diff --git a/groups/dev/java b/groups/dev/java
index 8e53093..62b3a45 100644
--- a/groups/dev/java
+++ b/groups/dev/java
@@ -1,2 +1,5 @@
-java
+git
+jdk
+jdk/8
+gradle
 intellijidea-ultimate
diff --git a/groups/java b/groups/java
deleted file mode 100644
index 74515f0..0000000
--- a/groups/java
+++ /dev/null
@@ -1,4 +0,0 @@
-git
-jdk8
-openjdk
-gradle
diff --git a/instalee b/instalee
index 519802d..3931e8b 100755
--- a/instalee
+++ b/instalee
@@ -18,7 +18,7 @@ getcontent() {
 # Get available package entries for given package
 getentries() {
 	cat "$home/handlers.available" | while read handler
-	do find "$home/packages/$1/" -type f -name "$handler*" 2>/dev/null
+	do find "$home/packages/$1/" -depth -type f -name "$handler*" | tac 2>/dev/null
 	done
 }
 
diff --git a/packages/jdk/8/arch b/packages/jdk/8/arch
new file mode 100644
index 0000000..5736209
--- /dev/null
+++ b/packages/jdk/8/arch
@@ -0,0 +1 @@
+jdk8-openjdk
diff --git a/packages/jdk/8/chocolatey b/packages/jdk/8/chocolatey
new file mode 100644
index 0000000..a13c335
--- /dev/null
+++ b/packages/jdk/8/chocolatey
@@ -0,0 +1 @@
+jdk8
diff --git a/packages/jdk/arch b/packages/jdk/arch
new file mode 100644
index 0000000..27ce781
--- /dev/null
+++ b/packages/jdk/arch
@@ -0,0 +1 @@
+jdk-openjdk
diff --git a/packages/jdk/chocolatey b/packages/jdk/chocolatey
new file mode 100644
index 0000000..9a5e3a8
--- /dev/null
+++ b/packages/jdk/chocolatey
@@ -0,0 +1 @@
+openjdk