diff --git a/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionResult.java b/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionResult.java
index ac37953..e772d00 100644
--- a/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionResult.java
+++ b/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionResult.java
@@ -1,11 +1,11 @@
 package org.apache.maven.mercury.representation;
 
 import org.apache.maven.mercury.ArtifactScopeEnum;
-import org.apache.maven.mercury.conflict.ConflictResolutionException;
-import org.apache.maven.mercury.conflict.ConflictResolver;
-import org.apache.maven.mercury.transform.ClasspathContainer;
-import org.apache.maven.mercury.transform.ClasspathTransformation;
-import org.apache.maven.mercury.transform.MetadataGraphTransformationException;
+import org.apache.maven.mercury.representation.conflict.ConflictResolutionException;
+import org.apache.maven.mercury.representation.conflict.ConflictResolver;
+import org.apache.maven.mercury.representation.transform.ClasspathContainer;
+import org.apache.maven.mercury.representation.transform.ClasspathTransformation;
+import org.apache.maven.mercury.representation.transform.MetadataGraphTransformationException;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 
diff --git a/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionException.java b/src/main/java/org/apache/maven/mercury/representation/conflict/ConflictResolutionException.java
similarity index 88%
rename from src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionException.java
rename to src/main/java/org/apache/maven/mercury/representation/conflict/ConflictResolutionException.java
index 0f9838d..0304ff1 100644
--- a/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionException.java
+++ b/src/main/java/org/apache/maven/mercury/representation/conflict/ConflictResolutionException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.conflict;
+package org.apache.maven.mercury.representation.conflict;
 
 /**
  * 
diff --git a/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionPolicy.java b/src/main/java/org/apache/maven/mercury/representation/conflict/ConflictResolutionPolicy.java
similarity index 88%
rename from src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionPolicy.java
rename to src/main/java/org/apache/maven/mercury/representation/conflict/ConflictResolutionPolicy.java
index 1479d44..7888155 100644
--- a/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionPolicy.java
+++ b/src/main/java/org/apache/maven/mercury/representation/conflict/ConflictResolutionPolicy.java
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.conflict;
+package org.apache.maven.mercury.representation.conflict;
 
 import org.apache.maven.mercury.representation.MetadataGraphEdge;
 
diff --git a/src/main/java/org/apache/maven/mercury/conflict/ConflictResolver.java b/src/main/java/org/apache/maven/mercury/representation/conflict/ConflictResolver.java
similarity index 96%
rename from src/main/java/org/apache/maven/mercury/conflict/ConflictResolver.java
rename to src/main/java/org/apache/maven/mercury/representation/conflict/ConflictResolver.java
index b271105..b26bca4 100644
--- a/src/main/java/org/apache/maven/mercury/conflict/ConflictResolver.java
+++ b/src/main/java/org/apache/maven/mercury/representation/conflict/ConflictResolver.java
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.conflict;
+package org.apache.maven.mercury.representation.conflict;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
diff --git a/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolutionPolicy.java b/src/main/java/org/apache/maven/mercury/representation/conflict/DefaultConflictResolutionPolicy.java
similarity index 85%
rename from src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolutionPolicy.java
rename to src/main/java/org/apache/maven/mercury/representation/conflict/DefaultConflictResolutionPolicy.java
index 09c9168..ecd6533 100644
--- a/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolutionPolicy.java
+++ b/src/main/java/org/apache/maven/mercury/representation/conflict/DefaultConflictResolutionPolicy.java
@@ -1,8 +1,8 @@
-package org.apache.maven.mercury.conflict;
+package org.apache.maven.mercury.representation.conflict;
 
 import org.apache.maven.mercury.representation.MetadataGraphEdge;
-import org.apache.maven.mercury.version.ArtifactVersion;
-import org.apache.maven.mercury.version.DefaultArtifactVersion;
+import org.apache.maven.mercury.representation.version.ArtifactVersion;
+import org.apache.maven.mercury.representation.version.DefaultArtifactVersion;
 
 /*
  * 
diff --git a/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolver.java b/src/main/java/org/apache/maven/mercury/representation/conflict/DefaultConflictResolver.java
similarity index 99%
rename from src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolver.java
rename to src/main/java/org/apache/maven/mercury/representation/conflict/DefaultConflictResolver.java
index bea0c9b..136895f 100644
--- a/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolver.java
+++ b/src/main/java/org/apache/maven/mercury/representation/conflict/DefaultConflictResolver.java
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.conflict;
+package org.apache.maven.mercury.representation.conflict;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
diff --git a/src/main/java/org/apache/maven/mercury/transform/ClasspathContainer.java b/src/main/java/org/apache/maven/mercury/representation/transform/ClasspathContainer.java
similarity index 98%
rename from src/main/java/org/apache/maven/mercury/transform/ClasspathContainer.java
rename to src/main/java/org/apache/maven/mercury/representation/transform/ClasspathContainer.java
index 087fafc..a1eb8e3 100644
--- a/src/main/java/org/apache/maven/mercury/transform/ClasspathContainer.java
+++ b/src/main/java/org/apache/maven/mercury/representation/transform/ClasspathContainer.java
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.transform;
+package org.apache.maven.mercury.representation.transform;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/main/java/org/apache/maven/mercury/transform/ClasspathTransformation.java b/src/main/java/org/apache/maven/mercury/representation/transform/ClasspathTransformation.java
similarity index 93%
rename from src/main/java/org/apache/maven/mercury/transform/ClasspathTransformation.java
rename to src/main/java/org/apache/maven/mercury/representation/transform/ClasspathTransformation.java
index 4eca3f8..3a0ee74 100644
--- a/src/main/java/org/apache/maven/mercury/transform/ClasspathTransformation.java
+++ b/src/main/java/org/apache/maven/mercury/representation/transform/ClasspathTransformation.java
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.transform;
+package org.apache.maven.mercury.representation.transform;
 
 import org.apache.maven.mercury.ArtifactScopeEnum;
 import org.apache.maven.mercury.representation.MetadataGraph;
diff --git a/src/main/java/org/apache/maven/mercury/transform/DefaultClasspathTransformation.java b/src/main/java/org/apache/maven/mercury/representation/transform/DefaultClasspathTransformation.java
similarity index 96%
rename from src/main/java/org/apache/maven/mercury/transform/DefaultClasspathTransformation.java
rename to src/main/java/org/apache/maven/mercury/representation/transform/DefaultClasspathTransformation.java
index c7da347..916ae88 100644
--- a/src/main/java/org/apache/maven/mercury/transform/DefaultClasspathTransformation.java
+++ b/src/main/java/org/apache/maven/mercury/representation/transform/DefaultClasspathTransformation.java
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.transform;
+package org.apache.maven.mercury.representation.transform;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -6,12 +6,12 @@
 import java.util.List;
 
 import org.apache.maven.mercury.ArtifactScopeEnum;
-import org.apache.maven.mercury.conflict.ConflictResolutionException;
-import org.apache.maven.mercury.conflict.ConflictResolver;
 import org.apache.maven.mercury.representation.ArtifactMetadata;
 import org.apache.maven.mercury.representation.MetadataGraph;
 import org.apache.maven.mercury.representation.MetadataGraphEdge;
 import org.apache.maven.mercury.representation.MetadataGraphVertex;
+import org.apache.maven.mercury.representation.conflict.ConflictResolutionException;
+import org.apache.maven.mercury.representation.conflict.ConflictResolver;
 
 /*
  * default implementation of the metadata classpath transformer
diff --git a/src/main/java/org/apache/maven/mercury/transform/MetadataGraphTransformationException.java b/src/main/java/org/apache/maven/mercury/representation/transform/MetadataGraphTransformationException.java
similarity index 90%
rename from src/main/java/org/apache/maven/mercury/transform/MetadataGraphTransformationException.java
rename to src/main/java/org/apache/maven/mercury/representation/transform/MetadataGraphTransformationException.java
index 9327f14..a9b30cf 100644
--- a/src/main/java/org/apache/maven/mercury/transform/MetadataGraphTransformationException.java
+++ b/src/main/java/org/apache/maven/mercury/representation/transform/MetadataGraphTransformationException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.transform;
+package org.apache.maven.mercury.representation.transform;
 
 /*
  * @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
diff --git a/src/main/java/org/apache/maven/mercury/version/ArtifactVersion.java b/src/main/java/org/apache/maven/mercury/representation/version/ArtifactVersion.java
similarity index 94%
rename from src/main/java/org/apache/maven/mercury/version/ArtifactVersion.java
rename to src/main/java/org/apache/maven/mercury/representation/version/ArtifactVersion.java
index 56b88be..e1731c9 100644
--- a/src/main/java/org/apache/maven/mercury/version/ArtifactVersion.java
+++ b/src/main/java/org/apache/maven/mercury/representation/version/ArtifactVersion.java
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.version;
+package org.apache.maven.mercury.representation.version;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/mercury/version/ComparableVersion.java b/src/main/java/org/apache/maven/mercury/representation/version/ComparableVersion.java
similarity index 99%
rename from src/main/java/org/apache/maven/mercury/version/ComparableVersion.java
rename to src/main/java/org/apache/maven/mercury/representation/version/ComparableVersion.java
index 85626d1..f97c810 100644
--- a/src/main/java/org/apache/maven/mercury/version/ComparableVersion.java
+++ b/src/main/java/org/apache/maven/mercury/representation/version/ComparableVersion.java
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.version;
+package org.apache.maven.mercury.representation.version;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
diff --git a/src/main/java/org/apache/maven/mercury/version/DefaultArtifactVersion.java b/src/main/java/org/apache/maven/mercury/representation/version/DefaultArtifactVersion.java
similarity index 98%
rename from src/main/java/org/apache/maven/mercury/version/DefaultArtifactVersion.java
rename to src/main/java/org/apache/maven/mercury/representation/version/DefaultArtifactVersion.java
index 4816e87..2bed41e 100644
--- a/src/main/java/org/apache/maven/mercury/version/DefaultArtifactVersion.java
+++ b/src/main/java/org/apache/maven/mercury/representation/version/DefaultArtifactVersion.java
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.version;
+package org.apache.maven.mercury.representation.version;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more contributor license