From 0bcc93cece828feda52e8302ca471f440fff3925 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Wed, 27 Jul 2016 13:49:20 +0200
Subject: [PATCH] root package is now 'eu' instead of 'org'

---
 config/application.tmpl                       |  2 +-
 config/application.yml                        |  2 +-
 pom.xml                                       | 12 +++----
 src/docker/build/Dockerfile                   |  2 ++
 src/docker/run/Dockerfile                     |  4 ++-
 .../{org => eu}/hbp/mip/MIPApplication.java   |  2 +-
 .../PersistenceConfiguration.java             |  8 ++---
 .../configuration/SecurityConfiguration.java  | 12 +++----
 .../mip/configuration/WebConfiguration.java   |  4 +--
 .../hbp/mip/controllers/AppsApi.java          | 16 ++++-----
 .../hbp/mip/controllers/ArticlesApi.java      | 10 +++---
 .../hbp/mip/controllers/DatasetsApi.java      |  6 ++--
 .../hbp/mip/controllers/ExperimentApi.java    | 16 ++++-----
 .../hbp/mip/controllers/GroupsApi.java        |  6 ++--
 .../hbp/mip/controllers/ModelsApi.java        | 19 ++++++-----
 .../hbp/mip/controllers/RequestsApi.java      |  8 ++---
 .../hbp/mip/controllers/StatsApi.java         | 10 +++---
 .../hbp/mip/controllers/UsersApi.java         |  6 ++--
 .../hbp/mip/controllers/VariablesApi.java     |  8 ++---
 .../java/{org => eu}/hbp/mip/model/App.java   |  2 +-
 .../{org => eu}/hbp/mip/model/Article.java    |  2 +-
 .../{org => eu}/hbp/mip/model/Config.java     |  2 +-
 .../{org => eu}/hbp/mip/model/Dataset.java    |  2 +-
 .../hbp/mip/model/ExaremeQueryElement.java    |  2 +-
 .../{org => eu}/hbp/mip/model/Experiment.java |  2 +-
 .../{org => eu}/hbp/mip/model/Filter.java     |  2 +-
 .../hbp/mip/model/GeneralStats.java           |  2 +-
 .../java/{org => eu}/hbp/mip/model/Group.java |  2 +-
 .../java/{org => eu}/hbp/mip/model/Model.java |  8 ++---
 .../java/{org => eu}/hbp/mip/model/Query.java |  2 +-
 .../java/{org => eu}/hbp/mip/model/Tag.java   |  2 +-
 .../java/{org => eu}/hbp/mip/model/User.java  |  2 +-
 .../java/{org => eu}/hbp/mip/model/Value.java |  2 +-
 .../{org => eu}/hbp/mip/model/Variable.java   |  2 +-
 .../java/{org => eu}/hbp/mip/model/Vote.java  |  2 +-
 .../hbp/mip/repositories/AppRepository.java   |  4 +--
 .../mip/repositories/ArticleRepository.java   |  6 ++--
 .../mip/repositories/ConfigRepository.java    |  4 +--
 .../mip/repositories/DatasetRepository.java   |  4 +--
 .../repositories/ExperimentRepository.java    |  6 ++--
 .../mip/repositories/FilterRepository.java    |  4 +--
 .../hbp/mip/repositories/GroupRepository.java |  4 +--
 .../hbp/mip/repositories/ModelRepository.java |  6 ++--
 .../hbp/mip/repositories/QueryRepository.java |  4 +--
 .../hbp/mip/repositories/TagRepository.java   |  4 +--
 .../hbp/mip/repositories/UserRepository.java  |  4 +--
 .../hbp/mip/repositories/ValueRepository.java |  4 +--
 .../mip/repositories/VariableRepository.java  |  4 +--
 .../hbp/mip/repositories/VoteRepository.java  |  8 ++---
 .../{org => eu}/hbp/mip/utils/CORSFilter.java |  2 +-
 .../{org => eu}/hbp/mip/utils/CSVUtil.java    | 10 +++---
 ...ustomLoginUrlAuthenticationEntryPoint.java |  2 +-
 .../{org => eu}/hbp/mip/utils/HTTPUtil.java   |  2 +-
 .../{org => eu}/hbp/mip/utils/JSONUtil.java   |  2 +-
 .../java/eu/hbp/mip/MIPApplicationTests.java  | 23 +++++++++++++
 .../java/org/hbp/mip/MIPApplicationTests.java | 34 -------------------
 tests/test-build.sh                           |  2 +-
 57 files changed, 165 insertions(+), 169 deletions(-)
 rename src/main/java/{org => eu}/hbp/mip/MIPApplication.java (94%)
 rename src/main/java/{org => eu}/hbp/mip/configuration/PersistenceConfiguration.java (89%)
 rename src/main/java/{org => eu}/hbp/mip/configuration/SecurityConfiguration.java (97%)
 rename src/main/java/{org => eu}/hbp/mip/configuration/WebConfiguration.java (91%)
 rename src/main/java/{org => eu}/hbp/mip/controllers/AppsApi.java (88%)
 rename src/main/java/{org => eu}/hbp/mip/controllers/ArticlesApi.java (96%)
 rename src/main/java/{org => eu}/hbp/mip/controllers/DatasetsApi.java (90%)
 rename src/main/java/{org => eu}/hbp/mip/controllers/ExperimentApi.java (97%)
 rename src/main/java/{org => eu}/hbp/mip/controllers/GroupsApi.java (91%)
 rename src/main/java/{org => eu}/hbp/mip/controllers/ModelsApi.java (95%)
 rename src/main/java/{org => eu}/hbp/mip/controllers/RequestsApi.java (90%)
 rename src/main/java/{org => eu}/hbp/mip/controllers/StatsApi.java (87%)
 rename src/main/java/{org => eu}/hbp/mip/controllers/UsersApi.java (91%)
 rename src/main/java/{org => eu}/hbp/mip/controllers/VariablesApi.java (95%)
 rename src/main/java/{org => eu}/hbp/mip/model/App.java (98%)
 rename src/main/java/{org => eu}/hbp/mip/model/Article.java (99%)
 rename src/main/java/{org => eu}/hbp/mip/model/Config.java (98%)
 rename src/main/java/{org => eu}/hbp/mip/model/Dataset.java (98%)
 rename src/main/java/{org => eu}/hbp/mip/model/ExaremeQueryElement.java (96%)
 rename src/main/java/{org => eu}/hbp/mip/model/Experiment.java (99%)
 rename src/main/java/{org => eu}/hbp/mip/model/Filter.java (98%)
 rename src/main/java/{org => eu}/hbp/mip/model/GeneralStats.java (96%)
 rename src/main/java/{org => eu}/hbp/mip/model/Group.java (98%)
 rename src/main/java/{org => eu}/hbp/mip/model/Model.java (94%)
 rename src/main/java/{org => eu}/hbp/mip/model/Query.java (99%)
 rename src/main/java/{org => eu}/hbp/mip/model/Tag.java (95%)
 rename src/main/java/{org => eu}/hbp/mip/model/User.java (99%)
 rename src/main/java/{org => eu}/hbp/mip/model/Value.java (96%)
 rename src/main/java/{org => eu}/hbp/mip/model/Variable.java (99%)
 rename src/main/java/{org => eu}/hbp/mip/model/Vote.java (97%)
 rename src/main/java/{org => eu}/hbp/mip/repositories/AppRepository.java (73%)
 rename src/main/java/{org => eu}/hbp/mip/repositories/ArticleRepository.java (77%)
 rename src/main/java/{org => eu}/hbp/mip/repositories/ConfigRepository.java (72%)
 rename src/main/java/{org => eu}/hbp/mip/repositories/DatasetRepository.java (72%)
 rename src/main/java/{org => eu}/hbp/mip/repositories/ExperimentRepository.java (75%)
 rename src/main/java/{org => eu}/hbp/mip/repositories/FilterRepository.java (72%)
 rename src/main/java/{org => eu}/hbp/mip/repositories/GroupRepository.java (72%)
 rename src/main/java/{org => eu}/hbp/mip/repositories/ModelRepository.java (79%)
 rename src/main/java/{org => eu}/hbp/mip/repositories/QueryRepository.java (72%)
 rename src/main/java/{org => eu}/hbp/mip/repositories/TagRepository.java (73%)
 rename src/main/java/{org => eu}/hbp/mip/repositories/UserRepository.java (73%)
 rename src/main/java/{org => eu}/hbp/mip/repositories/ValueRepository.java (72%)
 rename src/main/java/{org => eu}/hbp/mip/repositories/VariableRepository.java (72%)
 rename src/main/java/{org => eu}/hbp/mip/repositories/VoteRepository.java (64%)
 rename src/main/java/{org => eu}/hbp/mip/utils/CORSFilter.java (97%)
 rename src/main/java/{org => eu}/hbp/mip/utils/CSVUtil.java (97%)
 rename src/main/java/{org => eu}/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java (96%)
 rename src/main/java/{org => eu}/hbp/mip/utils/HTTPUtil.java (98%)
 rename src/main/java/{org => eu}/hbp/mip/utils/JSONUtil.java (96%)
 create mode 100644 src/test/java/eu/hbp/mip/MIPApplicationTests.java
 delete mode 100644 src/test/java/org/hbp/mip/MIPApplicationTests.java

