diff --git a/pom.xml b/pom.xml
index cd4b492c9c..8bc6e814a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
     <module>scm-dao-xml</module>
     <module>scm-webapp</module>
     <module>scm-server</module>
-    <module>packaging</module>
+    <module>scm-packaging</module>
     <module>scm-it</module>
   </modules>
 
diff --git a/packaging/deb/Vagrantfile b/scm-packaging/deb/Vagrantfile
similarity index 100%
rename from packaging/deb/Vagrantfile
rename to scm-packaging/deb/Vagrantfile
diff --git a/packaging/deb/pom.xml b/scm-packaging/deb/pom.xml
similarity index 99%
rename from packaging/deb/pom.xml
rename to scm-packaging/deb/pom.xml
index ee98094ac0..98afc3b4ed 100644
--- a/packaging/deb/pom.xml
+++ b/scm-packaging/deb/pom.xml
@@ -30,11 +30,10 @@
 
   <parent>
     <groupId>sonia.scm.packaging</groupId>
-    <artifactId>packaging</artifactId>
+    <artifactId>scm-packaging</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>sonia.scm.packaging</groupId>
   <artifactId>deb</artifactId>
   <packaging>deb</packaging>
   <version>2.0.0-SNAPSHOT</version>
diff --git a/packaging/deb/src/main/deb/control/control b/scm-packaging/deb/src/main/deb/control/control
similarity index 100%
rename from packaging/deb/src/main/deb/control/control
rename to scm-packaging/deb/src/main/deb/control/control
diff --git a/packaging/deb/src/main/deb/control/postinst b/scm-packaging/deb/src/main/deb/control/postinst
similarity index 100%
rename from packaging/deb/src/main/deb/control/postinst
rename to scm-packaging/deb/src/main/deb/control/postinst
diff --git a/packaging/deb/src/main/deb/control/preinst b/scm-packaging/deb/src/main/deb/control/preinst
similarity index 100%
rename from packaging/deb/src/main/deb/control/preinst
rename to scm-packaging/deb/src/main/deb/control/preinst
diff --git a/packaging/deb/src/main/fs/etc/default/scm-server b/scm-packaging/deb/src/main/fs/etc/default/scm-server
similarity index 100%
rename from packaging/deb/src/main/fs/etc/default/scm-server
rename to scm-packaging/deb/src/main/fs/etc/default/scm-server
diff --git a/packaging/deb/src/main/fs/etc/scm/logging.xml b/scm-packaging/deb/src/main/fs/etc/scm/logging.xml
similarity index 100%
rename from packaging/deb/src/main/fs/etc/scm/logging.xml
rename to scm-packaging/deb/src/main/fs/etc/scm/logging.xml
diff --git a/packaging/deb/src/main/fs/etc/scm/server-config.xml b/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml
similarity index 100%
rename from packaging/deb/src/main/fs/etc/scm/server-config.xml
rename to scm-packaging/deb/src/main/fs/etc/scm/server-config.xml
diff --git a/packaging/deb/src/main/fs/etc/systemd/system/scm-server.service b/scm-packaging/deb/src/main/fs/etc/systemd/system/scm-server.service
similarity index 100%
rename from packaging/deb/src/main/fs/etc/systemd/system/scm-server.service
rename to scm-packaging/deb/src/main/fs/etc/systemd/system/scm-server.service
diff --git a/packaging/deb/src/main/fs/opt/scm-server/bin/scm-server b/scm-packaging/deb/src/main/fs/opt/scm-server/bin/scm-server
similarity index 100%
rename from packaging/deb/src/main/fs/opt/scm-server/bin/scm-server
rename to scm-packaging/deb/src/main/fs/opt/scm-server/bin/scm-server
diff --git a/packaging/deb/src/main/fs/opt/scm-server/var/webapp/docroot/index.html b/scm-packaging/deb/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
similarity index 100%
rename from packaging/deb/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
rename to scm-packaging/deb/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
diff --git a/packaging/pom.xml b/scm-packaging/pom.xml
similarity index 96%
rename from packaging/pom.xml
rename to scm-packaging/pom.xml
index 4c33d74f21..69f40c26e3 100644
--- a/packaging/pom.xml
+++ b/scm-packaging/pom.xml
@@ -35,14 +35,14 @@
   </parent>
 
   <groupId>sonia.scm.packaging</groupId>
