commit 4dea180ef53ddfb9a51bd53cabe4eb84538812e3
author Hasan <hasan@apache.org> Tue Jul 30 00:32:05 2019 +0200
committer Hasan <hasan@apache.org> Tue Jul 30 00:32:05 2019 +0200
tree 46eff4221f22017ed7f88eee20bacdc32574f146
parent d2c6c5cce147aebe7f41e98a5b0f20f09ae83cd6

CLEREZZA-1044: Rename api.impl

api-implementation/pom.xml

diff --git a/api.impl/pom.xml b/api-implementation/pom.xml
similarity index 97%
rename from api.impl/pom.xml
rename to api-implementation/pom.xml
index 9034432..c313797 100644
--- a/api.impl/pom.xml
+++ b/api-implementation/pom.xml
@@ -27,7 +27,7 @@
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>api.impl</artifactId>
+    <artifactId>api-implementation</artifactId>
     <version>2.0.0</version>
     <packaging>bundle</packaging>
     <name>Clerezza - API Implementation</name>

api-implementation/src/main/java/org/apache/clerezza/implementation/TripleImpl.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/TripleImpl.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/TripleImpl.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/impl/TripleImpl.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/TripleImpl.java
index 87b8e0f..5ee4399 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/TripleImpl.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/TripleImpl.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl;
+package org.apache.clerezza.implementation;
 
 import org.apache.clerezza.BlankNodeOrIRI;
 import org.apache.clerezza.IRI;

api-implementation/src/main/java/org/apache/clerezza/implementation/debug/ReadLockDebug.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/debug/ReadLockDebug.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/debug/ReadLockDebug.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/debug/ReadLockDebug.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/debug/ReadLockDebug.java
index 8eb2f4c..8c4508c 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/debug/ReadLockDebug.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/debug/ReadLockDebug.java
@@ -16,7 +16,7 @@
  * language governing permissions and limitations under  the License.
  */
 
-package org.apache.clerezza.impl.debug;
+package org.apache.clerezza.implementation.debug;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;

api-implementation/src/main/java/org/apache/clerezza/implementation/debug/ReentrantReadWriteLockTracker.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/debug/ReentrantReadWriteLockTracker.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/debug/ReentrantReadWriteLockTracker.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/impl/debug/ReentrantReadWriteLockTracker.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/debug/ReentrantReadWriteLockTracker.java
index 830c300..45b7e20 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/debug/ReentrantReadWriteLockTracker.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/debug/ReentrantReadWriteLockTracker.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.debug;
+package org.apache.clerezza.implementation.debug;
 
 import java.util.Collection;
 import java.util.Collections;

api-implementation/src/main/java/org/apache/clerezza/implementation/debug/WriteLockDebug.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/debug/WriteLockDebug.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/debug/WriteLockDebug.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/debug/WriteLockDebug.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/debug/WriteLockDebug.java
index 5255e83..24355dd 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/debug/WriteLockDebug.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/debug/WriteLockDebug.java
@@ -16,7 +16,7 @@
  * language governing permissions and limitations under  the License.
  */
 
-package org.apache.clerezza.impl.debug;
+package org.apache.clerezza.implementation.debug;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;

api-implementation/src/main/java/org/apache/clerezza/implementation/graph/AbstractGraph.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graph/AbstractGraph.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/AbstractGraph.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graph/AbstractGraph.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graph/AbstractGraph.java
index 7af173c..dafd146 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graph/AbstractGraph.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/AbstractGraph.java
@@ -15,10 +15,10 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graph;
+package org.apache.clerezza.implementation.graph;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.debug.ReentrantReadWriteLockTracker;
+import org.apache.clerezza.implementation.debug.ReentrantReadWriteLockTracker;
 
 import java.util.AbstractCollection;
 import java.util.Collection;

api-implementation/src/main/java/org/apache/clerezza/implementation/graph/AbstractImmutableGraph.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graph/AbstractImmutableGraph.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/AbstractImmutableGraph.java
similarity index 96%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graph/AbstractImmutableGraph.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graph/AbstractImmutableGraph.java
index a8cb7ec..1c5bcdf 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graph/AbstractImmutableGraph.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/AbstractImmutableGraph.java
@@ -15,13 +15,13 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graph;
+package org.apache.clerezza.implementation.graph;
 
 import org.apache.clerezza.RDFTerm;
 import org.apache.clerezza.BlankNode;
 import org.apache.clerezza.ImmutableGraph;
 import org.apache.clerezza.Triple;
-import org.apache.clerezza.impl.graphmatching.GraphMatcher;
+import org.apache.clerezza.implementation.graphmatching.GraphMatcher;
 
 import java.util.Collection;
 import java.util.Iterator;

api-implementation/src/main/java/org/apache/clerezza/implementation/graph/DelayedNotificator.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graph/DelayedNotificator.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/DelayedNotificator.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graph/DelayedNotificator.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graph/DelayedNotificator.java
index 204a75c..66fda0d 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graph/DelayedNotificator.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/DelayedNotificator.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graph;
+package org.apache.clerezza.implementation.graph;
 
 import org.apache.clerezza.event.GraphEvent;
 import org.apache.clerezza.event.GraphListener;

api-implementation/src/main/java/org/apache/clerezza/implementation/graph/LockingIterator.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graph/LockingIterator.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/LockingIterator.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graph/LockingIterator.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graph/LockingIterator.java
index cb7bbd8..735d75c 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graph/LockingIterator.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/LockingIterator.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graph;
+package org.apache.clerezza.implementation.graph;
 
 import org.apache.clerezza.Triple;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/graph/PrivilegedGraphWrapper.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graph/PrivilegedGraphWrapper.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/PrivilegedGraphWrapper.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graph/PrivilegedGraphWrapper.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graph/PrivilegedGraphWrapper.java
index af3b59f..291d1dc 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graph/PrivilegedGraphWrapper.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/PrivilegedGraphWrapper.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graph;
+package org.apache.clerezza.implementation.graph;
 
 import org.apache.clerezza.*;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/graph/PrivilegedImmuatbleGraphWrapper.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graph/PrivilegedImmuatbleGraphWrapper.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/PrivilegedImmuatbleGraphWrapper.java
similarity index 95%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graph/PrivilegedImmuatbleGraphWrapper.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graph/PrivilegedImmuatbleGraphWrapper.java
index 74cee71..3a1b41b 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graph/PrivilegedImmuatbleGraphWrapper.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/PrivilegedImmuatbleGraphWrapper.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graph;
+package org.apache.clerezza.implementation.graph;
 
 import org.apache.clerezza.ImmutableGraph;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/graph/ReadOnlyException.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graph/ReadOnlyException.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/ReadOnlyException.java
similarity index 96%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graph/ReadOnlyException.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graph/ReadOnlyException.java
index 8a0bae0..790684c 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graph/ReadOnlyException.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/ReadOnlyException.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graph;
+package org.apache.clerezza.implementation.graph;
 
 import java.security.AccessControlException;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleGraph.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleGraph.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleGraph.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleGraph.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleGraph.java
index 82ff3e0..4a9d6c4 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleGraph.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleGraph.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graph;
+package org.apache.clerezza.implementation.graph;
 
 import org.apache.clerezza.*;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleImmutableGraph.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleImmutableGraph.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleImmutableGraph.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleImmutableGraph.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleImmutableGraph.java
