diff --git a/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java b/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
index b555efb..75bf020 100644
--- a/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
+++ b/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
@@ -28,8 +28,7 @@
      */
 
     public static final int NO_QUERY = 301;
-    // EM: e.g. vc type
-    public static final int INVALID_TYPE = 302;
+//    public static final int INVALID_TYPE = 302;
     public static final int MISSING_ATTRIBUTE = 303;
     public static final int INVALID_ATTRIBUTE = 304;
     public static final int UNSUPPORTED_VALUE = 305;
diff --git a/core/src/main/java/de/ids_mannheim/korap/user/DemoUser.java b/core/src/main/java/de/ids_mannheim/korap/user/DemoUser.java
index 2be2efb..5a48bcb 100644
--- a/core/src/main/java/de/ids_mannheim/korap/user/DemoUser.java
+++ b/core/src/main/java/de/ids_mannheim/korap/user/DemoUser.java
@@ -9,7 +9,7 @@
 @Setter
 public class DemoUser extends User implements Serializable {
     private static final long serialVersionUID = -5015206272520970500L;
-    public static final String DEMOUSER_NAME = "demo";
+    public static final String DEMOUSER_NAME = "guest";
     public static final Integer DEMOUSER_ID = 1654234534;
     private static final long ACCOUNT_CREATED = 1377102171202L;
     public static final String PASSPHRASE = "demo";
diff --git a/core/src/main/java/de/ids_mannheim/korap/security/auth/APIAuthentication.java b/full/src/main/java/de/ids_mannheim/korap/security/auth/APIAuthentication.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/security/auth/APIAuthentication.java
rename to full/src/main/java/de/ids_mannheim/korap/security/auth/APIAuthentication.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/security/auth/BasicHttpAuth.java b/full/src/main/java/de/ids_mannheim/korap/security/auth/BasicHttpAuth.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/security/auth/BasicHttpAuth.java
rename to full/src/main/java/de/ids_mannheim/korap/security/auth/BasicHttpAuth.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java b/full/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
rename to full/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/security/auth/LdapAuth3.java b/full/src/main/java/de/ids_mannheim/korap/security/auth/LdapAuth3.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/security/auth/LdapAuth3.java
rename to full/src/main/java/de/ids_mannheim/korap/security/auth/LdapAuth3.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/security/auth/LoginCounter.java b/full/src/main/java/de/ids_mannheim/korap/security/auth/LoginCounter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/security/auth/LoginCounter.java
rename to full/src/main/java/de/ids_mannheim/korap/security/auth/LoginCounter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/security/auth/SessionAuthentication.java b/full/src/main/java/de/ids_mannheim/korap/security/auth/SessionAuthentication.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/security/auth/SessionAuthentication.java
rename to full/src/main/java/de/ids_mannheim/korap/security/auth/SessionAuthentication.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/security/auth/SessionFactory.java b/full/src/main/java/de/ids_mannheim/korap/security/auth/SessionFactory.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/security/auth/SessionFactory.java
rename to full/src/main/java/de/ids_mannheim/korap/security/auth/SessionFactory.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java b/full/src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java
rename to full/src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java b/full/src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java
rename to full/src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java b/full/src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java
rename to full/src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java b/full/src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java
rename to full/src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java b/full/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java
rename to full/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java