diff --git a/core/DatabaseInstaller.php b/base/DatabaseInstaller.php
similarity index 100%
rename from core/DatabaseInstaller.php
rename to base/DatabaseInstaller.php
diff --git a/core/HHVMDaemon.php b/base/HHVMDaemon.php
similarity index 100%
rename from core/HHVMDaemon.php
rename to base/HHVMDaemon.php
diff --git a/core/NginxDaemon.php b/base/NginxDaemon.php
similarity index 100%
rename from core/NginxDaemon.php
rename to base/NginxDaemon.php
diff --git a/core/PHP5Daemon.php b/base/PHP5Daemon.php
similarity index 100%
rename from core/PHP5Daemon.php
rename to base/PHP5Daemon.php
diff --git a/core/PHPEngine.php b/base/PHPEngine.php
similarity index 100%
rename from core/PHPEngine.php
rename to base/PHPEngine.php
diff --git a/core/PerfOptions.php b/base/PerfOptions.php
similarity index 100%
rename from core/PerfOptions.php
rename to base/PerfOptions.php
diff --git a/core/PerfSettings.php b/base/PerfSettings.php
similarity index 100%
rename from core/PerfSettings.php
rename to base/PerfSettings.php
diff --git a/core/PerfTarget.php b/base/PerfTarget.php
similarity index 100%
rename from core/PerfTarget.php
rename to base/PerfTarget.php
diff --git a/core/Process.php b/base/Process.php
similarity index 100%
rename from core/Process.php
rename to base/Process.php
diff --git a/core/RequestMode.php b/base/RequestMode.php
similarity index 100%
rename from core/RequestMode.php
rename to base/RequestMode.php
diff --git a/core/Siege.php b/base/Siege.php
similarity index 100%
rename from core/Siege.php
rename to base/Siege.php
diff --git a/core/SiegeFields.php b/base/SiegeFields.php
similarity index 100%
rename from core/SiegeFields.php
rename to base/SiegeFields.php
diff --git a/core/SiegeStats.php b/base/SiegeStats.php
similarity index 100%
rename from core/SiegeStats.php
rename to base/SiegeStats.php
diff --git a/core/SystemChecks.php b/base/SystemChecks.php
similarity index 100%
rename from core/SystemChecks.php
rename to base/SystemChecks.php
diff --git a/core/Utils.php b/base/Utils.php
similarity index 100%
rename from core/Utils.php
rename to base/Utils.php
diff --git a/core/hhvm_config_check.php b/base/hhvm_config_check.php
similarity index 100%
rename from core/hhvm_config_check.php
rename to base/hhvm_config_check.php
diff --git a/composer.json b/composer.json
index 832804a..5754465 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
     "autoload": {
-        "classmap": ["core/", "targets/"]
+        "classmap": ["base/", "targets/"]
     }
 }