diff --git a/.gitignore b/.gitignore
index 4240d92..65f6f06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.pid
 *.swp
+vendor/
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..832804a
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,5 @@
+{
+    "autoload": {
+        "classmap": ["core/", "targets/"]
+    }
+}
diff --git a/nginx/fastcgi_params b/config/nginx/fastcgi_params
similarity index 100%
rename from nginx/fastcgi_params
rename to config/nginx/fastcgi_params
diff --git a/nginx/mime.types b/config/nginx/mime.types
similarity index 100%
rename from nginx/mime.types
rename to config/nginx/mime.types
diff --git a/nginx/nginx.conf.in b/config/nginx/nginx.conf.in
similarity index 100%
rename from nginx/nginx.conf.in
rename to config/nginx/nginx.conf.in
diff --git a/php.ini b/config/php.ini
similarity index 100%
rename from php.ini
rename to config/php.ini
diff --git a/DatabaseInstaller.php b/core/DatabaseInstaller.php
similarity index 100%
rename from DatabaseInstaller.php
rename to core/DatabaseInstaller.php
diff --git a/HHVMDaemon.php b/core/HHVMDaemon.php
similarity index 100%
rename from HHVMDaemon.php
rename to core/HHVMDaemon.php
diff --git a/NginxDaemon.php b/core/NginxDaemon.php
similarity index 100%
rename from NginxDaemon.php
rename to core/NginxDaemon.php
diff --git a/PHP5Daemon.php b/core/PHP5Daemon.php
similarity index 100%
rename from PHP5Daemon.php
rename to core/PHP5Daemon.php
diff --git a/PHPEngine.php b/core/PHPEngine.php
similarity index 100%
rename from PHPEngine.php
rename to core/PHPEngine.php
diff --git a/PerfOptions.php b/core/PerfOptions.php
similarity index 100%
rename from PerfOptions.php
rename to core/PerfOptions.php
diff --git a/PerfSettings.php b/core/PerfSettings.php
similarity index 100%
rename from PerfSettings.php
rename to core/PerfSettings.php
diff --git a/PerfTarget.php b/core/PerfTarget.php
similarity index 100%
rename from PerfTarget.php
rename to core/PerfTarget.php
diff --git a/Process.php b/core/Process.php
similarity index 100%
rename from Process.php
rename to core/Process.php
diff --git a/RequestMode.php b/core/RequestMode.php
similarity index 100%
rename from RequestMode.php
rename to core/RequestMode.php
diff --git a/Siege.php b/core/Siege.php
similarity index 100%
rename from Siege.php
rename to core/Siege.php
diff --git a/SiegeFields.php b/core/SiegeFields.php
similarity index 100%
rename from SiegeFields.php
rename to core/SiegeFields.php
diff --git a/SiegeStats.php b/core/SiegeStats.php
similarity index 100%
rename from SiegeStats.php
rename to core/SiegeStats.php
diff --git a/Utils.php b/core/Utils.php
similarity index 100%
rename from Utils.php
rename to core/Utils.php
diff --git a/hhvm_config_check.php b/core/hhvm_config_check.php
similarity index 100%
rename from hhvm_config_check.php
rename to core/hhvm_config_check.php
diff --git a/perf.php b/perf.php
index f4ae2ff..4d15023 100644
--- a/perf.php
+++ b/perf.php
@@ -9,6 +9,8 @@
  *
  */
 
