diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
index c8450aa..535223c 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
@@ -29,7 +29,7 @@
 import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum;
 import org.apache.directory.shared.asn1.DecoderCallback;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.message.ResponseCarryingMessageException;
+import org.apache.directory.shared.ldap.exception.ResponseCarryingMessageException;
 import org.apache.directory.shared.util.Strings;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.session.IoSession;
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/exception/ResponseCarryingMessageException.java
similarity index 94%
rename from ldap-model/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java
rename to ldap-model/src/main/java/org/apache/directory/shared/ldap/exception/ResponseCarryingMessageException.java
index e41f1f1..b85e3a6 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/exception/ResponseCarryingMessageException.java
@@ -18,9 +18,10 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.exception;
 
 
+import org.apache.directory.shared.ldap.message.Message;
 import org.apache.directory.shared.util.exception.RuntimeMultiException;
 
 
diff --git a/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java b/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
index c8450aa..535223c 100644
--- a/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
+++ b/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
@@ -29,7 +29,7 @@
 import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum;
 import org.apache.directory.shared.asn1.DecoderCallback;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.message.ResponseCarryingMessageException;
+import org.apache.directory.shared.ldap.exception.ResponseCarryingMessageException;
 import org.apache.directory.shared.util.Strings;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.session.IoSession;