diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseHandler.java b/core/src/main/java/de/ids_mannheim/korap/web/CoreResponseHandler.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseHandler.java
rename to core/src/main/java/de/ids_mannheim/korap/web/CoreResponseHandler.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/framework/AuthorizationData.java b/full/src/main/java/de/ids_mannheim/korap/authentication/http/AuthorizationData.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/framework/AuthorizationData.java
rename to full/src/main/java/de/ids_mannheim/korap/authentication/http/AuthorizationData.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/framework/HttpAuthorizationHandler.java b/full/src/main/java/de/ids_mannheim/korap/authentication/http/HttpAuthorizationHandler.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/framework/HttpAuthorizationHandler.java
rename to full/src/main/java/de/ids_mannheim/korap/authentication/http/HttpAuthorizationHandler.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/framework/TransferEncoding.java b/full/src/main/java/de/ids_mannheim/korap/authentication/http/TransferEncoding.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/framework/TransferEncoding.java
rename to full/src/main/java/de/ids_mannheim/korap/authentication/http/TransferEncoding.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionRewrite.java b/full/src/main/java/de/ids_mannheim/korap/rewrite/CollectionRewrite.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionRewrite.java
rename to full/src/main/java/de/ids_mannheim/korap/rewrite/CollectionRewrite.java