index c0106b3..e0e9396 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleImmutableGraph.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleImmutableGraph.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graph;
+package org.apache.clerezza.implementation.graph;
 
 import org.apache.clerezza.*;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleMGraph.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleMGraph.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleMGraph.java
similarity index 96%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleMGraph.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleMGraph.java
index c8ce95e..d58b2b9 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleMGraph.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleMGraph.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graph;
+package org.apache.clerezza.implementation.graph;
 
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.Triple;

api-implementation/src/main/java/org/apache/clerezza/implementation/graph/WatchableGraphWrapper.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graph/WatchableGraphWrapper.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/WatchableGraphWrapper.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graph/WatchableGraphWrapper.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graph/WatchableGraphWrapper.java
index 46c8074..15e49ec 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graph/WatchableGraphWrapper.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/WatchableGraphWrapper.java
@@ -17,7 +17,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graph;
+package org.apache.clerezza.implementation.graph;
 
 import org.apache.clerezza.*;
 import org.apache.clerezza.event.*;

api-implementation/src/main/java/org/apache/clerezza/implementation/graph/WriteBlockedGraph.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graph/WriteBlockedGraph.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/WriteBlockedGraph.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graph/WriteBlockedGraph.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graph/WriteBlockedGraph.java
index 28c88ec..2348a15 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graph/WriteBlockedGraph.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/WriteBlockedGraph.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graph;
+package org.apache.clerezza.implementation.graph;
 
 import org.apache.clerezza.*;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GraphMatcher.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GraphMatcher.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GraphMatcher.java
similarity index 96%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GraphMatcher.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GraphMatcher.java
index b92e4a4..a6c8ba6 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GraphMatcher.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GraphMatcher.java
@@ -16,11 +16,11 @@
  * language governing permissions and limitations under  the License.
  */
 
-package org.apache.clerezza.impl.graphmatching;
+package org.apache.clerezza.implementation.graphmatching;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleMGraph;
 
 import java.util.Iterator;
 import java.util.Map;

api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GraphNotIsomorphicException.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GraphNotIsomorphicException.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GraphNotIsomorphicException.java
similarity index 93%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GraphNotIsomorphicException.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GraphNotIsomorphicException.java
index 0b0e4a2..7930e9f 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GraphNotIsomorphicException.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GraphNotIsomorphicException.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graphmatching;
+package org.apache.clerezza.implementation.graphmatching;
 
 /**
  * @author reto

api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GroupMappingIterator.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GroupMappingIterator.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GroupMappingIterator.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GroupMappingIterator.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GroupMappingIterator.java
index 6dfafa2..1c6e27a 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GroupMappingIterator.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GroupMappingIterator.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graphmatching;
+package org.apache.clerezza.implementation.graphmatching;
 
 import java.util.*;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/HashMatching.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/HashMatching.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/HashMatching.java
similarity index 96%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/HashMatching.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/HashMatching.java
index e83d2f1..225a7cf 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/HashMatching.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/HashMatching.java
@@ -16,12 +16,12 @@
  * language governing permissions and limitations under  the License.
  */
 
-package org.apache.clerezza.impl.graphmatching;
+package org.apache.clerezza.implementation.graphmatching;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graphmatching.collections.IntHashMap;
-import org.apache.clerezza.impl.graphmatching.collections.IntIterator;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graphmatching.collections.IntHashMap;
+import org.apache.clerezza.implementation.graphmatching.collections.IntIterator;
 
 import java.util.*;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/MappingIterator.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/MappingIterator.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/MappingIterator.java
similarity index 96%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/MappingIterator.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/MappingIterator.java
index b32b288..f14cd5f 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/MappingIterator.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/MappingIterator.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graphmatching;
+package org.apache.clerezza.implementation.graphmatching;
 
 import java.util.*;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/PermutationIterator.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/PermutationIterator.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/PermutationIterator.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/PermutationIterator.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/PermutationIterator.java
index 9e72aa2..a9982dd 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/PermutationIterator.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/PermutationIterator.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graphmatching;
+package org.apache.clerezza.implementation.graphmatching;
 
 import java.util.*;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/Utils.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/Utils.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/Utils.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/Utils.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/Utils.java
index 8091a4c..81a0bfb 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/Utils.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/Utils.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graphmatching;
+package org.apache.clerezza.implementation.graphmatching;
 
 import org.apache.clerezza.BlankNode;
 import org.apache.clerezza.Triple;

api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntHashMap.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntHashMap.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntHashMap.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntHashMap.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntHashMap.java
index eb17bac..f98b125 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntHashMap.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntHashMap.java
@@ -23,7 +23,7 @@
  * but rereleased by the original author under the ASF license (above).
  */
 
-package org.apache.clerezza.impl.graphmatching.collections;
+package org.apache.clerezza.implementation.graphmatching.collections;
 
 /**
  * <p>A hash map that uses primitive ints for the key rather than objects.</p>

api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntHashSet.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntHashSet.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntHashSet.java
similarity index 96%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntHashSet.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntHashSet.java
index 816f3c4..eaeccb3 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntHashSet.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntHashSet.java
@@ -18,7 +18,7 @@
  * language governing permissions and limitations under  the License.
  */
 
-package org.apache.clerezza.impl.graphmatching.collections;
+package org.apache.clerezza.implementation.graphmatching.collections;
 
 import java.util.HashSet;
 import java.util.Iterator;

api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntIterator.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntIterator.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntIterator.java
similarity index 94%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntIterator.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntIterator.java
index 36e7f62..fe868f3 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntIterator.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntIterator.java
@@ -18,7 +18,7 @@
  * language governing permissions and limitations under  the License.
  */
 
-package org.apache.clerezza.impl.graphmatching.collections;
+package org.apache.clerezza.implementation.graphmatching.collections;
 
 import java.util.Iterator;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntSet.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntSet.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntSet.java
similarity index 94%
rename from api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntSet.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntSet.java
index 55dc375..cb24ebe 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntSet.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/collections/IntSet.java
@@ -18,7 +18,7 @@
  * language governing permissions and limitations under  the License.
  */
 
-package org.apache.clerezza.impl.graphmatching.collections;
+package org.apache.clerezza.implementation.graphmatching.collections;
 
 import java.util.Set;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/literal/AbstractLiteral.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/literal/AbstractLiteral.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/AbstractLiteral.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/literal/AbstractLiteral.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/literal/AbstractLiteral.java
index e4babaa..a500c1a 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/literal/AbstractLiteral.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/AbstractLiteral.java
@@ -17,7 +17,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.literal;
+package org.apache.clerezza.implementation.literal;
 
 import org.apache.clerezza.Literal;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/literal/InvalidLiteralTypeException.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/literal/InvalidLiteralTypeException.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/InvalidLiteralTypeException.java
similarity index 96%
rename from api.impl/src/main/java/org/apache/clerezza/impl/literal/InvalidLiteralTypeException.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/literal/InvalidLiteralTypeException.java
index 201eb36..afed2f2 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/literal/InvalidLiteralTypeException.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/InvalidLiteralTypeException.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.literal;
+package org.apache.clerezza.implementation.literal;
 
 import org.apache.clerezza.IRI;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/literal/LiteralFactory.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/literal/LiteralFactory.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/LiteralFactory.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/literal/LiteralFactory.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/literal/LiteralFactory.java
index c6939f2..f6ee742 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/literal/LiteralFactory.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/LiteralFactory.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.literal;
+package org.apache.clerezza.implementation.literal;
 
 import org.apache.clerezza.Literal;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/literal/LiteralImpl.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/literal/LiteralImpl.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/LiteralImpl.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/literal/LiteralImpl.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/literal/LiteralImpl.java
