diff --git a/pom.xml b/pom.xml
index b7cc3aa237..e8eb3b2641 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
     <module>scm-core</module>
     <module>scm-test</module>
     <module>maven</module>
-    <module>plugins</module>
+    <module>scm-plugins</module>
     <module>samples</module>
     <module>scm-webapp</module>
     <module>scm-server</module>
diff --git a/plugins/README.txt b/scm-plugins/README.txt
similarity index 100%
rename from plugins/README.txt
rename to scm-plugins/README.txt
diff --git a/plugins/pom.xml b/scm-plugins/pom.xml
similarity index 100%
rename from plugins/pom.xml
rename to scm-plugins/pom.xml
diff --git a/plugins/scm-activedirectory-auth-plugin/pom.xml b/scm-plugins/scm-activedirectory-auth-plugin/pom.xml
similarity index 100%
rename from plugins/scm-activedirectory-auth-plugin/pom.xml
rename to scm-plugins/scm-activedirectory-auth-plugin/pom.xml
diff --git a/plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryAuthenticationHandler.java b/scm-plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryAuthenticationHandler.java
similarity index 100%
rename from plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryAuthenticationHandler.java
rename to scm-plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryAuthenticationHandler.java
diff --git a/plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryDomain.java b/scm-plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryDomain.java
similarity index 100%
rename from plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryDomain.java
rename to scm-plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryDomain.java
diff --git a/plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryUtil.java b/scm-plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryUtil.java
similarity index 100%
rename from plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryUtil.java
rename to scm-plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryUtil.java
diff --git a/plugins/scm-activedirectory-auth-plugin/src/main/resources/META-INF/scm/plugin.xml b/scm-plugins/scm-activedirectory-auth-plugin/src/main/resources/META-INF/scm/plugin.xml
similarity index 100%
rename from plugins/scm-activedirectory-auth-plugin/src/main/resources/META-INF/scm/plugin.xml
rename to scm-plugins/scm-activedirectory-auth-plugin/src/main/resources/META-INF/scm/plugin.xml
diff --git a/plugins/scm-auth-ldap-plugin/pom.xml b/scm-plugins/scm-auth-ldap-plugin/pom.xml
similarity index 100%
rename from plugins/scm-auth-ldap-plugin/pom.xml
rename to scm-plugins/scm-auth-ldap-plugin/pom.xml
diff --git a/plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LDAPAuthenticationHandler.java b/scm-plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LDAPAuthenticationHandler.java
similarity index 100%
rename from plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LDAPAuthenticationHandler.java
rename to scm-plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LDAPAuthenticationHandler.java
diff --git a/plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LDAPConfig.java b/scm-plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LDAPConfig.java
similarity index 100%
rename from plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LDAPConfig.java
rename to scm-plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LDAPConfig.java
diff --git a/plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LDAPConfigResource.java b/scm-plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LDAPConfigResource.java
similarity index 100%
rename from plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LDAPConfigResource.java
rename to scm-plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LDAPConfigResource.java
diff --git a/plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LdapUtil.java b/scm-plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LdapUtil.java
similarity index 100%
rename from plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LdapUtil.java
rename to scm-plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LdapUtil.java
diff --git a/plugins/scm-auth-ldap-plugin/src/main/resources/META-INF/scm/plugin.xml b/scm-plugins/scm-auth-ldap-plugin/src/main/resources/META-INF/scm/plugin.xml
similarity index 100%
rename from plugins/scm-auth-ldap-plugin/src/main/resources/META-INF/scm/plugin.xml
rename to scm-plugins/scm-auth-ldap-plugin/src/main/resources/META-INF/scm/plugin.xml
diff --git a/plugins/scm-auth-ldap-plugin/src/main/resources/sonia/scm/auth/ldap/sonia.ldap.js b/scm-plugins/scm-auth-ldap-plugin/src/main/resources/sonia/scm/auth/ldap/sonia.ldap.js
similarity index 100%
rename from plugins/scm-auth-ldap-plugin/src/main/resources/sonia/scm/auth/ldap/sonia.ldap.js
rename to scm-plugins/scm-auth-ldap-plugin/src/main/resources/sonia/scm/auth/ldap/sonia.ldap.js