diff --git a/.github/workflows/ci_test.yml b/.github/workflows/ci_test.yml
index 61579e2..4899835 100644
--- a/.github/workflows/ci_test.yml
+++ b/.github/workflows/ci_test.yml
@@ -13,27 +13,26 @@
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Kustvakt
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: Kustvakt
 
       - name: Checkout Krill
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: KorAP/Krill
           path: Krill
-          ref: v0.61.3
 
       - name: Checkout Koral
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: KorAP/Koral
           path: Koral
-          ref: v0.41
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'temurin'
           java-version: 17
 
       - name: Build and install Krill
@@ -41,9 +40,9 @@
 
       - name: Build and install Koral
         run: mvn --file Koral/pom.xml install
-      
+
       - name: Build and package Kustvakt full
-        run: mvn clean --file Kustvakt/full/pom.xml package 
-        
+        run: mvn clean --file Kustvakt/pom.xml package
+
       - name: Build and package Kustvakt lite
-        run: mvn clean --file Kustvakt/full/pom.xml package -P lite -DskipTests=true     
+        run: mvn clean --file Kustvakt/pom.xml package -P lite -DskipTests=true
diff --git a/.gitignore b/.gitignore
index 1147d0b..a843788 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,6 @@
 /bin/
 *.sqlite
 *.bak
-/full/vc/
-/lite/krill_cache/
 **/ldap.conf
 
 icc-index
@@ -23,3 +21,41 @@
 src\main\resources\Kustvakt.conf
 /temp/
 /icc-index/
+
+# from full folder
+/*.sqlite
+/*.conf
+/*.properties
+/:memory::
+/processor/
+/testDB.sqlite-journal
+/bin/
+/default-config.xml
+/*.key
+/vc/
+/demo/
+/c3p0-config.xml
+/vc2/
+/dereko-kq-formatter.sh
+/shutdownToken
+/adminToken
+/free-resources.json
+/cache_store*
+/pipes
+/test-pipes
+/bin
+/Tools/
+/Tools/
+/target/
+/krill_cache/
+/access-rewrite-disabled-test/
+/old-logs/*
+/*.bak
+/*.sqlite
+/vc*
+/db*
+/client
+/test-config-icc.xml
+/data/
+/old-jars/
+/data-backup
\ No newline at end of file
diff --git a/full/Changes b/Changes
similarity index 99%
rename from full/Changes
rename to Changes
index f418083..0180350 100644
--- a/full/Changes
+++ b/Changes
@@ -1,4 +1,6 @@
-# version 0.72
+# version 0.72.1-SNAPSHOT
+
+# version 0.72-SNAPSHOT
 
 - Replaced javax.ws to jakarta.ws namespace (#648)
 - Upgrading Jersey 2.40 to 3.x (#646)
diff --git a/full/Changes-Core b/Changes-Core
similarity index 100%
rename from full/Changes-Core
rename to Changes-Core
diff --git a/full/Changes-Lite b/Changes-Lite
similarity index 100%
rename from full/Changes-Lite
rename to Changes-Lite
diff --git a/full/pom.xml b/pom.xml
similarity index 91%
rename from full/pom.xml
rename to pom.xml
index a944532..dcf98be 100644
--- a/full/pom.xml
+++ b/pom.xml
@@ -2,9 +2,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>de.ids_mannheim.korap</groupId>
-	<artifactId>Kustvakt-full</artifactId>
-	<version>0.72-SNAPSHOT</version>
+	<groupId>de.ids-mannheim.korap.kustvakt</groupId>
+	<artifactId>Kustvakt</artifactId>
+	<version>0.73-SNAPSHOT</version>
 	<properties>
 		<java.version>17</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -18,8 +18,8 @@
 		<jetty.version>11.0.19</jetty.version>
 		<flyway.version>10.4.1</flyway.version>
 		<log4j.version>2.22.1</log4j.version>
-		<krill.version>[0.61.3,)</krill.version>
-		<koral.version>[0.41,)</koral.version>
+		<krill.version>[0.62.0,)</krill.version>
+		<koral.version>[0.42,)</koral.version>
 	</properties>
 	<profiles>
 		<profile>
@@ -250,13 +250,62 @@
 	</build>
 
 	<dependencies>
-		<!-- backport -->
 		<dependency>
-			<groupId>backport-util-concurrent</groupId>
-			<artifactId>backport-util-concurrent</artifactId>
-			<version>3.1</version>
+			<groupId>de.ids-mannheim.korap.krill</groupId>
+			<artifactId>Krill</artifactId>
+			<version>${krill.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.jaxrs</groupId>
+					<artifactId>jackson-jaxrs-json-provider</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.glassfish.jersey.containers</groupId>
+					<artifactId>jersey-container-grizzly2-http</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-slf4j-impl</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>jul-to-slf4j</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
-
+		
+		<dependency>
+			<groupId>de.ids-mannheim.korap.koral</groupId>
+			<artifactId>Koral</artifactId>
+			<version>${koral.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-slf4j-impl</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-jul</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		
 		<!-- Jersey -->
 		<dependency>
 			<groupId>org.glassfish.jersey.core</groupId>
@@ -271,7 +320,7 @@
 			<!-- as long as we set spring6.version property transitive deps are ok 
 			-->
 		</dependency>
-
+		
 		<!-- JSON -->
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
@@ -287,13 +336,6 @@
 			<version>2.5.0</version>
 		</dependency>
 
-		<!-- Flyway -->
-		<dependency>
-			<groupId>org.flywaydb</groupId>
-			<artifactId>flyway-core</artifactId>
-			<version>${flyway.version}</version>
-		</dependency>
-
 		<!-- Logging -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
@@ -340,122 +382,13 @@
 			<version>3.30.2-GA</version>
 		</dependency>
 
-		<!-- EM:done -->
-
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>2.12.5</version>
-		</dependency>
-		<dependency>
-			<groupId>de.ids_mannheim.korap</groupId>
-			<artifactId>Koral</artifactId>
-			<version>${koral.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.sonatype.sisu</groupId>
-					<artifactId>sisu-guava</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.eclipse.jetty</groupId>
-					<artifactId>jetty-servlet</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.logging.log4j</groupId>
-					<artifactId>log4j-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.logging.log4j</groupId>
-					<artifactId>log4j-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.logging.log4j</groupId>
-					<artifactId>log4j-slf4j-impl</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.logging.log4j</groupId>
-					<artifactId>log4j-jul</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.xerial</groupId>
-			<artifactId>sqlite-jdbc</artifactId>
-			<version>3.42.0.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-dbcp2</artifactId>
-			<version>2.9.0</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-validator</groupId>
-			<artifactId>commons-validator</artifactId>
-			<version>1.8.0</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
+		<!-- Encryption -->
 		<dependency>
 			<groupId>org.mindrot</groupId>
 			<artifactId>jbcrypt</artifactId>
 			<version>0.4</version>
 		</dependency>
 
-		<dependency>
-			<groupId>de.ids_mannheim.korap</groupId>
-			<artifactId>Krill</artifactId>
-			<version>${krill.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.jaxrs</groupId>
-					<artifactId>jackson-jaxrs-json-provider</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.glassfish.jersey.containers</groupId>
-					<artifactId>jersey-container-grizzly2-http</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.xerial</groupId>
-					<artifactId>sqlite-jdbc</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.logging.log4j</groupId>
-					<artifactId>log4j-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.logging.log4j</groupId>
-					<artifactId>log4j-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.logging.log4j</groupId>
-					<artifactId>log4j-slf4j-impl</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>jul-to-slf4j</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.reflections</groupId>
-			<artifactId>reflections</artifactId>
-			<version>0.10.2</version>
-		</dependency>
-
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -473,11 +406,6 @@
 			<version>${spring.version}</version>
 		</dependency>
 
-		<!-- <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-core</artifactId> 
-			<version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework.security</groupId> 
-			<artifactId>spring-security-web</artifactId> <version>${spring.version}</version> 
-			</dependency> -->
-		<!-- EM: done -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
@@ -508,14 +436,6 @@
 			<version>${spring.version}</version>
 		</dependency>
 
-		<!-- end copy -->
-
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>3.2.2</version>
-		</dependency>
-
 		<!-- jetty -->
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
@@ -533,12 +453,6 @@
 			<version>${jetty.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>asm</groupId>
-			<artifactId>asm</artifactId>
-			<version>3.3.1</version>
-		</dependency>
-
 		<!-- not part of public release <dependency> <groupId>KorAP-graphDB</groupId> 
 			<artifactId>KorAP-graphDB</artifactId> <version>1.0-SNAPSHOT</version> <exclusions> 
 			<exclusion> <groupId>org.antlr</groupId> <artifactId>antlr4-runtime</artifactId> 
@@ -559,12 +473,40 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		
+		<!-- Database -->
 		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.15.1</version>
+			<groupId>org.xerial</groupId>
+			<artifactId>sqlite-jdbc</artifactId>
+			<version>3.42.0.0</version>
+		</dependency>
+		
+		<!-- MySql -->
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>8.0.30</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-dbcp2</artifactId>
+			<version>2.9.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- Flyway -->
+		<dependency>
+			<groupId>org.flywaydb</groupId>
+			<artifactId>flyway-core</artifactId>
+			<version>${flyway.version}</version>
+		</dependency>
+		
 		<!-- Hibernate -->
 		<dependency>
 			<groupId>org.hibernate.orm</groupId>
@@ -599,6 +541,7 @@
 			<version>${hibernate.version}</version>
 		</dependency>
 		
+		
 		<!-- Validation -->
 		<dependency>
 		    <groupId>org.hibernate.validator</groupId>
@@ -619,7 +562,6 @@
 			<version>3.1.0</version>
 		</dependency>
 
-		<!-- servlet -->
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>
@@ -627,16 +569,33 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<!-- Utilities -->
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>2.12.5</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.15.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-validator</groupId>
+			<artifactId>commons-validator</artifactId>
+			<version>1.8.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-text</artifactId>
 			<version>1.11.0</version>
 		</dependency>
-		<!--<dependency> <groupId>de.ids_mannheim.korap</groupId> <artifactId>Kustvakt-core</artifactId> 
-			<version>${project.version}</version> </dependency> <dependency> <groupId>de.ids_mannheim.korap</groupId> 
-			<artifactId>Kustvakt-core</artifactId> <version>${project.version}</version> 
-			<classifier>tests</classifier> <type>test-jar</type> <scope>test</scope> 
-			</dependency> -->
 
 		<!-- LDAP -->
 		<dependency>
@@ -650,28 +609,6 @@
 			<version>6.0.11</version>
 		</dependency>
 
-
-		<!-- MySql -->
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>8.0.30</version>
-		</dependency>
-
-		<!-- Jersey -->
-		<dependency>
-			<groupId>org.glassfish.jersey.test-framework</groupId>
-			<artifactId>jersey-test-framework-core</artifactId>
-			<version>${jersey.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
-			<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
-			<version>${jersey.version}</version>
-			<scope>test</scope>
-		</dependency>
-
 		<!-- velocity -->
 		<dependency>
 			<groupId>org.apache.velocity</groupId>
@@ -716,8 +653,8 @@
 			<artifactId>lombok</artifactId>
 			<version>1.18.30</version>
 		</dependency>
-
-		<!-- Mockserver -->
+		
+		<!-- Test -->
 		<dependency>
 			<groupId>org.mock-server</groupId>
 			<artifactId>mockserver-netty</artifactId>
@@ -730,5 +667,26 @@
 			<version>5.10.1</version>
 			<scope>test</scope>
 		</dependency>
+		<!-- Jersey Test -->
+		<dependency>
+			<groupId>org.glassfish.jersey.test-framework</groupId>
+			<artifactId>jersey-test-framework-core</artifactId>
+			<version>${jersey.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
+			<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+			<version>${jersey.version}</version>
+			<scope>test</scope>
+		</dependency>
+		
+		
+		<!-- Used in KustvaktClassLoader.java-->
+		<dependency>
+			<groupId>org.reflections</groupId>
+			<artifactId>reflections</artifactId>
+			<version>0.10.2</version>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/full/src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java b/src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java
rename to src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java b/src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java
rename to src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java b/src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java
rename to src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/APIAuthentication.java b/src/main/java/de/ids_mannheim/korap/authentication/APIAuthentication.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/APIAuthentication.java
rename to src/main/java/de/ids_mannheim/korap/authentication/APIAuthentication.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/AuthenticationIface.java b/src/main/java/de/ids_mannheim/korap/authentication/AuthenticationIface.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/AuthenticationIface.java
rename to src/main/java/de/ids_mannheim/korap/authentication/AuthenticationIface.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/AuthenticationManager.java b/src/main/java/de/ids_mannheim/korap/authentication/AuthenticationManager.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/AuthenticationManager.java
rename to src/main/java/de/ids_mannheim/korap/authentication/AuthenticationManager.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/BasicAuthentication.java b/src/main/java/de/ids_mannheim/korap/authentication/BasicAuthentication.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/BasicAuthentication.java
rename to src/main/java/de/ids_mannheim/korap/authentication/BasicAuthentication.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/DummyAuthenticationManager.java b/src/main/java/de/ids_mannheim/korap/authentication/DummyAuthenticationManager.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/DummyAuthenticationManager.java
rename to src/main/java/de/ids_mannheim/korap/authentication/DummyAuthenticationManager.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/KustvaktAuthenticationManager.java b/src/main/java/de/ids_mannheim/korap/authentication/KustvaktAuthenticationManager.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/KustvaktAuthenticationManager.java
rename to src/main/java/de/ids_mannheim/korap/authentication/KustvaktAuthenticationManager.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/LDAPConfig.java b/src/main/java/de/ids_mannheim/korap/authentication/LDAPConfig.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/LDAPConfig.java
rename to src/main/java/de/ids_mannheim/korap/authentication/LDAPConfig.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/LdapAuth3.java b/src/main/java/de/ids_mannheim/korap/authentication/LdapAuth3.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/LdapAuth3.java
rename to src/main/java/de/ids_mannheim/korap/authentication/LdapAuth3.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/LoginCounter.java b/src/main/java/de/ids_mannheim/korap/authentication/LoginCounter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/LoginCounter.java
rename to src/main/java/de/ids_mannheim/korap/authentication/LoginCounter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/OAuth2Authentication.java b/src/main/java/de/ids_mannheim/korap/authentication/OAuth2Authentication.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/OAuth2Authentication.java
rename to src/main/java/de/ids_mannheim/korap/authentication/OAuth2Authentication.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/SessionAuthentication.java b/src/main/java/de/ids_mannheim/korap/authentication/SessionAuthentication.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/SessionAuthentication.java
rename to src/main/java/de/ids_mannheim/korap/authentication/SessionAuthentication.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/SessionFactory.java b/src/main/java/de/ids_mannheim/korap/authentication/SessionFactory.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/authentication/SessionFactory.java
rename to src/main/java/de/ids_mannheim/korap/authentication/SessionFactory.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/http/AuthorizationData.java b/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/http/AuthorizationData.java
rename to src/main/java/de/ids_mannheim/korap/authentication/http/AuthorizationData.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/http/HttpAuthorizationHandler.java b/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/http/HttpAuthorizationHandler.java
rename to src/main/java/de/ids_mannheim/korap/authentication/http/HttpAuthorizationHandler.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/http/TransferEncoding.java b/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/http/TransferEncoding.java
rename to src/main/java/de/ids_mannheim/korap/authentication/http/TransferEncoding.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/Attributes.java b/src/main/java/de/ids_mannheim/korap/config/Attributes.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/Attributes.java
rename to src/main/java/de/ids_mannheim/korap/config/Attributes.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/BeanInjectable.java b/src/main/java/de/ids_mannheim/korap/config/BeanInjectable.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/BeanInjectable.java
rename to src/main/java/de/ids_mannheim/korap/config/BeanInjectable.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/BeansFactory.java b/src/main/java/de/ids_mannheim/korap/config/BeansFactory.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/BeansFactory.java
rename to src/main/java/de/ids_mannheim/korap/config/BeansFactory.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/ConfigLoader.java b/src/main/java/de/ids_mannheim/korap/config/ConfigLoader.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/ConfigLoader.java
rename to src/main/java/de/ids_mannheim/korap/config/ConfigLoader.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/Configurable.java b/src/main/java/de/ids_mannheim/korap/config/Configurable.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/Configurable.java
rename to src/main/java/de/ids_mannheim/korap/config/Configurable.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/ContextHolder.java b/src/main/java/de/ids_mannheim/korap/config/ContextHolder.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/ContextHolder.java
rename to src/main/java/de/ids_mannheim/korap/config/ContextHolder.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/DefaultHandler.java b/src/main/java/de/ids_mannheim/korap/config/DefaultHandler.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/DefaultHandler.java
rename to src/main/java/de/ids_mannheim/korap/config/DefaultHandler.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/FullConfiguration.java b/src/main/java/de/ids_mannheim/korap/config/FullConfiguration.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/FullConfiguration.java
rename to src/main/java/de/ids_mannheim/korap/config/FullConfiguration.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/JWTSigner.java b/src/main/java/de/ids_mannheim/korap/config/JWTSigner.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/JWTSigner.java
rename to src/main/java/de/ids_mannheim/korap/config/JWTSigner.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/KustvaktCacheable.java b/src/main/java/de/ids_mannheim/korap/config/KustvaktCacheable.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/KustvaktCacheable.java
rename to src/main/java/de/ids_mannheim/korap/config/KustvaktCacheable.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/KustvaktClassLoader.java b/src/main/java/de/ids_mannheim/korap/config/KustvaktClassLoader.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/KustvaktClassLoader.java
rename to src/main/java/de/ids_mannheim/korap/config/KustvaktClassLoader.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java b/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
rename to src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/NamedVCLoader.java b/src/main/java/de/ids_mannheim/korap/config/NamedVCLoader.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/NamedVCLoader.java
rename to src/main/java/de/ids_mannheim/korap/config/NamedVCLoader.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/ParamFields.java b/src/main/java/de/ids_mannheim/korap/config/ParamFields.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/ParamFields.java
rename to src/main/java/de/ids_mannheim/korap/config/ParamFields.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/QueryBuilderUtil.java b/src/main/java/de/ids_mannheim/korap/config/QueryBuilderUtil.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/QueryBuilderUtil.java
rename to src/main/java/de/ids_mannheim/korap/config/QueryBuilderUtil.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/Scopes.java b/src/main/java/de/ids_mannheim/korap/config/Scopes.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/Scopes.java
rename to src/main/java/de/ids_mannheim/korap/config/Scopes.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/URIParam.java b/src/main/java/de/ids_mannheim/korap/config/URIParam.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/config/URIParam.java
rename to src/main/java/de/ids_mannheim/korap/config/URIParam.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/constant/AnnotationType.java b/src/main/java/de/ids_mannheim/korap/constant/AnnotationType.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/constant/AnnotationType.java
rename to src/main/java/de/ids_mannheim/korap/constant/AnnotationType.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/constant/AuthenticationMethod.java b/src/main/java/de/ids_mannheim/korap/constant/AuthenticationMethod.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/constant/AuthenticationMethod.java
rename to src/main/java/de/ids_mannheim/korap/constant/AuthenticationMethod.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/constant/AuthenticationScheme.java b/src/main/java/de/ids_mannheim/korap/constant/AuthenticationScheme.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/constant/AuthenticationScheme.java
rename to src/main/java/de/ids_mannheim/korap/constant/AuthenticationScheme.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/constant/GroupMemberStatus.java b/src/main/java/de/ids_mannheim/korap/constant/GroupMemberStatus.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/constant/GroupMemberStatus.java
rename to src/main/java/de/ids_mannheim/korap/constant/GroupMemberStatus.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/constant/OAuth2Scope.java b/src/main/java/de/ids_mannheim/korap/constant/OAuth2Scope.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/constant/OAuth2Scope.java
rename to src/main/java/de/ids_mannheim/korap/constant/OAuth2Scope.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/constant/PredefinedRole.java b/src/main/java/de/ids_mannheim/korap/constant/PredefinedRole.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/constant/PredefinedRole.java
rename to src/main/java/de/ids_mannheim/korap/constant/PredefinedRole.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/constant/PrivilegeType.java b/src/main/java/de/ids_mannheim/korap/constant/PrivilegeType.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/constant/PrivilegeType.java
rename to src/main/java/de/ids_mannheim/korap/constant/PrivilegeType.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/constant/QueryAccessStatus.java b/src/main/java/de/ids_mannheim/korap/constant/QueryAccessStatus.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/constant/QueryAccessStatus.java
rename to src/main/java/de/ids_mannheim/korap/constant/QueryAccessStatus.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/constant/QueryType.java b/src/main/java/de/ids_mannheim/korap/constant/QueryType.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/constant/QueryType.java
rename to src/main/java/de/ids_mannheim/korap/constant/QueryType.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/constant/ResourceType.java b/src/main/java/de/ids_mannheim/korap/constant/ResourceType.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/constant/ResourceType.java
rename to src/main/java/de/ids_mannheim/korap/constant/ResourceType.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/constant/TokenType.java b/src/main/java/de/ids_mannheim/korap/constant/TokenType.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/constant/TokenType.java
rename to src/main/java/de/ids_mannheim/korap/constant/TokenType.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/constant/UserGroupStatus.java b/src/main/java/de/ids_mannheim/korap/constant/UserGroupStatus.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/constant/UserGroupStatus.java
rename to src/main/java/de/ids_mannheim/korap/constant/UserGroupStatus.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/core/entity/Annotation.java b/src/main/java/de/ids_mannheim/korap/core/entity/Annotation.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/core/entity/Annotation.java
rename to src/main/java/de/ids_mannheim/korap/core/entity/Annotation.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationKey.java b/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationKey.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationKey.java
rename to src/main/java/de/ids_mannheim/korap/core/entity/AnnotationKey.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationLayer.java b/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationLayer.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationLayer.java
rename to src/main/java/de/ids_mannheim/korap/core/entity/AnnotationLayer.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/core/entity/Resource.java b/src/main/java/de/ids_mannheim/korap/core/entity/Resource.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/core/entity/Resource.java
rename to src/main/java/de/ids_mannheim/korap/core/entity/Resource.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java b/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
rename to src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/core/service/BasicService.java b/src/main/java/de/ids_mannheim/korap/core/service/BasicService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/core/service/BasicService.java
rename to src/main/java/de/ids_mannheim/korap/core/service/BasicService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/core/service/SearchNetworkEndpoint.java b/src/main/java/de/ids_mannheim/korap/core/service/SearchNetworkEndpoint.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/core/service/SearchNetworkEndpoint.java
rename to src/main/java/de/ids_mannheim/korap/core/service/SearchNetworkEndpoint.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/core/service/SearchService.java b/src/main/java/de/ids_mannheim/korap/core/service/SearchService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/core/service/SearchService.java
rename to src/main/java/de/ids_mannheim/korap/core/service/SearchService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/core/service/StatisticService.java b/src/main/java/de/ids_mannheim/korap/core/service/StatisticService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/core/service/StatisticService.java
rename to src/main/java/de/ids_mannheim/korap/core/service/StatisticService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/core/web/controller/AnnotationController.java b/src/main/java/de/ids_mannheim/korap/core/web/controller/AnnotationController.java
similarity index 96%
rename from full/src/main/java/de/ids_mannheim/korap/core/web/controller/AnnotationController.java
rename to src/main/java/de/ids_mannheim/korap/core/web/controller/AnnotationController.java
index 1f75d3c..ae60dca 100644
--- a/full/src/main/java/de/ids_mannheim/korap/core/web/controller/AnnotationController.java
+++ b/src/main/java/de/ids_mannheim/korap/core/web/controller/AnnotationController.java
@@ -17,7 +17,6 @@
 import de.ids_mannheim.korap.web.KustvaktResponseHandler;
 import de.ids_mannheim.korap.web.filter.APIVersionFilter;
 import de.ids_mannheim.korap.web.filter.DemoUserFilter;
-import de.ids_mannheim.korap.web.filter.PiwikFilter;
 import de.ids_mannheim.korap.web.utils.ResourceFilters;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.GET;
@@ -34,8 +33,7 @@
  */
 @Controller
 @Path("/{version}/annotation/")
