> --git a/phoronix-test-suite b/phoronix-test-suite
index 67826df..f347ba6 100755
--- a/phoronix-test-suite
+++ b/phoronix-test-suite
@@ -22,13 +22,13 @@ case "${task}" in
     php pts-core/pts-main.php
     ;;
 "install")
-    php pts-core/pts-install-benchmark.php $2
+    php pts-core/pts-run-cmd.php INSTALL_BENCHMARK $2
     ;;
 "run")
     php pts-core/pts-run-benchmark.php $2
     ;;
 "benchmark")
-    php pts-core/pts-install-benchmark.php $2
+    php pts-core/pts-run-cmd.php INSTALL_BENCHMARK $2
     php pts-core/pts-run-benchmark.php $2
     ;;
 "merge-results")
diff --git a/pts-core/functions/pts-functions-install.php b/pts-core/functions/pts-functions-install.php
index 36c8df1..b00f42b 100644
--- a/pts-core/functions/pts-functions-install.php
+++ b/pts-core/functions/pts-functions-install.php
@@ -97,9 +97,9 @@ function pts_install_external_dependencies($Benchmark, &$INSTALL_OBJ)
     $dependencies = explode(", ", $dependencies);

     $dep_match_count = 0;
-    if(is_file(MISC_LOCATION . "dependencies/" . os_vendor() . "-packages.xml"))
+    if(is_file(MISC_LOCATION . "distro-xml/" . os_vendor() . "-packages.xml"))
     {
-        $xml_parser = new tandem_XmlReader(file_get_contents(MISC_LOCATION . "dependencies/" . os_vendor() . "-packages.xml"));
+        $xml_parser = new tandem_XmlReader(file_get_contents(MISC_LOCATION . "distro-xml/" . os_vendor() . "-packages.xml"));
         $generic_package = $xml_parser->getXMLArrayValues("Distribution/Package/GenericName");
         $distro_package = $xml_parser->getXMLArrayValues("Distribution/Package/PackageName");

diff --git a/pts-core/pts-install-benchmark.php b/pts-core/pts-install-benchmark.php
deleted file mode 100644
index 3ab748f..0000000
--- a/pts-core/pts-install-benchmark.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
-   Copyright (C) 2008, Michael Larabel.
-   Copyright (C) 2008, Phoronix Media.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-require("pts-core/functions/pts-functions.php");
-require("pts-core/functions/pts-functions-install.php");
-
-$TO_INSTALL = strtolower($argv[1]);
-
-if(empty($TO_INSTALL))
-{
-    echo "\nThe benchmark or suite name to install must be supplied.\n";
-    exit;
-}
-
-$install_objects = "";
-pts_recurse_install_benchmark($TO_INSTALL, $install_objects);
-
-?>
diff --git a/pts-core/pts-run-cmd.php b/pts-core/pts-run-cmd.php
index b22d1e6..c0365d8 100644
--- a/pts-core/pts-run-cmd.php
+++ b/pts-core/pts-run-cmd.php
@@ -45,7 +45,20 @@ switch($COMMAND)

         if(!empty($upload_url))
             echo "Results Uploaded To: " . $upload_url . "\n\n"; // TODO: Add checks to make sure it did work out
+        break;
+    case "INSTALL_BENCHMARK":
+        if(empty($ARG_1))
+        {
+            echo "\nThe benchmark or suite name to install must be supplied.\n";
+            exit;
+        }
+
+        require("pts-core/functions/pts-functions-install.php");
+
+        $ARG_1 = strtolower($ARG_1);

+        $install_objects = "";
+        pts_recurse_install_benchmark($ARG_1, $install_objects);
         break;
     case "REMOTE_COMPARISON":
         echo "Now Use merge-results for remote comparison with integrated Gl