diff --git a/src/main/java/hello/agh/edu/bazy/controllers/GisController.java b/src/main/java/hello/agh/edu/bazy/controllers/GisController.java
index 65be9fd..a58c8de 100644
--- a/src/main/java/hello/agh/edu/bazy/controllers/GisController.java
+++ b/src/main/java/hello/agh/edu/bazy/controllers/GisController.java
@@ -1,10 +1,9 @@
 package hello.agh.edu.bazy.controllers;
 
-import hello.APIServicePaths;
+import hello.agh.edu.bazy.path.APIServicePaths;
 import hello.agh.edu.bazy.dbApi.gis.GisdbApi;
 import hello.agh.edu.bazy.model.Location;
 import hello.agh.edu.bazy.row.gis.GisLamp;
-import hello.agh.edu.bazy.row.gis.GisPoint;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/hello/agh/edu/bazy/controllers/LoginController.java b/src/main/java/hello/agh/edu/bazy/controllers/LoginController.java
index f80a856..71b4c55 100644
--- a/src/main/java/hello/agh/edu/bazy/controllers/LoginController.java
+++ b/src/main/java/hello/agh/edu/bazy/controllers/LoginController.java
@@ -1,7 +1,7 @@
 package hello.agh.edu.bazy.controllers;
 
-import hello.APIServicePaths;
-import hello.ModuleServicePaths;
+import hello.agh.edu.bazy.path.APIServicePaths;
+import hello.agh.edu.bazy.path.ModuleServicePaths;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
diff --git a/src/main/java/hello/agh/edu/bazy/controllers/SensorsController.java b/src/main/java/hello/agh/edu/bazy/controllers/SensorsController.java
index ea2d7fd..6835dfc 100644
--- a/src/main/java/hello/agh/edu/bazy/controllers/SensorsController.java
+++ b/src/main/java/hello/agh/edu/bazy/controllers/SensorsController.java
@@ -1,6 +1,6 @@
 package hello.agh.edu.bazy.controllers;
 
-import hello.APIServicePaths;
+import hello.agh.edu.bazy.path.APIServicePaths;
 import hello.agh.edu.bazy.row.sensors.*;
 import hello.agh.edu.bazy.dbApi.sensors.SensorsdbApi;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/hello/RequestInterceptor.java b/src/main/java/hello/agh/edu/bazy/interceptor/RequestInterceptor.java
similarity index 96%
rename from src/main/java/hello/RequestInterceptor.java
rename to src/main/java/hello/agh/edu/bazy/interceptor/RequestInterceptor.java
index 77c6201..d59c0d7 100644
--- a/src/main/java/hello/RequestInterceptor.java
+++ b/src/main/java/hello/agh/edu/bazy/interceptor/RequestInterceptor.java
@@ -1,6 +1,7 @@
-package hello;
+package hello.agh.edu.bazy.interceptor;
 
 
+import hello.agh.edu.bazy.path.ModuleServicePaths;
 import hello.agh.edu.bazy.controllers.LoginController;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/hello/APIServicePaths.java b/src/main/java/hello/agh/edu/bazy/path/APIServicePaths.java
similarity index 97%
rename from src/main/java/hello/APIServicePaths.java
rename to src/main/java/hello/agh/edu/bazy/path/APIServicePaths.java
index b319a35..1fc3f08 100644
--- a/src/main/java/hello/APIServicePaths.java
+++ b/src/main/java/hello/agh/edu/bazy/path/APIServicePaths.java
@@ -1,4 +1,4 @@
-package hello;
+package hello.agh.edu.bazy.path;
 
 /**
  * Created by Marcin on 2015-01-19.
diff --git a/src/main/java/hello/ModuleServicePaths.java b/src/main/java/hello/agh/edu/bazy/path/ModuleServicePaths.java
similarity index 95%
rename from src/main/java/hello/ModuleServicePaths.java
rename to src/main/java/hello/agh/edu/bazy/path/ModuleServicePaths.java
index 0f77e5a..3fc8bb4 100644
--- a/src/main/java/hello/ModuleServicePaths.java
+++ b/src/main/java/hello/agh/edu/bazy/path/ModuleServicePaths.java
@@ -1,4 +1,4 @@
-package hello;
+package hello.agh.edu.bazy.path;
 
 /**
  * Created by Marcin on 2015-01-19.