diff --git a/src/main/java/org/hbp/mip/MIPApplication.java b/src/main/java/org/hbp/mip/MIPApplication.java
index 49d12c4e6175cf4a63d5d0a64df0c4f14e1d3adf..cddf54dacfeb82daa7812d8a5bbab22018fca00c 100644
--- a/src/main/java/org/hbp/mip/MIPApplication.java
+++ b/src/main/java/org/hbp/mip/MIPApplication.java
@@ -23,6 +23,7 @@ package org.hbp.mip;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
+import org.hbp.mip.controllers.HibernateUtil;
import org.hbp.mip.model.User;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/hbp/mip/ApiException.java b/src/main/java/org/hbp/mip/controllers/ApiException.java
similarity index 90%
rename from src/main/java/org/hbp/mip/ApiException.java
rename to src/main/java/org/hbp/mip/controllers/ApiException.java
index 1db90dc1b2ed43d971e44a5d89b96a6525345e02..d0281b38a48edf8c7ca23d37ef198c1dc4558d4e 100644
--- a/src/main/java/org/hbp/mip/ApiException.java
+++ b/src/main/java/org/hbp/mip/controllers/ApiException.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-07T07:38:20.227Z")
public class ApiException extends Exception {
diff --git a/src/main/java/org/hbp/mip/ApiOriginFilter.java b/src/main/java/org/hbp/mip/controllers/ApiOriginFilter.java
similarity index 96%
rename from src/main/java/org/hbp/mip/ApiOriginFilter.java
rename to src/main/java/org/hbp/mip/controllers/ApiOriginFilter.java
index 947af9b6aeca7167f123b8b69efec6d7da110d7e..5e44e05b63c454e97448f7eaae52a72f905b57cd 100644
--- a/src/main/java/org/hbp/mip/ApiOriginFilter.java
+++ b/src/main/java/org/hbp/mip/controllers/ApiOriginFilter.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import javax.servlet.*;
import javax.servlet.http.HttpServletResponse;
diff --git a/src/main/java/org/hbp/mip/ApiResponseMessage.java b/src/main/java/org/hbp/mip/controllers/ApiResponseMessage.java
similarity index 97%
rename from src/main/java/org/hbp/mip/ApiResponseMessage.java
rename to src/main/java/org/hbp/mip/controllers/ApiResponseMessage.java
index 13659d6b993bb070d402571d085a6eef9b019c1a..a1f9ee33ff968329bd4d0cffc7412d48e0a29319 100644
--- a/src/main/java/org/hbp/mip/ApiResponseMessage.java
+++ b/src/main/java/org/hbp/mip/controllers/ApiResponseMessage.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import javax.xml.bind.annotation.XmlTransient;
diff --git a/src/main/java/org/hbp/mip/ArticlesApi.java b/src/main/java/org/hbp/mip/controllers/ArticlesApi.java
similarity index 98%
rename from src/main/java/org/hbp/mip/ArticlesApi.java
rename to src/main/java/org/hbp/mip/controllers/ArticlesApi.java
index c2f06bb2aaa589f31945963c724a53394b5d1d67..9f361a3823569a74d6dfde0ead603c5984de461e 100644
--- a/src/main/java/org/hbp/mip/ArticlesApi.java
+++ b/src/main/java/org/hbp/mip/controllers/ArticlesApi.java
@@ -1,7 +1,8 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import io.swagger.annotations.*;
+import org.hbp.mip.MIPApplication;
import org.hbp.mip.model.Article;
import org.hbp.mip.model.User;
import org.hibernate.Session;
diff --git a/src/main/java/org/hbp/mip/DatasetsApi.java b/src/main/java/org/hbp/mip/controllers/DatasetsApi.java
similarity index 98%
rename from src/main/java/org/hbp/mip/DatasetsApi.java
rename to src/main/java/org/hbp/mip/controllers/DatasetsApi.java
index 35a24ba7bfcf573f6bfe19b61326308f39c84d8e..5d9b69e045285e9db5af0868961243497f0579e7 100644
--- a/src/main/java/org/hbp/mip/DatasetsApi.java
+++ b/src/main/java/org/hbp/mip/controllers/DatasetsApi.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import io.swagger.annotations.*;
diff --git a/src/main/java/org/hbp/mip/GroupsApi.java b/src/main/java/org/hbp/mip/controllers/GroupsApi.java
similarity index 98%
rename from src/main/java/org/hbp/mip/GroupsApi.java
rename to src/main/java/org/hbp/mip/controllers/GroupsApi.java
index 83d7e04c9acadef20bf49a448e52c14d463daa3e..f0e281cda164715b1fa57569a0281b532c24f6a7 100644
--- a/src/main/java/org/hbp/mip/GroupsApi.java
+++ b/src/main/java/org/hbp/mip/controllers/GroupsApi.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import io.swagger.annotations.Api;
diff --git a/src/main/java/org/hbp/mip/HibernateUtil.java b/src/main/java/org/hbp/mip/controllers/HibernateUtil.java
similarity index 97%
rename from src/main/java/org/hbp/mip/HibernateUtil.java
rename to src/main/java/org/hbp/mip/controllers/HibernateUtil.java
index 4732c8acdecdfc85c2a68efbc32c106327ccd1e6..2c2f6b4ed0cf27c9518acb4bdeb9293c51d33fc2 100644
--- a/src/main/java/org/hbp/mip/HibernateUtil.java
+++ b/src/main/java/org/hbp/mip/controllers/HibernateUtil.java
@@ -2,7 +2,7 @@
* Created by mirco on 07.12.15.
*/
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import org.hibernate.SessionFactory;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
diff --git a/src/main/java/org/hbp/mip/ModelsApi.java b/src/main/java/org/hbp/mip/controllers/ModelsApi.java
similarity index 99%
rename from src/main/java/org/hbp/mip/ModelsApi.java
rename to src/main/java/org/hbp/mip/controllers/ModelsApi.java
index b32be220c15e5f0240f90d6fef2ab29b26db7a2f..8f645508b81462964db33a9579e10309d25d7bd4 100644
--- a/src/main/java/org/hbp/mip/ModelsApi.java
+++ b/src/main/java/org/hbp/mip/controllers/ModelsApi.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import io.swagger.annotations.*;
diff --git a/src/main/java/org/hbp/mip/NotFoundException.java b/src/main/java/org/hbp/mip/controllers/NotFoundException.java
similarity index 90%
rename from src/main/java/org/hbp/mip/NotFoundException.java
rename to src/main/java/org/hbp/mip/controllers/NotFoundException.java
index d017a2525fd2f438bfb8c9a465d5027c1cf08458..6952e9d52c44f8389d06a8a406518dd54b42a582 100644
--- a/src/main/java/org/hbp/mip/NotFoundException.java
+++ b/src/main/java/org/hbp/mip/controllers/NotFoundException.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-07T07:38:20.227Z")
public class NotFoundException extends ApiException {
diff --git a/src/main/java/org/hbp/mip/VariablesApi.java b/src/main/java/org/hbp/mip/controllers/VariablesApi.java
similarity index 99%
rename from src/main/java/org/hbp/mip/VariablesApi.java
rename to src/main/java/org/hbp/mip/controllers/VariablesApi.java
index 75a3cfa9f20639658c35db386241b4313a0f99e4..0813f073fba44fa8b43531b5b2112d9cedad1ea3 100644
--- a/src/main/java/org/hbp/mip/VariablesApi.java
+++ b/src/main/java/org/hbp/mip/controllers/VariablesApi.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import io.swagger.annotations.*;
diff --git a/src/main/java/org/hbp/mip/mock/ArticleMock.java b/src/main/java/org/hbp/mip/mock/ArticleMock.java
deleted file mode 100644
index 472f7f0092d79b656e6e241e6385277a0e12be95..0000000000000000000000000000000000000000
--- a/src/main/java/org/hbp/mip/mock/ArticleMock.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Created by mirco on 04.12.15.
- */
-
-package org.hbp.mip.mock;
-
-import org.hbp.mip.model.Article;
-import org.hbp.mip.model.User;
-
-import java.util.Date;
-
-public class ArticleMock extends Article {
- public ArticleMock(int id) {
- Date currentDate = new Date();
- User currentUser = new UserMock(1);
- switch (id) {
- case 1:
- this.setTitle("Test1");
- this.setStatus("published");
- this.setSlug("test1");
- /*this.setPublishedAt(currentDate);
- this.setUpdatedAt(currentDate);
- this.setTags(new LinkedList<>());*/
- this.setAbstract("This is a first test article.");
- this.setContent("<!DOCTYPE html><html><head></head><body><p>This is the content of my first test article.</p></body></html>");
- /*this.setCreatedAt(currentDate);
- this.setCreatedBy(currentUser);
- this.setUpdatedBy(currentUser);*/
- break;
- case 2:
- this.setTitle("Test2");
- this.setStatus("published");
- this.setSlug("test2");
- /*this.setPublishedAt(currentDate);
- this.setUpdatedAt(currentDate);
- this.setTags(new LinkedList<>());*/
- this.setAbstract("This is a second test article.");
- this.setContent("<!DOCTYPE html><html><head></head><body><p>This is the content of my second test article.</p></body></html>");
- /*this.setCreatedAt(currentDate);
- this.setCreatedBy(currentUser);
- this.setUpdatedBy(currentUser);*/
- break;
- }
- }
-}
diff --git a/src/main/java/org/hbp/mip/mock/ModelMock.java b/src/main/java/org/hbp/mip/mock/ModelMock.java
deleted file mode 100644
index 144274b64754a356a2a734f89023bdc5e706e34c..0000000000000000000000000000000000000000
--- a/src/main/java/org/hbp/mip/mock/ModelMock.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Created by mirco on 04.12.15.
- */
-
-package org.hbp.mip.mock;
-
-import org.hbp.mip.model.Model;
-
-
-public class ModelMock extends Model {
- public ModelMock(int id) {
- switch (id) {
- case 1:
- this.setTitle("Model1");
- break;
- }
- }
-}
diff --git a/src/main/java/org/hbp/mip/mock/UserMock.java b/src/main/java/org/hbp/mip/mock/UserMock.java
deleted file mode 100644
index 1d6656adfda488686e685ae84bcb3bf2bc30d34a..0000000000000000000000000000000000000000
--- a/src/main/java/org/hbp/mip/mock/UserMock.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Created by mirco on 04.12.15.
- */
-
-package org.hbp.mip.mock;
-
-import org.hbp.mip.model.User;
-
-public class UserMock extends User {
- public UserMock(int id) {
- switch (id) {
- case 1:
- this.setFirstname("Linda");
- this.setFullname("Linda DIB");
- this.setLastname("DIB");
- this.setPicture("images/users/Linda.jpg");
- this.setWeb("http://www.hbpproject.eu");
- this.setPhone("+33 6 00 00 00 00");
- this.setBirthday("1982-01-22");
- this.setGender("Female");
- this.addLanguage("French");
- this.addLanguage("English");
- this.setPassword("user");
- this.setEmail("l.dib@hbpproject.eu");
- this.setIsActive(true);
- this.setApikey("kiliaanapikey");
- this.setTeam("Scientist");
- this.addRole("ROLE_ADMIN");
- this.addRole("ROLE_SCIENTIST");
- break;
- }
- }
-}