diff --git a/src/main/java/de/ids_mannheim/korap/KorapNode.java b/src/main/java/de/ids_mannheim/korap/KorapNode.java
index d1beac0..8c34dd0 100644
--- a/src/main/java/de/ids_mannheim/korap/KorapNode.java
+++ b/src/main/java/de/ids_mannheim/korap/KorapNode.java
@@ -84,7 +84,7 @@
         // create a resource config that scans for JAX-RS resources and providers
         // in de.ids_mannheim.korap.server package
         final ResourceConfig rc =
-            new ResourceConfig().packages("de.ids_mannheim.korap.server");
+            new ResourceConfig().packages("de.ids_mannheim.korap.node");
 
         // create and start a new instance of grizzly http server
         // exposing the Jersey application at BASE_URI
@@ -96,7 +96,7 @@
         // create a resource config that scans for JAX-RS resources and providers
         // in de.ids_mannheim.korap.server package
         final ResourceConfig rc =
-            new ResourceConfig().packages("de.ids_mannheim.korap.server");
+            new ResourceConfig().packages("de.ids_mannheim.korap.node");
 
         name = nodeName;
         path = indexPath;
diff --git a/src/main/java/de/ids_mannheim/korap/server/Ping.java b/src/main/java/de/ids_mannheim/korap/node/Ping.java
similarity index 89%
rename from src/main/java/de/ids_mannheim/korap/server/Ping.java
rename to src/main/java/de/ids_mannheim/korap/node/Ping.java
index ebaba96..8ae1725 100644
--- a/src/main/java/de/ids_mannheim/korap/server/Ping.java
+++ b/src/main/java/de/ids_mannheim/korap/node/Ping.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.server;
+package de.ids_mannheim.korap.node;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
diff --git a/src/main/java/de/ids_mannheim/korap/server/Resource.java b/src/main/java/de/ids_mannheim/korap/node/Resource.java
similarity index 99%
rename from src/main/java/de/ids_mannheim/korap/server/Resource.java
rename to src/main/java/de/ids_mannheim/korap/node/Resource.java
index f27b14a..f7043e7 100644
--- a/src/main/java/de/ids_mannheim/korap/server/Resource.java
+++ b/src/main/java/de/ids_mannheim/korap/node/Resource.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.server;
+package de.ids_mannheim.korap.node;
 
 import java.io.*;
 
diff --git a/src/test/java/de/ids_mannheim/korap/server/TestDatabase.java b/src/test/java/de/ids_mannheim/korap/node/TestDatabase.java
similarity index 99%
rename from src/test/java/de/ids_mannheim/korap/server/TestDatabase.java
rename to src/test/java/de/ids_mannheim/korap/node/TestDatabase.java
index 009e50e..0c26021 100644
--- a/src/test/java/de/ids_mannheim/korap/server/TestDatabase.java
+++ b/src/test/java/de/ids_mannheim/korap/node/TestDatabase.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.server;
+package de.ids_mannheim.korap.node;
 
 import de.ids_mannheim.korap.index.MatchCollector;
 import de.ids_mannheim.korap.index.collector.MatchCollectorDB;
diff --git a/src/test/java/de/ids_mannheim/korap/server/TestResource.java b/src/test/java/de/ids_mannheim/korap/node/TestResource.java
similarity index 98%
rename from src/test/java/de/ids_mannheim/korap/server/TestResource.java
rename to src/test/java/de/ids_mannheim/korap/node/TestResource.java
index de1a572..da10c71 100644
--- a/src/test/java/de/ids_mannheim/korap/server/TestResource.java
+++ b/src/test/java/de/ids_mannheim/korap/node/TestResource.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.server;
+package de.ids_mannheim.korap.node;
 
 /*
   http://harryjoy.com/2012/09/08/simple-rest-client-in-java/