diff --git a/.gitignore b/.gitignore
index 035749bb0..0d06a2439 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ dmp-backend/src/main/ui-resources/static/favicon.ico
 dmp-backend/src/main/ui-resources/static/assets/lang/en.json
 dmp-frontend/new  3.xml
 dmp-backend/src/main/ui-resources/static/
+dmp-backend/web/target/
diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml
index b12b9f203..cf86f0205 100644
--- a/dmp-backend/pom.xml
+++ b/dmp-backend/pom.xml
@@ -2,15 +2,21 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>dmp-backend</groupId>
+    <groupId>eu.eudat</groupId>
     <artifactId>dmp-backend</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>${packaging.type}</packaging>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>1.5.9.RELEASE</version>
     </parent>
+
+    <modules>
+        <module>queryable</module>
+        <module>web</module>
+    </modules>
+
     <properties>
         <project.http.version>1.19.0</project.http.version>
         <project.oauth.version>1.19.0</project.oauth.version>
diff --git a/dmp-backend/queryable/pom.xml b/dmp-backend/queryable/pom.xml
new file mode 100644
index 000000000..8e42110e0
--- /dev/null
+++ b/dmp-backend/queryable/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>dmp-backend</groupId>
+    <artifactId>queryable</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>eu.eudat</groupId>
+        <artifactId>dmp-backend</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+</project>
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/QueryableList.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/QueryableList.java
similarity index 87%
rename from dmp-backend/src/main/java/eu/eudat/queryable/QueryableList.java
rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/QueryableList.java
index d73ef4744..164ac1b2d 100644
--- a/dmp-backend/src/main/java/eu/eudat/queryable/QueryableList.java
+++ b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/QueryableList.java
@@ -1,11 +1,7 @@
 package eu.eudat.queryable;
 
-
-import eu.eudat.entities.DataEntity;
-import eu.eudat.queryable.predicates.NestedQuerySinglePredicate;
-import eu.eudat.queryable.predicates.OrderByPredicate;
-import eu.eudat.queryable.predicates.SelectPredicate;
-import eu.eudat.queryable.predicates.SinglePredicate;
+import eu.eudat.queryable.predicates.*;
+import eu.eudat.queryable.queryableentity.DataEntity;
 import eu.eudat.queryable.types.SelectionField;
 
 import javax.persistence.criteria.Subquery;
diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/exceptions/NotSingleResultException.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/exceptions/NotSingleResultException.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/queryable/exceptions/NotSingleResultException.java
rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/exceptions/NotSingleResultException.java
diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java
rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java
index 778710728..c4ccb71e9 100644
--- a/dmp-backend/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java
+++ b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java
@@ -1,13 +1,9 @@
 package eu.eudat.queryable.hibernatequeryablelist;
 
-
-import eu.eudat.entities.DataEntity;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.exceptions.NotSingleResultException;
-import eu.eudat.queryable.predicates.NestedQuerySinglePredicate;
-import eu.eudat.queryable.predicates.OrderByPredicate;
-import eu.eudat.queryable.predicates.SelectPredicate;
-import eu.eudat.queryable.predicates.SinglePredicate;
+import eu.eudat.queryable.predicates.*;
+import eu.eudat.queryable.queryableentity.DataEntity;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;
 
diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/predicates/NestedQuerySinglePredicate.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/NestedQuerySinglePredicate.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/queryable/predicates/NestedQuerySinglePredicate.java
rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/NestedQuerySinglePredicate.java
diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/predicates/OrderByPredicate.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/OrderByPredicate.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/queryable/predicates/OrderByPredicate.java
rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/OrderByPredicate.java
diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/predicates/QueryablePredicate.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/QueryablePredicate.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/queryable/predicates/QueryablePredicate.java
rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/QueryablePredicate.java
diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/predicates/SelectPredicate.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/SelectPredicate.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/queryable/predicates/SelectPredicate.java
rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/SelectPredicate.java
diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/predicates/SinglePredicate.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/SinglePredicate.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/queryable/predicates/SinglePredicate.java
rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/SinglePredicate.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/queryableentity/DataEntity.java
similarity index 65%
rename from dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java
rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/queryableentity/DataEntity.java
index 6ebe0080e..2b99e290b 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java
+++ b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/queryableentity/DataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.queryable.queryableentity;
 
 public interface DataEntity<T,K> {
     void update(T entity);
diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/types/FieldSelectionType.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/types/FieldSelectionType.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/queryable/types/FieldSelectionType.java
rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/types/FieldSelectionType.java
diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/types/SelectionField.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/types/SelectionField.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/queryable/types/SelectionField.java
rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/types/SelectionField.java
diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/QueryableList.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/QueryableList.class
new file mode 100644
index 000000000..8248c9bd4
Binary files /dev/null and b/dmp-backend/queryable/target/classes/eu/eudat/queryable/QueryableList.class differ
diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/exceptions/NotSingleResultException.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/exceptions/NotSingleResultException.class
new file mode 100644
index 000000000..d98d13f83
Binary files /dev/null and b/dmp-backend/queryable/target/classes/eu/eudat/queryable/exceptions/NotSingleResultException.class differ
diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.class
new file mode 100644
index 000000000..7087d1d3e
Binary files /dev/null and b/dmp-backend/queryable/target/classes/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.class differ
diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/NestedQuerySinglePredicate.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/NestedQuerySinglePredicate.class
new file mode 100644
index 000000000..ce9e6527f
Binary files /dev/null and b/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/NestedQuerySinglePredicate.class differ
diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/OrderByPredicate.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/OrderByPredicate.class
new file mode 100644
index 000000000..04dd72092
Binary files /dev/null and b/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/OrderByPredicate.class differ
diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/QueryablePredicate.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/QueryablePredicate.class
new file mode 100644
index 000000000..018236f71
Binary files /dev/null and b/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/QueryablePredicate.class differ
diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/SelectPredicate.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/SelectPredicate.class
new file mode 100644
index 000000000..91ff6db66
Binary files /dev/null and b/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/SelectPredicate.class differ
diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/SinglePredicate.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/SinglePredicate.class
new file mode 100644
index 000000000..c2dffadd4
Binary files /dev/null and b/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/SinglePredicate.class differ
diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/queryableentity/DataEntity.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/queryableentity/DataEntity.class
new file mode 100644
index 000000000..7db165f4d
Binary files /dev/null and b/dmp-backend/queryable/target/classes/eu/eudat/queryable/queryableentity/DataEntity.class differ
diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/types/FieldSelectionType.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/types/FieldSelectionType.class
new file mode 100644
index 000000000..c073300c8
Binary files /dev/null and b/dmp-backend/queryable/target/classes/eu/eudat/queryable/types/FieldSelectionType.class differ
diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/types/SelectionField.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/types/SelectionField.class
new file mode 100644
index 000000000..bfc18fb37
Binary files /dev/null and b/dmp-backend/queryable/target/classes/eu/eudat/queryable/types/SelectionField.class differ
diff --git a/dmp-backend/web/pom.xml b/dmp-backend/web/pom.xml
new file mode 100644
index 000000000..84ef62e93
--- /dev/null
+++ b/dmp-backend/web/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>dmp-backend</groupId>
+    <artifactId>web</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>eu.eudat</groupId>
+        <artifactId>dmp-backend</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>dmp-backend</groupId>
+            <artifactId>queryable</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java b/dmp-backend/web/src/main/java/eu/eudat/EuDatApplication.java
similarity index 81%
rename from dmp-backend/src/main/java/eu/eudat/EuDatApplication.java
rename to dmp-backend/web/src/main/java/eu/eudat/EuDatApplication.java
index 5f55cd672..7a674710f 100644
--- a/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/EuDatApplication.java
@@ -1,14 +1,11 @@
 package eu.eudat;
 
-import eu.eudat.services.helpers.FileStorageService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
-import org.springframework.web.context.WebApplicationContext;
 
 @SpringBootApplication
 public class EuDatApplication extends SpringBootServletInitializer {
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/Builder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/Builder.java
similarity index 73%
rename from dmp-backend/src/main/java/eu/eudat/builders/Builder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/Builder.java
index 50d3718b4..09eab8aac 100644
--- a/dmp-backend/src/main/java/eu/eudat/builders/Builder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/Builder.java
@@ -1,7 +1,5 @@
 package eu.eudat.builders;
 
-import eu.eudat.builders.helpers.BuilderApplier;
-
 /**
  * Created by ikalyvas on 2/15/2018.
  */
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/BuilderFactory.java b/dmp-backend/web/src/main/java/eu/eudat/builders/BuilderFactory.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/builders/BuilderFactory.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/BuilderFactory.java
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java b/dmp-backend/web/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java
similarity index 96%
rename from dmp-backend/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java
index 8951695e9..f1f1e188f 100644
--- a/dmp-backend/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java
@@ -5,7 +5,6 @@ import eu.eudat.builders.model.criteria.DataRepositoryCriteriaBuilder;
 import eu.eudat.builders.model.criteria.ExternalDatasetCriteriaBuilder;
 import eu.eudat.builders.model.criteria.RegistryCriteriaBuilder;
 import eu.eudat.builders.model.models.*;
-import eu.eudat.models.dashboard.recent.RecentActivityData;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/ContentBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/ContentBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/builders/entity/ContentBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/entity/ContentBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/helpers/BuilderApplier.java b/dmp-backend/web/src/main/java/eu/eudat/builders/helpers/BuilderApplier.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/builders/helpers/BuilderApplier.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/helpers/BuilderApplier.java
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/criteria/DataRepositoryCriteriaBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/DataRepositoryCriteriaBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/builders/model/criteria/DataRepositoryCriteriaBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/DataRepositoryCriteriaBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/criteria/ExternalDatasetCriteriaBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ExternalDatasetCriteriaBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/builders/model/criteria/ExternalDatasetCriteriaBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ExternalDatasetCriteriaBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/criteria/ServiceCriteriaBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ServiceCriteriaBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/builders/model/criteria/ServiceCriteriaBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ServiceCriteriaBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java
similarity index 94%
rename from dmp-backend/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java
index b68490577..378242d60 100644
--- a/dmp-backend/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java
@@ -1,7 +1,6 @@
 package eu.eudat.builders.model.models;
 
 import eu.eudat.builders.Builder;
-import eu.eudat.builders.helpers.BuilderApplier;
 import eu.eudat.models.helpers.common.DataTableData;
 
 import java.util.List;
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java
similarity index 96%
rename from dmp-backend/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java
index b3fa67333..a53d1558e 100644
--- a/dmp-backend/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java
@@ -1,7 +1,6 @@
 package eu.eudat.builders.model.models;
 
 import eu.eudat.builders.Builder;
-import eu.eudat.builders.helpers.BuilderApplier;
 import eu.eudat.models.security.Principal;
 import eu.eudat.types.Authorities;
 
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java
index b8881804c..87d2ed01c 100644
--- a/dmp-backend/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java
@@ -1,7 +1,6 @@
 package eu.eudat.builders.model.models;
 
 import eu.eudat.builders.Builder;
-import eu.eudat.builders.helpers.BuilderApplier;
 import eu.eudat.entities.UserInfo;
 import eu.eudat.models.dmp.DataManagementPlan;
 import eu.eudat.models.project.Project;
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/models/RecentActivityDataBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/RecentActivityDataBuilder.java
similarity index 96%
rename from dmp-backend/src/main/java/eu/eudat/builders/model/models/RecentActivityDataBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/models/RecentActivityDataBuilder.java
index d4e14fd94..33b823027 100644
--- a/dmp-backend/src/main/java/eu/eudat/builders/model/models/RecentActivityDataBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/RecentActivityDataBuilder.java
@@ -1,7 +1,6 @@
 package eu.eudat.builders.model.models;
 
 import eu.eudat.builders.Builder;
-import eu.eudat.builders.helpers.BuilderApplier;
 import eu.eudat.models.dashboard.recent.RecentActivityData;
 
 import java.util.Date;
diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/models/ResearcherBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ResearcherBuilder.java
similarity index 96%
rename from dmp-backend/src/main/java/eu/eudat/builders/model/models/ResearcherBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ResearcherBuilder.java
index e17aa3cd9..471629e4e 100644
--- a/dmp-backend/src/main/java/eu/eudat/builders/model/models/ResearcherBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ResearcherBuilder.java
@@ -1,7 +1,6 @@
 package eu.eudat.builders.model.models;
 
 import eu.eudat.builders.Builder;
-import eu.eudat.builders.helpers.BuilderApplier;
 import eu.eudat.models.dmp.Researcher;
 
 /**
diff --git a/dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java b/dmp-backend/web/src/main/java/eu/eudat/cache/ResponsesCache.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java
rename to dmp-backend/web/src/main/java/eu/eudat/cache/ResponsesCache.java
diff --git a/dmp-backend/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java
rename to dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java
diff --git a/dmp-backend/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java
rename to dmp-backend/web/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java
diff --git a/dmp-backend/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java
similarity index 93%
rename from dmp-backend/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java
rename to dmp-backend/web/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java
index db8889831..1186ab6ca 100644
--- a/dmp-backend/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java
@@ -4,8 +4,6 @@ import eu.eudat.controllers.interceptors.RequestInterceptor;
 import eu.eudat.handlers.PrincipalArgumentResolver;
 import eu.eudat.services.ApiContext;
 import eu.eudat.services.operations.AuthenticationService;
-import eu.eudat.services.operations.AuthenticationServiceImpl;
-import eu.eudat.types.WarningLevel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableAsync;
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Admin.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/Admin.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/BaseController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/BaseController.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/BaseController.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/BaseController.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DashBoardController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DashBoardController.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/DashBoardController.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/DashBoardController.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetWizardController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/DatasetWizardController.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/FileController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/FileController.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/FileController.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/FileController.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Login.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/Login.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Projects.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Projects.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/Projects.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Projects.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Registries.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/Registries.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Researchers.java
similarity index 96%
rename from dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Researchers.java
index 8c52c5b47..6c26a3686 100644
--- a/dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Researchers.java
@@ -1,13 +1,10 @@
 package eu.eudat.controllers;
 
 import eu.eudat.exceptions.security.UnauthorisedException;
-import eu.eudat.managers.ProjectManager;
 import eu.eudat.managers.ResearcherManager;
-import eu.eudat.models.criteria.ResearcherCriteria;
 import eu.eudat.models.dmp.Researcher;
 import eu.eudat.models.external.ResearchersExternalSourcesModel;
 import eu.eudat.models.helpers.responses.ResponseItem;
-import eu.eudat.models.project.ProjectCriteriaRequest;
 import eu.eudat.models.researcher.ResearcherCriteriaRequest;
 import eu.eudat.models.security.Principal;
 import eu.eudat.proxy.config.exceptions.HugeResultSet;
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Services.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/Services.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/UserInvitationController.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/UserInvitationController.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Users.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Users.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/Users.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Users.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java
rename to dmp-backend/web/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccess.java b/dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccess.java
similarity index 88%
rename from dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccess.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccess.java
index 94d45316c..f5860f8ae 100644
--- a/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccess.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccess.java
@@ -1,7 +1,7 @@
 package eu.eudat.dao;
 
 import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.DataEntity;
+import eu.eudat.queryable.queryableentity.DataEntity;
 
 
 public class DatabaseAccess<T extends DataEntity> {
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java b/dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java
similarity index 84%
rename from dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java
index 0a5c4cd0a..d75965d74 100644
--- a/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java
@@ -1,9 +1,8 @@
 package eu.eudat.dao;
 
 
-import eu.eudat.entities.DataEntity;
-import eu.eudat.entities.Dataset;
 import eu.eudat.queryable.QueryableList;
+import eu.eudat.queryable.queryableentity.DataEntity;
 
 import java.util.concurrent.CompletableFuture;
 
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java b/dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java
similarity index 96%
rename from dmp-backend/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java
index d9defe1ae..0c7531ab6 100644
--- a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java
@@ -1,8 +1,8 @@
 package eu.eudat.dao.databaselayer.context;
 
-import eu.eudat.entities.DataEntity;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.hibernatequeryablelist.QueryableHibernateList;
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java b/dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java
similarity index 94%
rename from dmp-backend/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java
index 3146c49b8..6ef974399 100644
--- a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java
@@ -2,8 +2,8 @@ package eu.eudat.dao.databaselayer.service;
 
 
 import eu.eudat.dao.databaselayer.context.DatabaseContext;
-import eu.eudat.entities.DataEntity;
 import eu.eudat.queryable.QueryableList;
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ContentDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ContentDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ContentDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ContentDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ContentDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ContentDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ContentDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ContentDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DMPDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DMPDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDao.java
similarity index 91%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDao.java
index eb560faec..66f0ab285 100644
--- a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDao.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDao.java
@@ -7,7 +7,6 @@ import eu.eudat.models.criteria.DatasetCriteria;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
 
 public interface DatasetDao extends DatabaseAccessLayer<Dataset, UUID> {
 
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/InvitationDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/InvitationDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/OrganisationDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/OrganisationDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ProjectDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ProjectDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/RegistryDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/RegistryDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ResearcherDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ResearcherDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ServiceDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ServiceDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserDmpDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserDmpDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserInfoDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserInfoDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserRoleDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserRoleDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java
diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/documents/helpers/FileEnvelope.java b/dmp-backend/web/src/main/java/eu/eudat/documents/helpers/FileEnvelope.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/documents/helpers/FileEnvelope.java
rename to dmp-backend/web/src/main/java/eu/eudat/documents/helpers/FileEnvelope.java
diff --git a/dmp-backend/src/main/java/eu/eudat/documents/types/ParagraphStyle.java b/dmp-backend/web/src/main/java/eu/eudat/documents/types/ParagraphStyle.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/documents/types/ParagraphStyle.java
rename to dmp-backend/web/src/main/java/eu/eudat/documents/types/ParagraphStyle.java
diff --git a/dmp-backend/src/main/java/eu/eudat/documents/types/TextStyle.java b/dmp-backend/web/src/main/java/eu/eudat/documents/types/TextStyle.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/documents/types/TextStyle.java
rename to dmp-backend/web/src/main/java/eu/eudat/documents/types/TextStyle.java
diff --git a/dmp-backend/src/main/java/eu/eudat/documents/word/WordBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/documents/word/WordBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/documents/word/WordBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/documents/word/WordBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/documents/xml/ExportXmlBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/documents/xml/ExportXmlBuilder.java
similarity index 99%
rename from dmp-backend/src/main/java/eu/eudat/documents/xml/ExportXmlBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/documents/xml/ExportXmlBuilder.java
index da81a9458..d77c740bf 100644
--- a/dmp-backend/src/main/java/eu/eudat/documents/xml/ExportXmlBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/documents/xml/ExportXmlBuilder.java
@@ -9,7 +9,6 @@ import eu.eudat.services.forms.VisibilityRuleService;
 import eu.eudat.utilities.builders.XmlBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Text;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Content.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Content.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/entities/Content.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/Content.java
index 55aa8b8d8..e4d59f681 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/Content.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Content.java
@@ -1,5 +1,6 @@
 package eu.eudat.entities;
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.*;
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Credential.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Credential.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/entities/Credential.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/Credential.java
index 070d39cb0..08d2e1d0e 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/Credential.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Credential.java
@@ -1,5 +1,7 @@
 package eu.eudat.entities;
 
+import eu.eudat.queryable.queryableentity.DataEntity;
+
 import javax.persistence.*;
 import java.util.Date;
 import java.util.UUID;
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DMP.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DMP.java
similarity index 99%
rename from dmp-backend/src/main/java/eu/eudat/entities/DMP.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/DMP.java
index 4fc6b7215..192142a32 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/DMP.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/DMP.java
@@ -1,6 +1,7 @@
 package eu.eudat.entities;
 
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DMPOrganisation.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DMPOrganisation.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/DMPOrganisation.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/DMPOrganisation.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DMPProfile.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DMPProfile.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/DMPProfile.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/DMPProfile.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DMPResearcher.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DMPResearcher.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/DMPResearcher.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/DMPResearcher.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DataRepository.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DataRepository.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/entities/DataRepository.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/DataRepository.java
index 6407186b6..8724f3b2b 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/DataRepository.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/DataRepository.java
@@ -1,6 +1,7 @@
 package eu.eudat.entities;
 
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Dataset.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Dataset.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/entities/Dataset.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/Dataset.java
index 519775f5a..070e24359 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/Dataset.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Dataset.java
@@ -1,6 +1,7 @@
 package eu.eudat.entities;
 
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
@@ -45,7 +46,7 @@ public class Dataset implements DataEntity<Dataset, UUID> {
             return value;
         }
 
-        public static Dataset.Status fromInteger(int value) {
+        public static Status fromInteger(int value) {
             switch (value) {
                 case 0:
                     return SAVED;
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetExternalDataset.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetExternalDataset.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/DatasetExternalDataset.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/DatasetExternalDataset.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfile.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/entities/DatasetProfile.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfile.java
index 4ecafda14..748cf632a 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfile.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfile.java
@@ -1,11 +1,11 @@
 package eu.eudat.entities;
 
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
-import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 import java.util.UUID;
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetRegistry.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetRegistry.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/DatasetRegistry.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/DatasetRegistry.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetService.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetService.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/DatasetService.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/DatasetService.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/ExternalDataset.java b/dmp-backend/web/src/main/java/eu/eudat/entities/ExternalDataset.java
similarity index 97%
rename from dmp-backend/src/main/java/eu/eudat/entities/ExternalDataset.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/ExternalDataset.java
index ebe7e438e..41b0814f4 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/ExternalDataset.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/ExternalDataset.java
@@ -1,5 +1,6 @@
 package eu.eudat.entities;
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.*;
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Invitation.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Invitation.java
similarity index 97%
rename from dmp-backend/src/main/java/eu/eudat/entities/Invitation.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/Invitation.java
index 04503cca6..c593c1572 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/Invitation.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Invitation.java
@@ -1,5 +1,6 @@
 package eu.eudat.entities;
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Organisation.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Organisation.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/entities/Organisation.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/Organisation.java
index 7916166f8..96d161591 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/Organisation.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Organisation.java
@@ -1,6 +1,7 @@
 package eu.eudat.entities;
 
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Project.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Project.java
similarity index 99%
rename from dmp-backend/src/main/java/eu/eudat/entities/Project.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/Project.java
index d6d4b4b45..3cec84df1 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/Project.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Project.java
@@ -1,9 +1,9 @@
 package eu.eudat.entities;
 
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
-import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.util.Date;
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Registry.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Registry.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/entities/Registry.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/Registry.java
index 80e601592..e25d03710 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/Registry.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Registry.java
@@ -1,6 +1,7 @@
 package eu.eudat.entities;
 
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Researcher.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Researcher.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/entities/Researcher.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/Researcher.java
index f37a4a5b8..746d613aa 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/Researcher.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Researcher.java
@@ -1,6 +1,7 @@
 package eu.eudat.entities;
 
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Service.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Service.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/entities/Service.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/Service.java
index 0c03a245e..9106eb2c5 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/Service.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Service.java
@@ -1,6 +1,7 @@
 package eu.eudat.entities;
 
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/UserDMP.java b/dmp-backend/web/src/main/java/eu/eudat/entities/UserDMP.java
similarity index 97%
rename from dmp-backend/src/main/java/eu/eudat/entities/UserDMP.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/UserDMP.java
index a2235a940..3468854eb 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/UserDMP.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/UserDMP.java
@@ -1,5 +1,6 @@
 package eu.eudat.entities;
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.*;
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/UserInfo.java b/dmp-backend/web/src/main/java/eu/eudat/entities/UserInfo.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/entities/UserInfo.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/UserInfo.java
index 07d98095f..847f3d646 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/UserInfo.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/UserInfo.java
@@ -1,5 +1,6 @@
 package eu.eudat.entities;
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/UserRole.java b/dmp-backend/web/src/main/java/eu/eudat/entities/UserRole.java
similarity index 95%
rename from dmp-backend/src/main/java/eu/eudat/entities/UserRole.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/UserRole.java
index 0f0f76668..38d8cd9ca 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/UserRole.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/UserRole.java
@@ -1,5 +1,6 @@
 package eu.eudat.entities;
 
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.*;
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/UserToken.java b/dmp-backend/web/src/main/java/eu/eudat/entities/UserToken.java
similarity index 96%
rename from dmp-backend/src/main/java/eu/eudat/entities/UserToken.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/UserToken.java
index 940812b84..0c25e1f02 100644
--- a/dmp-backend/src/main/java/eu/eudat/entities/UserToken.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/entities/UserToken.java
@@ -1,5 +1,7 @@
 package eu.eudat.entities;
 
+import eu.eudat.queryable.queryableentity.DataEntity;
+
 import javax.persistence.*;
 import java.util.Date;
 import java.util.UUID;
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Field.java b/dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Field.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Field.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Field.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/FieldSet.java b/dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/FieldSet.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/FieldSet.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/FieldSet.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java b/dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Section.java b/dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Section.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Section.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Section.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java b/dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java
rename to dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java
diff --git a/dmp-backend/src/main/java/eu/eudat/exceptions/datamanagementplan/DMPWithDatasetsException.java b/dmp-backend/web/src/main/java/eu/eudat/exceptions/datamanagementplan/DMPWithDatasetsException.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/exceptions/datamanagementplan/DMPWithDatasetsException.java
rename to dmp-backend/web/src/main/java/eu/eudat/exceptions/datamanagementplan/DMPWithDatasetsException.java
diff --git a/dmp-backend/src/main/java/eu/eudat/exceptions/files/TempFileNotFoundException.java b/dmp-backend/web/src/main/java/eu/eudat/exceptions/files/TempFileNotFoundException.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/exceptions/files/TempFileNotFoundException.java
rename to dmp-backend/web/src/main/java/eu/eudat/exceptions/files/TempFileNotFoundException.java
diff --git a/dmp-backend/src/main/java/eu/eudat/exceptions/security/NonValidTokenException.java b/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/NonValidTokenException.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/exceptions/security/NonValidTokenException.java
rename to dmp-backend/web/src/main/java/eu/eudat/exceptions/security/NonValidTokenException.java
diff --git a/dmp-backend/src/main/java/eu/eudat/exceptions/security/UnauthorisedException.java b/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/UnauthorisedException.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/exceptions/security/UnauthorisedException.java
rename to dmp-backend/web/src/main/java/eu/eudat/exceptions/security/UnauthorisedException.java
diff --git a/dmp-backend/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java b/dmp-backend/web/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java
similarity index 97%
rename from dmp-backend/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java
rename to dmp-backend/web/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java
index 7930fd947..5289f4e3b 100644
--- a/dmp-backend/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java
@@ -4,7 +4,6 @@ import eu.eudat.exceptions.security.UnauthorisedException;
 import eu.eudat.models.security.Principal;
 import eu.eudat.security.claims.ClaimedAuthorities;
 import eu.eudat.services.operations.AuthenticationService;
-import eu.eudat.services.operations.AuthenticationServiceImpl;
 import eu.eudat.types.Authorities;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.support.WebDataBinderFactory;
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/AdminManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/AdminManager.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/managers/AdminManager.java
rename to dmp-backend/web/src/main/java/eu/eudat/managers/AdminManager.java
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DashBoardManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/DashBoardManager.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/managers/DashBoardManager.java
rename to dmp-backend/web/src/main/java/eu/eudat/managers/DashBoardManager.java
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/DataManagementPlanManager.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java
rename to dmp-backend/web/src/main/java/eu/eudat/managers/DataManagementPlanManager.java
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/DatasetManager.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java
rename to dmp-backend/web/src/main/java/eu/eudat/managers/DatasetManager.java
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DatasetProfileManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/DatasetProfileManager.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/managers/DatasetProfileManager.java
rename to dmp-backend/web/src/main/java/eu/eudat/managers/DatasetProfileManager.java
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DatasetWizardManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/DatasetWizardManager.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/managers/DatasetWizardManager.java
rename to dmp-backend/web/src/main/java/eu/eudat/managers/DatasetWizardManager.java
index 40cb2cb7e..481224ff6 100644
--- a/dmp-backend/src/main/java/eu/eudat/managers/DatasetWizardManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/managers/DatasetWizardManager.java
@@ -13,7 +13,6 @@ import eu.eudat.queryable.QueryableList;
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 
 public class DatasetWizardManager {
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/ExternalDatasetManager.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java
rename to dmp-backend/web/src/main/java/eu/eudat/managers/ExternalDatasetManager.java
index 456ce7eca..312d16239 100644
--- a/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/managers/ExternalDatasetManager.java
@@ -16,7 +16,6 @@ import eu.eudat.services.ApiContext;
 
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 
 public class ExternalDatasetManager {
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/FileManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/FileManager.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/managers/FileManager.java
rename to dmp-backend/web/src/main/java/eu/eudat/managers/FileManager.java
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/InvitationsManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/InvitationsManager.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/managers/InvitationsManager.java
rename to dmp-backend/web/src/main/java/eu/eudat/managers/InvitationsManager.java
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/PaginationManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/PaginationManager.java
similarity index 98%
rename from dmp-backend/src/main/java/eu/eudat/managers/PaginationManager.java
rename to dmp-backend/web/src/main/java/eu/eudat/managers/PaginationManager.java
index d7bce76ac..8fe5e98ef 100644
--- a/dmp-backend/src/main/java/eu/eudat/managers/PaginationManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/managers/PaginationManager.java
@@ -1,10 +1,10 @@
 package eu.eudat.managers;
 
-import eu.eudat.entities.DataEntity;
 import eu.eudat.models.helpers.common.ColumnOrderings;
 import eu.eudat.models.helpers.common.Ordering;
 import eu.eudat.models.helpers.requests.TableRequest;
 import eu.eudat.queryable.QueryableList;
+import eu.eudat.queryable.queryableentity.DataEntity;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/ProjectManager.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java
rename to dmp-backend/web/src/main/java/eu/eudat/managers/ProjectManager.java
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/ResearcherManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/ResearcherManager.java
similarity index 97%
rename from dmp-backend/src/main/java/eu/eudat/managers/ResearcherManager.java
rename to dmp-backend/web/src/main/java/eu/eudat/managers/ResearcherManager.java
index 3b0a72193..23b7d5a85 100644
--- a/dmp-backend/src/main/java/eu/eudat/managers/ResearcherManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/managers/ResearcherManager.java
@@ -3,7 +3,6 @@ package eu.eudat.managers;
 import eu.eudat.builders.model.models.ResearcherBuilder;
 import eu.eudat.entities.Researcher;
 import eu.eudat.models.external.ExternalSourcesItemModel;
-import eu.eudat.models.external.ProjectsExternalSourcesModel;
 import eu.eudat.models.external.ResearchersExternalSourcesModel;
 import eu.eudat.models.researcher.ResearcherCriteriaRequest;
 import eu.eudat.proxy.config.exceptions.HugeResultSet;
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/UserManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/UserManager.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/managers/UserManager.java
rename to dmp-backend/web/src/main/java/eu/eudat/managers/UserManager.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/DataModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/DataModel.java
similarity index 77%
rename from dmp-backend/src/main/java/eu/eudat/models/DataModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/DataModel.java
index 25412ddc1..2333d33f8 100644
--- a/dmp-backend/src/main/java/eu/eudat/models/DataModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/DataModel.java
@@ -1,6 +1,7 @@
 package eu.eudat.models;
 
-import eu.eudat.entities.DataEntity;
+
+import eu.eudat.queryable.queryableentity.DataEntity;
 
 public interface DataModel<T extends DataEntity, M extends DataModel> {
     M fromDataModel(T entity);
diff --git a/dmp-backend/src/main/java/eu/eudat/models/HintedModelFactory.java b/dmp-backend/web/src/main/java/eu/eudat/models/HintedModelFactory.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/HintedModelFactory.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/HintedModelFactory.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java b/dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/FieldSet.java b/dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/FieldSet.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/FieldSet.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/FieldSet.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java b/dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Section.java b/dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/Section.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Section.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/Section.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/composite/DatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/models/admin/composite/DatasetProfile.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/admin/composite/DatasetProfile.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/admin/composite/DatasetProfile.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/DefaultValue.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/DefaultValue.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/DefaultValue.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/DefaultValue.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/Multiplicity.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/Multiplicity.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/Multiplicity.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/Multiplicity.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/Rule.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/Rule.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/Rule.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/Rule.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/ViewStyle.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/ViewStyle.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/ViewStyle.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/ViewStyle.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/Visibility.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/Visibility.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/Visibility.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/Visibility.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FieldData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/FieldData.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FieldData.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/FieldData.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/RadioBoxData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/RadioBoxData.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/RadioBoxData.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/RadioBoxData.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/WordListData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/WordListData.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/WordListData.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/WordListData.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/Criteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/Criteria.java
similarity index 81%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/Criteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/Criteria.java
index bbf65f7ed..bc595b509 100644
--- a/dmp-backend/src/main/java/eu/eudat/models/criteria/Criteria.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/Criteria.java
@@ -1,6 +1,7 @@
 package eu.eudat.models.criteria;
 
-import eu.eudat.entities.DataEntity;
+
+import eu.eudat.queryable.queryableentity.DataEntity;
 
 public abstract class Criteria<T extends DataEntity> {
     private String like;
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DataManagementPlanCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DataManagementPlanCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/DataManagementPlanCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/DataManagementPlanCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DataRepositoryCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DataRepositoryCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/DataRepositoryCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/DataRepositoryCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetProfileCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetProfileCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/ExternalDatasetCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/ExternalDatasetCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/ExternalDatasetCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/ExternalDatasetCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/InvitationCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/InvitationCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/InvitationCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/InvitationCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/OrganisationCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/OrganisationCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/OrganisationCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/OrganisationCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/ProjectCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/ProjectCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/ProjectCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/ProjectCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/RegistryCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/RegistryCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/RegistryCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/RegistryCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/ResearcherCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/ResearcherCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/ResearcherCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/ResearcherCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/ServiceCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/ServiceCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/ServiceCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/ServiceCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/UserRoleCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/UserRoleCriteria.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/criteria/UserRoleCriteria.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/UserRoleCriteria.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dashboard/recent/RecentActivity.java b/dmp-backend/web/src/main/java/eu/eudat/models/dashboard/recent/RecentActivity.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dashboard/recent/RecentActivity.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dashboard/recent/RecentActivity.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dashboard/recent/RecentActivityData.java b/dmp-backend/web/src/main/java/eu/eudat/models/dashboard/recent/RecentActivityData.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dashboard/recent/RecentActivityData.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dashboard/recent/RecentActivityData.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dashboard/statistics/DashBoardStatistics.java b/dmp-backend/web/src/main/java/eu/eudat/models/dashboard/statistics/DashBoardStatistics.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dashboard/statistics/DashBoardStatistics.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dashboard/statistics/DashBoardStatistics.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dataset/DataRepository.java b/dmp-backend/web/src/main/java/eu/eudat/models/dataset/DataRepository.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dataset/DataRepository.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dataset/DataRepository.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dataset/Dataset.java b/dmp-backend/web/src/main/java/eu/eudat/models/dataset/Dataset.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dataset/Dataset.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dataset/Dataset.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dataset/DatasetTableRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/dataset/DatasetTableRequest.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dataset/DatasetTableRequest.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dataset/DatasetTableRequest.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dataset/Registry.java b/dmp-backend/web/src/main/java/eu/eudat/models/dataset/Registry.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dataset/Registry.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dataset/Registry.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dataset/Service.java b/dmp-backend/web/src/main/java/eu/eudat/models/dataset/Service.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dataset/Service.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dataset/Service.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteItem.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteItem.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteItem.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteRequest.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteRequest.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteRequest.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileListingModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileListingModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileListingModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileTableRequestItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileTableRequestItem.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileTableRequestItem.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileTableRequestItem.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DataManagentPlanListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DataManagentPlanListingModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DataManagentPlanListingModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DataManagentPlanListingModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetProfileWizardAutocompleteRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DatasetProfileWizardAutocompleteRequest.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetProfileWizardAutocompleteRequest.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DatasetProfileWizardAutocompleteRequest.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardAutocompleteRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardAutocompleteRequest.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardAutocompleteRequest.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardAutocompleteRequest.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/AssociatedProfile.java b/dmp-backend/web/src/main/java/eu/eudat/models/dmp/AssociatedProfile.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dmp/AssociatedProfile.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dmp/AssociatedProfile.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlan.java b/dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlan.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlan.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlan.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanCriteriaRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlanCriteriaRequest.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanCriteriaRequest.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlanCriteriaRequest.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanNewVersionModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlanNewVersionModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanNewVersionModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlanNewVersionModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanTableRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlanTableRequest.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanTableRequest.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlanTableRequest.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/Organisation.java b/dmp-backend/web/src/main/java/eu/eudat/models/dmp/Organisation.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dmp/Organisation.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dmp/Organisation.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/Researcher.java b/dmp-backend/web/src/main/java/eu/eudat/models/dmp/Researcher.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/dmp/Researcher.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/dmp/Researcher.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/errormodels/ValidationErrorContext.java b/dmp-backend/web/src/main/java/eu/eudat/models/errormodels/ValidationErrorContext.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/errormodels/ValidationErrorContext.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/errormodels/ValidationErrorContext.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalDatasetModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalDatasetModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/external/ExternalDatasetModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalDatasetModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalItem.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/external/ExternalItem.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalItem.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalListingItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalListingItem.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/external/ExternalListingItem.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalListingItem.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalSourcesItemModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalSourcesItemModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/external/ExternalSourcesItemModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalSourcesItemModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/OrganisationsExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/OrganisationsExternalSourcesModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/external/OrganisationsExternalSourcesModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/external/OrganisationsExternalSourcesModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ProjectsExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/ProjectsExternalSourcesModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/external/ProjectsExternalSourcesModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/external/ProjectsExternalSourcesModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/RegistriesExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/RegistriesExternalSourcesModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/external/RegistriesExternalSourcesModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/external/RegistriesExternalSourcesModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ResearchersExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/ResearchersExternalSourcesModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/external/ResearchersExternalSourcesModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/external/ResearchersExternalSourcesModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ServiceExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/ServiceExternalSourcesModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/external/ServiceExternalSourcesModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/external/ServiceExternalSourcesModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetListingModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetListingModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetListingModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetTableRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetTableRequest.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetTableRequest.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetTableRequest.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/files/ContentFile.java b/dmp-backend/web/src/main/java/eu/eudat/models/files/ContentFile.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/files/ContentFile.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/files/ContentFile.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/AutoCompleteLookupItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/AutoCompleteLookupItem.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/helpers/common/AutoCompleteLookupItem.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/AutoCompleteLookupItem.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/ColumnOrderings.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/ColumnOrderings.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/helpers/common/ColumnOrderings.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/ColumnOrderings.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/DataTableData.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/DataTableData.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/helpers/common/DataTableData.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/DataTableData.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/Ordering.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/Ordering.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/helpers/common/Ordering.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/Ordering.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/SelectionFields.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/SelectionFields.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/helpers/common/SelectionFields.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/SelectionFields.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/requests/RequestItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/requests/RequestItem.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/helpers/requests/RequestItem.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/requests/RequestItem.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/requests/TableRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/requests/TableRequest.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/helpers/requests/TableRequest.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/requests/TableRequest.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/invitation/Invitation.java b/dmp-backend/web/src/main/java/eu/eudat/models/invitation/Invitation.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/invitation/Invitation.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/invitation/Invitation.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DatasetListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/listingmodels/DatasetListingModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/listingmodels/DatasetListingModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/listingmodels/DatasetListingModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/login/Credentials.java b/dmp-backend/web/src/main/java/eu/eudat/models/login/Credentials.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/login/Credentials.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/login/Credentials.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/login/LoginInfo.java b/dmp-backend/web/src/main/java/eu/eudat/models/login/LoginInfo.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/login/LoginInfo.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/login/LoginInfo.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/loginprovider/LoginProviderUser.java b/dmp-backend/web/src/main/java/eu/eudat/models/loginprovider/LoginProviderUser.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/loginprovider/LoginProviderUser.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/loginprovider/LoginProviderUser.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/mail/SimpleMail.java b/dmp-backend/web/src/main/java/eu/eudat/models/mail/SimpleMail.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/mail/SimpleMail.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/mail/SimpleMail.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/project/Project.java b/dmp-backend/web/src/main/java/eu/eudat/models/project/Project.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/project/Project.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/project/Project.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectCriteriaModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectCriteriaModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectCriteriaRequest.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaRequest.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectCriteriaRequest.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/project/ProjectListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectListingModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/project/ProjectListingModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectListingModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/project/ProjectTableRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectTableRequest.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/project/ProjectTableRequest.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectTableRequest.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java b/dmp-backend/web/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/Field.java b/dmp-backend/web/src/main/java/eu/eudat/models/properties/Field.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/properties/Field.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/properties/Field.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/FieldSet.java b/dmp-backend/web/src/main/java/eu/eudat/models/properties/FieldSet.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/properties/FieldSet.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/properties/FieldSet.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/Group.java b/dmp-backend/web/src/main/java/eu/eudat/models/properties/Group.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/properties/Group.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/properties/Group.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/PropertiesGenerator.java b/dmp-backend/web/src/main/java/eu/eudat/models/properties/PropertiesGenerator.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/properties/PropertiesGenerator.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/properties/PropertiesGenerator.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/PropertiesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/properties/PropertiesModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/properties/PropertiesModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/properties/PropertiesModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/Section.java b/dmp-backend/web/src/main/java/eu/eudat/models/properties/Section.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/properties/Section.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/properties/Section.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/researcher/Researcher.java b/dmp-backend/web/src/main/java/eu/eudat/models/researcher/Researcher.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/researcher/Researcher.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/researcher/Researcher.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/researcher/ResearcherCriteriaRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/researcher/ResearcherCriteriaRequest.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/researcher/ResearcherCriteriaRequest.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/researcher/ResearcherCriteriaRequest.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/security/Principal.java b/dmp-backend/web/src/main/java/eu/eudat/models/security/Principal.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/security/Principal.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/security/Principal.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/urls/DataManagementPlanUrlListing.java b/dmp-backend/web/src/main/java/eu/eudat/models/urls/DataManagementPlanUrlListing.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/urls/DataManagementPlanUrlListing.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/urls/DataManagementPlanUrlListing.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/urls/UrlListing.java b/dmp-backend/web/src/main/java/eu/eudat/models/urls/UrlListing.java
similarity index 90%
rename from dmp-backend/src/main/java/eu/eudat/models/urls/UrlListing.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/urls/UrlListing.java
index c28b744cb..826d54afd 100644
--- a/dmp-backend/src/main/java/eu/eudat/models/urls/UrlListing.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/urls/UrlListing.java
@@ -1,7 +1,6 @@
 package eu.eudat.models.urls;
-
-import eu.eudat.entities.DataEntity;
 import eu.eudat.models.DataModel;
+import eu.eudat.queryable.queryableentity.DataEntity;
 
 /**
  * Created by ikalyvas on 3/19/2018.
diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/components/commons/Rule.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/components/commons/Rule.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/user/components/commons/Rule.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/user/components/commons/Rule.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/Field.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/components/datasetprofile/Field.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/Field.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/user/components/datasetprofile/Field.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/FieldSet.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/components/datasetprofile/FieldSet.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/FieldSet.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/user/components/datasetprofile/FieldSet.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/Section.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/components/datasetprofile/Section.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/Section.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/user/components/datasetprofile/Section.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/composite/DatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/composite/DatasetProfile.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/user/composite/DatasetProfile.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/user/composite/DatasetProfile.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/composite/DatasetProfilePage.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/composite/DatasetProfilePage.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/user/composite/DatasetProfilePage.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/user/composite/DatasetProfilePage.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/composite/PagedDatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/composite/PagedDatasetProfile.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/user/composite/PagedDatasetProfile.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/user/composite/PagedDatasetProfile.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/composite/PropertiesModelBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/composite/PropertiesModelBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/user/composite/PropertiesModelBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/user/composite/PropertiesModelBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfo.java b/dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfo.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfo.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfo.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoInvitationModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfoInvitationModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoInvitationModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfoInvitationModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoRequestItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfoRequestItem.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoRequestItem.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfoRequestItem.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoTableRequestItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfoTableRequestItem.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoTableRequestItem.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfoTableRequestItem.java
diff --git a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserListingModel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/models/userinfo/UserListingModel.java
rename to dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserListingModel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/Proxy.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/Proxy.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/Proxy.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/Proxy.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/ExternalUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/ExternalUrls.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/ExternalUrls.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/ExternalUrls.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/FetchStrategy.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/FetchStrategy.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/FetchStrategy.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/FetchStrategy.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/UrlConfig.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/UrlConfig.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/UrlConfig.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/UrlConfig.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/configloaders/ConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/configloaders/ConfigLoader.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/configloaders/ConfigLoader.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/configloaders/ConfigLoader.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/configloaders/DevelConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/configloaders/DevelConfigLoader.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/configloaders/DevelConfigLoader.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/configloaders/DevelConfigLoader.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/configloaders/ProductionConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/configloaders/ProductionConfigLoader.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/configloaders/ProductionConfigLoader.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/configloaders/ProductionConfigLoader.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/DatasetUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/DatasetUrls.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/entities/DatasetUrls.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/DatasetUrls.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/OrganisationUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/OrganisationUrls.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/entities/OrganisationUrls.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/OrganisationUrls.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/ProjectUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/ProjectUrls.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/entities/ProjectUrls.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/ProjectUrls.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/RegistryUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/RegistryUrls.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/entities/RegistryUrls.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/RegistryUrls.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/RepositoryUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/RepositoryUrls.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/entities/RepositoryUrls.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/RepositoryUrls.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/ResearcherUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/ResearcherUrls.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/entities/ResearcherUrls.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/ResearcherUrls.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/ServiceUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/ServiceUrls.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/entities/ServiceUrls.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/ServiceUrls.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/exceptions/HugeResultSet.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/exceptions/HugeResultSet.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/exceptions/HugeResultSet.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/exceptions/HugeResultSet.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/exceptions/NoURLFound.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/exceptions/NoURLFound.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/config/exceptions/NoURLFound.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/exceptions/NoURLFound.java
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/fetching/RemoteFetcher.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/fetching/RemoteFetcher.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/proxy/fetching/RemoteFetcher.java
rename to dmp-backend/web/src/main/java/eu/eudat/proxy/fetching/RemoteFetcher.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/CustomAuthenticationProvider.java b/dmp-backend/web/src/main/java/eu/eudat/security/CustomAuthenticationProvider.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/CustomAuthenticationProvider.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/CustomAuthenticationProvider.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/claims/ClaimedAuthorities.java b/dmp-backend/web/src/main/java/eu/eudat/security/claims/ClaimedAuthorities.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/claims/ClaimedAuthorities.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/claims/ClaimedAuthorities.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/claims/ClaimedRights.java b/dmp-backend/web/src/main/java/eu/eudat/security/claims/ClaimedRights.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/claims/ClaimedRights.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/claims/ClaimedRights.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProvider.java b/dmp-backend/web/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProvider.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProvider.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProvider.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProviderImpl.java b/dmp-backend/web/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProviderImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProviderImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProviderImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/customproviders/B2AccessUser.java b/dmp-backend/web/src/main/java/eu/eudat/security/customproviders/B2AccessUser.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/customproviders/B2AccessUser.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/customproviders/B2AccessUser.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/TokenValidator.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidator.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/TokenValidator.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactory.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/TokenValidatorFactory.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactory.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/TokenValidatorFactory.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactoryImpl.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/TokenValidatorFactoryImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactoryImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/TokenValidatorFactoryImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/b2access/B2AccessTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/b2access/B2AccessTokenValidator.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/validators/b2access/B2AccessTokenValidator.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/b2access/B2AccessTokenValidator.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessRequest.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessRequest.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessRequest.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessRequest.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessResponseToken.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessResponseToken.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessResponseToken.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessResponseToken.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/facebook/FacebookTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/facebook/FacebookTokenValidator.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/validators/facebook/FacebookTokenValidator.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/facebook/FacebookTokenValidator.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/google/GoogleTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/google/GoogleTokenValidator.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/validators/google/GoogleTokenValidator.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/google/GoogleTokenValidator.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/linkedin/LinkedInTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/linkedin/LinkedInTokenValidator.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/validators/linkedin/LinkedInTokenValidator.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/linkedin/LinkedInTokenValidator.java
diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/twitter/TwitterTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/twitter/TwitterTokenValidator.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/security/validators/twitter/TwitterTokenValidator.java
rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/twitter/TwitterTokenValidator.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/ApiContext.java b/dmp-backend/web/src/main/java/eu/eudat/services/ApiContext.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/ApiContext.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/ApiContext.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/ApiContextImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/ApiContextImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/ApiContextImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/ApiContextImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityContext.java b/dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityContext.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityContext.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityContext.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRule.java b/dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRule.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRule.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRule.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRuleService.java b/dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRuleService.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRuleService.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRuleService.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRuleServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRuleServiceImpl.java
similarity index 96%
rename from dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRuleServiceImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRuleServiceImpl.java
index e821616b9..2ec1a51a3 100644
--- a/dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRuleServiceImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRuleServiceImpl.java
@@ -1,7 +1,6 @@
 package eu.eudat.services.forms;
 
 import eu.eudat.models.user.components.commons.Rule;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
diff --git a/dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRuleSource.java b/dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRuleSource.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRuleSource.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRuleSource.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/helpers/FileStorageService.java b/dmp-backend/web/src/main/java/eu/eudat/services/helpers/FileStorageService.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/helpers/FileStorageService.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/helpers/FileStorageService.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/helpers/FileStorageServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/helpers/FileStorageServiceImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/helpers/FileStorageServiceImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/helpers/FileStorageServiceImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/helpers/HelpersService.java b/dmp-backend/web/src/main/java/eu/eudat/services/helpers/HelpersService.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/helpers/HelpersService.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/helpers/HelpersService.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/helpers/HelpersServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/helpers/HelpersServiceImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/helpers/HelpersServiceImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/helpers/HelpersServiceImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/helpers/LoggerService.java b/dmp-backend/web/src/main/java/eu/eudat/services/helpers/LoggerService.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/helpers/LoggerService.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/helpers/LoggerService.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/helpers/LoggerServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/helpers/LoggerServiceImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/helpers/LoggerServiceImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/helpers/LoggerServiceImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/operations/AuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/services/operations/AuthenticationService.java
similarity index 86%
rename from dmp-backend/src/main/java/eu/eudat/services/operations/AuthenticationService.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/operations/AuthenticationService.java
index 7a025b22a..af4583de7 100644
--- a/dmp-backend/src/main/java/eu/eudat/services/operations/AuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/services/operations/AuthenticationService.java
@@ -1,7 +1,5 @@
 package eu.eudat.services.operations;
 
-import eu.eudat.entities.Credential;
-import eu.eudat.entities.UserToken;
 import eu.eudat.models.login.Credentials;
 import eu.eudat.models.loginprovider.LoginProviderUser;
 import eu.eudat.models.security.Principal;
diff --git a/dmp-backend/src/main/java/eu/eudat/services/operations/AuthenticationServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/operations/AuthenticationServiceImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/operations/AuthenticationServiceImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/operations/AuthenticationServiceImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/operations/DatabaseRepository.java b/dmp-backend/web/src/main/java/eu/eudat/services/operations/DatabaseRepository.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/operations/DatabaseRepository.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/operations/DatabaseRepository.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/operations/DatabaseRepositoryImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/operations/DatabaseRepositoryImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/operations/DatabaseRepositoryImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/operations/DatabaseRepositoryImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/operations/OperationsContext.java b/dmp-backend/web/src/main/java/eu/eudat/services/operations/OperationsContext.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/operations/OperationsContext.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/operations/OperationsContext.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/operations/OperationsContextImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/operations/OperationsContextImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/operations/OperationsContextImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/operations/OperationsContextImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/utilities/InvitationService.java b/dmp-backend/web/src/main/java/eu/eudat/services/utilities/InvitationService.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/utilities/InvitationService.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/utilities/InvitationService.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/utilities/InvitationServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/utilities/InvitationServiceImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/utilities/InvitationServiceImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/utilities/InvitationServiceImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/utilities/MailService.java b/dmp-backend/web/src/main/java/eu/eudat/services/utilities/MailService.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/utilities/MailService.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/utilities/MailService.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/utilities/MailServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/utilities/MailServiceImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/utilities/MailServiceImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/utilities/MailServiceImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/utilities/UtilitiesService.java b/dmp-backend/web/src/main/java/eu/eudat/services/utilities/UtilitiesService.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/utilities/UtilitiesService.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/utilities/UtilitiesService.java
diff --git a/dmp-backend/src/main/java/eu/eudat/services/utilities/UtilitiesServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/utilities/UtilitiesServiceImpl.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/services/utilities/UtilitiesServiceImpl.java
rename to dmp-backend/web/src/main/java/eu/eudat/services/utilities/UtilitiesServiceImpl.java
diff --git a/dmp-backend/src/main/java/eu/eudat/typedefinition/DataType.java b/dmp-backend/web/src/main/java/eu/eudat/typedefinition/DataType.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/typedefinition/DataType.java
rename to dmp-backend/web/src/main/java/eu/eudat/typedefinition/DataType.java
diff --git a/dmp-backend/src/main/java/eu/eudat/typedefinition/DatabaseColumnType.java b/dmp-backend/web/src/main/java/eu/eudat/typedefinition/DatabaseColumnType.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/typedefinition/DatabaseColumnType.java
rename to dmp-backend/web/src/main/java/eu/eudat/typedefinition/DatabaseColumnType.java
diff --git a/dmp-backend/src/main/java/eu/eudat/typedefinition/PostgreSQLDatabaseColumnType.java b/dmp-backend/web/src/main/java/eu/eudat/typedefinition/PostgreSQLDatabaseColumnType.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/typedefinition/PostgreSQLDatabaseColumnType.java
rename to dmp-backend/web/src/main/java/eu/eudat/typedefinition/PostgreSQLDatabaseColumnType.java
diff --git a/dmp-backend/src/main/java/eu/eudat/typedefinition/UUIDType.java b/dmp-backend/web/src/main/java/eu/eudat/typedefinition/UUIDType.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/typedefinition/UUIDType.java
rename to dmp-backend/web/src/main/java/eu/eudat/typedefinition/UUIDType.java
diff --git a/dmp-backend/src/main/java/eu/eudat/typedefinition/XMLType.java b/dmp-backend/web/src/main/java/eu/eudat/typedefinition/XMLType.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/typedefinition/XMLType.java
rename to dmp-backend/web/src/main/java/eu/eudat/typedefinition/XMLType.java
diff --git a/dmp-backend/src/main/java/eu/eudat/types/ApiMessageCode.java b/dmp-backend/web/src/main/java/eu/eudat/types/ApiMessageCode.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/types/ApiMessageCode.java
rename to dmp-backend/web/src/main/java/eu/eudat/types/ApiMessageCode.java
diff --git a/dmp-backend/src/main/java/eu/eudat/types/ApiResponseType.java b/dmp-backend/web/src/main/java/eu/eudat/types/ApiResponseType.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/types/ApiResponseType.java
rename to dmp-backend/web/src/main/java/eu/eudat/types/ApiResponseType.java
diff --git a/dmp-backend/src/main/java/eu/eudat/types/Authorities.java b/dmp-backend/web/src/main/java/eu/eudat/types/Authorities.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/types/Authorities.java
rename to dmp-backend/web/src/main/java/eu/eudat/types/Authorities.java
diff --git a/dmp-backend/src/main/java/eu/eudat/types/Rights.java b/dmp-backend/web/src/main/java/eu/eudat/types/Rights.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/types/Rights.java
rename to dmp-backend/web/src/main/java/eu/eudat/types/Rights.java
diff --git a/dmp-backend/src/main/java/eu/eudat/types/WarningLevel.java b/dmp-backend/web/src/main/java/eu/eudat/types/WarningLevel.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/types/WarningLevel.java
rename to dmp-backend/web/src/main/java/eu/eudat/types/WarningLevel.java
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/builders/ModelBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/builders/ModelBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/utilities/builders/ModelBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/utilities/builders/ModelBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/builders/XmlBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/builders/XmlBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/utilities/builders/XmlBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/utilities/builders/XmlBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/LabelBuilder.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelBuilder.java
rename to dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/LabelBuilder.java
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelGenerator.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/LabelGenerator.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelGenerator.java
rename to dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/LabelGenerator.java
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/helpers/ModelBuilderCollector.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/ModelBuilderCollector.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/utilities/helpers/ModelBuilderCollector.java
rename to dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/ModelBuilderCollector.java
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/helpers/ModelSerializer.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/ModelSerializer.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/utilities/helpers/ModelSerializer.java
rename to dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/ModelSerializer.java
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/Applier.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/Applier.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/Applier.java
rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/Applier.java
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ApplierWithValue.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ApplierWithValue.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ApplierWithValue.java
rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ApplierWithValue.java
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/Cloneable.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/Cloneable.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/Cloneable.java
rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/Cloneable.java
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/DatabaseDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/DatabaseDefinition.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/DatabaseDefinition.java
rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/DatabaseDefinition.java
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ModelDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ModelDefinition.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ModelDefinition.java
rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ModelDefinition.java
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ModelSerializer.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ModelSerializer.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ModelSerializer.java
rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ModelSerializer.java
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ViewStyleDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ViewStyleDefinition.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ViewStyleDefinition.java
rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ViewStyleDefinition.java
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/XmlSerializable.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/XmlSerializable.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/XmlSerializable.java
rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/XmlSerializable.java
diff --git a/dmp-backend/src/main/java/eu/eudat/validators/DataManagementPlanNewVersionValidator.java b/dmp-backend/web/src/main/java/eu/eudat/validators/DataManagementPlanNewVersionValidator.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/validators/DataManagementPlanNewVersionValidator.java
rename to dmp-backend/web/src/main/java/eu/eudat/validators/DataManagementPlanNewVersionValidator.java
diff --git a/dmp-backend/src/main/java/eu/eudat/validators/DataManagementPlanTableRequestValidator.java b/dmp-backend/web/src/main/java/eu/eudat/validators/DataManagementPlanTableRequestValidator.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/validators/DataManagementPlanTableRequestValidator.java
rename to dmp-backend/web/src/main/java/eu/eudat/validators/DataManagementPlanTableRequestValidator.java
diff --git a/dmp-backend/src/main/java/eu/eudat/validators/DatasetProfileValidator.java b/dmp-backend/web/src/main/java/eu/eudat/validators/DatasetProfileValidator.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/validators/DatasetProfileValidator.java
rename to dmp-backend/web/src/main/java/eu/eudat/validators/DatasetProfileValidator.java
diff --git a/dmp-backend/src/main/java/eu/eudat/validators/ProjectModelValidator.java b/dmp-backend/web/src/main/java/eu/eudat/validators/ProjectModelValidator.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/validators/ProjectModelValidator.java
rename to dmp-backend/web/src/main/java/eu/eudat/validators/ProjectModelValidator.java
diff --git a/dmp-backend/src/main/java/eu/eudat/validators/ProjectTableRequestValidator.java b/dmp-backend/web/src/main/java/eu/eudat/validators/ProjectTableRequestValidator.java
similarity index 100%
rename from dmp-backend/src/main/java/eu/eudat/validators/ProjectTableRequestValidator.java
rename to dmp-backend/web/src/main/java/eu/eudat/validators/ProjectTableRequestValidator.java
diff --git a/dmp-backend/src/main/resources/ExternalUrls.xml b/dmp-backend/web/src/main/resources/ExternalUrls.xml
similarity index 100%
rename from dmp-backend/src/main/resources/ExternalUrls.xml
rename to dmp-backend/web/src/main/resources/ExternalUrls.xml
diff --git a/dmp-backend/src/main/resources/META-INF/persistence.xml b/dmp-backend/web/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from dmp-backend/src/main/resources/META-INF/persistence.xml
rename to dmp-backend/web/src/main/resources/META-INF/persistence.xml
diff --git a/dmp-backend/src/main/resources/application.properties b/dmp-backend/web/src/main/resources/application.properties
similarity index 100%
rename from dmp-backend/src/main/resources/application.properties
rename to dmp-backend/web/src/main/resources/application.properties
diff --git a/dmp-backend/src/main/resources/documents/h2020.docx b/dmp-backend/web/src/main/resources/documents/h2020.docx
similarity index 100%
rename from dmp-backend/src/main/resources/documents/h2020.docx
rename to dmp-backend/web/src/main/resources/documents/h2020.docx
diff --git a/dmp-backend/src/main/resources/images/default.png b/dmp-backend/web/src/main/resources/images/default.png
similarity index 100%
rename from dmp-backend/src/main/resources/images/default.png
rename to dmp-backend/web/src/main/resources/images/default.png
diff --git a/dmp-backend/src/main/resources/messages.properties b/dmp-backend/web/src/main/resources/messages.properties
similarity index 100%
rename from dmp-backend/src/main/resources/messages.properties
rename to dmp-backend/web/src/main/resources/messages.properties
diff --git a/dmp-backend/src/main/resources/messages_el.properties b/dmp-backend/web/src/main/resources/messages_el.properties
similarity index 100%
rename from dmp-backend/src/main/resources/messages_el.properties
rename to dmp-backend/web/src/main/resources/messages_el.properties
diff --git a/dmp-backend/src/test/resources/ExternalUrlsTEST.xml b/dmp-backend/web/src/test/resources/ExternalUrlsTEST.xml
similarity index 100%
rename from dmp-backend/src/test/resources/ExternalUrlsTEST.xml
rename to dmp-backend/web/src/test/resources/ExternalUrlsTEST.xml
diff --git a/dmp-backend/src/test/resources/applicationContextTEST.xml b/dmp-backend/web/src/test/resources/applicationContextTEST.xml
similarity index 100%
rename from dmp-backend/src/test/resources/applicationContextTEST.xml
rename to dmp-backend/web/src/test/resources/applicationContextTEST.xml
diff --git a/dmp-backend/src/test/resources/dmpTEST.properties b/dmp-backend/web/src/test/resources/dmpTEST.properties
similarity index 100%
rename from dmp-backend/src/test/resources/dmpTEST.properties
rename to dmp-backend/web/src/test/resources/dmpTEST.properties