diff --git a/index.php b/index.php
index 4a531d5c..b00669b2 100644
--- a/index.php
+++ b/index.php
@@ -44,7 +44,7 @@ is_link(basename(__FILE__)) and chdir(dirname(realpath(__FILE__)));
 define('APPPATH', strtr(realpath('application') . '/', DIRECTORY_SEPARATOR, '/'));
 define('MODPATH', strtr(realpath('modules') . '/', DIRECTORY_SEPARATOR, '/'));
 define('THEMEPATH', strtr(realpath('themes') . '/', DIRECTORY_SEPARATOR, '/'));
-define('SYSPATH', strtr(realpath('kohana') . '/', DIRECTORY_SEPARATOR, '/'));
+define('SYSPATH', strtr(realpath('system') . '/', DIRECTORY_SEPARATOR, '/'));
 
 // Force a test run if we're in command line mode.
 if (PHP_SAPI == 'cli') {
diff --git a/kohana/KohanaLicense.html b/system/KohanaLicense.html
similarity index 100%
rename from kohana/KohanaLicense.html
rename to system/KohanaLicense.html
diff --git a/kohana/config/cache.php b/system/config/cache.php
similarity index 100%
rename from kohana/config/cache.php
rename to system/config/cache.php
diff --git a/kohana/config/cache_memcache.php b/system/config/cache_memcache.php
similarity index 100%
rename from kohana/config/cache_memcache.php
rename to system/config/cache_memcache.php
diff --git a/kohana/config/cache_sqlite.php b/system/config/cache_sqlite.php
similarity index 100%
rename from kohana/config/cache_sqlite.php
rename to system/config/cache_sqlite.php
diff --git a/kohana/config/cache_xcache.php b/system/config/cache_xcache.php
similarity index 100%
rename from kohana/config/cache_xcache.php
rename to system/config/cache_xcache.php
diff --git a/kohana/config/cookie.php b/system/config/cookie.php
similarity index 100%
rename from kohana/config/cookie.php
rename to system/config/cookie.php
diff --git a/kohana/config/credit_cards.php b/system/config/credit_cards.php
similarity index 100%
rename from kohana/config/credit_cards.php
rename to system/config/credit_cards.php
diff --git a/kohana/config/database.php b/system/config/database.php
similarity index 100%
rename from kohana/config/database.php
rename to system/config/database.php
diff --git a/kohana/config/email.php b/system/config/email.php
similarity index 100%
rename from kohana/config/email.php
rename to system/config/email.php
diff --git a/kohana/config/encryption.php b/system/config/encryption.php
similarity index 100%
rename from kohana/config/encryption.php
rename to system/config/encryption.php
diff --git a/kohana/config/http.php b/system/config/http.php
similarity index 100%
rename from kohana/config/http.php
rename to system/config/http.php
diff --git a/kohana/config/image.php b/system/config/image.php
similarity index 100%
rename from kohana/config/image.php
rename to system/config/image.php
diff --git a/kohana/config/inflector.php b/system/config/inflector.php
similarity index 100%
rename from kohana/config/inflector.php
rename to system/config/inflector.php
diff --git a/kohana/config/locale.php b/system/config/locale.php
similarity index 100%
rename from kohana/config/locale.php
rename to system/config/locale.php
diff --git a/kohana/config/mimes.php b/system/config/mimes.php
similarity index 100%
rename from kohana/config/mimes.php
rename to system/config/mimes.php
diff --git a/kohana/config/pagination.php b/system/config/pagination.php
similarity index 100%
rename from kohana/config/pagination.php
rename to system/config/pagination.php
diff --git a/kohana/config/profiler.php b/system/config/profiler.php
similarity index 100%
rename from kohana/config/profiler.php
rename to system/config/profiler.php
diff --git a/kohana/config/routes.php b/system/config/routes.php
similarity index 100%
rename from kohana/config/routes.php
rename to system/config/routes.php
diff --git a/kohana/config/session.php b/system/config/session.php
similarity index 100%
rename from kohana/config/session.php
rename to system/config/session.php
diff --git a/kohana/config/sql_types.php b/system/config/sql_types.php
similarity index 100%
rename from kohana/config/sql_types.php
rename to system/config/sql_types.php
diff --git a/kohana/config/upload.php b/system/config/upload.php
similarity index 100%
rename from kohana/config/upload.php
rename to system/config/upload.php
diff --git a/kohana/config/user_agents.php b/system/config/user_agents.php
similarity index 100%
rename from kohana/config/user_agents.php
rename to system/config/user_agents.php
diff --git a/kohana/config/view.php b/system/config/view.php
similarity index 100%
rename from kohana/config/view.php
rename to system/config/view.php
diff --git a/kohana/controllers/template.php b/system/controllers/template.php
similarity index 100%
rename from kohana/controllers/template.php
rename to system/controllers/template.php
diff --git a/kohana/core/Benchmark.php b/system/core/Benchmark.php
similarity index 100%
rename from kohana/core/Benchmark.php
rename to system/core/Benchmark.php
diff --git a/kohana/core/Bootstrap.php b/system/core/Bootstrap.php
similarity index 100%
rename from kohana/core/Bootstrap.php
rename to system/core/Bootstrap.php
diff --git a/kohana/core/Event.php b/system/core/Event.php
similarity index 100%
rename from kohana/core/Event.php
rename to system/core/Event.php
diff --git a/kohana/core/Kohana.php b/system/core/Kohana.php
similarity index 100%
rename from kohana/core/Kohana.php
rename to system/core/Kohana.php
diff --git a/kohana/core/utf8.php b/system/core/utf8.php
similarity index 100%
rename from kohana/core/utf8.php
rename to system/core/utf8.php
diff --git a/kohana/core/utf8/from_unicode.php b/system/core/utf8/from_unicode.php
similarity index 100%
rename from kohana/core/utf8/from_unicode.php
rename to system/core/utf8/from_unicode.php
diff --git a/kohana/core/utf8/ltrim.php b/system/core/utf8/ltrim.php
similarity index 100%
rename from kohana/core/utf8/ltrim.php
rename to system/core/utf8/ltrim.php
diff --git a/kohana/core/utf8/ord.php b/system/core/utf8/ord.php
similarity index 100%
rename from kohana/core/utf8/ord.php
rename to system/core/utf8/ord.php
diff --git a/kohana/core/utf8/rtrim.php b/system/core/utf8/rtrim.php
similarity index 100%
rename from kohana/core/utf8/rtrim.php
rename to system/core/utf8/rtrim.php
diff --git a/kohana/core/utf8/str_ireplace.php b/system/core/utf8/str_ireplace.php
similarity index 100%
rename from kohana/core/utf8/str_ireplace.php
rename to system/core/utf8/str_ireplace.php
diff --git a/kohana/core/utf8/str_pad.php b/system/core/utf8/str_pad.php
similarity index 100%
rename from kohana/core/utf8/str_pad.php
rename to system/core/utf8/str_pad.php
diff --git a/kohana/core/utf8/str_split.php b/system/core/utf8/str_split.php
similarity index 100%
rename from kohana/core/utf8/str_split.php
rename to system/core/utf8/str_split.php
diff --git a/kohana/core/utf8/strcasecmp.php b/system/core/utf8/strcasecmp.php
similarity index 100%
rename from kohana/core/utf8/strcasecmp.php
rename to system/core/utf8/strcasecmp.php
diff --git a/kohana/core/utf8/strcspn.php b/system/core/utf8/strcspn.php
similarity index 100%
rename from kohana/core/utf8/strcspn.php
rename to system/core/utf8/strcspn.php
diff --git a/kohana/core/utf8/stristr.php b/system/core/utf8/stristr.php
similarity index 100%
rename from kohana/core/utf8/stristr.php
rename to system/core/utf8/stristr.php
diff --git a/kohana/core/utf8/strlen.php b/system/core/utf8/strlen.php
similarity index 100%
rename from kohana/core/utf8/strlen.php
rename to system/core/utf8/strlen.php
diff --git a/kohana/core/utf8/strpos.php b/system/core/utf8/strpos.php
similarity index 100%
rename from kohana/core/utf8/strpos.php
rename to system/core/utf8/strpos.php
diff --git a/kohana/core/utf8/strrev.php b/system/core/utf8/strrev.php
similarity index 100%
rename from kohana/core/utf8/strrev.php
rename to system/core/utf8/strrev.php
diff --git a/kohana/core/utf8/strrpos.php b/system/core/utf8/strrpos.php
similarity index 100%
rename from kohana/core/utf8/strrpos.php
rename to system/core/utf8/strrpos.php
diff --git a/kohana/core/utf8/strspn.php b/system/core/utf8/strspn.php
similarity index 100%
rename from kohana/core/utf8/strspn.php
rename to system/core/utf8/strspn.php
diff --git a/kohana/core/utf8/strtolower.php b/system/core/utf8/strtolower.php
similarity index 100%
rename from kohana/core/utf8/strtolower.php
rename to system/core/utf8/strtolower.php
diff --git a/kohana/core/utf8/strtoupper.php b/system/core/utf8/strtoupper.php
similarity index 100%
rename from kohana/core/utf8/strtoupper.php
rename to system/core/utf8/strtoupper.php
diff --git a/kohana/core/utf8/substr.php b/system/core/utf8/substr.php
similarity index 100%
rename from kohana/core/utf8/substr.php
rename to system/core/utf8/substr.php
diff --git a/kohana/core/utf8/substr_replace.php b/system/core/utf8/substr_replace.php
similarity index 100%
rename from kohana/core/utf8/substr_replace.php
rename to system/core/utf8/substr_replace.php
diff --git a/kohana/core/utf8/to_unicode.php b/system/core/utf8/to_unicode.php
similarity index 100%
rename from kohana/core/utf8/to_unicode.php
rename to system/core/utf8/to_unicode.php
diff --git a/kohana/core/utf8/transliterate_to_ascii.php b/system/core/utf8/transliterate_to_ascii.php
similarity index 100%
rename from kohana/core/utf8/transliterate_to_ascii.php
rename to system/core/utf8/transliterate_to_ascii.php
diff --git a/kohana/core/utf8/trim.php b/system/core/utf8/trim.php
similarity index 100%
rename from kohana/core/utf8/trim.php
rename to system/core/utf8/trim.php
diff --git a/kohana/core/utf8/ucfirst.php b/system/core/utf8/ucfirst.php
similarity index 100%
rename from kohana/core/utf8/ucfirst.php
rename to system/core/utf8/ucfirst.php
diff --git a/kohana/core/utf8/ucwords.php b/system/core/utf8/ucwords.php
similarity index 100%
rename from kohana/core/utf8/ucwords.php
rename to system/core/utf8/ucwords.php
diff --git a/kohana/helpers/arr.php b/system/helpers/arr.php
similarity index 100%
rename from kohana/helpers/arr.php
rename to system/helpers/arr.php
diff --git a/kohana/helpers/cookie.php b/system/helpers/cookie.php
similarity index 100%
rename from kohana/helpers/cookie.php
rename to system/helpers/cookie.php
diff --git a/kohana/helpers/date.php b/system/helpers/date.php
similarity index 100%
rename from kohana/helpers/date.php
rename to system/helpers/date.php
diff --git a/kohana/helpers/download.php b/system/helpers/download.php
similarity index 100%
rename from kohana/helpers/download.php
rename to system/helpers/download.php
diff --git a/kohana/helpers/email.php b/system/helpers/email.php
similarity index 100%
rename from kohana/helpers/email.php
rename to system/helpers/email.php
diff --git a/kohana/helpers/expires.php b/system/helpers/expires.php
similarity index 100%
rename from kohana/helpers/expires.php
rename to system/helpers/expires.php
diff --git a/kohana/helpers/feed.php b/system/helpers/feed.php
similarity index 100%
rename from kohana/helpers/feed.php
rename to system/helpers/feed.php
diff --git a/kohana/helpers/file.php b/system/helpers/file.php
similarity index 100%
rename from kohana/helpers/file.php
rename to system/helpers/file.php
diff --git a/kohana/helpers/form.php b/system/helpers/form.php
similarity index 100%
rename from kohana/helpers/form.php
rename to system/helpers/form.php
diff --git a/kohana/helpers/format.php b/system/helpers/format.php
similarity index 100%
rename from kohana/helpers/format.php
rename to system/helpers/format.php
diff --git a/kohana/helpers/html.php b/system/helpers/html.php
similarity index 100%
rename from kohana/helpers/html.php
rename to system/helpers/html.php
diff --git a/kohana/helpers/inflector.php b/system/helpers/inflector.php
similarity index 100%
rename from kohana/helpers/inflector.php
rename to system/helpers/inflector.php
diff --git a/kohana/helpers/num.php b/system/helpers/num.php
similarity index 100%
rename from kohana/helpers/num.php
rename to system/helpers/num.php
diff --git a/kohana/helpers/remote.php b/system/helpers/remote.php
similarity index 100%
rename from kohana/helpers/remote.php
rename to system/helpers/remote.php
diff --git a/kohana/helpers/request.php b/system/helpers/request.php
similarity index 100%
rename from kohana/helpers/request.php
rename to system/helpers/request.php
diff --git a/kohana/helpers/security.php b/system/helpers/security.php
similarity index 100%
rename from kohana/helpers/security.php
rename to system/helpers/security.php
diff --git a/kohana/helpers/text.php b/system/helpers/text.php
similarity index 100%
rename from kohana/helpers/text.php
rename to system/helpers/text.php
diff --git a/kohana/helpers/upload.php b/system/helpers/upload.php
similarity index 100%
rename from kohana/helpers/upload.php
rename to system/helpers/upload.php
diff --git a/kohana/helpers/url.php b/system/helpers/url.php
similarity index 100%
rename from kohana/helpers/url.php
rename to system/helpers/url.php
diff --git a/kohana/helpers/valid.php b/system/helpers/valid.php
similarity index 100%
rename from kohana/helpers/valid.php
rename to system/helpers/valid.php
diff --git a/kohana/i18n/en_US/cache.php b/system/i18n/en_US/cache.php
similarity index 100%
rename from kohana/i18n/en_US/cache.php
rename to system/i18n/en_US/cache.php
diff --git a/kohana/i18n/en_US/calendar.php b/system/i18n/en_US/calendar.php
similarity index 100%
rename from kohana/i18n/en_US/calendar.php
rename to system/i18n/en_US/calendar.php
diff --git a/kohana/i18n/en_US/core.php b/system/i18n/en_US/core.php
similarity index 100%
rename from kohana/i18n/en_US/core.php
rename to system/i18n/en_US/core.php
diff --git a/kohana/i18n/en_US/database.php b/system/i18n/en_US/database.php
similarity index 100%
rename from kohana/i18n/en_US/database.php
rename to system/i18n/en_US/database.php
diff --git a/kohana/i18n/en_US/encrypt.php b/system/i18n/en_US/encrypt.php
similarity index 100%
rename from kohana/i18n/en_US/encrypt.php
rename to system/i18n/en_US/encrypt.php
diff --git a/kohana/i18n/en_US/errors.php b/system/i18n/en_US/errors.php
similarity index 100%
rename from kohana/i18n/en_US/errors.php
rename to system/i18n/en_US/errors.php
diff --git a/kohana/i18n/en_US/event.php b/system/i18n/en_US/event.php
similarity index 100%
rename from kohana/i18n/en_US/event.php
rename to system/i18n/en_US/event.php
diff --git a/kohana/i18n/en_US/image.php b/system/i18n/en_US/image.php
similarity index 100%
rename from kohana/i18n/en_US/image.php
rename to system/i18n/en_US/image.php
diff --git a/kohana/i18n/en_US/orm.php b/system/i18n/en_US/orm.php
similarity index 100%
rename from kohana/i18n/en_US/orm.php
rename to system/i18n/en_US/orm.php
diff --git a/kohana/i18n/en_US/profiler.php b/system/i18n/en_US/profiler.php
similarity index 100%
rename from kohana/i18n/en_US/profiler.php
rename to system/i18n/en_US/profiler.php
diff --git a/kohana/i18n/en_US/session.php b/system/i18n/en_US/session.php
similarity index 100%
rename from kohana/i18n/en_US/session.php
rename to system/i18n/en_US/session.php
diff --git a/kohana/i18n/en_US/upload.php b/system/i18n/en_US/upload.php
similarity index 100%
rename from kohana/i18n/en_US/upload.php
rename to system/i18n/en_US/upload.php
diff --git a/kohana/i18n/en_US/validation.php b/system/i18n/en_US/validation.php
similarity index 100%
rename from kohana/i18n/en_US/validation.php
rename to system/i18n/en_US/validation.php
diff --git a/kohana/libraries/Cache.php b/system/libraries/Cache.php
similarity index 100%
rename from kohana/libraries/Cache.php
rename to system/libraries/Cache.php
diff --git a/kohana/libraries/Controller.php b/system/libraries/Controller.php
similarity index 100%
rename from kohana/libraries/Controller.php
rename to system/libraries/Controller.php
diff --git a/kohana/libraries/Database.php b/system/libraries/Database.php
similarity index 100%
rename from kohana/libraries/Database.php
rename to system/libraries/Database.php
diff --git a/kohana/libraries/Database_Expression.php b/system/libraries/Database_Expression.php
similarity index 100%
rename from kohana/libraries/Database_Expression.php
rename to system/libraries/Database_Expression.php
diff --git a/kohana/libraries/Encrypt.php b/system/libraries/Encrypt.php
similarity index 100%
rename from kohana/libraries/Encrypt.php
rename to system/libraries/Encrypt.php
diff --git a/kohana/libraries/Event_Observer.php b/system/libraries/Event_Observer.php
similarity index 100%
rename from kohana/libraries/Event_Observer.php
rename to system/libraries/Event_Observer.php
diff --git a/kohana/libraries/Event_Subject.php b/system/libraries/Event_Subject.php
similarity index 100%
rename from kohana/libraries/Event_Subject.php
rename to system/libraries/Event_Subject.php
diff --git a/kohana/libraries/Image.php b/system/libraries/Image.php
similarity index 100%
rename from kohana/libraries/Image.php
rename to system/libraries/Image.php
diff --git a/kohana/libraries/Input.php b/system/libraries/Input.php
similarity index 100%
rename from kohana/libraries/Input.php
rename to system/libraries/Input.php
diff --git a/kohana/libraries/Model.php b/system/libraries/Model.php
similarity index 100%
rename from kohana/libraries/Model.php
rename to system/libraries/Model.php
diff --git a/kohana/libraries/ORM.php b/system/libraries/ORM.php
similarity index 100%
rename from kohana/libraries/ORM.php
rename to system/libraries/ORM.php
diff --git a/kohana/libraries/ORM_Iterator.php b/system/libraries/ORM_Iterator.php
similarity index 100%
rename from kohana/libraries/ORM_Iterator.php
rename to system/libraries/ORM_Iterator.php
diff --git a/kohana/libraries/ORM_Tree.php b/system/libraries/ORM_Tree.php
similarity index 100%
rename from kohana/libraries/ORM_Tree.php
rename to system/libraries/ORM_Tree.php
diff --git a/kohana/libraries/ORM_Versioned.php b/system/libraries/ORM_Versioned.php
similarity index 100%
rename from kohana/libraries/ORM_Versioned.php
rename to system/libraries/ORM_Versioned.php
diff --git a/kohana/libraries/Pagination.php b/system/libraries/Pagination.php
similarity index 100%
rename from kohana/libraries/Pagination.php
rename to system/libraries/Pagination.php
diff --git a/kohana/libraries/Profiler.php b/system/libraries/Profiler.php
similarity index 100%
rename from kohana/libraries/Profiler.php
rename to system/libraries/Profiler.php
diff --git a/kohana/libraries/Profiler_Table.php b/system/libraries/Profiler_Table.php
similarity index 100%
rename from kohana/libraries/Profiler_Table.php
rename to system/libraries/Profiler_Table.php
diff --git a/kohana/libraries/Router.php b/system/libraries/Router.php
similarity index 100%
rename from kohana/libraries/Router.php
rename to system/libraries/Router.php
diff --git a/kohana/libraries/Session.php b/system/libraries/Session.php
similarity index 100%
rename from kohana/libraries/Session.php
rename to system/libraries/Session.php
diff --git a/kohana/libraries/URI.php b/system/libraries/URI.php
similarity index 100%
rename from kohana/libraries/URI.php
rename to system/libraries/URI.php
diff --git a/kohana/libraries/Validation.php b/system/libraries/Validation.php
similarity index 100%
rename from kohana/libraries/Validation.php
rename to system/libraries/Validation.php
diff --git a/kohana/libraries/View.php b/system/libraries/View.php
similarity index 100%
rename from kohana/libraries/View.php
rename to system/libraries/View.php
diff --git a/kohana/libraries/drivers/Cache.php b/system/libraries/drivers/Cache.php
similarity index 100%
rename from kohana/libraries/drivers/Cache.php
rename to system/libraries/drivers/Cache.php
diff --git a/kohana/libraries/drivers/Cache/Apc.php b/system/libraries/drivers/Cache/Apc.php
similarity index 100%
rename from kohana/libraries/drivers/Cache/Apc.php
rename to system/libraries/drivers/Cache/Apc.php
diff --git a/kohana/libraries/drivers/Cache/Eaccelerator.php b/system/libraries/drivers/Cache/Eaccelerator.php
similarity index 100%
rename from kohana/libraries/drivers/Cache/Eaccelerator.php
rename to system/libraries/drivers/Cache/Eaccelerator.php
diff --git a/kohana/libraries/drivers/Cache/File.php b/system/libraries/drivers/Cache/File.php
similarity index 100%
rename from kohana/libraries/drivers/Cache/File.php
rename to system/libraries/drivers/Cache/File.php
diff --git a/kohana/libraries/drivers/Cache/Memcache.php b/system/libraries/drivers/Cache/Memcache.php
similarity index 100%
rename from kohana/libraries/drivers/Cache/Memcache.php
rename to system/libraries/drivers/Cache/Memcache.php
diff --git a/kohana/libraries/drivers/Cache/Sqlite.php b/system/libraries/drivers/Cache/Sqlite.php
similarity index 100%
rename from kohana/libraries/drivers/Cache/Sqlite.php
rename to system/libraries/drivers/Cache/Sqlite.php
diff --git a/kohana/libraries/drivers/Cache/Xcache.php b/system/libraries/drivers/Cache/Xcache.php
similarity index 100%
rename from kohana/libraries/drivers/Cache/Xcache.php
rename to system/libraries/drivers/Cache/Xcache.php
diff --git a/kohana/libraries/drivers/Captcha.php b/system/libraries/drivers/Captcha.php
similarity index 100%
rename from kohana/libraries/drivers/Captcha.php
rename to system/libraries/drivers/Captcha.php
diff --git a/kohana/libraries/drivers/Captcha/Alpha.php b/system/libraries/drivers/Captcha/Alpha.php
similarity index 100%
rename from kohana/libraries/drivers/Captcha/Alpha.php
rename to system/libraries/drivers/Captcha/Alpha.php
diff --git a/kohana/libraries/drivers/Captcha/Basic.php b/system/libraries/drivers/Captcha/Basic.php
similarity index 100%
rename from kohana/libraries/drivers/Captcha/Basic.php
rename to system/libraries/drivers/Captcha/Basic.php
diff --git a/kohana/libraries/drivers/Captcha/Black.php b/system/libraries/drivers/Captcha/Black.php
similarity index 100%
rename from kohana/libraries/drivers/Captcha/Black.php
rename to system/libraries/drivers/Captcha/Black.php
diff --git a/kohana/libraries/drivers/Captcha/Math.php b/system/libraries/drivers/Captcha/Math.php
similarity index 100%
rename from kohana/libraries/drivers/Captcha/Math.php
rename to system/libraries/drivers/Captcha/Math.php
diff --git a/kohana/libraries/drivers/Captcha/Riddle.php b/system/libraries/drivers/Captcha/Riddle.php
similarity index 100%
rename from kohana/libraries/drivers/Captcha/Riddle.php
rename to system/libraries/drivers/Captcha/Riddle.php
diff --git a/kohana/libraries/drivers/Captcha/Word.php b/system/libraries/drivers/Captcha/Word.php
similarity index 100%
rename from kohana/libraries/drivers/Captcha/Word.php
rename to system/libraries/drivers/Captcha/Word.php
diff --git a/kohana/libraries/drivers/Database.php b/system/libraries/drivers/Database.php
similarity index 100%
rename from kohana/libraries/drivers/Database.php
rename to system/libraries/drivers/Database.php
diff --git a/kohana/libraries/drivers/Database/Mssql.php b/system/libraries/drivers/Database/Mssql.php
similarity index 100%
rename from kohana/libraries/drivers/Database/Mssql.php
rename to system/libraries/drivers/Database/Mssql.php
diff --git a/kohana/libraries/drivers/Database/Mysql.php b/system/libraries/drivers/Database/Mysql.php
similarity index 100%
rename from kohana/libraries/drivers/Database/Mysql.php
rename to system/libraries/drivers/Database/Mysql.php
diff --git a/kohana/libraries/drivers/Database/Mysqli.php b/system/libraries/drivers/Database/Mysqli.php
similarity index 100%
rename from kohana/libraries/drivers/Database/Mysqli.php
rename to system/libraries/drivers/Database/Mysqli.php
diff --git a/kohana/libraries/drivers/Database/Pdosqlite.php b/system/libraries/drivers/Database/Pdosqlite.php
similarity index 100%
rename from kohana/libraries/drivers/Database/Pdosqlite.php
rename to system/libraries/drivers/Database/Pdosqlite.php
diff --git a/kohana/libraries/drivers/Database/Pgsql.php b/system/libraries/drivers/Database/Pgsql.php
similarity index 100%
rename from kohana/libraries/drivers/Database/Pgsql.php
rename to system/libraries/drivers/Database/Pgsql.php
diff --git a/kohana/libraries/drivers/Image.php b/system/libraries/drivers/Image.php
similarity index 100%
rename from kohana/libraries/drivers/Image.php
rename to system/libraries/drivers/Image.php
diff --git a/kohana/libraries/drivers/Image/GD.php b/system/libraries/drivers/Image/GD.php
similarity index 100%
rename from kohana/libraries/drivers/Image/GD.php
rename to system/libraries/drivers/Image/GD.php
diff --git a/kohana/libraries/drivers/Image/GraphicsMagick.php b/system/libraries/drivers/Image/GraphicsMagick.php
similarity index 100%
rename from kohana/libraries/drivers/Image/GraphicsMagick.php
rename to system/libraries/drivers/Image/GraphicsMagick.php
diff --git a/kohana/libraries/drivers/Image/ImageMagick.php b/system/libraries/drivers/Image/ImageMagick.php
similarity index 100%
rename from kohana/libraries/drivers/Image/ImageMagick.php
rename to system/libraries/drivers/Image/ImageMagick.php
diff --git a/kohana/libraries/drivers/Session.php b/system/libraries/drivers/Session.php
similarity index 100%
rename from kohana/libraries/drivers/Session.php
rename to system/libraries/drivers/Session.php
diff --git a/kohana/libraries/drivers/Session/Cache.php b/system/libraries/drivers/Session/Cache.php
similarity index 100%
rename from kohana/libraries/drivers/Session/Cache.php
rename to system/libraries/drivers/Session/Cache.php
diff --git a/kohana/libraries/drivers/Session/Cookie.php b/system/libraries/drivers/Session/Cookie.php
similarity index 100%
rename from kohana/libraries/drivers/Session/Cookie.php
rename to system/libraries/drivers/Session/Cookie.php
diff --git a/kohana/libraries/drivers/Session/Database.php b/system/libraries/drivers/Session/Database.php
similarity index 100%
rename from kohana/libraries/drivers/Session/Database.php
rename to system/libraries/drivers/Session/Database.php
diff --git a/kohana/views/kohana/template.php b/system/views/kohana/template.php
similarity index 100%
rename from kohana/views/kohana/template.php
rename to system/views/kohana/template.php
diff --git a/kohana/views/kohana_error_disabled.php b/system/views/kohana_error_disabled.php
similarity index 100%
rename from kohana/views/kohana_error_disabled.php
rename to system/views/kohana_error_disabled.php
diff --git a/kohana/views/kohana_error_page.php b/system/views/kohana_error_page.php
similarity index 100%
rename from kohana/views/kohana_error_page.php
rename to system/views/kohana_error_page.php
diff --git a/kohana/views/kohana_errors.css b/system/views/kohana_errors.css
similarity index 100%
rename from kohana/views/kohana_errors.css
rename to system/views/kohana_errors.css
diff --git a/kohana/views/kohana_profiler.php b/system/views/kohana_profiler.php
similarity index 100%
rename from kohana/views/kohana_profiler.php
rename to system/views/kohana_profiler.php
diff --git a/kohana/views/kohana_profiler_table.css b/system/views/kohana_profiler_table.css
similarity index 100%
rename from kohana/views/kohana_profiler_table.css
rename to system/views/kohana_profiler_table.css
diff --git a/kohana/views/kohana_profiler_table.php b/system/views/kohana_profiler_table.php
similarity index 100%
rename from kohana/views/kohana_profiler_table.php
rename to system/views/kohana_profiler_table.php