diff --git a/pom.xml b/pom.xml
index 05e23d0831..59794cac5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
 
   <modules>
     <module>scm-annotations</module>
-    <module>scm-maven-plugins</module>
+    <module>scm-annotation-processor</module>
     <module>scm-core</module>
     <module>scm-test</module>
     <module>scm-plugins</module>
diff --git a/scm-maven-plugins/scm-annotation-processor/pom.xml b/scm-annotation-processor/pom.xml
similarity index 92%
rename from scm-maven-plugins/scm-annotation-processor/pom.xml
rename to scm-annotation-processor/pom.xml
index b96d7f5684..6be04b34ae 100644
--- a/scm-maven-plugins/scm-annotation-processor/pom.xml
+++ b/scm-annotation-processor/pom.xml
@@ -5,12 +5,12 @@
   <modelVersion>4.0.0</modelVersion>
   
   <parent>
-    <groupId>sonia.scm.maven</groupId>
-    <artifactId>scm-maven-plugins</artifactId>
+    <groupId>sonia.scm</groupId>
+    <artifactId>scm</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   
-  <groupId>sonia.scm.maven</groupId>
+  <groupId>sonia.scm</groupId>
   <artifactId>scm-annotation-processor</artifactId>
   <version>2.0.0-SNAPSHOT</version>
   <name>scm-annotation-processor</name>
diff --git a/scm-maven-plugins/scm-annotation-processor/src/main/java/sonia/scm/annotation/ClassSetElement.java b/scm-annotation-processor/src/main/java/sonia/scm/annotation/ClassSetElement.java
similarity index 100%
rename from scm-maven-plugins/scm-annotation-processor/src/main/java/sonia/scm/annotation/ClassSetElement.java
rename to scm-annotation-processor/src/main/java/sonia/scm/annotation/ClassSetElement.java
diff --git a/scm-maven-plugins/scm-annotation-processor/src/main/java/sonia/scm/annotation/DescriptorElement.java b/scm-annotation-processor/src/main/java/sonia/scm/annotation/DescriptorElement.java
similarity index 100%
rename from scm-maven-plugins/scm-annotation-processor/src/main/java/sonia/scm/annotation/DescriptorElement.java
rename to scm-annotation-processor/src/main/java/sonia/scm/annotation/DescriptorElement.java
diff --git a/scm-maven-plugins/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java b/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java
similarity index 100%
rename from scm-maven-plugins/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java
rename to scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java
diff --git a/scm-maven-plugins/scm-annotation-processor/src/main/java/sonia/scm/annotation/SubscriberElement.java b/scm-annotation-processor/src/main/java/sonia/scm/annotation/SubscriberElement.java
similarity index 100%
rename from scm-maven-plugins/scm-annotation-processor/src/main/java/sonia/scm/annotation/SubscriberElement.java
rename to scm-annotation-processor/src/main/java/sonia/scm/annotation/SubscriberElement.java
diff --git a/scm-core/pom.xml b/scm-core/pom.xml
index 17567da1b7..7eceb76375 100644
--- a/scm-core/pom.xml
+++ b/scm-core/pom.xml
@@ -108,7 +108,7 @@
     <!-- annotation processor -->
     
     <dependency>
-      <groupId>sonia.scm.maven</groupId>
+      <groupId>sonia.scm</groupId>
       <artifactId>scm-annotation-processor</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <scope>provided</scope>
diff --git a/scm-maven-plugins/pom.xml b/scm-maven-plugins/pom.xml
deleted file mode 100644
index 9a6d4b4d19..0000000000
--- a/scm-maven-plugins/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>sonia.scm</groupId>
-    <artifactId>scm</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
-
-  <groupId>sonia.scm.maven</groupId>
-  <artifactId>scm-maven-plugins</artifactId>
-  <packaging>pom</packaging>
-  <version>2.0.0-SNAPSHOT</version>
-  <name>scm-maven-plugins</name>
-
-  <modules>
-    <module>scm-annotation-processor</module>
-  </modules>
-
-</project>
diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml
index 99672b02bb..9cfcc9585e 100644
--- a/scm-plugins/pom.xml
+++ b/scm-plugins/pom.xml
@@ -40,7 +40,7 @@
     <!-- annotation processor -->
     
     <dependency>
-      <groupId>sonia.scm.maven</groupId>
+      <groupId>sonia.scm</groupId>
       <artifactId>scm-annotation-processor</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <scope>provided</scope>
diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index f19cdc5938..17c4bd266f 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -20,7 +20,7 @@
     <!-- annotation processor -->
     
     <dependency>
-      <groupId>sonia.scm.maven</groupId>
+      <groupId>sonia.scm</groupId>
       <artifactId>scm-annotation-processor</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <scope>provided</scope>