diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/UnderDevelopment.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/UnderDevelopment.scala
similarity index 94%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/UnderDevelopment.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/UnderDevelopment.scala
index f117a4381c401c1665a6b26fb57e84101fdfb048..0aeb029fc256471cc32a4f46826bf036126932e6 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/UnderDevelopment.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/UnderDevelopment.scala
@@ -1,8 +1,8 @@
-package integrated_pipeline_end_to_end_tests
+package eu.nomad_lab.integrated_pipeline_end_to_end_tests
 
 import eu.nomad_lab.TreeType
 import eu.nomad_lab.integrated_pipeline.{ Main, OutputType }
-import integrated_pipeline_tests.EndToEnd
+import eu.nomad_lab.integrated_pipeline_tests.EndToEnd
 import org.scalatest.AsyncWordSpec
 
 /**
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/WorkingFeatures.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/WorkingFeatures.scala
similarity index 96%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/WorkingFeatures.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/WorkingFeatures.scala
index 1761e67015cfc1f3c9437bc83a658031082b2c43..6369a8d124abfa728ab28744643608357f74c4b2 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/WorkingFeatures.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/WorkingFeatures.scala
@@ -1,8 +1,8 @@
-package integrated_pipeline_end_to_end_tests
+package eu.nomad_lab.integrated_pipeline_end_to_end_tests
 
 import eu.nomad_lab.TreeType
 import eu.nomad_lab.integrated_pipeline.{ Main, OutputType }
-import integrated_pipeline_tests.EndToEnd
+import eu.nomad_lab.integrated_pipeline_tests.EndToEnd
 import org.scalatest.AsyncWordSpec
 
 /**
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/package.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/package.scala
similarity index 99%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/package.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/package.scala
index 1446956f86a1e550bbe7ceb6c15e5d1b939a14ad..e1042c5086b568d1ab5600b1e3cd1598197ebe3e 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/package.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/package.scala
@@ -1,3 +1,5 @@
+package eu.nomad_lab
+
 import java.nio.file.{ Path, Paths }
 
 import eu.nomad_lab.JsonSupport.formats
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/ArchiveHandlerSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ArchiveHandlerSpec.scala
similarity index 98%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/ArchiveHandlerSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ArchiveHandlerSpec.scala
index 2bd092e5783abcd0f24b1f666c0f9b2283706462..ad4050a3036f03e8d419f1c13d67cfc0d70f27df 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/ArchiveHandlerSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ArchiveHandlerSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.Paths
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/ArchiveUnpackingFlowSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ArchiveUnpackingFlowSpec.scala
similarity index 98%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/ArchiveUnpackingFlowSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ArchiveUnpackingFlowSpec.scala
index 8eda29e856a8be476fd7aabb63cdad0b42a9f856..d38c556132e2113c4cd05b7c64bd91e17147bd10 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/ArchiveUnpackingFlowSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ArchiveUnpackingFlowSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.Paths
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/Builders.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/Builders.scala
similarity index 96%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/Builders.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/Builders.scala
index 3c124b250c524489421227933fbc56735a5490a4..58ea96be55c45bdbfef8c4d649865a183937e025 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/Builders.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/Builders.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.{ Path, Paths }
 
@@ -7,7 +7,7 @@ import eu.nomad_lab.TreeType.TreeType
 import eu.nomad_lab.integrated_pipeline.messages._
 import eu.nomad_lab.parsers.ParseResult.ParseResult
 import eu.nomad_lab.parsers._
-import integrated_pipeline_tests.Builders._
+import eu.nomad_lab.integrated_pipeline_tests.Builders._
 
 trait TestDataBuilders {
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/CalculationParsingEngineSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingEngineSpec.scala
similarity index 99%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/CalculationParsingEngineSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingEngineSpec.scala
index 4e6d43015c2a1962ce87da054c2530e6d161d587..c6eeeab058e7bdd51f20dd97895d6c4a4e195055 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/CalculationParsingEngineSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingEngineSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.Paths
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/CalculationParsingFlowSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingFlowSpec.scala
similarity index 99%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/CalculationParsingFlowSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingFlowSpec.scala
index 9564a348ffb239076dc185276db276394a390871..153a5392262e05f21b83e9dfb92504b10d107e01 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/CalculationParsingFlowSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingFlowSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.Paths
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/MessageMatchers.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/MessageMatchers.scala
similarity index 98%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/MessageMatchers.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/MessageMatchers.scala
index 89d60c18ac68d8b814ab63253587f6b805f98b20..7517c47c2a345f83cd3ac81c9118dd15bf52ed79 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/MessageMatchers.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/MessageMatchers.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.{ Path, Paths }
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/ParsingResultsProcessorFlowSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ParsingResultsProcessorFlowSpec.scala
similarity index 99%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/ParsingResultsProcessorFlowSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ParsingResultsProcessorFlowSpec.scala
index 3ba0765d5d3b85349cde56baee1e8d658e68e90a..6fde2894632739eddbd1c483f0139b4ce0372867 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/ParsingResultsProcessorFlowSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ParsingResultsProcessorFlowSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.{ Path, Paths }
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/StreamAssertions.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/StreamAssertions.scala
similarity index 98%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/StreamAssertions.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/StreamAssertions.scala
index 4e72815529a3cbd6f3c3351550856e2308535766..9b9f10cfe48e543ee1c15b2b4328925979581504 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/StreamAssertions.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/StreamAssertions.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import akka.stream.testkit.TestSubscriber
 import akka.stream.testkit.TestSubscriber.{ OnComplete, OnError, OnNext, OnSubscribe }
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/TreeParserFlowSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/TreeParserFlowSpec.scala
similarity index 99%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/TreeParserFlowSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/TreeParserFlowSpec.scala
index 74c10f55a538633d449e7f09b15fb8ec69d1694a..5a0b48f2f2a796385a53aec69c17c0baeaf5a5dd 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/TreeParserFlowSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/TreeParserFlowSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.Paths
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/TreeParsingRequestGeneratorSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/TreeParsingRequestGeneratorSpec.scala
similarity index 98%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/TreeParsingRequestGeneratorSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/TreeParsingRequestGeneratorSpec.scala
index 3b33c53dc02ae422449c585290813efd423e27b3..7b4852afb47f33ea92680f00bcfa590722843547 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/TreeParsingRequestGeneratorSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/TreeParsingRequestGeneratorSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import eu.nomad_lab.QueueMessage.TreeParserRequest
 import eu.nomad_lab.TreeType.TreeType
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToHDF5MergedResultsProcessorSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToHDF5MergedResultsProcessorSpec.scala
similarity index 98%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToHDF5MergedResultsProcessorSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToHDF5MergedResultsProcessorSpec.scala
index e6d818591fe5c29bceab1dcfa12673520df04fd3..cd7239e27aaa7085324795b4a5cd8f0fcc537f1b 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToHDF5MergedResultsProcessorSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToHDF5MergedResultsProcessorSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.Paths
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToHDF5ResultsProcessorSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToHDF5ResultsProcessorSpec.scala
similarity index 97%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToHDF5ResultsProcessorSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToHDF5ResultsProcessorSpec.scala
index 39aee0752132f4d95e38c6572c6560165904aab8..8b3cb1d5ff242e6fe81aff91660a6315793bb5b1 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToHDF5ResultsProcessorSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToHDF5ResultsProcessorSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.Paths
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToJsonResultsProcessorSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToJsonResultsProcessorSpec.scala
similarity index 97%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToJsonResultsProcessorSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToJsonResultsProcessorSpec.scala
index 3088717bfca1cd48753e174bfb90fed8a833dbba..e84e2120467748152c5c1082532d9798e39b1fac 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToJsonResultsProcessorSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToJsonResultsProcessorSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.{ Files, Paths }
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/package.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/package.scala
similarity index 99%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/package.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/package.scala
index cf71ef1618f919cf5cf5fe4c6b2eb9e0fc8de4f1..f19395127d39a373fdf37ed2b2d6686c8786815f 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/package.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/package.scala
@@ -1,3 +1,5 @@
+package eu.nomad_lab
+
 import java.nio.file.{ Files, Path, Paths }
 
 import akka.actor.ActorSystem