diff --git a/mockserver-client/pom.xml b/mockserver-client/pom.xml
new file mode 100644
index 0000000..660594b
--- /dev/null
+++ b/mockserver-client/pom.xml
@@ -0,0 +1,28 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>http-mock-server</artifactId>
+        <groupId>pl.touk.mockserver</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mockserver-client</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/src/test/groovy/pl/touk/mockserver/client/AddMockRequestData.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/AddMockRequestData.groovy
similarity index 100%
rename from src/test/groovy/pl/touk/mockserver/client/AddMockRequestData.groovy
rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/AddMockRequestData.groovy
diff --git a/src/test/groovy/pl/touk/mockserver/client/ControlServerClient.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/ControlServerClient.groovy
similarity index 100%
rename from src/test/groovy/pl/touk/mockserver/client/ControlServerClient.groovy
rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/ControlServerClient.groovy
diff --git a/src/test/groovy/pl/touk/mockserver/client/InvalidMockDefinition.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockDefinition.groovy
similarity index 100%
rename from src/test/groovy/pl/touk/mockserver/client/InvalidMockDefinition.groovy
rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/InvalidMockDefinition.groovy
diff --git a/src/test/groovy/pl/touk/mockserver/client/MockAlreadyExists.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockAlreadyExists.groovy
similarity index 100%
rename from src/test/groovy/pl/touk/mockserver/client/MockAlreadyExists.groovy
rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockAlreadyExists.groovy
diff --git a/src/test/groovy/pl/touk/mockserver/client/MockDoesNotExist.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockDoesNotExist.groovy
similarity index 100%
rename from src/test/groovy/pl/touk/mockserver/client/MockDoesNotExist.groovy
rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockDoesNotExist.groovy
diff --git a/src/test/groovy/pl/touk/mockserver/client/MockEvent.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockEvent.groovy
similarity index 100%
rename from src/test/groovy/pl/touk/mockserver/client/MockEvent.groovy
rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockEvent.groovy
diff --git a/src/test/groovy/pl/touk/mockserver/client/MockRequest.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockRequest.groovy
similarity index 100%
rename from src/test/groovy/pl/touk/mockserver/client/MockRequest.groovy
rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockRequest.groovy
diff --git a/src/test/groovy/pl/touk/mockserver/client/MockResponse.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockResponse.groovy
similarity index 100%
rename from src/test/groovy/pl/touk/mockserver/client/MockResponse.groovy
rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/MockResponse.groovy
diff --git a/src/test/groovy/pl/touk/mockserver/client/RegisteredMock.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/RegisteredMock.groovy
similarity index 100%
rename from src/test/groovy/pl/touk/mockserver/client/RegisteredMock.groovy
rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/RegisteredMock.groovy
diff --git a/src/test/groovy/pl/touk/mockserver/client/RemoveMockRequestData.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/RemoveMockRequestData.groovy
similarity index 100%
rename from src/test/groovy/pl/touk/mockserver/client/RemoveMockRequestData.groovy
rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/RemoveMockRequestData.groovy
diff --git a/src/test/groovy/pl/touk/mockserver/client/Util.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/Util.groovy
similarity index 100%
rename from src/test/groovy/pl/touk/mockserver/client/Util.groovy
rename to mockserver-client/src/main/groovy/pl/touk/mockserver/client/Util.groovy
diff --git a/mockserver-tests/pom.xml b/mockserver-tests/pom.xml
new file mode 100644
index 0000000..9fcc06a
--- /dev/null
+++ b/mockserver-tests/pom.xml
@@ -0,0 +1,47 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>http-mock-server</artifactId>
+        <groupId>pl.touk.mockserver</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mockserver-tests</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>pl.touk.mockserver</groupId>
+            <artifactId>mockserver</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>pl.touk.mockserver</groupId>
+            <artifactId>mockserver-client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy
similarity index 100%
rename from src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy
rename to mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy
diff --git a/src/test/groovy/pl/touk/mockserver/tests/ServerMockPT.groovy b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/ServerMockPT.groovy
similarity index 100%
rename from src/test/groovy/pl/touk/mockserver/tests/ServerMockPT.groovy
rename to mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/ServerMockPT.groovy
diff --git a/mockserver/pom.xml b/mockserver/pom.xml
new file mode 100644
index 0000000..3f62697
--- /dev/null
+++ b/mockserver/pom.xml
@@ -0,0 +1,29 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>http-mock-server</artifactId>
+        <groupId>pl.touk.mockserver</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mockserver</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy
similarity index 100%
rename from src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy
rename to mockserver/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy
diff --git a/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy
similarity index 100%
rename from src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy
rename to mockserver/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy
diff --git a/src/main/groovy/pl/touk/mockserver/server/HttpServerWraper.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpServerWraper.groovy
similarity index 100%
rename from src/main/groovy/pl/touk/mockserver/server/HttpServerWraper.groovy
rename to mockserver/src/main/groovy/pl/touk/mockserver/server/HttpServerWraper.groovy
diff --git a/src/main/groovy/pl/touk/mockserver/server/Main.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/Main.groovy
similarity index 100%
rename from src/main/groovy/pl/touk/mockserver/server/Main.groovy
rename to mockserver/src/main/groovy/pl/touk/mockserver/server/Main.groovy
diff --git a/src/main/groovy/pl/touk/mockserver/server/Mock.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/Mock.groovy
similarity index 100%
rename from src/main/groovy/pl/touk/mockserver/server/Mock.groovy
rename to mockserver/src/main/groovy/pl/touk/mockserver/server/Mock.groovy
diff --git a/src/main/groovy/pl/touk/mockserver/server/MockEvent.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/MockEvent.groovy
similarity index 100%
rename from src/main/groovy/pl/touk/mockserver/server/MockEvent.groovy
rename to mockserver/src/main/groovy/pl/touk/mockserver/server/MockEvent.groovy
diff --git a/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy
similarity index 100%
rename from src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy
rename to mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy
diff --git a/src/main/groovy/pl/touk/mockserver/server/MockResponse.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/MockResponse.groovy
similarity index 100%
rename from src/main/groovy/pl/touk/mockserver/server/MockResponse.groovy
rename to mockserver/src/main/groovy/pl/touk/mockserver/server/MockResponse.groovy
diff --git a/src/main/groovy/pl/touk/mockserver/server/Util.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/Util.groovy
similarity index 100%
rename from src/main/groovy/pl/touk/mockserver/server/Util.groovy
rename to mockserver/src/main/groovy/pl/touk/mockserver/server/Util.groovy
diff --git a/pom.xml b/pom.xml
index 22c8311..3b4d20d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,13 @@
 
     <groupId>pl.touk.mockserver</groupId>
     <artifactId>http-mock-server</artifactId>
+    <packaging>pom</packaging>
     <version>1.0.0-SNAPSHOT</version>
+    <modules>
+        <module>mockserver-client</module>
+        <module>mockserver</module>
+        <module>mockserver-tests</module>
+    </modules>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -22,40 +28,41 @@
         <logback-classic.version>1.0.13</logback-classic.version>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-            <version>${groovy.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.spockframework</groupId>
-            <artifactId>spock-core</artifactId>
-            <version>${spock-core.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback-classic.version}</version>
-        </dependency>
-    </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-all</artifactId>
+                <version>${groovy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${httpclient.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.spockframework</groupId>
+                <artifactId>spock-core</artifactId>
+                <version>${spock-core.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons-lang3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback-classic.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <build>
         <plugins>