diff --git a/pom.xml b/pom.xml
index bd853442bc..0a90e49b33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,9 +64,10 @@
   </prerequisites>
 
   <modules>
+    <module>scm-annotations</module>
+    <module>scm-maven-plugins</module>
     <module>scm-core</module>
     <module>scm-test</module>
-    <module>scm-maven-plugins</module>
     <module>scm-plugins</module>
     <module>scm-samples</module>
     <module>scm-dao-xml</module>
@@ -467,7 +468,7 @@
     <project.build.javaLevel>1.6</project.build.javaLevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <netbeans.hint.license>SCM-BSD</netbeans.hint.license>
-    <jdk.classifier />
+    <jdk.classifier/>
   </properties>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/scm-annotations/pom.xml b/scm-annotations/pom.xml
new file mode 100644
index 0000000000..7d64cf3544
--- /dev/null
+++ b/scm-annotations/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <groupId>sonia.scm</groupId>
+    <artifactId>scm</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+  
+  <groupId>sonia.scm</groupId>
+  <artifactId>scm-annotations</artifactId>
+  <version>2.0.0-SNAPSHOT</version>
+  <name>scm-annotations</name>
+
+</project>
diff --git a/scm-core/src/main/java/sonia/scm/event/Event.java b/scm-annotations/src/main/java/sonia/scm/event/Event.java
similarity index 100%
rename from scm-core/src/main/java/sonia/scm/event/Event.java
rename to scm-annotations/src/main/java/sonia/scm/event/Event.java
diff --git a/scm-core/src/main/java/sonia/scm/i18n/I18n.java b/scm-annotations/src/main/java/sonia/scm/i18n/I18n.java
similarity index 100%
rename from scm-core/src/main/java/sonia/scm/i18n/I18n.java
rename to scm-annotations/src/main/java/sonia/scm/i18n/I18n.java
diff --git a/scm-core/src/main/java/sonia/scm/plugin/ExtensionPoint.java b/scm-annotations/src/main/java/sonia/scm/plugin/ExtensionPoint.java
similarity index 100%
rename from scm-core/src/main/java/sonia/scm/plugin/ExtensionPoint.java
rename to scm-annotations/src/main/java/sonia/scm/plugin/ExtensionPoint.java
diff --git a/scm-core/src/main/java/sonia/scm/plugin/PluginAnnotation.java b/scm-annotations/src/main/java/sonia/scm/plugin/PluginAnnotation.java
similarity index 100%
rename from scm-core/src/main/java/sonia/scm/plugin/PluginAnnotation.java
rename to scm-annotations/src/main/java/sonia/scm/plugin/PluginAnnotation.java
diff --git a/scm-core/src/main/java/sonia/scm/plugin/ext/Extension.java b/scm-annotations/src/main/java/sonia/scm/plugin/ext/Extension.java
similarity index 100%
rename from scm-core/src/main/java/sonia/scm/plugin/ext/Extension.java
rename to scm-annotations/src/main/java/sonia/scm/plugin/ext/Extension.java
diff --git a/scm-core/pom.xml b/scm-core/pom.xml
index 935896b057..79b46399f7 100644
--- a/scm-core/pom.xml
+++ b/scm-core/pom.xml
@@ -25,6 +25,14 @@
       <scope>provided</scope>
     </dependency>
     
+    <!-- annotations -->
+    
+    <dependency>
+      <groupId>sonia.scm</groupId>
+      <artifactId>scm-annotations</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+    </dependency>
+    
     <!-- logging -->
 
     <dependency>
@@ -96,6 +104,15 @@
       <artifactId>commons-lang</artifactId>
       <version>2.6</version>
     </dependency>
+    
+    <!-- annotation processor -->
+    
+    <dependency>
+      <groupId>sonia.scm.maven</groupId>
+      <artifactId>scm-annotation-processor</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
 
   </dependencies>
   
diff --git a/scm-maven-plugins/scm-annotation-processor/pom.xml b/scm-maven-plugins/scm-annotation-processor/pom.xml
index 04b2de6833..b96d7f5684 100644
--- a/scm-maven-plugins/scm-annotation-processor/pom.xml
+++ b/scm-maven-plugins/scm-annotation-processor/pom.xml
@@ -17,12 +17,40 @@
   
   <dependencies>
     
+    <!-- scm annotations -->
+    
     <dependency>
       <groupId>sonia.scm</groupId>
-      <artifactId>scm-core</artifactId>
+      <artifactId>scm-annotations</artifactId>
       <version>2.0.0-SNAPSHOT</version>
     </dependency>
     
+    <!-- rest api -->
+
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
+    
+    <!-- event bus -->
+    
+    <dependency>
+      <groupId>com.github.legman</groupId>
+      <artifactId>core</artifactId>
+      <version>${legman.version}</version>
+    </dependency>
+    
+    <!-- util -->
+    
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${guava.version}</version>
+    </dependency>
+    
+    <!-- meta-inf services -->
+    
     <dependency>
       <groupId>org.kohsuke.metainf-services</groupId>
       <artifactId>metainf-services</artifactId>