diff --git a/install.sh b/install.sh
index d7ebbb2..7733a93 100755
--- a/install.sh
+++ b/install.sh
@@ -231,7 +231,7 @@ run_as_root() {
 }
 
 install_pkg_set() {
-  local pkg_file=${BASEDIR}/${1}
+  local pkg_file=${BASEDIR}/packages/${1}
   local pkg_list=""
   if [ ! -f "${pkg_file}" ] ; then
     echo "Package set $(basename "${pkg_file}") does not exist." 1>&2
@@ -436,7 +436,7 @@ case $OPERATION in
     ;;
   package*)
     PKG_SET=${2:-minimal}
-    install_pkg_set "packages.${PKG_SET}"
+    install_pkg_set "${PKG_SET}"
     ;;
   test)
     # Do nothing, just sourcing
diff --git a/packages.x86_64 b/packages.x86_64
deleted file mode 100644
index 15671cc..0000000
--- a/packages.x86_64
+++ /dev/null
@@ -1,2 +0,0 @@
-gcc-multilib
-g++-multilib
diff --git a/packages.HHV b/packages/HHV
similarity index 100%
rename from packages.HHV
rename to packages/HHV
diff --git a/packages.X b/packages/X
similarity index 100%
rename from packages.X
rename to packages/X
diff --git a/packages.cli b/packages/cli
similarity index 100%
rename from packages.cli
rename to packages/cli
diff --git a/packages.fonts b/packages/fonts
similarity index 100%
rename from packages.fonts
rename to packages/fonts
diff --git a/packages.kali b/packages/kali
similarity index 100%
rename from packages.kali
rename to packages/kali
diff --git a/packages.minimal b/packages/minimal
similarity index 100%
rename from packages.minimal
rename to packages/minimal
diff --git a/python3.pip b/python3.pip
deleted file mode 100644
index 7979379..0000000
--- a/python3.pip
+++ /dev/null
@@ -1,5 +0,0 @@
-ipython
-keystone-engine
-unicorn
-capstone
-ropper