diff --git a/Examples/project/build.properties b/examples_x/project/build.properties
similarity index 100%
rename from Examples/project/build.properties
rename to examples_x/project/build.properties
diff --git a/Examples/src/main/resources/logback.xml b/examples_x/src/main/resources/logback.xml
similarity index 100%
rename from Examples/src/main/resources/logback.xml
rename to examples_x/src/main/resources/logback.xml
diff --git a/Examples/src/main/scala/za/co/absa/KafkaCase/Examples/KafkaCase.scala b/examples_x/src/main/scala/za/co/absa/KafkaCase/Examples/KafkaCase.scala
similarity index 100%
rename from Examples/src/main/scala/za/co/absa/KafkaCase/Examples/KafkaCase.scala
rename to examples_x/src/main/scala/za/co/absa/KafkaCase/Examples/KafkaCase.scala
diff --git a/Examples/src/test/resources/logback-test.xml b/examples_x/src/test/resources/logback-test.xml
similarity index 100%
rename from Examples/src/test/resources/logback-test.xml
rename to examples_x/src/test/resources/logback-test.xml
diff --git a/Models/project/build.properties b/models_x/project/build.properties
similarity index 100%
rename from Models/project/build.properties
rename to models_x/project/build.properties
diff --git a/Models/src/main/scala/za/co/absa/KafkaCase/Models/EdlaChangeTopic.scala b/models_x/src/main/scala/za/co/absa/KafkaCase/Models/EdlaChangeTopic.scala
similarity index 100%
rename from Models/src/main/scala/za/co/absa/KafkaCase/Models/EdlaChangeTopic.scala
rename to models_x/src/main/scala/za/co/absa/KafkaCase/Models/EdlaChangeTopic.scala
diff --git a/Models/src/main/scala/za/co/absa/KafkaCase/Models/SchemaRunTopic.scala b/models_x/src/main/scala/za/co/absa/KafkaCase/Models/SchemaRunTopic.scala
similarity index 100%
rename from Models/src/main/scala/za/co/absa/KafkaCase/Models/SchemaRunTopic.scala
rename to models_x/src/main/scala/za/co/absa/KafkaCase/Models/SchemaRunTopic.scala
diff --git a/Reader/project/build.properties b/reader_x/project/build.properties
similarity index 100%
rename from Reader/project/build.properties
rename to reader_x/project/build.properties
diff --git a/Reader/src/main/scala/za/co/absa/KafkaCase/Reader/Reader.scala b/reader_x/src/main/scala/za/co/absa/KafkaCase/Reader/Reader.scala
similarity index 100%
rename from Reader/src/main/scala/za/co/absa/KafkaCase/Reader/Reader.scala
rename to reader_x/src/main/scala/za/co/absa/KafkaCase/Reader/Reader.scala
diff --git a/Reader/src/main/scala/za/co/absa/KafkaCase/Reader/ReaderImpl.scala b/reader_x/src/main/scala/za/co/absa/KafkaCase/Reader/ReaderImpl.scala
similarity index 100%
rename from Reader/src/main/scala/za/co/absa/KafkaCase/Reader/ReaderImpl.scala
rename to reader_x/src/main/scala/za/co/absa/KafkaCase/Reader/ReaderImpl.scala
diff --git a/Writer/project/build.properties b/writer_x/project/build.properties
similarity index 100%
rename from Writer/project/build.properties
rename to writer_x/project/build.properties
diff --git a/Writer/src/main/scala/za/co/absa/KafkaCase/Writer/Writer.scala b/writer_x/src/main/scala/za/co/absa/KafkaCase/Writer/Writer.scala
similarity index 100%
rename from Writer/src/main/scala/za/co/absa/KafkaCase/Writer/Writer.scala
rename to writer_x/src/main/scala/za/co/absa/KafkaCase/Writer/Writer.scala
diff --git a/Writer/src/main/scala/za/co/absa/KafkaCase/Writer/WriterImpl.scala b/writer_x/src/main/scala/za/co/absa/KafkaCase/Writer/WriterImpl.scala
similarity index 100%
rename from Writer/src/main/scala/za/co/absa/KafkaCase/Writer/WriterImpl.scala
rename to writer_x/src/main/scala/za/co/absa/KafkaCase/Writer/WriterImpl.scala