diff --git a/config/application.tmpl b/config/application.tmpl
index b82aed60a..5086566bd 100644
--- a/config/application.tmpl
+++ b/config/application.tmpl
@@ -1,4 +1,4 @@
-# Configuration for the portal running inside a Docker container
+# Configuration template for the portal running inside a Docker container
 
 spring:
   datasource:
diff --git a/config/application.yml b/config/application.yml
index de62b378f..e1f4fd78c 100644
--- a/config/application.yml
+++ b/config/application.yml
@@ -1,4 +1,4 @@
-# Configuration for the portal running inside a Docker container
+# ONLY FOR DEVELOPMENT - Configuration for the portal running inside a Docker container
 
 spring:
   datasource:
diff --git a/pom.xml b/pom.xml
index 2726b792b..23c8733a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,13 +3,13 @@
     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>org.hbp.mip</groupId>
-    <artifactId>backend-services</artifactId>
+    <groupId>eu.hbp.mip</groupId>
+    <artifactId>portal-backend</artifactId>
     <version>DOCKER_BUILD</version>
     <packaging>jar</packaging>
 
-    <name>backend-services</name>
-    <description>Medical Informatics Platform : backend restful services</description>
+    <name>portal-backend</name>
+    <description>Medical Informatics Platform - portal-backend</description>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -20,8 +20,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <sonar.host.url>http://dockerhost:9000</sonar.host.url>
-        <sonar.projectName>MIP Backend</sonar.projectName>
+        <sonar.host.url>https://hbps1.chuv.ch/sonarqube/</sonar.host.url>
+        <sonar.projectName>MIP portal-backend</sonar.projectName>
         <sonar.sources>src/main/java/</sonar.sources>
         <java.version>1.8</java.version>
         <asciidoctor.maven.plugin.version>1.5.3</asciidoctor.maven.plugin.version>
diff --git a/src/docker/build/Dockerfile b/src/docker/build/Dockerfile
index b4318d788..2f62e5c9a 100644
--- a/src/docker/build/Dockerfile
+++ b/src/docker/build/Dockerfile
@@ -1,5 +1,7 @@
 FROM maven:3-jdk-8
 
+MAINTAINER mirco.nasuti@chuv.ch
+
 COPY ./build-in-docker.sh /build-in-docker.sh
 
 VOLUME /opt/portal/
diff --git a/src/docker/run/Dockerfile b/src/docker/run/Dockerfile
index f9c7d30b0..cc8d06554 100644
--- a/src/docker/run/Dockerfile
+++ b/src/docker/run/Dockerfile
@@ -1,6 +1,8 @@
 FROM java:openjdk-8u92-jdk-alpine
 
