diff --git a/NOTICE b/NOTICE
index 04c6229..b6cf6a1 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Directory Shared
+Apache Directory API
 Copyright 2003-2008 The Apache Software Foundation
 
 This product includes software developed at
diff --git a/all/pom.xml b/all/pom.xml
index 4f8712c..d0f8473 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -25,8 +25,8 @@
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-all</artifactId>
-  <name>Apache Directory Shared All</name>
+  <artifactId>api-all</artifactId>
+  <name>Apache Directory API All</name>
 
   <dependencies>
     <dependency>
@@ -39,11 +39,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-dsml-engine</artifactId>
+      <artifactId>api-dsml-engine</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-dsml-parser</artifactId>
+      <artifactId>api-dsml-parser</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -51,55 +51,55 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-client-api</artifactId>
+      <artifactId>api-ldap-client-api</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-core</artifactId>
+      <artifactId>api-ldap-codec-core</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-standalone</artifactId>
+      <artifactId>api-ldap-codec-standalone</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-extras-aci</artifactId>
+      <artifactId>api-ldap-extras-aci</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-extras-codec</artifactId>
+      <artifactId>api-ldap-extras-codec</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-extras-codec-api</artifactId>
+      <artifactId>api-ldap-extras-codec-api</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-extras-sp</artifactId>
+      <artifactId>api-ldap-extras-sp</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-extras-trigger</artifactId>
+      <artifactId>api-ldap-extras-trigger</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-extras-util</artifactId>
+      <artifactId>api-ldap-extras-util</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-net-mina</artifactId>
+      <artifactId>api-ldap-net-mina</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-schema-converter</artifactId>
+      <artifactId>api-ldap-schema-converter</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-schema-data</artifactId>
+      <artifactId>api-ldap-schema-data</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 13592fa..a7a877f 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -32,7 +32,7 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-all</artifactId>
+      <artifactId>api-all</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/dsml/engine/pom.xml b/dsml/engine/pom.xml
index 29402ec..316e503 100644
--- a/dsml/engine/pom.xml
+++ b/dsml/engine/pom.xml
@@ -21,12 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-dsml-parent</artifactId>
+    <artifactId>api-dsml-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
 
-  <artifactId>shared-dsml-engine</artifactId>
-  <name>Apache Directory Shared DSML Engine</name>
+  <artifactId>api-dsml-engine</artifactId>
+  <name>Apache Directory LDAP API DSML Engine</name>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -37,12 +37,12 @@
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-dsml-parser</artifactId>
+      <artifactId>api-dsml-parser</artifactId>
     </dependency>
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-client-api</artifactId>
+      <artifactId>api-ldap-client-api</artifactId>
     </dependency>
     
     <dependency>
diff --git a/dsml/parser/pom.xml b/dsml/parser/pom.xml
index ec09ed9..947438d 100644
--- a/dsml/parser/pom.xml
+++ b/dsml/parser/pom.xml
@@ -21,12 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-dsml-parent</artifactId>
+    <artifactId>api-dsml-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
 
-  <artifactId>shared-dsml-parser</artifactId>
-  <name>Apache Directory Shared DSML Parser</name>
+  <artifactId>api-dsml-parser</artifactId>
+  <name>Apache Directory LDAP API DSML Parser</name>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -38,18 +38,18 @@
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-standalone</artifactId>
+      <artifactId>api-ldap-codec-standalone</artifactId>
       <scope>test</scope>
     </dependency>
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-core</artifactId>
+      <artifactId>api-ldap-codec-core</artifactId>
     </dependency>
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
     
     <dependency>
diff --git a/dsml/pom.xml b/dsml/pom.xml
index cfb53b5..37114d5 100644
--- a/dsml/pom.xml
+++ b/dsml/pom.xml
@@ -24,8 +24,8 @@
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-dsml-parent</artifactId>
-  <name>Apache Directory Shared DSML Parent</name>
+  <artifactId>api-dsml-parent</artifactId>
+  <name>Apache Directory LDAP API DSML Parent</name>
   <inceptionYear>2003</inceptionYear>
   <packaging>pom</packaging>
 
diff --git a/i18n/pom.xml b/i18n/pom.xml
index 3c574b9..5faa92a 100644
--- a/i18n/pom.xml
+++ b/i18n/pom.xml
@@ -26,7 +26,7 @@
   </parent>
   
   <artifactId>api-i18n</artifactId>
-  <name>Apache Directory Shared I18n</name>
+  <name>Apache Directory LDAP API I18n</name>
   <packaging>bundle</packaging> 
   <description>Internationalization of errors and other messages</description>
 
diff --git a/integ/pom.xml b/integ/pom.xml
index c18f634..84331bb 100644
--- a/integ/pom.xml
+++ b/integ/pom.xml
@@ -25,14 +25,14 @@
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-integ</artifactId>
-  <name>Apache Directory Shared Integration Tests</name>
+  <artifactId>api-integ</artifactId>
+  <name>Apache Directory API Integration Tests</name>
 
   <!-- 
      NOTE: This is a temporary module and area where we may
      decide to remove it after figuring out a better place 
      to put these tests. For now it keeps tests that would 
-     otherwise clutter shared-schema or cause cycles if put
+     otherwise clutter api-schema or cause cycles if put
      in the rightful position where they belong.
 
      The odd ldap api tests can be put here, it matters not
@@ -56,31 +56,31 @@
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-schema-data</artifactId>
+      <artifactId>api-ldap-schema-data</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-extras-aci</artifactId>
+      <artifactId>api-ldap-extras-aci</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-extras-codec</artifactId>
+      <artifactId>api-ldap-extras-codec</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-net-mina</artifactId>
+      <artifactId>api-ldap-net-mina</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-standalone</artifactId>
+      <artifactId>api-ldap-codec-standalone</artifactId>
       <scope>test</scope>
     </dependency>
 
@@ -130,7 +130,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>
-                  <artifactId>shared-ldap-extras-codec</artifactId>
+                  <artifactId>api-ldap-extras-codec</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${codec.plugin.directory}</outputDirectory>
                 </artifactItem>
diff --git a/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java b/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java
index ffc4f7d..77899cd 100644
--- a/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java
+++ b/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java
@@ -24,11 +24,11 @@
 import static org.junit.Assert.assertTrue;
 
 import org.apache.directory.api.ldap.codec.standalone.StandaloneLdapApiService;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureRequest;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureRequestImpl;
 import org.apache.directory.api.ldap.model.message.Control;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequest;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequestImpl;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/ldap/client/all/pom.xml b/ldap/client/all/pom.xml
index e04431d..7106aed 100644
--- a/ldap/client/all/pom.xml
+++ b/ldap/client/all/pom.xml
@@ -21,12 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-client-parent</artifactId>
+    <artifactId>api-ldap-client-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-client-all</artifactId>
-  <name>Apache Directory Shared LDAP Client All</name>
+  <artifactId>api-ldap-client-all</artifactId>
+  <name>Apache Directory LDAP API Client All</name>
 
   <dependencies>
     <dependency>
