diff --git a/flextype/bootstrap.php b/flextype/bootstrap.php
index 8106268b..000e1153 100755
--- a/flextype/bootstrap.php
+++ b/flextype/bootstrap.php
@@ -74,7 +74,6 @@ $flextype['csrf'] = function ($container) {
     return new \Slim\Csrf\Guard;
 };
 
-
 /**
  * Add logger
  */
diff --git a/flextype/Cache.php b/flextype/core/Cache.php
similarity index 100%
rename from flextype/Cache.php
rename to flextype/core/Cache.php
diff --git a/flextype/Controller.php b/flextype/core/Controller.php
similarity index 100%
rename from flextype/Controller.php
rename to flextype/core/Controller.php
diff --git a/flextype/Entries.php b/flextype/core/Entries.php
similarity index 100%
rename from flextype/Entries.php
rename to flextype/core/Entries.php
diff --git a/flextype/Fieldsets.php b/flextype/core/Fieldsets.php
similarity index 100%
rename from flextype/Fieldsets.php
rename to flextype/core/Fieldsets.php
diff --git a/flextype/Middleware.php b/flextype/core/Middleware.php
similarity index 100%
rename from flextype/Middleware.php
rename to flextype/core/Middleware.php
diff --git a/flextype/Plugins.php b/flextype/core/Plugins.php
similarity index 100%
rename from flextype/Plugins.php
rename to flextype/core/Plugins.php
diff --git a/flextype/Snippets.php b/flextype/core/Snippets.php
similarity index 100%
rename from flextype/Snippets.php
rename to flextype/core/Snippets.php
diff --git a/flextype/Themes.php b/flextype/core/Themes.php
similarity index 100%
rename from flextype/Themes.php
rename to flextype/core/Themes.php