-COPY ./target/backend-services-DOCKER_BUILD.jar backend.jar
+MAINTAINER mirco.nasuti@chuv.ch
+
+COPY ./target/portal-backend-DOCKER_BUILD.jar backend.jar
 
 RUN apk add --update ca-certificates wget &&  rm -rf /var/cache/apk/* /tmp/* && update-ca-certificates
 RUN wget https://github.com/jwilder/dockerize/releases/download/v0.2.0/dockerize-linux-amd64-v0.2.0.tar.gz
diff --git a/src/main/java/org/hbp/mip/MIPApplication.java b/src/main/java/eu/hbp/mip/MIPApplication.java
similarity index 94%
rename from src/main/java/org/hbp/mip/MIPApplication.java
rename to src/main/java/eu/hbp/mip/MIPApplication.java
index 51fd6f3ea..ef20c9f9f 100644
--- a/src/main/java/org/hbp/mip/MIPApplication.java
+++ b/src/main/java/eu/hbp/mip/MIPApplication.java
@@ -2,7 +2,7 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip;
+package eu.hbp.mip;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java b/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
similarity index 89%
rename from src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
rename to src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
index 35ce472e9..0a01e433f 100644
--- a/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
@@ -1,7 +1,7 @@
-package org.hbp.mip.configuration;
+package eu.hbp.mip.configuration;
 
+import eu.hbp.mip.utils.CSVUtil;
 import org.flywaydb.core.Flyway;
-import org.hbp.mip.utils.CSVUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.orm.jpa.EntityScan;
 import org.springframework.context.annotation.Bean;
@@ -19,8 +19,8 @@ import javax.sql.DataSource;
  */
 
 @Configuration