-  <artifactId>packaging</artifactId>
+  <artifactId>scm-packaging</artifactId>
   <packaging>pom</packaging>
   <version>2.0.0-SNAPSHOT</version>
-  <name>packaging</name>
 
   <modules>
     <module>rpm</module>
     <module>deb</module>
+    <module>unix</module>
   </modules>
 
 </project>
diff --git a/packaging/rpm/Vagrantfile b/scm-packaging/rpm/Vagrantfile
similarity index 100%
rename from packaging/rpm/Vagrantfile
rename to scm-packaging/rpm/Vagrantfile
diff --git a/packaging/rpm/pom.xml b/scm-packaging/rpm/pom.xml
similarity index 99%
rename from packaging/rpm/pom.xml
rename to scm-packaging/rpm/pom.xml
index 76e8fc097c..174b6bed34 100644
--- a/packaging/rpm/pom.xml
+++ b/scm-packaging/rpm/pom.xml
@@ -30,11 +30,10 @@
 
   <parent>
     <groupId>sonia.scm.packaging</groupId>
-    <artifactId>packaging</artifactId>
+    <artifactId>scm-packaging</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>sonia.scm.packaging</groupId>
   <artifactId>rpm</artifactId>
   <packaging>rpm</packaging>
   <version>2.0.0-SNAPSHOT</version>
diff --git a/packaging/rpm/src/main/fs/etc/default/scm-server b/scm-packaging/rpm/src/main/fs/etc/default/scm-server
similarity index 100%
rename from packaging/rpm/src/main/fs/etc/default/scm-server
rename to scm-packaging/rpm/src/main/fs/etc/default/scm-server
diff --git a/packaging/rpm/src/main/fs/etc/scm/logging.xml b/scm-packaging/rpm/src/main/fs/etc/scm/logging.xml
similarity index 100%
rename from packaging/rpm/src/main/fs/etc/scm/logging.xml
rename to scm-packaging/rpm/src/main/fs/etc/scm/logging.xml
diff --git a/packaging/rpm/src/main/fs/etc/scm/server-config.xml b/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml
similarity index 100%
rename from packaging/rpm/src/main/fs/etc/scm/server-config.xml
rename to scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml
diff --git a/packaging/rpm/src/main/fs/etc/systemd/system/scm-server.service b/scm-packaging/rpm/src/main/fs/etc/systemd/system/scm-server.service
similarity index 100%
rename from packaging/rpm/src/main/fs/etc/systemd/system/scm-server.service
rename to scm-packaging/rpm/src/main/fs/etc/systemd/system/scm-server.service
diff --git a/packaging/rpm/src/main/fs/opt/scm-server/bin/scm-server b/scm-packaging/rpm/src/main/fs/opt/scm-server/bin/scm-server
similarity index 100%
rename from packaging/rpm/src/main/fs/opt/scm-server/bin/scm-server
rename to scm-packaging/rpm/src/main/fs/opt/scm-server/bin/scm-server
diff --git a/packaging/rpm/src/main/fs/opt/scm-server/var/webapp/docroot/index.html b/scm-packaging/rpm/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
similarity index 100%
rename from packaging/rpm/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
rename to scm-packaging/rpm/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
diff --git a/packaging/rpm/src/main/scripts/after-installation.sh b/scm-packaging/rpm/src/main/scripts/after-installation.sh
similarity index 100%
rename from packaging/rpm/src/main/scripts/after-installation.sh
rename to scm-packaging/rpm/src/main/scripts/after-installation.sh
diff --git a/packaging/rpm/src/main/scripts/before-installation.sh b/scm-packaging/rpm/src/main/scripts/before-installation.sh
similarity index 100%
rename from packaging/rpm/src/main/scripts/before-installation.sh
rename to scm-packaging/rpm/src/main/scripts/before-installation.sh