@@ -46,27 +46,27 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-client-api</artifactId>
+      <artifactId>api-ldap-client-api</artifactId>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-core</artifactId>
+      <artifactId>api-ldap-codec-core</artifactId>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-standalone</artifactId>
+      <artifactId>api-ldap-codec-standalone</artifactId>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-schema-data</artifactId>
+      <artifactId>api-ldap-schema-data</artifactId>
     </dependency>
 
     <dependency>
diff --git a/ldap/client/api/pom.xml b/ldap/client/api/pom.xml
index 11c88a5..ca9bf8c 100644
--- a/ldap/client/api/pom.xml
+++ b/ldap/client/api/pom.xml
@@ -23,12 +23,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-client-parent</artifactId>
+    <artifactId>api-ldap-client-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
 
-  <artifactId>shared-ldap-client-api</artifactId>
-  <name>Apache Directory Shared LDAP Client API</name>
+  <artifactId>api-ldap-client-api</artifactId>
+  <name>Apache Directory LDAP API Client API</name>
   <packaging>bundle</packaging>
   <inceptionYear>2009</inceptionYear>
 
@@ -50,12 +50,12 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-schema-data</artifactId>
+      <artifactId>api-ldap-schema-data</artifactId>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-core</artifactId>
+      <artifactId>api-ldap-codec-core</artifactId>
     </dependency>
 
     <dependency>
diff --git a/ldap/client/api/src/test/resources/log4j.properties b/ldap/client/api/src/test/resources/log4j.properties
index 32acb9b..8fcd92e 100644
--- a/ldap/client/api/src/test/resources/log4j.properties
+++ b/ldap/client/api/src/test/resources/log4j.properties
@@ -20,5 +20,5 @@
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
 
-#log4j.logger.org.apache.directory.shared.client.api=DEBUG
+#log4j.logger.org.apache.directory.api.client.api=DEBUG
 log4j.logger.org.apache.directory.api.asn1.ber=FATAL
diff --git a/ldap/client/pom.xml b/ldap/client/pom.xml
index 4ea16b2..bd3bb9b 100644
--- a/ldap/client/pom.xml
+++ b/ldap/client/pom.xml
@@ -20,12 +20,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-parent</artifactId>
+    <artifactId>api-ldap-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-client-parent</artifactId>
-  <name>Apache Directory Shared LDAP Client Parent</name>
+  <artifactId>api-ldap-client-parent</artifactId>
+  <name>Apache Directory LDAP API Client Parent</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/ldap/codec/core/pom.xml b/ldap/codec/core/pom.xml
index f8b4dfa..19d4014 100644
--- a/ldap/codec/core/pom.xml
+++ b/ldap/codec/core/pom.xml
@@ -21,12 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-codec-parent</artifactId>
+    <artifactId>api-ldap-codec-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-codec-core</artifactId>
-  <name>Apache Directory Shared LDAP Codec</name>
+  <artifactId>api-ldap-codec-core</artifactId>
+  <name>Apache Directory LDAP API Codec Core</name>
   <packaging>bundle</packaging>
   <description>LDAP Codec used by clients and servers</description>
 
@@ -59,7 +59,7 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency> 
 
     <dependency>
diff --git a/ldap/codec/pom.xml b/ldap/codec/pom.xml
index 3895059..e41708f 100644
--- a/ldap/codec/pom.xml
+++ b/ldap/codec/pom.xml
@@ -20,12 +20,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-parent</artifactId>
+    <artifactId>api-ldap-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-codec-parent</artifactId>
-  <name>Apache Directory Shared LDAP Codec Parent</name>
+  <artifactId>api-ldap-codec-parent</artifactId>
+  <name>Apache Directory LDAP API Codec Parent</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/ldap/codec/standalone/pom.xml b/ldap/codec/standalone/pom.xml
index 23d4d9b..e41d364 100644
--- a/ldap/codec/standalone/pom.xml
+++ b/ldap/codec/standalone/pom.xml
@@ -21,12 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-codec-parent</artifactId>
+    <artifactId>api-ldap-codec-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-codec-standalone</artifactId>
-  <name>Apache Directory Shared LDAP Codec Standalone</name>
+  <artifactId>api-ldap-codec-standalone</artifactId>
+  <name>Apache Directory LDAP API Codec Standalone</name>
   <packaging>jar</packaging>
   <description>
     This module was created to fix issue DIRSHARED-91 where the embedded Felix
@@ -50,12 +50,12 @@
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-net-mina</artifactId>
+      <artifactId>api-ldap-net-mina</artifactId>
     </dependency>
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-core</artifactId>
+      <artifactId>api-ldap-codec-core</artifactId>
     </dependency>
 
     <dependency>
diff --git a/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java b/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
index b9ecf5d..54b01d3 100644
--- a/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
+++ b/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
@@ -146,7 +146,7 @@
      *               &lt;artifactItems&gt;
      *                 &lt;artifactItem&gt;
      *                   &lt;groupId&gt;${project.groupId}&lt;/groupId&gt;
-     *                   &lt;artifactId&gt;shared-ldap-extras-codec&lt;/artifactId&gt;
+     *                   &lt;artifactId&gt;api-ldap-extras-codec&lt;/artifactId&gt;
      *                   &lt;version&gt;${project.version}&lt;/version&gt;
      *                   &lt;outputDirectory&gt;${codec.plugin.directory}&lt;/outputDirectory&gt;
      *                 &lt;/artifactItem&gt;
diff --git a/ldap/codec/standalone/src/test/java/org/apache/directory/api/ldap/codec/standalone/AbstractCodecServiceTest.java b/ldap/codec/standalone/src/test/java/org/apache/directory/api/ldap/codec/standalone/AbstractCodecServiceTest.java
index 87517dd..fbc885f 100644
--- a/ldap/codec/standalone/src/test/java/org/apache/directory/api/ldap/codec/standalone/AbstractCodecServiceTest.java
+++ b/ldap/codec/standalone/src/test/java/org/apache/directory/api/ldap/codec/standalone/AbstractCodecServiceTest.java
@@ -23,7 +23,6 @@
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
 import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.api.ldap.codec.api.LdapEncoder;
