diff --git a/core/config/config.php b/application/config/config.php
similarity index 99%
rename from core/config/config.php
rename to application/config/config.php
index 49b17908..92886dbe 100644
--- a/core/config/config.php
+++ b/application/config/config.php
@@ -119,6 +119,7 @@ $config['extension_prefix'] = 'MY_';
  */
 $config['modules'] = array(
   MODPATH . 'forge',
+  MODPATH . 'gallery',
 );
 
 if (TEST_MODE) {
diff --git a/index.php b/index.php
index ae94c19f..02bd3d3d 100644
--- a/index.php
+++ b/index.php
@@ -41,7 +41,7 @@ define('KOHANA',  'index.php');
 is_link(basename(__FILE__)) and chdir(dirname(realpath(__FILE__)));
 
 // Define application and system paths
-define('APPPATH', strtr(realpath('core') . '/', DIRECTORY_SEPARATOR, '/'));
+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, '/'));
diff --git a/core/config/cookie.php b/modules/gallery/config/cookie.php
similarity index 100%
rename from core/config/cookie.php
rename to modules/gallery/config/cookie.php
diff --git a/core/config/database.php b/modules/gallery/config/database.php
similarity index 100%
rename from core/config/database.php
rename to modules/gallery/config/database.php
diff --git a/core/config/locale.php b/modules/gallery/config/locale.php
similarity index 100%
rename from core/config/locale.php
rename to modules/gallery/config/locale.php
diff --git a/core/config/routes.php b/modules/gallery/config/routes.php
similarity index 100%
rename from core/config/routes.php
rename to modules/gallery/config/routes.php
diff --git a/core/config/sendmail.php b/modules/gallery/config/sendmail.php
similarity index 100%
rename from core/config/sendmail.php
rename to modules/gallery/config/sendmail.php
diff --git a/core/config/session.php b/modules/gallery/config/session.php
similarity index 100%
rename from core/config/session.php
rename to modules/gallery/config/session.php
diff --git a/core/config/upload.php b/modules/gallery/config/upload.php
similarity index 100%
rename from core/config/upload.php
rename to modules/gallery/config/upload.php
diff --git a/core/controllers/admin.php b/modules/gallery/controllers/admin.php
similarity index 100%
rename from core/controllers/admin.php
rename to modules/gallery/controllers/admin.php
diff --git a/core/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
similarity index 100%
rename from core/controllers/admin_advanced_settings.php
rename to modules/gallery/controllers/admin_advanced_settings.php
diff --git a/core/controllers/admin_dashboard.php b/modules/gallery/controllers/admin_dashboard.php
similarity index 100%
rename from core/controllers/admin_dashboard.php
rename to modules/gallery/controllers/admin_dashboard.php
diff --git a/core/controllers/admin_graphics.php b/modules/gallery/controllers/admin_graphics.php
similarity index 100%
rename from core/controllers/admin_graphics.php
rename to modules/gallery/controllers/admin_graphics.php
diff --git a/core/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
similarity index 100%
rename from core/controllers/admin_languages.php
rename to modules/gallery/controllers/admin_languages.php
diff --git a/core/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
similarity index 100%
rename from core/controllers/admin_maintenance.php
rename to modules/gallery/controllers/admin_maintenance.php
diff --git a/core/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php
similarity index 100%
rename from core/controllers/admin_modules.php
rename to modules/gallery/controllers/admin_modules.php
diff --git a/core/controllers/admin_theme_details.php b/modules/gallery/controllers/admin_theme_details.php
similarity index 100%
rename from core/controllers/admin_theme_details.php
rename to modules/gallery/controllers/admin_theme_details.php
diff --git a/core/controllers/admin_themes.php b/modules/gallery/controllers/admin_themes.php
similarity index 100%
rename from core/controllers/admin_themes.php
rename to modules/gallery/controllers/admin_themes.php
diff --git a/core/controllers/after_install.php b/modules/gallery/controllers/after_install.php
similarity index 100%
rename from core/controllers/after_install.php
rename to modules/gallery/controllers/after_install.php
diff --git a/core/controllers/albums.php b/modules/gallery/controllers/albums.php
similarity index 100%
rename from core/controllers/albums.php
rename to modules/gallery/controllers/albums.php
diff --git a/core/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
similarity index 100%
rename from core/controllers/file_proxy.php
rename to modules/gallery/controllers/file_proxy.php
diff --git a/core/controllers/items.php b/modules/gallery/controllers/items.php
similarity index 100%
rename from core/controllers/items.php
rename to modules/gallery/controllers/items.php
diff --git a/core/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
similarity index 100%
rename from core/controllers/l10n_client.php
rename to modules/gallery/controllers/l10n_client.php
diff --git a/core/controllers/maintenance.php b/modules/gallery/controllers/maintenance.php
similarity index 100%
rename from core/controllers/maintenance.php
rename to modules/gallery/controllers/maintenance.php
diff --git a/core/controllers/move.php b/modules/gallery/controllers/move.php
similarity index 100%
rename from core/controllers/move.php
rename to modules/gallery/controllers/move.php
diff --git a/core/controllers/movies.php b/modules/gallery/controllers/movies.php
similarity index 100%
rename from core/controllers/movies.php
rename to modules/gallery/controllers/movies.php
diff --git a/core/controllers/permissions.php b/modules/gallery/controllers/permissions.php
similarity index 100%
rename from core/controllers/permissions.php
rename to modules/gallery/controllers/permissions.php
diff --git a/core/controllers/photos.php b/modules/gallery/controllers/photos.php
similarity index 100%
rename from core/controllers/photos.php
rename to modules/gallery/controllers/photos.php
diff --git a/core/controllers/quick.php b/modules/gallery/controllers/quick.php
similarity index 100%
rename from core/controllers/quick.php
rename to modules/gallery/controllers/quick.php
diff --git a/core/controllers/rest.php b/modules/gallery/controllers/rest.php
similarity index 100%
rename from core/controllers/rest.php
rename to modules/gallery/controllers/rest.php
diff --git a/core/controllers/scaffold.php b/modules/gallery/controllers/scaffold.php
similarity index 100%
rename from core/controllers/scaffold.php
rename to modules/gallery/controllers/scaffold.php
diff --git a/core/controllers/simple_uploader.php b/modules/gallery/controllers/simple_uploader.php
similarity index 100%
rename from core/controllers/simple_uploader.php
rename to modules/gallery/controllers/simple_uploader.php
diff --git a/core/css/debug.css b/modules/gallery/css/debug.css
similarity index 100%
rename from core/css/debug.css
rename to modules/gallery/css/debug.css
diff --git a/core/css/l10n_client.css b/modules/gallery/css/l10n_client.css
similarity index 100%
rename from core/css/l10n_client.css
rename to modules/gallery/css/l10n_client.css
diff --git a/core/css/quick.css b/modules/gallery/css/quick.css
similarity index 100%
rename from core/css/quick.css
rename to modules/gallery/css/quick.css
diff --git a/core/helpers/MY_remote.php b/modules/gallery/helpers/MY_remote.php
similarity index 100%
rename from core/helpers/MY_remote.php
rename to modules/gallery/helpers/MY_remote.php
diff --git a/core/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
similarity index 100%
rename from core/helpers/MY_url.php
rename to modules/gallery/helpers/MY_url.php
diff --git a/core/helpers/access.php b/modules/gallery/helpers/access.php
similarity index 100%
rename from core/helpers/access.php
rename to modules/gallery/helpers/access.php
diff --git a/core/helpers/album.php b/modules/gallery/helpers/album.php
similarity index 100%
rename from core/helpers/album.php
rename to modules/gallery/helpers/album.php
diff --git a/core/helpers/batch.php b/modules/gallery/helpers/batch.php
similarity index 100%
rename from core/helpers/batch.php
rename to modules/gallery/helpers/batch.php
diff --git a/core/helpers/block_manager.php b/modules/gallery/helpers/block_manager.php
similarity index 100%
rename from core/helpers/block_manager.php
rename to modules/gallery/helpers/block_manager.php
diff --git a/core/helpers/core.php b/modules/gallery/helpers/core.php
similarity index 100%
rename from core/helpers/core.php
rename to modules/gallery/helpers/core.php
diff --git a/core/helpers/core_block.php b/modules/gallery/helpers/core_block.php
similarity index 100%
rename from core/helpers/core_block.php
rename to modules/gallery/helpers/core_block.php
diff --git a/core/helpers/core_event.php b/modules/gallery/helpers/core_event.php
similarity index 100%
rename from core/helpers/core_event.php
rename to modules/gallery/helpers/core_event.php
diff --git a/core/helpers/core_installer.php b/modules/gallery/helpers/core_installer.php
similarity index 100%
rename from core/helpers/core_installer.php
rename to modules/gallery/helpers/core_installer.php
diff --git a/core/helpers/core_menu.php b/modules/gallery/helpers/core_menu.php
similarity index 100%
rename from core/helpers/core_menu.php
rename to modules/gallery/helpers/core_menu.php
diff --git a/core/helpers/core_search.php b/modules/gallery/helpers/core_search.php
similarity index 100%
rename from core/helpers/core_search.php
rename to modules/gallery/helpers/core_search.php
diff --git a/core/helpers/core_task.php b/modules/gallery/helpers/core_task.php
similarity index 100%
rename from core/helpers/core_task.php
rename to modules/gallery/helpers/core_task.php
diff --git a/core/helpers/core_theme.php b/modules/gallery/helpers/core_theme.php
similarity index 100%
rename from core/helpers/core_theme.php
rename to modules/gallery/helpers/core_theme.php
diff --git a/core/helpers/dir.php b/modules/gallery/helpers/dir.php
similarity index 100%
rename from core/helpers/dir.php
rename to modules/gallery/helpers/dir.php
diff --git a/core/helpers/graphics.php b/modules/gallery/helpers/graphics.php
similarity index 100%
rename from core/helpers/graphics.php
rename to modules/gallery/helpers/graphics.php
diff --git a/core/helpers/item.php b/modules/gallery/helpers/item.php
similarity index 100%
rename from core/helpers/item.php
rename to modules/gallery/helpers/item.php
diff --git a/core/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
similarity index 100%
rename from core/helpers/l10n_client.php
rename to modules/gallery/helpers/l10n_client.php
diff --git a/core/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
similarity index 100%
rename from core/helpers/l10n_scanner.php
rename to modules/gallery/helpers/l10n_scanner.php
diff --git a/core/helpers/locale.php b/modules/gallery/helpers/locale.php
similarity index 100%
rename from core/helpers/locale.php
rename to modules/gallery/helpers/locale.php
diff --git a/core/helpers/log.php b/modules/gallery/helpers/log.php
similarity index 100%
rename from core/helpers/log.php
rename to modules/gallery/helpers/log.php
diff --git a/core/helpers/message.php b/modules/gallery/helpers/message.php
similarity index 100%
rename from core/helpers/message.php
rename to modules/gallery/helpers/message.php
diff --git a/core/helpers/model_cache.php b/modules/gallery/helpers/model_cache.php
similarity index 100%
rename from core/helpers/model_cache.php
rename to modules/gallery/helpers/model_cache.php
diff --git a/core/helpers/module.php b/modules/gallery/helpers/module.php
similarity index 100%
rename from core/helpers/module.php
rename to modules/gallery/helpers/module.php
diff --git a/core/helpers/movie.php b/modules/gallery/helpers/movie.php
similarity index 100%
rename from core/helpers/movie.php
rename to modules/gallery/helpers/movie.php
diff --git a/core/helpers/photo.php b/modules/gallery/helpers/photo.php
similarity index 100%
rename from core/helpers/photo.php
rename to modules/gallery/helpers/photo.php
diff --git a/core/helpers/rest.php b/modules/gallery/helpers/rest.php
similarity index 100%
rename from core/helpers/rest.php
rename to modules/gallery/helpers/rest.php
diff --git a/core/helpers/site_status.php b/modules/gallery/helpers/site_status.php
similarity index 100%
rename from core/helpers/site_status.php
rename to modules/gallery/helpers/site_status.php
diff --git a/core/helpers/task.php b/modules/gallery/helpers/task.php
similarity index 100%
rename from core/helpers/task.php
rename to modules/gallery/helpers/task.php
diff --git a/core/helpers/theme.php b/modules/gallery/helpers/theme.php
similarity index 100%
rename from core/helpers/theme.php
rename to modules/gallery/helpers/theme.php
diff --git a/core/helpers/xml.php b/modules/gallery/helpers/xml.php
similarity index 100%
rename from core/helpers/xml.php
rename to modules/gallery/helpers/xml.php
diff --git a/core/hooks/init_gallery.php b/modules/gallery/hooks/init_gallery.php
similarity index 100%
rename from core/hooks/init_gallery.php
rename to modules/gallery/hooks/init_gallery.php
diff --git a/core/images/gallery.png b/modules/gallery/images/gallery.png
similarity index 100%
rename from core/images/gallery.png
rename to modules/gallery/images/gallery.png
diff --git a/core/images/gd.png b/modules/gallery/images/gd.png
similarity index 100%
rename from core/images/gd.png
rename to modules/gallery/images/gd.png
diff --git a/core/images/graphicsmagick.png b/modules/gallery/images/graphicsmagick.png
similarity index 100%
rename from core/images/graphicsmagick.png
rename to modules/gallery/images/graphicsmagick.png
diff --git a/core/images/imagemagick.jpg b/modules/gallery/images/imagemagick.jpg
similarity index 100%
rename from core/images/imagemagick.jpg
rename to modules/gallery/images/imagemagick.jpg
diff --git a/core/js/albums_form_add.js b/modules/gallery/js/albums_form_add.js
similarity index 100%
rename from core/js/albums_form_add.js
rename to modules/gallery/js/albums_form_add.js
diff --git a/core/js/fullsize.js b/modules/gallery/js/fullsize.js
similarity index 100%
rename from core/js/fullsize.js
rename to modules/gallery/js/fullsize.js
diff --git a/core/js/l10n_client.js b/modules/gallery/js/l10n_client.js
similarity index 100%
rename from core/js/l10n_client.js
rename to modules/gallery/js/l10n_client.js
diff --git a/core/js/quick.js b/modules/gallery/js/quick.js
similarity index 100%
rename from core/js/quick.js
rename to modules/gallery/js/quick.js
diff --git a/core/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
similarity index 100%
rename from core/libraries/Admin_View.php
rename to modules/gallery/libraries/Admin_View.php
diff --git a/core/libraries/Block.php b/modules/gallery/libraries/Block.php
similarity index 100%
rename from core/libraries/Block.php
rename to modules/gallery/libraries/Block.php
diff --git a/core/libraries/I18n.php b/modules/gallery/libraries/I18n.php
similarity index 100%
rename from core/libraries/I18n.php
rename to modules/gallery/libraries/I18n.php
diff --git a/core/libraries/MY_Database.php b/modules/gallery/libraries/MY_Database.php
similarity index 100%
rename from core/libraries/MY_Database.php
rename to modules/gallery/libraries/MY_Database.php
diff --git a/core/libraries/MY_Forge.php b/modules/gallery/libraries/MY_Forge.php
similarity index 100%
rename from core/libraries/MY_Forge.php
rename to modules/gallery/libraries/MY_Forge.php
diff --git a/core/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
similarity index 100%
rename from core/libraries/MY_ORM.php
rename to modules/gallery/libraries/MY_ORM.php
diff --git a/core/libraries/MY_Pagination.php b/modules/gallery/libraries/MY_Pagination.php
similarity index 100%
rename from core/libraries/MY_Pagination.php
rename to modules/gallery/libraries/MY_Pagination.php
diff --git a/core/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php
similarity index 100%
rename from core/libraries/MY_View.php
rename to modules/gallery/libraries/MY_View.php
diff --git a/core/libraries/Menu.php b/modules/gallery/libraries/Menu.php
similarity index 100%
rename from core/libraries/Menu.php
rename to modules/gallery/libraries/Menu.php
diff --git a/core/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
similarity index 100%
rename from core/libraries/ORM_MPTT.php
rename to modules/gallery/libraries/ORM_MPTT.php
diff --git a/core/libraries/Sendmail.php b/modules/gallery/libraries/Sendmail.php
similarity index 100%
rename from core/libraries/Sendmail.php
rename to modules/gallery/libraries/Sendmail.php
diff --git a/core/libraries/Task_Definition.php b/modules/gallery/libraries/Task_Definition.php
similarity index 100%
rename from core/libraries/Task_Definition.php
rename to modules/gallery/libraries/Task_Definition.php
diff --git a/core/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
similarity index 100%
rename from core/libraries/Theme_View.php
rename to modules/gallery/libraries/Theme_View.php
diff --git a/core/models/access_cache.php b/modules/gallery/models/access_cache.php
similarity index 100%
rename from core/models/access_cache.php
rename to modules/gallery/models/access_cache.php
diff --git a/core/models/access_intent.php b/modules/gallery/models/access_intent.php
similarity index 100%
rename from core/models/access_intent.php
rename to modules/gallery/models/access_intent.php
diff --git a/core/models/graphics_rule.php b/modules/gallery/models/graphics_rule.php
similarity index 100%
rename from core/models/graphics_rule.php
rename to modules/gallery/models/graphics_rule.php
diff --git a/core/models/incoming_translation.php b/modules/gallery/models/incoming_translation.php
similarity index 100%
rename from core/models/incoming_translation.php
rename to modules/gallery/models/incoming_translation.php
diff --git a/core/models/item.php b/modules/gallery/models/item.php
similarity index 100%
rename from core/models/item.php
rename to modules/gallery/models/item.php
diff --git a/core/models/log.php b/modules/gallery/models/log.php
similarity index 100%
rename from core/models/log.php
rename to modules/gallery/models/log.php
diff --git a/core/models/message.php b/modules/gallery/models/message.php
similarity index 100%
rename from core/models/message.php
rename to modules/gallery/models/message.php
diff --git a/core/models/module.php b/modules/gallery/models/module.php
similarity index 100%
rename from core/models/module.php
rename to modules/gallery/models/module.php
diff --git a/core/models/outgoing_translation.php b/modules/gallery/models/outgoing_translation.php
similarity index 100%
rename from core/models/outgoing_translation.php
rename to modules/gallery/models/outgoing_translation.php
diff --git a/core/models/permission.php b/modules/gallery/models/permission.php
similarity index 100%
rename from core/models/permission.php
rename to modules/gallery/models/permission.php
diff --git a/core/models/task.php b/modules/gallery/models/task.php
similarity index 100%
rename from core/models/task.php
rename to modules/gallery/models/task.php
diff --git a/core/models/theme.php b/modules/gallery/models/theme.php
similarity index 100%
rename from core/models/theme.php
rename to modules/gallery/models/theme.php
diff --git a/core/models/var.php b/modules/gallery/models/var.php
similarity index 100%
rename from core/models/var.php
rename to modules/gallery/models/var.php
diff --git a/core/module.info b/modules/gallery/module.info
similarity index 100%
rename from core/module.info
rename to modules/gallery/module.info
diff --git a/core/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
similarity index 100%
rename from core/tests/Access_Helper_Test.php
rename to modules/gallery/tests/Access_Helper_Test.php
diff --git a/core/tests/Album_Helper_Test.php b/modules/gallery/tests/Album_Helper_Test.php
similarity index 100%
rename from core/tests/Album_Helper_Test.php
rename to modules/gallery/tests/Album_Helper_Test.php
diff --git a/core/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php
similarity index 100%
rename from core/tests/Albums_Controller_Test.php
rename to modules/gallery/tests/Albums_Controller_Test.php
diff --git a/core/tests/Core_Installer_Test.php b/modules/gallery/tests/Core_Installer_Test.php
similarity index 100%
rename from core/tests/Core_Installer_Test.php
rename to modules/gallery/tests/Core_Installer_Test.php
diff --git a/core/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
similarity index 100%
rename from core/tests/Database_Test.php
rename to modules/gallery/tests/Database_Test.php
diff --git a/core/tests/Dir_Helper_Test.php b/modules/gallery/tests/Dir_Helper_Test.php
similarity index 100%
rename from core/tests/Dir_Helper_Test.php
rename to modules/gallery/tests/Dir_Helper_Test.php
diff --git a/core/tests/DrawForm_Test.php b/modules/gallery/tests/DrawForm_Test.php
similarity index 100%
rename from core/tests/DrawForm_Test.php
rename to modules/gallery/tests/DrawForm_Test.php
diff --git a/core/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
similarity index 100%
rename from core/tests/File_Structure_Test.php
rename to modules/gallery/tests/File_Structure_Test.php
diff --git a/core/tests/I18n_Test.php b/modules/gallery/tests/I18n_Test.php
similarity index 100%
rename from core/tests/I18n_Test.php
rename to modules/gallery/tests/I18n_Test.php
diff --git a/core/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
similarity index 100%
rename from core/tests/Item_Model_Test.php
rename to modules/gallery/tests/Item_Model_Test.php
diff --git a/core/tests/Menu_Test.php b/modules/gallery/tests/Menu_Test.php
similarity index 100%
rename from core/tests/Menu_Test.php
rename to modules/gallery/tests/Menu_Test.php
diff --git a/core/tests/Movie_Helper_Test.php b/modules/gallery/tests/Movie_Helper_Test.php
similarity index 100%
rename from core/tests/Movie_Helper_Test.php
rename to modules/gallery/tests/Movie_Helper_Test.php
diff --git a/core/tests/ORM_MPTT_Test.php b/modules/gallery/tests/ORM_MPTT_Test.php
similarity index 100%
rename from core/tests/ORM_MPTT_Test.php
rename to modules/gallery/tests/ORM_MPTT_Test.php
diff --git a/core/tests/Photo_Helper_Test.php b/modules/gallery/tests/Photo_Helper_Test.php
similarity index 100%
rename from core/tests/Photo_Helper_Test.php
rename to modules/gallery/tests/Photo_Helper_Test.php
diff --git a/core/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php
similarity index 100%
rename from core/tests/Photos_Controller_Test.php
rename to modules/gallery/tests/Photos_Controller_Test.php
diff --git a/core/tests/REST_Controller_Test.php b/modules/gallery/tests/REST_Controller_Test.php
similarity index 100%
rename from core/tests/REST_Controller_Test.php
rename to modules/gallery/tests/REST_Controller_Test.php
diff --git a/core/tests/REST_Helper_Test.php b/modules/gallery/tests/REST_Helper_Test.php
similarity index 100%
rename from core/tests/REST_Helper_Test.php
rename to modules/gallery/tests/REST_Helper_Test.php
diff --git a/core/tests/Sendmail_Test.php b/modules/gallery/tests/Sendmail_Test.php
similarity index 100%
rename from core/tests/Sendmail_Test.php
rename to modules/gallery/tests/Sendmail_Test.php
diff --git a/core/tests/Var_Test.php b/modules/gallery/tests/Var_Test.php
similarity index 100%
rename from core/tests/Var_Test.php
rename to modules/gallery/tests/Var_Test.php
diff --git a/core/tests/images/DSC_0003.jpg b/modules/gallery/tests/images/DSC_0003.jpg
similarity index 100%
rename from core/tests/images/DSC_0003.jpg
rename to modules/gallery/tests/images/DSC_0003.jpg
diff --git a/core/tests/images/DSC_0005.jpg b/modules/gallery/tests/images/DSC_0005.jpg
similarity index 100%
rename from core/tests/images/DSC_0005.jpg
rename to modules/gallery/tests/images/DSC_0005.jpg
diff --git a/core/tests/images/DSC_0017.jpg b/modules/gallery/tests/images/DSC_0017.jpg
similarity index 100%
rename from core/tests/images/DSC_0017.jpg
rename to modules/gallery/tests/images/DSC_0017.jpg
diff --git a/core/tests/images/DSC_0019.jpg b/modules/gallery/tests/images/DSC_0019.jpg
similarity index 100%
rename from core/tests/images/DSC_0019.jpg
rename to modules/gallery/tests/images/DSC_0019.jpg
diff --git a/core/tests/images/DSC_0067.jpg b/modules/gallery/tests/images/DSC_0067.jpg
similarity index 100%
rename from core/tests/images/DSC_0067.jpg
rename to modules/gallery/tests/images/DSC_0067.jpg
diff --git a/core/tests/images/DSC_0072.jpg b/modules/gallery/tests/images/DSC_0072.jpg
similarity index 100%
rename from core/tests/images/DSC_0072.jpg
rename to modules/gallery/tests/images/DSC_0072.jpg
diff --git a/core/tests/images/P4050088.jpg b/modules/gallery/tests/images/P4050088.jpg
similarity index 100%
rename from core/tests/images/P4050088.jpg
rename to modules/gallery/tests/images/P4050088.jpg
diff --git a/core/tests/selenium/Add_Album.html b/modules/gallery/tests/selenium/Add_Album.html
similarity index 100%
rename from core/tests/selenium/Add_Album.html
rename to modules/gallery/tests/selenium/Add_Album.html
diff --git a/core/tests/selenium/Add_Comment.html b/modules/gallery/tests/selenium/Add_Comment.html
similarity index 100%
rename from core/tests/selenium/Add_Comment.html
rename to modules/gallery/tests/selenium/Add_Comment.html
diff --git a/core/tests/selenium/Add_Item.html b/modules/gallery/tests/selenium/Add_Item.html
similarity index 100%
rename from core/tests/selenium/Add_Item.html
rename to modules/gallery/tests/selenium/Add_Item.html
diff --git a/core/tests/selenium/Login.html b/modules/gallery/tests/selenium/Login.html
similarity index 100%
rename from core/tests/selenium/Login.html
rename to modules/gallery/tests/selenium/Login.html
diff --git a/core/tests/test.jpg b/modules/gallery/tests/test.jpg
similarity index 100%
rename from core/tests/test.jpg
rename to modules/gallery/tests/test.jpg
diff --git a/core/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
similarity index 100%
rename from core/views/admin_advanced_settings.html.php
rename to modules/gallery/views/admin_advanced_settings.html.php
diff --git a/core/views/admin_block_log_entries.html.php b/modules/gallery/views/admin_block_log_entries.html.php
similarity index 100%
rename from core/views/admin_block_log_entries.html.php
rename to modules/gallery/views/admin_block_log_entries.html.php
diff --git a/core/views/admin_block_news.html.php b/modules/gallery/views/admin_block_news.html.php
similarity index 100%
rename from core/views/admin_block_news.html.php
rename to modules/gallery/views/admin_block_news.html.php
diff --git a/core/views/admin_block_photo_stream.html.php b/modules/gallery/views/admin_block_photo_stream.html.php
similarity index 100%
rename from core/views/admin_block_photo_stream.html.php
rename to modules/gallery/views/admin_block_photo_stream.html.php
diff --git a/core/views/admin_block_platform.html.php b/modules/gallery/views/admin_block_platform.html.php
similarity index 100%
rename from core/views/admin_block_platform.html.php
rename to modules/gallery/views/admin_block_platform.html.php
diff --git a/core/views/admin_block_stats.html.php b/modules/gallery/views/admin_block_stats.html.php
similarity index 100%
rename from core/views/admin_block_stats.html.php
rename to modules/gallery/views/admin_block_stats.html.php
diff --git a/core/views/admin_block_welcome.html.php b/modules/gallery/views/admin_block_welcome.html.php
similarity index 100%
rename from core/views/admin_block_welcome.html.php
rename to modules/gallery/views/admin_block_welcome.html.php
diff --git a/core/views/admin_dashboard.html.php b/modules/gallery/views/admin_dashboard.html.php
similarity index 100%
rename from core/views/admin_dashboard.html.php
rename to modules/gallery/views/admin_dashboard.html.php
diff --git a/core/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php
similarity index 100%
rename from core/views/admin_graphics.html.php
rename to modules/gallery/views/admin_graphics.html.php
diff --git a/core/views/admin_graphics_gd.html.php b/modules/gallery/views/admin_graphics_gd.html.php
similarity index 100%
rename from core/views/admin_graphics_gd.html.php
rename to modules/gallery/views/admin_graphics_gd.html.php
diff --git a/core/views/admin_graphics_graphicsmagick.html.php b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
similarity index 100%
rename from core/views/admin_graphics_graphicsmagick.html.php
rename to modules/gallery/views/admin_graphics_graphicsmagick.html.php
diff --git a/core/views/admin_graphics_imagemagick.html.php b/modules/gallery/views/admin_graphics_imagemagick.html.php
similarity index 100%
rename from core/views/admin_graphics_imagemagick.html.php
rename to modules/gallery/views/admin_graphics_imagemagick.html.php
diff --git a/core/views/admin_graphics_none.html.php b/modules/gallery/views/admin_graphics_none.html.php
similarity index 100%
rename from core/views/admin_graphics_none.html.php
rename to modules/gallery/views/admin_graphics_none.html.php
diff --git a/core/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
similarity index 100%
rename from core/views/admin_languages.html.php
rename to modules/gallery/views/admin_languages.html.php
diff --git a/core/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
similarity index 100%
rename from core/views/admin_maintenance.html.php
rename to modules/gallery/views/admin_maintenance.html.php
diff --git a/core/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
similarity index 100%
rename from core/views/admin_maintenance_task.html.php
rename to modules/gallery/views/admin_maintenance_task.html.php
diff --git a/core/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
similarity index 100%
rename from core/views/admin_modules.html.php
rename to modules/gallery/views/admin_modules.html.php
diff --git a/core/views/admin_theme_details.html.php b/modules/gallery/views/admin_theme_details.html.php
similarity index 100%
rename from core/views/admin_theme_details.html.php
rename to modules/gallery/views/admin_theme_details.html.php
diff --git a/core/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
similarity index 100%
rename from core/views/admin_themes.html.php
rename to modules/gallery/views/admin_themes.html.php
diff --git a/core/views/admin_themes_preview.html.php b/modules/gallery/views/admin_themes_preview.html.php
similarity index 100%
rename from core/views/admin_themes_preview.html.php
rename to modules/gallery/views/admin_themes_preview.html.php
diff --git a/core/views/after_install.html.php b/modules/gallery/views/after_install.html.php
similarity index 100%
rename from core/views/after_install.html.php
rename to modules/gallery/views/after_install.html.php
diff --git a/core/views/after_install_loader.html.php b/modules/gallery/views/after_install_loader.html.php
similarity index 100%
rename from core/views/after_install_loader.html.php
rename to modules/gallery/views/after_install_loader.html.php
diff --git a/core/views/form.html.php b/modules/gallery/views/form.html.php
similarity index 100%
rename from core/views/form.html.php
rename to modules/gallery/views/form.html.php
diff --git a/core/views/kohana_error_page.php b/modules/gallery/views/kohana_error_page.php
similarity index 100%
rename from core/views/kohana_error_page.php
rename to modules/gallery/views/kohana_error_page.php
diff --git a/core/views/kohana_profiler.php b/modules/gallery/views/kohana_profiler.php
similarity index 100%
rename from core/views/kohana_profiler.php
rename to modules/gallery/views/kohana_profiler.php
diff --git a/core/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
similarity index 100%
rename from core/views/l10n_client.html.php
rename to modules/gallery/views/l10n_client.html.php
diff --git a/core/views/maintenance.html.php b/modules/gallery/views/maintenance.html.php
similarity index 100%
rename from core/views/maintenance.html.php
rename to modules/gallery/views/maintenance.html.php
diff --git a/core/views/move_browse.html.php b/modules/gallery/views/move_browse.html.php
similarity index 100%
rename from core/views/move_browse.html.php
rename to modules/gallery/views/move_browse.html.php
diff --git a/core/views/move_tree.html.php b/modules/gallery/views/move_tree.html.php
similarity index 100%
rename from core/views/move_tree.html.php
rename to modules/gallery/views/move_tree.html.php
diff --git a/core/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
similarity index 100%
rename from core/views/permissions_browse.html.php
rename to modules/gallery/views/permissions_browse.html.php
diff --git a/core/views/permissions_form.html.php b/modules/gallery/views/permissions_form.html.php
similarity index 100%
rename from core/views/permissions_form.html.php
rename to modules/gallery/views/permissions_form.html.php
diff --git a/core/views/quick_pane.html.php b/modules/gallery/views/quick_pane.html.php
similarity index 100%
rename from core/views/quick_pane.html.php
rename to modules/gallery/views/quick_pane.html.php
diff --git a/core/views/scaffold.html.php b/modules/gallery/views/scaffold.html.php
similarity index 100%
rename from core/views/scaffold.html.php
rename to modules/gallery/views/scaffold.html.php
diff --git a/core/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
similarity index 100%
rename from core/views/simple_uploader.html.php
rename to modules/gallery/views/simple_uploader.html.php