diff --git a/public/include/autoloader.inc.php b/public/include/autoloader.inc.php
index 5eedea49..c99e02cb 100644
--- a/public/include/autoloader.inc.php
+++ b/public/include/autoloader.inc.php
@@ -15,12 +15,12 @@ require_once(INCLUDE_DIR . '/config/error_codes.inc.php');
 
 // We need to load these first
 require_once(CLASS_DIR . '/base.class.php');
-require_once(CLASS_DIR . '/coin_base.class.php');
+require_once(CLASS_DIR . '/coins/coin_base.class.php');
 require_once(CLASS_DIR . '/setting.class.php');
 
 // Now decide on which coin class to load and instantiate
-if (file_exists(CLASS_DIR . '/coin_' . $config['algorithm'] . '.class.php')) {
-  require_once(CLASS_DIR . '/coin_' . $config['algorithm'] . '.class.php');
+if (file_exists(CLASS_DIR . '/coins/coin_' . $config['algorithm'] . '.class.php')) {
+  require_once(CLASS_DIR . '/coins/coin_' . $config['algorithm'] . '.class.php');
   $coin = new Coin();
   $coin->setConfig($config);
 } else {
@@ -49,9 +49,6 @@ require_once(CLASS_DIR . '/template.class.php');
 // Load smarty now that we have our theme defined
 require_once(INCLUDE_DIR . '/smarty.inc.php');
 
-// Load our base coin class
-// require_once(CLASS_DIR . '/coin_base.class.php');
-
 // Load everything else in proper order
 require_once(CLASS_DIR . '/mail.class.php');
 require_once(CLASS_DIR . '/tokentype.class.php');
diff --git a/public/include/classes/coin_base.class.php b/public/include/classes/coins/coin_base.class.php
similarity index 100%
rename from public/include/classes/coin_base.class.php
rename to public/include/classes/coins/coin_base.class.php
diff --git a/public/include/classes/coin_scrypt.class.php b/public/include/classes/coins/coin_scrypt.class.php
similarity index 100%
rename from public/include/classes/coin_scrypt.class.php
rename to public/include/classes/coins/coin_scrypt.class.php
diff --git a/public/include/classes/coin_sha256d.class.php b/public/include/classes/coins/coin_sha256d.class.php
similarity index 100%
rename from public/include/classes/coin_sha256d.class.php
rename to public/include/classes/coins/coin_sha256d.class.php