diff --git a/retorch-orchestration/src/main/java/giis/retorch/orchestration/testdata/EmptyInputException.java b/retorch-orchestration/src/main/java/giis/retorch/orchestration/classifier/EmptyInputException.java
similarity index 92%
rename from retorch-orchestration/src/main/java/giis/retorch/orchestration/testdata/EmptyInputException.java
rename to retorch-orchestration/src/main/java/giis/retorch/orchestration/classifier/EmptyInputException.java
index 911df5e..67778bf 100644
--- a/retorch-orchestration/src/main/java/giis/retorch/orchestration/testdata/EmptyInputException.java
+++ b/retorch-orchestration/src/main/java/giis/retorch/orchestration/classifier/EmptyInputException.java
@@ -1,4 +1,4 @@
-package giis.retorch.orchestration.testdata;
+package giis.retorch.orchestration.classifier;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/retorch-orchestration/src/main/java/giis/retorch/orchestration/testdata/ResourceSerializer.java b/retorch-orchestration/src/main/java/giis/retorch/orchestration/classifier/ResourceSerializer.java
similarity index 99%
rename from retorch-orchestration/src/main/java/giis/retorch/orchestration/testdata/ResourceSerializer.java
rename to retorch-orchestration/src/main/java/giis/retorch/orchestration/classifier/ResourceSerializer.java
index cdd67c6..17ad322 100644
--- a/retorch-orchestration/src/main/java/giis/retorch/orchestration/testdata/ResourceSerializer.java
+++ b/retorch-orchestration/src/main/java/giis/retorch/orchestration/classifier/ResourceSerializer.java
@@ -1,4 +1,4 @@
-package giis.retorch.orchestration.testdata;
+package giis.retorch.orchestration.classifier;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/retorch-orchestration/src/main/java/giis/retorch/orchestration/testdata/RetorchClassifier.java b/retorch-orchestration/src/main/java/giis/retorch/orchestration/classifier/RetorchClassifier.java
similarity index 99%
rename from retorch-orchestration/src/main/java/giis/retorch/orchestration/testdata/RetorchClassifier.java
rename to retorch-orchestration/src/main/java/giis/retorch/orchestration/classifier/RetorchClassifier.java
index 72bb10d..7c776be 100644
--- a/retorch-orchestration/src/main/java/giis/retorch/orchestration/testdata/RetorchClassifier.java
+++ b/retorch-orchestration/src/main/java/giis/retorch/orchestration/classifier/RetorchClassifier.java
@@ -1,4 +1,4 @@
-package giis.retorch.orchestration.testdata;
+package giis.retorch.orchestration.classifier;
 
 import giis.retorch.annotations.AccessModes;
 import giis.retorch.orchestration.model.*;
diff --git a/retorch-orchestration/src/test/java/giis/retorch/orchestration/ClassifierTests.java b/retorch-orchestration/src/test/java/giis/retorch/orchestration/ClassifierTests.java
index 5bcca76..7205ebd 100644
--- a/retorch-orchestration/src/test/java/giis/retorch/orchestration/ClassifierTests.java
+++ b/retorch-orchestration/src/test/java/giis/retorch/orchestration/ClassifierTests.java
@@ -4,10 +4,9 @@
 import ch.qos.logback.classic.spi.LoggingEvent;
 import ch.qos.logback.core.Appender;
 import giis.retorch.orchestration.model.System;
-import giis.retorch.orchestration.testdata.EmptyInputException;
-import giis.retorch.orchestration.testdata.RetorchClassifier;
+import giis.retorch.orchestration.classifier.EmptyInputException;
+import giis.retorch.orchestration.classifier.RetorchClassifier;
 import giis.retorch.orchestration.testdata.SyntheticInvalidClassTests;
-import giis.retorch.orchestration.utils.ClassifierUtils;
 import giis.retorch.orchestration.testdata.synteticpackage.insidepackage.SyntheticClassOneTests;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/retorch-orchestration/src/test/java/giis/retorch/orchestration/utils/ClassifierUtils.java b/retorch-orchestration/src/test/java/giis/retorch/orchestration/ClassifierUtils.java
similarity index 99%
rename from retorch-orchestration/src/test/java/giis/retorch/orchestration/utils/ClassifierUtils.java
rename to retorch-orchestration/src/test/java/giis/retorch/orchestration/ClassifierUtils.java
index 3f34597..261bcc2 100644
--- a/retorch-orchestration/src/test/java/giis/retorch/orchestration/utils/ClassifierUtils.java
+++ b/retorch-orchestration/src/test/java/giis/retorch/orchestration/ClassifierUtils.java
@@ -1,4 +1,4 @@
-package giis.retorch.orchestration.utils;
+package giis.retorch.orchestration;
 
 import giis.retorch.orchestration.model.*;
 import giis.retorch.orchestration.model.System;
diff --git a/retorch-orchestration/src/test/java/giis/retorch/orchestration/utils/GenericUtils.java b/retorch-orchestration/src/test/java/giis/retorch/orchestration/GenericUtils.java
similarity index 99%
rename from retorch-orchestration/src/test/java/giis/retorch/orchestration/utils/GenericUtils.java
rename to retorch-orchestration/src/test/java/giis/retorch/orchestration/GenericUtils.java
index 8bf8590..bb597ce 100644
--- a/retorch-orchestration/src/test/java/giis/retorch/orchestration/utils/GenericUtils.java
+++ b/retorch-orchestration/src/test/java/giis/retorch/orchestration/GenericUtils.java
@@ -1,4 +1,4 @@
-package giis.retorch.orchestration.utils;
+package giis.retorch.orchestration;
 
 import giis.retorch.orchestration.model.*;
 
diff --git a/sonar-project.properties b/sonar-project.properties
index 7f3a717..d838fa9 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -2,7 +2,7 @@ sonar.projectKey=my:retorch
 sonar.projectName=retorch
 sonar.organization=giis
 sonar.projectVersion=1.0
-sonar.java.source=1.8
+sonar.java.source=16
 sonar.modules=retorch-annotations,retorch-orchestration
 sonar.sources=src/main/java
 sonar.sourceEncoding=UTF-8