-import org.apache.directory.api.ldap.codec.standalone.StandaloneLdapApiService;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
@@ -58,20 +57,20 @@
                 "org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory" );
 
         System.setProperty( StandaloneLdapApiService.EXTRA_CONTROLS_LIST,
-            "org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," +
-                "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory," +
-                "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory," +
-                "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory," +
-                "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" );
+            "org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," +
+                "org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory," +
+                "org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory," +
+                "org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory," +
+                "org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" );
 
         System.setProperty( StandaloneLdapApiService.DEFAULT_EXTENDED_OPERATION_REQUESTS_LIST,
-            "org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelFactory," +
-                "org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory," +
-                "org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory," +
-                "org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory" );
+            "org.apache.directory.api.ldap.extras.extended.ads_impl.cancel.CancelFactory," +
+                "org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory," +
+                "org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory," +
+                "org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory" );
 
         System.setProperty( StandaloneLdapApiService.DEFAULT_EXTENDED_OPERATION_RESPONSES_LIST,
-            "org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" );
+            "org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" );
 
         System.setProperty( StandaloneLdapApiService.EXTRA_EXTENDED_OPERATION_LIST, "" );
 
diff --git a/ldap/extras/aci/pom.xml b/ldap/extras/aci/pom.xml
index 40b16b4..5049b4d 100644
--- a/ldap/extras/aci/pom.xml
+++ b/ldap/extras/aci/pom.xml
@@ -21,14 +21,14 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-extras-parent</artifactId>
+    <artifactId>api-ldap-extras-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-extras-aci</artifactId>
-  <name>Apache Directory Shared LDAP Extras ACI</name>
+  <artifactId>api-ldap-extras-aci</artifactId>
+  <name>Apache Directory LDAP API Extras ACI</name>
   <packaging>bundle</packaging>
-  <description>Extra Shared LDAP API for Access Control Items</description>
+  <description>Extra LDAP API for Access Control Items</description>
 
   <dependencies>
     <dependency>
@@ -49,7 +49,7 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency> 
 
     <dependency>
diff --git a/ldap/extras/codec-api/pom.xml b/ldap/extras/codec-api/pom.xml
index 1cc2373..ead8c15 100644
--- a/ldap/extras/codec-api/pom.xml
+++ b/ldap/extras/codec-api/pom.xml
@@ -21,12 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-extras-parent</artifactId>
+    <artifactId>api-ldap-extras-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-extras-codec-api</artifactId>
-  <name>Apache Directory Shared LDAP Extras Codec API</name>
+  <artifactId>api-ldap-extras-codec-api</artifactId>
+  <name>Apache Directory LDAP API Extras Codec API</name>
   <packaging>bundle</packaging>
   <description>
     Extra LDAP controls and extended operation interfaces and POJOs for the
@@ -42,7 +42,7 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncDoneValue.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncDoneValue.java
similarity index 97%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncDoneValue.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncDoneValue.java
index 67521fe..6a35611 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncDoneValue.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncDoneValue.java
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls;
 
 
 import org.apache.directory.api.ldap.model.message.Control;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncDoneValueImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncDoneValueImpl.java
similarity index 98%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncDoneValueImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncDoneValueImpl.java
index 6a9fe92..e2d5222 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncDoneValueImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncDoneValueImpl.java
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls;
 
 
 import java.util.Arrays;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValue.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncInfoValue.java
similarity index 98%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValue.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncInfoValue.java
index 5bafc6e..1973cad 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValue.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncInfoValue.java
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls;
 
 
 import java.util.List;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValueImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncInfoValueImpl.java
similarity index 99%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValueImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncInfoValueImpl.java
index dbe8941..a75cf4d 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValueImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncInfoValueImpl.java
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls;
 
 
 import java.util.ArrayList;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncModifyDnType.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncModifyDnType.java