-@EnableJpaRepositories(value = "org.hbp.mip.repositories")
-@EntityScan(basePackages = "org.hbp.mip.model")
+@EnableJpaRepositories(value = "eu.hbp.mip.repositories")
+@EntityScan(basePackages = "eu.hbp.mip.model")
 public class PersistenceConfiguration {
 
     @Autowired
diff --git a/src/main/java/org/hbp/mip/configuration/SecurityConfiguration.java b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
similarity index 97%
rename from src/main/java/org/hbp/mip/configuration/SecurityConfiguration.java
rename to src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
index f8d78b38f..7f076ab80 100644
--- a/src/main/java/org/hbp/mip/configuration/SecurityConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
@@ -1,14 +1,14 @@
-package org.hbp.mip.configuration;
+package eu.hbp.mip.configuration;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import eu.hbp.mip.controllers.ArticlesApi;
+import eu.hbp.mip.utils.CORSFilter;
 import io.swagger.annotations.ApiParam;
 import org.apache.log4j.Logger;
-import org.hbp.mip.controllers.ArticlesApi;
-import org.hbp.mip.model.User;
-import org.hbp.mip.repositories.UserRepository;
-import org.hbp.mip.utils.CORSFilter;
-import org.hbp.mip.utils.CustomLoginUrlAuthenticationEntryPoint;
+import eu.hbp.mip.model.User;
+import eu.hbp.mip.repositories.UserRepository;
+import eu.hbp.mip.utils.CustomLoginUrlAuthenticationEntryPoint;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.security.oauth2.resource.ResourceServerProperties;
diff --git a/src/main/java/org/hbp/mip/configuration/WebConfiguration.java b/src/main/java/eu/hbp/mip/configuration/WebConfiguration.java
similarity index 91%
rename from src/main/java/org/hbp/mip/configuration/WebConfiguration.java
rename to src/main/java/eu/hbp/mip/configuration/WebConfiguration.java
index 888fbd1e7..96826c1a6 100644
--- a/src/main/java/org/hbp/mip/configuration/WebConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/WebConfiguration.java
@@ -1,4 +1,4 @@
-package org.hbp.mip.configuration;
+package eu.hbp.mip.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -29,7 +29,7 @@ public class WebConfiguration {
     public Docket documentation() {
         return new Docket(DocumentationType.SWAGGER_2)
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("org.hbp.mip.controllers"))
+                .apis(RequestHandlerSelectors.basePackage("eu.hbp.mip.controllers"))
                 .build()
                 .pathMapping("/")
                 .apiInfo(metadata());
diff --git a/src/main/java/org/hbp/mip/controllers/AppsApi.java b/src/main/java/eu/hbp/mip/controllers/AppsApi.java
similarity index 88%
rename from src/main/java/org/hbp/mip/controllers/AppsApi.java
rename to src/main/java/eu/hbp/mip/controllers/AppsApi.java
index 351a2efb0..0bc610aca 100644
--- a/src/main/java/org/hbp/mip/controllers/AppsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/AppsApi.java
@@ -2,17 +2,17 @@
  * Created by mirco on 20.05.16.
  */
 
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
 
+import eu.hbp.mip.configuration.SecurityConfiguration;
+import eu.hbp.mip.repositories.AppRepository;
 import io.swagger.annotations.*;
 import org.apache.log4j.Logger;
-import org.hbp.mip.configuration.SecurityConfiguration;
-import org.hbp.mip.model.App;
-import org.hbp.mip.model.User;
-import org.hbp.mip.model.Vote;
-import org.hbp.mip.repositories.AppRepository;
-import org.hbp.mip.repositories.UserRepository;
-import org.hbp.mip.repositories.VoteRepository;
+import eu.hbp.mip.model.App;
+import eu.hbp.mip.model.User;
+import eu.hbp.mip.model.Vote;
+import eu.hbp.mip.repositories.UserRepository;
+import eu.hbp.mip.repositories.VoteRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/org/hbp/mip/controllers/ArticlesApi.java b/src/main/java/eu/hbp/mip/controllers/ArticlesApi.java
similarity index 96%
rename from src/main/java/org/hbp/mip/controllers/ArticlesApi.java
rename to src/main/java/eu/hbp/mip/controllers/ArticlesApi.java
index 83eed7133..0b85ff02c 100644
--- a/src/main/java/org/hbp/mip/controllers/ArticlesApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ArticlesApi.java
@@ -2,16 +2,16 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
 
 
 import com.github.slugify.Slugify;
+import eu.hbp.mip.model.Article;
 import io.swagger.annotations.*;
 import org.apache.log4j.Logger;
-import org.hbp.mip.configuration.SecurityConfiguration;
-import org.hbp.mip.model.Article;
-import org.hbp.mip.model.User;
-import org.hbp.mip.repositories.ArticleRepository;
+import eu.hbp.mip.configuration.SecurityConfiguration;
+import eu.hbp.mip.model.User;
+import eu.hbp.mip.repositories.ArticleRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/org/hbp/mip/controllers/DatasetsApi.java b/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java
similarity index 90%
rename from src/main/java/org/hbp/mip/controllers/DatasetsApi.java
rename to src/main/java/eu/hbp/mip/controllers/DatasetsApi.java
index 05fc11d6a..e82c226bd 100644
--- a/src/main/java/org/hbp/mip/controllers/DatasetsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java
@@ -2,12 +2,12 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
 
 
 import io.swagger.annotations.*;
-import org.hbp.mip.model.Dataset;
-import org.hbp.mip.repositories.DatasetRepository;
+import eu.hbp.mip.model.Dataset;
+import eu.hbp.mip.repositories.DatasetRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/src/main/java/org/hbp/mip/controllers/ExperimentApi.java b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
similarity index 97%
rename from src/main/java/org/hbp/mip/controllers/ExperimentApi.java
rename to src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
index 99275314d..c472f0760 100644
--- a/src/main/java/org/hbp/mip/controllers/ExperimentApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
@@ -1,16 +1,16 @@
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
 
 import com.google.common.collect.Lists;
 import com.google.gson.*;
+import eu.hbp.mip.configuration.SecurityConfiguration;
+import eu.hbp.mip.model.User;
+import eu.hbp.mip.utils.HTTPUtil;
 import io.swagger.annotations.*;
 import org.apache.log4j.Logger;
-import org.hbp.mip.configuration.SecurityConfiguration;
-import org.hbp.mip.model.Experiment;
-import org.hbp.mip.model.User;
-import org.hbp.mip.repositories.ExperimentRepository;
-import org.hbp.mip.repositories.ModelRepository;
-import org.hbp.mip.utils.HTTPUtil;
-import org.hbp.mip.utils.JSONUtil;
+import eu.hbp.mip.model.Experiment;
+import eu.hbp.mip.repositories.ExperimentRepository;
+import eu.hbp.mip.repositories.ModelRepository;
+import eu.hbp.mip.utils.JSONUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
diff --git a/src/main/java/org/hbp/mip/controllers/GroupsApi.java b/src/main/java/eu/hbp/mip/controllers/GroupsApi.java
similarity index 91%
rename from src/main/java/org/hbp/mip/controllers/GroupsApi.java
rename to src/main/java/eu/hbp/mip/controllers/GroupsApi.java
index 48574e48c..ead40a093 100644
--- a/src/main/java/org/hbp/mip/controllers/GroupsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/GroupsApi.java
@@ -2,14 +2,14 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import org.hbp.mip.model.Group;
-import org.hbp.mip.repositories.GroupRepository;
+import eu.hbp.mip.model.Group;
+import eu.hbp.mip.repositories.GroupRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/org/hbp/mip/controllers/ModelsApi.java b/src/main/java/eu/hbp/mip/controllers/ModelsApi.java
similarity index 95%
rename from src/main/java/org/hbp/mip/controllers/ModelsApi.java
rename to src/main/java/eu/hbp/mip/controllers/ModelsApi.java
index 2570b9a67..31d736d2a 100644
--- a/src/main/java/org/hbp/mip/controllers/ModelsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ModelsApi.java
@@ -2,18 +2,21 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
 
 import com.github.slugify.Slugify;
+import eu.hbp.mip.configuration.SecurityConfiguration;
+import eu.hbp.mip.model.Filter;
+import eu.hbp.mip.model.Model;
+import eu.hbp.mip.model.User;
+import eu.hbp.mip.model.Variable;
+import eu.hbp.mip.repositories.ConfigRepository;
+import eu.hbp.mip.repositories.ModelRepository;
+import eu.hbp.mip.utils.CSVUtil;
 import io.swagger.annotations.*;
 import org.apache.log4j.Logger;
-import org.hbp.mip.configuration.SecurityConfiguration;
-import org.hbp.mip.model.*;
-import org.hbp.mip.repositories.ConfigRepository;
-import org.hbp.mip.repositories.DatasetRepository;
-import org.hbp.mip.repositories.ModelRepository;
-import org.hbp.mip.repositories.QueryRepository;
-import org.hbp.mip.utils.CSVUtil;
+import eu.hbp.mip.repositories.DatasetRepository;
+import eu.hbp.mip.repositories.QueryRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/org/hbp/mip/controllers/RequestsApi.java b/src/main/java/eu/hbp/mip/controllers/RequestsApi.java
similarity index 90%
rename from src/main/java/org/hbp/mip/controllers/RequestsApi.java
rename to src/main/java/eu/hbp/mip/controllers/RequestsApi.java
index 76527eba6..c3ace60ee 100644
--- a/src/main/java/org/hbp/mip/controllers/RequestsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/RequestsApi.java
@@ -2,12 +2,12 @@
  * Created by mirco on 18.01.16.
  */
 
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
 
 import io.swagger.annotations.*;
-import org.hbp.mip.model.Dataset;
-import org.hbp.mip.model.Query;
-import org.hbp.mip.utils.CSVUtil;
+import eu.hbp.mip.model.Dataset;
+import eu.hbp.mip.model.Query;
+import eu.hbp.mip.utils.CSVUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/src/main/java/org/hbp/mip/controllers/StatsApi.java b/src/main/java/eu/hbp/mip/controllers/StatsApi.java
similarity index 87%
rename from src/main/java/org/hbp/mip/controllers/StatsApi.java
rename to src/main/java/eu/hbp/mip/controllers/StatsApi.java
index 3f6883f28..4dd13b39d 100644
--- a/src/main/java/org/hbp/mip/controllers/StatsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/StatsApi.java
@@ -2,16 +2,16 @@
  * Created by mirco on 18.01.16.
  */
 
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
 
+import eu.hbp.mip.repositories.VariableRepository;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import org.hbp.mip.model.GeneralStats;
-import org.hbp.mip.repositories.ArticleRepository;
-import org.hbp.mip.repositories.UserRepository;
-import org.hbp.mip.repositories.VariableRepository;
+import eu.hbp.mip.model.GeneralStats;
+import eu.hbp.mip.repositories.ArticleRepository;
+import eu.hbp.mip.repositories.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/org/hbp/mip/controllers/UsersApi.java b/src/main/java/eu/hbp/mip/controllers/UsersApi.java
similarity index 91%
rename from src/main/java/org/hbp/mip/controllers/UsersApi.java
rename to src/main/java/eu/hbp/mip/controllers/UsersApi.java
index eabeffca1..7859a669a 100644
--- a/src/main/java/org/hbp/mip/controllers/UsersApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/UsersApi.java
@@ -2,11 +2,11 @@
  * Created by mirco on 14.01.16.
  */
 
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
 
 import io.swagger.annotations.*;
-import org.hbp.mip.model.User;
-import org.hbp.mip.repositories.UserRepository;
+import eu.hbp.mip.model.User;
+import eu.hbp.mip.repositories.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/src/main/java/org/hbp/mip/controllers/VariablesApi.java b/src/main/java/eu/hbp/mip/controllers/VariablesApi.java
similarity index 95%
rename from src/main/java/org/hbp/mip/controllers/VariablesApi.java
rename to src/main/java/eu/hbp/mip/controllers/VariablesApi.java
index b5f2d72f2..77cfc404a 100644
--- a/src/main/java/org/hbp/mip/controllers/VariablesApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/VariablesApi.java
@@ -2,13 +2,13 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
 
 
+import eu.hbp.mip.repositories.VariableRepository;
 import io.swagger.annotations.*;
-import org.hbp.mip.model.Value;
-import org.hbp.mip.model.Variable;
-import org.hbp.mip.repositories.VariableRepository;
+import eu.hbp.mip.model.Value;
+import eu.hbp.mip.model.Variable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/org/hbp/mip/model/App.java b/src/main/java/eu/hbp/mip/model/App.java
similarity index 98%
rename from src/main/java/org/hbp/mip/model/App.java
rename to src/main/java/eu/hbp/mip/model/App.java
index c328c36ca..8629865a8 100644
--- a/src/main/java/org/hbp/mip/model/App.java
+++ b/src/main/java/eu/hbp/mip/model/App.java
@@ -2,7 +2,7 @@
  * Created by mirco on 20.05.16.
  */
 
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/src/main/java/org/hbp/mip/model/Article.java b/src/main/java/eu/hbp/mip/model/Article.java
similarity index 99%
rename from src/main/java/org/hbp/mip/model/Article.java
rename to src/main/java/eu/hbp/mip/model/Article.java
index b7821db0c..508ad89c4 100644
--- a/src/main/java/org/hbp/mip/model/Article.java
+++ b/src/main/java/eu/hbp/mip/model/Article.java
@@ -2,7 +2,7 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/hbp/mip/model/Config.java b/src/main/java/eu/hbp/mip/model/Config.java
similarity index 98%
rename from src/main/java/org/hbp/mip/model/Config.java
rename to src/main/java/eu/hbp/mip/model/Config.java
index 08bed8979..d950d5074 100644
--- a/src/main/java/org/hbp/mip/model/Config.java
+++ b/src/main/java/eu/hbp/mip/model/Config.java
@@ -2,7 +2,7 @@
  * Created by mirco on 25.02.16.
  */
 
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
diff --git a/src/main/java/org/hbp/mip/model/Dataset.java b/src/main/java/eu/hbp/mip/model/Dataset.java
similarity index 98%
rename from src/main/java/org/hbp/mip/model/Dataset.java
rename to src/main/java/eu/hbp/mip/model/Dataset.java
index 023cecf06..f0dab7c4b 100644
--- a/src/main/java/org/hbp/mip/model/Dataset.java
+++ b/src/main/java/eu/hbp/mip/model/Dataset.java
@@ -2,7 +2,7 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
diff --git a/src/main/java/org/hbp/mip/model/ExaremeQueryElement.java b/src/main/java/eu/hbp/mip/model/ExaremeQueryElement.java
similarity index 96%
rename from src/main/java/org/hbp/mip/model/ExaremeQueryElement.java
rename to src/main/java/eu/hbp/mip/model/ExaremeQueryElement.java
index dba6d6269..0b7005c19 100644
--- a/src/main/java/org/hbp/mip/model/ExaremeQueryElement.java
+++ b/src/main/java/eu/hbp/mip/model/ExaremeQueryElement.java
@@ -1,4 +1,4 @@
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
diff --git a/src/main/java/org/hbp/mip/model/Experiment.java b/src/main/java/eu/hbp/mip/model/Experiment.java
similarity index 99%
rename from src/main/java/org/hbp/mip/model/Experiment.java
rename to src/main/java/eu/hbp/mip/model/Experiment.java
index f42ffbd6c..9fac6af17 100644
--- a/src/main/java/org/hbp/mip/model/Experiment.java
+++ b/src/main/java/eu/hbp/mip/model/Experiment.java
@@ -1,4 +1,4 @@
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/src/main/java/org/hbp/mip/model/Filter.java b/src/main/java/eu/hbp/mip/model/Filter.java
similarity index 98%
rename from src/main/java/org/hbp/mip/model/Filter.java
rename to src/main/java/eu/hbp/mip/model/Filter.java
index 27af1d69c..e55b405e9 100644
--- a/src/main/java/org/hbp/mip/model/Filter.java
+++ b/src/main/java/eu/hbp/mip/model/Filter.java
@@ -2,7 +2,7 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/src/main/java/org/hbp/mip/model/GeneralStats.java b/src/main/java/eu/hbp/mip/model/GeneralStats.java
similarity index 96%
rename from src/main/java/org/hbp/mip/model/GeneralStats.java
rename to src/main/java/eu/hbp/mip/model/GeneralStats.java
index b9366c013..8953828d4 100644
--- a/src/main/java/org/hbp/mip/model/GeneralStats.java
+++ b/src/main/java/eu/hbp/mip/model/GeneralStats.java
@@ -2,7 +2,7 @@
  * Created by mirco on 03.02.16.
  */
 
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
diff --git a/src/main/java/org/hbp/mip/model/Group.java b/src/main/java/eu/hbp/mip/model/Group.java
similarity index 98%
rename from src/main/java/org/hbp/mip/model/Group.java
rename to src/main/java/eu/hbp/mip/model/Group.java
index 32cf44f66..a77de2039 100644
--- a/src/main/java/org/hbp/mip/model/Group.java
+++ b/src/main/java/eu/hbp/mip/model/Group.java
@@ -2,7 +2,7 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/src/main/java/org/hbp/mip/model/Model.java b/src/main/java/eu/hbp/mip/model/Model.java
similarity index 94%
rename from src/main/java/org/hbp/mip/model/Model.java
rename to src/main/java/eu/hbp/mip/model/Model.java
index fb871152f..d788436a6 100644
--- a/src/main/java/org/hbp/mip/model/Model.java
+++ b/src/main/java/eu/hbp/mip/model/Model.java
@@ -2,7 +2,7 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.google.gson.annotations.Expose;
@@ -36,7 +36,7 @@ public class Model {
 
     @ManyToOne
     @Cascade(CascadeType.SAVE_UPDATE)
-    private Query query = null;
+    private eu.hbp.mip.model.Query query = null;
 
     @ManyToOne
     @Cascade(CascadeType.SAVE_UPDATE)
@@ -92,11 +92,11 @@ public class Model {
     }
 
 
-    public Query getQuery() {
+    public eu.hbp.mip.model.Query getQuery() {
         return query;
     }
 
-    public void setQuery(Query query) {
+    public void setQuery(eu.hbp.mip.model.Query query) {
         this.query = query;
     }
 
diff --git a/src/main/java/org/hbp/mip/model/Query.java b/src/main/java/eu/hbp/mip/model/Query.java
similarity index 99%
rename from src/main/java/org/hbp/mip/model/Query.java
rename to src/main/java/eu/hbp/mip/model/Query.java
index fddb0c7a7..61b979ff4 100644
--- a/src/main/java/org/hbp/mip/model/Query.java
+++ b/src/main/java/eu/hbp/mip/model/Query.java
@@ -2,7 +2,7 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/src/main/java/org/hbp/mip/model/Tag.java b/src/main/java/eu/hbp/mip/model/Tag.java
similarity index 95%
rename from src/main/java/org/hbp/mip/model/Tag.java
rename to src/main/java/eu/hbp/mip/model/Tag.java
index 6619bd75f..e09f86fc2 100644
--- a/src/main/java/org/hbp/mip/model/Tag.java
+++ b/src/main/java/eu/hbp/mip/model/Tag.java
@@ -2,7 +2,7 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
diff --git a/src/main/java/org/hbp/mip/model/User.java b/src/main/java/eu/hbp/mip/model/User.java
similarity index 99%
rename from src/main/java/org/hbp/mip/model/User.java
rename to src/main/java/eu/hbp/mip/model/User.java
index 7d12a47f5..11b6b8fd4 100644
--- a/src/main/java/org/hbp/mip/model/User.java
+++ b/src/main/java/eu/hbp/mip/model/User.java
@@ -2,7 +2,7 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/src/main/java/org/hbp/mip/model/Value.java b/src/main/java/eu/hbp/mip/model/Value.java
similarity index 96%
rename from src/main/java/org/hbp/mip/model/Value.java
rename to src/main/java/eu/hbp/mip/model/Value.java
index b9c2705c5..17ca49d52 100644
--- a/src/main/java/org/hbp/mip/model/Value.java
+++ b/src/main/java/eu/hbp/mip/model/Value.java
@@ -2,7 +2,7 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
diff --git a/src/main/java/org/hbp/mip/model/Variable.java b/src/main/java/eu/hbp/mip/model/Variable.java
similarity index 99%
rename from src/main/java/org/hbp/mip/model/Variable.java
rename to src/main/java/eu/hbp/mip/model/Variable.java
index 2bc6a37c8..1f8d58bd1 100644
--- a/src/main/java/org/hbp/mip/model/Variable.java
+++ b/src/main/java/eu/hbp/mip/model/Variable.java
@@ -2,7 +2,7 @@
  * Created by mirco on 04.12.15.
  */
 
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/src/main/java/org/hbp/mip/model/Vote.java b/src/main/java/eu/hbp/mip/model/Vote.java
similarity index 97%
rename from src/main/java/org/hbp/mip/model/Vote.java
rename to src/main/java/eu/hbp/mip/model/Vote.java
index b9981a8e9..8c7953784 100644
--- a/src/main/java/org/hbp/mip/model/Vote.java
+++ b/src/main/java/eu/hbp/mip/model/Vote.java
@@ -2,7 +2,7 @@
  * Created by mirco on 24.05.16.
  */
 
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
diff --git a/src/main/java/org/hbp/mip/repositories/AppRepository.java b/src/main/java/eu/hbp/mip/repositories/AppRepository.java
similarity index 73%
rename from src/main/java/org/hbp/mip/repositories/AppRepository.java
rename to src/main/java/eu/hbp/mip/repositories/AppRepository.java
index ba00367af..949e7b3f6 100644
--- a/src/main/java/org/hbp/mip/repositories/AppRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/AppRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
 
-import org.hbp.mip.model.App;
+import eu.hbp.mip.model.App;
 import org.springframework.data.repository.CrudRepository;
 
 /**
diff --git a/src/main/java/org/hbp/mip/repositories/ArticleRepository.java b/src/main/java/eu/hbp/mip/repositories/ArticleRepository.java
similarity index 77%
rename from src/main/java/org/hbp/mip/repositories/ArticleRepository.java
rename to src/main/java/eu/hbp/mip/repositories/ArticleRepository.java
index b27ecfaa4..4ad0e3942 100644
--- a/src/main/java/org/hbp/mip/repositories/ArticleRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/ArticleRepository.java
@@ -1,7 +1,7 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
 
-import org.hbp.mip.model.Article;
-import org.hbp.mip.model.User;
+import eu.hbp.mip.model.Article;
+import eu.hbp.mip.model.User;
 import org.springframework.data.repository.CrudRepository;
 
 /**
diff --git a/src/main/java/org/hbp/mip/repositories/ConfigRepository.java b/src/main/java/eu/hbp/mip/repositories/ConfigRepository.java
similarity index 72%
rename from src/main/java/org/hbp/mip/repositories/ConfigRepository.java
rename to src/main/java/eu/hbp/mip/repositories/ConfigRepository.java
index f54f37914..deb286150 100644
--- a/src/main/java/org/hbp/mip/repositories/ConfigRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/ConfigRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
 
-import org.hbp.mip.model.Config;
+import eu.hbp.mip.model.Config;
 import org.springframework.data.repository.CrudRepository;
 
 /**
diff --git a/src/main/java/org/hbp/mip/repositories/DatasetRepository.java b/src/main/java/eu/hbp/mip/repositories/DatasetRepository.java
similarity index 72%
rename from src/main/java/org/hbp/mip/repositories/DatasetRepository.java
rename to src/main/java/eu/hbp/mip/repositories/DatasetRepository.java
index 53883eb21..7c6da1e97 100644
--- a/src/main/java/org/hbp/mip/repositories/DatasetRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/DatasetRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
 
-import org.hbp.mip.model.Dataset;
+import eu.hbp.mip.model.Dataset;
 import org.springframework.data.repository.CrudRepository;
 
 /**
diff --git a/src/main/java/org/hbp/mip/repositories/ExperimentRepository.java b/src/main/java/eu/hbp/mip/repositories/ExperimentRepository.java
similarity index 75%
rename from src/main/java/org/hbp/mip/repositories/ExperimentRepository.java
rename to src/main/java/eu/hbp/mip/repositories/ExperimentRepository.java
index 3815879be..6609d6450 100644
--- a/src/main/java/org/hbp/mip/repositories/ExperimentRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/ExperimentRepository.java
@@ -1,7 +1,7 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
 
-import org.hbp.mip.model.Experiment;
-import org.hbp.mip.model.User;
+import eu.hbp.mip.model.Experiment;
+import eu.hbp.mip.model.User;
 import org.springframework.data.repository.CrudRepository;
 
 import java.util.UUID;
diff --git a/src/main/java/org/hbp/mip/repositories/FilterRepository.java b/src/main/java/eu/hbp/mip/repositories/FilterRepository.java
similarity index 72%
rename from src/main/java/org/hbp/mip/repositories/FilterRepository.java
rename to src/main/java/eu/hbp/mip/repositories/FilterRepository.java
index 7f4a15569..d8d8e5ff4 100644
--- a/src/main/java/org/hbp/mip/repositories/FilterRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/FilterRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
 
-import org.hbp.mip.model.Filter;
+import eu.hbp.mip.model.Filter;
 import org.springframework.data.repository.CrudRepository;
 
 /**
diff --git a/src/main/java/org/hbp/mip/repositories/GroupRepository.java b/src/main/java/eu/hbp/mip/repositories/GroupRepository.java
similarity index 72%
rename from src/main/java/org/hbp/mip/repositories/GroupRepository.java
rename to src/main/java/eu/hbp/mip/repositories/GroupRepository.java
index 548653269..ab6839f71 100644
--- a/src/main/java/org/hbp/mip/repositories/GroupRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/GroupRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
 
-import org.hbp.mip.model.Group;
+import eu.hbp.mip.model.Group;
 import org.springframework.data.repository.CrudRepository;
 
 /**
diff --git a/src/main/java/org/hbp/mip/repositories/ModelRepository.java b/src/main/java/eu/hbp/mip/repositories/ModelRepository.java
similarity index 79%
rename from src/main/java/org/hbp/mip/repositories/ModelRepository.java
rename to src/main/java/eu/hbp/mip/repositories/ModelRepository.java
index 9da1df5bd..de44afc6c 100644
--- a/src/main/java/org/hbp/mip/repositories/ModelRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/ModelRepository.java
@@ -1,7 +1,7 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
 
-import org.hbp.mip.model.Model;
-import org.hbp.mip.model.User;
+import eu.hbp.mip.model.Model;
+import eu.hbp.mip.model.User;
 import org.springframework.data.repository.CrudRepository;
 
 /**
diff --git a/src/main/java/org/hbp/mip/repositories/QueryRepository.java b/src/main/java/eu/hbp/mip/repositories/QueryRepository.java
similarity index 72%
rename from src/main/java/org/hbp/mip/repositories/QueryRepository.java
rename to src/main/java/eu/hbp/mip/repositories/QueryRepository.java
index 44dc9527b..f0b95d39c 100644
--- a/src/main/java/org/hbp/mip/repositories/QueryRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/QueryRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
 
-import org.hbp.mip.model.Query;
+import eu.hbp.mip.model.Query;
 import org.springframework.data.repository.CrudRepository;
 
 /**
diff --git a/src/main/java/org/hbp/mip/repositories/TagRepository.java b/src/main/java/eu/hbp/mip/repositories/TagRepository.java
similarity index 73%
rename from src/main/java/org/hbp/mip/repositories/TagRepository.java
rename to src/main/java/eu/hbp/mip/repositories/TagRepository.java
index 155d65d17..4edb4090e 100644
--- a/src/main/java/org/hbp/mip/repositories/TagRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/TagRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
 
-import org.hbp.mip.model.Tag;
+import eu.hbp.mip.model.Tag;
 import org.springframework.data.repository.CrudRepository;
 
 /**
diff --git a/src/main/java/org/hbp/mip/repositories/UserRepository.java b/src/main/java/eu/hbp/mip/repositories/UserRepository.java
similarity index 73%
rename from src/main/java/org/hbp/mip/repositories/UserRepository.java
rename to src/main/java/eu/hbp/mip/repositories/UserRepository.java
index 04338433f..3a0db7ee3 100644
--- a/src/main/java/org/hbp/mip/repositories/UserRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/UserRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
 
-import org.hbp.mip.model.User;
+import eu.hbp.mip.model.User;
 import org.springframework.data.repository.CrudRepository;
 
 /**
diff --git a/src/main/java/org/hbp/mip/repositories/ValueRepository.java b/src/main/java/eu/hbp/mip/repositories/ValueRepository.java
similarity index 72%
rename from src/main/java/org/hbp/mip/repositories/ValueRepository.java
rename to src/main/java/eu/hbp/mip/repositories/ValueRepository.java
index c3b088462..b41574d60 100644
--- a/src/main/java/org/hbp/mip/repositories/ValueRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/ValueRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
 
-import org.hbp.mip.model.Value;
+import eu.hbp.mip.model.Value;
 import org.springframework.data.repository.CrudRepository;
 
 /**
diff --git a/src/main/java/org/hbp/mip/repositories/VariableRepository.java b/src/main/java/eu/hbp/mip/repositories/VariableRepository.java
similarity index 72%
rename from src/main/java/org/hbp/mip/repositories/VariableRepository.java
rename to src/main/java/eu/hbp/mip/repositories/VariableRepository.java
index ac241ca7a..3a4e7e2f5 100644
--- a/src/main/java/org/hbp/mip/repositories/VariableRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/VariableRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
 
-import org.hbp.mip.model.Variable;
+import eu.hbp.mip.model.Variable;
 import org.springframework.data.repository.CrudRepository;
 
 /**
diff --git a/src/main/java/org/hbp/mip/repositories/VoteRepository.java b/src/main/java/eu/hbp/mip/repositories/VoteRepository.java
similarity index 64%
rename from src/main/java/org/hbp/mip/repositories/VoteRepository.java
rename to src/main/java/eu/hbp/mip/repositories/VoteRepository.java
index 78d760b9c..30499e551 100644
--- a/src/main/java/org/hbp/mip/repositories/VoteRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/VoteRepository.java
@@ -1,8 +1,8 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
 
-import org.hbp.mip.model.App;
-import org.hbp.mip.model.User;
-import org.hbp.mip.model.Vote;
+import eu.hbp.mip.model.App;
+import eu.hbp.mip.model.User;
+import eu.hbp.mip.model.Vote;
 import org.springframework.data.repository.CrudRepository;
 
 /**
diff --git a/src/main/java/org/hbp/mip/utils/CORSFilter.java b/src/main/java/eu/hbp/mip/utils/CORSFilter.java
similarity index 97%
rename from src/main/java/org/hbp/mip/utils/CORSFilter.java
rename to src/main/java/eu/hbp/mip/utils/CORSFilter.java
index 9feb2895d..ef3b35353 100644
--- a/src/main/java/org/hbp/mip/utils/CORSFilter.java
+++ b/src/main/java/eu/hbp/mip/utils/CORSFilter.java
@@ -1,4 +1,4 @@
-package org.hbp.mip.utils;
+package eu.hbp.mip.utils;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/main/java/org/hbp/mip/utils/CSVUtil.java b/src/main/java/eu/hbp/mip/utils/CSVUtil.java
similarity index 97%
rename from src/main/java/org/hbp/mip/utils/CSVUtil.java
rename to src/main/java/eu/hbp/mip/utils/CSVUtil.java
index a91d390ce..ce56b7935 100644
--- a/src/main/java/org/hbp/mip/utils/CSVUtil.java
+++ b/src/main/java/eu/hbp/mip/utils/CSVUtil.java
@@ -1,10 +1,10 @@
-package org.hbp.mip.utils;
+package eu.hbp.mip.utils;
 
+import eu.hbp.mip.repositories.VariableRepository;
 import org.apache.log4j.Logger;
-import org.hbp.mip.model.Dataset;
-import org.hbp.mip.model.Query;
-import org.hbp.mip.model.Variable;
-import org.hbp.mip.repositories.VariableRepository;
+import eu.hbp.mip.model.Dataset;
+import eu.hbp.mip.model.Query;
+import eu.hbp.mip.model.Variable;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.BufferedReader;
diff --git a/src/main/java/org/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java b/src/main/java/eu/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java
similarity index 96%
rename from src/main/java/org/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java
rename to src/main/java/eu/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java
index 437052aa8..45870c777 100644
--- a/src/main/java/org/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java
+++ b/src/main/java/eu/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java
@@ -1,4 +1,4 @@
-package org.hbp.mip.utils;
+package eu.hbp.mip.utils;
 
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
diff --git a/src/main/java/org/hbp/mip/utils/HTTPUtil.java b/src/main/java/eu/hbp/mip/utils/HTTPUtil.java
similarity index 98%
rename from src/main/java/org/hbp/mip/utils/HTTPUtil.java
rename to src/main/java/eu/hbp/mip/utils/HTTPUtil.java
index 0a524bb99..c641826e8 100644
--- a/src/main/java/org/hbp/mip/utils/HTTPUtil.java
+++ b/src/main/java/eu/hbp/mip/utils/HTTPUtil.java
@@ -1,4 +1,4 @@
-package org.hbp.mip.utils;
+package eu.hbp.mip.utils;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
diff --git a/src/main/java/org/hbp/mip/utils/JSONUtil.java b/src/main/java/eu/hbp/mip/utils/JSONUtil.java
similarity index 96%
rename from src/main/java/org/hbp/mip/utils/JSONUtil.java
rename to src/main/java/eu/hbp/mip/utils/JSONUtil.java
index 938cfbb70..82e466be0 100644
--- a/src/main/java/org/hbp/mip/utils/JSONUtil.java
+++ b/src/main/java/eu/hbp/mip/utils/JSONUtil.java
@@ -1,4 +1,4 @@
-package org.hbp.mip.utils;
+package eu.hbp.mip.utils;
 
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
diff --git a/src/test/java/eu/hbp/mip/MIPApplicationTests.java b/src/test/java/eu/hbp/mip/MIPApplicationTests.java
new file mode 100644
index 000000000..be4ef7d96
--- /dev/null
+++ b/src/test/java/eu/hbp/mip/MIPApplicationTests.java
@@ -0,0 +1,23 @@
+package eu.hbp.mip;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.GenericXmlContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(loader = GenericXmlContextLoader.class)
+public class MIPApplicationTests {
+
+    @Test
+    public void testHello()
+    {
+        /*
+        * NO UNIT TEST NEEDED FOR THIS COMPONENT
+        */
+
+        Assert.assertNotNull("test");
+    }
+}
diff --git a/src/test/java/org/hbp/mip/MIPApplicationTests.java b/src/test/java/org/hbp/mip/MIPApplicationTests.java
deleted file mode 100644
index 3beac4281..000000000
--- a/src/test/java/org/hbp/mip/MIPApplicationTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2012-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.hbp.mip;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.GenericXmlContextLoader;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(loader = GenericXmlContextLoader.class)
-public class MIPApplicationTests {
-
-    @Test
-    public void testHello()
-    {
-        Assert.assertNotNull("test");
-    }
-}
diff --git a/tests/test-build.sh b/tests/test-build.sh
index 39b78db4e..89b65881e 100755
--- a/tests/test-build.sh
+++ b/tests/test-build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ ! -f ./target/backend-services-DOCKER_BUILD.jar ]; then
+if [ ! -f ./target/portal-backend-DOCKER_BUILD.jar ]; then
     exit 1
 fi
 
-- 
GitLab