diff --git a/core/pom.xml b/core/pom.xml
deleted file mode 100644
index 774e89a..0000000
--- a/core/pom.xml
+++ /dev/null
@@ -1,488 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>de.ids_mannheim.korap</groupId>
-	<artifactId>Kustvakt-core</artifactId>
-	<version>0.70.1</version>
-
-	<properties>
-		<java.version>11</java.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.version>5.3.27</spring.version>
-		<jersey.version>2.39.1</jersey.version>
-		<jetty.version>9.4.51.v20230217</jetty.version>
-		<hibernate.version>5.6.15.Final</hibernate.version>
-		<flyway.version>9.17.0</flyway.version>
-		<log4j.version>2.19.0</log4j.version>
-		<krill.version>[0.61.2,)</krill.version>
-		<koral.version>[0.39.1,)</koral.version>
-	</properties>
-	
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				 <filtering>true</filtering>
-			</resource>
-		</resources>
-		<testResources>
-			<testResource>
-				<directory>src/test/resources</directory>
-			</testResource>
-			<testResource>
-				<directory>src/main/resources</directory>
-			</testResource>
-		</testResources>
-		<plugins>
-			<!-- Formatter plugin for Eclipse based coding conventions http://maven-java-formatter-plugin.googlecode.com/svn/site/0.4/usage.html -->
-			<plugin>
-				<groupId>com.googlecode.maven-java-formatter-plugin</groupId>
-				<artifactId>maven-java-formatter-plugin</artifactId>
-				<version>0.4</version>
-				<configuration>
-					<configFile>${project.basedir}/Format.xml</configFile>
-					<overrideConfigCompilerVersion>true</overrideConfigCompilerVersion>
-					<compilerSource>${java.version}</compilerSource>
-					<compilerCompliance>${java.version}</compilerCompliance>
-					<compilerTargetPlatform>${java.version}</compilerTargetPlatform>
-				</configuration>
-				<!-- <executions> <execution> <goals> <goal>format</goal> </goals> </execution> 
-					</executions> -->
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.11.0</version>
-				<configuration>
-					<compilerVersion>${java.version}</compilerVersion>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-					<annotationProcessors>
-						<processor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</processor>
-						<processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-					</annotationProcessors>
-				</configuration>
-			</plugin>
-
-			<!-- build tests jar, so extensions can use fastjerseytest class to build 
-				rest tests -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.3.0</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			
-			<!-- Generate source jar -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>3.2.1</version>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<!-- backport -->
-		<dependency>
-		    <groupId>backport-util-concurrent</groupId>
-		    <artifactId>backport-util-concurrent</artifactId>
-		    <version>3.1</version>
-		</dependency>
-	
-		<!-- Jersey -->
-		<dependency>
-			<groupId>org.glassfish.jersey.core</groupId>
-			<artifactId>jersey-server</artifactId>
-			<version>${jersey.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.glassfish.jersey.ext</groupId>
-			<artifactId>jersey-spring5</artifactId>
-			<version>${jersey.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-web</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-beans</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-context</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-aop</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<!-- JSON -->
-		<dependency>
-			<groupId>org.glassfish.jersey.media</groupId>
-			<artifactId>jersey-media-json-jackson</artifactId>
-			<version>${jersey.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-annotations</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-databind</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>net.minidev</groupId>
-			<artifactId>json-smart</artifactId>
-			<version>2.4.10</version>
-		</dependency>
-		
-		<!-- Jersey 1x originally uses codehaus -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>2.14.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>
-			<artifactId>log4j-api</artifactId>
-			<version>${log4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<version>${log4j.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.logging.log4j</groupId>
-					<artifactId>log4j-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j2-impl</artifactId>
-			<version>${log4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-jul</artifactId>
-			<version>${log4j.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.logging.log4j</groupId>
-					<artifactId>log4j-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>2.0.7</version>
-		</dependency>
-		
-		<!-- Java Assist -->
-		<dependency>
-			<groupId>org.javassist</groupId>
-			<artifactId>javassist</artifactId>
-			<version>3.29.2-GA</version>
-		</dependency>
-
-		<!-- EM:done -->
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>1.18.26</version>
-		</dependency>
-		<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.41.2.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-dbcp2</artifactId>
-			<version>2.9.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-validator</groupId>
-			<artifactId>commons-validator</artifactId>
-			<version>1.7</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.mindrot</groupId>
-			<artifactId>jbcrypt</artifactId>
-			<version>0.4</version>
-		</dependency>
-
-		<dependency>
-		    <groupId>javax.annotation</groupId>
-		    <artifactId>javax.annotation-api</artifactId>
-		    <version>1.3.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>de.ids_mannheim.korap</groupId>
-			<artifactId>Krill</artifactId>
-			<version>${krill.version}</version>
-			<exclusions>
-				<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>
-			<artifactId>spring-core</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-orm</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-			<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>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context-support</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${spring.version}</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<!-- apparently this order prevents the spring schemas from being overriden 
-			in META-INF/spring.schemas, thus must stay like this -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-aop</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-aspects</artifactId>
-			<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>
-			<artifactId>jetty-server</artifactId>
-			<version>${jetty.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<version>${jetty.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-webapp</artifactId>
-			<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> 
-			</exclusion> <exclusion> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> 
-			</exclusion> <exclusion> <groupId>org.glassfish.jersey.containers</groupId> 
-			<artifactId>jersey-container-grizzly2-http</artifactId> </exclusion> <exclusion> 
-			<groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-common</artifactId> 
-			</exclusion> <exclusion> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> 
-			</exclusion> </exclusions> </dependency> -->
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.5.14</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.11.0</version>
-		</dependency>
-
-		<!-- Hibernate -->
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-ehcache</artifactId>
-			<version>${hibernate.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-jpamodelgen</artifactId>
-			<version>${hibernate.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.github.gwenn</groupId>
-			<artifactId>sqlite-dialect</artifactId>
-			<version>0.1.0</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>4.0.1</version>
-		</dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-text</artifactId>
-      <version>1.10.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/full/Changes b/full/Changes
index 86653f4..2a44ed9 100644
--- a/full/Changes
+++ b/full/Changes
@@ -4,6 +4,7 @@
 - Renamed web.controller package in core
 - Moved SearchNetworkEndpoint to core.service package
 - Merged lite into full
+- Merged core into full
 
 # version 0.70
 
diff --git a/core/Changes b/full/Changes-Core
similarity index 100%
rename from core/Changes
rename to full/Changes-Core
diff --git a/full/pom.xml b/full/pom.xml
index a1ff3cb..fcb3233 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -9,6 +9,12 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jersey.version>2.39.1</jersey.version>
 		<hibernate.version>5.6.15.Final</hibernate.version>
+		<spring.version>5.3.27</spring.version>
+		<jetty.version>9.4.51.v20230217</jetty.version>
+		<flyway.version>9.17.0</flyway.version>
+		<log4j.version>2.19.0</log4j.version>
+		<krill.version>[0.61.2,)</krill.version>
+		<koral.version>[0.39.1,)</koral.version>
 	</properties>
 	<profiles>
 		<profile>
@@ -186,6 +192,19 @@
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>3.2.1</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.1.0</version>
 				<dependencies>
@@ -220,7 +239,395 @@
 	</build>
 
 	<dependencies>
+		<!-- backport -->
 		<dependency>
+		    <groupId>backport-util-concurrent</groupId>
+		    <artifactId>backport-util-concurrent</artifactId>
+		    <version>3.1</version>
+		</dependency>
+	
+		<!-- Jersey -->
+		<dependency>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-server</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.glassfish.jersey.ext</groupId>
+			<artifactId>jersey-spring5</artifactId>
+			<version>${jersey.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-web</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-beans</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-context</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-aop</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- JSON -->
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-jackson</artifactId>
+			<version>${jersey.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.core</groupId>
+					<artifactId>jackson-annotations</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.core</groupId>
+					<artifactId>jackson-databind</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>net.minidev</groupId>
+			<artifactId>json-smart</artifactId>
+			<version>2.4.10</version>
+		</dependency>
+		
+		<!-- Jersey 1x originally uses codehaus -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<version>2.14.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>
+			<artifactId>log4j-api</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>${log4j.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-jul</artifactId>
+			<version>${log4j.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>2.0.7</version>
+		</dependency>
+		
+		<!-- Java Assist -->
+		<dependency>
+			<groupId>org.javassist</groupId>
+			<artifactId>javassist</artifactId>
+			<version>3.29.2-GA</version>
+		</dependency>
+
+		<!-- EM:done -->
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.13.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.26</version>
+		</dependency>
+		<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.41.2.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-dbcp2</artifactId>
+			<version>2.9.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-validator</groupId>
+			<artifactId>commons-validator</artifactId>
+			<version>1.7</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mindrot</groupId>
+			<artifactId>jbcrypt</artifactId>
+			<version>0.4</version>
+		</dependency>
+
+		<dependency>
+		    <groupId>javax.annotation</groupId>
+		    <artifactId>javax.annotation-api</artifactId>
+		    <version>1.3.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>de.ids_mannheim.korap</groupId>
+			<artifactId>Krill</artifactId>
+			<version>${krill.version}</version>
+			<exclusions>
+				<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>
+			<artifactId>spring-core</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+			<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>
+			<version>${spring.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context-support</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${spring.version}</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<!-- apparently this order prevents the spring schemas from being overriden 
+			in META-INF/spring.schemas, thus must stay like this -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aop</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aspects</artifactId>
+			<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>
+			<artifactId>jetty-server</artifactId>
+			<version>${jetty.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+			<version>${jetty.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-webapp</artifactId>
+			<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> 
+			</exclusion> <exclusion> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> 
+			</exclusion> <exclusion> <groupId>org.glassfish.jersey.containers</groupId> 
+			<artifactId>jersey-container-grizzly2-http</artifactId> </exclusion> <exclusion> 
+			<groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-common</artifactId> 
+			</exclusion> <exclusion> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> 
+			</exclusion> </exclusions> </dependency> -->
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.14</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.11.0</version>
+		</dependency>
+
+		<!-- Hibernate -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-ehcache</artifactId>
+			<version>${hibernate.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-jpamodelgen</artifactId>
+			<version>${hibernate.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.github.gwenn</groupId>
+			<artifactId>sqlite-dialect</artifactId>
+			<version>0.1.0</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>4.0.1</version>
+		</dependency>
+	    <dependency>
+	      <groupId>org.apache.commons</groupId>
+	      <artifactId>commons-text</artifactId>
+	      <version>1.10.0</version>
+	      <scope>test</scope>
+	    </dependency>
+		<!--<dependency>
 			<groupId>de.ids_mannheim.korap</groupId>
 			<artifactId>Kustvakt-core</artifactId>
 			<version>${project.version}</version>
@@ -232,7 +639,7 @@
 			<classifier>tests</classifier>
       		<type>test-jar</type>
       		<scope>test</scope>
-		</dependency>
+		</dependency>-->
 		<!-- LDAP -->
 		<dependency>
 			<groupId>com.novell.ldap</groupId>
diff --git a/core/src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java b/full/src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java
rename to full/src/main/java/de/ids_mannheim/korap/annotation/AnnotationParser.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java b/full/src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java
rename to full/src/main/java/de/ids_mannheim/korap/annotation/ArrayVariables.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/auditing/AuditRecord.java b/full/src/main/java/de/ids_mannheim/korap/auditing/AuditRecord.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/auditing/AuditRecord.java
rename to full/src/main/java/de/ids_mannheim/korap/auditing/AuditRecord.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/authentication/AuthenticationIface.java b/full/src/main/java/de/ids_mannheim/korap/authentication/AuthenticationIface.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/authentication/AuthenticationIface.java
rename to full/src/main/java/de/ids_mannheim/korap/authentication/AuthenticationIface.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/authentication/AuthenticationManager.java b/full/src/main/java/de/ids_mannheim/korap/authentication/AuthenticationManager.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/authentication/AuthenticationManager.java
rename to full/src/main/java/de/ids_mannheim/korap/authentication/AuthenticationManager.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/authentication/http/AuthorizationData.java b/full/src/main/java/de/ids_mannheim/korap/authentication/http/AuthorizationData.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/authentication/http/AuthorizationData.java
rename to full/src/main/java/de/ids_mannheim/korap/authentication/http/AuthorizationData.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/authentication/http/HttpAuthorizationHandler.java b/full/src/main/java/de/ids_mannheim/korap/authentication/http/HttpAuthorizationHandler.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/authentication/http/HttpAuthorizationHandler.java
rename to full/src/main/java/de/ids_mannheim/korap/authentication/http/HttpAuthorizationHandler.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/authentication/http/TransferEncoding.java b/full/src/main/java/de/ids_mannheim/korap/authentication/http/TransferEncoding.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/authentication/http/TransferEncoding.java
rename to full/src/main/java/de/ids_mannheim/korap/authentication/http/TransferEncoding.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/Attributes.java b/full/src/main/java/de/ids_mannheim/korap/config/Attributes.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/config/Attributes.java
rename to full/src/main/java/de/ids_mannheim/korap/config/Attributes.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/BeanInjectable.java b/full/src/main/java/de/ids_mannheim/korap/config/BeanInjectable.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/config/BeanInjectable.java
rename to full/src/main/java/de/ids_mannheim/korap/config/BeanInjectable.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/BeansFactory.java b/full/src/main/java/de/ids_mannheim/korap/config/BeansFactory.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/config/BeansFactory.java
rename to full/src/main/java/de/ids_mannheim/korap/config/BeansFactory.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/ConfigLoader.java b/full/src/main/java/de/ids_mannheim/korap/config/ConfigLoader.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/config/ConfigLoader.java
rename to full/src/main/java/de/ids_mannheim/korap/config/ConfigLoader.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/Configurable.java b/full/src/main/java/de/ids_mannheim/korap/config/Configurable.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/config/Configurable.java
rename to full/src/main/java/de/ids_mannheim/korap/config/Configurable.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/ContextHolder.java b/full/src/main/java/de/ids_mannheim/korap/config/ContextHolder.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/config/ContextHolder.java
rename to full/src/main/java/de/ids_mannheim/korap/config/ContextHolder.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/DefaultHandler.java b/full/src/main/java/de/ids_mannheim/korap/config/DefaultHandler.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/config/DefaultHandler.java
rename to full/src/main/java/de/ids_mannheim/korap/config/DefaultHandler.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/KustvaktCacheable.java b/full/src/main/java/de/ids_mannheim/korap/config/KustvaktCacheable.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/config/KustvaktCacheable.java
rename to full/src/main/java/de/ids_mannheim/korap/config/KustvaktCacheable.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/KustvaktClassLoader.java b/full/src/main/java/de/ids_mannheim/korap/config/KustvaktClassLoader.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/config/KustvaktClassLoader.java
rename to full/src/main/java/de/ids_mannheim/korap/config/KustvaktClassLoader.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java b/full/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
rename to full/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/ParamFields.java b/full/src/main/java/de/ids_mannheim/korap/config/ParamFields.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/config/ParamFields.java
rename to full/src/main/java/de/ids_mannheim/korap/config/ParamFields.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/QueryBuilderUtil.java b/full/src/main/java/de/ids_mannheim/korap/config/QueryBuilderUtil.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/config/QueryBuilderUtil.java
rename to full/src/main/java/de/ids_mannheim/korap/config/QueryBuilderUtil.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/Scopes.java b/full/src/main/java/de/ids_mannheim/korap/config/Scopes.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/config/Scopes.java
rename to full/src/main/java/de/ids_mannheim/korap/config/Scopes.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/URIParam.java b/full/src/main/java/de/ids_mannheim/korap/config/URIParam.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/config/URIParam.java
rename to full/src/main/java/de/ids_mannheim/korap/config/URIParam.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/constant/AnnotationType.java b/full/src/main/java/de/ids_mannheim/korap/constant/AnnotationType.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/constant/AnnotationType.java
rename to full/src/main/java/de/ids_mannheim/korap/constant/AnnotationType.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/constant/AuthenticationMethod.java b/full/src/main/java/de/ids_mannheim/korap/constant/AuthenticationMethod.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/constant/AuthenticationMethod.java
rename to full/src/main/java/de/ids_mannheim/korap/constant/AuthenticationMethod.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/constant/AuthenticationScheme.java b/full/src/main/java/de/ids_mannheim/korap/constant/AuthenticationScheme.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/constant/AuthenticationScheme.java
rename to full/src/main/java/de/ids_mannheim/korap/constant/AuthenticationScheme.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/constant/OAuth2Scope.java b/full/src/main/java/de/ids_mannheim/korap/constant/OAuth2Scope.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/constant/OAuth2Scope.java
rename to full/src/main/java/de/ids_mannheim/korap/constant/OAuth2Scope.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/constant/TokenType.java b/full/src/main/java/de/ids_mannheim/korap/constant/TokenType.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/constant/TokenType.java
rename to full/src/main/java/de/ids_mannheim/korap/constant/TokenType.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/core/entity/Annotation.java b/full/src/main/java/de/ids_mannheim/korap/core/entity/Annotation.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/core/entity/Annotation.java
rename to full/src/main/java/de/ids_mannheim/korap/core/entity/Annotation.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationKey.java b/full/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationKey.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationKey.java
rename to full/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationKey.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationLayer.java b/full/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationLayer.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationLayer.java
rename to full/src/main/java/de/ids_mannheim/korap/core/entity/AnnotationLayer.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/core/entity/Resource.java b/full/src/main/java/de/ids_mannheim/korap/core/entity/Resource.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/core/entity/Resource.java
rename to full/src/main/java/de/ids_mannheim/korap/core/entity/Resource.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java b/full/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
rename to full/src/main/java/de/ids_mannheim/korap/core/service/AnnotationService.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/core/service/BasicService.java b/full/src/main/java/de/ids_mannheim/korap/core/service/BasicService.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/core/service/BasicService.java
rename to full/src/main/java/de/ids_mannheim/korap/core/service/BasicService.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/core/service/SearchNetworkEndpoint.java b/full/src/main/java/de/ids_mannheim/korap/core/service/SearchNetworkEndpoint.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/core/service/SearchNetworkEndpoint.java
rename to full/src/main/java/de/ids_mannheim/korap/core/service/SearchNetworkEndpoint.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/core/service/SearchService.java b/full/src/main/java/de/ids_mannheim/korap/core/service/SearchService.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/core/service/SearchService.java
rename to full/src/main/java/de/ids_mannheim/korap/core/service/SearchService.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/core/service/StatisticService.java b/full/src/main/java/de/ids_mannheim/korap/core/service/StatisticService.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/core/service/StatisticService.java
rename to full/src/main/java/de/ids_mannheim/korap/core/service/StatisticService.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/core/web/controller/AnnotationController.java b/full/src/main/java/de/ids_mannheim/korap/core/web/controller/AnnotationController.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/core/web/controller/AnnotationController.java
rename to full/src/main/java/de/ids_mannheim/korap/core/web/controller/AnnotationController.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/core/web/controller/SearchController.java b/full/src/main/java/de/ids_mannheim/korap/core/web/controller/SearchController.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/core/web/controller/SearchController.java
rename to full/src/main/java/de/ids_mannheim/korap/core/web/controller/SearchController.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/core/web/controller/StatisticController.java b/full/src/main/java/de/ids_mannheim/korap/core/web/controller/StatisticController.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/core/web/controller/StatisticController.java
rename to full/src/main/java/de/ids_mannheim/korap/core/web/controller/StatisticController.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/dao/AdminDao.java b/full/src/main/java/de/ids_mannheim/korap/dao/AdminDao.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/dao/AdminDao.java
rename to full/src/main/java/de/ids_mannheim/korap/dao/AdminDao.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java b/full/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
rename to full/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java b/full/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
rename to full/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java b/full/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java
rename to full/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/dto/LayerDto.java b/full/src/main/java/de/ids_mannheim/korap/dto/LayerDto.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/dto/LayerDto.java
rename to full/src/main/java/de/ids_mannheim/korap/dto/LayerDto.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java b/full/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
rename to full/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/encryption/RandomCodeGenerator.java b/full/src/main/java/de/ids_mannheim/korap/encryption/RandomCodeGenerator.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/encryption/RandomCodeGenerator.java
rename to full/src/main/java/de/ids_mannheim/korap/encryption/RandomCodeGenerator.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/exceptions/DatabaseException.java b/full/src/main/java/de/ids_mannheim/korap/exceptions/DatabaseException.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/exceptions/DatabaseException.java
rename to full/src/main/java/de/ids_mannheim/korap/exceptions/DatabaseException.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/exceptions/EmptyResultException.java b/full/src/main/java/de/ids_mannheim/korap/exceptions/EmptyResultException.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/exceptions/EmptyResultException.java
rename to full/src/main/java/de/ids_mannheim/korap/exceptions/EmptyResultException.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/exceptions/KustvaktException.java b/full/src/main/java/de/ids_mannheim/korap/exceptions/KustvaktException.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/exceptions/KustvaktException.java
rename to full/src/main/java/de/ids_mannheim/korap/exceptions/KustvaktException.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/exceptions/ServiceException.java b/full/src/main/java/de/ids_mannheim/korap/exceptions/ServiceException.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/exceptions/ServiceException.java
rename to full/src/main/java/de/ids_mannheim/korap/exceptions/ServiceException.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java b/full/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
rename to full/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/exceptions/WrappedException.java b/full/src/main/java/de/ids_mannheim/korap/exceptions/WrappedException.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/exceptions/WrappedException.java
rename to full/src/main/java/de/ids_mannheim/korap/exceptions/WrappedException.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java b/full/src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java
rename to full/src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/interfaces/EntityHandlerIface.java b/full/src/main/java/de/ids_mannheim/korap/interfaces/EntityHandlerIface.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/interfaces/EntityHandlerIface.java
rename to full/src/main/java/de/ids_mannheim/korap/interfaces/EntityHandlerIface.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/interfaces/KustvaktBaseDaoInterface.java b/full/src/main/java/de/ids_mannheim/korap/interfaces/KustvaktBaseDaoInterface.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/interfaces/KustvaktBaseDaoInterface.java
rename to full/src/main/java/de/ids_mannheim/korap/interfaces/KustvaktBaseDaoInterface.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/interfaces/KustvaktTypeInterface.java b/full/src/main/java/de/ids_mannheim/korap/interfaces/KustvaktTypeInterface.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/interfaces/KustvaktTypeInterface.java
rename to full/src/main/java/de/ids_mannheim/korap/interfaces/KustvaktTypeInterface.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/interfaces/db/AuditingIface.java b/full/src/main/java/de/ids_mannheim/korap/interfaces/db/AuditingIface.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/interfaces/db/AuditingIface.java
rename to full/src/main/java/de/ids_mannheim/korap/interfaces/db/AuditingIface.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/interfaces/db/PersistenceClient.java b/full/src/main/java/de/ids_mannheim/korap/interfaces/db/PersistenceClient.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/interfaces/db/PersistenceClient.java
rename to full/src/main/java/de/ids_mannheim/korap/interfaces/db/PersistenceClient.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/interfaces/db/UserDataDbIface.java b/full/src/main/java/de/ids_mannheim/korap/interfaces/db/UserDataDbIface.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/interfaces/db/UserDataDbIface.java
rename to full/src/main/java/de/ids_mannheim/korap/interfaces/db/UserDataDbIface.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/interfaces/defaults/DefaultAuditing.java b/full/src/main/java/de/ids_mannheim/korap/interfaces/defaults/DefaultAuditing.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/interfaces/defaults/DefaultAuditing.java
rename to full/src/main/java/de/ids_mannheim/korap/interfaces/defaults/DefaultAuditing.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ScopeService.java b/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ScopeService.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ScopeService.java
rename to full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ScopeService.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java b/full/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java
rename to full/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/rewrite/FoundryInject.java b/full/src/main/java/de/ids_mannheim/korap/rewrite/FoundryInject.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/rewrite/FoundryInject.java
rename to full/src/main/java/de/ids_mannheim/korap/rewrite/FoundryInject.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/rewrite/IdWriter.java b/full/src/main/java/de/ids_mannheim/korap/rewrite/IdWriter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/rewrite/IdWriter.java
rename to full/src/main/java/de/ids_mannheim/korap/rewrite/IdWriter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/rewrite/KoralNode.java b/full/src/main/java/de/ids_mannheim/korap/rewrite/KoralNode.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/rewrite/KoralNode.java
rename to full/src/main/java/de/ids_mannheim/korap/rewrite/KoralNode.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/rewrite/LayerMapper.java b/full/src/main/java/de/ids_mannheim/korap/rewrite/LayerMapper.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/rewrite/LayerMapper.java
rename to full/src/main/java/de/ids_mannheim/korap/rewrite/LayerMapper.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/rewrite/MetaConstraint.java b/full/src/main/java/de/ids_mannheim/korap/rewrite/MetaConstraint.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/rewrite/MetaConstraint.java
rename to full/src/main/java/de/ids_mannheim/korap/rewrite/MetaConstraint.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/rewrite/RewriteHandler.java b/full/src/main/java/de/ids_mannheim/korap/rewrite/RewriteHandler.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/rewrite/RewriteHandler.java
rename to full/src/main/java/de/ids_mannheim/korap/rewrite/RewriteHandler.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/rewrite/RewriteTask.java b/full/src/main/java/de/ids_mannheim/korap/rewrite/RewriteTask.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/rewrite/RewriteTask.java
rename to full/src/main/java/de/ids_mannheim/korap/rewrite/RewriteTask.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/rewrite/TreeConstraint.java b/full/src/main/java/de/ids_mannheim/korap/rewrite/TreeConstraint.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/rewrite/TreeConstraint.java
rename to full/src/main/java/de/ids_mannheim/korap/rewrite/TreeConstraint.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/security/context/KustvaktContext.java b/full/src/main/java/de/ids_mannheim/korap/security/context/KustvaktContext.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/security/context/KustvaktContext.java
rename to full/src/main/java/de/ids_mannheim/korap/security/context/KustvaktContext.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/security/context/TokenContext.java b/full/src/main/java/de/ids_mannheim/korap/security/context/TokenContext.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/security/context/TokenContext.java
rename to full/src/main/java/de/ids_mannheim/korap/security/context/TokenContext.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
rename to full/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/user/DataFactory.java b/full/src/main/java/de/ids_mannheim/korap/user/DataFactory.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/user/DataFactory.java
rename to full/src/main/java/de/ids_mannheim/korap/user/DataFactory.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/user/DemoUser.java b/full/src/main/java/de/ids_mannheim/korap/user/DemoUser.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/user/DemoUser.java
rename to full/src/main/java/de/ids_mannheim/korap/user/DemoUser.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/user/GenericUserData.java b/full/src/main/java/de/ids_mannheim/korap/user/GenericUserData.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/user/GenericUserData.java
rename to full/src/main/java/de/ids_mannheim/korap/user/GenericUserData.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/user/KorAPUser.java b/full/src/main/java/de/ids_mannheim/korap/user/KorAPUser.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/user/KorAPUser.java
rename to full/src/main/java/de/ids_mannheim/korap/user/KorAPUser.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/user/User.java b/full/src/main/java/de/ids_mannheim/korap/user/User.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/user/User.java
rename to full/src/main/java/de/ids_mannheim/korap/user/User.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/user/UserDetails.java b/full/src/main/java/de/ids_mannheim/korap/user/UserDetails.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/user/UserDetails.java
rename to full/src/main/java/de/ids_mannheim/korap/user/UserDetails.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/user/UserQuery.java b/full/src/main/java/de/ids_mannheim/korap/user/UserQuery.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/user/UserQuery.java
rename to full/src/main/java/de/ids_mannheim/korap/user/UserQuery.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/user/UserSettingProcessor.java b/full/src/main/java/de/ids_mannheim/korap/user/UserSettingProcessor.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/user/UserSettingProcessor.java
rename to full/src/main/java/de/ids_mannheim/korap/user/UserSettingProcessor.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/user/Userdata.java b/full/src/main/java/de/ids_mannheim/korap/user/Userdata.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/user/Userdata.java
rename to full/src/main/java/de/ids_mannheim/korap/user/Userdata.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/BooleanUtils.java b/full/src/main/java/de/ids_mannheim/korap/utils/BooleanUtils.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/BooleanUtils.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/BooleanUtils.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/CollectionTypes.java b/full/src/main/java/de/ids_mannheim/korap/utils/CollectionTypes.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/CollectionTypes.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/CollectionTypes.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/ConcurrentMultiMap.java b/full/src/main/java/de/ids_mannheim/korap/utils/ConcurrentMultiMap.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/ConcurrentMultiMap.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/ConcurrentMultiMap.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/IPNetMask.java b/full/src/main/java/de/ids_mannheim/korap/utils/IPNetMask.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/IPNetMask.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/IPNetMask.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/JerseyUtils.java b/full/src/main/java/de/ids_mannheim/korap/utils/JerseyUtils.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/JerseyUtils.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/JerseyUtils.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/JsonUtils.java b/full/src/main/java/de/ids_mannheim/korap/utils/JsonUtils.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/JsonUtils.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/JsonUtils.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java b/full/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/NamingUtils.java b/full/src/main/java/de/ids_mannheim/korap/utils/NamingUtils.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/NamingUtils.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/NamingUtils.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/ParameterChecker.java b/full/src/main/java/de/ids_mannheim/korap/utils/ParameterChecker.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/ParameterChecker.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/ParameterChecker.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/PrefixTreeMap.java b/full/src/main/java/de/ids_mannheim/korap/utils/PrefixTreeMap.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/PrefixTreeMap.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/PrefixTreeMap.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/PropertyReader.java b/full/src/main/java/de/ids_mannheim/korap/utils/PropertyReader.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/PropertyReader.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/PropertyReader.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/ServiceInfo.java b/full/src/main/java/de/ids_mannheim/korap/utils/ServiceInfo.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/ServiceInfo.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/ServiceInfo.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/SqlBuilder.java b/full/src/main/java/de/ids_mannheim/korap/utils/SqlBuilder.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/SqlBuilder.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/SqlBuilder.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/StringUtils.java b/full/src/main/java/de/ids_mannheim/korap/utils/StringUtils.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/StringUtils.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/StringUtils.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/utils/TimeUtils.java b/full/src/main/java/de/ids_mannheim/korap/utils/TimeUtils.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/utils/TimeUtils.java
rename to full/src/main/java/de/ids_mannheim/korap/utils/TimeUtils.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/validator/ApacheValidator.java b/full/src/main/java/de/ids_mannheim/korap/validator/ApacheValidator.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/validator/ApacheValidator.java
rename to full/src/main/java/de/ids_mannheim/korap/validator/ApacheValidator.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/validator/Validator.java b/full/src/main/java/de/ids_mannheim/korap/validator/Validator.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/validator/Validator.java
rename to full/src/main/java/de/ids_mannheim/korap/validator/Validator.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/ClientsHandler.java b/full/src/main/java/de/ids_mannheim/korap/web/ClientsHandler.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/ClientsHandler.java
rename to full/src/main/java/de/ids_mannheim/korap/web/ClientsHandler.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/CoreResponseHandler.java b/full/src/main/java/de/ids_mannheim/korap/web/CoreResponseHandler.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/CoreResponseHandler.java
rename to full/src/main/java/de/ids_mannheim/korap/web/CoreResponseHandler.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/KustvaktResponseHandler.java b/full/src/main/java/de/ids_mannheim/korap/web/KustvaktResponseHandler.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/KustvaktResponseHandler.java
rename to full/src/main/java/de/ids_mannheim/korap/web/KustvaktResponseHandler.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/SearchKrill.java b/full/src/main/java/de/ids_mannheim/korap/web/SearchKrill.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/SearchKrill.java
rename to full/src/main/java/de/ids_mannheim/korap/web/SearchKrill.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/TRACE.java b/full/src/main/java/de/ids_mannheim/korap/web/TRACE.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/TRACE.java
rename to full/src/main/java/de/ids_mannheim/korap/web/TRACE.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/filter/APIVersionFilter.java b/full/src/main/java/de/ids_mannheim/korap/web/filter/APIVersionFilter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/filter/APIVersionFilter.java
rename to full/src/main/java/de/ids_mannheim/korap/web/filter/APIVersionFilter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java b/full/src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java
rename to full/src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/filter/AuthenticationFilter.java b/full/src/main/java/de/ids_mannheim/korap/web/filter/AuthenticationFilter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/filter/AuthenticationFilter.java
rename to full/src/main/java/de/ids_mannheim/korap/web/filter/AuthenticationFilter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java b/full/src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java
rename to full/src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java b/full/src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java
rename to full/src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java b/full/src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java
rename to full/src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java b/full/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java
rename to full/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/filter/PiwikFilter.java b/full/src/main/java/de/ids_mannheim/korap/web/filter/PiwikFilter.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/filter/PiwikFilter.java
rename to full/src/main/java/de/ids_mannheim/korap/web/filter/PiwikFilter.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java b/full/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
rename to full/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/HTMLBuilder.java b/full/src/main/java/de/ids_mannheim/korap/web/utils/HTMLBuilder.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/utils/HTMLBuilder.java
rename to full/src/main/java/de/ids_mannheim/korap/web/utils/HTMLBuilder.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/JsonExceptionMapper.java b/full/src/main/java/de/ids_mannheim/korap/web/utils/JsonExceptionMapper.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/utils/JsonExceptionMapper.java
rename to full/src/main/java/de/ids_mannheim/korap/web/utils/JsonExceptionMapper.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktMap.java b/full/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktMap.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktMap.java
rename to full/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktMap.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseBuilder.java b/full/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseBuilder.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseBuilder.java
rename to full/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseBuilder.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/LocaleFactory.java b/full/src/main/java/de/ids_mannheim/korap/web/utils/LocaleFactory.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/utils/LocaleFactory.java
rename to full/src/main/java/de/ids_mannheim/korap/web/utils/LocaleFactory.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/NotFoundMapper.java b/full/src/main/java/de/ids_mannheim/korap/web/utils/NotFoundMapper.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/utils/NotFoundMapper.java
rename to full/src/main/java/de/ids_mannheim/korap/web/utils/NotFoundMapper.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/ResourceFilters.java b/full/src/main/java/de/ids_mannheim/korap/web/utils/ResourceFilters.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/utils/ResourceFilters.java
rename to full/src/main/java/de/ids_mannheim/korap/web/utils/ResourceFilters.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/ResourceFiltersFeature.java b/full/src/main/java/de/ids_mannheim/korap/web/utils/ResourceFiltersFeature.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/utils/ResourceFiltersFeature.java
rename to full/src/main/java/de/ids_mannheim/korap/web/utils/ResourceFiltersFeature.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFilters.java b/full/src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFilters.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFilters.java
rename to full/src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFilters.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFiltersFeature.java b/full/src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFiltersFeature.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFiltersFeature.java
rename to full/src/main/java/de/ids_mannheim/korap/web/utils/SearchResourceFiltersFeature.java
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/ShutdownHook.java b/full/src/main/java/de/ids_mannheim/korap/web/utils/ShutdownHook.java
similarity index 100%
rename from core/src/main/java/de/ids_mannheim/korap/web/utils/ShutdownHook.java
rename to full/src/main/java/de/ids_mannheim/korap/web/utils/ShutdownHook.java
diff --git a/core/src/main/resources/annotation-scripts/foundries/base.js b/full/src/main/resources/annotation-scripts/foundries/base.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/foundries/base.js
rename to full/src/main/resources/annotation-scripts/foundries/base.js
diff --git a/core/src/main/resources/annotation-scripts/foundries/cnx.js b/full/src/main/resources/annotation-scripts/foundries/cnx.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/foundries/cnx.js
rename to full/src/main/resources/annotation-scripts/foundries/cnx.js
diff --git a/core/src/main/resources/annotation-scripts/foundries/corenlp.js b/full/src/main/resources/annotation-scripts/foundries/corenlp.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/foundries/corenlp.js
rename to full/src/main/resources/annotation-scripts/foundries/corenlp.js
diff --git a/core/src/main/resources/annotation-scripts/foundries/dereko.js b/full/src/main/resources/annotation-scripts/foundries/dereko.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/foundries/dereko.js
rename to full/src/main/resources/annotation-scripts/foundries/dereko.js
diff --git a/core/src/main/resources/annotation-scripts/foundries/drukola.js b/full/src/main/resources/annotation-scripts/foundries/drukola.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/foundries/drukola.js
rename to full/src/main/resources/annotation-scripts/foundries/drukola.js
diff --git a/core/src/main/resources/annotation-scripts/foundries/lwc.js b/full/src/main/resources/annotation-scripts/foundries/lwc.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/foundries/lwc.js
rename to full/src/main/resources/annotation-scripts/foundries/lwc.js
diff --git a/core/src/main/resources/annotation-scripts/foundries/malt.js b/full/src/main/resources/annotation-scripts/foundries/malt.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/foundries/malt.js
rename to full/src/main/resources/annotation-scripts/foundries/malt.js
diff --git a/core/src/main/resources/annotation-scripts/foundries/marmot.js b/full/src/main/resources/annotation-scripts/foundries/marmot.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/foundries/marmot.js
rename to full/src/main/resources/annotation-scripts/foundries/marmot.js
diff --git a/core/src/main/resources/annotation-scripts/foundries/mate.js b/full/src/main/resources/annotation-scripts/foundries/mate.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/foundries/mate.js
rename to full/src/main/resources/annotation-scripts/foundries/mate.js
diff --git a/core/src/main/resources/annotation-scripts/foundries/opennlp.js b/full/src/main/resources/annotation-scripts/foundries/opennlp.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/foundries/opennlp.js
rename to full/src/main/resources/annotation-scripts/foundries/opennlp.js
diff --git a/core/src/main/resources/annotation-scripts/foundries/schreibgebrauch.js b/full/src/main/resources/annotation-scripts/foundries/schreibgebrauch.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/foundries/schreibgebrauch.js
rename to full/src/main/resources/annotation-scripts/foundries/schreibgebrauch.js
diff --git a/core/src/main/resources/annotation-scripts/foundries/treetagger.js b/full/src/main/resources/annotation-scripts/foundries/treetagger.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/foundries/treetagger.js
rename to full/src/main/resources/annotation-scripts/foundries/treetagger.js
diff --git a/core/src/main/resources/annotation-scripts/foundries/xip.js b/full/src/main/resources/annotation-scripts/foundries/xip.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/foundries/xip.js
rename to full/src/main/resources/annotation-scripts/foundries/xip.js
diff --git a/core/src/main/resources/annotation-scripts/variables/negraedges.js b/full/src/main/resources/annotation-scripts/variables/negraedges.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/variables/negraedges.js
rename to full/src/main/resources/annotation-scripts/variables/negraedges.js
diff --git a/core/src/main/resources/annotation-scripts/variables/negranodes.js b/full/src/main/resources/annotation-scripts/variables/negranodes.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/variables/negranodes.js
rename to full/src/main/resources/annotation-scripts/variables/negranodes.js
diff --git a/core/src/main/resources/annotation-scripts/variables/stts.js b/full/src/main/resources/annotation-scripts/variables/stts.js
similarity index 100%
rename from core/src/main/resources/annotation-scripts/variables/stts.js
rename to full/src/main/resources/annotation-scripts/variables/stts.js
diff --git a/full/src/main/resources/lite-config.xml b/full/src/main/resources/lite-config.xml
index 4b6a074..5c9b8ff 100644
--- a/full/src/main/resources/lite-config.xml
+++ b/full/src/main/resources/lite-config.xml
@@ -132,10 +132,10 @@
 	<!-- Initialization -->
 	<!-- <bean id="initializator" class="de.ids_mannheim.de.init.LiteInitializatorImpl"
 		init-method="init">
-	</bean> -->
+	</bean> 
 	<bean id="annotationParser" class="de.ids_mannheim.korap.annotation.AnnotationParser"
 		scope="singleton" />
-
+	-->
 	<!-- Search Engine -->
 	<bean id="search_krill" class="de.ids_mannheim.korap.web.SearchKrill">
 		<constructor-arg value="${krill.indexDir}" />
diff --git a/core/src/main/resources/service.properties b/full/src/main/resources/service.properties
similarity index 100%
rename from core/src/main/resources/service.properties
rename to full/src/main/resources/service.properties
diff --git a/core/src/main/resources/validation.properties b/full/src/main/resources/validation.properties
similarity index 100%
rename from core/src/main/resources/validation.properties
rename to full/src/main/resources/validation.properties
diff --git a/core/src/test/resources/network-output/search-result.jsonld b/full/src/test/resources/network-output/search-result.jsonld
similarity index 100%
rename from core/src/test/resources/network-output/search-result.jsonld
rename to full/src/test/resources/network-output/search-result.jsonld
diff --git a/core/src/test/resources/pipe-output/test-pipes.jsonld b/full/src/test/resources/pipe-output/test-pipes.jsonld
similarity index 100%
rename from core/src/test/resources/pipe-output/test-pipes.jsonld
rename to full/src/test/resources/pipe-output/test-pipes.jsonld
diff --git a/core/src/test/resources/pipe-output/with-param.jsonld b/full/src/test/resources/pipe-output/with-param.jsonld
similarity index 100%
rename from core/src/test/resources/pipe-output/with-param.jsonld
rename to full/src/test/resources/pipe-output/with-param.jsonld