Restructure packages

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

packages.x86_64

@@ -1,2 +0,0 @@
-gcc-multilib
-g++-multilib

python3.pip

@@ -1,5 +0,0 @@
-ipython
-keystone-engine
-unicorn
-capstone
-ropper