diff --git a/src/main/java/de/ids_mannheim/korap/auditing/AuditRecord.java b/core/src/main/java/de/ids_mannheim/korap/auditing/AuditRecord.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/auditing/AuditRecord.java
rename to core/src/main/java/de/ids_mannheim/korap/auditing/AuditRecord.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/AdminSetup.java b/core/src/main/java/de/ids_mannheim/korap/config/AdminSetup.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/AdminSetup.java
rename to core/src/main/java/de/ids_mannheim/korap/config/AdminSetup.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/Attributes.java b/core/src/main/java/de/ids_mannheim/korap/config/Attributes.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/Attributes.java
rename to core/src/main/java/de/ids_mannheim/korap/config/Attributes.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/AuthCodeInfo.java b/core/src/main/java/de/ids_mannheim/korap/config/AuthCodeInfo.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/AuthCodeInfo.java
rename to core/src/main/java/de/ids_mannheim/korap/config/AuthCodeInfo.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/BeanConfiguration.java b/core/src/main/java/de/ids_mannheim/korap/config/BeanConfiguration.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/BeanConfiguration.java
rename to core/src/main/java/de/ids_mannheim/korap/config/BeanConfiguration.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/BeanInjectable.java b/core/src/main/java/de/ids_mannheim/korap/config/BeanInjectable.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/BeanInjectable.java
rename to core/src/main/java/de/ids_mannheim/korap/config/BeanInjectable.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/BeansFactory.java b/core/src/main/java/de/ids_mannheim/korap/config/BeansFactory.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/BeansFactory.java
rename to core/src/main/java/de/ids_mannheim/korap/config/BeansFactory.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/ClientInfo.java b/core/src/main/java/de/ids_mannheim/korap/config/ClientInfo.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/ClientInfo.java
rename to core/src/main/java/de/ids_mannheim/korap/config/ClientInfo.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/ConfigLoader.java b/core/src/main/java/de/ids_mannheim/korap/config/ConfigLoader.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/ConfigLoader.java
rename to core/src/main/java/de/ids_mannheim/korap/config/ConfigLoader.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/Configurable.java b/core/src/main/java/de/ids_mannheim/korap/config/Configurable.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/Configurable.java
rename to core/src/main/java/de/ids_mannheim/korap/config/Configurable.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/ContextHolder.java b/core/src/main/java/de/ids_mannheim/korap/config/ContextHolder.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/ContextHolder.java
rename to core/src/main/java/de/ids_mannheim/korap/config/ContextHolder.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/DefaultHandler.java b/core/src/main/java/de/ids_mannheim/korap/config/DefaultHandler.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/DefaultHandler.java
rename to core/src/main/java/de/ids_mannheim/korap/config/DefaultHandler.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/ExceptionBuilder.java b/core/src/main/java/de/ids_mannheim/korap/config/ExceptionBuilder.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/ExceptionBuilder.java
rename to core/src/main/java/de/ids_mannheim/korap/config/ExceptionBuilder.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/JWTSigner.java b/core/src/main/java/de/ids_mannheim/korap/config/JWTSigner.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/JWTSigner.java
rename to core/src/main/java/de/ids_mannheim/korap/config/JWTSigner.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/KustvaktBaseDaoInterface.java b/core/src/main/java/de/ids_mannheim/korap/config/KustvaktBaseDaoInterface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/KustvaktBaseDaoInterface.java
rename to core/src/main/java/de/ids_mannheim/korap/config/KustvaktBaseDaoInterface.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/KustvaktCacheable.java b/core/src/main/java/de/ids_mannheim/korap/config/KustvaktCacheable.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/KustvaktCacheable.java
rename to core/src/main/java/de/ids_mannheim/korap/config/KustvaktCacheable.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/KustvaktClassLoader.java b/core/src/main/java/de/ids_mannheim/korap/config/KustvaktClassLoader.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/KustvaktClassLoader.java
rename to core/src/main/java/de/ids_mannheim/korap/config/KustvaktClassLoader.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java b/core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
rename to core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/KustvaktContext.java b/core/src/main/java/de/ids_mannheim/korap/config/KustvaktContext.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/KustvaktContext.java
rename to core/src/main/java/de/ids_mannheim/korap/config/KustvaktContext.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/KustvaktTypeInterface.java b/core/src/main/java/de/ids_mannheim/korap/config/KustvaktTypeInterface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/KustvaktTypeInterface.java
rename to core/src/main/java/de/ids_mannheim/korap/config/KustvaktTypeInterface.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/ParamFields.java b/core/src/main/java/de/ids_mannheim/korap/config/ParamFields.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/ParamFields.java
rename to core/src/main/java/de/ids_mannheim/korap/config/ParamFields.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/QueryBuilderUtil.java b/core/src/main/java/de/ids_mannheim/korap/config/QueryBuilderUtil.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/QueryBuilderUtil.java
rename to core/src/main/java/de/ids_mannheim/korap/config/QueryBuilderUtil.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/Scopes.java b/core/src/main/java/de/ids_mannheim/korap/config/Scopes.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/Scopes.java
rename to core/src/main/java/de/ids_mannheim/korap/config/Scopes.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/URIParam.java b/core/src/main/java/de/ids_mannheim/korap/config/URIParam.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/URIParam.java
rename to core/src/main/java/de/ids_mannheim/korap/config/URIParam.java
diff --git a/src/main/java/de/ids_mannheim/korap/config/UserClientInfo.java b/core/src/main/java/de/ids_mannheim/korap/config/UserClientInfo.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/config/UserClientInfo.java
rename to core/src/main/java/de/ids_mannheim/korap/config/UserClientInfo.java
diff --git a/src/main/java/de/ids_mannheim/korap/exceptions/DatabaseException.java b/core/src/main/java/de/ids_mannheim/korap/exceptions/DatabaseException.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/exceptions/DatabaseException.java
rename to core/src/main/java/de/ids_mannheim/korap/exceptions/DatabaseException.java
diff --git a/src/main/java/de/ids_mannheim/korap/exceptions/EmptyResultException.java b/core/src/main/java/de/ids_mannheim/korap/exceptions/EmptyResultException.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/exceptions/EmptyResultException.java
rename to core/src/main/java/de/ids_mannheim/korap/exceptions/EmptyResultException.java
diff --git a/src/main/java/de/ids_mannheim/korap/exceptions/KustvaktException.java b/core/src/main/java/de/ids_mannheim/korap/exceptions/KustvaktException.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/exceptions/KustvaktException.java
rename to core/src/main/java/de/ids_mannheim/korap/exceptions/KustvaktException.java
diff --git a/src/main/java/de/ids_mannheim/korap/exceptions/NotAuthorizedException.java b/core/src/main/java/de/ids_mannheim/korap/exceptions/NotAuthorizedException.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/exceptions/NotAuthorizedException.java
rename to core/src/main/java/de/ids_mannheim/korap/exceptions/NotAuthorizedException.java
diff --git a/src/main/java/de/ids_mannheim/korap/exceptions/ServiceException.java b/core/src/main/java/de/ids_mannheim/korap/exceptions/ServiceException.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/exceptions/ServiceException.java
rename to core/src/main/java/de/ids_mannheim/korap/exceptions/ServiceException.java
diff --git a/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java b/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
rename to core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
diff --git a/src/main/java/de/ids_mannheim/korap/exceptions/WrappedException.java b/core/src/main/java/de/ids_mannheim/korap/exceptions/WrappedException.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/exceptions/WrappedException.java
rename to core/src/main/java/de/ids_mannheim/korap/exceptions/WrappedException.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/AuthenticationIface.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/AuthenticationIface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/AuthenticationIface.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/AuthenticationIface.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/AuthenticationManagerIface.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/AuthenticationManagerIface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/AuthenticationManagerIface.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/AuthenticationManagerIface.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/ValidatorIface.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/ValidatorIface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/ValidatorIface.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/ValidatorIface.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/db/AdminHandlerIface.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/db/AdminHandlerIface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/db/AdminHandlerIface.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/db/AdminHandlerIface.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/db/AuditingIface.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/db/AuditingIface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/db/AuditingIface.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/db/AuditingIface.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/db/EntityHandlerIface.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/db/EntityHandlerIface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/db/EntityHandlerIface.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/db/EntityHandlerIface.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/db/PersistenceClient.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/db/PersistenceClient.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/db/PersistenceClient.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/db/PersistenceClient.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/db/PolicyHandlerIface.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/db/PolicyHandlerIface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/db/PolicyHandlerIface.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/db/PolicyHandlerIface.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/db/ResourceOperationIface.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/db/ResourceOperationIface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/db/ResourceOperationIface.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/db/ResourceOperationIface.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/db/UserDataDbIface.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/db/UserDataDbIface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/db/UserDataDbIface.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/db/UserDataDbIface.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/defaults/ApacheValidator.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/defaults/ApacheValidator.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/defaults/ApacheValidator.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/defaults/ApacheValidator.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/defaults/DefaultAuditing.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/defaults/DefaultAuditing.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/defaults/DefaultAuditing.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/defaults/DefaultAuditing.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/defaults/DefaultEncryption.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/defaults/DefaultEncryption.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/defaults/DefaultEncryption.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/defaults/DefaultEncryption.java
diff --git a/src/main/java/de/ids_mannheim/korap/interfaces/defaults/KustvaktEncryption.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/defaults/KustvaktEncryption.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/interfaces/defaults/KustvaktEncryption.java
rename to core/src/main/java/de/ids_mannheim/korap/interfaces/defaults/KustvaktEncryption.java
diff --git a/src/main/java/de/ids_mannheim/korap/managers/ManagerInterface.java b/core/src/main/java/de/ids_mannheim/korap/managers/ManagerInterface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/managers/ManagerInterface.java
rename to core/src/main/java/de/ids_mannheim/korap/managers/ManagerInterface.java
diff --git a/src/main/java/de/ids_mannheim/korap/resource/LayerMapper.java b/core/src/main/java/de/ids_mannheim/korap/resource/LayerMapper.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resource/LayerMapper.java
rename to core/src/main/java/de/ids_mannheim/korap/resource/LayerMapper.java
diff --git a/src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionCleanRewrite.java b/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionCleanRewrite.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionCleanRewrite.java
rename to core/src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionCleanRewrite.java
diff --git a/src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionConstraint.java b/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionConstraint.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionConstraint.java
rename to core/src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionConstraint.java
diff --git a/src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionRewrite.java b/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionRewrite.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionRewrite.java
rename to core/src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionRewrite.java
diff --git a/src/main/java/de/ids_mannheim/korap/resource/rewrite/DocMatchRewrite.java b/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/DocMatchRewrite.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resource/rewrite/DocMatchRewrite.java
rename to core/src/main/java/de/ids_mannheim/korap/resource/rewrite/DocMatchRewrite.java
diff --git a/src/main/java/de/ids_mannheim/korap/resource/rewrite/FoundryInject.java b/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/FoundryInject.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resource/rewrite/FoundryInject.java
rename to core/src/main/java/de/ids_mannheim/korap/resource/rewrite/FoundryInject.java
diff --git a/src/main/java/de/ids_mannheim/korap/resource/rewrite/IdWriter.java b/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/IdWriter.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resource/rewrite/IdWriter.java
rename to core/src/main/java/de/ids_mannheim/korap/resource/rewrite/IdWriter.java
diff --git a/src/main/java/de/ids_mannheim/korap/resource/rewrite/KoralNode.java b/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/KoralNode.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resource/rewrite/KoralNode.java
rename to core/src/main/java/de/ids_mannheim/korap/resource/rewrite/KoralNode.java
diff --git a/src/main/java/de/ids_mannheim/korap/resource/rewrite/MetaConstraint.java b/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/MetaConstraint.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resource/rewrite/MetaConstraint.java
rename to core/src/main/java/de/ids_mannheim/korap/resource/rewrite/MetaConstraint.java
diff --git a/src/main/java/de/ids_mannheim/korap/resource/rewrite/PublicCollection.java b/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/PublicCollection.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resource/rewrite/PublicCollection.java
rename to core/src/main/java/de/ids_mannheim/korap/resource/rewrite/PublicCollection.java
diff --git a/src/main/java/de/ids_mannheim/korap/resource/rewrite/RewriteHandler.java b/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/RewriteHandler.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resource/rewrite/RewriteHandler.java
rename to core/src/main/java/de/ids_mannheim/korap/resource/rewrite/RewriteHandler.java
diff --git a/src/main/java/de/ids_mannheim/korap/resource/rewrite/RewriteTask.java b/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/RewriteTask.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resource/rewrite/RewriteTask.java
rename to core/src/main/java/de/ids_mannheim/korap/resource/rewrite/RewriteTask.java
diff --git a/src/main/java/de/ids_mannheim/korap/resource/rewrite/TreeConstraint.java b/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/TreeConstraint.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resource/rewrite/TreeConstraint.java
rename to core/src/main/java/de/ids_mannheim/korap/resource/rewrite/TreeConstraint.java
diff --git a/src/main/java/de/ids_mannheim/korap/resources/Corpus.java b/core/src/main/java/de/ids_mannheim/korap/resources/Corpus.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resources/Corpus.java
rename to core/src/main/java/de/ids_mannheim/korap/resources/Corpus.java
diff --git a/src/main/java/de/ids_mannheim/korap/resources/Document.java b/core/src/main/java/de/ids_mannheim/korap/resources/Document.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resources/Document.java
rename to core/src/main/java/de/ids_mannheim/korap/resources/Document.java
diff --git a/src/main/java/de/ids_mannheim/korap/resources/Foundry.java b/core/src/main/java/de/ids_mannheim/korap/resources/Foundry.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resources/Foundry.java
rename to core/src/main/java/de/ids_mannheim/korap/resources/Foundry.java
diff --git a/src/main/java/de/ids_mannheim/korap/resources/KustvaktResource.java b/core/src/main/java/de/ids_mannheim/korap/resources/KustvaktResource.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resources/KustvaktResource.java
rename to core/src/main/java/de/ids_mannheim/korap/resources/KustvaktResource.java
diff --git a/src/main/java/de/ids_mannheim/korap/resources/Layer.java b/core/src/main/java/de/ids_mannheim/korap/resources/Layer.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resources/Layer.java
rename to core/src/main/java/de/ids_mannheim/korap/resources/Layer.java
diff --git a/src/main/java/de/ids_mannheim/korap/resources/Permissions.java b/core/src/main/java/de/ids_mannheim/korap/resources/Permissions.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resources/Permissions.java
rename to core/src/main/java/de/ids_mannheim/korap/resources/Permissions.java
diff --git a/src/main/java/de/ids_mannheim/korap/resources/Relation.java b/core/src/main/java/de/ids_mannheim/korap/resources/Relation.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resources/Relation.java
rename to core/src/main/java/de/ids_mannheim/korap/resources/Relation.java
diff --git a/src/main/java/de/ids_mannheim/korap/resources/ResourceFactory.java b/core/src/main/java/de/ids_mannheim/korap/resources/ResourceFactory.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resources/ResourceFactory.java
rename to core/src/main/java/de/ids_mannheim/korap/resources/ResourceFactory.java
diff --git a/src/main/java/de/ids_mannheim/korap/resources/VirtualCollection.java b/core/src/main/java/de/ids_mannheim/korap/resources/VirtualCollection.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/resources/VirtualCollection.java
rename to core/src/main/java/de/ids_mannheim/korap/resources/VirtualCollection.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/Parameter.java b/core/src/main/java/de/ids_mannheim/korap/security/Parameter.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/Parameter.java
rename to core/src/main/java/de/ids_mannheim/korap/security/Parameter.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/PermissionsBuffer.java b/core/src/main/java/de/ids_mannheim/korap/security/PermissionsBuffer.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/PermissionsBuffer.java
rename to core/src/main/java/de/ids_mannheim/korap/security/PermissionsBuffer.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/PolicyCondition.java b/core/src/main/java/de/ids_mannheim/korap/security/PolicyCondition.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/PolicyCondition.java
rename to core/src/main/java/de/ids_mannheim/korap/security/PolicyCondition.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/PolicyContext.java b/core/src/main/java/de/ids_mannheim/korap/security/PolicyContext.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/PolicyContext.java
rename to core/src/main/java/de/ids_mannheim/korap/security/PolicyContext.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/SecurityPolicy.java b/core/src/main/java/de/ids_mannheim/korap/security/SecurityPolicy.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/SecurityPolicy.java
rename to core/src/main/java/de/ids_mannheim/korap/security/SecurityPolicy.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/ConditionManagement.java b/core/src/main/java/de/ids_mannheim/korap/security/ac/ConditionManagement.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/ac/ConditionManagement.java
rename to core/src/main/java/de/ids_mannheim/korap/security/ac/ConditionManagement.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/ConditionManager.java b/core/src/main/java/de/ids_mannheim/korap/security/ac/ConditionManager.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/ac/ConditionManager.java
rename to core/src/main/java/de/ids_mannheim/korap/security/ac/ConditionManager.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/PolicyBuilder.java b/core/src/main/java/de/ids_mannheim/korap/security/ac/PolicyBuilder.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/ac/PolicyBuilder.java
rename to core/src/main/java/de/ids_mannheim/korap/security/ac/PolicyBuilder.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/PolicyDao.java b/core/src/main/java/de/ids_mannheim/korap/security/ac/PolicyDao.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/ac/PolicyDao.java
rename to core/src/main/java/de/ids_mannheim/korap/security/ac/PolicyDao.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/PolicyEvaluator.java b/core/src/main/java/de/ids_mannheim/korap/security/ac/PolicyEvaluator.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/ac/PolicyEvaluator.java
rename to core/src/main/java/de/ids_mannheim/korap/security/ac/PolicyEvaluator.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/ResourceFinder.java b/core/src/main/java/de/ids_mannheim/korap/security/ac/ResourceFinder.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/ac/ResourceFinder.java
rename to core/src/main/java/de/ids_mannheim/korap/security/ac/ResourceFinder.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/ResourceHandler.java b/core/src/main/java/de/ids_mannheim/korap/security/ac/ResourceHandler.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/ac/ResourceHandler.java
rename to core/src/main/java/de/ids_mannheim/korap/security/ac/ResourceHandler.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/SecurityManager.java b/core/src/main/java/de/ids_mannheim/korap/security/ac/SecurityManager.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/ac/SecurityManager.java
rename to core/src/main/java/de/ids_mannheim/korap/security/ac/SecurityManager.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/SecurityManagerFactory.java b/core/src/main/java/de/ids_mannheim/korap/security/ac/SecurityManagerFactory.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/ac/SecurityManagerFactory.java
rename to core/src/main/java/de/ids_mannheim/korap/security/ac/SecurityManagerFactory.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/SecurityRowMappers.java b/core/src/main/java/de/ids_mannheim/korap/security/ac/SecurityRowMappers.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/ac/SecurityRowMappers.java
rename to core/src/main/java/de/ids_mannheim/korap/security/ac/SecurityRowMappers.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/APIAuthentication.java b/core/src/main/java/de/ids_mannheim/korap/security/auth/APIAuthentication.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/auth/APIAuthentication.java
rename to core/src/main/java/de/ids_mannheim/korap/security/auth/APIAuthentication.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/BasicHttpAuth.java b/core/src/main/java/de/ids_mannheim/korap/security/auth/BasicHttpAuth.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/auth/BasicHttpAuth.java
rename to core/src/main/java/de/ids_mannheim/korap/security/auth/BasicHttpAuth.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java b/core/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
rename to core/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/LdapAuth3.java b/core/src/main/java/de/ids_mannheim/korap/security/auth/LdapAuth3.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/auth/LdapAuth3.java
rename to core/src/main/java/de/ids_mannheim/korap/security/auth/LdapAuth3.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/LoginCounter.java b/core/src/main/java/de/ids_mannheim/korap/security/auth/LoginCounter.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/auth/LoginCounter.java
rename to core/src/main/java/de/ids_mannheim/korap/security/auth/LoginCounter.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/SessionAuthentication.java b/core/src/main/java/de/ids_mannheim/korap/security/auth/SessionAuthentication.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/auth/SessionAuthentication.java
rename to core/src/main/java/de/ids_mannheim/korap/security/auth/SessionAuthentication.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/SessionFactory.java b/core/src/main/java/de/ids_mannheim/korap/security/auth/SessionFactory.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/auth/SessionFactory.java
rename to core/src/main/java/de/ids_mannheim/korap/security/auth/SessionFactory.java
diff --git a/src/main/java/de/ids_mannheim/korap/user/DataFactory.java b/core/src/main/java/de/ids_mannheim/korap/user/DataFactory.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/user/DataFactory.java
rename to core/src/main/java/de/ids_mannheim/korap/user/DataFactory.java
diff --git a/src/main/java/de/ids_mannheim/korap/user/DemoUser.java b/core/src/main/java/de/ids_mannheim/korap/user/DemoUser.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/user/DemoUser.java
rename to core/src/main/java/de/ids_mannheim/korap/user/DemoUser.java
diff --git a/src/main/java/de/ids_mannheim/korap/user/GenericUserData.java b/core/src/main/java/de/ids_mannheim/korap/user/GenericUserData.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/user/GenericUserData.java
rename to core/src/main/java/de/ids_mannheim/korap/user/GenericUserData.java
diff --git a/src/main/java/de/ids_mannheim/korap/user/KorAPUser.java b/core/src/main/java/de/ids_mannheim/korap/user/KorAPUser.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/user/KorAPUser.java
rename to core/src/main/java/de/ids_mannheim/korap/user/KorAPUser.java
diff --git a/src/main/java/de/ids_mannheim/korap/user/ShibUser.java b/core/src/main/java/de/ids_mannheim/korap/user/ShibUser.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/user/ShibUser.java
rename to core/src/main/java/de/ids_mannheim/korap/user/ShibUser.java
diff --git a/src/main/java/de/ids_mannheim/korap/user/TokenContext.java b/core/src/main/java/de/ids_mannheim/korap/user/TokenContext.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/user/TokenContext.java
rename to core/src/main/java/de/ids_mannheim/korap/user/TokenContext.java
diff --git a/src/main/java/de/ids_mannheim/korap/user/User.java b/core/src/main/java/de/ids_mannheim/korap/user/User.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/user/User.java
rename to core/src/main/java/de/ids_mannheim/korap/user/User.java
diff --git a/src/main/java/de/ids_mannheim/korap/user/UserDetails.java b/core/src/main/java/de/ids_mannheim/korap/user/UserDetails.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/user/UserDetails.java
rename to core/src/main/java/de/ids_mannheim/korap/user/UserDetails.java
diff --git a/src/main/java/de/ids_mannheim/korap/user/UserQuery.java b/core/src/main/java/de/ids_mannheim/korap/user/UserQuery.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/user/UserQuery.java
rename to core/src/main/java/de/ids_mannheim/korap/user/UserQuery.java
diff --git a/src/main/java/de/ids_mannheim/korap/user/UserSettings.java b/core/src/main/java/de/ids_mannheim/korap/user/UserSettings.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/user/UserSettings.java
rename to core/src/main/java/de/ids_mannheim/korap/user/UserSettings.java
diff --git a/src/main/java/de/ids_mannheim/korap/user/Userdata.java b/core/src/main/java/de/ids_mannheim/korap/user/Userdata.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/user/Userdata.java
rename to core/src/main/java/de/ids_mannheim/korap/user/Userdata.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/BooleanUtils.java b/core/src/main/java/de/ids_mannheim/korap/utils/BooleanUtils.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/BooleanUtils.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/BooleanUtils.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/CollectionTypes.java b/core/src/main/java/de/ids_mannheim/korap/utils/CollectionTypes.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/CollectionTypes.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/CollectionTypes.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/ConcurrentMultiMap.java b/core/src/main/java/de/ids_mannheim/korap/utils/ConcurrentMultiMap.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/ConcurrentMultiMap.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/ConcurrentMultiMap.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/IPNetMask.java b/core/src/main/java/de/ids_mannheim/korap/utils/IPNetMask.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/IPNetMask.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/IPNetMask.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/JsonUtils.java b/core/src/main/java/de/ids_mannheim/korap/utils/JsonUtils.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/JsonUtils.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/JsonUtils.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java b/core/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/KustvaktLogger.java b/core/src/main/java/de/ids_mannheim/korap/utils/KustvaktLogger.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/KustvaktLogger.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/KustvaktLogger.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/NamingUtils.java b/core/src/main/java/de/ids_mannheim/korap/utils/NamingUtils.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/NamingUtils.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/NamingUtils.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/PrefixTreeMap.java b/core/src/main/java/de/ids_mannheim/korap/utils/PrefixTreeMap.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/PrefixTreeMap.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/PrefixTreeMap.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/PropertyReader.java b/core/src/main/java/de/ids_mannheim/korap/utils/PropertyReader.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/PropertyReader.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/PropertyReader.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/ServiceInfo.java b/core/src/main/java/de/ids_mannheim/korap/utils/ServiceInfo.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/ServiceInfo.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/ServiceInfo.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/SqlBuilder.java b/core/src/main/java/de/ids_mannheim/korap/utils/SqlBuilder.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/SqlBuilder.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/SqlBuilder.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/StringUtils.java b/core/src/main/java/de/ids_mannheim/korap/utils/StringUtils.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/StringUtils.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/StringUtils.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/TimeUtils.java b/core/src/main/java/de/ids_mannheim/korap/utils/TimeUtils.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/TimeUtils.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/TimeUtils.java
diff --git a/src/main/java/de/ids_mannheim/korap/utils/UserPropertyReader.java b/core/src/main/java/de/ids_mannheim/korap/utils/UserPropertyReader.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/utils/UserPropertyReader.java
rename to core/src/main/java/de/ids_mannheim/korap/utils/UserPropertyReader.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/ClientsHandler.java b/core/src/main/java/de/ids_mannheim/korap/web/ClientsHandler.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/ClientsHandler.java
rename to core/src/main/java/de/ids_mannheim/korap/web/ClientsHandler.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/KustvaktBaseServer.java b/core/src/main/java/de/ids_mannheim/korap/web/KustvaktBaseServer.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/KustvaktBaseServer.java
rename to core/src/main/java/de/ids_mannheim/korap/web/KustvaktBaseServer.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/SearchKrill.java b/core/src/main/java/de/ids_mannheim/korap/web/SearchKrill.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/SearchKrill.java
rename to core/src/main/java/de/ids_mannheim/korap/web/SearchKrill.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/TRACE.java b/core/src/main/java/de/ids_mannheim/korap/web/TRACE.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/TRACE.java
rename to core/src/main/java/de/ids_mannheim/korap/web/TRACE.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java b/core/src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java
rename to core/src/main/java/de/ids_mannheim/korap/web/filter/AdminFilter.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/filter/AuthFilter.java b/core/src/main/java/de/ids_mannheim/korap/web/filter/AuthFilter.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/filter/AuthFilter.java
rename to core/src/main/java/de/ids_mannheim/korap/web/filter/AuthFilter.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java b/core/src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java
rename to core/src/main/java/de/ids_mannheim/korap/web/filter/BlockingFilter.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java b/core/src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java
rename to core/src/main/java/de/ids_mannheim/korap/web/filter/DemoFilter.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java b/core/src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java
rename to core/src/main/java/de/ids_mannheim/korap/web/filter/DemoUserFilter.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java b/core/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java
rename to core/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/filter/PiwikFilter.java b/core/src/main/java/de/ids_mannheim/korap/web/filter/PiwikFilter.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/filter/PiwikFilter.java
rename to core/src/main/java/de/ids_mannheim/korap/web/filter/PiwikFilter.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/BootableBeanInterface.java b/core/src/main/java/de/ids_mannheim/korap/web/service/BootableBeanInterface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/BootableBeanInterface.java
rename to core/src/main/java/de/ids_mannheim/korap/web/service/BootableBeanInterface.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/BootupInterface.java b/core/src/main/java/de/ids_mannheim/korap/web/service/BootupInterface.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/BootupInterface.java
rename to core/src/main/java/de/ids_mannheim/korap/web/service/BootupInterface.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/CollectionLoader.java b/core/src/main/java/de/ids_mannheim/korap/web/service/CollectionLoader.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/CollectionLoader.java
rename to core/src/main/java/de/ids_mannheim/korap/web/service/CollectionLoader.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/PolicyLoader.java b/core/src/main/java/de/ids_mannheim/korap/web/service/PolicyLoader.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/PolicyLoader.java
rename to core/src/main/java/de/ids_mannheim/korap/web/service/PolicyLoader.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/UserLoader.java b/core/src/main/java/de/ids_mannheim/korap/web/service/UserLoader.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/UserLoader.java
rename to core/src/main/java/de/ids_mannheim/korap/web/service/UserLoader.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/light/LightService.java b/core/src/main/java/de/ids_mannheim/korap/web/service/light/LightService.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/light/LightService.java
rename to core/src/main/java/de/ids_mannheim/korap/web/service/light/LightService.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java b/core/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
rename to core/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/utils/HTMLBuilder.java b/core/src/main/java/de/ids_mannheim/korap/web/utils/HTMLBuilder.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/utils/HTMLBuilder.java
rename to core/src/main/java/de/ids_mannheim/korap/web/utils/HTMLBuilder.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktContext.java b/core/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktContext.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/utils/KustvaktContext.java
rename to core/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktContext.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktMap.java b/core/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktMap.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/utils/KustvaktMap.java
rename to core/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktMap.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseBuilder.java b/core/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseBuilder.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseBuilder.java
rename to core/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseBuilder.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseHandler.java b/core/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseHandler.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseHandler.java
rename to core/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseHandler.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/utils/LocaleProvider.java b/core/src/main/java/de/ids_mannheim/korap/web/utils/LocaleProvider.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/utils/LocaleProvider.java
rename to core/src/main/java/de/ids_mannheim/korap/web/utils/LocaleProvider.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/utils/ShutdownHook.java b/core/src/main/java/de/ids_mannheim/korap/web/utils/ShutdownHook.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/utils/ShutdownHook.java
rename to core/src/main/java/de/ids_mannheim/korap/web/utils/ShutdownHook.java
diff --git a/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 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/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 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/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 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/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 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/src/main/java/de/ids_mannheim/korap/dto/ResourceDto.java b/full/src/main/java/de/ids_mannheim/korap/dto/ResourceDto.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/dto/ResourceDto.java
rename to full/src/main/java/de/ids_mannheim/korap/dto/ResourceDto.java
diff --git a/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 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/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java b/full/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java
rename to full/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java
diff --git a/src/main/java/de/ids_mannheim/korap/entity/Annotation.java b/full/src/main/java/de/ids_mannheim/korap/entity/Annotation.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/entity/Annotation.java
rename to full/src/main/java/de/ids_mannheim/korap/entity/Annotation.java
diff --git a/src/main/java/de/ids_mannheim/korap/entity/AnnotationPair.java b/full/src/main/java/de/ids_mannheim/korap/entity/AnnotationPair.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/entity/AnnotationPair.java
rename to full/src/main/java/de/ids_mannheim/korap/entity/AnnotationPair.java
diff --git a/src/main/java/de/ids_mannheim/korap/entity/Resource.java b/full/src/main/java/de/ids_mannheim/korap/entity/Resource.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/entity/Resource.java
rename to full/src/main/java/de/ids_mannheim/korap/entity/Resource.java
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/AdminDao.java b/full/src/main/java/de/ids_mannheim/korap/handlers/AdminDao.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/handlers/AdminDao.java
rename to full/src/main/java/de/ids_mannheim/korap/handlers/AdminDao.java
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/BatchBuilder.java b/full/src/main/java/de/ids_mannheim/korap/handlers/BatchBuilder.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/handlers/BatchBuilder.java
rename to full/src/main/java/de/ids_mannheim/korap/handlers/BatchBuilder.java
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/DocumentDao.java b/full/src/main/java/de/ids_mannheim/korap/handlers/DocumentDao.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/handlers/DocumentDao.java
rename to full/src/main/java/de/ids_mannheim/korap/handlers/DocumentDao.java
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/EntityDao.java b/full/src/main/java/de/ids_mannheim/korap/handlers/EntityDao.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/handlers/EntityDao.java
rename to full/src/main/java/de/ids_mannheim/korap/handlers/EntityDao.java
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/JDBCAuditing.java b/full/src/main/java/de/ids_mannheim/korap/handlers/JDBCAuditing.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/handlers/JDBCAuditing.java
rename to full/src/main/java/de/ids_mannheim/korap/handlers/JDBCAuditing.java
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/JDBCClient.java b/full/src/main/java/de/ids_mannheim/korap/handlers/JDBCClient.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/handlers/JDBCClient.java
rename to full/src/main/java/de/ids_mannheim/korap/handlers/JDBCClient.java
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/OAuth2Handler.java b/full/src/main/java/de/ids_mannheim/korap/handlers/OAuth2Handler.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/handlers/OAuth2Handler.java
rename to full/src/main/java/de/ids_mannheim/korap/handlers/OAuth2Handler.java
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/OAuthDb.java b/full/src/main/java/de/ids_mannheim/korap/handlers/OAuthDb.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/handlers/OAuthDb.java
rename to full/src/main/java/de/ids_mannheim/korap/handlers/OAuthDb.java
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/ResourceDao.java b/full/src/main/java/de/ids_mannheim/korap/handlers/ResourceDao.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/handlers/ResourceDao.java
rename to full/src/main/java/de/ids_mannheim/korap/handlers/ResourceDao.java
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/RowMapperFactory.java b/full/src/main/java/de/ids_mannheim/korap/handlers/RowMapperFactory.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/handlers/RowMapperFactory.java
rename to full/src/main/java/de/ids_mannheim/korap/handlers/RowMapperFactory.java
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/UserDetailsDao.java b/full/src/main/java/de/ids_mannheim/korap/handlers/UserDetailsDao.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/handlers/UserDetailsDao.java
rename to full/src/main/java/de/ids_mannheim/korap/handlers/UserDetailsDao.java
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/UserSettingsDao.java b/full/src/main/java/de/ids_mannheim/korap/handlers/UserSettingsDao.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/handlers/UserSettingsDao.java
rename to full/src/main/java/de/ids_mannheim/korap/handlers/UserSettingsDao.java
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/OpenIDconnectAuthentication.java b/full/src/main/java/de/ids_mannheim/korap/security/auth/OpenIDconnectAuthentication.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/security/auth/OpenIDconnectAuthentication.java
rename to full/src/main/java/de/ids_mannheim/korap/security/auth/OpenIDconnectAuthentication.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/KustvaktServer.java b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/KustvaktServer.java
rename to full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/full/AdminService.java b/full/src/main/java/de/ids_mannheim/korap/web/service/full/AdminService.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/full/AdminService.java
rename to full/src/main/java/de/ids_mannheim/korap/web/service/full/AdminService.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/full/AnnotationService.java b/full/src/main/java/de/ids_mannheim/korap/web/service/full/AnnotationService.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/full/AnnotationService.java
rename to full/src/main/java/de/ids_mannheim/korap/web/service/full/AnnotationService.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/full/AuthService.java b/full/src/main/java/de/ids_mannheim/korap/web/service/full/AuthService.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/full/AuthService.java
rename to full/src/main/java/de/ids_mannheim/korap/web/service/full/AuthService.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/full/DocumentService.java b/full/src/main/java/de/ids_mannheim/korap/web/service/full/DocumentService.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/full/DocumentService.java
rename to full/src/main/java/de/ids_mannheim/korap/web/service/full/DocumentService.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/full/KustvaktService.java b/full/src/main/java/de/ids_mannheim/korap/web/service/full/KustvaktService.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/full/KustvaktService.java
rename to full/src/main/java/de/ids_mannheim/korap/web/service/full/KustvaktService.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/full/OAuthService.java b/full/src/main/java/de/ids_mannheim/korap/web/service/full/OAuthService.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/full/OAuthService.java
rename to full/src/main/java/de/ids_mannheim/korap/web/service/full/OAuthService.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java b/full/src/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java
rename to full/src/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/full/SearchService.java b/full/src/main/java/de/ids_mannheim/korap/web/service/full/SearchService.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/full/SearchService.java
rename to full/src/main/java/de/ids_mannheim/korap/web/service/full/SearchService.java
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/full/UserService.java b/full/src/main/java/de/ids_mannheim/korap/web/service/full/UserService.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/web/service/full/UserService.java
rename to full/src/main/java/de/ids_mannheim/korap/web/service/full/UserService.java
diff --git a/src/main/resources/ESAPI.properties b/full/src/main/resources/ESAPI.properties
similarity index 100%
rename from src/main/resources/ESAPI.properties
rename to full/src/main/resources/ESAPI.properties
diff --git a/src/main/resources/META-INF/persistence.xml b/full/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from src/main/resources/META-INF/persistence.xml
rename to full/src/main/resources/META-INF/persistence.xml
diff --git a/src/main/resources/changelog b/full/src/main/resources/changelog
similarity index 100%
rename from src/main/resources/changelog
rename to full/src/main/resources/changelog
diff --git a/src/main/resources/codes.kustvakt b/full/src/main/resources/codes.kustvakt
similarity index 100%
rename from src/main/resources/codes.kustvakt
rename to full/src/main/resources/codes.kustvakt
diff --git a/src/main/resources/db/mysql/V0.1__userdatabase.sql b/full/src/main/resources/db/mysql/V0.1__userdatabase.sql
similarity index 100%
rename from src/main/resources/db/mysql/V0.1__userdatabase.sql
rename to full/src/main/resources/db/mysql/V0.1__userdatabase.sql
diff --git a/src/main/resources/db/mysql/V0.2__resourcesdatabase.sql b/full/src/main/resources/db/mysql/V0.2__resourcesdatabase.sql
similarity index 100%
rename from src/main/resources/db/mysql/V0.2__resourcesdatabase.sql
rename to full/src/main/resources/db/mysql/V0.2__resourcesdatabase.sql
diff --git a/src/main/resources/db/mysql/V0.3__securitydatabase.sql b/full/src/main/resources/db/mysql/V0.3__securitydatabase.sql
similarity index 100%
rename from src/main/resources/db/mysql/V0.3__securitydatabase.sql
rename to full/src/main/resources/db/mysql/V0.3__securitydatabase.sql
diff --git a/src/main/resources/db/mysql/V1.2__oauth2_tables_mysql.sql b/full/src/main/resources/db/mysql/V1.2__oauth2_tables_mysql.sql
similarity index 100%
rename from src/main/resources/db/mysql/V1.2__oauth2_tables_mysql.sql
rename to full/src/main/resources/db/mysql/V1.2__oauth2_tables_mysql.sql
diff --git a/src/main/resources/db/mysql/V1.3__triggers.sql b/full/src/main/resources/db/mysql/V1.3__triggers.sql
similarity index 100%
rename from src/main/resources/db/mysql/V1.3__triggers.sql
rename to full/src/main/resources/db/mysql/V1.3__triggers.sql
diff --git a/src/main/resources/db/mysql/V1.4__indices.sql b/full/src/main/resources/db/mysql/V1.4__indices.sql
similarity index 100%
rename from src/main/resources/db/mysql/V1.4__indices.sql
rename to full/src/main/resources/db/mysql/V1.4__indices.sql
diff --git a/src/main/resources/db/mysql/initial_version.sql b/full/src/main/resources/db/mysql/initial_version.sql
similarity index 100%
rename from src/main/resources/db/mysql/initial_version.sql
rename to full/src/main/resources/db/mysql/initial_version.sql
diff --git a/src/main/resources/db/mysql/mysql_refactoring.sql b/full/src/main/resources/db/mysql/mysql_refactoring.sql
similarity index 100%
rename from src/main/resources/db/mysql/mysql_refactoring.sql
rename to full/src/main/resources/db/mysql/mysql_refactoring.sql
diff --git a/src/main/resources/db/mysql/mysql_schema_comp.sql b/full/src/main/resources/db/mysql/mysql_schema_comp.sql
similarity index 100%
rename from src/main/resources/db/mysql/mysql_schema_comp.sql
rename to full/src/main/resources/db/mysql/mysql_schema_comp.sql
diff --git a/src/main/resources/db/new-mysql/V1__create_tables.sql b/full/src/main/resources/db/new-mysql/V1__create_tables.sql
similarity index 100%
rename from src/main/resources/db/new-mysql/V1__create_tables.sql
rename to full/src/main/resources/db/new-mysql/V1__create_tables.sql
diff --git a/src/main/resources/db/new-mysql/V2.0__insert_annotations.sql b/full/src/main/resources/db/new-mysql/V2.0__insert_annotations.sql
similarity index 100%
rename from src/main/resources/db/new-mysql/V2.0__insert_annotations.sql
rename to full/src/main/resources/db/new-mysql/V2.0__insert_annotations.sql
diff --git a/src/main/resources/db/new-mysql/V2.1__insert_annotation_pairs.sql b/full/src/main/resources/db/new-mysql/V2.1__insert_annotation_pairs.sql
similarity index 100%
rename from src/main/resources/db/new-mysql/V2.1__insert_annotation_pairs.sql
rename to full/src/main/resources/db/new-mysql/V2.1__insert_annotation_pairs.sql
diff --git a/src/main/resources/db/new-mysql/V2.2__insert_annotation_pair_values.sql b/full/src/main/resources/db/new-mysql/V2.2__insert_annotation_pair_values.sql
similarity index 100%
rename from src/main/resources/db/new-mysql/V2.2__insert_annotation_pair_values.sql
rename to full/src/main/resources/db/new-mysql/V2.2__insert_annotation_pair_values.sql
diff --git a/src/main/resources/db/new-mysql/V2.3__insert_resources.sql b/full/src/main/resources/db/new-mysql/V2.3__insert_resources.sql
similarity index 100%
rename from src/main/resources/db/new-mysql/V2.3__insert_resources.sql
rename to full/src/main/resources/db/new-mysql/V2.3__insert_resources.sql
diff --git a/src/main/resources/db/new-mysql/V2.4__insert_resource_layers.sql b/full/src/main/resources/db/new-mysql/V2.4__insert_resource_layers.sql
similarity index 100%
rename from src/main/resources/db/new-mysql/V2.4__insert_resource_layers.sql
rename to full/src/main/resources/db/new-mysql/V2.4__insert_resource_layers.sql
diff --git a/src/main/resources/db/sqlite/V1__Initial_version.sql b/full/src/main/resources/db/sqlite/V1__Initial_version.sql
similarity index 100%
rename from src/main/resources/db/sqlite/V1__Initial_version.sql
rename to full/src/main/resources/db/sqlite/V1__Initial_version.sql
diff --git a/src/main/resources/default-config.xml b/full/src/main/resources/default-config.xml
similarity index 100%
rename from src/main/resources/default-config.xml
rename to full/src/main/resources/default-config.xml
diff --git a/src/main/resources/ehcache.xml b/full/src/main/resources/ehcache.xml
similarity index 100%
rename from src/main/resources/ehcache.xml
rename to full/src/main/resources/ehcache.xml
diff --git a/src/main/resources/hibernate.properties b/full/src/main/resources/hibernate.properties
similarity index 100%
rename from src/main/resources/hibernate.properties
rename to full/src/main/resources/hibernate.properties
diff --git a/src/main/resources/index-kustvakt-example.zip b/full/src/main/resources/index-kustvakt-example.zip
similarity index 100%
rename from src/main/resources/index-kustvakt-example.zip
rename to full/src/main/resources/index-kustvakt-example.zip
Binary files differ
diff --git a/src/main/resources/jdbc.properties b/full/src/main/resources/jdbc.properties
similarity index 100%
rename from src/main/resources/jdbc.properties
rename to full/src/main/resources/jdbc.properties
diff --git a/src/main/resources/kustvakt.conf b/full/src/main/resources/kustvakt.conf
similarity index 100%
rename from src/main/resources/kustvakt.conf
rename to full/src/main/resources/kustvakt.conf
diff --git a/src/main/resources/kustvakt.info b/full/src/main/resources/kustvakt.info
similarity index 100%
rename from src/main/resources/kustvakt.info
rename to full/src/main/resources/kustvakt.info
diff --git a/src/main/resources/log4j.properties b/full/src/main/resources/log4j.properties
similarity index 100%
rename from src/main/resources/log4j.properties
rename to full/src/main/resources/log4j.properties
diff --git a/src/main/resources/validation.properties b/full/src/main/resources/validation.properties
similarity index 100%
rename from src/main/resources/validation.properties
rename to full/src/main/resources/validation.properties
diff --git a/src/test/java/de/ids_mannheim/korap/config/BeanConfigTest.java b/full/src/test/java/de/ids_mannheim/korap/config/BeanConfigTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/config/BeanConfigTest.java
rename to full/src/test/java/de/ids_mannheim/korap/config/BeanConfigTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/config/BeanInjectTest.java b/full/src/test/java/de/ids_mannheim/korap/config/BeanInjectTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/config/BeanInjectTest.java
rename to full/src/test/java/de/ids_mannheim/korap/config/BeanInjectTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/config/ClassLoaderTest.java b/full/src/test/java/de/ids_mannheim/korap/config/ClassLoaderTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/config/ClassLoaderTest.java
rename to full/src/test/java/de/ids_mannheim/korap/config/ClassLoaderTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/config/CollectionLoaderTest.java b/full/src/test/java/de/ids_mannheim/korap/config/CollectionLoaderTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/config/CollectionLoaderTest.java
rename to full/src/test/java/de/ids_mannheim/korap/config/CollectionLoaderTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/config/ConfigTest.java b/full/src/test/java/de/ids_mannheim/korap/config/ConfigTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/config/ConfigTest.java
rename to full/src/test/java/de/ids_mannheim/korap/config/ConfigTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/config/KustvaktResourceTest.java b/full/src/test/java/de/ids_mannheim/korap/config/KustvaktResourceTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/config/KustvaktResourceTest.java
rename to full/src/test/java/de/ids_mannheim/korap/config/KustvaktResourceTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/config/LoaderTest.java b/full/src/test/java/de/ids_mannheim/korap/config/LoaderTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/config/LoaderTest.java
rename to full/src/test/java/de/ids_mannheim/korap/config/LoaderTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/config/PolicyLoaderTest.java b/full/src/test/java/de/ids_mannheim/korap/config/PolicyLoaderTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/config/PolicyLoaderTest.java
rename to full/src/test/java/de/ids_mannheim/korap/config/PolicyLoaderTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/config/StringUtilsTest.java b/full/src/test/java/de/ids_mannheim/korap/config/StringUtilsTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/config/StringUtilsTest.java
rename to full/src/test/java/de/ids_mannheim/korap/config/StringUtilsTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/config/TestBeans.java b/full/src/test/java/de/ids_mannheim/korap/config/TestBeans.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/config/TestBeans.java
rename to full/src/test/java/de/ids_mannheim/korap/config/TestBeans.java
diff --git a/src/test/java/de/ids_mannheim/korap/config/TestHelper.java b/full/src/test/java/de/ids_mannheim/korap/config/TestHelper.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/config/TestHelper.java
rename to full/src/test/java/de/ids_mannheim/korap/config/TestHelper.java
diff --git a/src/test/java/de/ids_mannheim/korap/config/TestVariables.java b/full/src/test/java/de/ids_mannheim/korap/config/TestVariables.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/config/TestVariables.java
rename to full/src/test/java/de/ids_mannheim/korap/config/TestVariables.java
diff --git a/src/test/java/de/ids_mannheim/korap/config/UserLoaderTest.java b/full/src/test/java/de/ids_mannheim/korap/config/UserLoaderTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/config/UserLoaderTest.java
rename to full/src/test/java/de/ids_mannheim/korap/config/UserLoaderTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/handlers/DocumentDaoTest.java b/full/src/test/java/de/ids_mannheim/korap/handlers/DocumentDaoTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/handlers/DocumentDaoTest.java
rename to full/src/test/java/de/ids_mannheim/korap/handlers/DocumentDaoTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/handlers/ResourceDaoTest.java b/full/src/test/java/de/ids_mannheim/korap/handlers/ResourceDaoTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/handlers/ResourceDaoTest.java
rename to full/src/test/java/de/ids_mannheim/korap/handlers/ResourceDaoTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/handlers/UserDaoTest.java b/full/src/test/java/de/ids_mannheim/korap/handlers/UserDaoTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/handlers/UserDaoTest.java
rename to full/src/test/java/de/ids_mannheim/korap/handlers/UserDaoTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java b/full/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java
rename to full/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/misc/DemoUserTest.java b/full/src/test/java/de/ids_mannheim/korap/misc/DemoUserTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/misc/DemoUserTest.java
rename to full/src/test/java/de/ids_mannheim/korap/misc/DemoUserTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/misc/FileAuditingTest.java b/full/src/test/java/de/ids_mannheim/korap/misc/FileAuditingTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/misc/FileAuditingTest.java
rename to full/src/test/java/de/ids_mannheim/korap/misc/FileAuditingTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/misc/KoralNodeTest.java b/full/src/test/java/de/ids_mannheim/korap/misc/KoralNodeTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/misc/KoralNodeTest.java
rename to full/src/test/java/de/ids_mannheim/korap/misc/KoralNodeTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/misc/LocalQueryTest.java b/full/src/test/java/de/ids_mannheim/korap/misc/LocalQueryTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/misc/LocalQueryTest.java
rename to full/src/test/java/de/ids_mannheim/korap/misc/LocalQueryTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/misc/MetaQueryBuilderTest.java b/full/src/test/java/de/ids_mannheim/korap/misc/MetaQueryBuilderTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/misc/MetaQueryBuilderTest.java
rename to full/src/test/java/de/ids_mannheim/korap/misc/MetaQueryBuilderTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/misc/PublicAPITest.java b/full/src/test/java/de/ids_mannheim/korap/misc/PublicAPITest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/misc/PublicAPITest.java
rename to full/src/test/java/de/ids_mannheim/korap/misc/PublicAPITest.java
diff --git a/src/test/java/de/ids_mannheim/korap/misc/ScopesTest.java b/full/src/test/java/de/ids_mannheim/korap/misc/ScopesTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/misc/ScopesTest.java
rename to full/src/test/java/de/ids_mannheim/korap/misc/ScopesTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/misc/SerializationTest.java b/full/src/test/java/de/ids_mannheim/korap/misc/SerializationTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/misc/SerializationTest.java
rename to full/src/test/java/de/ids_mannheim/korap/misc/SerializationTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/misc/ServiceSuite.java b/full/src/test/java/de/ids_mannheim/korap/misc/ServiceSuite.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/misc/ServiceSuite.java
rename to full/src/test/java/de/ids_mannheim/korap/misc/ServiceSuite.java
diff --git a/src/test/java/de/ids_mannheim/korap/misc/TestNullableSqls.java b/full/src/test/java/de/ids_mannheim/korap/misc/TestNullableSqls.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/misc/TestNullableSqls.java
rename to full/src/test/java/de/ids_mannheim/korap/misc/TestNullableSqls.java
diff --git a/src/test/java/de/ids_mannheim/korap/resource/rewrite/CollectionRewriteTest.java b/full/src/test/java/de/ids_mannheim/korap/resource/rewrite/CollectionRewriteTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/resource/rewrite/CollectionRewriteTest.java
rename to full/src/test/java/de/ids_mannheim/korap/resource/rewrite/CollectionRewriteTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/resource/rewrite/FoundryRewriteTest.java b/full/src/test/java/de/ids_mannheim/korap/resource/rewrite/FoundryRewriteTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/resource/rewrite/FoundryRewriteTest.java
rename to full/src/test/java/de/ids_mannheim/korap/resource/rewrite/FoundryRewriteTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/resource/rewrite/IdRewriteTest.java b/full/src/test/java/de/ids_mannheim/korap/resource/rewrite/IdRewriteTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/resource/rewrite/IdRewriteTest.java
rename to full/src/test/java/de/ids_mannheim/korap/resource/rewrite/IdRewriteTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/resource/rewrite/ResultRewriteTest.java b/full/src/test/java/de/ids_mannheim/korap/resource/rewrite/ResultRewriteTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/resource/rewrite/ResultRewriteTest.java
rename to full/src/test/java/de/ids_mannheim/korap/resource/rewrite/ResultRewriteTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/resource/rewrite/RewriteBenchmarkTest.java b/full/src/test/java/de/ids_mannheim/korap/resource/rewrite/RewriteBenchmarkTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/resource/rewrite/RewriteBenchmarkTest.java
rename to full/src/test/java/de/ids_mannheim/korap/resource/rewrite/RewriteBenchmarkTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/resource/rewrite/RewriteHandlerTest.java b/full/src/test/java/de/ids_mannheim/korap/resource/rewrite/RewriteHandlerTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/resource/rewrite/RewriteHandlerTest.java
rename to full/src/test/java/de/ids_mannheim/korap/resource/rewrite/RewriteHandlerTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/security/PermissionBufferTest.java b/full/src/test/java/de/ids_mannheim/korap/security/PermissionBufferTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/security/PermissionBufferTest.java
rename to full/src/test/java/de/ids_mannheim/korap/security/PermissionBufferTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/security/PolicyBenchmarkTest.java b/full/src/test/java/de/ids_mannheim/korap/security/PolicyBenchmarkTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/security/PolicyBenchmarkTest.java
rename to full/src/test/java/de/ids_mannheim/korap/security/PolicyBenchmarkTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/security/PolicyBuilderTest.java b/full/src/test/java/de/ids_mannheim/korap/security/PolicyBuilderTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/security/PolicyBuilderTest.java
rename to full/src/test/java/de/ids_mannheim/korap/security/PolicyBuilderTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/security/PolicyDaoTest.java b/full/src/test/java/de/ids_mannheim/korap/security/PolicyDaoTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/security/PolicyDaoTest.java
rename to full/src/test/java/de/ids_mannheim/korap/security/PolicyDaoTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/security/ResourceFinderTest.java b/full/src/test/java/de/ids_mannheim/korap/security/ResourceFinderTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/security/ResourceFinderTest.java
rename to full/src/test/java/de/ids_mannheim/korap/security/ResourceFinderTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/security/ResourcesTest.java b/full/src/test/java/de/ids_mannheim/korap/security/ResourcesTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/security/ResourcesTest.java
rename to full/src/test/java/de/ids_mannheim/korap/security/ResourcesTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/security/SecurityPolicyTest.java b/full/src/test/java/de/ids_mannheim/korap/security/SecurityPolicyTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/security/SecurityPolicyTest.java
rename to full/src/test/java/de/ids_mannheim/korap/security/SecurityPolicyTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManagerTest.java b/full/src/test/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManagerTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManagerTest.java
rename to full/src/test/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManagerTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/user/UserFactoryTest.java b/full/src/test/java/de/ids_mannheim/korap/user/UserFactoryTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/user/UserFactoryTest.java
rename to full/src/test/java/de/ids_mannheim/korap/user/UserFactoryTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java b/full/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/user/UserdataTest.java
rename to full/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/FastJerseyTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/FastJerseyTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/FastJerseyTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/FastJerseyTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/OAuth2HandlerTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/OAuth2HandlerTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/OAuth2HandlerTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/OAuth2HandlerTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/SearchKrillTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/SearchKrillTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/SearchKrillTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/SearchKrillTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/AuthServiceTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/AuthServiceTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/AuthServiceTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/AuthServiceTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/FilterTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/FilterTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/FilterTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/FilterTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/KustvaktCoreRestTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/KustvaktCoreRestTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/KustvaktCoreRestTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/KustvaktCoreRestTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/KustvaktServerTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/KustvaktServerTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/KustvaktServerTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/KustvaktServerTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/LightServiceTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/LightServiceTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/LightServiceTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/LightServiceTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/MatchInfoServiceTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/MatchInfoServiceTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/MatchInfoServiceTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/MatchInfoServiceTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/OAuth2EndpointTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/OAuth2EndpointTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/OAuth2EndpointTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/OAuth2EndpointTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/PolicyServiceTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/PolicyServiceTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/PolicyServiceTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/PolicyServiceTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/QuerySerializationServiceTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/QuerySerializationServiceTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/QuerySerializationServiceTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/QuerySerializationServiceTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/ResourceInfoServiceTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/ResourceInfoServiceTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/ResourceInfoServiceTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/ResourceInfoServiceTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/ResourceRemoteApiTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/ResourceRemoteApiTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/ResourceRemoteApiTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/ResourceRemoteApiTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/ResourceServiceTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/ResourceServiceTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/ResourceServiceTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/ResourceServiceTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/SearchServiceTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/SearchServiceTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/SearchServiceTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/SearchServiceTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/SearchWithAvailabilityTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/SearchWithAvailabilityTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/SearchWithAvailabilityTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/SearchWithAvailabilityTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/StatisticsServiceTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/StatisticsServiceTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/StatisticsServiceTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/StatisticsServiceTest.java
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/full/UserServiceTest.java b/full/src/test/java/de/ids_mannheim/korap/web/service/full/UserServiceTest.java
similarity index 100%
rename from src/test/java/de/ids_mannheim/korap/web/service/full/UserServiceTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/service/full/UserServiceTest.java
diff --git a/src/test/resources/kustvakt-test.conf b/full/src/test/resources/kustvakt-test.conf
similarity index 100%
rename from src/test/resources/kustvakt-test.conf
rename to full/src/test/resources/kustvakt-test.conf
diff --git a/src/test/resources/policy-test.conf b/full/src/test/resources/policy-test.conf
similarity index 100%
rename from src/test/resources/policy-test.conf
rename to full/src/test/resources/policy-test.conf
diff --git a/src/test/resources/test-default-config.xml b/full/src/test/resources/test-default-config.xml
similarity index 100%
rename from src/test/resources/test-default-config.xml
rename to full/src/test/resources/test-default-config.xml
diff --git a/src/test/resources/test-jdbc.properties b/full/src/test/resources/test-jdbc.properties
similarity index 100%
rename from src/test/resources/test-jdbc.properties
rename to full/src/test/resources/test-jdbc.properties
diff --git a/src/main/resources/light-config.xml b/lite/src/main/resources/light-config.xml
similarity index 100%
rename from src/main/resources/light-config.xml
rename to lite/src/main/resources/light-config.xml
diff --git a/src/test/resources/sample-index/_0.cfe b/sample-index/_0.cfe
similarity index 100%
rename from src/test/resources/sample-index/_0.cfe
rename to sample-index/_0.cfe
Binary files differ
diff --git a/src/test/resources/sample-index/_0.cfs b/sample-index/_0.cfs
similarity index 100%
rename from src/test/resources/sample-index/_0.cfs
rename to sample-index/_0.cfs
Binary files differ
diff --git a/src/test/resources/sample-index/_0.si b/sample-index/_0.si
similarity index 100%
rename from src/test/resources/sample-index/_0.si
rename to sample-index/_0.si
Binary files differ
diff --git a/src/test/resources/sample-index/_1.cfe b/sample-index/_1.cfe
similarity index 100%
rename from src/test/resources/sample-index/_1.cfe
rename to sample-index/_1.cfe
Binary files differ
diff --git a/src/test/resources/sample-index/_1.cfs b/sample-index/_1.cfs
similarity index 100%
rename from src/test/resources/sample-index/_1.cfs
rename to sample-index/_1.cfs
Binary files differ
diff --git a/src/test/resources/sample-index/_1.si b/sample-index/_1.si
similarity index 100%
rename from src/test/resources/sample-index/_1.si
rename to sample-index/_1.si
Binary files differ
diff --git a/src/test/resources/sample-index/_2.cfe b/sample-index/_2.cfe
similarity index 100%
rename from src/test/resources/sample-index/_2.cfe
rename to sample-index/_2.cfe
Binary files differ
diff --git a/src/test/resources/sample-index/_2.cfs b/sample-index/_2.cfs
similarity index 100%
rename from src/test/resources/sample-index/_2.cfs
rename to sample-index/_2.cfs
Binary files differ
diff --git a/src/test/resources/sample-index/_2.si b/sample-index/_2.si
similarity index 100%
rename from src/test/resources/sample-index/_2.si
rename to sample-index/_2.si
Binary files differ
diff --git a/src/test/resources/sample-index/_3.cfe b/sample-index/_3.cfe
similarity index 100%
rename from src/test/resources/sample-index/_3.cfe
rename to sample-index/_3.cfe
Binary files differ
diff --git a/src/test/resources/sample-index/_3.cfs b/sample-index/_3.cfs
similarity index 100%
rename from src/test/resources/sample-index/_3.cfs
rename to sample-index/_3.cfs
Binary files differ
diff --git a/src/test/resources/sample-index/_3.si b/sample-index/_3.si
similarity index 100%
rename from src/test/resources/sample-index/_3.si
rename to sample-index/_3.si
Binary files differ
diff --git a/src/test/resources/sample-index/segments_1 b/sample-index/segments_1
similarity index 100%
rename from src/test/resources/sample-index/segments_1
rename to sample-index/segments_1
Binary files differ
diff --git a/src/test/resources/sample-index/write.lock b/sample-index/write.lock
similarity index 100%
rename from src/test/resources/sample-index/write.lock
rename to sample-index/write.lock