diff --git a/kotlin/pom.xml b/kotlin/pom.xml
index 59f71f91a6..eba248e1b9 100644
--- a/kotlin/pom.xml
+++ b/kotlin/pom.xml
@@ -12,18 +12,18 @@
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
-            <version>1.0.4</version>
+            <version>${kotlin-stdlib.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test-junit</artifactId>
-            <version>1.0.4</version>
+            <version>${kotlin-test-junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -35,7 +35,7 @@
             <plugin>
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <groupId>org.jetbrains.kotlin</groupId>
-                <version>1.0.4</version>
+                <version>${kotlin-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>compile</id>
@@ -55,4 +55,11 @@
         </plugins>
     </build>
 
+    <properties>
+        <junit.version>4.12</junit.version>
+        <kotlin-test-junit.version>1.0.4</kotlin-test-junit.version>
+        <kotlin-stdlib.version>1.0.4</kotlin-stdlib.version>
+        <kotlin-maven-plugin.version>1.0.4</kotlin-maven-plugin.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/kotlin/src/main/kotlin/com/baeldung/Example1.kt b/kotlin/src/main/kotlin/com/baeldung/kotlin/Example1.kt
similarity index 68%
rename from kotlin/src/main/kotlin/com/baeldung/Example1.kt
rename to kotlin/src/main/kotlin/com/baeldung/kotlin/Example1.kt
index 9637ec9145..bca1e54a6c 100644
--- a/kotlin/src/main/kotlin/com/baeldung/Example1.kt
+++ b/kotlin/src/main/kotlin/com/baeldung/kotlin/Example1.kt
@@ -1,4 +1,4 @@
-package com.baeldung
+package com.baeldung.kotlin
 
 fun main(args: Array<String>){
     println("hello word")
diff --git a/kotlin/src/main/kotlin/com/baeldung/Item.kt b/kotlin/src/main/kotlin/com/baeldung/kotlin/Item.kt
similarity index 91%
rename from kotlin/src/main/kotlin/com/baeldung/Item.kt
rename to kotlin/src/main/kotlin/com/baeldung/kotlin/Item.kt
index e1a5559cd2..36994e4994 100644
--- a/kotlin/src/main/kotlin/com/baeldung/Item.kt
+++ b/kotlin/src/main/kotlin/com/baeldung/kotlin/Item.kt
@@ -1,4 +1,4 @@
-package com.baeldung
+package com.baeldung.kotlin
 
 open class Item(val id: String, val name: String = "unknown_name") {
     open fun getIdOfItem(): String {
diff --git a/kotlin/src/main/kotlin/com/baeldung/ItemService.kt b/kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt
similarity index 98%
rename from kotlin/src/main/kotlin/com/baeldung/ItemService.kt
rename to kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt
index f117ea5c52..3c0d2eacb1 100644
--- a/kotlin/src/main/kotlin/com/baeldung/ItemService.kt
+++ b/kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt
@@ -1,4 +1,4 @@
-package com.baeldung
+package com.baeldung.kotlin
 
 import java.util.*
 
diff --git a/kotlin/src/main/kotlin/com/baeldung/ListExtension.kt b/kotlin/src/main/kotlin/com/baeldung/kotlin/ListExtension.kt
similarity index 91%
rename from kotlin/src/main/kotlin/com/baeldung/ListExtension.kt
rename to kotlin/src/main/kotlin/com/baeldung/kotlin/ListExtension.kt
index 9245bf991d..da1773b7c9 100644
--- a/kotlin/src/main/kotlin/com/baeldung/ListExtension.kt
+++ b/kotlin/src/main/kotlin/com/baeldung/kotlin/ListExtension.kt
@@ -1,4 +1,4 @@
-package com.baeldung
+package com.baeldung.kotlin
 
 import java.util.concurrent.ThreadLocalRandom
 
diff --git a/kotlin/src/test/kotlin/com/baeldung/ItemServiceTest.kt b/kotlin/src/test/kotlin/com/baeldung/kotlin/ItemServiceTest.kt
similarity index 93%
rename from kotlin/src/test/kotlin/com/baeldung/ItemServiceTest.kt
rename to kotlin/src/test/kotlin/com/baeldung/kotlin/ItemServiceTest.kt
index d681627f81..3d730b1283 100644
--- a/kotlin/src/test/kotlin/com/baeldung/ItemServiceTest.kt
+++ b/kotlin/src/test/kotlin/com/baeldung/kotlin/ItemServiceTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung
+package com.baeldung.kotlin
 
 import org.junit.Test
 import kotlin.test.assertNotNull
diff --git a/kotlin/src/test/kotlin/com/baeldung/ListExtensionTest.kt b/kotlin/src/test/kotlin/com/baeldung/kotlin/ListExtensionTest.kt
similarity index 84%
rename from kotlin/src/test/kotlin/com/baeldung/ListExtensionTest.kt
rename to kotlin/src/test/kotlin/com/baeldung/kotlin/ListExtensionTest.kt
index 42453f2057..7a496e7437 100644
--- a/kotlin/src/test/kotlin/com/baeldung/ListExtensionTest.kt
+++ b/kotlin/src/test/kotlin/com/baeldung/kotlin/ListExtensionTest.kt
@@ -1,5 +1,6 @@
-package com.baeldung
+package com.baeldung.kotlin
 
+import com.baeldung.kotlin.ListExtension
 import org.junit.Test
 import kotlin.test.assertTrue