diff --git a/plugins/scm-git-plugin/pom.xml b/plugins/scm-git-plugin/pom.xml
index 114c1893fb..43e1eb08a4 100644
--- a/plugins/scm-git-plugin/pom.xml
+++ b/plugins/scm-git-plugin/pom.xml
@@ -18,12 +18,6 @@
   <description>Plugin for the version control system Git</description>
 
   <dependencies>
-    
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-web-api</artifactId>
-      <version>1.0-M3-SNAPSHOT</version>
-    </dependency>
 
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/plugins/scm-graph-plugin/pom.xml b/plugins/scm-graph-plugin/pom.xml
index a21eca85c5..c5d3d17f0d 100644
--- a/plugins/scm-graph-plugin/pom.xml
+++ b/plugins/scm-graph-plugin/pom.xml
@@ -25,12 +25,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-web-api</artifactId>
-      <version>1.0-M3-SNAPSHOT</version>
-    </dependency>
-
     <dependency>
       <groupId>com.google.inject.extensions</groupId>
       <artifactId>guice-grapher</artifactId>
diff --git a/plugins/scm-hg-plugin/pom.xml b/plugins/scm-hg-plugin/pom.xml
index 3582dcae95..bccf7cc264 100644
--- a/plugins/scm-hg-plugin/pom.xml
+++ b/plugins/scm-hg-plugin/pom.xml
@@ -26,12 +26,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-web-api</artifactId>
-      <version>1.0-M3-SNAPSHOT</version>
-    </dependency>
-
   </dependencies>
  
 </project>
diff --git a/plugins/scm-svn-plugin/pom.xml b/plugins/scm-svn-plugin/pom.xml
index 9030835142..bcbbee4aeb 100644
--- a/plugins/scm-svn-plugin/pom.xml
+++ b/plugins/scm-svn-plugin/pom.xml
@@ -19,12 +19,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-web-api</artifactId>
-      <version>1.0-M3-SNAPSHOT</version>
-    </dependency>
-
     <dependency>
       <groupId>org.tmatesoft.svnkit</groupId>
       <artifactId>svnkit</artifactId>
diff --git a/pom.xml b/pom.xml
index 13f3fcd851..10542a3b56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,8 @@
   <modules>
     <module>third-party</module>
     <module>scm-core</module>
+    <module>scm-test</module>
     <module>maven</module>
-    <module>scm-cli</module>
-    <module>scm-web-api</module>
     <module>scm-server-api</module>
     <module>scm-server-jetty</module>
     <module>plugins</module>