index 083af73..d87013f 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/literal/LiteralImpl.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/LiteralImpl.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.literal;
+package org.apache.clerezza.implementation.literal;
 
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.Language;

api-implementation/src/main/java/org/apache/clerezza/implementation/literal/NoConvertorException.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/literal/NoConvertorException.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/NoConvertorException.java
similarity index 96%
rename from api.impl/src/main/java/org/apache/clerezza/impl/literal/NoConvertorException.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/literal/NoConvertorException.java
index 8c5e59f..c2c7b9e 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/literal/NoConvertorException.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/NoConvertorException.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.literal;
+package org.apache.clerezza.implementation.literal;
 
 import java.lang.reflect.Type;
 

api-implementation/src/main/java/org/apache/clerezza/implementation/literal/PlainLiteralImpl.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/literal/PlainLiteralImpl.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/PlainLiteralImpl.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/literal/PlainLiteralImpl.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/literal/PlainLiteralImpl.java
index 8b57607..b205f93 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/literal/PlainLiteralImpl.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/PlainLiteralImpl.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.literal;
+package org.apache.clerezza.implementation.literal;
 
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.Language;

api-implementation/src/main/java/org/apache/clerezza/implementation/literal/SimpleLiteralFactory.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/literal/SimpleLiteralFactory.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/SimpleLiteralFactory.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/literal/SimpleLiteralFactory.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/literal/SimpleLiteralFactory.java
index 8706a4d..6ddc682 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/literal/SimpleLiteralFactory.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/SimpleLiteralFactory.java
@@ -15,12 +15,12 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.literal;
+package org.apache.clerezza.implementation.literal;
 
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.Literal;
-import org.apache.clerezza.impl.util.Base64;
-import org.apache.clerezza.impl.util.W3CDateFormat;
+import org.apache.clerezza.implementation.util.Base64;
+import org.apache.clerezza.implementation.util.W3CDateFormat;
 
 import java.math.BigInteger;
 import java.text.DateFormat;

api-implementation/src/main/java/org/apache/clerezza/implementation/literal/TypedLiteralImpl.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/literal/TypedLiteralImpl.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/TypedLiteralImpl.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/impl/literal/TypedLiteralImpl.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/literal/TypedLiteralImpl.java
index 75c7536..7fd5921 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/literal/TypedLiteralImpl.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/literal/TypedLiteralImpl.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.literal;
+package org.apache.clerezza.implementation.literal;
 
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.Language;

api-implementation/src/main/java/org/apache/clerezza/implementation/package-info.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/package-info.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/package-info.java
similarity index 94%
rename from api.impl/src/main/java/org/apache/clerezza/impl/package-info.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/package-info.java
index c378f13..c0bab7b 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/package-info.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/package-info.java
@@ -15,4 +15,4 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl;
\ No newline at end of file
+package org.apache.clerezza.implementation;
\ No newline at end of file

