diff --git a/.gitignore b/.gitignore
index 3a109ac2..0b115dde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ koans/data*
 koans/app/data
 lib/file-compiler/bin
 koans/app/config/file_hashes.dat
+*.iml
+.idea/
diff --git a/koans/app/config/PathToEnlightenment.xml b/koans/app/config/PathToEnlightenment.xml
index 6e0256ec..d603e4ed 100755
--- a/koans/app/config/PathToEnlightenment.xml
+++ b/koans/app/config/PathToEnlightenment.xml
@@ -1,12 +1,27 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <packages>
-	<package pkg="beginner" name="Novice">
+	<package pkg="beginner" name="Introduction to Koans">
 		<suite class="AboutKoans">
 			<koan name="findAboutKoansFile" displayIncompleteKoanException="false" />
 			<koan name="definitionOfKoanCompletion" displayIncompleteKoanException="false" />
 		</suite>
+    </package>
+	<package pkg="java8" name="Java 8">
+		<suite class="AboutDefaultMethods"/>
+		<suite class="AboutOptional"/>
+		<suite class="AboutLocalTime"/>
+		<suite class="AboutLambdas"/>
+		<suite class="AboutStreams"/>
+		<suite class="AboutMultipleInheritance"/>
+	</package>
+	<package pkg="java7" name="Java 7">
+		<suite class="AboutJava7LiteralsEnhancements"/>
+		<suite class="AboutStringsInSwitch"/>
+		<suite class="AboutDiamondOperator"/>
+		<suite class="AboutTryWithResources"/>
+	</package>
+	<package pkg="beginner" name="Novice">
 		<suite class="AboutAssertions"/>
-		<!-- TODO: AboutDataTypes... -->
 		<suite class="AboutEquality"/>
 		<suite class="AboutPrimitives" />
 		<suite class="AboutStrings"/>
@@ -38,18 +53,4 @@
 	<package pkg="advanced" name="Advanced">
 		<suite class="AboutMocks"/>
 	</package>
-	<package pkg="java7" name="Java 7">
-		<suite class="AboutJava7LiteralsEnhancements"/>
-		<suite class="AboutStringsInSwitch"/>
-		<suite class="AboutDiamondOperator"/>
-		<suite class="AboutTryWithResources"/>
-	</package>
-	<package pkg="java8" name="Java 8">
-		<suite class="AboutDefaultMethods"/>
-		<suite class="AboutOptional"/>
-		<suite class="AboutLocalTime"/>
-		<suite class="AboutLambdas"/>
-		<suite class="AboutStreams"/>
-		<suite class="AboutMultipleInheritance"/>
-	</package>
 </packages>