diff --git a/pom.xml b/pom.xml
index 30d7892bc6..77384d5c76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
   <modules>
     <module>scm-core</module>
     <module>scm-test</module>
-    <module>maven</module>
+    <module>scm-maven-plugins</module>
     <module>scm-plugins</module>
     <module>scm-samples</module>
     <module>scm-dao-xml</module>
@@ -75,7 +75,7 @@
     <module>scm-server</module>
     <module>scm-plugin-backend</module>
     <module>scm-clients</module>
-    <module>support</module>
+    <module>scm-support</module>
   </modules>
 
   <repositories>
diff --git a/maven/pom.xml b/scm-maven-plugins/pom.xml
similarity index 100%
rename from maven/pom.xml
rename to scm-maven-plugins/pom.xml
diff --git a/maven/scm-maven-plugin/pom.xml b/scm-maven-plugins/scm-maven-plugin/pom.xml
similarity index 100%
rename from maven/scm-maven-plugin/pom.xml
rename to scm-maven-plugins/scm-maven-plugin/pom.xml
diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java b/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java
similarity index 100%
rename from maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java
rename to scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java
diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractScmMojo.java b/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractScmMojo.java
similarity index 100%
rename from maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractScmMojo.java
rename to scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractScmMojo.java
diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/Classpath.java b/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/Classpath.java
similarity index 100%
rename from maven/scm-maven-plugin/src/main/java/sonia/scm/maven/Classpath.java
rename to scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/Classpath.java
diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/FixDescriptorMojo.java b/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/FixDescriptorMojo.java
similarity index 100%
rename from maven/scm-maven-plugin/src/main/java/sonia/scm/maven/FixDescriptorMojo.java
rename to scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/FixDescriptorMojo.java
diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/InstallMojo.java b/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/InstallMojo.java
similarity index 100%
rename from maven/scm-maven-plugin/src/main/java/sonia/scm/maven/InstallMojo.java
rename to scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/InstallMojo.java
diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/JettyStopMonitorThread.java b/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/JettyStopMonitorThread.java
similarity index 100%
rename from maven/scm-maven-plugin/src/main/java/sonia/scm/maven/JettyStopMonitorThread.java
rename to scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/JettyStopMonitorThread.java
diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/OpenBrowserListener.java b/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/OpenBrowserListener.java
similarity index 100%
rename from maven/scm-maven-plugin/src/main/java/sonia/scm/maven/OpenBrowserListener.java
rename to scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/OpenBrowserListener.java
diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/PackageMojo.java b/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/PackageMojo.java
similarity index 100%
rename from maven/scm-maven-plugin/src/main/java/sonia/scm/maven/PackageMojo.java
rename to scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/PackageMojo.java
diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java b/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java
similarity index 100%
rename from maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java
rename to scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java
diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/StopMojo.java b/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/StopMojo.java
similarity index 100%
rename from maven/scm-maven-plugin/src/main/java/sonia/scm/maven/StopMojo.java
rename to scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/StopMojo.java
diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/Util.java b/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/Util.java
similarity index 100%
rename from maven/scm-maven-plugin/src/main/java/sonia/scm/maven/Util.java
rename to scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/Util.java
diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/WebApplication.java b/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/WebApplication.java
similarity index 100%
rename from maven/scm-maven-plugin/src/main/java/sonia/scm/maven/WebApplication.java
rename to scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/WebApplication.java
diff --git a/maven/scm-plugin-archetype/pom.xml b/scm-maven-plugins/scm-plugin-archetype/pom.xml
similarity index 100%
rename from maven/scm-plugin-archetype/pom.xml
rename to scm-maven-plugins/scm-plugin-archetype/pom.xml
diff --git a/maven/scm-plugin-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/scm-maven-plugins/scm-plugin-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
similarity index 100%
rename from maven/scm-plugin-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
rename to scm-maven-plugins/scm-plugin-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/maven/scm-plugin-archetype/src/main/resources/META-INF/maven/archetype.xml b/scm-maven-plugins/scm-plugin-archetype/src/main/resources/META-INF/maven/archetype.xml
similarity index 100%
rename from maven/scm-plugin-archetype/src/main/resources/META-INF/maven/archetype.xml
rename to scm-maven-plugins/scm-plugin-archetype/src/main/resources/META-INF/maven/archetype.xml
diff --git a/maven/scm-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/scm-maven-plugins/scm-plugin-archetype/src/main/resources/archetype-resources/pom.xml
similarity index 100%
rename from maven/scm-plugin-archetype/src/main/resources/archetype-resources/pom.xml
rename to scm-maven-plugins/scm-plugin-archetype/src/main/resources/archetype-resources/pom.xml
diff --git a/maven/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/conf/logging.xml b/scm-maven-plugins/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/conf/logging.xml
similarity index 100%
rename from maven/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/conf/logging.xml
rename to scm-maven-plugins/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/conf/logging.xml
diff --git a/maven/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/java/HelloResource.java b/scm-maven-plugins/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/java/HelloResource.java
similarity index 100%
rename from maven/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/java/HelloResource.java
rename to scm-maven-plugins/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/java/HelloResource.java
diff --git a/maven/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/scm/plugin.xml b/scm-maven-plugins/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/scm/plugin.xml
similarity index 100%
rename from maven/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/scm/plugin.xml
rename to scm-maven-plugins/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/scm/plugin.xml
diff --git a/maven/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/resources/scm/sample.hello.js b/scm-maven-plugins/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/resources/scm/sample.hello.js
similarity index 100%
rename from maven/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/resources/scm/sample.hello.js
rename to scm-maven-plugins/scm-plugin-archetype/src/main/resources/archetype-resources/src/main/resources/scm/sample.hello.js
diff --git a/support/pom.xml b/scm-support/pom.xml
similarity index 100%
rename from support/pom.xml
rename to scm-support/pom.xml
diff --git a/support/scm-script-plugin/analyze-ehcache.groovy b/scm-support/scm-script-plugin/analyze-ehcache.groovy
similarity index 100%
rename from support/scm-script-plugin/analyze-ehcache.groovy
rename to scm-support/scm-script-plugin/analyze-ehcache.groovy
diff --git a/support/scm-support-btrace/pom.xml b/scm-support/scm-support-btrace/pom.xml
similarity index 100%
rename from support/scm-support-btrace/pom.xml
rename to scm-support/scm-support-btrace/pom.xml
diff --git a/support/scm-support-btrace/src/main/java/sonia/scm/btrace/IndexPage.java b/scm-support/scm-support-btrace/src/main/java/sonia/scm/btrace/IndexPage.java
similarity index 100%
rename from support/scm-support-btrace/src/main/java/sonia/scm/btrace/IndexPage.java
rename to scm-support/scm-support-btrace/src/main/java/sonia/scm/btrace/IndexPage.java
diff --git a/support/scm-support-youdebug/GitFileLeak.ydb b/scm-support/scm-support-youdebug/GitFileLeak.ydb
similarity index 100%
rename from support/scm-support-youdebug/GitFileLeak.ydb
rename to scm-support/scm-support-youdebug/GitFileLeak.ydb
diff --git a/support/scm-support-youdebug/GitRepositoryNotFoundOnPush.ydb b/scm-support/scm-support-youdebug/GitRepositoryNotFoundOnPush.ydb
similarity index 100%
rename from support/scm-support-youdebug/GitRepositoryNotFoundOnPush.ydb
rename to scm-support/scm-support-youdebug/GitRepositoryNotFoundOnPush.ydb
diff --git a/support/scm-support-youdebug/IndexPage.ydb b/scm-support/scm-support-youdebug/IndexPage.ydb
similarity index 100%
rename from support/scm-support-youdebug/IndexPage.ydb
rename to scm-support/scm-support-youdebug/IndexPage.ydb
diff --git a/scm-webapp/config/.cipherkey b/scm-webapp/config/.cipherkey
new file mode 100644
index 0000000000..97dba1ae23
--- /dev/null
+++ b/scm-webapp/config/.cipherkey
@@ -0,0 +1 @@
+4Q20UTU3e5AvLRBRAuxKU0F91k8nzKxXHAW5+8NLxbu+2gCSYuovsgApSlSvOlAi1wBzHA==
\ No newline at end of file