similarity index 96%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncModifyDnType.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncModifyDnType.java
index 4015b6b..341441a 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncModifyDnType.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncModifyDnType.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.directory.shared.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls;
 
 
 /**
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValue.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncRequestValue.java
similarity index 96%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValue.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncRequestValue.java
index fd1a823..71319a7 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValue.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncRequestValue.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls;
 
 
 import org.apache.directory.api.ldap.model.message.Control;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValueImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncRequestValueImpl.java
similarity index 98%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValueImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncRequestValueImpl.java
index d38f1f1..abbec3a 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValueImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncRequestValueImpl.java
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls;
 
 
 import java.util.Arrays;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateTypeEnum.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateTypeEnum.java
similarity index 97%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateTypeEnum.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateTypeEnum.java
index cc11f6b..df703c5 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateTypeEnum.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateTypeEnum.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls;
 
 
 import org.apache.directory.api.i18n.I18n;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValue.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateValue.java
similarity index 97%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValue.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateValue.java
index ac79e87..5c276f2 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValue.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateValue.java
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls;
 
 
 import org.apache.directory.api.ldap.model.message.Control;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValueImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateValueImpl.java
similarity index 98%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValueImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateValueImpl.java
index b5a75fb..ef9dcca 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValueImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateValueImpl.java
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls;
 
 
 import java.util.Arrays;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SynchronizationInfoEnum.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SynchronizationInfoEnum.java
similarity index 97%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SynchronizationInfoEnum.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SynchronizationInfoEnum.java
index f8e8de0..b3ed265 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SynchronizationInfoEnum.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SynchronizationInfoEnum.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls;
 
 
 /**
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SynchronizationModeEnum.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SynchronizationModeEnum.java
similarity index 97%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SynchronizationModeEnum.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SynchronizationModeEnum.java
index 9c221d0..1353e3c 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SynchronizationModeEnum.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SynchronizationModeEnum.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls;
 
 
 /**
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicy.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicy.java
similarity index 97%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicy.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicy.java
index 4ba0b10..ab46d65 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicy.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicy.java
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.controls.ppolicy;
+package org.apache.directory.api.ldap.extras.controls.ppolicy;
 
 
 import org.apache.directory.api.ldap.model.message.Control;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyErrorEnum.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyErrorEnum.java
similarity index 97%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyErrorEnum.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyErrorEnum.java
index 6882796..86d7fff 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyErrorEnum.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyErrorEnum.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.directory.shared.ldap.extras.controls.ppolicy;
+package org.apache.directory.api.ldap.extras.controls.ppolicy;
 
 
 /**
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyImpl.java
similarity index 97%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyImpl.java
index 4193bd8..08e5045 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyImpl.java
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.controls.ppolicy;
+package org.apache.directory.api.ldap.extras.controls.ppolicy;
 
 
 import org.apache.directory.api.ldap.model.message.Control;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyResponse.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyResponse.java
similarity index 96%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyResponse.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyResponse.java
index af97219..4699664 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyResponse.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyResponse.java
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.controls.ppolicy;
+package org.apache.directory.api.ldap.extras.controls.ppolicy;
 
 
 /**
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyResponseImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyResponseImpl.java
similarity index 96%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyResponseImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyResponseImpl.java
index ac8d879..400da5e 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyResponseImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyResponseImpl.java
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.controls.ppolicy;
+package org.apache.directory.api.ldap.extras.controls.ppolicy;
 
 
 /**
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequest.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequest.java
similarity index 96%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequest.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequest.java
index bdd4652..632c895 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequest.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequest.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.ldap.model.message.ExtendedRequest;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequestImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequestImpl.java
similarity index 97%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequestImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequestImpl.java
index 47a2700..a0aba00 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequestImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequestImpl.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.ldap.model.message.AbstractExtendedRequest;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelResponse.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponse.java
similarity index 94%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelResponse.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponse.java
index 8cbea3e..ddb1950 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelResponse.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponse.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.ldap.model.message.ExtendedResponse;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelResponseImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponseImpl.java
similarity index 98%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelResponseImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponseImpl.java
index 5ac6973..e33fc3b 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelResponseImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponseImpl.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.i18n.I18n;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequest.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationRequest.java
similarity index 96%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequest.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationRequest.java
index 0a63764..0893d87 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequest.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationRequest.java
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.ldap.model.message.ExtendedRequest;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequestImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationRequestImpl.java
similarity index 98%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequestImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationRequestImpl.java
index a2baae1..4e189af 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequestImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationRequestImpl.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.ldap.model.message.AbstractExtendedRequest;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponse.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationResponse.java
similarity index 95%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponse.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationResponse.java
index 9189e3f..0852d29 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponse.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationResponse.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.ldap.model.message.ExtendedResponse;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponseImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationResponseImpl.java
similarity index 98%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponseImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationResponseImpl.java
index 2df5824..bfa9824 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponseImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationResponseImpl.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.i18n.I18n;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponse.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponse.java
similarity index 97%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponse.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponse.java
index d744cd2..c0209de 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponse.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponse.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.ldap.model.message.ExtendedResponse;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponseImpl.java
similarity index 88%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponseImpl.java
index 76d710e..1528813 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponseImpl.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.i18n.I18n;
@@ -112,7 +112,7 @@
     // -----------------------------------------------------------------------
 
     /* (non-Javadoc)
-     * @see org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponse#getDelay()
+     * @see org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponse#getDelay()
      */
     public int getDelay()
     {
@@ -121,7 +121,7 @@
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponse#setDelay(int)
+     * @see org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponse#setDelay(int)
      */
     public void setDelay( int delay )
     {
@@ -130,7 +130,7 @@
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponse#getTimeOffline()
+     * @see org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponse#getTimeOffline()
      */
     public int getTimeOffline()
     {
@@ -139,7 +139,7 @@
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponse#setTimeOffline(int)
+     * @see org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponse#setTimeOffline(int)
      */
     public void setTimeOffline( int timeOffline )
     {
@@ -148,7 +148,7 @@
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponse#getReplicatedContexts()
+     * @see org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponse#getReplicatedContexts()
      */
     public Referral getReplicatedContexts()
     {
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequest.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequest.java
similarity index 97%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequest.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequest.java
index fdc5ff2..976b82c 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequest.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequest.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.ldap.model.message.ExtendedRequest;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequestImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequestImpl.java
similarity index 98%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequestImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequestImpl.java
index 28dbea1..a6c4d64 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequestImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequestImpl.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.ldap.model.message.AbstractExtendedRequest;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponse.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponse.java
similarity index 95%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponse.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponse.java
index 8177bbb..52d2b4e 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponse.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponse.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.ldap.model.message.ExtendedResponse;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponseImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponseImpl.java
similarity index 98%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponseImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponseImpl.java
index a10ba5b..2f8cd17 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponseImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponseImpl.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.i18n.I18n;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureParameter.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureParameter.java
similarity index 97%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureParameter.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureParameter.java
index 40a29dc..97d9236 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureParameter.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureParameter.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.util.Strings;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequest.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequest.java
similarity index 97%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequest.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequest.java
index ee907bc..4b35490 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequest.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequest.java
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import java.util.List;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequestImpl.java
similarity index 99%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequestImpl.java
index 7c61876..ffa18ba 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequestImpl.java
@@ -17,7 +17,7 @@
  *  under the License.
  * 
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import java.util.ArrayList;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureResponse.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponse.java
similarity index 95%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureResponse.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponse.java
index ac2f14f..ebd4281 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureResponse.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponse.java
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.ldap.model.message.ExtendedResponse;
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureResponseImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponseImpl.java
similarity index 96%
rename from ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureResponseImpl.java
rename to ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponseImpl.java
index 88f3d48..2ca7dd6 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureResponseImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponseImpl.java
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended;
 
 
 import org.apache.directory.api.ldap.model.message.ExtendedResponseImpl;
diff --git a/ldap/extras/codec/pom.xml b/ldap/extras/codec/pom.xml
index 06d1835..f3948bb 100644
--- a/ldap/extras/codec/pom.xml
+++ b/ldap/extras/codec/pom.xml
@@ -21,12 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-extras-parent</artifactId>
+    <artifactId>api-ldap-extras-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-extras-codec</artifactId>
-  <name>Apache Directory Shared LDAP Extras Codec</name>
+  <artifactId>api-ldap-extras-codec</artifactId>
+  <name>Apache Directory LDAP API Extras Codec</name>
   <packaging>bundle</packaging>
   <description>
     Extra LDAP controls and extended operation extentions for the Codec used
@@ -45,12 +45,12 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-core</artifactId>
+      <artifactId>api-ldap-codec-core</artifactId>
     </dependency>
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-extras-codec-api</artifactId>
+      <artifactId>api-ldap-extras-codec-api</artifactId>
     </dependency>
     
     <dependency>
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
index 2398b8f..b88c663 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
@@ -24,26 +24,26 @@
 import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
 import org.apache.directory.api.ldap.codec.api.UnsolicitedResponseFactory;
+import org.apache.directory.api.ldap.extras.controls.SyncDoneValue;
+import org.apache.directory.api.ldap.extras.controls.SyncInfoValue;
+import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
+import org.apache.directory.api.ldap.extras.controls.SyncStateValue;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
 import org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory;
 import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory;
 import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory;
 import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory;
 import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory;
+import org.apache.directory.api.ldap.extras.extended.CancelRequest;
+import org.apache.directory.api.ldap.extras.extended.CertGenerationRequest;
+import org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponse;
+import org.apache.directory.api.ldap.extras.extended.GracefulShutdownRequest;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureRequest;
 import org.apache.directory.api.ldap.extras.extended.ads_impl.cancel.CancelFactory;
 import org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory;
 import org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory;
 import org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory;
 import org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory;
-import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
-import org.apache.directory.shared.ldap.extras.extended.CancelRequest;
-import org.apache.directory.shared.ldap.extras.extended.CertGenerationRequest;
-import org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponse;
-import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownRequest;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequest;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java
index 9d03938..c9bf077 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java
@@ -23,8 +23,8 @@
 
 import org.apache.directory.api.asn1.ber.AbstractContainer;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyImpl;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyImpl;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java
index 11055e1..75e720a 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java
@@ -32,9 +32,9 @@
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.codec.api.ControlDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyImpl;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyResponse;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyImpl;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyResponse;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java
index 480ee17..a99de3b 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java
@@ -22,7 +22,7 @@
 
 import org.apache.directory.api.ldap.codec.api.ControlFactory;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/StoreError.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/StoreError.java
index 6817eff..a128683 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/StoreError.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/StoreError.java
@@ -22,7 +22,7 @@
 
 import org.apache.directory.api.asn1.actions.AbstractReadInteger;
 import org.apache.directory.api.asn1.ber.Asn1Container;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java
index 6d06ab6..5c95cc8 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java
@@ -22,7 +22,7 @@
 
 import org.apache.directory.api.asn1.ber.AbstractContainer;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
+import org.apache.directory.api.ldap.extras.controls.SyncDoneValue;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java
index ba11f1d..c2d9a9c 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java
@@ -32,9 +32,9 @@
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.codec.api.ControlDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
+import org.apache.directory.api.ldap.extras.controls.SyncDoneValue;
+import org.apache.directory.api.ldap.extras.controls.SyncDoneValueImpl;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncDoneValueImpl;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java
index 75381d6..f40643c 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java
@@ -22,7 +22,7 @@
 
 import org.apache.directory.api.ldap.codec.api.ControlFactory;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
+import org.apache.directory.api.ldap.extras.controls.SyncDoneValue;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java
index 71f4251..f4e9f41 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java
@@ -22,7 +22,7 @@
 
 import org.apache.directory.api.asn1.ber.AbstractContainer;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
+import org.apache.directory.api.ldap.extras.controls.SyncInfoValue;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java
index d24a5a5..683f13a 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java
@@ -34,10 +34,10 @@
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.codec.api.ControlDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
+import org.apache.directory.api.ldap.extras.controls.SyncInfoValue;
+import org.apache.directory.api.ldap.extras.controls.SyncInfoValueImpl;
+import org.apache.directory.api.ldap.extras.controls.SynchronizationInfoEnum;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncInfoValueImpl;
-import org.apache.directory.shared.ldap.extras.controls.SynchronizationInfoEnum;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java
index 35ae379..1b60d47 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java
@@ -22,7 +22,7 @@
 
 import org.apache.directory.api.ldap.codec.api.ControlFactory;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
+import org.apache.directory.api.ldap.extras.controls.SyncInfoValue;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueGrammar.java
index 99a5b17..fa230e2 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueGrammar.java
@@ -30,9 +30,9 @@
 import org.apache.directory.api.asn1.ber.tlv.BooleanDecoderException;
 import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.api.i18n.I18n;
+import org.apache.directory.api.ldap.extras.controls.SyncInfoValue;
+import org.apache.directory.api.ldap.extras.controls.SynchronizationInfoEnum;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
-import org.apache.directory.shared.ldap.extras.controls.SynchronizationInfoEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueContainer.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueContainer.java
index 573cbba..eadf095 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueContainer.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueContainer.java
@@ -21,7 +21,7 @@
 
 
 import org.apache.directory.api.asn1.ber.AbstractContainer;
-import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
+import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java
index a1533d1..29c98da 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java
@@ -32,10 +32,10 @@
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.codec.api.ControlDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
+import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
+import org.apache.directory.api.ldap.extras.controls.SyncRequestValueImpl;
+import org.apache.directory.api.ldap.extras.controls.SynchronizationModeEnum;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncRequestValueImpl;
-import org.apache.directory.shared.ldap.extras.controls.SynchronizationModeEnum;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java
index 7a24e95..02c9669 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java
@@ -22,7 +22,7 @@
 
 import org.apache.directory.api.ldap.codec.api.ControlFactory;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
+import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueGrammar.java
index 2469ea8..52d83fe 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueGrammar.java
@@ -32,8 +32,8 @@
 import org.apache.directory.api.asn1.ber.tlv.IntegerDecoderException;
 import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.api.i18n.I18n;
+import org.apache.directory.api.ldap.extras.controls.SynchronizationModeEnum;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.controls.SynchronizationModeEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueContainer.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueContainer.java
index 8f90396..0df0bbf 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueContainer.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueContainer.java
@@ -21,7 +21,7 @@
 
 
 import org.apache.directory.api.asn1.ber.AbstractContainer;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
+import org.apache.directory.api.ldap.extras.controls.SyncStateValue;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java
index 280bfff..2ea0eb1 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java
@@ -32,9 +32,9 @@
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.codec.api.ControlDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateValueImpl;
+import org.apache.directory.api.ldap.extras.controls.SyncStateTypeEnum;
+import org.apache.directory.api.ldap.extras.controls.SyncStateValue;
+import org.apache.directory.api.ldap.extras.controls.SyncStateValueImpl;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java
index 5486b74..a25c025 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java
@@ -22,7 +22,7 @@
 
 import org.apache.directory.api.ldap.codec.api.ControlFactory;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
+import org.apache.directory.api.ldap.extras.controls.SyncStateValue;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueGrammar.java
index fb5e4d9..c87710d 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueGrammar.java
@@ -30,8 +30,8 @@
 import org.apache.directory.api.asn1.ber.tlv.IntegerDecoderException;
 import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.api.i18n.I18n;
+import org.apache.directory.api.ldap.extras.controls.SyncStateTypeEnum;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java
index 08f576e..c972725 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java
@@ -25,12 +25,12 @@
 import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory;
 import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
+import org.apache.directory.api.ldap.extras.extended.CancelRequest;
+import org.apache.directory.api.ldap.extras.extended.CancelRequestImpl;
+import org.apache.directory.api.ldap.extras.extended.CancelResponse;
+import org.apache.directory.api.ldap.extras.extended.CancelResponseImpl;
 import org.apache.directory.api.ldap.model.message.ExtendedRequest;
 import org.apache.directory.api.ldap.model.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.extras.extended.CancelRequestImpl;
-import org.apache.directory.shared.ldap.extras.extended.CancelResponseImpl;
-import org.apache.directory.shared.ldap.extras.extended.CancelRequest;
-import org.apache.directory.shared.ldap.extras.extended.CancelResponse;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java
index 17863d1..90da032 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java
@@ -25,8 +25,8 @@
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.extended.CancelRequest;
-import org.apache.directory.shared.ldap.extras.extended.CancelResponse;
+import org.apache.directory.api.ldap.extras.extended.CancelRequest;
+import org.apache.directory.api.ldap.extras.extended.CancelResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelResponseDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelResponseDecorator.java
index b917657..9db7b0b 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelResponseDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelResponseDecorator.java
@@ -22,7 +22,7 @@
 
 import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.extended.CancelResponse;
+import org.apache.directory.api.ldap.extras.extended.CancelResponse;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java
index ac39b39..1df82fd 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java
@@ -25,12 +25,12 @@
 import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory;
 import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
+import org.apache.directory.api.ldap.extras.extended.CertGenerationRequest;
+import org.apache.directory.api.ldap.extras.extended.CertGenerationRequestImpl;
+import org.apache.directory.api.ldap.extras.extended.CertGenerationResponse;
+import org.apache.directory.api.ldap.extras.extended.CertGenerationResponseImpl;
 import org.apache.directory.api.ldap.model.message.ExtendedRequest;
 import org.apache.directory.api.ldap.model.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.extras.extended.CertGenerationRequestImpl;
-import org.apache.directory.shared.ldap.extras.extended.CertGenerationResponseImpl;
-import org.apache.directory.shared.ldap.extras.extended.CertGenerationRequest;
-import org.apache.directory.shared.ldap.extras.extended.CertGenerationResponse;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java
index b44bc7d..10fc938 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java
@@ -29,9 +29,9 @@
 import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
+import org.apache.directory.api.ldap.extras.extended.CertGenerationRequestImpl;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.extended.CertGenerationRequestImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java
index b93824f..affbefe 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java
@@ -26,8 +26,8 @@
 import org.apache.directory.api.asn1.EncoderException;
 import org.apache.directory.api.asn1.ber.tlv.BerValue;
 import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
+import org.apache.directory.api.ldap.extras.extended.CertGenerationRequest;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.extended.CertGenerationRequest;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java
index ccf5b6c..ebc1756 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java
@@ -25,8 +25,8 @@
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.extended.CertGenerationRequest;
-import org.apache.directory.shared.ldap.extras.extended.CertGenerationResponse;
+import org.apache.directory.api.ldap.extras.extended.CertGenerationRequest;
+import org.apache.directory.api.ldap.extras.extended.CertGenerationResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationResponseDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationResponseDecorator.java
index b8e69d9..0badaa5 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationResponseDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationResponseDecorator.java
@@ -22,7 +22,7 @@
 
 import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.extended.CertGenerationResponse;
+import org.apache.directory.api.ldap.extras.extended.CertGenerationResponse;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java
index 43f1137..a70d3d0 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java
@@ -25,9 +25,9 @@
 import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
 import org.apache.directory.api.ldap.codec.api.UnsolicitedResponseFactory;
+import org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponse;
+import org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponseImpl;
 import org.apache.directory.api.ldap.model.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponse;
-import org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponseImpl;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java
index dec8534..f4d9ceb 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java
@@ -29,13 +29,13 @@
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
+import org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponse;
+import org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponseImpl;
 import org.apache.directory.api.ldap.model.exception.LdapURLEncodingException;
 import org.apache.directory.api.ldap.model.message.Referral;
 import org.apache.directory.api.ldap.model.message.ReferralImpl;
 import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.api.ldap.model.url.LdapUrl;
-import org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponse;
-import org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponseImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java
index 4b00f9a..5826e36 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java
@@ -25,12 +25,12 @@
 import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory;
 import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
+import org.apache.directory.api.ldap.extras.extended.GracefulShutdownRequest;
+import org.apache.directory.api.ldap.extras.extended.GracefulShutdownRequestImpl;
+import org.apache.directory.api.ldap.extras.extended.GracefulShutdownResponse;
+import org.apache.directory.api.ldap.extras.extended.GracefulShutdownResponseImpl;
 import org.apache.directory.api.ldap.model.message.ExtendedRequest;
 import org.apache.directory.api.ldap.model.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownRequestImpl;
-import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownResponseImpl;
-import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownRequest;
-import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownResponse;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java
index 2220c3a..3b2e76a 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java
@@ -25,8 +25,8 @@
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownRequest;
-import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownResponse;
+import org.apache.directory.api.ldap.extras.extended.GracefulShutdownRequest;
+import org.apache.directory.api.ldap.extras.extended.GracefulShutdownResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownResponseDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownResponseDecorator.java
index abc17be..ee8a3f9 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownResponseDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownResponseDecorator.java
@@ -22,7 +22,7 @@
 
 import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownResponse;
+import org.apache.directory.api.ldap.extras.extended.GracefulShutdownResponse;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java
index 1aa7ef5..9f175d6 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java
@@ -25,11 +25,11 @@
 import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory;
 import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureRequest;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureResponse;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureResponseImpl;
 import org.apache.directory.api.ldap.model.message.ExtendedRequest;
 import org.apache.directory.api.ldap.model.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequest;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureResponse;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureResponseImpl;
 
 
 /**
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java
index 96da0e5..77ae354 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java
@@ -29,8 +29,8 @@
 import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureParameter;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureParameter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
index da722b9..c1038cc 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
@@ -32,11 +32,11 @@
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureParameter;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureRequest;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureRequestImpl;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureResponse;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureParameter;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequest;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequestImpl;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureResponseDecorator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureResponseDecorator.java
index 27bb722..31f54de 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureResponseDecorator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureResponseDecorator.java
@@ -22,7 +22,7 @@
 
 import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureResponse;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureResponse;
 
 
 /**
diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyTest.java
index ffbd91c..c8f3407 100644
--- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyTest.java
+++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/ppolicy/PasswordPolicyTest.java
@@ -28,9 +28,9 @@
 import java.nio.ByteBuffer;
 
 import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
 import org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
 import org.junit.Test;
 
 
diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java
index 73fc711..36596e7 100644
--- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java
+++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java
@@ -30,9 +30,9 @@
 
 import org.apache.directory.api.asn1.EncoderException;
 import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest;
+import org.apache.directory.api.ldap.extras.controls.SyncDoneValue;
 import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueDecorator;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueControlTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueControlTest.java
index 629d6d5..08a4f8a 100644
--- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueControlTest.java
+++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueControlTest.java
@@ -30,10 +30,10 @@
 import org.apache.directory.api.asn1.DecoderException;
 import org.apache.directory.api.asn1.EncoderException;
 import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest;
+import org.apache.directory.api.ldap.extras.controls.SyncInfoValue;
+import org.apache.directory.api.ldap.extras.controls.SynchronizationInfoEnum;
 import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueDecorator;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
-import org.apache.directory.shared.ldap.extras.controls.SynchronizationInfoEnum;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java
index 986aa39..521dfd2 100644
--- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java
+++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java
@@ -30,11 +30,11 @@
 import org.apache.directory.api.asn1.DecoderException;
 import org.apache.directory.api.asn1.EncoderException;
 import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest;
+import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
+import org.apache.directory.api.ldap.extras.controls.SyncRequestValueImpl;
+import org.apache.directory.api.ldap.extras.controls.SynchronizationModeEnum;
 import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueDecorator;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncRequestValueImpl;
-import org.apache.directory.shared.ldap.extras.controls.SynchronizationModeEnum;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java
index 4481132..c5b4348 100644
--- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java
+++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java
@@ -29,10 +29,10 @@
 import org.apache.directory.api.asn1.DecoderException;
 import org.apache.directory.api.asn1.EncoderException;
 import org.apache.directory.api.ldap.extras.AbstractCodecServiceTest;
+import org.apache.directory.api.ldap.extras.controls.SyncStateTypeEnum;
+import org.apache.directory.api.ldap.extras.controls.SyncStateValue;
 import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueDecorator;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java
index e166321..834821c 100644
--- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java
+++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java
@@ -30,10 +30,10 @@
 import org.apache.directory.api.asn1.EncoderException;
 import org.apache.directory.api.asn1.ber.Asn1Decoder;
 import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
+import org.apache.directory.api.ldap.extras.extended.CertGenerationRequestImpl;
 import org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration.CertGenerationContainer;
 import org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration.CertGenerationRequestDecorator;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.extras.extended.CertGenerationRequestImpl;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/ldap/extras/pom.xml b/ldap/extras/pom.xml
index 1ced41b..bb8b0fe 100644
--- a/ldap/extras/pom.xml
+++ b/ldap/extras/pom.xml
@@ -20,12 +20,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-parent</artifactId>
+    <artifactId>api-ldap-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-extras-parent</artifactId>
-  <name>Apache Directory Shared LDAP Extras</name>
+  <artifactId>api-ldap-extras-parent</artifactId>
+  <name>Apache Directory LDAP API Extras</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/ldap/extras/sp/pom.xml b/ldap/extras/sp/pom.xml
index 1ae9caa..5295a8a 100644
--- a/ldap/extras/sp/pom.xml
+++ b/ldap/extras/sp/pom.xml
@@ -21,14 +21,14 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-extras-parent</artifactId>
+    <artifactId>api-ldap-extras-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-extras-sp</artifactId>
-  <name>Apache Directory Shared LDAP Extras Stored Procedures</name>
+  <artifactId>api-ldap-extras-sp</artifactId>
+  <name>Apache Directory LDAP API Extras Stored Procedures</name>
   <packaging>bundle</packaging>
-  <description>Shared Extras LDAP stored procedure packages used by clients and servers</description>
+  <description>Extras LDAP API stored procedure packages used by clients and servers</description>
 
   <dependencies>
     <dependency>
@@ -49,17 +49,17 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency> 
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-extras-codec</artifactId>
+      <artifactId>api-ldap-extras-codec</artifactId>
     </dependency> 
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-extras-util</artifactId>
+      <artifactId>api-ldap-extras-util</artifactId>
     </dependency> 
 
     <dependency>
diff --git a/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/JavaStoredProcUtils.java b/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/JavaStoredProcUtils.java
index 26643f9..e9ecf50 100644
--- a/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/JavaStoredProcUtils.java
+++ b/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/JavaStoredProcUtils.java
@@ -38,8 +38,8 @@
 import org.apache.commons.lang.SerializationUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureRequestImpl;
 import org.apache.directory.api.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequestImpl;
 
 
 /**
diff --git a/ldap/extras/trigger/pom.xml b/ldap/extras/trigger/pom.xml
index 631fe23..acb1c7d 100644
--- a/ldap/extras/trigger/pom.xml
+++ b/ldap/extras/trigger/pom.xml
@@ -21,14 +21,14 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-extras-parent</artifactId>
+    <artifactId>api-ldap-extras-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-extras-trigger</artifactId>
-  <name>Apache Directory Shared LDAP Extras Trigger</name>
+  <artifactId>api-ldap-extras-trigger</artifactId>
+  <name>Apache Directory LDAP API Extras Trigger</name>
   <packaging>bundle</packaging>
-  <description>Shared Extra LDAP Trigger API</description>
+  <description>Extra LDAP API Trigger API</description>
 
   <dependencies>
     <dependency>
@@ -49,7 +49,7 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency> 
     
     <dependency>
diff --git a/ldap/extras/util/pom.xml b/ldap/extras/util/pom.xml
index 26cc505..bee29d9 100644
--- a/ldap/extras/util/pom.xml
+++ b/ldap/extras/util/pom.xml
@@ -21,14 +21,14 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-extras-parent</artifactId>
+    <artifactId>api-ldap-extras-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-extras-util</artifactId>
-  <name>Apache Directory Shared LDAP Extras Util</name>
+  <artifactId>api-ldap-extras-util</artifactId>
+  <name>Apache Directory LDAP API Extras Util</name>
   <packaging>bundle</packaging>
-  <description>Shared LDAP Extra utility packages used by clients and servers</description>
+  <description>LDAP API Extra utility packages used by clients and servers</description>
 
   <dependencies>
     <dependency>
@@ -44,12 +44,12 @@
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-core</artifactId>
+      <artifactId>api-ldap-codec-core</artifactId>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/ldap/model/pom.xml b/ldap/model/pom.xml
index 4a2624e..59a9eb8 100644
--- a/ldap/model/pom.xml
+++ b/ldap/model/pom.xml
@@ -21,12 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-parent</artifactId>
+    <artifactId>api-ldap-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-model</artifactId>
-  <name>Apache Directory Shared LDAP Model</name>
+  <artifactId>api-ldap-model</artifactId>
+  <name>Apache Directory LDAP API Model</name>
   <packaging>bundle</packaging>
   <description>Common LDAP Model used by clients and servers</description>
 
diff --git a/ldap/net/mina/pom.xml b/ldap/net/mina/pom.xml
index f4155de..c1a6573 100644
--- a/ldap/net/mina/pom.xml
+++ b/ldap/net/mina/pom.xml
@@ -21,12 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-net-parent</artifactId>
+    <artifactId>api-ldap-net-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-net-mina</artifactId>
-  <name>Apache Directory Shared LDAP Network MINA</name>
+  <artifactId>api-ldap-net-mina</artifactId>
+  <name>Apache Directory LDAP API Network MINA</name>
   <packaging>bundle</packaging>
   <description>LDAP ProtocolCodecFactory implementation based on MINA</description>
 
@@ -39,7 +39,7 @@
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-core</artifactId>
+      <artifactId>api-ldap-codec-core</artifactId>
     </dependency> 
 
     <dependency>
diff --git a/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolDecoder.java b/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolDecoder.java
index d089cc3..b99e693 100644
--- a/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolDecoder.java
+++ b/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolDecoder.java
@@ -43,7 +43,7 @@
 
 
 /**
- * A LDAP message decoder. It is based on shared-ldap decoder.
+ * A LDAP message decoder. It is based on api-ldap decoder.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
diff --git a/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolEncoder.java b/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolEncoder.java
index 5721ba3..25f0865 100644
--- a/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolEncoder.java
+++ b/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolEncoder.java
@@ -32,7 +32,7 @@
 
 
 /**
- * A LDAP message encoder. It is based on shared-ldap encoder.
+ * A LDAP message encoder. It is based on api-ldap encoder.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
diff --git a/ldap/net/pom.xml b/ldap/net/pom.xml
index c619f1d..d3a10ef 100644
--- a/ldap/net/pom.xml
+++ b/ldap/net/pom.xml
@@ -20,12 +20,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-parent</artifactId>
+    <artifactId>api-ldap-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-net-parent</artifactId>
-  <name>Apache Directory Shared LDAP Net Parent</name>
+  <artifactId>api-ldap-net-parent</artifactId>
+  <name>Apache Directory LDAP API Net Parent</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/ldap/pom.xml b/ldap/pom.xml
index b5997bd..c64a893 100644
--- a/ldap/pom.xml
+++ b/ldap/pom.xml
@@ -24,8 +24,8 @@
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-parent</artifactId>
-  <name>Apache Directory Shared LDAP Parent</name>
+  <artifactId>api-ldap-parent</artifactId>
+  <name>Apache Directory LDAP API Parent</name>
   <inceptionYear>2003</inceptionYear>
   <packaging>pom</packaging>
 
diff --git a/ldap/schema/converter/pom.xml b/ldap/schema/converter/pom.xml
index 863dc57..accca84 100644
--- a/ldap/schema/converter/pom.xml
+++ b/ldap/schema/converter/pom.xml
@@ -21,12 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-schema-parent</artifactId>
+    <artifactId>api-ldap-schema-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-schema-converter</artifactId>
-  <name>Apache Directory Shared LDAP Schema Converter</name>
+  <artifactId>api-ldap-schema-converter</artifactId>
+  <name>Apache Directory LDAP API Schema Converter</name>
   <packaging>bundle</packaging>
   <description>LDAP Schema Converter</description>
 
@@ -49,7 +49,7 @@
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
     
     <dependency>
diff --git a/ldap/schema/data/pom.xml b/ldap/schema/data/pom.xml
index cecc54f..d1ce569 100644
--- a/ldap/schema/data/pom.xml
+++ b/ldap/schema/data/pom.xml
@@ -21,12 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-schema-parent</artifactId>
+    <artifactId>api-ldap-schema-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-schema-data</artifactId>
-  <name>Apache Directory Shared LDAP Schema</name>
+  <artifactId>api-ldap-schema-data</artifactId>
+  <name>Apache Directory LDAP API Schema Data</name>
 
   <description>
     Jar bundled LDIF files containing schema data using the Apache Directory
@@ -48,12 +48,12 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-extras-aci</artifactId>
+      <artifactId>api-ldap-extras-aci</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/ResourceMap.java b/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/ResourceMap.java
index b0b02e5..2f9fca0 100644
--- a/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/ResourceMap.java
+++ b/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/ResourceMap.java
@@ -51,7 +51,7 @@
      *
      *  usage: -Dschema.resource.location=/tmp/schema
      *                OR
-     *         -Dschema.resource.location=/tmp/shared-ldap-schema-0.9.18.jar
+     *         -Dschema.resource.location=/tmp/api-ldap-schema-1.0.0-M13.jar
      *  */
     private static final String SCHEMA_RESOURCE_LOCATION = "schema.resource.location";
 
@@ -232,4 +232,4 @@
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/ldap/schema/pom.xml b/ldap/schema/pom.xml
index ae2f381..ef18260 100644
--- a/ldap/schema/pom.xml
+++ b/ldap/schema/pom.xml
@@ -20,12 +20,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.api</groupId>
-    <artifactId>shared-ldap-parent</artifactId>
+    <artifactId>api-ldap-parent</artifactId>
     <version>1.0.0-M14-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-schema-parent</artifactId>
-  <name>Apache Directory Shared LDAP Schema Parent</name>
+  <artifactId>api-ldap-schema-parent</artifactId>
+  <name>Apache Directory LDAP API Schema Parent</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/pom.xml b/pom.xml
index 5cdd770..e345123 100644
--- a/pom.xml
+++ b/pom.xml
@@ -432,7 +432,7 @@
       <!-- Project sub-modules dependencies -->
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-all</artifactId>
+        <artifactId>api-all</artifactId>
         <version>${project.version}</version>
       </dependency>
       
@@ -450,13 +450,13 @@
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-dsml-engine</artifactId>
+        <artifactId>api-dsml-engine</artifactId>
         <version>${project.version}</version>
       </dependency>
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-dsml-parser</artifactId>
+        <artifactId>api-dsml-parser</artifactId>
         <version>${project.version}</version>
       </dependency>
       
@@ -468,79 +468,79 @@
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-client-api</artifactId>
+        <artifactId>api-ldap-client-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-codec-core</artifactId>
+        <artifactId>api-ldap-codec-core</artifactId>
         <version>${project.version}</version>
       </dependency>
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-codec-standalone</artifactId>
+        <artifactId>api-ldap-codec-standalone</artifactId>
         <version>${project.version}</version>
       </dependency>
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-extras-aci</artifactId>
+        <artifactId>api-ldap-extras-aci</artifactId>
         <version>${project.version}</version>
       </dependency>
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-extras-codec</artifactId>
+        <artifactId>api-ldap-extras-codec</artifactId>
         <version>${project.version}</version>
       </dependency>
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-extras-codec-api</artifactId>
+        <artifactId>api-ldap-extras-codec-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-extras-sp</artifactId>
+        <artifactId>api-ldap-extras-sp</artifactId>
         <version>${project.version}</version>
       </dependency>
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-extras-trigger</artifactId>
+        <artifactId>api-ldap-extras-trigger</artifactId>
         <version>${project.version}</version>
       </dependency>
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-extras-util</artifactId>
+        <artifactId>api-ldap-extras-util</artifactId>
         <version>${project.version}</version>
       </dependency>
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-model</artifactId>
+        <artifactId>api-ldap-model</artifactId>
         <version>${project.version}</version>
       </dependency>
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-net-mina</artifactId>
+        <artifactId>api-ldap-net-mina</artifactId>
         <version>${project.version}</version>
       </dependency>
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-schema-converter</artifactId>
+        <artifactId>api-ldap-schema-converter</artifactId>
         <version>${project.version}</version>
       </dependency>
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-schema-data</artifactId>
+        <artifactId>api-ldap-schema-data</artifactId>
         <version>${project.version}</version>
       </dependency>