api-implementation/src/main/java/org/apache/clerezza/implementation/util/Base64.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/util/Base64.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/util/Base64.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/impl/util/Base64.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/util/Base64.java
index ec453e1..921710f 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/util/Base64.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/util/Base64.java
@@ -20,7 +20,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.util;
+package org.apache.clerezza.implementation.util;
 
 public class Base64 {
 

api-implementation/src/main/java/org/apache/clerezza/implementation/util/W3CDateFormat.java

diff --git a/api.impl/src/main/java/org/apache/clerezza/impl/util/W3CDateFormat.java b/api-implementation/src/main/java/org/apache/clerezza/implementation/util/W3CDateFormat.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/impl/util/W3CDateFormat.java
rename to api-implementation/src/main/java/org/apache/clerezza/implementation/util/W3CDateFormat.java
index 0d8c024..bf7aca1 100644
--- a/api.impl/src/main/java/org/apache/clerezza/impl/util/W3CDateFormat.java
+++ b/api-implementation/src/main/java/org/apache/clerezza/implementation/util/W3CDateFormat.java
@@ -23,7 +23,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.util;
+package org.apache.clerezza.implementation.util;
 
 import java.text.DateFormat;
 import java.text.FieldPosition;

api-implementation/src/test/java/org/apache/clerezza/implementation/LanguageTest.java

diff --git a/api.impl/src/test/java/org/apache/clerezza/impl/LanguageTest.java b/api-implementation/src/test/java/org/apache/clerezza/implementation/LanguageTest.java
similarity index 96%
rename from api.impl/src/test/java/org/apache/clerezza/impl/LanguageTest.java
rename to api-implementation/src/test/java/org/apache/clerezza/implementation/LanguageTest.java
index aa2e42e..06a8f50 100644
--- a/api.impl/src/test/java/org/apache/clerezza/impl/LanguageTest.java
+++ b/api-implementation/src/test/java/org/apache/clerezza/implementation/LanguageTest.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl;
+package org.apache.clerezza.implementation;
 
 import org.apache.clerezza.Language;
 import org.junit.Assert;

api-implementation/src/test/java/org/apache/clerezza/implementation/UriRefTest.java

diff --git a/api.impl/src/test/java/org/apache/clerezza/impl/UriRefTest.java b/api-implementation/src/test/java/org/apache/clerezza/implementation/UriRefTest.java
similarity index 97%
rename from api.impl/src/test/java/org/apache/clerezza/impl/UriRefTest.java
rename to api-implementation/src/test/java/org/apache/clerezza/implementation/UriRefTest.java
index 3390c1d..a484094 100644
--- a/api.impl/src/test/java/org/apache/clerezza/impl/UriRefTest.java
+++ b/api-implementation/src/test/java/org/apache/clerezza/implementation/UriRefTest.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl;
+package org.apache.clerezza.implementation;
 
 import org.apache.clerezza.IRI;
 import org.junit.Assert;

api-implementation/src/test/java/org/apache/clerezza/implementation/graph/GraphTest.java

diff --git a/api.impl/src/test/java/org/apache/clerezza/impl/graph/GraphTest.java b/api-implementation/src/test/java/org/apache/clerezza/implementation/graph/GraphTest.java
similarity index 98%
rename from api.impl/src/test/java/org/apache/clerezza/impl/graph/GraphTest.java
rename to api-implementation/src/test/java/org/apache/clerezza/implementation/graph/GraphTest.java
index 257e41a..c3a00b5 100644
--- a/api.impl/src/test/java/org/apache/clerezza/impl/graph/GraphTest.java
+++ b/api-implementation/src/test/java/org/apache/clerezza/implementation/graph/GraphTest.java
@@ -15,12 +15,12 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graph;
+package org.apache.clerezza.implementation.graph;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.literal.PlainLiteralImpl;
-import org.apache.clerezza.impl.literal.TypedLiteralImpl;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
+import org.apache.clerezza.implementation.literal.TypedLiteralImpl;
 import org.junit.Assert;
 import org.junit.Test;
 

api-implementation/src/test/java/org/apache/clerezza/implementation/graph/SimpleGraphTest.java

diff --git a/api.impl/src/test/java/org/apache/clerezza/impl/graph/SimpleGraphTest.java b/api-implementation/src/test/java/org/apache/clerezza/implementation/graph/SimpleGraphTest.java
similarity index 96%
rename from api.impl/src/test/java/org/apache/clerezza/impl/graph/SimpleGraphTest.java
rename to api-implementation/src/test/java/org/apache/clerezza/implementation/graph/SimpleGraphTest.java
index b5cbb64..e4f504d 100644
--- a/api.impl/src/test/java/org/apache/clerezza/impl/graph/SimpleGraphTest.java
+++ b/api-implementation/src/test/java/org/apache/clerezza/implementation/graph/SimpleGraphTest.java
@@ -15,11 +15,11 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graph;
+package org.apache.clerezza.implementation.graph;
 
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.Triple;
-import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.implementation.TripleImpl;
 import org.junit.Assert;
 import org.junit.Test;
 

api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/GraphMatcherTest.java

diff --git a/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/GraphMatcherTest.java b/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/GraphMatcherTest.java
similarity index 97%
rename from api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/GraphMatcherTest.java
rename to api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/GraphMatcherTest.java
index b426651..d39660c 100644
--- a/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/GraphMatcherTest.java
+++ b/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/GraphMatcherTest.java
@@ -15,14 +15,14 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.graphmatching;
+package org.apache.clerezza.implementation.graphmatching;
 
 import org.apache.clerezza.BlankNodeOrIRI;
 import org.apache.clerezza.BlankNode;
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleMGraph;
 import org.junit.Assert;
 import org.junit.Test;
 

api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/HashMatchingTest.java

diff --git a/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/HashMatchingTest.java b/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/HashMatchingTest.java
similarity index 96%
rename from api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/HashMatchingTest.java
rename to api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/HashMatchingTest.java
index b0bf75a..9dc1109 100644
--- a/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/HashMatchingTest.java
+++ b/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/HashMatchingTest.java
@@ -16,7 +16,7 @@
  * language governing permissions and limitations under  the License.
  */
 
-package org.apache.clerezza.impl.graphmatching;
+package org.apache.clerezza.implementation.graphmatching;
 
 import org.apache.clerezza.BlankNodeOrIRI;
 import org.apache.clerezza.BlankNode;

api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/PermutationIteratorTest.java

diff --git a/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/PermutationIteratorTest.java b/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/PermutationIteratorTest.java
similarity index 97%
rename from api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/PermutationIteratorTest.java
rename to api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/PermutationIteratorTest.java
index baf1ebe..a05ab69 100644
--- a/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/PermutationIteratorTest.java
+++ b/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/PermutationIteratorTest.java
@@ -16,7 +16,7 @@
  * language governing permissions and limitations under  the License.
  */
 
-package org.apache.clerezza.impl.graphmatching;
+package org.apache.clerezza.implementation.graphmatching;
 
 import org.junit.Assert;
 import org.junit.Test;

api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/Utils4Testing.java

diff --git a/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/Utils4Testing.java b/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/Utils4Testing.java
similarity index 89%
rename from api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/Utils4Testing.java
rename to api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/Utils4Testing.java
index dc3c428..d8b5c2c 100644
--- a/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/Utils4Testing.java
+++ b/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/Utils4Testing.java
@@ -16,14 +16,14 @@
  * language governing permissions and limitations under  the License.
  */
 
-package org.apache.clerezza.impl.graphmatching;
+package org.apache.clerezza.implementation.graphmatching;
 
 import org.apache.clerezza.BlankNode;
 import org.apache.clerezza.BlankNodeOrIRI;
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleMGraph;
 
 /**
  * @author reto

api-implementation/src/test/java/org/apache/clerezza/implementation/literal/LiteralFactoryTest.java

diff --git a/api.impl/src/test/java/org/apache/clerezza/impl/literal/LiteralFactoryTest.java b/api-implementation/src/test/java/org/apache/clerezza/implementation/literal/LiteralFactoryTest.java
similarity index 98%
rename from api.impl/src/test/java/org/apache/clerezza/impl/literal/LiteralFactoryTest.java
rename to api-implementation/src/test/java/org/apache/clerezza/implementation/literal/LiteralFactoryTest.java
index 435b4ed..36695d2 100644
--- a/api.impl/src/test/java/org/apache/clerezza/impl/literal/LiteralFactoryTest.java
+++ b/api-implementation/src/test/java/org/apache/clerezza/implementation/literal/LiteralFactoryTest.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.literal;
+package org.apache.clerezza.implementation.literal;
 
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.Literal;

api-implementation/src/test/java/org/apache/clerezza/implementation/literal/PlainLiteralImplTest.java

diff --git a/api.impl/src/test/java/org/apache/clerezza/impl/literal/PlainLiteralImplTest.java b/api-implementation/src/test/java/org/apache/clerezza/implementation/literal/PlainLiteralImplTest.java
similarity index 97%
rename from api.impl/src/test/java/org/apache/clerezza/impl/literal/PlainLiteralImplTest.java
rename to api-implementation/src/test/java/org/apache/clerezza/implementation/literal/PlainLiteralImplTest.java
index 2bd20b9..2cd0786 100644
--- a/api.impl/src/test/java/org/apache/clerezza/impl/literal/PlainLiteralImplTest.java
+++ b/api-implementation/src/test/java/org/apache/clerezza/implementation/literal/PlainLiteralImplTest.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.literal;
+package org.apache.clerezza.implementation.literal;
 
 import org.apache.clerezza.Language;
 import org.apache.clerezza.Literal;

api-implementation/src/test/java/org/apache/clerezza/implementation/literal/TripleImplTest.java

diff --git a/api.impl/src/test/java/org/apache/clerezza/impl/literal/TripleImplTest.java b/api-implementation/src/test/java/org/apache/clerezza/implementation/literal/TripleImplTest.java
similarity index 93%
rename from api.impl/src/test/java/org/apache/clerezza/impl/literal/TripleImplTest.java
rename to api-implementation/src/test/java/org/apache/clerezza/implementation/literal/TripleImplTest.java
index 1abde41..39dc6a7 100644
--- a/api.impl/src/test/java/org/apache/clerezza/impl/literal/TripleImplTest.java
+++ b/api-implementation/src/test/java/org/apache/clerezza/implementation/literal/TripleImplTest.java
@@ -15,14 +15,14 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.literal;
+package org.apache.clerezza.implementation.literal;
 
 import junit.framework.Assert;
 import org.apache.clerezza.BlankNodeOrIRI;
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.RDFTerm;
 import org.apache.clerezza.Triple;
-import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.implementation.TripleImpl;
 import org.junit.Test;
 
 /**

api-implementation/src/test/java/org/apache/clerezza/implementation/literal/TypedLiteralImplTest.java

diff --git a/api.impl/src/test/java/org/apache/clerezza/impl/literal/TypedLiteralImplTest.java b/api-implementation/src/test/java/org/apache/clerezza/implementation/literal/TypedLiteralImplTest.java
similarity index 97%
rename from api.impl/src/test/java/org/apache/clerezza/impl/literal/TypedLiteralImplTest.java
rename to api-implementation/src/test/java/org/apache/clerezza/implementation/literal/TypedLiteralImplTest.java
index 50e5450..1928fed 100644
--- a/api.impl/src/test/java/org/apache/clerezza/impl/literal/TypedLiteralImplTest.java
+++ b/api-implementation/src/test/java/org/apache/clerezza/implementation/literal/TypedLiteralImplTest.java
@@ -15,7 +15,7 @@
  * either  express  or implied.  See  the License  for  the  specific
  * language governing permissions and limitations under  the License.
  */
-package org.apache.clerezza.impl.literal;
+package org.apache.clerezza.implementation.literal;
 
 import junit.framework.Assert;
 import org.apache.clerezza.Literal;

api.utils/pom.xml

diff --git a/api.utils/pom.xml b/api.utils/pom.xml
index 5cc4235..837b7f8 100644
--- a/api.utils/pom.xml
+++ b/api.utils/pom.xml
@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
-            <artifactId>api.impl</artifactId>
+            <artifactId>api-implementation</artifactId>
             <version>2.0.0</version>
         </dependency>
         <dependency>

api.utils/src/main/java/org/apache/clerezza/utils/GraphNode.java

diff --git a/api.utils/src/main/java/org/apache/clerezza/utils/GraphNode.java b/api.utils/src/main/java/org/apache/clerezza/utils/GraphNode.java
index a3151b4..73def9d 100644
--- a/api.utils/src/main/java/org/apache/clerezza/utils/GraphNode.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/GraphNode.java
@@ -18,9 +18,9 @@
 package org.apache.clerezza.utils;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleGraph;
-import org.apache.clerezza.impl.literal.LiteralFactory;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.literal.LiteralFactory;
 
 import java.util.*;
 import java.util.concurrent.locks.Lock;

api.utils/src/main/java/org/apache/clerezza/utils/GraphUtils.java

diff --git a/api.utils/src/main/java/org/apache/clerezza/utils/GraphUtils.java b/api.utils/src/main/java/org/apache/clerezza/utils/GraphUtils.java
index 070b362..0c349cd 100644
--- a/api.utils/src/main/java/org/apache/clerezza/utils/GraphUtils.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/GraphUtils.java
@@ -18,7 +18,7 @@
 package org.apache.clerezza.utils;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
 
 import java.util.HashSet;
 import java.util.Iterator;

api.utils/src/main/java/org/apache/clerezza/utils/RdfList.java

diff --git a/api.utils/src/main/java/org/apache/clerezza/utils/RdfList.java b/api.utils/src/main/java/org/apache/clerezza/utils/RdfList.java
index cdb6f29..3b2a359 100644
--- a/api.utils/src/main/java/org/apache/clerezza/utils/RdfList.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/RdfList.java
@@ -18,7 +18,7 @@
 package org.apache.clerezza.utils;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.implementation.TripleImpl;
 import org.apache.clerezza.ontologies.OWL;
 import org.apache.clerezza.ontologies.RDF;
 import org.apache.clerezza.representation.Serializer;

api.utils/src/main/java/org/apache/clerezza/utils/UnionGraph.java

diff --git a/api.utils/src/main/java/org/apache/clerezza/utils/UnionGraph.java b/api.utils/src/main/java/org/apache/clerezza/utils/UnionGraph.java
index 30703d6..33407c8 100644
--- a/api.utils/src/main/java/org/apache/clerezza/utils/UnionGraph.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/UnionGraph.java
@@ -18,7 +18,7 @@
 package org.apache.clerezza.utils;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.graph.AbstractGraph;
+import org.apache.clerezza.implementation.graph.AbstractGraph;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;

api.utils/src/main/java/org/apache/clerezza/utils/UriMutatingGraph.java

diff --git a/api.utils/src/main/java/org/apache/clerezza/utils/UriMutatingGraph.java b/api.utils/src/main/java/org/apache/clerezza/utils/UriMutatingGraph.java
index da698a5..39073c4 100644
--- a/api.utils/src/main/java/org/apache/clerezza/utils/UriMutatingGraph.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/UriMutatingGraph.java
@@ -18,8 +18,8 @@
 package org.apache.clerezza.utils;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleImmutableGraph;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleImmutableGraph;
 
 import java.util.Collection;
 import java.util.Iterator;

api.utils/src/main/java/org/apache/clerezza/utils/smushing/BaseSmusher.java

diff --git a/api.utils/src/main/java/org/apache/clerezza/utils/smushing/BaseSmusher.java b/api.utils/src/main/java/org/apache/clerezza/utils/smushing/BaseSmusher.java
index fe9f65b..c58c964 100644
--- a/api.utils/src/main/java/org/apache/clerezza/utils/smushing/BaseSmusher.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/smushing/BaseSmusher.java
@@ -18,8 +18,8 @@
 package org.apache.clerezza.utils.smushing;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
 import org.apache.clerezza.ontologies.OWL;
 
 import java.util.*;

api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzLiteral.scala

diff --git a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzLiteral.scala b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzLiteral.scala
index 3abef97..eac171e 100644
--- a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzLiteral.scala
+++ b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzLiteral.scala
@@ -18,8 +18,8 @@
 package org.apache.clerezza.scala.utils
 
 import org.apache.clerezza.{IRI, Language, Literal}
-import org.apache.clerezza.impl.literal._
-import org.apache.clerezza.impl.literal.{PlainLiteralImpl, TypedLiteralImpl}
+import org.apache.clerezza.implementation.literal._
+import org.apache.clerezza.implementation.literal.{PlainLiteralImpl, TypedLiteralImpl}
 import org.apache.clerezza.ontologies.XSD
 
 object EzLiteral extends EzLiteralImplicits

api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzMGraph.scala

diff --git a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzMGraph.scala b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzMGraph.scala
index 27bbf8c..9da6c3c 100644
--- a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzMGraph.scala
+++ b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzMGraph.scala
@@ -19,8 +19,8 @@
 
 import org.apache.clerezza
 import org.apache.clerezza._
-import org.apache.clerezza.impl.graph._
-import org.apache.clerezza.impl.graph.{AbstractGraph, SimpleGraph}
+import org.apache.clerezza.implementation.graph._
+import org.apache.clerezza.implementation.graph.{AbstractGraph, SimpleGraph}
 
 import _root_.scala.collection.mutable.HashMap
 

api.utils/src/main/scala/org/apache/clerezza/scala/utils/Preamble.scala

diff --git a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/Preamble.scala b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/Preamble.scala
index ad2b551..41fb1f8 100644
--- a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/Preamble.scala
+++ b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/Preamble.scala
@@ -23,11 +23,11 @@
 
 import org.apache.clerezza.{Graph, IRI, Literal, RDFTerm}
 import org.apache.clerezza._
-import org.apache.clerezza.impl.graph._
-import org.apache.clerezza.impl.literal._
+import org.apache.clerezza.implementation.graph._
+import org.apache.clerezza.implementation.literal._
 import org.apache.clerezza.utils.GraphNode
-import org.apache.clerezza.impl.graph.{SimpleGraph, SimpleImmutableGraph}
-import org.apache.clerezza.impl.literal.{LiteralFactory, PlainLiteralImpl}
+import org.apache.clerezza.implementation.graph.{SimpleGraph, SimpleImmutableGraph}
+import org.apache.clerezza.implementation.literal.{LiteralFactory, PlainLiteralImpl}
 import org.apache.clerezza.utils.GraphNode
 
 /**

api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala

diff --git a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala
index 72e1252..994904f 100644
--- a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala
+++ b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala
@@ -21,11 +21,11 @@
 
 import org.apache.clerezza.{Graph, IRI, Literal, RDFTerm}
 import org.apache.clerezza._
-import org.apache.clerezza.impl.graph.SimpleGraph
-import org.apache.clerezza.impl.literal.LiteralFactory
+import org.apache.clerezza.implementation.graph.SimpleGraph
+import org.apache.clerezza.implementation.literal.LiteralFactory
 import org.apache.clerezza.utils.{GraphNode, UnionGraph}
-import org.apache.clerezza.impl.graph.SimpleGraph
-import org.apache.clerezza.impl.literal.LiteralFactory
+import org.apache.clerezza.implementation.graph.SimpleGraph
+import org.apache.clerezza.implementation.literal.LiteralFactory
 import org.apache.clerezza.ontologies.RDF
 import org.apache.clerezza.utils.{GraphNode, UnionGraph}
 

api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java

diff --git a/api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java b/api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java
index 931c148..f7844c4 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java
@@ -20,8 +20,8 @@
 import org.apache.clerezza.BlankNode;
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
 import org.junit.Assert;
 import org.junit.Test;
 

api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java

diff --git a/api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java b/api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java
index bcc4250..2380f3f 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java
@@ -20,9 +20,9 @@
 import org.apache.clerezza.BlankNode;
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleGraph;
-import org.apache.clerezza.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
 import org.apache.clerezza.ontologies.FOAF;
 import org.apache.clerezza.ontologies.OWL;
 import org.apache.clerezza.ontologies.RDF;

api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java

diff --git a/api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java b/api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java
index 9b65b45..889899e 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java
@@ -22,8 +22,8 @@
 import org.apache.clerezza.BlankNode;
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
-import org.apache.clerezza.impl.graph.SimpleGraph;
-import org.apache.clerezza.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
 import org.junit.Test;
 
 import java.util.List;

api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java

diff --git a/api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java b/api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java
index 9bc99f4..bf4f5c9 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java
@@ -21,9 +21,9 @@
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.Literal;
 import org.apache.clerezza.Triple;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleGraph;
-import org.apache.clerezza.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
 import org.apache.clerezza.ontologies.FOAF;
 import org.apache.clerezza.ontologies.OWL;
 import org.apache.clerezza.ontologies.RDFS;

api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java

diff --git a/api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java b/api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java
index 1a628c9..e3801f5 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java
@@ -19,9 +19,9 @@
 
 import junit.framework.Assert;
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleGraph;
-import org.apache.clerezza.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
 import org.apache.clerezza.test.utils.RandomGraph;
 import org.junit.Test;
 

api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java

diff --git a/api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java b/api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java
index 7c47bfc..39458d1 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java
@@ -21,8 +21,8 @@
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.Triple;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
 import org.junit.Assert;
 import org.junit.Test;
 

api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java

diff --git a/api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java b/api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java
index 2a3b350..1378353 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java
@@ -21,9 +21,9 @@
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.Literal;
 import org.apache.clerezza.Triple;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleGraph;
-import org.apache.clerezza.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
 import org.apache.clerezza.ontologies.FOAF;
 import org.apache.clerezza.ontologies.OWL;
 import org.apache.clerezza.ontologies.RDFS;

api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala

diff --git a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala
index 7d170c4..489cccf 100644
--- a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala
+++ b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala
@@ -18,13 +18,13 @@
 package org.apache.clerezza.scala.utils
 
 import org.apache.clerezza._
-import org.apache.clerezza.impl._
-import org.apache.clerezza.impl.literal._
+import org.apache.clerezza.implementation._
+import org.apache.clerezza.implementation.literal._
 import Preamble._
 import org.apache.clerezza.{BlankNode, IRI, ImmutableGraph, Language}
-import org.apache.clerezza.impl.TripleImpl
-import org.apache.clerezza.impl.graph.SimpleGraph
-import org.apache.clerezza.impl.literal.{LiteralFactory, PlainLiteralImpl, TypedLiteralImpl}
+import org.apache.clerezza.implementation.TripleImpl
+import org.apache.clerezza.implementation.graph.SimpleGraph
+import org.apache.clerezza.implementation.literal.{LiteralFactory, PlainLiteralImpl, TypedLiteralImpl}
 import org.apache.clerezza.ontologies._
 import org.junit._
 

api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala

diff --git a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala
index a244278..fe9cf23 100644
--- a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala
+++ b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala
@@ -18,15 +18,15 @@
 package org.apache.clerezza.scala.utils
 
 import org.apache.clerezza._
-import org.apache.clerezza.impl._
-import org.apache.clerezza.impl.graph._
-import org.apache.clerezza.impl.literal._
+import org.apache.clerezza.implementation._
+import org.apache.clerezza.implementation.graph._
+import org.apache.clerezza.implementation.literal._
 import Preamble._
 import org.apache.clerezza._
 import org.apache.clerezza.utils._
-import org.apache.clerezza.impl.TripleImpl
-import org.apache.clerezza.impl.graph.SimpleGraph
-import org.apache.clerezza.impl.literal.{PlainLiteralImpl, TypedLiteralImpl}
+import org.apache.clerezza.implementation.TripleImpl
+import org.apache.clerezza.implementation.graph.SimpleGraph
+import org.apache.clerezza.implementation.literal.{PlainLiteralImpl, TypedLiteralImpl}
 import org.apache.clerezza.ontologies._
 import org.apache.clerezza.utils.{GraphNode, RdfList}
 import org.junit._

api.utils/src/test/scala/org/apache/clerezza/scala/utils/TypeConversionTest.scala

diff --git a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/TypeConversionTest.scala b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/TypeConversionTest.scala
index e6258fb..eef9510 100644
--- a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/TypeConversionTest.scala
+++ b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/TypeConversionTest.scala
@@ -19,10 +19,10 @@
 
 import org.apache.clerezza.{IRI, Language}
 import org.apache.clerezza._
-import org.apache.clerezza.impl._
-import org.apache.clerezza.impl.literal._
-import org.apache.clerezza.impl.TripleImpl
-import org.apache.clerezza.impl.literal.{LiteralFactory, PlainLiteralImpl, TypedLiteralImpl}
+import org.apache.clerezza.implementation._
+import org.apache.clerezza.implementation.literal._
+import org.apache.clerezza.implementation.TripleImpl
+import org.apache.clerezza.implementation.literal.{LiteralFactory, PlainLiteralImpl, TypedLiteralImpl}
 import org.junit._
 
 class TypeConversionTest {

dataset/pom.xml

diff --git a/dataset/pom.xml b/dataset/pom.xml
index b3492d9..d1e8430 100644
--- a/dataset/pom.xml
+++ b/dataset/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
-            <artifactId>api.impl</artifactId>
+            <artifactId>api-implementation</artifactId>
             <version>2.0.0</version>
         </dependency>
         <dependency>

dataset/src/main/java/org/apache/clerezza/dataset/SecuredGraph.java

diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/SecuredGraph.java b/dataset/src/main/java/org/apache/clerezza/dataset/SecuredGraph.java
index 595b3fc..c667ed4 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/SecuredGraph.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/SecuredGraph.java
@@ -19,8 +19,8 @@
 package org.apache.clerezza.dataset;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.graph.SimpleImmutableGraph;
-import org.apache.clerezza.impl.graph.WriteBlockedGraph;
+import org.apache.clerezza.implementation.graph.SimpleImmutableGraph;
+import org.apache.clerezza.implementation.graph.WriteBlockedGraph;
 import org.apache.clerezza.dataset.security.TcAccessController;
 
 import java.security.AccessControlException;

dataset/src/main/java/org/apache/clerezza/dataset/TcManager.java

diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/TcManager.java b/dataset/src/main/java/org/apache/clerezza/dataset/TcManager.java
index 760b705..39afc95 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/TcManager.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/TcManager.java
@@ -21,8 +21,8 @@
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.ImmutableGraph;
-import org.apache.clerezza.impl.graph.SimpleGraph;
-import org.apache.clerezza.impl.graph.WriteBlockedGraph;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.graph.WriteBlockedGraph;
 import org.apache.clerezza.dataset.security.TcAccessController;
 import org.apache.clerezza.sparql.*;
 import org.apache.clerezza.sparql.query.*;

dataset/src/main/java/org/apache/clerezza/dataset/security/TcAccessController.java

diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/security/TcAccessController.java b/dataset/src/main/java/org/apache/clerezza/dataset/security/TcAccessController.java
index 1080340..19b85d0 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/security/TcAccessController.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/security/TcAccessController.java
@@ -18,8 +18,8 @@
 package org.apache.clerezza.dataset.security;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.literal.LiteralFactory;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.literal.LiteralFactory;
 import org.apache.clerezza.dataset.NoSuchEntityException;
 import org.apache.clerezza.dataset.TcManager;
 

dataset/src/main/java/org/apache/clerezza/simple/storage/SimpleTcProvider.java

diff --git a/dataset/src/main/java/org/apache/clerezza/simple/storage/SimpleTcProvider.java b/dataset/src/main/java/org/apache/clerezza/simple/storage/SimpleTcProvider.java
index 985ae60..dd09b0b 100644
--- a/dataset/src/main/java/org/apache/clerezza/simple/storage/SimpleTcProvider.java
+++ b/dataset/src/main/java/org/apache/clerezza/simple/storage/SimpleTcProvider.java
@@ -21,8 +21,8 @@
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.ImmutableGraph;
-import org.apache.clerezza.impl.graph.SimpleGraph;
-import org.apache.clerezza.impl.graph.SimpleImmutableGraph;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.graph.SimpleImmutableGraph;
 import org.apache.clerezza.dataset.*;
 import org.osgi.service.component.annotations.Component;
 

dataset/src/test/java/org/apache/clerezza/dataset/SecurityTest.java

diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/SecurityTest.java b/dataset/src/test/java/org/apache/clerezza/dataset/SecurityTest.java
index a6288b0..1e0383d 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/SecurityTest.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/SecurityTest.java
@@ -21,9 +21,9 @@
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.Triple;
-import org.apache.clerezza.impl.graph.ReadOnlyException;
-import org.apache.clerezza.impl.literal.PlainLiteralImpl;
-import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.implementation.graph.ReadOnlyException;
+import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
+import org.apache.clerezza.implementation.TripleImpl;
 import org.apache.clerezza.dataset.providers.WeightedA;
 import org.apache.clerezza.dataset.providers.WeightedDummy;
 import org.apache.clerezza.dataset.security.TcPermission;

dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java

diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java b/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java
index 44d12b6..f301639 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java
@@ -22,8 +22,8 @@
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.ImmutableGraph;
 import org.apache.clerezza.Triple;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleMGraph;
 import org.apache.clerezza.dataset.providers.WeightedA;
 import org.apache.clerezza.dataset.providers.WeightedA1;
 import org.apache.clerezza.dataset.providers.WeightedAHeavy;

dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA.java

diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA.java b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA.java
index 69f1281..25cdaad 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA.java
@@ -21,8 +21,8 @@
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.ImmutableGraph;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleMGraph;
 import org.apache.clerezza.dataset.EntityUndeletableException;
 import org.apache.clerezza.dataset.NoSuchEntityException;
 import org.apache.clerezza.dataset.TcManagerTest;

dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA1.java

diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA1.java b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA1.java
index 45475f0..ea42d24 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA1.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA1.java
@@ -21,8 +21,8 @@
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.ImmutableGraph;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleMGraph;
 import org.apache.clerezza.dataset.EntityUndeletableException;
 import org.apache.clerezza.dataset.NoSuchEntityException;
 import org.apache.clerezza.dataset.TcManagerTest;

dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedAHeavy.java

diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedAHeavy.java b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedAHeavy.java
index c20abe9..ed4c8fd 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedAHeavy.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedAHeavy.java
@@ -21,8 +21,8 @@
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.ImmutableGraph;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
 import org.apache.clerezza.dataset.EntityUndeletableException;
 import org.apache.clerezza.dataset.NoSuchEntityException;
 import org.apache.clerezza.dataset.TcManagerTest;

dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedBlight.java

diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedBlight.java b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedBlight.java
index 582ad30..0ffca3c 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedBlight.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedBlight.java
@@ -21,8 +21,8 @@
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.ImmutableGraph;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleMGraph;
 import org.apache.clerezza.dataset.EntityUndeletableException;
 import org.apache.clerezza.dataset.NoSuchEntityException;
 import org.apache.clerezza.dataset.TcManagerTest;

dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedDummy.java

diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedDummy.java b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedDummy.java
index d5226c3..c565914 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedDummy.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedDummy.java
@@ -21,8 +21,8 @@
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.ImmutableGraph;
-import org.apache.clerezza.impl.graph.SimpleImmutableGraph;
-import org.apache.clerezza.impl.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.graph.SimpleImmutableGraph;
+import org.apache.clerezza.implementation.graph.SimpleMGraph;
 import org.apache.clerezza.dataset.EntityAlreadyExistsException;
 import org.apache.clerezza.dataset.EntityUndeletableException;
 import org.apache.clerezza.dataset.NoSuchEntityException;

dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java

diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java b/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java
index 4bd91f3..7651a0b 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java
@@ -19,8 +19,8 @@
 package org.apache.clerezza.dataset.test.utils;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
 import org.apache.clerezza.dataset.EntityAlreadyExistsException;
 import org.apache.clerezza.dataset.NoSuchEntityException;
 import org.apache.clerezza.dataset.TcProvider;

dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java

diff --git a/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java b/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java
index 3773070..d1894d8 100644
--- a/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java
+++ b/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java
@@ -20,7 +20,7 @@
 
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
-import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
 import org.apache.clerezza.dataset.TcManager;
 import org.junit.Assert;
 import org.junit.Test;

dataset/src/test/java/org/apache/clerezza/simple/storage/SimpleGraphGenericTest.java

diff --git a/dataset/src/test/java/org/apache/clerezza/simple/storage/SimpleGraphGenericTest.java b/dataset/src/test/java/org/apache/clerezza/simple/storage/SimpleGraphGenericTest.java
index a789ad1..941a8ac 100644
--- a/dataset/src/test/java/org/apache/clerezza/simple/storage/SimpleGraphGenericTest.java
+++ b/dataset/src/test/java/org/apache/clerezza/simple/storage/SimpleGraphGenericTest.java
@@ -19,7 +19,7 @@
 package org.apache.clerezza.simple.storage;
 
 import org.apache.clerezza.Graph;
-import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
 import org.apache.clerezza.test.utils.GraphTest;
 
 /**

jaxrs.rdf.providers/pom.xml

diff --git a/jaxrs.rdf.providers/pom.xml b/jaxrs.rdf.providers/pom.xml
index f0916e7..8ac11b5 100644
--- a/jaxrs.rdf.providers/pom.xml
+++ b/jaxrs.rdf.providers/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
-            <artifactId>api.impl</artifactId>
+            <artifactId>api-implementation</artifactId>
             <version>2.0.0</version>
         </dependency>
         <dependency>

jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java

diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
index cb4f83b..b9d1f51 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
@@ -21,7 +21,7 @@
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.RDFTerm;
 import org.apache.clerezza.Triple;
-import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
 import org.apache.clerezza.utils.GraphNode;
 import org.apache.clerezza.representation.Serializer;
 import org.apache.clerezza.representation.SupportedFormat;

jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java

diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
index 6c55a24..482697b 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
@@ -18,7 +18,7 @@
 package org.apache.clerezza.jaxrs.rdf.providers;
 
 import org.apache.clerezza.Graph;
-import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.implementation.graph.SimpleGraph;
 import org.apache.clerezza.representation.Parser;
 import org.apache.clerezza.representation.SupportedFormat;
 import org.osgi.service.component.annotations.Component;

pom.xml

diff --git a/pom.xml b/pom.xml
index 7ba4432..7b814c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
     <modules>
         <module>parent</module>
         <module>api</module>
-        <module>api.impl</module>
+        <module>api-implementation</module>
         <module>ontologies</module>
         <module>sparql</module>
         <module>representation</module>

representation/pom.xml

diff --git a/representation/pom.xml b/representation/pom.xml
index e5e80c3..efeb2e0 100644
--- a/representation/pom.xml
+++ b/representation/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
-            <artifactId>api.impl</artifactId>
+            <artifactId>api-implementation</artifactId>
             <version>2.0.0</version>
         </dependency>
         <dependency>

representation/src/main/java/org/apache/clerezza/representation/Parser.java

diff --git a/representation/src/main/java/org/apache/clerezza/representation/Parser.java b/representation/src/main/java/org/apache/clerezza/representation/Parser.java
index 8582344..ea2b571 100644
--- a/representation/src/main/java/org/apache/clerezza/representation/Parser.java
+++ b/representation/src/main/java/org/apache/clerezza/representation/Parser.java
@@ -21,7 +21,7 @@
 import org.apache.clerezza.Graph;
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.ImmutableGraph;
-import org.apache.clerezza.impl.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.graph.SimpleMGraph;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.*;

sparql/pom.xml

diff --git a/sparql/pom.xml b/sparql/pom.xml
index 100b82d..6eef401 100644
--- a/sparql/pom.xml
+++ b/sparql/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
-            <artifactId>api.impl</artifactId>
+            <artifactId>api-implementation</artifactId>
             <version>2.0.0</version>
         </dependency>
         <dependency>

sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedQueryParser.jj

diff --git a/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedQueryParser.jj b/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedQueryParser.jj
index 6b9a545..35547b2 100644
--- a/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedQueryParser.jj
+++ b/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedQueryParser.jj
@@ -36,9 +36,9 @@
 import org.apache.clerezza.Literal;
 import org.apache.clerezza.RDFTerm;
 import org.apache.clerezza.IRI;
-import org.apache.clerezza.impl.literal.LiteralFactory;
-import org.apache.clerezza.impl.literal.PlainLiteralImpl;
-import org.apache.clerezza.impl.literal.TypedLiteralImpl;
+import org.apache.clerezza.implementation.literal.LiteralFactory;
+import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
+import org.apache.clerezza.implementation.literal.TypedLiteralImpl;
 import org.apache.clerezza.sparql.query.GroupGraphPattern;
 import org.apache.clerezza.sparql.query.BinaryOperation;
 import org.apache.clerezza.sparql.query.Variable;

sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedSparqlPreParser.jj

diff --git a/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedSparqlPreParser.jj b/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedSparqlPreParser.jj
index 3a5618e..0169742 100644
--- a/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedSparqlPreParser.jj
+++ b/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedSparqlPreParser.jj
@@ -31,9 +31,9 @@
 package org.apache.clerezza.sparql;
 
 import org.apache.clerezza.BlankNode;
-import org.apache.clerezza.impl.literal.LiteralFactory;
-import org.apache.clerezza.impl.literal.PlainLiteralImpl;
-import org.apache.clerezza.impl.literal.TypedLiteralImpl;
+import org.apache.clerezza.implementation.literal.LiteralFactory;
+import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
+import org.apache.clerezza.implementation.literal.TypedLiteralImpl;
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.Language;
 import org.apache.clerezza.Literal;

sparql/src/test/java/org/apache/clerezza/sparql/QueryParserTest.java

diff --git a/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserTest.java b/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserTest.java
index 2e9269d..4ced6c0 100644
--- a/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserTest.java
+++ b/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserTest.java
@@ -20,7 +20,7 @@
 
 import org.apache.clerezza.IRI;
 import org.apache.clerezza.Language;
-import org.apache.clerezza.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
 import org.apache.clerezza.sparql.query.*;
 import org.apache.clerezza.sparql.query.impl.SimpleTriplePattern;
 import org.junit.Assert;

sparql/src/test/java/org/apache/clerezza/sparql/QuerySerializerTest.java

diff --git a/sparql/src/test/java/org/apache/clerezza/sparql/QuerySerializerTest.java b/sparql/src/test/java/org/apache/clerezza/sparql/QuerySerializerTest.java
index f244252..b178637 100644
--- a/sparql/src/test/java/org/apache/clerezza/sparql/QuerySerializerTest.java
+++ b/sparql/src/test/java/org/apache/clerezza/sparql/QuerySerializerTest.java
@@ -19,7 +19,7 @@
 package org.apache.clerezza.sparql;
 
 import org.apache.clerezza.IRI;
-import org.apache.clerezza.impl.literal.LiteralFactory;
+import org.apache.clerezza.implementation.literal.LiteralFactory;
 import org.apache.clerezza.sparql.query.*;
 import org.apache.clerezza.sparql.query.impl.*;
 import org.junit.Assert;

test.utils/pom.xml

diff --git a/test.utils/pom.xml b/test.utils/pom.xml
index 900cc08..1e72547 100644
--- a/test.utils/pom.xml
+++ b/test.utils/pom.xml
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
-            <artifactId>api.impl</artifactId>
+            <artifactId>api-implementation</artifactId>
             <version>2.0.0</version>
         </dependency>
         <dependency>

test.utils/src/main/java/org/apache/clerezza/test/utils/GraphTest.java

diff --git a/test.utils/src/main/java/org/apache/clerezza/test/utils/GraphTest.java b/test.utils/src/main/java/org/apache/clerezza/test/utils/GraphTest.java
index dde348c..67f397e 100644
--- a/test.utils/src/main/java/org/apache/clerezza/test/utils/GraphTest.java
+++ b/test.utils/src/main/java/org/apache/clerezza/test/utils/GraphTest.java
@@ -19,9 +19,9 @@
 package org.apache.clerezza.test.utils;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.literal.PlainLiteralImpl;
-import org.apache.clerezza.impl.literal.TypedLiteralImpl;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
+import org.apache.clerezza.implementation.literal.TypedLiteralImpl;
 import org.junit.Assert;
 import org.junit.Test;
 

test.utils/src/main/java/org/apache/clerezza/test/utils/RandomGraph.java

diff --git a/test.utils/src/main/java/org/apache/clerezza/test/utils/RandomGraph.java b/test.utils/src/main/java/org/apache/clerezza/test/utils/RandomGraph.java
index 40b81ba..c0de303 100644
--- a/test.utils/src/main/java/org/apache/clerezza/test/utils/RandomGraph.java
+++ b/test.utils/src/main/java/org/apache/clerezza/test/utils/RandomGraph.java
@@ -19,8 +19,8 @@
 package org.apache.clerezza.test.utils;
 
 import org.apache.clerezza.*;
-import org.apache.clerezza.impl.TripleImpl;
-import org.apache.clerezza.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
 import org.apache.commons.lang.RandomStringUtils;
 
 import java.util.Iterator;