diff --git a/edec-codelist-tools/pom.xml b/edec-codelist-tools/pom.xml
index e87a2c0..855d951 100644
--- a/edec-codelist-tools/pom.xml
+++ b/edec-codelist-tools/pom.xml
@@ -88,7 +88,7 @@
       <dependency>
         <groupId>com.helger.peppol</groupId>
         <artifactId>peppol-commons-parent-pom</artifactId>
-        <version>9.1.0</version>
+        <version>9.1.1-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/edec-codelist-tools/src/main/java/eu/peppol/codelist/v8/AbstractConvertV8.java b/edec-codelist-tools/src/main/java/eu/peppol/codelist/main/AbstractConvertV8.java
similarity index 99%
rename from edec-codelist-tools/src/main/java/eu/peppol/codelist/v8/AbstractConvertV8.java
rename to edec-codelist-tools/src/main/java/eu/peppol/codelist/main/AbstractConvertV8.java
index faca2d9..bf7d4da 100644
--- a/edec-codelist-tools/src/main/java/eu/peppol/codelist/v8/AbstractConvertV8.java
+++ b/edec-codelist-tools/src/main/java/eu/peppol/codelist/main/AbstractConvertV8.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.peppol.codelist.v8;
+package eu.peppol.codelist.main;
 
 import java.util.Map;
 
diff --git a/edec-codelist-tools/src/main/java/eu/peppol/codelist/v8/ConvertV8_7.java b/edec-codelist-tools/src/main/java/eu/peppol/codelist/main/ConvertV8_7.java
similarity index 97%
rename from edec-codelist-tools/src/main/java/eu/peppol/codelist/v8/ConvertV8_7.java
rename to edec-codelist-tools/src/main/java/eu/peppol/codelist/main/ConvertV8_7.java
index 89505a5..0f22796 100644
--- a/edec-codelist-tools/src/main/java/eu/peppol/codelist/v8/ConvertV8_7.java
+++ b/edec-codelist-tools/src/main/java/eu/peppol/codelist/main/ConvertV8_7.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.peppol.codelist.v8;
+package eu.peppol.codelist.main;
 
 import com.helger.commons.version.Version;
 
diff --git a/edec-codelist-tools/src/main/java/eu/peppol/codelist/main/MainProcessExcelCodeLists.java b/edec-codelist-tools/src/main/java/eu/peppol/codelist/main/MainProcessExcelCodeLists.java
index c0fcf58..693aec3 100644
--- a/edec-codelist-tools/src/main/java/eu/peppol/codelist/main/MainProcessExcelCodeLists.java
+++ b/edec-codelist-tools/src/main/java/eu/peppol/codelist/main/MainProcessExcelCodeLists.java
@@ -18,8 +18,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import eu.peppol.codelist.v8.ConvertV8_7;
-
 /**
  * Utility class to create the Genericode files from the Excel code list.
  *
diff --git a/edec-codelist-tools/src/test/java/eu/peppol/codelist/jaxb/ConvertV8ResultFuncTest.java b/edec-codelist-tools/src/test/java/eu/peppol/codelist/jaxb/ConvertV8ResultFuncTest.java
index aa3c10b..6eb804e 100644
--- a/edec-codelist-tools/src/test/java/eu/peppol/codelist/jaxb/ConvertV8ResultFuncTest.java
+++ b/edec-codelist-tools/src/test/java/eu/peppol/codelist/jaxb/ConvertV8ResultFuncTest.java
@@ -24,11 +24,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import eu.peppol.codelist.main.ConvertV8_7;
 import eu.peppol.codelist.model.DocTypeRow;
 import eu.peppol.codelist.model.ParticipantIdentifierSchemeRow;
 import eu.peppol.codelist.model.ProcessRow;
 import eu.peppol.codelist.model.TransportProfileRow;
-import eu.peppol.codelist.v8.ConvertV8_7;
 
 /**
  * Check if the created lists match the XSD.