diff --git a/pom.xml b/pom.xml
index 364c8554a00caefa12c8d327034a635657b1079a..003c4f2aadb67e3577968cbb7921f2c08442f075 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
          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.cern.nile</groupId>
+    <groupId>ch.cern.nile</groupId>
     <artifactId>nile-common</artifactId>
     <version>1.0.0</version>
 
diff --git a/src/main/java/org/cern/nile/common/clients/KafkaStreamsClient.java b/src/main/java/ch/cern/nile/common/clients/KafkaStreamsClient.java
similarity index 93%
rename from src/main/java/org/cern/nile/common/clients/KafkaStreamsClient.java
rename to src/main/java/ch/cern/nile/common/clients/KafkaStreamsClient.java
index 15ca9944241c96b229f80be3a67b1ac8ecb8974c..74b490dc5eccac6f4c5c7c63be5d3583e20d5cd0 100644
--- a/src/main/java/org/cern/nile/common/clients/KafkaStreamsClient.java
+++ b/src/main/java/ch/cern/nile/common/clients/KafkaStreamsClient.java
@@ -1,8 +1,11 @@
-package org.cern.nile.common.clients;
+package ch.cern.nile.common.clients;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Properties;
+
+import ch.cern.nile.common.configs.Configure;
+import ch.cern.nile.common.exceptions.ReverseDnsLookupException;
 import org.apache.kafka.common.config.SaslConfigs;
 import org.apache.kafka.common.config.SslConfigs;
 import org.apache.kafka.common.serialization.Serdes;
@@ -11,10 +14,8 @@ import org.apache.kafka.streams.StreamsConfig;
 import org.apache.kafka.streams.Topology;
 import org.apache.kafka.streams.errors.DefaultProductionExceptionHandler;
 import org.apache.kafka.streams.errors.LogAndContinueExceptionHandler;
