Move all to main directory

.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

.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>

.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>

Kotlin/.gitignore

@@ -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

build.gradle

@@ -32,4 +32,4 @@ compileTestKotlin {
     kotlinOptions {
         jvmTarget = "1.8"
     }
-}
+}