diff --git a/src/main/groovy/com/blogspot/przybyszd/mockserver/ContextExecutor.groovy b/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy
similarity index 98%
rename from src/main/groovy/com/blogspot/przybyszd/mockserver/ContextExecutor.groovy
rename to src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy
index c44dd13..63dff2b 100644
--- a/src/main/groovy/com/blogspot/przybyszd/mockserver/ContextExecutor.groovy
+++ b/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy
@@ -1,4 +1,4 @@
-package com.blogspot.przybyszd.mockserver
+package pl.touk.mockserver.server
 
 import com.sun.net.httpserver.HttpExchange
 import groovy.util.slurpersupport.GPathResult
diff --git a/src/main/groovy/com/blogspot/przybyszd/mockserver/HttpMockServer.groovy b/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy
similarity index 98%
rename from src/main/groovy/com/blogspot/przybyszd/mockserver/HttpMockServer.groovy
rename to src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy
index 8e65820..d90dab5 100644
--- a/src/main/groovy/com/blogspot/przybyszd/mockserver/HttpMockServer.groovy
+++ b/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy
@@ -1,4 +1,4 @@
-package com.blogspot.przybyszd.mockserver
+package pl.touk.mockserver.server
 
 import com.sun.net.httpserver.HttpExchange
 import groovy.util.slurpersupport.GPathResult
diff --git a/src/main/groovy/com/blogspot/przybyszd/mockserver/HttpServerWraper.groovy b/src/main/groovy/pl/touk/mockserver/server/HttpServerWraper.groovy
similarity index 96%
rename from src/main/groovy/com/blogspot/przybyszd/mockserver/HttpServerWraper.groovy
rename to src/main/groovy/pl/touk/mockserver/server/HttpServerWraper.groovy
index 4e2d048..058fef0 100644
--- a/src/main/groovy/com/blogspot/przybyszd/mockserver/HttpServerWraper.groovy
+++ b/src/main/groovy/pl/touk/mockserver/server/HttpServerWraper.groovy
@@ -1,4 +1,4 @@
-package com.blogspot.przybyszd.mockserver
+package pl.touk.mockserver.server
 
 import com.sun.net.httpserver.HttpHandler
 import com.sun.net.httpserver.HttpServer
diff --git a/src/main/groovy/com/blogspot/przybyszd/mockserver/Main.groovy b/src/main/groovy/pl/touk/mockserver/server/Main.groovy
similarity index 90%
rename from src/main/groovy/com/blogspot/przybyszd/mockserver/Main.groovy
rename to src/main/groovy/pl/touk/mockserver/server/Main.groovy
index 66f9542..a1b4a1a 100644
--- a/src/main/groovy/com/blogspot/przybyszd/mockserver/Main.groovy
+++ b/src/main/groovy/pl/touk/mockserver/server/Main.groovy
@@ -1,4 +1,4 @@
-package com.blogspot.przybyszd.mockserver
+package pl.touk.mockserver.server
 
 class Main {
     static void main(String [] args) {
diff --git a/src/main/groovy/com/blogspot/przybyszd/mockserver/Mock.groovy b/src/main/groovy/pl/touk/mockserver/server/Mock.groovy
similarity index 91%
rename from src/main/groovy/com/blogspot/przybyszd/mockserver/Mock.groovy
rename to src/main/groovy/pl/touk/mockserver/server/Mock.groovy
index f85386a..d7110dc 100644
--- a/src/main/groovy/com/blogspot/przybyszd/mockserver/Mock.groovy
+++ b/src/main/groovy/pl/touk/mockserver/server/Mock.groovy
@@ -1,4 +1,4 @@
-package com.blogspot.przybyszd.mockserver
+package pl.touk.mockserver.server
 
 import groovy.transform.EqualsAndHashCode
 
diff --git a/src/test/groovy/MockServerTest.groovy b/src/test/groovy/pl/touk/mockserver/server/MockServerTest.groovy
similarity index 95%
rename from src/test/groovy/MockServerTest.groovy
rename to src/test/groovy/pl/touk/mockserver/server/MockServerTest.groovy
index f34fafa..98dfe1f 100644
--- a/src/test/groovy/MockServerTest.groovy
+++ b/src/test/groovy/pl/touk/mockserver/server/MockServerTest.groovy
@@ -1,13 +1,13 @@
-import com.blogspot.przybyszd.mockserver.HttpMockServer
+package pl.touk.mockserver.server
+
+import pl.touk.mockserver.server.HttpMockServer
 import groovy.util.slurpersupport.GPathResult
-import org.apache.http.HttpEntity
 import org.apache.http.client.methods.CloseableHttpResponse
 import org.apache.http.client.methods.HttpPost
 import org.apache.http.entity.ContentType
 import org.apache.http.entity.StringEntity
 import org.apache.http.impl.client.CloseableHttpClient
 import org.apache.http.impl.client.HttpClients
-import org.apache.http.util.EntityUtils
 import pl.touk.mockserver.client.AddMockRequestData
 import pl.touk.mockserver.client.ControlServerClient
 import pl.touk.mockserver.client.Util
@@ -16,8 +16,6 @@ import spock.lang.Specification
 
 class MockServerTest extends Specification{
 
-    private static final String controlServerUrl = 'http://localhost:9000/serverControl'
-
     ControlServerClient controlServerClient
 
     HttpMockServer httpMockServer