diff --git a/.gitignore b/.gitignore
index 60991ec5..784e1ee7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,25 @@
-.idea/workspace.xml
-**/.idea
-.DS_Store
+.idea/
+out/
+*.class
+
+*.iml
+
+# Created by https://www.gitignore.io/api/gradle
+
+### Gradle ###
+.gradle
+**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+# End of https://www.gitignore.io/api/gradle
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6e367118..27cb9b2d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,5 +6,4 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 75acca37..ba027917 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/Java/Java.iml" filepath="$PROJECT_DIR$/Java/Java.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/GildedRose-Kotlin.iml" filepath="$PROJECT_DIR$/.idea/GildedRose-Kotlin.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/Kotlin/.gitignore b/Kotlin/.gitignore
deleted file mode 100644
index 784e1ee7..00000000
--- a/Kotlin/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-.idea/
-out/
-*.class
-
-*.iml
-
-# Created by https://www.gitignore.io/api/gradle
-
-### Gradle ###
-.gradle
-**/build/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
-# Cache of project
-.gradletasknamecache
-
-# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
-# gradle/wrapper/gradle-wrapper.properties
-
-# End of https://www.gitignore.io/api/gradle
diff --git a/Kotlin/build.gradle b/build.gradle
similarity index 99%
rename from Kotlin/build.gradle
rename to build.gradle
index aaa9d72b..02295308 100644
--- a/Kotlin/build.gradle
+++ b/build.gradle
@@ -32,4 +32,4 @@ compileTestKotlin {
     kotlinOptions {
         jvmTarget = "1.8"
     }
-}
+}
\ No newline at end of file
diff --git a/Kotlin/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from Kotlin/gradle/wrapper/gradle-wrapper.jar
rename to gradle/wrapper/gradle-wrapper.jar
diff --git a/Kotlin/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from Kotlin/gradle/wrapper/gradle-wrapper.properties
rename to gradle/wrapper/gradle-wrapper.properties
diff --git a/Kotlin/gradlew b/gradlew
similarity index 100%
rename from Kotlin/gradlew
rename to gradlew
diff --git a/Kotlin/gradlew.bat b/gradlew.bat
similarity index 100%
rename from Kotlin/gradlew.bat
rename to gradlew.bat
diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/src/main/kotlin/com/gildedrose/GildedRose.kt
similarity index 100%
rename from Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt
rename to src/main/kotlin/com/gildedrose/GildedRose.kt
diff --git a/Kotlin/src/main/kotlin/com/gildedrose/Item.kt b/src/main/kotlin/com/gildedrose/Item.kt
similarity index 100%
rename from Kotlin/src/main/kotlin/com/gildedrose/Item.kt
rename to src/main/kotlin/com/gildedrose/Item.kt
diff --git a/Kotlin/src/test/kotlin/com/gildedrose/GildedRoseTest.kt b/src/test/kotlin/com/gildedrose/GildedRoseTest.kt
similarity index 100%
rename from Kotlin/src/test/kotlin/com/gildedrose/GildedRoseTest.kt
rename to src/test/kotlin/com/gildedrose/GildedRoseTest.kt
diff --git a/Kotlin/src/test/kotlin/com/gildedrose/TexttestFixture.kt b/src/test/kotlin/com/gildedrose/TexttestFixture.kt
similarity index 100%
rename from Kotlin/src/test/kotlin/com/gildedrose/TexttestFixture.kt
rename to src/test/kotlin/com/gildedrose/TexttestFixture.kt