-@ResourceFilters({ APIVersionFilter.class, DemoUserFilter.class,
-        PiwikFilter.class })
+@ResourceFilters({ APIVersionFilter.class, DemoUserFilter.class})
 @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
 public class AnnotationController {
 
diff --git a/full/src/main/java/de/ids_mannheim/korap/core/web/controller/SearchController.java b/src/main/java/de/ids_mannheim/korap/core/web/controller/SearchController.java
similarity index 99%
rename from full/src/main/java/de/ids_mannheim/korap/core/web/controller/SearchController.java
rename to src/main/java/de/ids_mannheim/korap/core/web/controller/SearchController.java
index 042f412..e78993d 100644
--- a/full/src/main/java/de/ids_mannheim/korap/core/web/controller/SearchController.java
+++ b/src/main/java/de/ids_mannheim/korap/core/web/controller/SearchController.java
@@ -27,7 +27,6 @@
 import de.ids_mannheim.korap.web.filter.AdminFilter;
 import de.ids_mannheim.korap.web.filter.AuthenticationFilter;
 import de.ids_mannheim.korap.web.filter.DemoUserFilter;
-import de.ids_mannheim.korap.web.filter.PiwikFilter;
 import de.ids_mannheim.korap.web.utils.ResourceFilters;
 import de.ids_mannheim.korap.web.utils.SearchResourceFilters;
 import jakarta.servlet.ServletContext;
@@ -55,7 +54,7 @@
 @Controller
 @Path("/")
 @ResourceFilters({ APIVersionFilter.class, AuthenticationFilter.class,
-        DemoUserFilter.class, PiwikFilter.class })
+        DemoUserFilter.class})
 public class SearchController {
 
     private static final boolean DEBUG = false;
diff --git a/full/src/main/java/de/ids_mannheim/korap/core/web/controller/StatisticController.java b/src/main/java/de/ids_mannheim/korap/core/web/controller/StatisticController.java
similarity index 96%
rename from full/src/main/java/de/ids_mannheim/korap/core/web/controller/StatisticController.java
rename to src/main/java/de/ids_mannheim/korap/core/web/controller/StatisticController.java
index 6f86d2c..0c90f2f 100644
--- a/full/src/main/java/de/ids_mannheim/korap/core/web/controller/StatisticController.java
+++ b/src/main/java/de/ids_mannheim/korap/core/web/controller/StatisticController.java
@@ -12,7 +12,6 @@
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 import de.ids_mannheim.korap.web.CoreResponseHandler;
 import de.ids_mannheim.korap.web.filter.APIVersionFilter;
-import de.ids_mannheim.korap.web.filter.PiwikFilter;
 import de.ids_mannheim.korap.web.utils.ResourceFilters;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.GET;
@@ -36,7 +35,7 @@
  */
 @Controller
 @Path("{version}/statistics/")
-@ResourceFilters({ APIVersionFilter.class, PiwikFilter.class })
+@ResourceFilters({ APIVersionFilter.class})
 @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
 public class StatisticController {
 
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/AdminDao.java b/src/main/java/de/ids_mannheim/korap/dao/AdminDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dao/AdminDao.java
rename to src/main/java/de/ids_mannheim/korap/dao/AdminDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/AdminDaoImpl.java b/src/main/java/de/ids_mannheim/korap/dao/AdminDaoImpl.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dao/AdminDaoImpl.java
rename to src/main/java/de/ids_mannheim/korap/dao/AdminDaoImpl.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java b/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
rename to src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/DefaultSettingDao.java b/src/main/java/de/ids_mannheim/korap/dao/DefaultSettingDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dao/DefaultSettingDao.java
rename to src/main/java/de/ids_mannheim/korap/dao/DefaultSettingDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/DummyAdminDaoImpl.java b/src/main/java/de/ids_mannheim/korap/dao/DummyAdminDaoImpl.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dao/DummyAdminDaoImpl.java
rename to src/main/java/de/ids_mannheim/korap/dao/DummyAdminDaoImpl.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/PrivilegeDao.java b/src/main/java/de/ids_mannheim/korap/dao/PrivilegeDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dao/PrivilegeDao.java
rename to src/main/java/de/ids_mannheim/korap/dao/PrivilegeDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/QueryAccessDao.java b/src/main/java/de/ids_mannheim/korap/dao/QueryAccessDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dao/QueryAccessDao.java
rename to src/main/java/de/ids_mannheim/korap/dao/QueryAccessDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/QueryDao.java b/src/main/java/de/ids_mannheim/korap/dao/QueryDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dao/QueryDao.java
rename to src/main/java/de/ids_mannheim/korap/dao/QueryDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java b/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
rename to src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java b/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java
rename to src/main/java/de/ids_mannheim/korap/dao/RoleDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/UserDao.java b/src/main/java/de/ids_mannheim/korap/dao/UserDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dao/UserDao.java
rename to src/main/java/de/ids_mannheim/korap/dao/UserDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/UserGroupDao.java b/src/main/java/de/ids_mannheim/korap/dao/UserGroupDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dao/UserGroupDao.java
rename to src/main/java/de/ids_mannheim/korap/dao/UserGroupDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/UserGroupMemberDao.java b/src/main/java/de/ids_mannheim/korap/dao/UserGroupMemberDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dao/UserGroupMemberDao.java
rename to src/main/java/de/ids_mannheim/korap/dao/UserGroupMemberDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java b/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java
rename to src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/InstalledPluginDto.java b/src/main/java/de/ids_mannheim/korap/dto/InstalledPluginDto.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dto/InstalledPluginDto.java
rename to src/main/java/de/ids_mannheim/korap/dto/InstalledPluginDto.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/LayerDto.java b/src/main/java/de/ids_mannheim/korap/dto/LayerDto.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dto/LayerDto.java
rename to src/main/java/de/ids_mannheim/korap/dto/LayerDto.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/QueryAccessDto.java b/src/main/java/de/ids_mannheim/korap/dto/QueryAccessDto.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dto/QueryAccessDto.java
rename to src/main/java/de/ids_mannheim/korap/dto/QueryAccessDto.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/QueryDto.java b/src/main/java/de/ids_mannheim/korap/dto/QueryDto.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dto/QueryDto.java
rename to src/main/java/de/ids_mannheim/korap/dto/QueryDto.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/ResourceDto.java b/src/main/java/de/ids_mannheim/korap/dto/ResourceDto.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dto/ResourceDto.java
rename to src/main/java/de/ids_mannheim/korap/dto/ResourceDto.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/UserGroupDto.java b/src/main/java/de/ids_mannheim/korap/dto/UserGroupDto.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dto/UserGroupDto.java
rename to src/main/java/de/ids_mannheim/korap/dto/UserGroupDto.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/UserGroupMemberDto.java b/src/main/java/de/ids_mannheim/korap/dto/UserGroupMemberDto.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dto/UserGroupMemberDto.java
rename to src/main/java/de/ids_mannheim/korap/dto/UserGroupMemberDto.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java b/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
rename to src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/converter/QueryAccessConverter.java b/src/main/java/de/ids_mannheim/korap/dto/converter/QueryAccessConverter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dto/converter/QueryAccessConverter.java
rename to src/main/java/de/ids_mannheim/korap/dto/converter/QueryAccessConverter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/converter/QueryConverter.java b/src/main/java/de/ids_mannheim/korap/dto/converter/QueryConverter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dto/converter/QueryConverter.java
rename to src/main/java/de/ids_mannheim/korap/dto/converter/QueryConverter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java b/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java
rename to src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/converter/UserGroupConverter.java b/src/main/java/de/ids_mannheim/korap/dto/converter/UserGroupConverter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/dto/converter/UserGroupConverter.java
rename to src/main/java/de/ids_mannheim/korap/dto/converter/UserGroupConverter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/encryption/DefaultEncryption.java b/src/main/java/de/ids_mannheim/korap/encryption/DefaultEncryption.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/encryption/DefaultEncryption.java
rename to src/main/java/de/ids_mannheim/korap/encryption/DefaultEncryption.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/encryption/KustvaktEncryption.java b/src/main/java/de/ids_mannheim/korap/encryption/KustvaktEncryption.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/encryption/KustvaktEncryption.java
rename to src/main/java/de/ids_mannheim/korap/encryption/KustvaktEncryption.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/encryption/RandomCodeGenerator.java b/src/main/java/de/ids_mannheim/korap/encryption/RandomCodeGenerator.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/encryption/RandomCodeGenerator.java
rename to src/main/java/de/ids_mannheim/korap/encryption/RandomCodeGenerator.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/entity/Admin.java b/src/main/java/de/ids_mannheim/korap/entity/Admin.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/entity/Admin.java
rename to src/main/java/de/ids_mannheim/korap/entity/Admin.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/entity/DefaultSetting.java b/src/main/java/de/ids_mannheim/korap/entity/DefaultSetting.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/entity/DefaultSetting.java
rename to src/main/java/de/ids_mannheim/korap/entity/DefaultSetting.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/entity/InstalledPlugin.java b/src/main/java/de/ids_mannheim/korap/entity/InstalledPlugin.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/entity/InstalledPlugin.java
rename to src/main/java/de/ids_mannheim/korap/entity/InstalledPlugin.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/entity/Privilege.java b/src/main/java/de/ids_mannheim/korap/entity/Privilege.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/entity/Privilege.java
rename to src/main/java/de/ids_mannheim/korap/entity/Privilege.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/entity/QueryAccess.java b/src/main/java/de/ids_mannheim/korap/entity/QueryAccess.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/entity/QueryAccess.java
rename to src/main/java/de/ids_mannheim/korap/entity/QueryAccess.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/entity/QueryDO.java b/src/main/java/de/ids_mannheim/korap/entity/QueryDO.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/entity/QueryDO.java
rename to src/main/java/de/ids_mannheim/korap/entity/QueryDO.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/entity/Role.java b/src/main/java/de/ids_mannheim/korap/entity/Role.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/entity/Role.java
rename to src/main/java/de/ids_mannheim/korap/entity/Role.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/entity/UserGroup.java b/src/main/java/de/ids_mannheim/korap/entity/UserGroup.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/entity/UserGroup.java
rename to src/main/java/de/ids_mannheim/korap/entity/UserGroup.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/entity/UserGroupMember.java b/src/main/java/de/ids_mannheim/korap/entity/UserGroupMember.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/entity/UserGroupMember.java
rename to src/main/java/de/ids_mannheim/korap/entity/UserGroupMember.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/exceptions/DatabaseException.java b/src/main/java/de/ids_mannheim/korap/exceptions/DatabaseException.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/exceptions/DatabaseException.java
rename to src/main/java/de/ids_mannheim/korap/exceptions/DatabaseException.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/exceptions/EmptyResultException.java b/src/main/java/de/ids_mannheim/korap/exceptions/EmptyResultException.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/exceptions/EmptyResultException.java
rename to src/main/java/de/ids_mannheim/korap/exceptions/EmptyResultException.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/exceptions/KustvaktException.java b/src/main/java/de/ids_mannheim/korap/exceptions/KustvaktException.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/exceptions/KustvaktException.java
rename to src/main/java/de/ids_mannheim/korap/exceptions/KustvaktException.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java b/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
rename to src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/exceptions/WrappedException.java b/src/main/java/de/ids_mannheim/korap/exceptions/WrappedException.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/exceptions/WrappedException.java
rename to src/main/java/de/ids_mannheim/korap/exceptions/WrappedException.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/handlers/BatchBuilder.java b/src/main/java/de/ids_mannheim/korap/handlers/BatchBuilder.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/handlers/BatchBuilder.java
rename to src/main/java/de/ids_mannheim/korap/handlers/BatchBuilder.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/handlers/RowMapperFactory.java b/src/main/java/de/ids_mannheim/korap/handlers/RowMapperFactory.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/handlers/RowMapperFactory.java
rename to src/main/java/de/ids_mannheim/korap/handlers/RowMapperFactory.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/init/Initializator.java b/src/main/java/de/ids_mannheim/korap/init/Initializator.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/init/Initializator.java
rename to src/main/java/de/ids_mannheim/korap/init/Initializator.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java b/src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java
rename to src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/interfaces/EntityHandlerIface.java b/src/main/java/de/ids_mannheim/korap/interfaces/EntityHandlerIface.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/interfaces/EntityHandlerIface.java
rename to src/main/java/de/ids_mannheim/korap/interfaces/EntityHandlerIface.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/interfaces/KustvaktTypeInterface.java b/src/main/java/de/ids_mannheim/korap/interfaces/KustvaktTypeInterface.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/interfaces/KustvaktTypeInterface.java
rename to src/main/java/de/ids_mannheim/korap/interfaces/KustvaktTypeInterface.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/constant/OAuth2ClientType.java b/src/main/java/de/ids_mannheim/korap/oauth2/constant/OAuth2ClientType.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/constant/OAuth2ClientType.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/constant/OAuth2ClientType.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/constant/OAuth2Error.java b/src/main/java/de/ids_mannheim/korap/oauth2/constant/OAuth2Error.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/constant/OAuth2Error.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/constant/OAuth2Error.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessScopeDao.java b/src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessScopeDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessScopeDao.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessScopeDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessTokenDao.java b/src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessTokenDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessTokenDao.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/dao/AccessTokenDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AuthorizationDao.java b/src/main/java/de/ids_mannheim/korap/oauth2/dao/AuthorizationDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AuthorizationDao.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/dao/AuthorizationDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AuthorizationDaoImpl.java b/src/main/java/de/ids_mannheim/korap/oauth2/dao/AuthorizationDaoImpl.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/dao/AuthorizationDaoImpl.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/dao/AuthorizationDaoImpl.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/CachedAuthorizationDaoImpl.java b/src/main/java/de/ids_mannheim/korap/oauth2/dao/CachedAuthorizationDaoImpl.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/dao/CachedAuthorizationDaoImpl.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/dao/CachedAuthorizationDaoImpl.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/InstalledPluginDao.java b/src/main/java/de/ids_mannheim/korap/oauth2/dao/InstalledPluginDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/dao/InstalledPluginDao.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/dao/InstalledPluginDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/OAuth2ClientDao.java b/src/main/java/de/ids_mannheim/korap/oauth2/dao/OAuth2ClientDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/dao/OAuth2ClientDao.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/dao/OAuth2ClientDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dao/RefreshTokenDao.java b/src/main/java/de/ids_mannheim/korap/oauth2/dao/RefreshTokenDao.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/dao/RefreshTokenDao.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/dao/RefreshTokenDao.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2ClientDto.java b/src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2ClientDto.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2ClientDto.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2ClientDto.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2ClientInfoDto.java b/src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2ClientInfoDto.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2ClientInfoDto.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2ClientInfoDto.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2TokenDto.java b/src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2TokenDto.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2TokenDto.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2TokenDto.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2UserClientDto.java b/src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2UserClientDto.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2UserClientDto.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/dto/OAuth2UserClientDto.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/entity/AccessScope.java b/src/main/java/de/ids_mannheim/korap/oauth2/entity/AccessScope.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/entity/AccessScope.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/entity/AccessScope.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/entity/AccessToken.java b/src/main/java/de/ids_mannheim/korap/oauth2/entity/AccessToken.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/entity/AccessToken.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/entity/AccessToken.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/entity/Authorization.java b/src/main/java/de/ids_mannheim/korap/oauth2/entity/Authorization.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/entity/Authorization.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/entity/Authorization.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/entity/OAuth2Client.java b/src/main/java/de/ids_mannheim/korap/oauth2/entity/OAuth2Client.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/entity/OAuth2Client.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/entity/OAuth2Client.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/entity/RefreshToken.java b/src/main/java/de/ids_mannheim/korap/oauth2/entity/RefreshToken.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/entity/RefreshToken.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/entity/RefreshToken.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/service/DummyOAuth2ScopeServiceImpl.java b/src/main/java/de/ids_mannheim/korap/oauth2/service/DummyOAuth2ScopeServiceImpl.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/service/DummyOAuth2ScopeServiceImpl.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/service/DummyOAuth2ScopeServiceImpl.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2AdminService.java b/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2AdminService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2AdminService.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2AdminService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2AuthorizationService.java b/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2AuthorizationService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2AuthorizationService.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2AuthorizationService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ClientService.java b/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ClientService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ClientService.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ClientService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2InitClientService.java b/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2InitClientService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2InitClientService.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2InitClientService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ScopeService.java b/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ScopeService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ScopeService.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ScopeService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ScopeServiceImpl.java b/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ScopeServiceImpl.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ScopeServiceImpl.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ScopeServiceImpl.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2TokenService.java b/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2TokenService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2TokenService.java
rename to src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2TokenService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java b/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java
similarity index 97%
rename from full/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java
rename to src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java
index f827871..5aacdd5 100644
--- a/full/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java
+++ b/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java
@@ -1,5 +1,6 @@
 package de.ids_mannheim.korap.rewrite;
 
+import java.util.Arrays;
 import java.util.Iterator;
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -7,7 +8,6 @@
 
 import de.ids_mannheim.korap.config.KustvaktConfiguration;
 import de.ids_mannheim.korap.user.User;
-import edu.emory.mathcs.backport.java.util.Arrays;
 
 /**
  * EM: not used anymore. This rewrite was to remove an empty koral:doc
diff --git a/full/src/main/java/de/ids_mannheim/korap/rewrite/CollectionConstraint.java b/src/main/java/de/ids_mannheim/korap/rewrite/CollectionConstraint.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/rewrite/CollectionConstraint.java
rename to src/main/java/de/ids_mannheim/korap/rewrite/CollectionConstraint.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/rewrite/CollectionRewrite.java b/src/main/java/de/ids_mannheim/korap/rewrite/CollectionRewrite.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/rewrite/CollectionRewrite.java
rename to src/main/java/de/ids_mannheim/korap/rewrite/CollectionRewrite.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/rewrite/FoundryInject.java b/src/main/java/de/ids_mannheim/korap/rewrite/FoundryInject.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/rewrite/FoundryInject.java
rename to src/main/java/de/ids_mannheim/korap/rewrite/FoundryInject.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/rewrite/FoundryRewrite.java b/src/main/java/de/ids_mannheim/korap/rewrite/FoundryRewrite.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/rewrite/FoundryRewrite.java
rename to src/main/java/de/ids_mannheim/korap/rewrite/FoundryRewrite.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/rewrite/IdWriter.java b/src/main/java/de/ids_mannheim/korap/rewrite/IdWriter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/rewrite/IdWriter.java
rename to src/main/java/de/ids_mannheim/korap/rewrite/IdWriter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/rewrite/KoralNode.java b/src/main/java/de/ids_mannheim/korap/rewrite/KoralNode.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/rewrite/KoralNode.java
rename to src/main/java/de/ids_mannheim/korap/rewrite/KoralNode.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/rewrite/LayerMapper.java b/src/main/java/de/ids_mannheim/korap/rewrite/LayerMapper.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/rewrite/LayerMapper.java
rename to src/main/java/de/ids_mannheim/korap/rewrite/LayerMapper.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/rewrite/MetaConstraint.java b/src/main/java/de/ids_mannheim/korap/rewrite/MetaConstraint.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/rewrite/MetaConstraint.java
rename to src/main/java/de/ids_mannheim/korap/rewrite/MetaConstraint.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewrite.java b/src/main/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewrite.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewrite.java
rename to src/main/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewrite.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/rewrite/RewriteHandler.java b/src/main/java/de/ids_mannheim/korap/rewrite/RewriteHandler.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/rewrite/RewriteHandler.java
rename to src/main/java/de/ids_mannheim/korap/rewrite/RewriteHandler.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/rewrite/RewriteTask.java b/src/main/java/de/ids_mannheim/korap/rewrite/RewriteTask.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/rewrite/RewriteTask.java
rename to src/main/java/de/ids_mannheim/korap/rewrite/RewriteTask.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/rewrite/TreeConstraint.java b/src/main/java/de/ids_mannheim/korap/rewrite/TreeConstraint.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/rewrite/TreeConstraint.java
rename to src/main/java/de/ids_mannheim/korap/rewrite/TreeConstraint.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewrite.java b/src/main/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewrite.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewrite.java
rename to src/main/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewrite.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/security/context/KustvaktContext.java b/src/main/java/de/ids_mannheim/korap/security/context/KustvaktContext.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/security/context/KustvaktContext.java
rename to src/main/java/de/ids_mannheim/korap/security/context/KustvaktContext.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/security/context/TokenContext.java b/src/main/java/de/ids_mannheim/korap/security/context/TokenContext.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/security/context/TokenContext.java
rename to src/main/java/de/ids_mannheim/korap/security/context/TokenContext.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java b/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java
rename to src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java b/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
rename to src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java b/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java
rename to src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java b/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
rename to src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/service/DefaultSettingService.java b/src/main/java/de/ids_mannheim/korap/service/DefaultSettingService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/service/DefaultSettingService.java
rename to src/main/java/de/ids_mannheim/korap/service/DefaultSettingService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/service/MailAuthenticator.java b/src/main/java/de/ids_mannheim/korap/service/MailAuthenticator.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/service/MailAuthenticator.java
rename to src/main/java/de/ids_mannheim/korap/service/MailAuthenticator.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/service/MailService.java b/src/main/java/de/ids_mannheim/korap/service/MailService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/service/MailService.java
rename to src/main/java/de/ids_mannheim/korap/service/MailService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/service/QueryService.java b/src/main/java/de/ids_mannheim/korap/service/QueryService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/service/QueryService.java
rename to src/main/java/de/ids_mannheim/korap/service/QueryService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/service/ResourceService.java b/src/main/java/de/ids_mannheim/korap/service/ResourceService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/service/ResourceService.java
rename to src/main/java/de/ids_mannheim/korap/service/ResourceService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/service/UserGroupService.java b/src/main/java/de/ids_mannheim/korap/service/UserGroupService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/service/UserGroupService.java
rename to src/main/java/de/ids_mannheim/korap/service/UserGroupService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/service/UserService.java b/src/main/java/de/ids_mannheim/korap/service/UserService.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/service/UserService.java
rename to src/main/java/de/ids_mannheim/korap/service/UserService.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/user/DataFactory.java b/src/main/java/de/ids_mannheim/korap/user/DataFactory.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/user/DataFactory.java
rename to src/main/java/de/ids_mannheim/korap/user/DataFactory.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/user/DemoUser.java b/src/main/java/de/ids_mannheim/korap/user/DemoUser.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/user/DemoUser.java
rename to src/main/java/de/ids_mannheim/korap/user/DemoUser.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/user/GenericUserData.java b/src/main/java/de/ids_mannheim/korap/user/GenericUserData.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/user/GenericUserData.java
rename to src/main/java/de/ids_mannheim/korap/user/GenericUserData.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/user/KorAPUser.java b/src/main/java/de/ids_mannheim/korap/user/KorAPUser.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/user/KorAPUser.java
rename to src/main/java/de/ids_mannheim/korap/user/KorAPUser.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/user/ShibbolethUser.java b/src/main/java/de/ids_mannheim/korap/user/ShibbolethUser.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/user/ShibbolethUser.java
rename to src/main/java/de/ids_mannheim/korap/user/ShibbolethUser.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/user/User.java b/src/main/java/de/ids_mannheim/korap/user/User.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/user/User.java
rename to src/main/java/de/ids_mannheim/korap/user/User.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/user/UserDetails.java b/src/main/java/de/ids_mannheim/korap/user/UserDetails.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/user/UserDetails.java
rename to src/main/java/de/ids_mannheim/korap/user/UserDetails.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/user/UserQuery.java b/src/main/java/de/ids_mannheim/korap/user/UserQuery.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/user/UserQuery.java
rename to src/main/java/de/ids_mannheim/korap/user/UserQuery.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/user/UserSettingProcessor.java b/src/main/java/de/ids_mannheim/korap/user/UserSettingProcessor.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/user/UserSettingProcessor.java
rename to src/main/java/de/ids_mannheim/korap/user/UserSettingProcessor.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/user/Userdata.java b/src/main/java/de/ids_mannheim/korap/user/Userdata.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/user/Userdata.java
rename to src/main/java/de/ids_mannheim/korap/user/Userdata.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/BooleanUtils.java b/src/main/java/de/ids_mannheim/korap/utils/BooleanUtils.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/utils/BooleanUtils.java
rename to src/main/java/de/ids_mannheim/korap/utils/BooleanUtils.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/CollectionTypes.java b/src/main/java/de/ids_mannheim/korap/utils/CollectionTypes.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/utils/CollectionTypes.java
rename to src/main/java/de/ids_mannheim/korap/utils/CollectionTypes.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/ConcurrentMultiMap.java b/src/main/java/de/ids_mannheim/korap/utils/ConcurrentMultiMap.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/utils/ConcurrentMultiMap.java
rename to src/main/java/de/ids_mannheim/korap/utils/ConcurrentMultiMap.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/IPNetMask.java b/src/main/java/de/ids_mannheim/korap/utils/IPNetMask.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/utils/IPNetMask.java
rename to src/main/java/de/ids_mannheim/korap/utils/IPNetMask.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/JerseyUtils.java b/src/main/java/de/ids_mannheim/korap/utils/JerseyUtils.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/utils/JerseyUtils.java
rename to src/main/java/de/ids_mannheim/korap/utils/JerseyUtils.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/JsonUtils.java b/src/main/java/de/ids_mannheim/korap/utils/JsonUtils.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/utils/JsonUtils.java
rename to src/main/java/de/ids_mannheim/korap/utils/JsonUtils.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java b/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java
similarity index 99%
rename from full/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java
rename to src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java
index 7dd99ad..28e75e9 100644
--- a/full/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java
+++ b/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java
@@ -1,5 +1,6 @@
 package de.ids_mannheim.korap.utils;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -12,7 +13,6 @@
 import de.ids_mannheim.korap.exceptions.StatusCodes;
 import de.ids_mannheim.korap.query.serialize.CollectionQueryProcessor;
 import de.ids_mannheim.korap.response.Notifications;
-import edu.emory.mathcs.backport.java.util.Arrays;
 
 /**
  * convenience builder class for collection query
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/NamingUtils.java b/src/main/java/de/ids_mannheim/korap/utils/NamingUtils.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/utils/NamingUtils.java
rename to src/main/java/de/ids_mannheim/korap/utils/NamingUtils.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/ParameterChecker.java b/src/main/java/de/ids_mannheim/korap/utils/ParameterChecker.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/utils/ParameterChecker.java
rename to src/main/java/de/ids_mannheim/korap/utils/ParameterChecker.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/PrefixTreeMap.java b/src/main/java/de/ids_mannheim/korap/utils/PrefixTreeMap.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/utils/PrefixTreeMap.java
rename to src/main/java/de/ids_mannheim/korap/utils/PrefixTreeMap.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/PropertyReader.java b/src/main/java/de/ids_mannheim/korap/utils/PropertyReader.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/utils/PropertyReader.java
rename to src/main/java/de/ids_mannheim/korap/utils/PropertyReader.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/ServiceInfo.java b/src/main/java/de/ids_mannheim/korap/utils/ServiceInfo.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/utils/ServiceInfo.java
rename to src/main/java/de/ids_mannheim/korap/utils/ServiceInfo.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/SqlBuilder.java b/src/main/java/de/ids_mannheim/korap/utils/SqlBuilder.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/utils/SqlBuilder.java
rename to src/main/java/de/ids_mannheim/korap/utils/SqlBuilder.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/StringUtils.java b/src/main/java/de/ids_mannheim/korap/utils/StringUtils.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/utils/StringUtils.java
rename to src/main/java/de/ids_mannheim/korap/utils/StringUtils.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/utils/TimeUtils.java b/src/main/java/de/ids_mannheim/korap/utils/TimeUtils.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/utils/TimeUtils.java
rename to src/main/java/de/ids_mannheim/korap/utils/TimeUtils.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/validator/ApacheValidator.java b/src/main/java/de/ids_mannheim/korap/validator/ApacheValidator.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/validator/ApacheValidator.java
rename to src/main/java/de/ids_mannheim/korap/validator/ApacheValidator.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/validator/Validator.java b/src/main/java/de/ids_mannheim/korap/validator/Validator.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/validator/Validator.java
rename to src/main/java/de/ids_mannheim/korap/validator/Validator.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/ClientsHandler.java b/src/main/java/de/ids_mannheim/korap/web/ClientsHandler.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/ClientsHandler.java
rename to src/main/java/de/ids_mannheim/korap/web/ClientsHandler.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/CoreResponseHandler.java b/src/main/java/de/ids_mannheim/korap/web/CoreResponseHandler.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/CoreResponseHandler.java
rename to src/main/java/de/ids_mannheim/korap/web/CoreResponseHandler.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/KustvaktResponseHandler.java b/src/main/java/de/ids_mannheim/korap/web/KustvaktResponseHandler.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/KustvaktResponseHandler.java
rename to src/main/java/de/ids_mannheim/korap/web/KustvaktResponseHandler.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/OAuth2ResponseHandler.java b/src/main/java/de/ids_mannheim/korap/web/OAuth2ResponseHandler.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/OAuth2ResponseHandler.java
rename to src/main/java/de/ids_mannheim/korap/web/OAuth2ResponseHandler.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/SearchKrill.java b/src/main/java/de/ids_mannheim/korap/web/SearchKrill.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/SearchKrill.java
rename to src/main/java/de/ids_mannheim/korap/web/SearchKrill.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/TRACE.java b/src/main/java/de/ids_mannheim/korap/web/TRACE.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/TRACE.java
rename to src/main/java/de/ids_mannheim/korap/web/TRACE.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/AuthenticationController.java b/src/main/java/de/ids_mannheim/korap/web/controller/AuthenticationController.java
similarity index 99%
rename from full/src/main/java/de/ids_mannheim/korap/web/controller/AuthenticationController.java
rename to src/main/java/de/ids_mannheim/korap/web/controller/AuthenticationController.java
index 0b40e33..99ae42c 100644
--- a/full/src/main/java/de/ids_mannheim/korap/web/controller/AuthenticationController.java
+++ b/src/main/java/de/ids_mannheim/korap/web/controller/AuthenticationController.java
@@ -30,7 +30,6 @@
 import de.ids_mannheim.korap.web.filter.AuthenticationFilter;
 import de.ids_mannheim.korap.web.filter.BlockingFilter;
 import de.ids_mannheim.korap.web.filter.DemoUserFilter;
-import de.ids_mannheim.korap.web.filter.PiwikFilter;
 import de.ids_mannheim.korap.web.utils.ResourceFilters;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.GET;
@@ -60,7 +59,7 @@
  */
 @Controller
 @Path("/{version}/auth")
-@ResourceFilters({ APIVersionFilter.class, PiwikFilter.class })
+@ResourceFilters({ APIVersionFilter.class})
 @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
 public class AuthenticationController {
 
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/OAuth2AdminController.java b/src/main/java/de/ids_mannheim/korap/web/controller/OAuth2AdminController.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/controller/OAuth2AdminController.java
rename to src/main/java/de/ids_mannheim/korap/web/controller/OAuth2AdminController.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/OAuth2Controller.java b/src/main/java/de/ids_mannheim/korap/web/controller/OAuth2Controller.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/controller/OAuth2Controller.java
rename to src/main/java/de/ids_mannheim/korap/web/controller/OAuth2Controller.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/OAuthClientController.java b/src/main/java/de/ids_mannheim/korap/web/controller/OAuthClientController.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/controller/OAuthClientController.java
rename to src/main/java/de/ids_mannheim/korap/web/controller/OAuthClientController.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/PluginController.java b/src/main/java/de/ids_mannheim/korap/web/controller/PluginController.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/controller/PluginController.java
rename to src/main/java/de/ids_mannheim/korap/web/controller/PluginController.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/QueryReferenceController.java b/src/main/java/de/ids_mannheim/korap/web/controller/QueryReferenceController.java
similarity index 97%
rename from full/src/main/java/de/ids_mannheim/korap/web/controller/QueryReferenceController.java
rename to src/main/java/de/ids_mannheim/korap/web/controller/QueryReferenceController.java
index af9c395..5216963 100644
--- a/full/src/main/java/de/ids_mannheim/korap/web/controller/QueryReferenceController.java
+++ b/src/main/java/de/ids_mannheim/korap/web/controller/QueryReferenceController.java
@@ -18,7 +18,6 @@
 import de.ids_mannheim.korap.web.filter.AuthenticationFilter;
 import de.ids_mannheim.korap.web.filter.BlockingFilter;
 import de.ids_mannheim.korap.web.filter.DemoUserFilter;
-import de.ids_mannheim.korap.web.filter.PiwikFilter;
 import de.ids_mannheim.korap.web.input.QueryJson;
 import de.ids_mannheim.korap.web.utils.ResourceFilters;
 import jakarta.ws.rs.Consumes;
@@ -47,7 +46,7 @@
 @Controller
 @Path("{version}/query")
 @ResourceFilters({ APIVersionFilter.class, AuthenticationFilter.class,
-        BlockingFilter.class, PiwikFilter.class })
+        BlockingFilter.class})
 @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
 public class QueryReferenceController {
 
@@ -120,7 +119,7 @@
     @GET
     @Path("~{createdBy}/{qName}")
     @ResourceFilters({ APIVersionFilter.class, AuthenticationFilter.class,
-            DemoUserFilter.class, PiwikFilter.class })
+            DemoUserFilter.class})
     public QueryDto retrieveQueryByName (
             @Context SecurityContext securityContext,
             @PathParam("createdBy") String createdBy,
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/ResourceController.java b/src/main/java/de/ids_mannheim/korap/web/controller/ResourceController.java
similarity index 90%
rename from full/src/main/java/de/ids_mannheim/korap/web/controller/ResourceController.java
rename to src/main/java/de/ids_mannheim/korap/web/controller/ResourceController.java
index 986f621..12f3bc2 100644
--- a/full/src/main/java/de/ids_mannheim/korap/web/controller/ResourceController.java
+++ b/src/main/java/de/ids_mannheim/korap/web/controller/ResourceController.java
@@ -8,7 +8,6 @@
 import de.ids_mannheim.korap.dto.ResourceDto;
 import de.ids_mannheim.korap.service.ResourceService;
 import de.ids_mannheim.korap.web.filter.APIVersionFilter;
-import de.ids_mannheim.korap.web.filter.PiwikFilter;
 import de.ids_mannheim.korap.web.utils.ResourceFilters;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
@@ -23,7 +22,7 @@
  */
 @Controller
 @Path("{version}/resource")
-@ResourceFilters({ APIVersionFilter.class, PiwikFilter.class })
+@ResourceFilters({ APIVersionFilter.class})
 @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
 public class ResourceController {
 
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/UserController.java b/src/main/java/de/ids_mannheim/korap/web/controller/UserController.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/controller/UserController.java
rename to src/main/java/de/ids_mannheim/korap/web/controller/UserController.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupAdminController.java b/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupAdminController.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupAdminController.java
rename to src/main/java/de/ids_mannheim/korap/web/controller/UserGroupAdminController.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java b/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
similarity index 98%
rename from full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
rename to src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
index b54269a..00cbf9a 100644
--- a/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
+++ b/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
@@ -16,7 +16,6 @@
 import de.ids_mannheim.korap.web.filter.APIVersionFilter;
 import de.ids_mannheim.korap.web.filter.AuthenticationFilter;
 import de.ids_mannheim.korap.web.filter.BlockingFilter;
-import de.ids_mannheim.korap.web.filter.PiwikFilter;
 import de.ids_mannheim.korap.web.utils.ResourceFilters;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.DELETE;
@@ -47,7 +46,7 @@
 @Controller
 @Path("{version}/group")
 @ResourceFilters({ APIVersionFilter.class, AuthenticationFilter.class,
-        BlockingFilter.class, PiwikFilter.class })
+        BlockingFilter.class})
 @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
 public class UserGroupController {
 
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/UserSettingController.java b/src/main/java/de/ids_mannheim/korap/web/controller/UserSettingController.java
similarity index 91%
rename from full/src/main/java/de/ids_mannheim/korap/web/controller/UserSettingController.java
rename to src/main/java/de/ids_mannheim/korap/web/controller/UserSettingController.java
index af0199f..3f861ae 100644
--- a/full/src/main/java/de/ids_mannheim/korap/web/controller/UserSettingController.java
+++ b/src/main/java/de/ids_mannheim/korap/web/controller/UserSettingController.java
@@ -15,7 +15,6 @@
 import de.ids_mannheim.korap.web.filter.APIVersionFilter;
 import de.ids_mannheim.korap.web.filter.AuthenticationFilter;
 import de.ids_mannheim.korap.web.filter.BlockingFilter;
-import de.ids_mannheim.korap.web.filter.PiwikFilter;
 import de.ids_mannheim.korap.web.utils.ResourceFilters;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.DELETE;
@@ -40,8 +39,8 @@
  */
 @Controller
 @Path("{version}/{username: ~[a-zA-Z0-9_.]+}/setting")
-@ResourceFilters({ AuthenticationFilter.class, APIVersionFilter.class,
-        PiwikFilter.class })
+@ResourceFilters({APIVersionFilter.class, BlockingFilter.class, 
+    AuthenticationFilter.class})
 @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
 public class UserSettingController {
 
@@ -70,8 +69,6 @@
      */
     @PUT
     @Consumes(MediaType.APPLICATION_JSON)
-    @ResourceFilters({ AuthenticationFilter.class, PiwikFilter.class,
-            BlockingFilter.class })
     public Response createDefaultSetting (@Context SecurityContext context,
             @PathParam("username") String username, Map<String, Object> map) {
 
@@ -99,8 +96,6 @@
      * @return the default setting of the given username
      */
     @GET
-    @ResourceFilters({ AuthenticationFilter.class, PiwikFilter.class,
-            BlockingFilter.class })
     public Response retrieveDefaultSetting (@Context SecurityContext context,
             @PathParam("username") String username) {
         TokenContext tokenContext = (TokenContext) context.getUserPrincipal();
@@ -139,8 +134,6 @@
     @DELETE
     @Path("{key}")
     @Consumes(MediaType.APPLICATION_JSON)
-    @ResourceFilters({ AuthenticationFilter.class, PiwikFilter.class,
-            BlockingFilter.class })
     public Response deleteDefaultSettingEntry (@Context SecurityContext context,
             @PathParam("username") String username,
             @PathParam("key") String key) {
@@ -169,8 +162,6 @@
      * @return 200 if the request is successful
      */
     @DELETE
-    @ResourceFilters({ AuthenticationFilter.class, PiwikFilter.class,
-            BlockingFilter.class })
     public Response deleteDefaultSetting (@Context SecurityContext context,
             @PathParam("username") String username) {
 
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusAdminController.java b/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusAdminController.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusAdminController.java
rename to src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusAdminController.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusController.java b/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusController.java
similarity index 98%
rename from full/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusController.java
rename to src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusController.java
index b69b09f..6c91dd6 100644
--- a/full/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusController.java
+++ b/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusController.java
@@ -23,7 +23,6 @@
 import de.ids_mannheim.korap.web.filter.AuthenticationFilter;
 import de.ids_mannheim.korap.web.filter.BlockingFilter;
 import de.ids_mannheim.korap.web.filter.DemoUserFilter;
-import de.ids_mannheim.korap.web.filter.PiwikFilter;
 import de.ids_mannheim.korap.web.input.QueryJson;
 import de.ids_mannheim.korap.web.utils.ResourceFilters;
 import jakarta.ws.rs.Consumes;
@@ -62,7 +61,7 @@
 @Controller
 @Path("{version}/vc")
 @ResourceFilters({ APIVersionFilter.class, AuthenticationFilter.class,
-        BlockingFilter.class, PiwikFilter.class })
+        BlockingFilter.class })
 @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
 public class VirtualCorpusController {
 
@@ -139,7 +138,7 @@
     @GET
     @Path("~{createdBy}/{vcName}")
     @ResourceFilters({ APIVersionFilter.class, AuthenticationFilter.class,
-            DemoUserFilter.class, PiwikFilter.class })
+            DemoUserFilter.class})
     public QueryDto retrieveVCByName (@Context SecurityContext securityContext,
             @PathParam("createdBy") String createdBy,
             @PathParam("vcName") String vcName) {
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/filter/APIVersionFilter.java b/src/main/java/de/ids_mannheim/korap/web/filter/APIVersionFilter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/filter/APIVersionFilter.java
rename to src/main/java/de/ids_mannheim/korap/web/filter/APIVersionFilter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java b/src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java
rename to src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/filter/AuthenticationFilter.java b/src/main/java/de/ids_mannheim/korap/web/filter/AuthenticationFilter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/filter/AuthenticationFilter.java
rename to src/main/java/de/ids_mannheim/korap/web/filter/AuthenticationFilter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java b/src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java
rename to src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java b/src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java
rename to src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java b/src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java
rename to src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java b/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java
rename to src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/filter/PiwikFilter.java b/src/main/java/de/ids_mannheim/korap/web/filter/PiwikFilter.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/filter/PiwikFilter.java
rename to src/main/java/de/ids_mannheim/korap/web/filter/PiwikFilter.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/input/OAuth2ClientJson.java b/src/main/java/de/ids_mannheim/korap/web/input/OAuth2ClientJson.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/input/OAuth2ClientJson.java
rename to src/main/java/de/ids_mannheim/korap/web/input/OAuth2ClientJson.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/input/QueryJson.java b/src/main/java/de/ids_mannheim/korap/web/input/QueryJson.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/input/QueryJson.java
rename to src/main/java/de/ids_mannheim/korap/web/input/QueryJson.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/input/UserGroupJson.java b/src/main/java/de/ids_mannheim/korap/web/input/UserGroupJson.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/input/UserGroupJson.java
rename to src/main/java/de/ids_mannheim/korap/web/input/UserGroupJson.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java b/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
rename to src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/utils/HTMLBuilder.java b/src/main/java/de/ids_mannheim/korap/web/utils/HTMLBuilder.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/utils/HTMLBuilder.java
rename to src/main/java/de/ids_mannheim/korap/web/utils/HTMLBuilder.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/utils/JsonExceptionMapper.java b/src/main/java/de/ids_mannheim/korap/web/utils/JsonExceptionMapper.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/utils/JsonExceptionMapper.java
rename to src/main/java/de/ids_mannheim/korap/web/utils/JsonExceptionMapper.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktMap.java b/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktMap.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktMap.java
rename to src/main/java/de/ids_mannheim/korap/web/utils/KustvaktMap.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseBuilder.java b/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseBuilder.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseBuilder.java
rename to src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseBuilder.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/utils/LocaleFactory.java b/src/main/java/de/ids_mannheim/korap/web/utils/LocaleFactory.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/utils/LocaleFactory.java
rename to src/main/java/de/ids_mannheim/korap/web/utils/LocaleFactory.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/utils/MapUtils.java b/src/main/java/de/ids_mannheim/korap/web/utils/MapUtils.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/utils/MapUtils.java
rename to src/main/java/de/ids_mannheim/korap/web/utils/MapUtils.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/utils/NotFoundMapper.java b/src/main/java/de/ids_mannheim/korap/web/utils/NotFoundMapper.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/utils/NotFoundMapper.java
rename to src/main/java/de/ids_mannheim/korap/web/utils/NotFoundMapper.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/utils/ResourceFilters.java b/src/main/java/de/ids_mannheim/korap/web/utils/ResourceFilters.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/utils/ResourceFilters.java
rename to src/main/java/de/ids_mannheim/korap/web/utils/ResourceFilters.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/utils/ResourceFiltersFeature.java b/src/main/java/de/ids_mannheim/korap/web/utils/ResourceFiltersFeature.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/utils/ResourceFiltersFeature.java
rename to src/main/java/de/ids_mannheim/korap/web/utils/ResourceFiltersFeature.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFilters.java b/src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFilters.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFilters.java
rename to src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFilters.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFiltersFeature.java b/src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFiltersFeature.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFiltersFeature.java
rename to src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFiltersFeature.java
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/utils/ShutdownHook.java b/src/main/java/de/ids_mannheim/korap/web/utils/ShutdownHook.java
similarity index 100%
rename from full/src/main/java/de/ids_mannheim/korap/web/utils/ShutdownHook.java
rename to src/main/java/de/ids_mannheim/korap/web/utils/ShutdownHook.java
diff --git a/full/src/main/resources/ESAPI.properties b/src/main/resources/ESAPI.properties
similarity index 100%
rename from full/src/main/resources/ESAPI.properties
rename to src/main/resources/ESAPI.properties
diff --git a/full/src/main/resources/annotation-scripts/foundries/base.js b/src/main/resources/annotation-scripts/foundries/base.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/foundries/base.js
rename to src/main/resources/annotation-scripts/foundries/base.js
diff --git a/full/src/main/resources/annotation-scripts/foundries/cnx.js b/src/main/resources/annotation-scripts/foundries/cnx.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/foundries/cnx.js
rename to src/main/resources/annotation-scripts/foundries/cnx.js
diff --git a/full/src/main/resources/annotation-scripts/foundries/corenlp.js b/src/main/resources/annotation-scripts/foundries/corenlp.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/foundries/corenlp.js
rename to src/main/resources/annotation-scripts/foundries/corenlp.js
diff --git a/full/src/main/resources/annotation-scripts/foundries/dereko.js b/src/main/resources/annotation-scripts/foundries/dereko.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/foundries/dereko.js
rename to src/main/resources/annotation-scripts/foundries/dereko.js
diff --git a/full/src/main/resources/annotation-scripts/foundries/drukola.js b/src/main/resources/annotation-scripts/foundries/drukola.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/foundries/drukola.js
rename to src/main/resources/annotation-scripts/foundries/drukola.js
diff --git a/full/src/main/resources/annotation-scripts/foundries/lwc.js b/src/main/resources/annotation-scripts/foundries/lwc.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/foundries/lwc.js
rename to src/main/resources/annotation-scripts/foundries/lwc.js
diff --git a/full/src/main/resources/annotation-scripts/foundries/malt.js b/src/main/resources/annotation-scripts/foundries/malt.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/foundries/malt.js
rename to src/main/resources/annotation-scripts/foundries/malt.js
diff --git a/full/src/main/resources/annotation-scripts/foundries/marmot.js b/src/main/resources/annotation-scripts/foundries/marmot.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/foundries/marmot.js
rename to src/main/resources/annotation-scripts/foundries/marmot.js
diff --git a/full/src/main/resources/annotation-scripts/foundries/mate.js b/src/main/resources/annotation-scripts/foundries/mate.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/foundries/mate.js
rename to src/main/resources/annotation-scripts/foundries/mate.js
diff --git a/full/src/main/resources/annotation-scripts/foundries/opennlp.js b/src/main/resources/annotation-scripts/foundries/opennlp.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/foundries/opennlp.js
rename to src/main/resources/annotation-scripts/foundries/opennlp.js
diff --git a/full/src/main/resources/annotation-scripts/foundries/schreibgebrauch.js b/src/main/resources/annotation-scripts/foundries/schreibgebrauch.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/foundries/schreibgebrauch.js
rename to src/main/resources/annotation-scripts/foundries/schreibgebrauch.js
diff --git a/full/src/main/resources/annotation-scripts/foundries/treetagger.js b/src/main/resources/annotation-scripts/foundries/treetagger.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/foundries/treetagger.js
rename to src/main/resources/annotation-scripts/foundries/treetagger.js
diff --git a/full/src/main/resources/annotation-scripts/foundries/xip.js b/src/main/resources/annotation-scripts/foundries/xip.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/foundries/xip.js
rename to src/main/resources/annotation-scripts/foundries/xip.js
diff --git a/full/src/main/resources/annotation-scripts/variables/negraedges.js b/src/main/resources/annotation-scripts/variables/negraedges.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/variables/negraedges.js
rename to src/main/resources/annotation-scripts/variables/negraedges.js
diff --git a/full/src/main/resources/annotation-scripts/variables/negranodes.js b/src/main/resources/annotation-scripts/variables/negranodes.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/variables/negranodes.js
rename to src/main/resources/annotation-scripts/variables/negranodes.js
diff --git a/full/src/main/resources/annotation-scripts/variables/stts.js b/src/main/resources/annotation-scripts/variables/stts.js
similarity index 100%
rename from full/src/main/resources/annotation-scripts/variables/stts.js
rename to src/main/resources/annotation-scripts/variables/stts.js
diff --git a/full/src/main/resources/basic-config.xml b/src/main/resources/basic-config.xml
similarity index 100%
rename from full/src/main/resources/basic-config.xml
rename to src/main/resources/basic-config.xml
diff --git a/full/src/main/resources/codes.kustvakt b/src/main/resources/codes.kustvakt
similarity index 100%
rename from full/src/main/resources/codes.kustvakt
rename to src/main/resources/codes.kustvakt
diff --git a/full/src/main/resources/db/lite/V1.1__annotation.sql b/src/main/resources/db/lite/V1.1__annotation.sql
similarity index 100%
rename from full/src/main/resources/db/lite/V1.1__annotation.sql
rename to src/main/resources/db/lite/V1.1__annotation.sql
diff --git a/full/src/main/resources/db/lite/V1.2__annotation_layer.sql b/src/main/resources/db/lite/V1.2__annotation_layer.sql
similarity index 100%
rename from full/src/main/resources/db/lite/V1.2__annotation_layer.sql
rename to src/main/resources/db/lite/V1.2__annotation_layer.sql
diff --git a/full/src/main/resources/db/lite/V1.3__annotation_key.sql b/src/main/resources/db/lite/V1.3__annotation_key.sql
similarity index 100%
rename from full/src/main/resources/db/lite/V1.3__annotation_key.sql
rename to src/main/resources/db/lite/V1.3__annotation_key.sql
diff --git a/full/src/main/resources/db/lite/V1.4__annotation_value.sql b/src/main/resources/db/lite/V1.4__annotation_value.sql
similarity index 100%
rename from full/src/main/resources/db/lite/V1.4__annotation_value.sql
rename to src/main/resources/db/lite/V1.4__annotation_value.sql
diff --git a/full/src/main/resources/db/lite/V1__annotation_tables.sql b/src/main/resources/db/lite/V1__annotation_tables.sql
similarity index 100%
rename from full/src/main/resources/db/lite/V1__annotation_tables.sql
rename to src/main/resources/db/lite/V1__annotation_tables.sql
diff --git a/full/src/main/resources/db/mysql/V1.1__create_virtual_corpus_tables.sql b/src/main/resources/db/mysql/V1.1__create_virtual_corpus_tables.sql
similarity index 100%
rename from full/src/main/resources/db/mysql/V1.1__create_virtual_corpus_tables.sql
rename to src/main/resources/db/mysql/V1.1__create_virtual_corpus_tables.sql
diff --git a/full/src/main/resources/db/mysql/V1.2__create_admin_table.sql b/src/main/resources/db/mysql/V1.2__create_admin_table.sql
similarity index 100%
rename from full/src/main/resources/db/mysql/V1.2__create_admin_table.sql
rename to src/main/resources/db/mysql/V1.2__create_admin_table.sql
diff --git a/full/src/main/resources/db/mysql/V1.3__triggers.sql b/src/main/resources/db/mysql/V1.3__triggers.sql
similarity index 100%
rename from full/src/main/resources/db/mysql/V1.3__triggers.sql
rename to src/main/resources/db/mysql/V1.3__triggers.sql
diff --git a/full/src/main/resources/db/mysql/V1.4__oauth2_tables.sql b/src/main/resources/db/mysql/V1.4__oauth2_tables.sql
similarity index 100%
rename from full/src/main/resources/db/mysql/V1.4__oauth2_tables.sql
rename to src/main/resources/db/mysql/V1.4__oauth2_tables.sql
diff --git a/full/src/main/resources/db/mysql/V1.6__user_tables.sql b/src/main/resources/db/mysql/V1.6__user_tables.sql
similarity index 100%
rename from full/src/main/resources/db/mysql/V1.6__user_tables.sql
rename to src/main/resources/db/mysql/V1.6__user_tables.sql
diff --git a/full/src/main/resources/db/mysql/V1.7__query_references.sql b/src/main/resources/db/mysql/V1.7__query_references.sql
similarity index 100%
rename from full/src/main/resources/db/mysql/V1.7__query_references.sql
rename to src/main/resources/db/mysql/V1.7__query_references.sql
diff --git a/full/src/main/resources/db/mysql/V1__create_tables.sql b/src/main/resources/db/mysql/V1__create_tables.sql
similarity index 100%
rename from full/src/main/resources/db/mysql/V1__create_tables.sql
rename to src/main/resources/db/mysql/V1__create_tables.sql
diff --git a/full/src/main/resources/db/predefined/V2.1__insert_predefined_roles.sql b/src/main/resources/db/predefined/V2.1__insert_predefined_roles.sql
similarity index 100%
rename from full/src/main/resources/db/predefined/V2.1__insert_predefined_roles.sql
rename to src/main/resources/db/predefined/V2.1__insert_predefined_roles.sql
diff --git a/full/src/main/resources/db/predefined/V2.2__annotation.sql b/src/main/resources/db/predefined/V2.2__annotation.sql
similarity index 100%
rename from full/src/main/resources/db/predefined/V2.2__annotation.sql
rename to src/main/resources/db/predefined/V2.2__annotation.sql
diff --git a/full/src/main/resources/db/predefined/V2.3__annotation_layer.sql b/src/main/resources/db/predefined/V2.3__annotation_layer.sql
similarity index 100%
rename from full/src/main/resources/db/predefined/V2.3__annotation_layer.sql
rename to src/main/resources/db/predefined/V2.3__annotation_layer.sql
diff --git a/full/src/main/resources/db/predefined/V2.4__annotation_key.sql b/src/main/resources/db/predefined/V2.4__annotation_key.sql
similarity index 100%
rename from full/src/main/resources/db/predefined/V2.4__annotation_key.sql
rename to src/main/resources/db/predefined/V2.4__annotation_key.sql
diff --git a/full/src/main/resources/db/predefined/V2.5__annotation_value.sql b/src/main/resources/db/predefined/V2.5__annotation_value.sql
similarity index 100%
rename from full/src/main/resources/db/predefined/V2.5__annotation_value.sql
rename to src/main/resources/db/predefined/V2.5__annotation_value.sql
diff --git a/full/src/main/resources/db/sqlite/V1.10__oauth2_alteration.sql b/src/main/resources/db/sqlite/V1.10__oauth2_alteration.sql
similarity index 100%
rename from full/src/main/resources/db/sqlite/V1.10__oauth2_alteration.sql
rename to src/main/resources/db/sqlite/V1.10__oauth2_alteration.sql
diff --git a/full/src/main/resources/db/sqlite/V1.11__oauth2_client_alteration.sql b/src/main/resources/db/sqlite/V1.11__oauth2_client_alteration.sql
similarity index 100%
rename from full/src/main/resources/db/sqlite/V1.11__oauth2_client_alteration.sql
rename to src/main/resources/db/sqlite/V1.11__oauth2_client_alteration.sql
diff --git a/full/src/main/resources/db/sqlite/V1.12__plugins.sql b/src/main/resources/db/sqlite/V1.12__plugins.sql
similarity index 100%
rename from full/src/main/resources/db/sqlite/V1.12__plugins.sql
rename to src/main/resources/db/sqlite/V1.12__plugins.sql
diff --git a/full/src/main/resources/db/sqlite/V1.1__create_virtual_corpus_tables.sql b/src/main/resources/db/sqlite/V1.1__create_virtual_corpus_tables.sql
similarity index 100%
rename from full/src/main/resources/db/sqlite/V1.1__create_virtual_corpus_tables.sql
rename to src/main/resources/db/sqlite/V1.1__create_virtual_corpus_tables.sql
diff --git a/full/src/main/resources/db/sqlite/V1.2__triggers.sql b/src/main/resources/db/sqlite/V1.2__triggers.sql
similarity index 100%
rename from full/src/main/resources/db/sqlite/V1.2__triggers.sql
rename to src/main/resources/db/sqlite/V1.2__triggers.sql
diff --git a/full/src/main/resources/db/sqlite/V1.3__create_admin_table.sql b/src/main/resources/db/sqlite/V1.3__create_admin_table.sql
similarity index 100%
rename from full/src/main/resources/db/sqlite/V1.3__create_admin_table.sql
rename to src/main/resources/db/sqlite/V1.3__create_admin_table.sql
diff --git a/full/src/main/resources/db/sqlite/V1.4__oauth2_tables.sql b/src/main/resources/db/sqlite/V1.4__oauth2_tables.sql
similarity index 100%
rename from full/src/main/resources/db/sqlite/V1.4__oauth2_tables.sql
rename to src/main/resources/db/sqlite/V1.4__oauth2_tables.sql
diff --git a/full/src/main/resources/db/sqlite/V1.5__oauth2_triggers.sql b/src/main/resources/db/sqlite/V1.5__oauth2_triggers.sql
similarity index 100%
rename from full/src/main/resources/db/sqlite/V1.5__oauth2_triggers.sql
rename to src/main/resources/db/sqlite/V1.5__oauth2_triggers.sql
diff --git a/full/src/main/resources/db/sqlite/V1.6__user_tables.sql b/src/main/resources/db/sqlite/V1.6__user_tables.sql
similarity index 100%
rename from full/src/main/resources/db/sqlite/V1.6__user_tables.sql
rename to src/main/resources/db/sqlite/V1.6__user_tables.sql
diff --git a/full/src/main/resources/db/sqlite/V1.7__query_references.sql b/src/main/resources/db/sqlite/V1.7__query_references.sql
similarity index 100%
rename from full/src/main/resources/db/sqlite/V1.7__query_references.sql
rename to src/main/resources/db/sqlite/V1.7__query_references.sql
diff --git a/full/src/main/resources/db/sqlite/V1.8__oauth2_alteration.sql b/src/main/resources/db/sqlite/V1.8__oauth2_alteration.sql
similarity index 100%
rename from full/src/main/resources/db/sqlite/V1.8__oauth2_alteration.sql
rename to src/main/resources/db/sqlite/V1.8__oauth2_alteration.sql
diff --git a/full/src/main/resources/db/sqlite/V1.9__query_alteration.sql b/src/main/resources/db/sqlite/V1.9__query_alteration.sql
similarity index 100%
rename from full/src/main/resources/db/sqlite/V1.9__query_alteration.sql
rename to src/main/resources/db/sqlite/V1.9__query_alteration.sql
diff --git a/full/src/main/resources/db/sqlite/V1__initial_version.sql b/src/main/resources/db/sqlite/V1__initial_version.sql
similarity index 100%
rename from full/src/main/resources/db/sqlite/V1__initial_version.sql
rename to src/main/resources/db/sqlite/V1__initial_version.sql
diff --git a/full/src/main/resources/db/test/V3.1__insert_virtual_corpus.sql b/src/main/resources/db/test/V3.1__insert_virtual_corpus.sql
similarity index 100%
rename from full/src/main/resources/db/test/V3.1__insert_virtual_corpus.sql
rename to src/main/resources/db/test/V3.1__insert_virtual_corpus.sql
diff --git a/full/src/main/resources/db/test/V3.3__insert_member_roles.sql b/src/main/resources/db/test/V3.3__insert_member_roles.sql
similarity index 100%
rename from full/src/main/resources/db/test/V3.3__insert_member_roles.sql
rename to src/main/resources/db/test/V3.3__insert_member_roles.sql
diff --git a/full/src/main/resources/db/test/V3.4__insert_admins.sql b/src/main/resources/db/test/V3.4__insert_admins.sql
similarity index 100%
rename from full/src/main/resources/db/test/V3.4__insert_admins.sql
rename to src/main/resources/db/test/V3.4__insert_admins.sql
diff --git a/full/src/main/resources/db/test/V3.5__insert_oauth2_clients.sql b/src/main/resources/db/test/V3.5__insert_oauth2_clients.sql
similarity index 100%
rename from full/src/main/resources/db/test/V3.5__insert_oauth2_clients.sql
rename to src/main/resources/db/test/V3.5__insert_oauth2_clients.sql
diff --git a/full/src/main/resources/db/test/V3.6__insert_default_settings.sql b/src/main/resources/db/test/V3.6__insert_default_settings.sql
similarity index 100%
rename from full/src/main/resources/db/test/V3.6__insert_default_settings.sql
rename to src/main/resources/db/test/V3.6__insert_default_settings.sql
diff --git a/full/src/main/resources/db/test/V3.7__insert_query_references.sql b/src/main/resources/db/test/V3.7__insert_query_references.sql
similarity index 100%
rename from full/src/main/resources/db/test/V3.7__insert_query_references.sql
rename to src/main/resources/db/test/V3.7__insert_query_references.sql
diff --git a/full/src/main/resources/default-config.xml b/src/main/resources/default-config.xml
similarity index 90%
rename from full/src/main/resources/default-config.xml
rename to src/main/resources/default-config.xml
index 073bf26..291271c 100644
--- a/full/src/main/resources/default-config.xml
+++ b/src/main/resources/default-config.xml
@@ -87,28 +87,6 @@
 		<property name="testConnectionOnCheckin" value="true" />
 	</bean>
 
-	<bean id="sqliteDataSource"
-		class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
-		lazy-init="true">
-		<property name="driverClassName"
-			value="${jdbc.driverClassName}" />
-		<property name="url" value="${jdbc.url}" />
-		<property name="username" value="${jdbc.username}" />
-		<property name="password" value="${jdbc.password}" />
-		<property name="connectionProperties">
-			<props>
-				<prop key="date_string_format">yyyy-MM-dd HH:mm:ss</prop>
-			</props>
-		</property>
-
-		<!-- relevant for single connection datasource and sqlite -->
-		<property name="suppressClose">
-			<value>true</value>
-		</property>
-		<!--<property name="initialSize" value="2"/> -->
-		<!--<property name="poolPreparedStatements" value="true"/> -->
-	</bean>
-
 	<!-- to configure database for sqlite, mysql, etc. migrations -->
 	<bean id="flywayConfig"
 		class="org.flywaydb.core.api.configuration.ClassicConfiguration">
@@ -118,7 +96,6 @@
 		<property name="locations"
 			value="#{'${jdbc.schemaPath}'.split(',')}" />
 		<property name="dataSource" ref="dataSource" />
-		<!-- <property name="dataSource" ref="sqliteDataSource" /> -->
 		<!-- <property name="dataSource" ref="c3p0DataSource" /> -->
 		<property name="outOfOrder" value="true" />
 	</bean>
@@ -132,7 +109,6 @@
 		class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"
 		depends-on="flyway">
 		<property name="dataSource" ref="dataSource" />
-		<!-- <property name="dataSource" ref="sqliteDataSource" /> -->
 		<!-- <property name="dataSource" ref="c3p0DataSource" /> -->
 
 		<property name="packagesToScan">
@@ -183,13 +159,6 @@
 	<bean id="authorizationDao"
 		class="de.ids_mannheim.korap.oauth2.dao.CachedAuthorizationDaoImpl" />
 
-	<!-- Filters -->
-	<!-- <bean id="authenticationFilter" class="de.ids_mannheim.korap.web.filter.AuthenticationFilter" 
-		> <property name="authenticationManager" ref="kustvakt_authenticationmanager"/> 
-		</bean> <bean id="piwikFilter" class="de.ids_mannheim.korap.web.filter.PiwikFilter" 
-		> <property name="authenticationManager" ref="kustvakt_authenticationmanager"/> 
-		</bean> -->
-
 	<!-- Services -->
 	<bean id="scopeService"
 		class="de.ids_mannheim.korap.oauth2.service.OAuth2ScopeServiceImpl" />
@@ -321,8 +290,7 @@
 	<!-- similarly, don't forget the PlatformTransactionManager -->
 	<bean id="txManager"
 		class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-		<!-- <property name="dataSource" ref="dataSource" /> -->
-		<property name="dataSource" ref="sqliteDataSource" />
+		<property name="dataSource" ref="dataSource" />
 		<!-- <property name="dataSource" ref="c3p0DataSource" /> -->
 	</bean>
 
diff --git a/full/src/main/resources/default-lite-config.xml b/src/main/resources/default-lite-config.xml
similarity index 100%
rename from full/src/main/resources/default-lite-config.xml
rename to src/main/resources/default-lite-config.xml
diff --git a/full/src/main/resources/ehcache.xml b/src/main/resources/ehcache.xml
similarity index 100%
rename from full/src/main/resources/ehcache.xml
rename to src/main/resources/ehcache.xml
diff --git a/full/src/main/resources/embedded-ldap-default.conf b/src/main/resources/embedded-ldap-default.conf
similarity index 100%
rename from full/src/main/resources/embedded-ldap-default.conf
rename to src/main/resources/embedded-ldap-default.conf
diff --git a/full/src/main/resources/embedded-ldap-example.conf b/src/main/resources/embedded-ldap-example.conf
similarity index 100%
rename from full/src/main/resources/embedded-ldap-example.conf
rename to src/main/resources/embedded-ldap-example.conf
diff --git a/full/src/main/resources/example-users.ldif b/src/main/resources/example-users.ldif
similarity index 100%
rename from full/src/main/resources/example-users.ldif
rename to src/main/resources/example-users.ldif
diff --git a/full/src/main/resources/free-resources.json b/src/main/resources/free-resources.json
similarity index 100%
rename from full/src/main/resources/free-resources.json
rename to src/main/resources/free-resources.json
diff --git a/full/src/main/resources/json/initial_super_client.json b/src/main/resources/json/initial_super_client.json
similarity index 100%
rename from full/src/main/resources/json/initial_super_client.json
rename to src/main/resources/json/initial_super_client.json
diff --git a/full/src/main/resources/kustvakt-lite.conf b/src/main/resources/kustvakt-lite.conf
similarity index 95%
rename from full/src/main/resources/kustvakt-lite.conf
rename to src/main/resources/kustvakt-lite.conf
index 9dc83b5..b9315db 100644
--- a/full/src/main/resources/kustvakt-lite.conf
+++ b/src/main/resources/kustvakt-lite.conf
@@ -1,7 +1,7 @@
 # Krill settings
 
 # index dir
-krill.indexDir= ../sample-index
+krill.indexDir= sample-index
 
 krill.index.commit.count = 134217000
 krill.index.commit.log = log/krill.commit.log
diff --git a/full/src/main/resources/kustvakt.conf b/src/main/resources/kustvakt.conf
similarity index 98%
rename from full/src/main/resources/kustvakt.conf
rename to src/main/resources/kustvakt.conf
index 128ad0c..a0a8554 100644
--- a/full/src/main/resources/kustvakt.conf
+++ b/src/main/resources/kustvakt.conf
@@ -1,5 +1,5 @@
 #Krill
-krill.indexDir= ../sample-index
+krill.indexDir= sample-index
 
 krill.index.commit.count = 134217000
 krill.index.commit.log = log/krill.commit.log
diff --git a/full/src/main/resources/kustvakt.info b/src/main/resources/kustvakt.info
similarity index 100%
rename from full/src/main/resources/kustvakt.info
rename to src/main/resources/kustvakt.info
diff --git a/full/src/main/resources/log4j2-debug.properties b/src/main/resources/log4j2-debug.properties
similarity index 100%
rename from full/src/main/resources/log4j2-debug.properties
rename to src/main/resources/log4j2-debug.properties
diff --git a/full/src/main/resources/log4j2.properties b/src/main/resources/log4j2.properties
similarity index 100%
rename from full/src/main/resources/log4j2.properties
rename to src/main/resources/log4j2.properties
diff --git a/full/src/main/resources/properties/basic-jdbc.properties b/src/main/resources/properties/basic-jdbc.properties
similarity index 100%
rename from full/src/main/resources/properties/basic-jdbc.properties
rename to src/main/resources/properties/basic-jdbc.properties
diff --git a/full/src/main/resources/properties/hibernate.properties b/src/main/resources/properties/hibernate.properties
similarity index 100%
rename from full/src/main/resources/properties/hibernate.properties
rename to src/main/resources/properties/hibernate.properties
diff --git a/full/src/main/resources/properties/jdbc.properties b/src/main/resources/properties/jdbc.properties
similarity index 100%
rename from full/src/main/resources/properties/jdbc.properties
rename to src/main/resources/properties/jdbc.properties
diff --git a/full/src/main/resources/properties/lite-jdbc.properties b/src/main/resources/properties/lite-jdbc.properties
similarity index 100%
rename from full/src/main/resources/properties/lite-jdbc.properties
rename to src/main/resources/properties/lite-jdbc.properties
diff --git a/full/src/main/resources/properties/mail.properties b/src/main/resources/properties/mail.properties
similarity index 100%
rename from full/src/main/resources/properties/mail.properties
rename to src/main/resources/properties/mail.properties
diff --git a/full/src/main/resources/service.properties b/src/main/resources/service.properties
similarity index 100%
rename from full/src/main/resources/service.properties
rename to src/main/resources/service.properties
diff --git a/full/src/main/resources/templates/notification.vm b/src/main/resources/templates/notification.vm
similarity index 100%
rename from full/src/main/resources/templates/notification.vm
rename to src/main/resources/templates/notification.vm
diff --git a/full/src/main/resources/validation.properties b/src/main/resources/validation.properties
similarity index 100%
rename from full/src/main/resources/validation.properties
rename to src/main/resources/validation.properties
diff --git a/full/src/test/java/de/ids_mannheim/korap/authentication/APIAuthenticationTest.java b/src/test/java/de/ids_mannheim/korap/authentication/APIAuthenticationTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/authentication/APIAuthenticationTest.java
rename to src/test/java/de/ids_mannheim/korap/authentication/APIAuthenticationTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/authentication/AuthenticationFilterTest.java b/src/test/java/de/ids_mannheim/korap/authentication/AuthenticationFilterTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/authentication/AuthenticationFilterTest.java
rename to src/test/java/de/ids_mannheim/korap/authentication/AuthenticationFilterTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/authentication/LdapAuth3Test.java b/src/test/java/de/ids_mannheim/korap/authentication/LdapAuth3Test.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/authentication/LdapAuth3Test.java
rename to src/test/java/de/ids_mannheim/korap/authentication/LdapAuth3Test.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/authentication/LdapOAuth2Test.java b/src/test/java/de/ids_mannheim/korap/authentication/LdapOAuth2Test.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/authentication/LdapOAuth2Test.java
rename to src/test/java/de/ids_mannheim/korap/authentication/LdapOAuth2Test.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/authentication/RandomCodeGeneratorTest.java b/src/test/java/de/ids_mannheim/korap/authentication/RandomCodeGeneratorTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/authentication/RandomCodeGeneratorTest.java
rename to src/test/java/de/ids_mannheim/korap/authentication/RandomCodeGeneratorTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/cache/NamedVCLoaderTest.java b/src/test/java/de/ids_mannheim/korap/cache/NamedVCLoaderTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/cache/NamedVCLoaderTest.java
rename to src/test/java/de/ids_mannheim/korap/cache/NamedVCLoaderTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/cache/TotalResultTest.java b/src/test/java/de/ids_mannheim/korap/cache/TotalResultTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/cache/TotalResultTest.java
rename to src/test/java/de/ids_mannheim/korap/cache/TotalResultTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java b/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java
rename to src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java b/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java
rename to src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/config/StaticContextLoaderListener.java b/src/test/java/de/ids_mannheim/korap/config/StaticContextLoaderListener.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/config/StaticContextLoaderListener.java
rename to src/test/java/de/ids_mannheim/korap/config/StaticContextLoaderListener.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/config/TestVariables.java b/src/test/java/de/ids_mannheim/korap/config/TestVariables.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/config/TestVariables.java
rename to src/test/java/de/ids_mannheim/korap/config/TestVariables.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/dao/RolePrivilegeDaoTest.java b/src/test/java/de/ids_mannheim/korap/dao/RolePrivilegeDaoTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/dao/RolePrivilegeDaoTest.java
rename to src/test/java/de/ids_mannheim/korap/dao/RolePrivilegeDaoTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/dao/UserGroupDaoTest.java b/src/test/java/de/ids_mannheim/korap/dao/UserGroupDaoTest.java
similarity index 98%
rename from full/src/test/java/de/ids_mannheim/korap/dao/UserGroupDaoTest.java
rename to src/test/java/de/ids_mannheim/korap/dao/UserGroupDaoTest.java
index 1ee65bf..c698321 100644
--- a/full/src/test/java/de/ids_mannheim/korap/dao/UserGroupDaoTest.java
+++ b/src/test/java/de/ids_mannheim/korap/dao/UserGroupDaoTest.java
@@ -5,6 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -28,7 +29,6 @@
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 import de.ids_mannheim.korap.exceptions.StatusCodes;
 import de.ids_mannheim.korap.user.User.CorpusAccess;
-import edu.emory.mathcs.backport.java.util.Collections;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:test-config.xml")
diff --git a/full/src/test/java/de/ids_mannheim/korap/dao/UserGroupMemberDaoTest.java b/src/test/java/de/ids_mannheim/korap/dao/UserGroupMemberDaoTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/dao/UserGroupMemberDaoTest.java
rename to src/test/java/de/ids_mannheim/korap/dao/UserGroupMemberDaoTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusAccessDaoTest.java b/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusAccessDaoTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusAccessDaoTest.java
rename to src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusAccessDaoTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java b/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java
rename to src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/misc/BCryptTest.java b/src/test/java/de/ids_mannheim/korap/misc/BCryptTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/misc/BCryptTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/BCryptTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java b/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/misc/ConfigTest.java b/src/test/java/de/ids_mannheim/korap/misc/ConfigTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/misc/ConfigTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/ConfigTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/misc/KoralNodeTest.java b/src/test/java/de/ids_mannheim/korap/misc/KoralNodeTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/misc/KoralNodeTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/KoralNodeTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/misc/LocalQueryTest.java b/src/test/java/de/ids_mannheim/korap/misc/LocalQueryTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/misc/LocalQueryTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/LocalQueryTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/misc/MapUtilsTest.java b/src/test/java/de/ids_mannheim/korap/misc/MapUtilsTest.java
similarity index 95%
rename from full/src/test/java/de/ids_mannheim/korap/misc/MapUtilsTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/MapUtilsTest.java
index 4d59790..bf389db 100644
--- a/full/src/test/java/de/ids_mannheim/korap/misc/MapUtilsTest.java
+++ b/src/test/java/de/ids_mannheim/korap/misc/MapUtilsTest.java
@@ -2,11 +2,12 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Arrays;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
+
 import de.ids_mannheim.korap.web.utils.MapUtils;
-import edu.emory.mathcs.backport.java.util.Arrays;
 import jakarta.ws.rs.core.MultivaluedHashMap;
 import jakarta.ws.rs.core.MultivaluedMap;
 
diff --git a/full/src/test/java/de/ids_mannheim/korap/misc/MetaQueryBuilderTest.java b/src/test/java/de/ids_mannheim/korap/misc/MetaQueryBuilderTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/misc/MetaQueryBuilderTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/MetaQueryBuilderTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/misc/RegexTest.java b/src/test/java/de/ids_mannheim/korap/misc/RegexTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/misc/RegexTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/RegexTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/misc/ScopesTest.java b/src/test/java/de/ids_mannheim/korap/misc/ScopesTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/misc/ScopesTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/ScopesTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/misc/SerializationTest.java b/src/test/java/de/ids_mannheim/korap/misc/SerializationTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/misc/SerializationTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/SerializationTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/misc/ServiceSuite.java b/src/test/java/de/ids_mannheim/korap/misc/ServiceSuite.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/misc/ServiceSuite.java
rename to src/test/java/de/ids_mannheim/korap/misc/ServiceSuite.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/misc/StringUtilsTest.java b/src/test/java/de/ids_mannheim/korap/misc/StringUtilsTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/misc/StringUtilsTest.java
rename to src/test/java/de/ids_mannheim/korap/misc/StringUtilsTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/misc/TestNullableSqls.java b/src/test/java/de/ids_mannheim/korap/misc/TestNullableSqls.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/misc/TestNullableSqls.java
rename to src/test/java/de/ids_mannheim/korap/misc/TestNullableSqls.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/rewrite/CollectionRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/CollectionRewriteTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/rewrite/CollectionRewriteTest.java
rename to src/test/java/de/ids_mannheim/korap/rewrite/CollectionRewriteTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/rewrite/FoundryRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/FoundryRewriteTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/rewrite/FoundryRewriteTest.java
rename to src/test/java/de/ids_mannheim/korap/rewrite/FoundryRewriteTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/rewrite/IdRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/IdRewriteTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/rewrite/IdRewriteTest.java
rename to src/test/java/de/ids_mannheim/korap/rewrite/IdRewriteTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/rewrite/QueryRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/QueryRewriteTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/rewrite/QueryRewriteTest.java
rename to src/test/java/de/ids_mannheim/korap/rewrite/QueryRewriteTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/rewrite/ResultRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/ResultRewriteTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/rewrite/ResultRewriteTest.java
rename to src/test/java/de/ids_mannheim/korap/rewrite/ResultRewriteTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/rewrite/RewriteHandlerTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/RewriteHandlerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/rewrite/RewriteHandlerTest.java
rename to src/test/java/de/ids_mannheim/korap/rewrite/RewriteHandlerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewriteTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewriteTest.java
rename to src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewriteTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/scenario/ICCTest.java b/src/test/java/de/ids_mannheim/korap/scenario/ICCTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/scenario/ICCTest.java
rename to src/test/java/de/ids_mannheim/korap/scenario/ICCTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/server/EmbeddedLdapServerTest.java b/src/test/java/de/ids_mannheim/korap/server/EmbeddedLdapServerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/server/EmbeddedLdapServerTest.java
rename to src/test/java/de/ids_mannheim/korap/server/EmbeddedLdapServerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/service/VirtualCorpusServiceTest.java b/src/test/java/de/ids_mannheim/korap/service/VirtualCorpusServiceTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/service/VirtualCorpusServiceTest.java
rename to src/test/java/de/ids_mannheim/korap/service/VirtualCorpusServiceTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/user/DataFactoryTest.java b/src/test/java/de/ids_mannheim/korap/user/DataFactoryTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/user/DataFactoryTest.java
rename to src/test/java/de/ids_mannheim/korap/user/DataFactoryTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java b/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java
similarity index 98%
rename from full/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java
rename to src/test/java/de/ids_mannheim/korap/user/UserdataTest.java
index 0e99a7f..499208f 100644
--- a/full/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java
+++ b/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java
@@ -3,21 +3,22 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.databind.node.ArrayNode;
+
 import de.ids_mannheim.korap.config.Attributes;
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 import de.ids_mannheim.korap.utils.JsonUtils;
 import de.ids_mannheim.korap.validator.ApacheValidator;
-import edu.emory.mathcs.backport.java.util.Arrays;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * @author hanl, margaretha
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/ApiVersionTest.java b/src/test/java/de/ids_mannheim/korap/web/ApiVersionTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/ApiVersionTest.java
rename to src/test/java/de/ids_mannheim/korap/web/ApiVersionTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/InitialSuperClientTest.java b/src/test/java/de/ids_mannheim/korap/web/InitialSuperClientTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/InitialSuperClientTest.java
rename to src/test/java/de/ids_mannheim/korap/web/InitialSuperClientTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/JettyServerTest.java b/src/test/java/de/ids_mannheim/korap/web/JettyServerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/JettyServerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/JettyServerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/SearchKrillTest.java b/src/test/java/de/ids_mannheim/korap/web/SearchKrillTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/SearchKrillTest.java
rename to src/test/java/de/ids_mannheim/korap/web/SearchKrillTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/AdminLoadVCTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/AdminLoadVCTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/AdminLoadVCTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/AdminLoadVCTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/AnnotationControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/AnnotationControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/AnnotationControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/AnnotationControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/IndexControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/IndexControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/IndexControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/IndexControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/InfoControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/InfoControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/InfoControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/InfoControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/MatchInfoControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/MatchInfoControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/MatchInfoControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/MatchInfoControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/MetadataControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/MetadataControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/MetadataControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/MetadataControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/MultipleCorpusQueryTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/MultipleCorpusQueryTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/MultipleCorpusQueryTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/MultipleCorpusQueryTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AccessTokenTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AccessTokenTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AccessTokenTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AccessTokenTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AdminControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AdminControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AdminControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AdminControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AuthorizationPostTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AuthorizationPostTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AuthorizationPostTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AuthorizationPostTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AuthorizationTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AuthorizationTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AuthorizationTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/OAuth2AuthorizationTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2ClientControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2ClientControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2ClientControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/OAuth2ClientControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2ControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2ControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2ControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/OAuth2ControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2PluginTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2PluginTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2PluginTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/OAuth2PluginTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2RClientTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2RClientTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2RClientTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/OAuth2RClientTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2TestBase.java b/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2TestBase.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2TestBase.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/OAuth2TestBase.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/QueryReferenceControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/QueryReferenceControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/QueryReferenceControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/QueryReferenceControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/QueryReferenceSearchTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/QueryReferenceSearchTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/QueryReferenceSearchTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/QueryReferenceSearchTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/QuerySerializationControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/QuerySerializationControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/QuerySerializationControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/QuerySerializationControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/ResourceInfoControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/ResourceInfoControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/ResourceInfoControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/ResourceInfoControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/SearchControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/SearchControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/SearchControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/SearchControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/SearchNetworkEndpointTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/SearchNetworkEndpointTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/SearchNetworkEndpointTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/SearchNetworkEndpointTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/SearchPipeTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/SearchPipeTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/SearchPipeTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/SearchPipeTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/SearchPublicMetadataTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/SearchPublicMetadataTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/SearchPublicMetadataTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/SearchPublicMetadataTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/SearchTokenSnippetTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/SearchTokenSnippetTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/SearchTokenSnippetTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/SearchTokenSnippetTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/TokenExpiryTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/TokenExpiryTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/TokenExpiryTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/TokenExpiryTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/UserControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/UserControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/UserControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/UserControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerAdminTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerAdminTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerAdminTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerAdminTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/UserSettingControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/UserSettingControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/UserSettingControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/UserSettingControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/VCReferenceTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/VCReferenceTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/VCReferenceTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/VCReferenceTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusAccessTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusAccessTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusAccessTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusAccessTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusClientTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusClientTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusClientTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusClientTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerAdminTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerAdminTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerAdminTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerAdminTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusFieldTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusFieldTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusFieldTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusFieldTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusInfoTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusInfoTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusInfoTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusInfoTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusListTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusListTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusListTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusListTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusSharingTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusSharingTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusSharingTest.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusSharingTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusTestBase.java b/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusTestBase.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusTestBase.java
rename to src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusTestBase.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/lite/InfoControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/lite/InfoControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/lite/InfoControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/lite/InfoControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteMultipleCorpusQueryTest.java b/src/test/java/de/ids_mannheim/korap/web/lite/LiteMultipleCorpusQueryTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/lite/LiteMultipleCorpusQueryTest.java
rename to src/test/java/de/ids_mannheim/korap/web/lite/LiteMultipleCorpusQueryTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchPipeTest.java b/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchPipeTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchPipeTest.java
rename to src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchPipeTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchTokenSnippetTest.java b/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchTokenSnippetTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchTokenSnippetTest.java
rename to src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchTokenSnippetTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
rename to src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/lite/SearchNetworkEndpointTest.java b/src/test/java/de/ids_mannheim/korap/web/lite/SearchNetworkEndpointTest.java
similarity index 100%
rename from full/src/test/java/de/ids_mannheim/korap/web/lite/SearchNetworkEndpointTest.java
rename to src/test/java/de/ids_mannheim/korap/web/lite/SearchNetworkEndpointTest.java
diff --git a/full/src/test/resources/json/oauth2_public_client.json b/src/test/resources/json/oauth2_public_client.json
similarity index 100%
rename from full/src/test/resources/json/oauth2_public_client.json
rename to src/test/resources/json/oauth2_public_client.json
diff --git a/full/src/test/resources/junit-platform.properties b/src/test/resources/junit-platform.properties
similarity index 100%
rename from full/src/test/resources/junit-platform.properties
rename to src/test/resources/junit-platform.properties
diff --git a/full/src/test/resources/keystore.p12 b/src/test/resources/keystore.p12
similarity index 100%
rename from full/src/test/resources/keystore.p12
rename to src/test/resources/keystore.p12
Binary files differ
diff --git a/full/src/test/resources/kustvakt-icc.conf b/src/test/resources/kustvakt-icc.conf
similarity index 98%
rename from full/src/test/resources/kustvakt-icc.conf
rename to src/test/resources/kustvakt-icc.conf
index 6864df8..84a38a8 100644
--- a/full/src/test/resources/kustvakt-icc.conf
+++ b/src/test/resources/kustvakt-icc.conf
@@ -1,5 +1,5 @@
 # index dir
-krill.indexDir = ../wiki-index
+krill.indexDir = wiki-index
 
 krill.index.commit.count = 134217000
 krill.index.commit.log = log/krill.commit.log
diff --git a/full/src/test/resources/kustvakt-test.conf b/src/test/resources/kustvakt-test.conf
similarity index 98%
rename from full/src/test/resources/kustvakt-test.conf
rename to src/test/resources/kustvakt-test.conf
index 913e2ed..facc03a 100644
--- a/full/src/test/resources/kustvakt-test.conf
+++ b/src/test/resources/kustvakt-test.conf
@@ -1,6 +1,6 @@
 # Krill settings
 #
-krill.indexDir = ../sample-index
+krill.indexDir = sample-index
 
 krill.index.commit.count = 134217000
 krill.index.commit.log = log/krill.commit.log
diff --git a/full/src/test/resources/log4j2-test.properties b/src/test/resources/log4j2-test.properties
similarity index 100%
rename from full/src/test/resources/log4j2-test.properties
rename to src/test/resources/log4j2-test.properties
diff --git a/full/src/test/resources/network-output/search-result.jsonld b/src/test/resources/network-output/search-result.jsonld
similarity index 100%
rename from full/src/test/resources/network-output/search-result.jsonld
rename to src/test/resources/network-output/search-result.jsonld
diff --git a/full/src/test/resources/pipe-output/test-pipes.jsonld b/src/test/resources/pipe-output/test-pipes.jsonld
similarity index 100%
rename from full/src/test/resources/pipe-output/test-pipes.jsonld
rename to src/test/resources/pipe-output/test-pipes.jsonld
diff --git a/full/src/test/resources/pipe-output/with-param.jsonld b/src/test/resources/pipe-output/with-param.jsonld
similarity index 100%
rename from full/src/test/resources/pipe-output/with-param.jsonld
rename to src/test/resources/pipe-output/with-param.jsonld
diff --git a/full/src/test/resources/test-config-icc.xml b/src/test/resources/test-config-icc.xml
similarity index 100%
rename from full/src/test/resources/test-config-icc.xml
rename to src/test/resources/test-config-icc.xml
diff --git a/full/src/test/resources/test-config-lite.xml b/src/test/resources/test-config-lite.xml
similarity index 100%
rename from full/src/test/resources/test-config-lite.xml
rename to src/test/resources/test-config-lite.xml
diff --git a/full/src/test/resources/test-config.xml b/src/test/resources/test-config.xml
similarity index 98%
rename from full/src/test/resources/test-config.xml
rename to src/test/resources/test-config.xml
index d1dd61c..cae0248 100644
--- a/full/src/test/resources/test-config.xml
+++ b/src/test/resources/test-config.xml
@@ -66,11 +66,10 @@
 		<!--<property name="poolPreparedStatements" value="true"/> -->
 	</bean>
 
-	<!-- use SingleConnection only for testing! -->
-	<bean id="sqliteDataSource"
+<!-- <bean id="sqliteDataSource"
 		class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
 		lazy-init="true">
-		<!-- <property name="driverClassName" value="${jdbc.driverClassName}" /> -->
+		<property name="driverClassName" value="${jdbc.driverClassName}" />
 		<property name="url" value="${jdbc.url}" />
 		<property name="username" value="${jdbc.username}" />
 		<property name="password" value="${jdbc.password}" />
@@ -80,12 +79,12 @@
 			</props>
 		</property>
 
-		<!-- Sqlite can only have a single connection -->
+		Sqlite can only have a single connection
 		<property name="suppressClose">
 			<value>true</value>
 		</property>
 	</bean>
-
+ -->
 	<bean id="c3p0DataSource"
 		class="com.mchange.v2.c3p0.ComboPooledDataSource"
 		destroy-method="close">
diff --git a/full/src/test/resources/test-embedded-ldap-users.ldif b/src/test/resources/test-embedded-ldap-users.ldif
similarity index 100%
rename from full/src/test/resources/test-embedded-ldap-users.ldif
rename to src/test/resources/test-embedded-ldap-users.ldif
diff --git a/full/src/test/resources/test-embedded-ldap.conf b/src/test/resources/test-embedded-ldap.conf
similarity index 100%
rename from full/src/test/resources/test-embedded-ldap.conf
rename to src/test/resources/test-embedded-ldap.conf
diff --git a/full/src/test/resources/test-hibernate.properties b/src/test/resources/test-hibernate.properties
similarity index 100%
rename from full/src/test/resources/test-hibernate.properties
rename to src/test/resources/test-hibernate.properties
diff --git a/full/src/test/resources/test-invalid-signature.token b/src/test/resources/test-invalid-signature.token
similarity index 100%
rename from full/src/test/resources/test-invalid-signature.token
rename to src/test/resources/test-invalid-signature.token
diff --git a/full/src/test/resources/test-jdbc.properties b/src/test/resources/test-jdbc.properties
similarity index 100%
rename from full/src/test/resources/test-jdbc.properties
rename to src/test/resources/test-jdbc.properties
diff --git a/full/src/test/resources/test-ldap-users.ldif b/src/test/resources/test-ldap-users.ldif
similarity index 100%
rename from full/src/test/resources/test-ldap-users.ldif
rename to src/test/resources/test-ldap-users.ldif
diff --git a/full/src/test/resources/test-ldap.conf b/src/test/resources/test-ldap.conf
similarity index 100%
rename from full/src/test/resources/test-ldap.conf
rename to src/test/resources/test-ldap.conf
diff --git a/full/src/test/resources/test-ldaps-with-truststore.conf b/src/test/resources/test-ldaps-with-truststore.conf
similarity index 100%
rename from full/src/test/resources/test-ldaps-with-truststore.conf
rename to src/test/resources/test-ldaps-with-truststore.conf
diff --git a/full/src/test/resources/test-ldaps.conf b/src/test/resources/test-ldaps.conf
similarity index 100%
rename from full/src/test/resources/test-ldaps.conf
rename to src/test/resources/test-ldaps.conf
diff --git a/full/src/test/resources/test-resource-config.xml b/src/test/resources/test-resource-config.xml
similarity index 100%
rename from full/src/test/resources/test-resource-config.xml
rename to src/test/resources/test-resource-config.xml
diff --git a/full/src/test/resources/truststore.jks b/src/test/resources/truststore.jks
similarity index 100%
rename from full/src/test/resources/truststore.jks
rename to src/test/resources/truststore.jks
Binary files differ
diff --git a/full/src/test/resources/vc/named-vc1.jsonld b/src/test/resources/vc/named-vc1.jsonld
similarity index 100%
rename from full/src/test/resources/vc/named-vc1.jsonld
rename to src/test/resources/vc/named-vc1.jsonld
diff --git a/full/src/test/resources/vc/named-vc2.jsonld b/src/test/resources/vc/named-vc2.jsonld
similarity index 100%
rename from full/src/test/resources/vc/named-vc2.jsonld
rename to src/test/resources/vc/named-vc2.jsonld
diff --git a/full/src/test/resources/vc/named-vc3.jsonld b/src/test/resources/vc/named-vc3.jsonld
similarity index 100%
rename from full/src/test/resources/vc/named-vc3.jsonld
rename to src/test/resources/vc/named-vc3.jsonld