+require_once('vendor/autoload.php');
+
 function check_cpufreq(): void {
   $sys_cpu_root = '/sys/devices/system/cpu';
   if (file_exists($sys_cpu_root)) {
diff --git a/codeigniter/CodeIgniter-2.2.0.tar.gz b/targets/codeigniter/CodeIgniter-2.2.0.tar.gz
similarity index 100%
rename from codeigniter/CodeIgniter-2.2.0.tar.gz
rename to targets/codeigniter/CodeIgniter-2.2.0.tar.gz
diff --git a/CodeIgniterTarget.php b/targets/codeigniter/CodeIgniterTarget.php
similarity index 100%
rename from CodeIgniterTarget.php
rename to targets/codeigniter/CodeIgniterTarget.php
diff --git a/CodeIgniterTarget.urls b/targets/codeigniter/CodeIgniterTarget.urls
similarity index 100%
rename from CodeIgniterTarget.urls
rename to targets/codeigniter/CodeIgniterTarget.urls
diff --git a/Drupal7Target.php b/targets/drupal7/Drupal7Target.php
similarity index 100%
rename from Drupal7Target.php
rename to targets/drupal7/Drupal7Target.php
diff --git a/Drupal7Target.urls b/targets/drupal7/Drupal7Target.urls
similarity index 100%
rename from Drupal7Target.urls
rename to targets/drupal7/Drupal7Target.urls
diff --git a/drupal7/dbdump.sql.gz b/targets/drupal7/dbdump.sql.gz
similarity index 100%
rename from drupal7/dbdump.sql.gz
rename to targets/drupal7/dbdump.sql.gz
diff --git a/drupal7/demo-static.tar.bz2 b/targets/drupal7/demo-static.tar.bz2
similarity index 100%
rename from drupal7/demo-static.tar.bz2
rename to targets/drupal7/demo-static.tar.bz2
diff --git a/drupal7/devel-7.x-1.5.tar.gz b/targets/drupal7/devel-7.x-1.5.tar.gz
similarity index 100%
rename from drupal7/devel-7.x-1.5.tar.gz
rename to targets/drupal7/devel-7.x-1.5.tar.gz
diff --git a/drupal7/drupal-7.31.tar.gz b/targets/drupal7/drupal-7.31.tar.gz
similarity index 100%
rename from drupal7/drupal-7.31.tar.gz
rename to targets/drupal7/drupal-7.31.tar.gz
diff --git a/drupal7/settings.php.gz b/targets/drupal7/settings.php.gz
similarity index 100%
rename from drupal7/settings.php.gz
rename to targets/drupal7/settings.php.gz
diff --git a/LaravelTarget.php b/targets/laravel/LaravelTarget.php
similarity index 100%
rename from LaravelTarget.php
rename to targets/laravel/LaravelTarget.php
diff --git a/LaravelTarget.urls b/targets/laravel/LaravelTarget.urls
similarity index 100%
rename from LaravelTarget.urls
rename to targets/laravel/LaravelTarget.urls
diff --git a/laravel/laravel-4.2.0.tar.gz b/targets/laravel/laravel-4.2.0.tar.gz
similarity index 100%
rename from laravel/laravel-4.2.0.tar.gz
rename to targets/laravel/laravel-4.2.0.tar.gz
diff --git a/laravel/vendor.tar.bz2 b/targets/laravel/vendor.tar.bz2
similarity index 100%
rename from laravel/vendor.tar.bz2
rename to targets/laravel/vendor.tar.bz2
diff --git a/Magento1Target.php b/targets/magento1/Magento1Target.php
similarity index 100%
rename from Magento1Target.php
rename to targets/magento1/Magento1Target.php
diff --git a/Magento1Target.urls b/targets/magento1/Magento1Target.urls
similarity index 100%
rename from Magento1Target.urls
rename to targets/magento1/Magento1Target.urls
diff --git a/magento1/local.xml b/targets/magento1/local.xml
similarity index 100%
rename from magento1/local.xml
rename to targets/magento1/local.xml
diff --git a/magento1/magento-1.9.0.1.tar.gz b/targets/magento1/magento-1.9.0.1.tar.gz
similarity index 100%
rename from magento1/magento-1.9.0.1.tar.gz
rename to targets/magento1/magento-1.9.0.1.tar.gz
diff --git a/magento1/magento-sample-data-1.9.0.0.tar.gz b/targets/magento1/magento-sample-data-1.9.0.0.tar.gz
similarity index 100%
rename from magento1/magento-sample-data-1.9.0.0.tar.gz
rename to targets/magento1/magento-sample-data-1.9.0.0.tar.gz
diff --git a/SugarCRMTarget.php b/targets/sugarcrm/SugarCRMTarget.php
similarity index 100%
rename from SugarCRMTarget.php
rename to targets/sugarcrm/SugarCRMTarget.php
diff --git a/SugarCRMTarget.urls b/targets/sugarcrm/SugarCRMTarget.urls
similarity index 100%
rename from SugarCRMTarget.urls
rename to targets/sugarcrm/SugarCRMTarget.urls
diff --git a/sugarcrm/config.php b/targets/sugarcrm/config.php
similarity index 100%
rename from sugarcrm/config.php
rename to targets/sugarcrm/config.php
diff --git a/sugarcrm/dbdump.sql.gz b/targets/sugarcrm/dbdump.sql.gz
similarity index 100%
rename from sugarcrm/dbdump.sql.gz
rename to targets/sugarcrm/dbdump.sql.gz
diff --git a/sugarcrm/sugarcrm_dev-6.5.16.tar.gz b/targets/sugarcrm/sugarcrm_dev-6.5.16.tar.gz
similarity index 100%
rename from sugarcrm/sugarcrm_dev-6.5.16.tar.gz
rename to targets/sugarcrm/sugarcrm_dev-6.5.16.tar.gz
diff --git a/FibonacciTarget.php b/targets/toys/FibonacciTarget.php
similarity index 100%
rename from FibonacciTarget.php
rename to targets/toys/FibonacciTarget.php
diff --git a/FibonacciTarget.urls b/targets/toys/FibonacciTarget.urls
similarity index 100%
rename from FibonacciTarget.urls
rename to targets/toys/FibonacciTarget.urls
diff --git a/HelloWorldTarget.php b/targets/toys/HelloWorldTarget.php
similarity index 100%
rename from HelloWorldTarget.php
rename to targets/toys/HelloWorldTarget.php
diff --git a/HelloWorldTarget.urls b/targets/toys/HelloWorldTarget.urls
similarity index 100%
rename from HelloWorldTarget.urls
rename to targets/toys/HelloWorldTarget.urls
diff --git a/toys/fibonacci.php b/targets/toys/fibonacci.php
similarity index 100%
rename from toys/fibonacci.php
rename to targets/toys/fibonacci.php
diff --git a/toys/helloworld.php b/targets/toys/helloworld.php
similarity index 100%
rename from toys/helloworld.php
rename to targets/toys/helloworld.php
diff --git a/WordpressTarget.php b/targets/wordpress/WordpressTarget.php
similarity index 100%
rename from WordpressTarget.php
rename to targets/wordpress/WordpressTarget.php
diff --git a/WordpressTarget.urls b/targets/wordpress/WordpressTarget.urls
similarity index 100%
rename from WordpressTarget.urls
rename to targets/wordpress/WordpressTarget.urls
diff --git a/wordpress/dbdump.sql.gz b/targets/wordpress/dbdump.sql.gz
similarity index 100%
rename from wordpress/dbdump.sql.gz
rename to targets/wordpress/dbdump.sql.gz
diff --git a/wordpress/demo-data-creator-1.3.2.zip b/targets/wordpress/demo-data-creator-1.3.2.zip
similarity index 100%
rename from wordpress/demo-data-creator-1.3.2.zip
rename to targets/wordpress/demo-data-creator-1.3.2.zip
diff --git a/wordpress/wordpress-3.9.1.tar.gz b/targets/wordpress/wordpress-3.9.1.tar.gz
similarity index 100%
rename from wordpress/wordpress-3.9.1.tar.gz
rename to targets/wordpress/wordpress-3.9.1.tar.gz
diff --git a/wordpress/wp-config.php b/targets/wordpress/wp-config.php
similarity index 100%
rename from wordpress/wp-config.php
rename to targets/wordpress/wp-config.php