@@ -70,14 +69,14 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.2</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.5</version>
+      <version>${mokito.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -251,6 +250,8 @@
   </profiles>
 
   <properties>
+    <mokito.version>1.8.5</mokito.version>
+    <junit.version>4.8.2</junit.version>
     <slf4j.version>1.6.1</slf4j.version>
     <servlet.version>2.5</servlet.version>
     <guice.version>2.0</guice.version>
@@ -261,4 +262,4 @@
     <netbeans.hint.license>SCM-BSD</netbeans.hint.license>
   </properties>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/samples/scm-sample-auth/pom.xml b/samples/scm-sample-auth/pom.xml
index 9289b35816..f73dc4e816 100644
--- a/samples/scm-sample-auth/pom.xml
+++ b/samples/scm-sample-auth/pom.xml
@@ -32,12 +32,6 @@
       <version>1.0-M3-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-web-api</artifactId>
-      <version>1.0-M3-SNAPSHOT</version>
-    </dependency>
-
   </dependencies>
   
 </project>
diff --git a/scm-cli/pom.xml b/scm-cli/pom.xml
deleted file mode 100644
index 206accefad..0000000000
--- a/scm-cli/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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-M3-SNAPSHOT</version>
-  </parent>
-
-  <groupId>sonia.scm</groupId>
-  <artifactId>scm-cli</artifactId>
-  <version>1.0-M3-SNAPSHOT</version>
-  <name>scm-cli</name>
-
-</project>
diff --git a/scm-core/pom.xml b/scm-core/pom.xml
index 12d041c837..6c16ebfef6 100644
--- a/scm-core/pom.xml
+++ b/scm-core/pom.xml
@@ -17,6 +17,13 @@
 
   <dependencies>
 
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${servlet.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
@@ -29,6 +36,20 @@
       <version>${guice.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.google.inject.extensions</groupId>
+      <artifactId>guice-servlet</artifactId>
+      <version>${guice.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
+
+    <!-- test scope -->
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
diff --git a/scm-cli/src/main/java/sonia/scm/cli/Argument.java b/scm-core/src/main/java/sonia/scm/cli/Argument.java
similarity index 100%
rename from scm-cli/src/main/java/sonia/scm/cli/Argument.java
rename to scm-core/src/main/java/sonia/scm/cli/Argument.java
diff --git a/scm-cli/src/main/java/sonia/scm/cli/CliException.java b/scm-core/src/main/java/sonia/scm/cli/CliException.java
similarity index 100%
rename from scm-cli/src/main/java/sonia/scm/cli/CliException.java
rename to scm-core/src/main/java/sonia/scm/cli/CliException.java
diff --git a/scm-cli/src/main/java/sonia/scm/cli/CliHelpBuilder.java b/scm-core/src/main/java/sonia/scm/cli/CliHelpBuilder.java
similarity index 100%
rename from scm-cli/src/main/java/sonia/scm/cli/CliHelpBuilder.java
rename to scm-core/src/main/java/sonia/scm/cli/CliHelpBuilder.java
diff --git a/scm-cli/src/main/java/sonia/scm/cli/CliParser.java b/scm-core/src/main/java/sonia/scm/cli/CliParser.java
similarity index 100%
rename from scm-cli/src/main/java/sonia/scm/cli/CliParser.java
rename to scm-core/src/main/java/sonia/scm/cli/CliParser.java
diff --git a/scm-cli/src/main/java/sonia/scm/cli/CliRequiredException.java b/scm-core/src/main/java/sonia/scm/cli/CliRequiredException.java
similarity index 100%
rename from scm-cli/src/main/java/sonia/scm/cli/CliRequiredException.java
rename to scm-core/src/main/java/sonia/scm/cli/CliRequiredException.java
diff --git a/scm-cli/src/main/java/sonia/scm/cli/ConvertUtil.java b/scm-core/src/main/java/sonia/scm/cli/ConvertUtil.java
similarity index 100%
rename from scm-cli/src/main/java/sonia/scm/cli/ConvertUtil.java
rename to scm-core/src/main/java/sonia/scm/cli/ConvertUtil.java
diff --git a/scm-cli/src/main/java/sonia/scm/cli/DefaultCliHelpBuilder.java b/scm-core/src/main/java/sonia/scm/cli/DefaultCliHelpBuilder.java
similarity index 100%
rename from scm-cli/src/main/java/sonia/scm/cli/DefaultCliHelpBuilder.java
rename to scm-core/src/main/java/sonia/scm/cli/DefaultCliHelpBuilder.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/cgi/AbstractCGIServlet.java b/scm-core/src/main/java/sonia/scm/web/cgi/AbstractCGIServlet.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/cgi/AbstractCGIServlet.java
rename to scm-core/src/main/java/sonia/scm/web/cgi/AbstractCGIServlet.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/cgi/CGIRunner.java b/scm-core/src/main/java/sonia/scm/web/cgi/CGIRunner.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/cgi/CGIRunner.java
rename to scm-core/src/main/java/sonia/scm/web/cgi/CGIRunner.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/cgi/EnvList.java b/scm-core/src/main/java/sonia/scm/web/cgi/EnvList.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/cgi/EnvList.java
rename to scm-core/src/main/java/sonia/scm/web/cgi/EnvList.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java
rename to scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/filter/HttpFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/HttpFilter.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/filter/HttpFilter.java
rename to scm-core/src/main/java/sonia/scm/web/filter/HttpFilter.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/filter/LoggingFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/LoggingFilter.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/filter/LoggingFilter.java
rename to scm-core/src/main/java/sonia/scm/web/filter/LoggingFilter.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/filter/PermissionFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/PermissionFilter.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/filter/PermissionFilter.java
rename to scm-core/src/main/java/sonia/scm/web/filter/PermissionFilter.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/filter/RegexPermissionFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/RegexPermissionFilter.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/filter/RegexPermissionFilter.java
rename to scm-core/src/main/java/sonia/scm/web/filter/RegexPermissionFilter.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java b/scm-core/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java
rename to scm-core/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationHandler.java b/scm-core/src/main/java/sonia/scm/web/security/AuthenticationHandler.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationHandler.java
rename to scm-core/src/main/java/sonia/scm/web/security/AuthenticationHandler.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationManager.java b/scm-core/src/main/java/sonia/scm/web/security/AuthenticationManager.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationManager.java
rename to scm-core/src/main/java/sonia/scm/web/security/AuthenticationManager.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationResult.java b/scm-core/src/main/java/sonia/scm/web/security/AuthenticationResult.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationResult.java
rename to scm-core/src/main/java/sonia/scm/web/security/AuthenticationResult.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationState.java b/scm-core/src/main/java/sonia/scm/web/security/AuthenticationState.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationState.java
rename to scm-core/src/main/java/sonia/scm/web/security/AuthenticationState.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/BasicSecurityContext.java b/scm-core/src/main/java/sonia/scm/web/security/BasicSecurityContext.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/security/BasicSecurityContext.java
rename to scm-core/src/main/java/sonia/scm/web/security/BasicSecurityContext.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/ChainAuthenticatonManager.java b/scm-core/src/main/java/sonia/scm/web/security/ChainAuthenticatonManager.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/security/ChainAuthenticatonManager.java
rename to scm-core/src/main/java/sonia/scm/web/security/ChainAuthenticatonManager.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/WebSecurityContext.java b/scm-core/src/main/java/sonia/scm/web/security/WebSecurityContext.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/security/WebSecurityContext.java
rename to scm-core/src/main/java/sonia/scm/web/security/WebSecurityContext.java
diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/XmlAuthenticationHandler.java b/scm-core/src/main/java/sonia/scm/web/security/XmlAuthenticationHandler.java
similarity index 100%
rename from scm-web-api/src/main/java/sonia/scm/web/security/XmlAuthenticationHandler.java
rename to scm-core/src/main/java/sonia/scm/web/security/XmlAuthenticationHandler.java
diff --git a/scm-core/src/test/java/sonia/scm/repository/PermissionUtilTest.java b/scm-core/src/test/java/sonia/scm/repository/PermissionUtilTest.java
index 964408cd51..3b44ade372 100644
--- a/scm-core/src/test/java/sonia/scm/repository/PermissionUtilTest.java
+++ b/scm-core/src/test/java/sonia/scm/repository/PermissionUtilTest.java
@@ -44,6 +44,10 @@ import static org.junit.Assert.*;
 //~--- JDK imports ------------------------------------------------------------
 
 import java.util.Arrays;
+import sonia.scm.repository.Permission;
+import sonia.scm.repository.PermissionType;
+import sonia.scm.repository.PermissionUtil;
+import sonia.scm.repository.Repository;
 
 /**
  *
diff --git a/scm-server-api/pom.xml b/scm-server-api/pom.xml
index cc52104c7e..4a3d8985b1 100644
--- a/scm-server-api/pom.xml
+++ b/scm-server-api/pom.xml
@@ -23,12 +23,6 @@
       <version>1.0-M3-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-cli</artifactId>
-      <version>1.0-M3-SNAPSHOT</version>
-    </dependency>
-    
   </dependencies>
 
 </project>
diff --git a/scm-web-api/pom.xml b/scm-test/pom.xml
similarity index 55%
rename from scm-web-api/pom.xml
rename to scm-test/pom.xml
index 2f4a5d6822..2184f993b0 100644
--- a/scm-web-api/pom.xml
+++ b/scm-test/pom.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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>
     <artifactId>scm</artifactId>
     <groupId>sonia.scm</groupId>
@@ -11,37 +11,30 @@
   </parent>
 
   <groupId>sonia.scm</groupId>
-  <artifactId>scm-web-api</artifactId>
+  <artifactId>scm-test</artifactId>
   <version>1.0-M3-SNAPSHOT</version>
-  <name>scm-web-api</name>
-
+  <name>scm-test</name>
+  
   <dependencies>
 
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>${servlet.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>sonia.scm</groupId>
       <artifactId>scm-core</artifactId>
       <version>1.0-M3-SNAPSHOT</version>
     </dependency>
-
+    
     <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-      <version>${jersey.version}</version>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-servlet</artifactId>
-      <version>${guice.version}</version>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>${mokito.version}</version>
     </dependency>
 
   </dependencies>
-
+  
 </project>
diff --git a/scm-core/src/test/java/sonia/scm/ManagerTestBase.java b/scm-test/src/main/java/sonia/scm/ManagerTestBase.java
similarity index 100%
rename from scm-core/src/test/java/sonia/scm/ManagerTestBase.java
rename to scm-test/src/main/java/sonia/scm/ManagerTestBase.java
diff --git a/scm-core/src/test/java/sonia/scm/repository/DummyRepositoryHandler.java b/scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java
similarity index 100%
rename from scm-core/src/test/java/sonia/scm/repository/DummyRepositoryHandler.java
rename to scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java
diff --git a/scm-core/src/test/java/sonia/scm/repository/RepositoryManagerTestBase.java b/scm-test/src/main/java/sonia/scm/repository/RepositoryManagerTestBase.java
similarity index 100%
rename from scm-core/src/test/java/sonia/scm/repository/RepositoryManagerTestBase.java
rename to scm-test/src/main/java/sonia/scm/repository/RepositoryManagerTestBase.java
diff --git a/scm-core/src/test/java/sonia/scm/user/UserManagerTestBase.java b/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java
similarity index 100%
rename from scm-core/src/test/java/sonia/scm/user/UserManagerTestBase.java
rename to scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java
diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 4740064b2f..3f8726e052 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -31,12 +31,6 @@
       <version>1.0-M3-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-web-api</artifactId>
-      <version>1.0-M3-SNAPSHOT</version>
-    </dependency>
-
     <dependency>
       <groupId>sonia.scm.plugins</groupId>
       <artifactId>scm-hg-plugin</artifactId>
@@ -103,6 +97,15 @@
       <version>${ehcache.version}</version>
     </dependency>
 
+    <!-- test scope -->
+
+    <dependency>
+      <groupId>sonia.scm</groupId>
+      <artifactId>scm-test</artifactId>
+      <version>1.0-M3-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
diff --git a/scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java b/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java
similarity index 100%
rename from scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java
rename to scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java
diff --git a/scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryList.java b/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryList.java
similarity index 100%
rename from scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryList.java
rename to scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryList.java
diff --git a/scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java
similarity index 100%
rename from scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java
rename to scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java
diff --git a/scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java b/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java
similarity index 100%
rename from scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java
rename to scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java
diff --git a/scm-core/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java b/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java
similarity index 100%
rename from scm-core/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java
rename to scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java
diff --git a/scm-core/src/main/java/sonia/scm/user/xml/XmlUserList.java b/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserList.java
similarity index 100%
rename from scm-core/src/main/java/sonia/scm/user/xml/XmlUserList.java
rename to scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserList.java
diff --git a/scm-core/src/main/java/sonia/scm/user/xml/XmlUserManager.java b/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserManager.java
similarity index 100%
rename from scm-core/src/main/java/sonia/scm/user/xml/XmlUserManager.java
rename to scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserManager.java
diff --git a/scm-core/src/main/java/sonia/scm/user/xml/XmlUserMapAdapter.java b/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserMapAdapter.java
similarity index 100%
rename from scm-core/src/main/java/sonia/scm/user/xml/XmlUserMapAdapter.java
rename to scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserMapAdapter.java
diff --git a/scm-core/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java b/scm-webapp/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java
similarity index 100%
rename from scm-core/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java
rename to scm-webapp/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java
diff --git a/scm-core/src/test/java/sonia/scm/user/XmlUserManagerTest.java b/scm-webapp/src/test/java/sonia/scm/user/XmlUserManagerTest.java
similarity index 100%
rename from scm-core/src/test/java/sonia/scm/user/XmlUserManagerTest.java
rename to scm-webapp/src/test/java/sonia/scm/user/XmlUserManagerTest.java