diff --git a/pom.xml b/pom.xml
index f89f7bff3..33056834f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 		<version>1.5.1</version>
 	</parent>
 	<artifactId>data-model-lib</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
+	<version>1.7.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Data Model Library</name>
 	<url>http://github.com/qbicsoftware/data-model-lib</url>
diff --git a/src/main/groovy/life/qbic/datamodel/services/Address.groovy b/src/main/groovy/life/qbic/datamodel/people/Address.groovy
similarity index 98%
rename from src/main/groovy/life/qbic/datamodel/services/Address.groovy
rename to src/main/groovy/life/qbic/datamodel/people/Address.groovy
index 2a8266331..e5cd70e8b 100755
--- a/src/main/groovy/life/qbic/datamodel/services/Address.groovy
+++ b/src/main/groovy/life/qbic/datamodel/people/Address.groovy
@@ -1,4 +1,4 @@
-package life.qbic.datamodel.services
+package life.qbic.datamodel.people
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/src/main/groovy/life/qbic/datamodel/services/Contact.groovy b/src/main/groovy/life/qbic/datamodel/people/Contact.groovy
similarity index 97%
rename from src/main/groovy/life/qbic/datamodel/services/Contact.groovy
rename to src/main/groovy/life/qbic/datamodel/people/Contact.groovy
index 71efc7dcc..3a158ebaa 100755
--- a/src/main/groovy/life/qbic/datamodel/services/Contact.groovy
+++ b/src/main/groovy/life/qbic/datamodel/people/Contact.groovy
@@ -1,4 +1,4 @@
-package life.qbic.datamodel.services;
+package life.qbic.datamodel.people;
 
 import javax.validation.Valid;
 
diff --git a/src/main/groovy/life/qbic/datamodel/services/Person.groovy b/src/main/groovy/life/qbic/datamodel/people/Person.groovy
similarity index 72%
rename from src/main/groovy/life/qbic/datamodel/services/Person.groovy
rename to src/main/groovy/life/qbic/datamodel/people/Person.groovy
index 1831f8c7c..51cd79ce4 100644
--- a/src/main/groovy/life/qbic/datamodel/services/Person.groovy
+++ b/src/main/groovy/life/qbic/datamodel/people/Person.groovy
@@ -1,12 +1,12 @@
-package life.qbic.datamodel.services;
+package life.qbic.datamodel.people;
 
-public class Person {
+class Person {
 
   private String firstName
   private String lastName
   private String email
 
-  public Person(String first, String last, String email) {
+  Person(String first, String last, String email) {
     this.firstName = first
     this.lastName = last
     this.email = email
diff --git a/src/main/groovy/life/qbic/datamodel/services/Location.groovy b/src/main/groovy/life/qbic/datamodel/samples/Location.groovy
similarity index 98%
rename from src/main/groovy/life/qbic/datamodel/services/Location.groovy
rename to src/main/groovy/life/qbic/datamodel/samples/Location.groovy
index e9c321284..d5fbadc68 100644
--- a/src/main/groovy/life/qbic/datamodel/services/Location.groovy
+++ b/src/main/groovy/life/qbic/datamodel/samples/Location.groovy
@@ -1,11 +1,11 @@
-package life.qbic.datamodel.services
+package life.qbic.datamodel.samples
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import life.qbic.datamodel.people.Address
+
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 
-import java.util.Date
-
 class Location  {
 
   private String name
diff --git a/src/main/groovy/life/qbic/datamodel/services/Sample.groovy b/src/main/groovy/life/qbic/datamodel/samples/Sample.groovy
similarity index 96%
rename from src/main/groovy/life/qbic/datamodel/services/Sample.groovy
rename to src/main/groovy/life/qbic/datamodel/samples/Sample.groovy
index 7264c16a3..69afacb3d 100644
--- a/src/main/groovy/life/qbic/datamodel/services/Sample.groovy
+++ b/src/main/groovy/life/qbic/datamodel/samples/Sample.groovy
@@ -1,6 +1,5 @@
-package life.qbic.datamodel.services;
+package life.qbic.datamodel.samples
 
-import javax.validation.Valid;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/groovy/life/qbic/datamodel/services/Status.groovy b/src/main/groovy/life/qbic/datamodel/samples/Status.groovy
similarity index 73%
rename from src/main/groovy/life/qbic/datamodel/services/Status.groovy
rename to src/main/groovy/life/qbic/datamodel/samples/Status.groovy
index 99a781d9a..9332658e8 100644
--- a/src/main/groovy/life/qbic/datamodel/services/Status.groovy
+++ b/src/main/groovy/life/qbic/datamodel/samples/Status.groovy
@@ -1,4 +1,4 @@
-package life.qbic.datamodel.services;
+package life.qbic.datamodel.samples;
 
 public enum Status {
   WAITING, PROCESSING, PROCESSED, FAILED_QC, DATA_AT_QBIC, METADATA_REGISTERED
diff --git a/src/main/groovy/life/qbic/datamodel/services/ServiceUser.groovy b/src/main/groovy/life/qbic/datamodel/services/ServiceUser.groovy
new file mode 100644
index 000000000..77ad56e9c
--- /dev/null
+++ b/src/main/groovy/life/qbic/datamodel/services/ServiceUser.groovy
@@ -0,0 +1,9 @@
+package life.qbic.datamodel.services
+
+class ServiceUser {
+
+    public String name
+
+    public String password
+
+}