diff --git a/pom.xml b/pom.xml
index 99413e8885..4d4f655f49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,7 @@
   <name>scm</name>
 
   <modules>
+    <module>scm-core</module>
     <module>scm-webapp</module>
   </modules>
 
@@ -67,5 +68,4 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-</project>
-
+</project>
\ No newline at end of file
diff --git a/scm-core/pom.xml b/scm-core/pom.xml
new file mode 100644
index 0000000000..fced383e7b
--- /dev/null
+++ b/scm-core/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <artifactId>scm</artifactId>
+    <groupId>sonia.scm</groupId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>sonia.scm</groupId>
+  <artifactId>scm-core</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>scm-core</name>
+
+</project>
diff --git a/scm-webapp/src/main/java/sonia/scm/Group.java b/scm-core/src/main/java/sonia/scm/Group.java
similarity index 100%
rename from scm-webapp/src/main/java/sonia/scm/Group.java
rename to scm-core/src/main/java/sonia/scm/Group.java
diff --git a/scm-webapp/src/main/java/sonia/scm/Repository.java b/scm-core/src/main/java/sonia/scm/Repository.java
similarity index 100%
rename from scm-webapp/src/main/java/sonia/scm/Repository.java
rename to scm-core/src/main/java/sonia/scm/Repository.java
diff --git a/scm-webapp/src/main/java/sonia/scm/RepositoryType.java b/scm-core/src/main/java/sonia/scm/RepositoryType.java
similarity index 100%
rename from scm-webapp/src/main/java/sonia/scm/RepositoryType.java
rename to scm-core/src/main/java/sonia/scm/RepositoryType.java
diff --git a/scm-webapp/src/main/java/sonia/scm/util/Util.java b/scm-core/src/main/java/sonia/scm/util/Util.java
similarity index 100%
rename from scm-webapp/src/main/java/sonia/scm/util/Util.java
rename to scm-core/src/main/java/sonia/scm/util/Util.java
diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index da0a634a1d..2b4dd5fbc2 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -24,6 +24,12 @@
       <version>6.0</version>
       <scope>provided</scope>
     </dependency>
+
+    <dependency>
+      <groupId>sonia.scm</groupId>
+      <artifactId>scm-core</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     
     <dependency>
       <groupId>com.sun.jersey</groupId>