-import org.cern.nile.common.configs.Configure;
-import org.cern.nile.common.configs.StreamConfig;
-import org.cern.nile.common.exceptions.ReverseDnsLookupException;
-import org.cern.nile.common.json.JsonSerde;
+import ch.cern.nile.common.configs.StreamConfig;
+import ch.cern.nile.common.json.JsonSerde;
 
 /**
  * This class is responsible for creating and configuring KafkaStreams instances.
diff --git a/src/main/java/org/cern/nile/common/configs/Configure.java b/src/main/java/ch/cern/nile/common/configs/Configure.java
similarity index 82%
rename from src/main/java/org/cern/nile/common/configs/Configure.java
rename to src/main/java/ch/cern/nile/common/configs/Configure.java
index e7c9e085c265d0e05565f45ce5dd4a296195546b..b0b3c4db0c965f004194736065406f3723b3b634 100644
--- a/src/main/java/org/cern/nile/common/configs/Configure.java
+++ b/src/main/java/ch/cern/nile/common/configs/Configure.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.configs;
+package ch.cern.nile.common.configs;
 
 import java.util.Properties;
 
diff --git a/src/main/java/org/cern/nile/common/configs/PropertiesCheck.java b/src/main/java/ch/cern/nile/common/configs/PropertiesCheck.java
similarity index 94%
rename from src/main/java/org/cern/nile/common/configs/PropertiesCheck.java
rename to src/main/java/ch/cern/nile/common/configs/PropertiesCheck.java
index 11d6f641f1242aa2ed3bd5edff02c65b749e136e..bb95779c67cda0c09186abdd21a65e966f85898c 100644
--- a/src/main/java/org/cern/nile/common/configs/PropertiesCheck.java
+++ b/src/main/java/ch/cern/nile/common/configs/PropertiesCheck.java
@@ -1,10 +1,11 @@
-package org.cern.nile.common.configs;
+package ch.cern.nile.common.configs;
 
 import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
-import org.cern.nile.common.exceptions.MissingPropertyException;
-import org.cern.nile.common.exceptions.UnknownStreamTypeException;
+
+import ch.cern.nile.common.exceptions.MissingPropertyException;
+import ch.cern.nile.common.exceptions.UnknownStreamTypeException;
 
 /**
  * A utility class to validate properties based on the type of stream.
diff --git a/src/main/java/org/cern/nile/common/configs/StreamConfig.java b/src/main/java/ch/cern/nile/common/configs/StreamConfig.java
similarity index 98%
rename from src/main/java/org/cern/nile/common/configs/StreamConfig.java
rename to src/main/java/ch/cern/nile/common/configs/StreamConfig.java
index 515acf3a6978eaedda46a492bdc14210524da227..e0312f9290a5ec40a0982ca1fcbe744cc8f27434 100644
--- a/src/main/java/org/cern/nile/common/configs/StreamConfig.java
+++ b/src/main/java/ch/cern/nile/common/configs/StreamConfig.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.configs;
+package ch.cern.nile.common.configs;
 
 import java.util.Arrays;
 import java.util.Set;
diff --git a/src/main/java/org/cern/nile/common/configs/StreamType.java b/src/main/java/ch/cern/nile/common/configs/StreamType.java
similarity index 79%
rename from src/main/java/org/cern/nile/common/configs/StreamType.java
rename to src/main/java/ch/cern/nile/common/configs/StreamType.java
index 3421f89c322b2732524c6397768384a454dcd0a0..b3b3565fe06e28e6d655c01c6d8d3bd8ddbbbb75 100644
--- a/src/main/java/org/cern/nile/common/configs/StreamType.java
+++ b/src/main/java/ch/cern/nile/common/configs/StreamType.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.configs;
+package ch.cern.nile.common.configs;
 
 /**
  * Enum representing the types of streams supported by the application.
diff --git a/src/main/java/org/cern/nile/common/exceptions/DecodingException.java b/src/main/java/ch/cern/nile/common/exceptions/DecodingException.java
similarity index 84%
rename from src/main/java/org/cern/nile/common/exceptions/DecodingException.java
rename to src/main/java/ch/cern/nile/common/exceptions/DecodingException.java
index 1eb689afdcf9dbc04cebd9af6e19e2ad701116ed..7b02130f1aa1fd86f33345708e5ca21ccd23882c 100644
--- a/src/main/java/org/cern/nile/common/exceptions/DecodingException.java
+++ b/src/main/java/ch/cern/nile/common/exceptions/DecodingException.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.exceptions;
+package ch.cern.nile.common.exceptions;
 
 public class DecodingException extends RuntimeException {
 
diff --git a/src/main/java/org/cern/nile/common/exceptions/InvalidStreamTypeException.java b/src/main/java/ch/cern/nile/common/exceptions/InvalidStreamTypeException.java
similarity index 79%
rename from src/main/java/org/cern/nile/common/exceptions/InvalidStreamTypeException.java
rename to src/main/java/ch/cern/nile/common/exceptions/InvalidStreamTypeException.java
index 8336157584c41932f90b36995e2d8df17d1bcfaf..47c56519b0e49c0b69677c6fb1ca9e9771d1c281 100644
--- a/src/main/java/org/cern/nile/common/exceptions/InvalidStreamTypeException.java
+++ b/src/main/java/ch/cern/nile/common/exceptions/InvalidStreamTypeException.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.exceptions;
+package ch.cern.nile.common.exceptions;
 
 public class InvalidStreamTypeException extends IllegalArgumentException {
 
diff --git a/src/main/java/org/cern/nile/common/exceptions/MissingPropertyException.java b/src/main/java/ch/cern/nile/common/exceptions/MissingPropertyException.java
similarity index 77%
rename from src/main/java/org/cern/nile/common/exceptions/MissingPropertyException.java
rename to src/main/java/ch/cern/nile/common/exceptions/MissingPropertyException.java
index 63fa3bf594dce93d667cfb8bb3b07ac3625ffe7a..17651663fcee7adb683c13e56af98552cdb53a43 100644
--- a/src/main/java/org/cern/nile/common/exceptions/MissingPropertyException.java
+++ b/src/main/java/ch/cern/nile/common/exceptions/MissingPropertyException.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.exceptions;
+package ch.cern.nile.common.exceptions;
 
 public class MissingPropertyException extends RuntimeException {
 
diff --git a/src/main/java/org/cern/nile/common/exceptions/ReverseDnsLookupException.java b/src/main/java/ch/cern/nile/common/exceptions/ReverseDnsLookupException.java
similarity index 80%
rename from src/main/java/org/cern/nile/common/exceptions/ReverseDnsLookupException.java
rename to src/main/java/ch/cern/nile/common/exceptions/ReverseDnsLookupException.java
index e9a53b86c00faf6ba44c72a02e1f21d0ab306145..e97b759a3055ff097cb0e87f715601c05a7c7865 100644
--- a/src/main/java/org/cern/nile/common/exceptions/ReverseDnsLookupException.java
+++ b/src/main/java/ch/cern/nile/common/exceptions/ReverseDnsLookupException.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.exceptions;
+package ch.cern.nile.common.exceptions;
 
 public class ReverseDnsLookupException extends RuntimeException {
 
diff --git a/src/main/java/org/cern/nile/common/exceptions/UnknownStreamTypeException.java b/src/main/java/ch/cern/nile/common/exceptions/UnknownStreamTypeException.java
similarity index 78%
rename from src/main/java/org/cern/nile/common/exceptions/UnknownStreamTypeException.java
rename to src/main/java/ch/cern/nile/common/exceptions/UnknownStreamTypeException.java
index 68a3d529af98bc91fd19c30ed4fd91211e5abaea..4de99513d998b893643451441bcf9647e7f05346 100644
--- a/src/main/java/org/cern/nile/common/exceptions/UnknownStreamTypeException.java
+++ b/src/main/java/ch/cern/nile/common/exceptions/UnknownStreamTypeException.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.exceptions;
+package ch.cern.nile.common.exceptions;
 
 public class UnknownStreamTypeException extends RuntimeException {
 
diff --git a/src/main/java/org/cern/nile/common/json/JsonPojoDeserializer.java b/src/main/java/ch/cern/nile/common/json/JsonPojoDeserializer.java
similarity index 97%
rename from src/main/java/org/cern/nile/common/json/JsonPojoDeserializer.java
rename to src/main/java/ch/cern/nile/common/json/JsonPojoDeserializer.java
index dc1188d8d61e71938fc96461431806ef0cb5d487..d54fe36efd2e9d575d55e145788c27638c86fb11 100644
--- a/src/main/java/org/cern/nile/common/json/JsonPojoDeserializer.java
+++ b/src/main/java/ch/cern/nile/common/json/JsonPojoDeserializer.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.json;
+package ch.cern.nile.common.json;
 
 import com.google.gson.Gson;
 import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/org/cern/nile/common/json/JsonPojoSerializer.java b/src/main/java/ch/cern/nile/common/json/JsonPojoSerializer.java
similarity index 96%
rename from src/main/java/org/cern/nile/common/json/JsonPojoSerializer.java
rename to src/main/java/ch/cern/nile/common/json/JsonPojoSerializer.java
index 5c69dc8aa7a262cc76178ffee7de30d6dfe30fab..b11221e77ad0d07a8aed8789bc48f0b4ac9fbcf9 100644
--- a/src/main/java/org/cern/nile/common/json/JsonPojoSerializer.java
+++ b/src/main/java/ch/cern/nile/common/json/JsonPojoSerializer.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.json;
+package ch.cern.nile.common.json;
 
 import com.google.gson.Gson;
 import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/org/cern/nile/common/json/JsonSerde.java b/src/main/java/ch/cern/nile/common/json/JsonSerde.java
similarity index 96%
rename from src/main/java/org/cern/nile/common/json/JsonSerde.java
rename to src/main/java/ch/cern/nile/common/json/JsonSerde.java
index e826e2b290f0bb3f3811039458b4c504c2bc9d1d..1afd5838baa17247718b553bc35cd5fc190efcaf 100644
--- a/src/main/java/org/cern/nile/common/json/JsonSerde.java
+++ b/src/main/java/ch/cern/nile/common/json/JsonSerde.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.json;
+package ch.cern.nile.common.json;
 
 import com.google.gson.JsonObject;
 import java.util.Map;
diff --git a/src/main/java/org/cern/nile/common/models/Application.java b/src/main/java/ch/cern/nile/common/models/Application.java
similarity index 85%
rename from src/main/java/org/cern/nile/common/models/Application.java
rename to src/main/java/ch/cern/nile/common/models/Application.java
index 08c785937f08b9ba2a5ebb538d2c19a405fb65f2..b91c0afb721c9651170f4f34a8a228cab28a7f3d 100644
--- a/src/main/java/org/cern/nile/common/models/Application.java
+++ b/src/main/java/ch/cern/nile/common/models/Application.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.models;
+package ch.cern.nile.common.models;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/org/cern/nile/common/models/Topic.java b/src/main/java/ch/cern/nile/common/models/Topic.java
similarity index 84%
rename from src/main/java/org/cern/nile/common/models/Topic.java
rename to src/main/java/ch/cern/nile/common/models/Topic.java
index b3514cb32c59ab89fe4af22eabcbc7cba31fcab3..a65ec396fb11b5ebbc04400c2b2e4a7ce2c6993b 100644
--- a/src/main/java/org/cern/nile/common/models/Topic.java
+++ b/src/main/java/ch/cern/nile/common/models/Topic.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.models;
+package ch.cern.nile.common.models;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/org/cern/nile/common/probes/Health.java b/src/main/java/ch/cern/nile/common/probes/Health.java
similarity index 96%
rename from src/main/java/org/cern/nile/common/probes/Health.java
rename to src/main/java/ch/cern/nile/common/probes/Health.java
index 56adcd096f66dcd1f5c8c2bf8e3133e96042c391..532cba07ef13d67e9a875555a077370b449efae4 100644
--- a/src/main/java/org/cern/nile/common/probes/Health.java
+++ b/src/main/java/ch/cern/nile/common/probes/Health.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.probes;
+package ch.cern.nile.common.probes;
 
 import com.sun.net.httpserver.HttpServer;
 import java.io.IOException;
diff --git a/src/main/java/org/cern/nile/common/schema/JsonType.java b/src/main/java/ch/cern/nile/common/schema/JsonType.java
similarity index 96%
rename from src/main/java/org/cern/nile/common/schema/JsonType.java
rename to src/main/java/ch/cern/nile/common/schema/JsonType.java
index d4a4146552ed6ad3c40a54d2facd5d6e0696671f..f15754311393ad58a7651ca960c7b2b6ad12f49d 100644
--- a/src/main/java/org/cern/nile/common/schema/JsonType.java
+++ b/src/main/java/ch/cern/nile/common/schema/JsonType.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.schema;
+package ch.cern.nile.common.schema;
 
 import java.util.Date;
 
diff --git a/src/main/java/org/cern/nile/common/schema/SchemaInjector.java b/src/main/java/ch/cern/nile/common/schema/SchemaInjector.java
similarity index 98%
rename from src/main/java/org/cern/nile/common/schema/SchemaInjector.java
rename to src/main/java/ch/cern/nile/common/schema/SchemaInjector.java
index 32df60bd005725dce4f052c23be5cf9e763b02c5..be2b36e8c0de9d7e2159c5de034220f01bf54794 100644
--- a/src/main/java/org/cern/nile/common/schema/SchemaInjector.java
+++ b/src/main/java/ch/cern/nile/common/schema/SchemaInjector.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.schema;
+package ch.cern.nile.common.schema;
 
 import java.util.Date;
 import java.util.HashMap;
diff --git a/src/main/java/org/cern/nile/common/streams/AbstractStream.java b/src/main/java/ch/cern/nile/common/streams/AbstractStream.java
similarity index 95%
rename from src/main/java/org/cern/nile/common/streams/AbstractStream.java
rename to src/main/java/ch/cern/nile/common/streams/AbstractStream.java
index 0b6ed1b613444e69afaf98dbc1857f547a963c94..2292c6879a092e2deafb4618678d49180e1808f9 100644
--- a/src/main/java/org/cern/nile/common/streams/AbstractStream.java
+++ b/src/main/java/ch/cern/nile/common/streams/AbstractStream.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.streams;
+package ch.cern.nile.common.streams;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -14,9 +14,9 @@ import org.apache.kafka.streams.StreamsBuilder;
 import org.apache.kafka.streams.Topology;
 import org.apache.kafka.streams.kstream.ValueTransformer;
 import org.apache.kafka.streams.processor.ProcessorContext;
-import org.cern.nile.common.clients.KafkaStreamsClient;
-import org.cern.nile.common.configs.StreamConfig;
-import org.cern.nile.common.probes.Health;
+import ch.cern.nile.common.clients.KafkaStreamsClient;
+import ch.cern.nile.common.configs.StreamConfig;
+import ch.cern.nile.common.probes.Health;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/ch/cern/nile/common/streams/Streaming.java b/src/main/java/ch/cern/nile/common/streams/Streaming.java
new file mode 100644
index 0000000000000000000000000000000000000000..1aa171e03453b9068aedb48d574c1d9adff04ed5
--- /dev/null
+++ b/src/main/java/ch/cern/nile/common/streams/Streaming.java
@@ -0,0 +1,10 @@
+package ch.cern.nile.common.streams;
+
+import ch.cern.nile.common.configs.Configure;
+import ch.cern.nile.common.clients.KafkaStreamsClient;
+
+public interface Streaming extends Configure {
+
+  void stream(KafkaStreamsClient kafkaStreamsClient);
+
+}
diff --git a/src/main/java/org/cern/nile/common/streams/Streaming.java b/src/main/java/org/cern/nile/common/streams/Streaming.java
deleted file mode 100644
index 37a4dd8289d46cf3f2b0431a6030bd3be161cc60..0000000000000000000000000000000000000000
--- a/src/main/java/org/cern/nile/common/streams/Streaming.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.cern.nile.common.streams;
-
-import org.cern.nile.common.clients.KafkaStreamsClient;
-import org.cern.nile.common.configs.Configure;
-
-public interface Streaming extends Configure {
-
-  void stream(KafkaStreamsClient kafkaStreamsClient);
-
-}
diff --git a/src/test/java/org/cern/nile/common/configs/PropertiesCheckTest.java b/src/test/java/ch/cern/nile/common/configs/PropertiesCheckTest.java
similarity index 98%
rename from src/test/java/org/cern/nile/common/configs/PropertiesCheckTest.java
rename to src/test/java/ch/cern/nile/common/configs/PropertiesCheckTest.java
index 57c0e5140e65db7131735592d3db979eaa7d1be0..523fa2214fbd3ae20db1b0429462ebe9e9de70f0 100644
--- a/src/test/java/org/cern/nile/common/configs/PropertiesCheckTest.java
+++ b/src/test/java/ch/cern/nile/common/configs/PropertiesCheckTest.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.configs;
+package ch.cern.nile.common.configs;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
diff --git a/src/test/java/org/cern/nile/common/configs/StreamConfigTest.java b/src/test/java/ch/cern/nile/common/configs/StreamConfigTest.java
similarity index 97%
rename from src/test/java/org/cern/nile/common/configs/StreamConfigTest.java
rename to src/test/java/ch/cern/nile/common/configs/StreamConfigTest.java
index b9338fb13369a9a3e93dc09ba2dd61d49eed73ff..e2a7674f5ecc63999bf035a3735fcf67b33ef340 100644
--- a/src/test/java/org/cern/nile/common/configs/StreamConfigTest.java
+++ b/src/test/java/ch/cern/nile/common/configs/StreamConfigTest.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.configs;
+package ch.cern.nile.common.configs;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/src/test/java/org/cern/nile/common/configs/StreamTypeTest.java b/src/test/java/ch/cern/nile/common/configs/StreamTypeTest.java
similarity index 95%
rename from src/test/java/org/cern/nile/common/configs/StreamTypeTest.java
rename to src/test/java/ch/cern/nile/common/configs/StreamTypeTest.java
index 2915644a0c7ce02a065b8e86d791fd30c7b3e863..5dd6bf9e89e05f43513dd2f1d7def845f16f19b9 100644
--- a/src/test/java/org/cern/nile/common/configs/StreamTypeTest.java
+++ b/src/test/java/ch/cern/nile/common/configs/StreamTypeTest.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.configs;
+package ch.cern.nile.common.configs;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/src/test/java/org/cern/nile/common/json/JsonPojoDeserializerTest.java b/src/test/java/ch/cern/nile/common/json/JsonPojoDeserializerTest.java
similarity index 93%
rename from src/test/java/org/cern/nile/common/json/JsonPojoDeserializerTest.java
rename to src/test/java/ch/cern/nile/common/json/JsonPojoDeserializerTest.java
index 62982d26bb492d6e59ae7424ff9563c224ac7845..f5f1261a9b2cd24ef21dbd00e19ec6dd97a4424b 100644
--- a/src/test/java/org/cern/nile/common/json/JsonPojoDeserializerTest.java
+++ b/src/test/java/ch/cern/nile/common/json/JsonPojoDeserializerTest.java
@@ -1,11 +1,11 @@
-package org.cern.nile.common.json;
+package ch.cern.nile.common.json;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.Map;
-import org.cern.nile.common.models.Application;
-import org.cern.nile.common.models.Topic;
+import ch.cern.nile.common.models.Application;
+import ch.cern.nile.common.models.Topic;
 import org.junit.jupiter.api.Test;
 
 class JsonPojoDeserializerTest {
diff --git a/src/test/java/org/cern/nile/common/json/JsonPojoSerializerTest.java b/src/test/java/ch/cern/nile/common/json/JsonPojoSerializerTest.java
similarity index 97%
rename from src/test/java/org/cern/nile/common/json/JsonPojoSerializerTest.java
rename to src/test/java/ch/cern/nile/common/json/JsonPojoSerializerTest.java
index d971b482d91bfa109a33b8649781e5de296736a1..4f7d9b7e021882533e85b2986882baaa4bd785bb 100644
--- a/src/test/java/org/cern/nile/common/json/JsonPojoSerializerTest.java
+++ b/src/test/java/ch/cern/nile/common/json/JsonPojoSerializerTest.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.json;
+package ch.cern.nile.common.json;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/src/test/java/org/cern/nile/common/json/JsonSerdeTest.java b/src/test/java/ch/cern/nile/common/json/JsonSerdeTest.java
similarity index 93%
rename from src/test/java/org/cern/nile/common/json/JsonSerdeTest.java
rename to src/test/java/ch/cern/nile/common/json/JsonSerdeTest.java
index f3f1a6c7c12f09817061eef55aef6540f1bfaad9..228333c7570c58754c8874243317b39068454d39 100644
--- a/src/test/java/org/cern/nile/common/json/JsonSerdeTest.java
+++ b/src/test/java/ch/cern/nile/common/json/JsonSerdeTest.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.json;
+package ch.cern.nile.common.json;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
diff --git a/src/test/java/org/cern/nile/common/schema/SchemaInjectorTest.java b/src/test/java/ch/cern/nile/common/schema/SchemaInjectorTest.java
similarity index 98%
rename from src/test/java/org/cern/nile/common/schema/SchemaInjectorTest.java
rename to src/test/java/ch/cern/nile/common/schema/SchemaInjectorTest.java
index 1aad988be4124fefb966b6666c7c54a0078a7232..0b0ae4b70eccce0f9243c1a22d0cc7a58340cc37 100644
--- a/src/test/java/org/cern/nile/common/schema/SchemaInjectorTest.java
+++ b/src/test/java/ch/cern/nile/common/schema/SchemaInjectorTest.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.schema;
+package ch.cern.nile.common.schema;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/org/cern/nile/common/schema/SchemaTestBase.java b/src/test/java/ch/cern/nile/common/schema/SchemaTestBase.java
similarity index 94%
rename from src/test/java/org/cern/nile/common/schema/SchemaTestBase.java
rename to src/test/java/ch/cern/nile/common/schema/SchemaTestBase.java
index abeb38cb8767f3d568d7f89a217e31f5909bd842..9eca0fa7a2dae6077f84b29a67536dbd92db13ef 100644
--- a/src/test/java/org/cern/nile/common/schema/SchemaTestBase.java
+++ b/src/test/java/ch/cern/nile/common/schema/SchemaTestBase.java
@@ -1,4 +1,4 @@
-package org.cern.nile.common.schema;
+package ch.cern.nile.common.schema;
 
 import java.util.Date;
 import java.util.HashMap;