diff --git a/kotlin/README.md b/core-kotlin/README.md
similarity index 100%
rename from kotlin/README.md
rename to core-kotlin/README.md
diff --git a/kotlin/pom.xml b/core-kotlin/pom.xml
similarity index 99%
rename from kotlin/pom.xml
rename to core-kotlin/pom.xml
index e88013ab69..856a37ded0 100644
--- a/kotlin/pom.xml
+++ b/core-kotlin/pom.xml
@@ -3,7 +3,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>
 
-    <artifactId>kotlin</artifactId>
+    <artifactId>core-kotlin</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <parent>
diff --git a/kotlin/src/main/java/com/baeldung/dataclass/Movie.java b/core-kotlin/src/main/java/com/baeldung/dataclass/Movie.java
similarity index 100%
rename from kotlin/src/main/java/com/baeldung/dataclass/Movie.java
rename to core-kotlin/src/main/java/com/baeldung/dataclass/Movie.java
diff --git a/kotlin/src/main/java/com/baeldung/java/ArrayExample.java b/core-kotlin/src/main/java/com/baeldung/java/ArrayExample.java
similarity index 100%
rename from kotlin/src/main/java/com/baeldung/java/ArrayExample.java
rename to core-kotlin/src/main/java/com/baeldung/java/ArrayExample.java
diff --git a/kotlin/src/main/java/com/baeldung/java/Customer.java b/core-kotlin/src/main/java/com/baeldung/java/Customer.java
similarity index 100%
rename from kotlin/src/main/java/com/baeldung/java/Customer.java
rename to core-kotlin/src/main/java/com/baeldung/java/Customer.java
diff --git a/kotlin/src/main/java/com/baeldung/java/StringUtils.java b/core-kotlin/src/main/java/com/baeldung/java/StringUtils.java
similarity index 100%
rename from kotlin/src/main/java/com/baeldung/java/StringUtils.java
rename to core-kotlin/src/main/java/com/baeldung/java/StringUtils.java
diff --git a/kotlin/src/main/java/com/baeldung/lazy/ClassWithHeavyInitialization.java b/core-kotlin/src/main/java/com/baeldung/lazy/ClassWithHeavyInitialization.java
similarity index 100%
rename from kotlin/src/main/java/com/baeldung/lazy/ClassWithHeavyInitialization.java
rename to core-kotlin/src/main/java/com/baeldung/lazy/ClassWithHeavyInitialization.java
diff --git a/kotlin/src/main/kotlin/com/baeldung/dataclass/Movie.kt b/core-kotlin/src/main/kotlin/com/baeldung/dataclass/Movie.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/dataclass/Movie.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/dataclass/Movie.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/dataclass/Sandbox.kt b/core-kotlin/src/main/kotlin/com/baeldung/dataclass/Sandbox.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/dataclass/Sandbox.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/dataclass/Sandbox.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Person.kt b/core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Person.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Person.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Person.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Result.kt b/core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Result.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Result.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Result.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Sandbox.kt b/core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Sandbox.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Sandbox.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Sandbox.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/Example1.kt b/core-kotlin/src/main/kotlin/com/baeldung/kotlin/Example1.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/kotlin/Example1.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/kotlin/Example1.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/Item.kt b/core-kotlin/src/main/kotlin/com/baeldung/kotlin/Item.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/kotlin/Item.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/kotlin/Item.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt b/core-kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/JvmSample.kt b/core-kotlin/src/main/kotlin/com/baeldung/kotlin/JvmSample.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/kotlin/JvmSample.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/kotlin/JvmSample.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/ListExtension.kt b/core-kotlin/src/main/kotlin/com/baeldung/kotlin/ListExtension.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/kotlin/ListExtension.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/kotlin/ListExtension.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/MathematicsOperations.kt b/core-kotlin/src/main/kotlin/com/baeldung/kotlin/MathematicsOperations.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/kotlin/MathematicsOperations.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/kotlin/MathematicsOperations.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/Sealed.kt b/core-kotlin/src/main/kotlin/com/baeldung/kotlin/Sealed.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/kotlin/Sealed.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/kotlin/Sealed.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/User.kt b/core-kotlin/src/main/kotlin/com/baeldung/kotlin/User.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/kotlin/User.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/kotlin/User.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/WhenBlockTypes.kt b/core-kotlin/src/main/kotlin/com/baeldung/kotlin/WhenBlockTypes.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/kotlin/WhenBlockTypes.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/kotlin/WhenBlockTypes.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/Database.kt b/core-kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/Database.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/Database.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/Database.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/DatabaseDelegate.kt b/core-kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/DatabaseDelegate.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/DatabaseDelegate.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/DatabaseDelegate.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/User.kt b/core-kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/User.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/User.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/User.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/mockito/BookService.kt b/core-kotlin/src/main/kotlin/com/baeldung/kotlin/mockito/BookService.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/kotlin/mockito/BookService.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/kotlin/mockito/BookService.kt
diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/mockito/LendBookManager.kt b/core-kotlin/src/main/kotlin/com/baeldung/kotlin/mockito/LendBookManager.kt
similarity index 100%
rename from kotlin/src/main/kotlin/com/baeldung/kotlin/mockito/LendBookManager.kt
rename to core-kotlin/src/main/kotlin/com/baeldung/kotlin/mockito/LendBookManager.kt
diff --git a/kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinUnitTest.java b/core-kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinUnitTest.java
similarity index 100%
rename from kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinUnitTest.java
rename to core-kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinUnitTest.java
diff --git a/kotlin/src/test/java/com/baeldung/kotlin/LazyJavaUnitTest.java b/core-kotlin/src/test/java/com/baeldung/kotlin/LazyJavaUnitTest.java
similarity index 100%
rename from kotlin/src/test/java/com/baeldung/kotlin/LazyJavaUnitTest.java
rename to core-kotlin/src/test/java/com/baeldung/kotlin/LazyJavaUnitTest.java
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/ArrayTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/ArrayTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/ArrayTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/ArrayTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/CollectionsTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CollectionsTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/CollectionsTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/CollectionsTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/CustomerTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CustomerTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/CustomerTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/CustomerTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/EqualityTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/EqualityTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/EqualityTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/EqualityTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/GenericsTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/GenericsTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/GenericsTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/GenericsTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/ItemServiceTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/ItemServiceTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/ItemServiceTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/ItemServiceTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/JvmSampleTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/JvmSampleTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/JvmSampleTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/JvmSampleTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/KotlinJavaInteroperabilityTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/KotlinJavaInteroperabilityTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/KotlinJavaInteroperabilityTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/KotlinJavaInteroperabilityTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/LambdaTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LambdaTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/LambdaTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/LambdaTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/LazyUnitTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LazyUnitTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/LazyUnitTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/LazyUnitTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/ListExtensionTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/ListExtensionTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/ListExtensionTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/ListExtensionTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/ListToMapTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/ListToMapTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/ListToMapTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/ListToMapTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/NullSafetyTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/NullSafetyTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/NullSafetyTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/NullSafetyTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/SealedTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/SealedTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/SealedTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/SealedTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/WhenBlockUnitTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/WhenBlockUnitTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/WhenBlockUnitTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/WhenBlockUnitTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/delegates/DatabaseDelegatesTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/delegates/DatabaseDelegatesTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/delegates/DatabaseDelegatesTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/delegates/DatabaseDelegatesTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/mockito/LendBookManagerTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/mockito/LendBookManagerTest.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/mockito/LendBookManagerTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/mockito/LendBookManagerTest.kt
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/mockito/LendBookManagerTestMockitoKotlin.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/mockito/LendBookManagerTestMockitoKotlin.kt
similarity index 100%
rename from kotlin/src/test/kotlin/com/baeldung/kotlin/mockito/LendBookManagerTestMockitoKotlin.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/mockito/LendBookManagerTestMockitoKotlin.kt