323 files changed, 217 insertions, 212 deletions

diff --git a/.gitignore b/.gitignore
index a20370a7..702fa990 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 # Ignore the var subdirectory
 var
+index.local.php
+
+
 
 # Ignore the index.local.php
 index.local.php
diff --git a/core/config/config.php b/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..d8fc2742 100644
--- a/index.php
+++ b/index.php
@@ -41,10 +41,10 @@ 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, '/'));
+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/installer/init_var.php b/installer/init_var.php
index c010888c..c010888c 100644..100755
--- a/installer/init_var.php
+++ b/installer/init_var.php
diff --git a/installer/install.sql b/installer/install.sql
index 69584cdb..8ea58f1a 100644..100755
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -75,7 +75,7 @@ CREATE TABLE {graphics_rules} (
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
-INSERT INTO {graphics_rules} VALUES (1,1,'a:3:{s:5:\"width\";i:200;s:6:\"height\";i:200;s:6:\"master\";i:2;}','core','resize',100,'thumb'),(2,1,'a:3:{s:5:\"width\";i:640;s:6:\"height\";i:480;s:6:\"master\";i:2;}','core','resize',100,'resize');
+INSERT INTO {graphics_rules} VALUES (1,1,'a:3:{s:5:\"width\";i:200;s:6:\"height\";i:200;s:6:\"master\";i:2;}','gallery','resize',100,'thumb'),(2,1,'a:3:{s:5:\"width\";i:640;s:6:\"height\";i:480;s:6:\"master\";i:2;}','gallery','resize',100,'resize');
 DROP TABLE IF EXISTS {groups};
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
@@ -208,7 +208,7 @@ CREATE TABLE {modules} (
   UNIQUE KEY `name` (`name`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
-INSERT INTO {modules} VALUES (1,1,'core',1),(2,1,'user',1),(3,1,'comment',1),(4,1,'organize',1),(5,1,'info',1),(6,1,'rss',1),(7,1,'search',1),(8,1,'slideshow',1),(9,1,'tag',1);
+INSERT INTO {modules} VALUES (1,1,'gallery',1),(2,1,'user',1),(3,1,'comment',1),(4,1,'organize',1),(5,1,'info',1),(6,1,'rss',1),(7,1,'search',1),(8,1,'slideshow',1),(9,1,'tag',1);
 DROP TABLE IF EXISTS {outgoing_translations};
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
@@ -335,4 +335,4 @@ CREATE TABLE {vars} (
   UNIQUE KEY `module_name` (`module_name`,`name`)
 ) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
-INSERT INTO {vars} VALUES (1,'core','active_site_theme','default'),(2,'core','active_admin_theme','admin_default'),(3,'core','page_size','9'),(4,'core','thumb_size','200'),(5,'core','resize_size','640'),(6,'core','default_locale','en_US'),(7,'core','image_quality','75'),(9,'core','blocks_dashboard_sidebar','a:4:{i:280595051;a:2:{i:0;s:4:\"core\";i:1;s:11:\"block_adder\";}i:652858034;a:2:{i:0;s:4:\"core\";i:1;s:5:\"stats\";}i:940891777;a:2:{i:0;s:4:\"core\";i:1;s:13:\"platform_info\";}i:478383514;a:2:{i:0;s:4:\"core\";i:1;s:12:\"project_news\";}}'),(14,'core','blocks_dashboard_center','a:4:{i:1592623773;a:2:{i:0;s:4:\"core\";i:1;s:7:\"welcome\";}i:869840165;a:2:{i:0;s:4:\"core\";i:1;s:12:\"photo_stream\";}i:1904124669;a:2:{i:0;s:4:\"core\";i:1;s:11:\"log_entries\";}i:1825935772;a:2:{i:0;s:7:\"comment\";i:1;s:15:\"recent_comments\";}}'),(17,'core','version','3.0 pre-beta svn'),(18,'core','choose_default_tookit','1'),(20,'comment','spam_caught','0');
+INSERT INTO {vars} VALUES (1,'gallery','active_site_theme','default'),(2,'gallery','active_admin_theme','admin_default'),(3,'gallery','page_size','9'),(4,'gallery','thumb_size','200'),(5,'gallery','resize_size','640'),(6,'gallery','default_locale','en_US'),(7,'gallery','image_quality','75'),(9,'gallery','blocks_dashboard_sidebar','a:4:{i:280595051;a:2:{i:0;s:4:\"gallery\";i:1;s:11:\"block_adder\";}i:652858034;a:2:{i:0;s:4:\"gallery\";i:1;s:5:\"stats\";}i:940891777;a:2:{i:0;s:4:\"gallery\";i:1;s:13:\"platform_info\";}i:478383514;a:2:{i:0;s:4:\"gallery\";i:1;s:12:\"project_news\";}}'),(14,'gallery','blocks_dashboard_center','a:4:{i:1592623773;a:2:{i:0;s:4:\"gallery\";i:1;s:7:\"welcome\";}i:869840165;a:2:{i:0;s:4:\"gallery\";i:1;s:12:\"photo_stream\";}i:1904124669;a:2:{i:0;s:4:\"gallery\";i:1;s:11:\"log_entries\";}i:1825935772;a:2:{i:0;s:7:\"comment\";i:1;s:15:\"recent_comments\";}}'),(17,'gallery','version','3.0 pre-beta svn'),(18,'gallery','choose_default_tookit','1'),(20,'comment','spam_caught','0');
diff --git a/installer/installer.php b/installer/installer.php
index 84adc5f9..38fde1fe 100644
--- a/installer/installer.php
+++ b/installer/installer.php
@@ -122,7 +122,7 @@ class installer {
   static function create_private_key($config) {
     $key = md5(uniqid(mt_rand(), true)) . md5(uniqid(mt_rand(), true));
     $sql = self::prepend_prefix($config["prefix"],
-       "INSERT INTO {vars} VALUES(NULL, 'core', 'private_key', '$key')");
+       "INSERT INTO {vars} VALUES(NULL, 'gallery', 'private_key', '$key')");
     if (mysql_query($sql)) {
     } else {
       throw new Exception(mysql_error());
diff --git a/installer/views/install.html.php b/installer/views/install.html.php
index c3b9686d..18060219 100644
--- a/installer/views/install.html.php
+++ b/installer/views/install.html.php
@@ -6,7 +6,7 @@
   </head>
   <body>
     <div id="outer">
-      <img src="../core/images/gallery.png" />
+      <img src="../modules/gallery/images/gallery.png" />
       <div id="inner">
         <?php print $content ?>
       </div>
diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php
index f17660ae..25894291 100644
--- a/modules/g2_import/controllers/admin_g2_import.php
+++ b/modules/g2_import/controllers/admin_g2_import.php
@@ -32,8 +32,8 @@ class Admin_g2_import_Controller extends Admin_Controller {
     if (g2_import::is_initialized()) {
       $view->content->g2_stats = $g2_stats;
       $view->content->g2_sizes = $g2_sizes;
-      $view->content->thumb_size = module::get_var("core", "thumb_size");
-      $view->content->resize_size = module::get_var("core", "resize_size");
+      $view->content->thumb_size = module::get_var("gallery", "thumb_size");
+      $view->content->resize_size = module::get_var("gallery", "resize_size");
     }
     print $view;
   }
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 37efcad0..dd23d7a0 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -481,8 +481,8 @@ class g2_import_Core {
     $g2_item_id = self::$current_g2_item->getId();
     $derivatives = g2(GalleryCoreApi::fetchDerivativesByItemIds(array($g2_item_id)));
 
-    $target_thumb_size = module::get_var("core", "thumb_size");
-    $target_resize_size = module::get_var("core", "resize_size");
+    $target_thumb_size = module::get_var("gallery", "thumb_size");
+    $target_resize_size = module::get_var("gallery", "resize_size");
     foreach ($derivatives[$g2_item_id] as $derivative) {
       if ($derivative->getPostFilterOperations()) {
         // Let's assume for now that this is a watermark operation, which we can't handle.
diff --git a/core/config/cookie.php b/modules/gallery/config/cookie.php
index 692ef548..692ef548 100644
--- a/core/config/cookie.php
+++ b/modules/gallery/config/cookie.php
diff --git a/core/config/database.php b/modules/gallery/config/database.php
index c20ccdb0..c20ccdb0 100644
--- a/core/config/database.php
+++ b/modules/gallery/config/database.php
diff --git a/core/config/locale.php b/modules/gallery/config/locale.php
index 4789dc2b..4789dc2b 100644
--- a/core/config/locale.php
+++ b/modules/gallery/config/locale.php
diff --git a/core/config/routes.php b/modules/gallery/config/routes.php
index 0272ca15..0272ca15 100644
--- a/core/config/routes.php
+++ b/modules/gallery/config/routes.php
diff --git a/core/config/sendmail.php b/modules/gallery/config/sendmail.php
index a4fa76ef..a4fa76ef 100644
--- a/core/config/sendmail.php
+++ b/modules/gallery/config/sendmail.php
diff --git a/core/config/session.php b/modules/gallery/config/session.php
index 990fa31f..990fa31f 100644
--- a/core/config/session.php
+++ b/modules/gallery/config/session.php
diff --git a/core/config/upload.php b/modules/gallery/config/upload.php
index 897ecacf..897ecacf 100644
--- a/core/config/upload.php
+++ b/modules/gallery/config/upload.php
diff --git a/core/controllers/admin.php b/modules/gallery/controllers/admin.php
index af0f387a..af0f387a 100644
--- a/core/controllers/admin.php
+++ b/modules/gallery/controllers/admin.php
diff --git a/core/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index 79bc1183..79bc1183 100644
--- a/core/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
diff --git a/core/controllers/admin_dashboard.php b/modules/gallery/controllers/admin_dashboard.php
index d2d2f79b..a1090a6d 100644
--- a/core/controllers/admin_dashboard.php
+++ b/modules/gallery/controllers/admin_dashboard.php
@@ -29,7 +29,7 @@ class Admin_Dashboard_Controller extends Admin_Controller {
   }
 
   public function add_block() {
-    $form = core_block::get_add_block_form();
+    $form = gallery_block::get_add_block_form();
     if ($form->validate()) {
       list ($module_name, $id) = explode(":", $form->add_block->id->value);
       $available = block_manager::get_available();
diff --git a/core/controllers/admin_graphics.php b/modules/gallery/controllers/admin_graphics.php
index 0b3014f0..7e8ef47c 100644
--- a/core/controllers/admin_graphics.php
+++ b/modules/gallery/controllers/admin_graphics.php
@@ -24,7 +24,7 @@ class Admin_Graphics_Controller extends Admin_Controller {
     $view->content->available = "";
 
     $tk = new ArrayObject(graphics::detect_toolkits(), ArrayObject::ARRAY_AS_PROPS);
-    $active = module::get_var("core", "graphics_toolkit", "none");
+    $active = module::get_var("gallery", "graphics_toolkit", "none");
     foreach (array("gd", "imagemagick", "graphicsmagick", "none") as $id) {
       if ($id == $active) {
         $view->content->active = new View("admin_graphics_$id.html");
@@ -43,12 +43,12 @@ class Admin_Graphics_Controller extends Admin_Controller {
 
   public function choose($toolkit) {
     access::verify_csrf();
-    if ($toolkit != module::get_var("core", "graphics_toolkit")) {
-      module::set_var("core", "graphics_toolkit", $toolkit);
+    if ($toolkit != module::get_var("gallery", "graphics_toolkit")) {
+      module::set_var("gallery", "graphics_toolkit", $toolkit);
 
       $toolkit_info = graphics::detect_toolkits();
       if ($toolkit == "graphicsmagick" || $toolkit == "imagemagick") {
-        module::set_var("core", "graphics_toolkit_path", $toolkit_info[$toolkit]);
+        module::set_var("gallery", "graphics_toolkit_path", $toolkit_info[$toolkit]);
       }
 
       site_status::clear("missing_graphics_toolkit");
diff --git a/core/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index 37d335a3..1dea733c 100644
--- a/core/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -33,7 +33,7 @@ class Admin_Languages_Controller extends Admin_Controller {
   public function save() {
     $form = $this->_languages_form();
     if ($form->validate()) {
-      module::set_var("core", "default_locale", $form->choose_language->locale->value);
+      module::set_var("gallery", "default_locale", $form->choose_language->locale->value);
       locale::update_installed($form->choose_language->installed_locales->value);
       message::success(t("Settings saved"));
     }
@@ -76,7 +76,7 @@ class Admin_Languages_Controller extends Admin_Controller {
           message::success(t("Your API key has been saved."));
         }
 
-        log::success(t("core"), t("l10n_client API key changed."));
+        log::success(t("gallery"), t("l10n_client API key changed."));
         url::redirect("admin/languages");
     } else {
       // Show the page with form errors
@@ -92,7 +92,7 @@ class Admin_Languages_Controller extends Admin_Controller {
       ->label(t("Language settings"));
     $group->dropdown("locale")
       ->options($installed_locales)
-      ->selected(module::get_var("core", "default_locale"))
+      ->selected(module::get_var("gallery", "default_locale"))
       ->label(t("Default language"))
       ->rules('required');
 
diff --git a/core/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index c169de75..c169de75 100644
--- a/core/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
diff --git a/core/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php
index f7dd909d..f7dd909d 100644
--- a/core/controllers/admin_modules.php
+++ b/modules/gallery/controllers/admin_modules.php
diff --git a/core/controllers/admin_theme_details.php b/modules/gallery/controllers/admin_theme_details.php
index 542ec31c..fec1311b 100644
--- a/core/controllers/admin_theme_details.php
+++ b/modules/gallery/controllers/admin_theme_details.php
@@ -28,32 +28,32 @@ class Admin_Theme_Details_Controller extends Admin_Controller {
   public function save() {
     $form = theme::get_edit_form_admin();
     if ($form->validate()) {
-      module::set_var("core", "page_size", $form->edit_theme->page_size->value);
+      module::set_var("gallery", "page_size", $form->edit_theme->page_size->value);
 
       $thumb_size = $form->edit_theme->thumb_size->value;
       $thumb_dirty = false;
-      if (module::get_var("core", "thumb_size") != $thumb_size) {
-        graphics::remove_rule("core", "thumb", "resize");
+      if (module::get_var("gallery", "thumb_size") != $thumb_size) {
+        graphics::remove_rule("gallery", "thumb", "resize");
         graphics::add_rule(
-          "core", "thumb", "resize",
+          "gallery", "thumb", "resize",
           array("width" => $thumb_size, "height" => $thumb_size, "master" => Image::AUTO),
           100);
-        module::set_var("core", "thumb_size", $thumb_size);
+        module::set_var("gallery", "thumb_size", $thumb_size);
       }
 
       $resize_size = $form->edit_theme->resize_size->value;
       $resize_dirty = false;
-      if (module::get_var("core", "resize_size") != $resize_size) {
-        graphics::remove_rule("core", "resize", "resize");
+      if (module::get_var("gallery", "resize_size") != $resize_size) {
+        graphics::remove_rule("gallery", "resize", "resize");
         graphics::add_rule(
-          "core", "resize", "resize",
+          "gallery", "resize", "resize",
           array("width" => $resize_size, "height" => $resize_size, "master" => Image::AUTO),
           100);
-        module::set_var("core", "resize_size", $resize_size);
+        module::set_var("gallery", "resize_size", $resize_size);
       }
 
-      module::set_var("core", "header_text", $form->edit_theme->header_text->value);
-      module::set_var("core", "footer_text", $form->edit_theme->footer_text->value);
+      module::set_var("gallery", "header_text", $form->edit_theme->header_text->value);
+      module::set_var("gallery", "footer_text", $form->edit_theme->footer_text->value);
 
       message::success(t("Updated theme details"));
       url::redirect("admin/theme_details");
diff --git a/core/controllers/admin_themes.php b/modules/gallery/controllers/admin_themes.php
index 05c134d1..aef6c2d1 100644
--- a/core/controllers/admin_themes.php
+++ b/modules/gallery/controllers/admin_themes.php
@@ -21,8 +21,8 @@ class Admin_Themes_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_themes.html");
-    $view->content->admin = module::get_var("core", "active_admin_theme");
-    $view->content->site = module::get_var("core", "active_site_theme");
+    $view->content->admin = module::get_var("gallery", "active_admin_theme");
+    $view->content->site = module::get_var("gallery", "active_site_theme");
     $view->content->themes = $this->_get_themes();
     print $view;
   }
@@ -64,11 +64,11 @@ class Admin_Themes_Controller extends Admin_Controller {
       parse_ini_file(THEMEPATH . "$theme_name/theme.info"), ArrayObject::ARRAY_AS_PROPS);
 
     if ($type == "admin" && $info->admin) {
-      module::set_var("core", "active_admin_theme", $theme_name);
+      module::set_var("gallery", "active_admin_theme", $theme_name);
       message::success(t("Successfully changed your admin theme to <b>%theme_name</b>",
                          array("theme_name" => $info->name)));
     } else if ($type == "site" && $info->site) {
-      module::set_var("core", "active_site_theme", $theme_name);
+      module::set_var("gallery", "active_site_theme", $theme_name);
       message::success(t("Successfully changed your Gallery theme to <b>%theme_name</b>",
                          array("theme_name" => $info->name)));
     }
diff --git a/core/controllers/after_install.php b/modules/gallery/controllers/after_install.php
index f066afe4..f066afe4 100644
--- a/core/controllers/after_install.php
+++ b/modules/gallery/controllers/after_install.php
diff --git a/core/controllers/albums.php b/modules/gallery/controllers/albums.php
index 5b4d5979..03a64f43 100644
--- a/core/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -32,7 +32,7 @@ class Albums_Controller extends Items_Controller {
       }
     }
 
-    $page_size = module::get_var("core", "page_size", 9);
+    $page_size = module::get_var("gallery", "page_size", 9);
     $show = $this->input->get("show");
 
     if ($show) {
@@ -114,7 +114,7 @@ class Albums_Controller extends Items_Controller {
     } else {
       print json_encode(
         array("result" => "error",
-              "form" => $form->__toString() . html::script("core/js/albums_form_add.js")));
+              "form" => $form->__toString() . html::script("gallery/js/albums_form_add.js")));
     }
   }
 
@@ -206,7 +206,7 @@ class Albums_Controller extends Items_Controller {
     switch ($this->input->get("type")) {
     case "album":
       print album::get_add_form($album) .
-        html::script("core/js/albums_form_add.js");
+        html::script("gallery/js/albums_form_add.js");
       break;
 
     case "photo":
diff --git a/core/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index f3c5f109..f3c5f109 100644
--- a/core/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
diff --git a/core/controllers/items.php b/modules/gallery/controllers/items.php
index 13891726..13891726 100644
--- a/core/controllers/items.php
+++ b/modules/gallery/controllers/items.php
diff --git a/core/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 17520051..17520051 100644
--- a/core/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
diff --git a/core/controllers/maintenance.php b/modules/gallery/controllers/maintenance.php
index b5f39bed..b5f39bed 100644
--- a/core/controllers/maintenance.php
+++ b/modules/gallery/controllers/maintenance.php
diff --git a/core/controllers/move.php b/modules/gallery/controllers/move.php
index 130c247f..130c247f 100644
--- a/core/controllers/move.php
+++ b/modules/gallery/controllers/move.php
diff --git a/core/controllers/movies.php b/modules/gallery/controllers/movies.php
index 55bbb0e5..55bbb0e5 100644
--- a/core/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
diff --git a/core/controllers/permissions.php b/modules/gallery/controllers/permissions.php
index b0cee303..b0cee303 100644
--- a/core/controllers/permissions.php
+++ b/modules/gallery/controllers/permissions.php
diff --git a/core/controllers/photos.php b/modules/gallery/controllers/photos.php
index 5d4040cf..5d4040cf 100644
--- a/core/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
diff --git a/core/controllers/quick.php b/modules/gallery/controllers/quick.php
index 643dce30..643dce30 100644
--- a/core/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
diff --git a/core/controllers/rest.php b/modules/gallery/controllers/rest.php
index 11a6bbac..11a6bbac 100644
--- a/core/controllers/rest.php
+++ b/modules/gallery/controllers/rest.php
diff --git a/core/controllers/scaffold.php b/modules/gallery/controllers/scaffold.php
index f0063725..5b8f9aa9 100644
--- a/core/controllers/scaffold.php
+++ b/modules/gallery/controllers/scaffold.php
@@ -80,7 +80,7 @@ class Scaffold_Controller extends Template_Controller {
     $parents = ORM::factory("item")->where("type", "album")->find_all()->as_array();
     $owner_id = user::active()->id;
 
-    $test_images = glob(APPPATH . "tests/images/*.[Jj][Pp][Gg]");
+    $test_images = glob(MODPATH . "gallery/tests/images/*.[Jj][Pp][Gg]");
 
     batch::start();
     $album_count = $photo_count = 0;
@@ -94,7 +94,7 @@ class Scaffold_Controller extends Template_Controller {
         $type = rand(0, 10) ? "photo" : "album";
       }
       if ($type == "album") {
-        $thumb_size = module::get_var("core", "thumb_size");
+        $thumb_size = module::get_var("gallery", "thumb_size");
         $parents[] = album::create(
           $parent, "rnd_" . rand(), "Rnd $i", "random album $i", $owner_id)
           ->save();
@@ -262,7 +262,7 @@ class Scaffold_Controller extends Template_Controller {
     }
 
     foreach ($to_install as $module_name) {
-      if ($module_name != "core") {
+      if ($module_name != "gallery") {
         require_once(DOCROOT . "modules/${module_name}/helpers/${module_name}_installer.php");
       }
       module::install($module_name);
@@ -300,7 +300,7 @@ class Scaffold_Controller extends Template_Controller {
     srand(0);
 
     try {
-      core_installer::install(true);
+      gallery_installer::install(true);
       module::load_modules();
 
       foreach (array("user", "comment", "organize", "info", "rss",
@@ -325,7 +325,7 @@ class Scaffold_Controller extends Template_Controller {
     $db = Database::instance();
     $db->query("TRUNCATE {sessions}");
     $db->query("TRUNCATE {logs}");
-    $db->query("DELETE FROM {vars} WHERE `module_name` = 'core' AND `name` = '_cache'");
+    $db->query("DELETE FROM {vars} WHERE `module_name` = 'gallery' AND `name` = '_cache'");
     $db->update("users", array("password" => ""), array("id" => 1));
     $db->update("users", array("password" => ""), array("id" => 2));
 
diff --git a/core/controllers/simple_uploader.php b/modules/gallery/controllers/simple_uploader.php
index bdf9582f..bdf9582f 100644
--- a/core/controllers/simple_uploader.php
+++ b/modules/gallery/controllers/simple_uploader.php
diff --git a/core/css/debug.css b/modules/gallery/css/debug.css
index fe5665ad..fe5665ad 100644
--- a/core/css/debug.css
+++ b/modules/gallery/css/debug.css
diff --git a/core/css/l10n_client.css b/modules/gallery/css/l10n_client.css
index 8973715f..8973715f 100644
--- a/core/css/l10n_client.css
+++ b/modules/gallery/css/l10n_client.css
diff --git a/core/css/quick.css b/modules/gallery/css/quick.css
index 02f9953e..02f9953e 100644
--- a/core/css/quick.css
+++ b/modules/gallery/css/quick.css
diff --git a/core/helpers/MY_remote.php b/modules/gallery/helpers/MY_remote.php
index 4abf5bf1..4abf5bf1 100644
--- a/core/helpers/MY_remote.php
+++ b/modules/gallery/helpers/MY_remote.php
diff --git a/core/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index 81dcbe1e..5e8bfc9e 100644
--- a/core/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -50,7 +50,7 @@ class url extends url_Core {
 
     if (!empty($item)) {
       Router::$controller = "{$item->type}s";
-      Router::$controller_path = APPPATH . "controllers/{$item->type}s.php";
+      Router::$controller_path = MODPATH . "gallery/controllers/{$item->type}s.php";
       Router::$method = $item->id;
     }
   }
diff --git a/core/helpers/access.php b/modules/gallery/helpers/access.php
index 64ce91fa..c48f0b79 100644
--- a/core/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -389,7 +389,7 @@ class access_Core {
    * @return ORM_Iterator
    */
   private static function _get_all_groups() {
-    // When we build the core package, it's possible that the user module is not installed yet.
+    // When we build the gallery package, it's possible that the user module is not installed yet.
     // This is ok at packaging time, so work around it.
     if (module::is_active("user")) {
       return ORM::factory("group")->find_all();
@@ -595,7 +595,7 @@ class access_Core {
   }
 
   static function private_key() {
-    return module::get_var("core", "private_key");
+    return module::get_var("gallery", "private_key");
   }
 
   /**
diff --git a/core/helpers/album.php b/modules/gallery/helpers/album.php
index 362b93d0..362b93d0 100644
--- a/core/helpers/album.php
+++ b/modules/gallery/helpers/album.php
diff --git a/core/helpers/batch.php b/modules/gallery/helpers/batch.php
index 0faa3369..0faa3369 100644
--- a/core/helpers/batch.php
+++ b/modules/gallery/helpers/batch.php
diff --git a/core/helpers/block_manager.php b/modules/gallery/helpers/block_manager.php
index 022626e5..20b641d4 100644
--- a/core/helpers/block_manager.php
+++ b/modules/gallery/helpers/block_manager.php
@@ -19,11 +19,11 @@
  */
 class block_manager_Core {
   static function get_active($location) {
-    return unserialize(module::get_var("core", "blocks_$location", "a:0:{}"));
+    return unserialize(module::get_var("gallery", "blocks_$location", "a:0:{}"));
   }
 
   static function set_active($location, $blocks) {
-    module::set_var("core", "blocks_$location", serialize($blocks));
+    module::set_var("gallery", "blocks_$location", serialize($blocks));
   }
 
   static function add($location, $module_name, $block_id) {
diff --git a/core/helpers/dir.php b/modules/gallery/helpers/dir.php
index 1717bdd9..1717bdd9 100644
--- a/core/helpers/dir.php
+++ b/modules/gallery/helpers/dir.php
diff --git a/core/helpers/core.php b/modules/gallery/helpers/gallery.php
index 63f51f86..34671f1f 100644
--- a/core/helpers/core.php
+++ b/modules/gallery/helpers/gallery.php
@@ -17,17 +17,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class core_Core {
+class gallery_Core {
   /**
    * If Gallery is in maintenance mode, then force all non-admins to get routed to a "This site is
    * down for maintenance" page.
    */
   static function maintenance_mode() {
-    $maintenance_mode = Kohana::config("core.maintenance_mode", false, false);
+    $maintenance_mode = Kohana::config("gallery.maintenance_mode", false, false);
 
     if (Router::$controller != "login" && !empty($maintenance_mode) && !user::active()->admin) {
       Router::$controller = "maintenance";
-      Router::$controller_path = APPPATH . "controllers/maintenance.php";
+      Router::$controller_path = MODPATH . "gallery/controllers/maintenance.php";
       Router::$method = "index";
     }
   }
diff --git a/core/helpers/core_block.php b/modules/gallery/helpers/gallery_block.php
index 0e2e9c54..abc8a195 100644
--- a/core/helpers/core_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class core_block_Core {
+class gallery_block_Core {
   static function get_list() {
     return array(
       "welcome" => t("Welcome to Gallery 3!"),
diff --git a/core/helpers/core_event.php b/modules/gallery/helpers/gallery_event.php
index bbb53cc9..aa11b7c0 100644
--- a/core/helpers/core_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-class core_event_Core {
+class gallery_event_Core {
   static function group_created($group) {
     access::add_group($group);
   }
@@ -38,9 +38,9 @@ class core_event_Core {
   static function user_login($user) {
     // If this user is an admin, check to see if there are any post-install tasks that we need
     // to run and take care of those now.
-    if ($user->admin && module::get_var("core", "choose_default_tookit", null)) {
+    if ($user->admin && module::get_var("gallery", "choose_default_tookit", null)) {
       graphics::choose_default_toolkit();
-      module::clear_var("core", "choose_default_tookit");
+      module::clear_var("gallery", "choose_default_tookit");
     }
   }
 }
diff --git a/core/helpers/core_installer.php b/modules/gallery/helpers/gallery_installer.php
index cffcbedb..e3aa403f 100644
--- a/core/helpers/core_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class core_installer {
+class gallery__installer {
   static function install($initial_install=false) {
     $db = Database::instance();
     if ($initial_install) {
       $version = 0;
     } else {
-      $version = module::get_version("core");
+      $version = module::get_version("gallery");
     }
 
     if ($version == 0) {
@@ -212,21 +212,21 @@ class core_installer {
       $root->save();
       access::add_item($root);
 
-      module::set_var("core", "active_site_theme", "default");
-      module::set_var("core", "active_admin_theme", "admin_default");
-      module::set_var("core", "page_size", 9);
-      module::set_var("core", "thumb_size", 200);
-      module::set_var("core", "resize_size", 640);
-      module::set_var("core", "default_locale", "en_US");
-      module::set_var("core", "image_quality", 75);
+      module::set_var("gallery", "active_site_theme", "default");
+      module::set_var("gallery", "active_admin_theme", "admin_default");
+      module::set_var("gallery", "page_size", 9);
+      module::set_var("gallery", "thumb_size", 200);
+      module::set_var("gallery", "resize_size", 640);
+      module::set_var("gallery", "default_locale", "en_US");
+      module::set_var("gallery", "image_quality", 75);
 
       // Add rules for generating our thumbnails and resizes
       graphics::add_rule(
-        "core", "thumb", "resize",
+        "gallery", "thumb", "resize",
         array("width" => 200, "height" => 200, "master" => Image::AUTO),
         100);
       graphics::add_rule(
-        "core", "resize", "resize",
+        "gallery", "resize", "resize",
         array("width" => 640, "height" => 480, "master" => Image::AUTO),
         100);
 
@@ -240,17 +240,17 @@ class core_installer {
         $theme->save();
       }
 
-      block_manager::add("dashboard_sidebar", "core", "block_adder");
-      block_manager::add("dashboard_sidebar", "core", "stats");
-      block_manager::add("dashboard_sidebar", "core", "platform_info");
-      block_manager::add("dashboard_sidebar", "core", "project_news");
-      block_manager::add("dashboard_center", "core", "welcome");
-      block_manager::add("dashboard_center", "core", "photo_stream");
-      block_manager::add("dashboard_center", "core", "log_entries");
+      block_manager::add("dashboard_sidebar", "gallery", "block_adder");
+      block_manager::add("dashboard_sidebar", "gallery", "stats");
+      block_manager::add("dashboard_sidebar", "gallery", "platform_info");
+      block_manager::add("dashboard_sidebar", "gallery", "project_news");
+      block_manager::add("dashboard_center", "gallery", "welcome");
+      block_manager::add("dashboard_center", "gallery", "photo_stream");
+      block_manager::add("dashboard_center", "gallery", "log_entries");
 
-      module::set_version("core", 1);
-      module::set_var("core", "version", "3.0 pre-beta svn");
-      module::set_var("core", "choose_default_tookit", 1);
+      module::set_version("gallery", 1);
+      module::set_var("gallery", "version", "3.0 pre-beta git");
+      module::set_var("gallery", "choose_default_tookit", 1);
     }
   }
 
diff --git a/core/helpers/core_menu.php b/modules/gallery/helpers/gallery_menu.php
index eb208560..1dc9cb41 100644
--- a/core/helpers/core_menu.php
+++ b/modules/gallery/helpers/gallery_menu.php
@@ -17,9 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class core_menu_Core {
+class gallery_menu_Core {
   static function site($menu, $theme) {
-    if (file_exists(APPPATH . "controllers/scaffold.php") && user::active()->admin) {
+    if (file_exists(MODPATH . "gallery/controllers/scaffold.php") && user::active()->admin) {
       $menu->append($scaffold_menu = Menu::factory("submenu")
                     ->id("scaffold")
                     ->label("Scaffold"));
@@ -74,7 +74,7 @@ class core_menu_Core {
                     ->label(t("Admin")));
       self::admin($admin_menu, $theme);
       foreach (module::active() as $module) {
-        if ($module->name == "core") {
+        if ($module->name == "gallery") {
           continue;
         }
         $class = "{$module->name}_menu";
diff --git a/core/helpers/core_search.php b/modules/gallery/helpers/gallery_search.php
index 9957a493..2a4029d3 100644
--- a/core/helpers/core_search.php
+++ b/modules/gallery/helpers/gallery_search.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Core_Search_Core {
+class gallery_search_Core {
   static function item_index_data($item) {
     return join(" ", array($item->description, $item->name, $item->title));
   }
diff --git a/core/helpers/core_task.php b/modules/gallery/helpers/gallery_task.php
index e078192c..6046bfc4 100644
--- a/core/helpers/core_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class core_task_Core {
+class gallery_task_Core {
   static function available_tasks() {
     $dirty_count = graphics::find_dirty_images_query()->count();
     $tasks = array();
     $tasks[] = Task_Definition::factory()
-                 ->callback("core_task::rebuild_dirty_images")
+                 ->callback("gallery_task::rebuild_dirty_images")
                  ->name(t("Rebuild Images"))
                  ->description($dirty_count ?
                                t2("You have one out of date photo",
@@ -32,7 +32,7 @@ class core_task_Core {
       ->severity($dirty_count ? log::WARNING : log::SUCCESS);
 
     $tasks[] = Task_Definition::factory()
-                 ->callback("core_task::update_l10n")
+                 ->callback("gallery_task::update_l10n")
                  ->name(t("Update translations"))
                  ->description(t("Download new and updated translated strings"))
       ->severity(log::SUCCESS);
@@ -92,7 +92,7 @@ class core_task_Core {
 
     switch ($task->get("mode", "init")) {
     case "init":  // 0%
-      $dirs = array("core", "modules", "themes", "installer");
+      $dirs = array("gallery", "modules", "themes", "installer");
       $files = array();
       $task->set("mode", "find_files");
       $task->status = t("Finding files");
diff --git a/core/helpers/core_theme.php b/modules/gallery/helpers/gallery_theme.php
index 28f544a1..0acccb45 100644
--- a/core/helpers/core_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -17,36 +17,36 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class core_theme_Core {
+class gallery_theme_Core {
   static function head($theme) {
     $session = Session::instance();
     $buf = "";
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
-        url::file("core/css/debug.css") . "\" />";
+        url::file("gallery/css/debug.css") . "\" />";
     }
     if (($theme->page_type == "album" || $theme->page_type == "photo")
         && access::can("edit", $theme->item())) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
-        url::file("core/css/quick.css") . "\" />";
-      $buf .= html::script("core/js/quick.js");
+        url::file("gallery/css/quick.css") . "\" />";
+      $buf .= html::script("gallery/js/quick.js");
     }
     if ($theme->page_type == "photo" && access::can("view_full", $theme->item())) {
       $buf .= "<script type=\"text/javascript\" >" .
               "  var fullsize_detail = { " .
-              "    close: \"" . url::file("core/images/ico-close.png") . "\", " .
+              "    close: \"" . url::file("gallery/images/ico-close.png") . "\", " .
               "    url: \"" . $theme->item()->file_url() . "\", " .
               "    width: " . $theme->item()->width . ", " .
               "    height: " . $theme->item()->height . "};" .
               "</script>";
-      $buf .= html::script("core/js/fullsize.js");
+      $buf .= html::script("gallery/js/fullsize.js");
     }
 
     if ($session->get("l10n_mode", false)) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
-        url::file("core/css/l10n_client.css") . "\" />";
+        url::file("gallery/css/l10n_client.css") . "\" />";
       $buf .= html::script("lib/jquery.cookie.js");
-      $buf .= html::script("core/js/l10n_client.js");
+      $buf .= html::script("gallery/js/l10n_client.js");
     }
 
     return $buf;
@@ -83,14 +83,14 @@ class core_theme_Core {
     $buf = "";
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
-        url::file("core/css/debug.css") . "\" />";
+        url::file("gallery/css/debug.css") . "\" />";
     }
 
     if ($session->get("l10n_mode", false)) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
-        url::file("core/css/l10n_client.css") . "\" />";
+        url::file("gallery/css/l10n_client.css") . "\" />";
       $buf .= html::script("lib/jquery.cookie.js");
-      $buf .= html::script("core/js/l10n_client.js");
+      $buf .= html::script("gallery/js/l10n_client.js");
     }
 
     return $buf;
@@ -127,11 +127,11 @@ class core_theme_Core {
     return "<li class=\"first\">" .
       t("Powered by <a href=\"%url\">Gallery %version</a>",
         array("url" => "http://gallery.menalto.com",
-              "version" => module::get_var("core", "version"))) .
+              "version" => module::get_var("gallery", "version"))) .
       "</li>";
   }
 
   static function admin_credits() {
-    return core_theme::credits();
+    return gallery_theme::credits();
   }
 }
\ No newline at end of file
diff --git a/core/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 805a95c0..605b9ff8 100644
--- a/core/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -26,11 +26,11 @@ class graphics_Core {
    * Rules are applied to targets (thumbnails and resizes) in priority order.  Rules are functions
    * in the graphics class.  So for example, the following rule:
    *
-   *   graphics::add_rule("core", "thumb", "resize",
+   *   graphics::add_rule("gallery", "thumb", "resize",
    *                       array("width" => 200, "height" => 200, "master" => Image::AUTO), 100);
    *
-   * Specifies that "core" is adding a rule to resize thumbnails down to a max of 200px on
-   * the longest side.  The core module adds default rules at a priority of 100.  You can set
+   * Specifies that "gallery" is adding a rule to resize thumbnails down to a max of 200px on
+   * the longest side.  The gallery module adds default rules at a priority of 100.  You can set
    * higher and lower priorities to perform operations before or after this fires.
    *
    * @param string  $module_name the module that added the rule
@@ -194,7 +194,7 @@ class graphics_Core {
     } else {
       Image::factory($input_file)
         ->resize($options["width"], $options["height"], $options["master"])
-        ->quality(module::get_var("core", "image_quality"))
+        ->quality(module::get_var("gallery", "image_quality"))
         ->save($output_file);
     }
   }
@@ -212,7 +212,7 @@ class graphics_Core {
     }
 
     Image::factory($input_file)
-      ->quality(module::get_var("core", "image_quality"))
+      ->quality(module::get_var("gallery", "image_quality"))
       ->rotate($options["degrees"])
       ->save($output_file);
   }
@@ -262,7 +262,7 @@ class graphics_Core {
 
     Image::factory($input_file)
       ->composite($options["file"], $x, $y, $options["transparency"])
-      ->quality(module::get_var("core", "image_quality"))
+      ->quality(module::get_var("gallery", "image_quality"))
       ->save($output_file);
   }
 
@@ -302,7 +302,7 @@ class graphics_Core {
              $count,
              array("attrs" => sprintf(
                'href="%s" class="gDialogLink"',
-               url::site("admin/maintenance/start/core_task::rebuild_dirty_images?csrf=__CSRF__")))),
+               url::site("admin/maintenance/start/gallery_task::rebuild_dirty_images?csrf=__CSRF__")))),
           "graphics_dirty");
     }
   }
@@ -332,12 +332,12 @@ class graphics_Core {
     $toolkits = graphics::detect_toolkits();
     foreach (array("imagemagick", "graphicsmagick", "gd") as $tk) {
       if ($toolkits[$tk]) {
-        module::set_var("core", "graphics_toolkit", $tk);
-        module::set_var("core", "graphics_toolkit_path", $tk == "gd" ? "" : $toolkits[$tk]);
+        module::set_var("gallery", "graphics_toolkit", $tk);
+        module::set_var("gallery", "graphics_toolkit_path", $tk == "gd" ? "" : $toolkits[$tk]);
         break;
       }
     }
-    if (!module::get_var("core", "graphics_toolkit")) {
+    if (!module::get_var("gallery", "graphics_toolkit")) {
       site_status::warning(
         t("Graphics toolkit missing!  Please <a href=\"%url\">choose a toolkit</a>",
           array("url" => url::site("admin/graphics"))),
@@ -349,7 +349,7 @@ class graphics_Core {
    * Choose which driver the Kohana Image library uses.
    */
   static function init_toolkit() {
-    switch(module::get_var("core", "graphics_toolkit")) {
+    switch(module::get_var("gallery", "graphics_toolkit")) {
     case "gd":
       Kohana::config_set("image.driver", "GD");
       break;
@@ -357,13 +357,13 @@ class graphics_Core {
     case "imagemagick":
       Kohana::config_set("image.driver", "ImageMagick");
       Kohana::config_set(
-        "image.params.directory", module::get_var("core", "graphics_toolkit_path"));
+        "image.params.directory", module::get_var("gallery", "graphics_toolkit_path"));
       break;
 
     case "graphicsmagick":
       Kohana::config_set("image.driver", "GraphicsMagick");
       Kohana::config_set(
-        "image.params.directory", module::get_var("core", "graphics_toolkit_path"));
+        "image.params.directory", module::get_var("gallery", "graphics_toolkit_path"));
       break;
     }
 
@@ -376,7 +376,7 @@ class graphics_Core {
    * @return boolean
    */
   static function can($func) {
-    if (module::get_var("core", "graphics_toolkit") == "gd" &&
+    if (module::get_var("gallery", "graphics_toolkit") == "gd" &&
         $func == "rotate" &&
         !function_exists("imagerotate")) {
       return false;
diff --git a/core/helpers/item.php b/modules/gallery/helpers/item.php
index 7daaf1e1..7daaf1e1 100644
--- a/core/helpers/item.php
+++ b/modules/gallery/helpers/item.php
diff --git a/core/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index ec4c5429..d26739f5 100644
--- a/core/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -35,9 +35,9 @@ class l10n_client_Core {
 
   static function api_key($api_key=null) {
     if ($api_key !== null) {
-      module::set_var("core", "l10n_client_key", $api_key);
+      module::set_var("gallery", "l10n_client_key", $api_key);
     }
-    return module::get_var("core", "l10n_client_key", "");
+    return module::get_var("gallery", "l10n_client_key", "");
   }
 
   static function server_uid($api_key=null) {
diff --git a/core/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
index 80b6f01c..80b6f01c 100644
--- a/core/helpers/l10n_scanner.php
+++ b/modules/gallery/helpers/l10n_scanner.php
diff --git a/core/helpers/locale.php b/modules/gallery/helpers/locale.php
index b707637f..2ba0f255 100644
--- a/core/helpers/locale.php
+++ b/modules/gallery/helpers/locale.php
@@ -37,8 +37,8 @@ class locale_Core {
 
   static function installed() {
     $available = self::available();
-    $default = module::get_var("core", "default_locale");
-    $codes = explode("|", module::get_var("core", "installed_locales", $default));
+    $default = module::get_var("gallery", "default_locale");
+    $codes = explode("|", module::get_var("gallery", "installed_locales", $default));
     foreach ($codes as $code) {
       if (isset($available->$code)) {
         $installed[$code] = $available[$code];
@@ -49,10 +49,10 @@ class locale_Core {
 
   static function update_installed($locales) {
     // Ensure that the default is included...
-    $default = module::get_var("core", "default_locale");
+    $default = module::get_var("gallery", "default_locale");
     $locales = array_merge($locales, array($default));
 
-    module::set_var("core", "installed_locales", join("|", $locales));
+    module::set_var("gallery", "installed_locales", join("|", $locales));
   }
 
   // @todo Might want to add a localizable language name as well.
diff --git a/core/helpers/log.php b/modules/gallery/helpers/log.php
index 451f985a..451f985a 100644
--- a/core/helpers/log.php
+++ b/modules/gallery/helpers/log.php
diff --git a/core/helpers/message.php b/modules/gallery/helpers/message.php
index af3b96cc..af3b96cc 100644
--- a/core/helpers/message.php
+++ b/modules/gallery/helpers/message.php
diff --git a/core/helpers/model_cache.php b/modules/gallery/helpers/model_cache.php
index 2649fdbd..2649fdbd 100644
--- a/core/helpers/model_cache.php
+++ b/modules/gallery/helpers/model_cache.php
diff --git a/core/helpers/module.php b/modules/gallery/helpers/module.php
index a48c89ed..a6cc87ac 100644
--- a/core/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -37,7 +37,7 @@ class module_Core {
     $module = self::get($module_name);
     if (!$module->loaded) {
       $module->name = $module_name;
-      $module->active = $module_name == "core";  // only core is active by default
+      $module->active = $module_name == "gallery";  // only gallery is active by default
     }
     $module->version = 1;
     $module->save();
@@ -75,7 +75,7 @@ class module_Core {
    */
   static function available() {
     $modules = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
-    foreach (array_merge(array("core/module.info"), glob(MODPATH . "*/module.info")) as $file) {
+    foreach (array_merge(array("gallery/module.info"), glob(MODPATH . "*/module.info")) as $file) {
       $module_name = basename(dirname($file));
       $modules->$module_name = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
       $modules->$module_name->installed = self::is_installed($module_name);
@@ -85,7 +85,7 @@ class module_Core {
     }
 
     // Lock certain modules
-    $modules->core->locked = true;
+    $modules->gallery->locked = true;
     $modules->user->locked = true;
     $modules->ksort();
 
@@ -215,10 +215,10 @@ class module_Core {
       if ($module->active) {
         self::$active[] = $module;
       }
-      if ($module->name != "core") {
-        $kohana_modules[] = MODPATH . $module->name;
-      }
+      $kohana_modules[] = MODPATH . $module->name;
+      // @todo: force 'gallery' to be at the end
     }
+
     Kohana::config_set("core.modules", $kohana_modules);
   }
 
@@ -252,32 +252,32 @@ class module_Core {
    * @return the value
    */
   static function get_var($module_name, $name, $default_value=null) {
-    // We cache all vars in core._cache so that we can load all vars at once for
+    // We cache all vars in gallery._cache so that we can load all vars at once for
     // performance.
     if (empty(self::$var_cache)) {
       $row = Database::instance()
         ->select("value")
         ->from("vars")
-        ->where(array("module_name" => "core", "name" => "_cache"))
+        ->where(array("module_name" => "gallery", "name" => "_cache"))
         ->get()
         ->current();
       if ($row) {
         self::$var_cache = unserialize($row->value);
       } else {
-        // core._cache doesn't exist.  Create it now.
+        // gallery._cache doesn't exist.  Create it now.
         foreach (Database::instance()
                  ->select("module_name", "name", "value")
                  ->from("vars")
                  ->orderby("module_name", "name")
                  ->get() as $row) {
-          if ($row->module_name == "core" && $row->name == "_cache") {
+          if ($row->module_name == "gallery" && $row->name == "_cache") {
             // This could happen if there's a race condition
             continue;
           }
           self::$var_cache->{$row->module_name}->{$row->name} = $row->value;
         }
         $cache = ORM::factory("var");
-        $cache->module_name = "core";
+        $cache->module_name = "gallery";
         $cache->name = "_cache";
         $cache->value = serialize(self::$var_cache);
         $cache->save();
@@ -309,7 +309,7 @@ class module_Core {
     $var->value = $value;
     $var->save();
 
-    Database::instance()->delete("vars", array("module_name" => "core", "name" => "_cache"));
+    Database::instance()->delete("vars", array("module_name" => "gallery", "name" => "_cache"));
     self::$var_cache = null;
  }
 
@@ -325,7 +325,7 @@ class module_Core {
       "WHERE `module_name` = '$module_name' " .
       "AND `name` = '$name'");
 
-    Database::instance()->delete("vars", array("module_name" => "core", "name" => "_cache"));
+    Database::instance()->delete("vars", array("module_name" => "gallery", "name" => "_cache"));
     self::$var_cache = null;
   }
 
@@ -343,7 +343,7 @@ class module_Core {
       $var->delete();
     }
 
-    Database::instance()->delete("vars", array("module_name" => "core", "name" => "_cache"));
+    Database::instance()->delete("vars", array("module_name" => "gallery", "name" => "_cache"));
     self::$var_cache = null;
   }
 
diff --git a/core/helpers/movie.php b/modules/gallery/helpers/movie.php
index 3293d4ac..15225fe7 100644
--- a/core/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -140,11 +140,11 @@ class movie_Core {
   }
 
   static function find_ffmpeg() {
-    if (!$ffmpeg_path = module::get_var("core", "ffmpeg_path")) {
+    if (!$ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) {
       if (function_exists("exec")) {
         $ffmpeg_path = exec("which ffmpeg");
         if ($ffmpeg_path) {
-          module::set_var("core", "ffmpeg_path", $ffmpeg_path);
+          module::set_var("gallery", "ffmpeg_path", $ffmpeg_path);
         }
       }
     }
diff --git a/core/helpers/photo.php b/modules/gallery/helpers/photo.php
index c1c005f5..c1c005f5 100644
--- a/core/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
diff --git a/core/helpers/rest.php b/modules/gallery/helpers/rest.php
index a63b94c8..a63b94c8 100644
--- a/core/helpers/rest.php
+++ b/modules/gallery/helpers/rest.php
diff --git a/core/helpers/site_status.php b/modules/gallery/helpers/site_status.php
index 6d47e565..6d47e565 100644
--- a/core/helpers/site_status.php
+++ b/modules/gallery/helpers/site_status.php
diff --git a/core/helpers/task.php b/modules/gallery/helpers/task.php
index a8a004ab..a8a004ab 100644
--- a/core/helpers/task.php
+++ b/modules/gallery/helpers/task.php
diff --git a/core/helpers/theme.php b/modules/gallery/helpers/theme.php
index cbe224db..af340db6 100644
--- a/core/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -31,10 +31,11 @@ class theme_Core {
   static function load_themes() {
     $modules = Kohana::config("core.modules");
     if (Router::$controller == "admin") {
-      array_unshift($modules, THEMEPATH . module::get_var("core", "active_admin_theme"));
+      array_unshift($modules, THEMEPATH . module::get_var("gallery", "active_admin_theme"));
     } else {
-      array_unshift($modules, THEMEPATH . module::get_var("core", "active_site_theme"));
+      array_unshift($modules, THEMEPATH . module::get_var("gallery", "active_site_theme"));
     }
+
     Kohana::config_set("core.modules", $modules);
   }
 
@@ -43,17 +44,17 @@ class theme_Core {
     $group = $form->group("edit_theme");
     $group->input("page_size")->label(t("Items per page"))->id("gPageSize")
       ->rules("required|valid_digit")
-      ->value(module::get_var("core", "page_size"));
+      ->value(module::get_var("gallery", "page_size"));
     $group->input("thumb_size")->label(t("Thumbnail size (in pixels)"))->id("gThumbSize")
       ->rules("required|valid_digit")
-      ->value(module::get_var("core", "thumb_size"));
+      ->value(module::get_var("gallery", "thumb_size"));
     $group->input("resize_size")->label(t("Resized image size (in pixels)"))->id("gResizeSize")
       ->rules("required|valid_digit")
-      ->value(module::get_var("core", "resize_size"));
+      ->value(module::get_var("gallery", "resize_size"));
     $group->textarea("header_text")->label(t("Header text"))->id("gHeaderText")
-      ->value(module::get_var("core", "header_text"));
+      ->value(module::get_var("gallery", "header_text"));
     $group->textarea("footer_text")->label(t("Footer text"))->id("gFooterText")
-      ->value(module::get_var("core", "footer_text"));
+      ->value(module::get_var("gallery", "footer_text"));
     $group->submit("")->value(t("Save"));
     return $form;
   }
diff --git a/core/helpers/xml.php b/modules/gallery/helpers/xml.php
index e734e90c..e734e90c 100644
--- a/core/helpers/xml.php
+++ b/modules/gallery/helpers/xml.php
diff --git a/core/hooks/init_gallery.php b/modules/gallery/hooks/init_gallery.php
index 2c36795a..5735e7dc 100644
--- a/core/hooks/init_gallery.php
+++ b/modules/gallery/hooks/init_gallery.php
@@ -26,11 +26,11 @@ if (!file_exists(VARPATH . "database.php")) {
 
 Event::add("system.ready", array("I18n", "instance"));
 Event::add("system.ready", array("module", "load_modules"));
-Event::add("system.ready", array("core", "ready"));
+Event::add("system.ready", array("gallery", "ready"));
 Event::add("system.post_routing", array("theme", "load_themes"));
 Event::add("system.post_routing", array("url", "parse_url"));
-Event::add("system.post_routing", array("core", "maintenance_mode"));
-Event::add("system.shutdown", array("core", "shutdown"));
+Event::add("system.post_routing", array("gallery", "maintenance_mode"));
+Event::add("system.shutdown", array("gallery", "shutdown"));
 
 // Override the cookie if we have a session id in the URL.
 // @todo This should probably be an event callback
diff --git a/core/images/gallery.png b/modules/gallery/images/gallery.png
index ca8e0e95..ca8e0e95 100644
--- a/core/images/gallery.png
+++ b/modules/gallery/images/gallery.png
diff --git a/core/images/gd.png b/modules/gallery/images/gd.png
index b341d71c..b341d71c 100644
--- a/core/images/gd.png
+++ b/modules/gallery/images/gd.png
diff --git a/core/images/graphicsmagick.png b/modules/gallery/images/graphicsmagick.png
index 3d1d77e9..3d1d77e9 100644
--- a/core/images/graphicsmagick.png
+++ b/modules/gallery/images/graphicsmagick.png
diff --git a/core/images/imagemagick.jpg b/modules/gallery/images/imagemagick.jpg
index d83c4509..d83c4509 100644
--- a/core/images/imagemagick.jpg
+++ b/modules/gallery/images/imagemagick.jpg
diff --git a/core/js/albums_form_add.js b/modules/gallery/js/albums_form_add.js
index 06a364f3..06a364f3 100644
--- a/core/js/albums_form_add.js
+++ b/modules/gallery/js/albums_form_add.js
diff --git a/core/js/fullsize.js b/modules/gallery/js/fullsize.js
index 7428adb5..7428adb5 100644
--- a/core/js/fullsize.js
+++ b/modules/gallery/js/fullsize.js
diff --git a/core/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index f43671f1..f43671f1 100644
--- a/core/js/l10n_client.js
+++ b/modules/gallery/js/l10n_client.js
diff --git a/core/js/quick.js b/modules/gallery/js/quick.js
index e7f35cea..e7f35cea 100644
--- a/core/js/quick.js
+++ b/modules/gallery/js/quick.js
diff --git a/core/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index acc3f8ec..1f976871 100644
--- a/core/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -29,15 +29,15 @@ class Admin_View_Core extends View {
    * @return  void
    */
   public function __construct($name) {
-    $theme_name = module::get_var("core", "active_site_theme");
+    $theme_name = module::get_var("gallery", "active_site_theme");
     if (!file_exists("themes/$theme_name")) {
-      module::set_var("core", "active_site_theme", "admin_default");
+      module::set_var("gallery", "active_site_theme", "admin_default");
       theme::load_themes();
       Kohana::log("error", "Unable to locate theme '$theme_name', switching to default theme.");
     }
     parent::__construct($name);
 
-    $this->theme_name = module::get_var("core", "active_admin_theme");
+    $this->theme_name = module::get_var("gallery", "active_admin_theme");
     if (user::active()->admin) {
       $this->theme_name = Input::instance()->get("theme", $this->theme_name);
     }
@@ -57,10 +57,10 @@ class Admin_View_Core extends View {
 
   public function admin_menu() {
     $menu = Menu::factory("root");
-    core_menu::admin($menu, $this);
+    gallery_menu::admin($menu, $this);
 
     foreach (module::active() as $module) {
-      if ($module->name == "core") {
+      if ($module->name == "gallery") {
         continue;
       }
       $class = "{$module->name}_menu";
diff --git a/core/libraries/Block.php b/modules/gallery/libraries/Block.php
index 6fe679f1..6fe679f1 100644
--- a/core/libraries/Block.php
+++ b/modules/gallery/libraries/Block.php
diff --git a/core/libraries/I18n.php b/modules/gallery/libraries/I18n.php
index c936be88..f2801169 100644
--- a/core/libraries/I18n.php
+++ b/modules/gallery/libraries/I18n.php
@@ -62,7 +62,7 @@ class I18n_Core {
     if (self::$_instance == NULL || isset($config)) {
       $config = isset($config) ? $config : Kohana::config('locale');
       if (empty($config['default_locale'])) {
-        $config['default_locale'] = module::get_var('core', 'default_locale');
+        $config['default_locale'] = module::get_var('gallery', 'default_locale');
       }
       self::$_instance = new I18n_Core($config);
     }
diff --git a/core/libraries/MY_Database.php b/modules/gallery/libraries/MY_Database.php
index c56f16e8..c56f16e8 100644
--- a/core/libraries/MY_Database.php
+++ b/modules/gallery/libraries/MY_Database.php
diff --git a/core/libraries/MY_Forge.php b/modules/gallery/libraries/MY_Forge.php
index 17d0465b..17d0465b 100644
--- a/core/libraries/MY_Forge.php
+++ b/modules/gallery/libraries/MY_Forge.php
diff --git a/core/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index fb2f80a7..fb2f80a7 100644
--- a/core/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
diff --git a/core/libraries/MY_Pagination.php b/modules/gallery/libraries/MY_Pagination.php
index d06a974f..d06a974f 100644
--- a/core/libraries/MY_Pagination.php
+++ b/modules/gallery/libraries/MY_Pagination.php
diff --git a/core/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php
index 836d1087..836d1087 100644
--- a/core/libraries/MY_View.php
+++ b/modules/gallery/libraries/MY_View.php
diff --git a/core/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index d19d8b1e..d19d8b1e 100644
--- a/core/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
diff --git a/core/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index 46280d95..46280d95 100644
--- a/core/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
diff --git a/core/libraries/Sendmail.php b/modules/gallery/libraries/Sendmail.php
index 90998457..90998457 100644
--- a/core/libraries/Sendmail.php
+++ b/modules/gallery/libraries/Sendmail.php
diff --git a/core/libraries/Task_Definition.php b/modules/gallery/libraries/Task_Definition.php
index 8d9c5922..8d9c5922 100644
--- a/core/libraries/Task_Definition.php
+++ b/modules/gallery/libraries/Task_Definition.php
diff --git a/core/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index b5b97666..5fcc2943 100644
--- a/core/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -30,15 +30,15 @@ class Theme_View_Core extends View {
    * @return  void
    */
   public function __construct($name, $page_type) {
-    $theme_name = module::get_var("core", "active_site_theme");
+    $theme_name = module::get_var("gallery", "active_site_theme");
     if (!file_exists("themes/$theme_name")) {
-      module::set_var("core", "active_site_theme", "default");
+      module::set_var("gallery", "active_site_theme", "default");
       theme::load_themes();
       Kohana::log("error", "Unable to locate theme '$theme_name', switching to default theme.");
     }
     parent::__construct($name);
 
-    $this->theme_name = module::get_var("core", "active_site_theme");
+    $this->theme_name = module::get_var("gallery", "active_site_theme");
     if (user::active()->admin) {
       $this->theme_name = Input::instance()->get("theme", $this->theme_name);
     }
@@ -64,7 +64,7 @@ class Theme_View_Core extends View {
   public function thumb_proportion() {
     // @TODO change the 200 to a theme supplied value when and if we come up with an
     // API to allow the theme to set defaults.
-    return module::get_var("core", "thumb_size", 200) / 200;
+    return module::get_var("gallery", "thumb_size", 200) / 200;
   }
 
   public function url($path, $absolute_url=false) {
@@ -91,10 +91,10 @@ class Theme_View_Core extends View {
   public function site_menu() {
     $menu = Menu::factory("root");
     if ($this->page_type != "login") {
-      core_menu::site($menu, $this);
+      gallery_menu::site($menu, $this);
 
       foreach (module::active() as $module) {
-        if ($module->name == "core") {
+        if ($module->name == "gallery") {
           continue;
         }
         $class = "{$module->name}_menu";
@@ -109,10 +109,10 @@ class Theme_View_Core extends View {
 
   public function album_menu() {
     $menu = Menu::factory("root");
-    core_menu::album($menu, $this);
+    gallery_menu::album($menu, $this);
 
     foreach (module::active() as $module) {
-      if ($module->name == "core") {
+      if ($module->name == "gallery") {
         continue;
       }
       $class = "{$module->name}_menu";
@@ -126,10 +126,10 @@ class Theme_View_Core extends View {
 
   public function photo_menu() {
     $menu = Menu::factory("root");
-    core_menu::photo($menu, $this);
+    gallery_menu::photo($menu, $this);
 
     foreach (module::active() as $module) {
-      if ($module->name == "core") {
+      if ($module->name == "gallery") {
         continue;
       }
       $class = "{$module->name}_menu";
diff --git a/core/models/access_cache.php b/modules/gallery/models/access_cache.php
index 10d05df7..10d05df7 100644
--- a/core/models/access_cache.php
+++ b/modules/gallery/models/access_cache.php
diff --git a/core/models/access_intent.php b/modules/gallery/models/access_intent.php
index 86cda7b3..86cda7b3 100644
--- a/core/models/access_intent.php
+++ b/modules/gallery/models/access_intent.php
diff --git a/core/models/graphics_rule.php b/modules/gallery/models/graphics_rule.php
index 2b5a8968..2b5a8968 100644
--- a/core/models/graphics_rule.php
+++ b/modules/gallery/models/graphics_rule.php
diff --git a/core/models/incoming_translation.php b/modules/gallery/models/incoming_translation.php
index 0c9a343f..0c9a343f 100644
--- a/core/models/incoming_translation.php
+++ b/modules/gallery/models/incoming_translation.php
diff --git a/core/models/item.php b/modules/gallery/models/item.php
index 4b8cac8e..4b8cac8e 100644
--- a/core/models/item.php
+++ b/modules/gallery/models/item.php
diff --git a/core/models/log.php b/modules/gallery/models/log.php
index 6734afb8..6734afb8 100644
--- a/core/models/log.php
+++ b/modules/gallery/models/log.php
diff --git a/core/models/message.php b/modules/gallery/models/message.php
index 851ececa..851ececa 100644
--- a/core/models/message.php
+++ b/modules/gallery/models/message.php
diff --git a/core/models/module.php b/modules/gallery/models/module.php
index 5a9ea5bd..5a9ea5bd 100644
--- a/core/models/module.php
+++ b/modules/gallery/models/module.php
diff --git a/core/models/outgoing_translation.php b/modules/gallery/models/outgoing_translation.php
index bf617f42..bf617f42 100644
--- a/core/models/outgoing_translation.php
+++ b/modules/gallery/models/outgoing_translation.php
diff --git a/core/models/permission.php b/modules/gallery/models/permission.php
index e77fa5bd..e77fa5bd 100644
--- a/core/models/permission.php
+++ b/modules/gallery/models/permission.php
diff --git a/core/models/task.php b/modules/gallery/models/task.php
index 9e3ae5c6..9e3ae5c6 100644
--- a/core/models/task.php
+++ b/modules/gallery/models/task.php
diff --git a/core/models/theme.php b/modules/gallery/models/theme.php
index f479fd5a..f479fd5a 100644
--- a/core/models/theme.php
+++ b/modules/gallery/models/theme.php
diff --git a/core/models/var.php b/modules/gallery/models/var.php
index 434370e9..434370e9 100644
--- a/core/models/var.php
+++ b/modules/gallery/models/var.php
diff --git a/core/module.info b/modules/gallery/module.info
index ff7da82d..ff7da82d 100644
--- a/core/module.info
+++ b/modules/gallery/module.info
diff --git a/core/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index 7012a487..7012a487 100644
--- a/core/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
diff --git a/core/tests/Album_Helper_Test.php b/modules/gallery/tests/Album_Helper_Test.php
index 80afa8d1..80afa8d1 100644
--- a/core/tests/Album_Helper_Test.php
+++ b/modules/gallery/tests/Album_Helper_Test.php
diff --git a/core/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php
index ef1fac77..ef1fac77 100644
--- a/core/tests/Albums_Controller_Test.php
+++ b/modules/gallery/tests/Albums_Controller_Test.php
diff --git a/core/tests/Core_Installer_Test.php b/modules/gallery/tests/Core_Installer_Test.php
index f7036286..24d24b38 100644
--- a/core/tests/Core_Installer_Test.php
+++ b/modules/gallery/tests/Core_Installer_Test.php
@@ -19,21 +19,21 @@
  */
 
 /**
- * This test case operates under the assumption that core_installer::install() is called by the
+ * This test case operates under the assumption that gallery_installer::install() is called by the
  * test controller before it starts.
  */
-class Core_Installer_Test extends Unit_Test_Case {
+class Gallery_Installer_Test extends Unit_Test_Case {
   public function install_creates_dirs_test() {
     $this->assert_true(file_exists(VARPATH . "albums"));
     $this->assert_true(file_exists(VARPATH . "resizes"));
   }
 
-  public function install_registers_core_module_test() {
-    $core = ORM::factory("module")->where("name", "core")->find();
-    $this->assert_equal("core", $core->name);
+  public function install_registers_gallery_module_test() {
+    $gallery = ORM::factory("module")->where("name", "gallery")->find();
+    $this->assert_equal("gallery", $gallery->name);
 
     // This is probably too volatile to keep for long
-    $this->assert_equal(1, $core->version);
+    $this->assert_equal(1, $gallery->version);
   }
 
   public function install_creates_root_item_test() {
diff --git a/core/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index bd3d2f53..bd3d2f53 100644
--- a/core/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
diff --git a/core/tests/Dir_Helper_Test.php b/modules/gallery/tests/Dir_Helper_Test.php
index 46bb871c..46bb871c 100644
--- a/core/tests/Dir_Helper_Test.php
+++ b/modules/gallery/tests/Dir_Helper_Test.php
diff --git a/core/tests/DrawForm_Test.php b/modules/gallery/tests/DrawForm_Test.php
index 2c5aaba4..2c5aaba4 100644
--- a/core/tests/DrawForm_Test.php
+++ b/modules/gallery/tests/DrawForm_Test.php
diff --git a/core/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index 1caa82ba..017b1950 100644
--- a/core/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -218,11 +218,11 @@ class GalleryCodeFilterIterator extends FilterIterator {
     $path_name = $this->getInnerIterator()->getPathName();
     return !(
       strpos($path_name, ".svn") ||
-      strpos($path_name, "core/views/kohana_profiler.php") !== false ||
       strpos($path_name, DOCROOT . "test") !== false ||
       strpos($path_name, DOCROOT . "var") !== false ||
       strpos($path_name, MODPATH . "forge") !== false ||
-      strpos($path_name, APPPATH . "views/kohana_error_page.php") !== false ||
+      strpos($path_name, MODPATH . "gallery/views/kohana_error_page.php") !== false ||
+      strpos($path_name, MODPATH . "gallery/views/kohana_profiler.php") !== false ||
       strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_error_page.php") !== false ||
       strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_unit_test_cli.php") !== false ||
       strpos($path_name, MODPATH . "unit_test") !== false ||
diff --git a/core/tests/I18n_Test.php b/modules/gallery/tests/I18n_Test.php
index 9010606a..9010606a 100644
--- a/core/tests/I18n_Test.php
+++ b/modules/gallery/tests/I18n_Test.php
diff --git a/core/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index 615b8997..615b8997 100644
--- a/core/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
diff --git a/core/tests/Menu_Test.php b/modules/gallery/tests/Menu_Test.php
index c91aee0b..c91aee0b 100644
--- a/core/tests/Menu_Test.php
+++ b/modules/gallery/tests/Menu_Test.php
diff --git a/core/tests/Movie_Helper_Test.php b/modules/gallery/tests/Movie_Helper_Test.php
index b92ef3f8..627651bb 100644
--- a/core/tests/Movie_Helper_Test.php
+++ b/modules/gallery/tests/Movie_Helper_Test.php
@@ -22,7 +22,7 @@ class Movie_Helper_Test extends Unit_Test_Case {
     $rand = rand();
     $root = ORM::factory("item", 1);
     try {
-      $movie = movie::create($root, DOCROOT . "core/tests/test.jpg", "$rand/.jpg", $rand, $rand);
+      $movie = movie::create($root, MODPATH . "gallery/tests/test.jpg", "$rand/.jpg", $rand, $rand);
     } catch (Exception $e) {
       // pass
       return;
@@ -35,7 +35,7 @@ class Movie_Helper_Test extends Unit_Test_Case {
     $rand = rand();
     $root = ORM::factory("item", 1);
     try {
-      $movie = movie::create($root, DOCROOT . "core/tests/test.jpg", "$rand.jpg.", $rand, $rand);
+      $movie = movie::create($root, MODPATH . "gallery/tests/test.jpg", "$rand.jpg.", $rand, $rand);
     } catch (Exception $e) {
       $this->assert_equal("@todo NAME_CANNOT_END_IN_PERIOD", $e->getMessage());
       return;
diff --git a/core/tests/ORM_MPTT_Test.php b/modules/gallery/tests/ORM_MPTT_Test.php
index 200c8a74..200c8a74 100644
--- a/core/tests/ORM_MPTT_Test.php
+++ b/modules/gallery/tests/ORM_MPTT_Test.php
diff --git a/core/tests/Photo_Helper_Test.php b/modules/gallery/tests/Photo_Helper_Test.php
index deb11bb9..2a6693e1 100644
--- a/core/tests/Photo_Helper_Test.php
+++ b/modules/gallery/tests/Photo_Helper_Test.php
@@ -21,7 +21,7 @@ class Photo_Helper_Test extends Unit_Test_Case {
   public function create_photo_test() {
     $rand = rand();
 
-    $filename = DOCROOT . "core/tests/test.jpg";
+    $filename = MODPATH . "gallery/tests/test.jpg";
     $image_info = getimagesize($filename);
 
     $root = ORM::factory("item", 1);
@@ -50,8 +50,8 @@ class Photo_Helper_Test extends Unit_Test_Case {
   public function create_conflicting_photo_test() {
     $rand = rand();
     $root = ORM::factory("item", 1);
-    $photo1 = photo::create($root, DOCROOT . "core/tests/test.jpg", "$rand.jpg", $rand, $rand);
-    $photo2 = photo::create($root, DOCROOT . "core/tests/test.jpg", "$rand.jpg", $rand, $rand);
+    $photo1 = photo::create($root, MODPATH . "gallery/tests/test.jpg", "$rand.jpg", $rand, $rand);
+    $photo2 = photo::create($root, MODPATH . "gallery/tests/test.jpg", "$rand.jpg", $rand, $rand);
     $this->assert_true($photo1->name != $photo2->name);
   }
 
@@ -68,7 +68,7 @@ class Photo_Helper_Test extends Unit_Test_Case {
   public function thumb_url_test() {
     $rand = rand();
     $root = ORM::factory("item", 1);
-    $photo = photo::create($root, DOCROOT . "core/tests/test.jpg", "$rand.jpg", $rand, $rand);
+    $photo = photo::create($root, MODPATH . "gallery/tests/test.jpg", "$rand.jpg", $rand, $rand);
     $this->assert_equal("http://./var/thumbs/{$rand}.jpg", $photo->thumb_url());
   }
 
@@ -76,7 +76,7 @@ class Photo_Helper_Test extends Unit_Test_Case {
     $rand = rand();
     $root = ORM::factory("item", 1);
     $album = album::create($root, $rand, $rand, $rand);
-    $photo = photo::create($album, DOCROOT . "core/tests/test.jpg", "$rand.jpg", $rand, $rand);
+    $photo = photo::create($album, MODPATH . "gallery/tests/test.jpg", "$rand.jpg", $rand, $rand);
 
     $this->assert_equal("http://./var/resizes/{$rand}/{$rand}.jpg", $photo->resize_url());
   }
@@ -85,7 +85,7 @@ class Photo_Helper_Test extends Unit_Test_Case {
     $rand = rand();
     $root = ORM::factory("item", 1);
     try {
-      $photo = photo::create($root, DOCROOT . "core/tests/test.jpg", "$rand/.jpg", $rand, $rand);
+      $photo = photo::create($root, MODPATH . "gallery/tests/test.jpg", "$rand/.jpg", $rand, $rand);
     } catch (Exception $e) {
       // pass
       return;
@@ -98,7 +98,7 @@ class Photo_Helper_Test extends Unit_Test_Case {
     $rand = rand();
     $root = ORM::factory("item", 1);
     try {
-      $photo = photo::create($root, DOCROOT . "core/tests/test.jpg", "$rand.jpg.", $rand, $rand);
+      $photo = photo::create($root, MODPATH . "gallery/tests/test.jpg", "$rand.jpg.", $rand, $rand);
     } catch (Exception $e) {
       $this->assert_equal("@todo NAME_CANNOT_END_IN_PERIOD", $e->getMessage());
       return;
diff --git a/core/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php
index 71319315..771cc90d 100644
--- a/core/tests/Photos_Controller_Test.php
+++ b/modules/gallery/tests/Photos_Controller_Test.php
@@ -29,7 +29,7 @@ class Photos_Controller_Test extends Unit_Test_Case {
   public function change_photo_test() {
     $controller = new Photos_Controller();
     $root = ORM::factory("item", 1);
-    $photo = photo::create($root, DOCROOT . "core/tests/test.jpg", "test.jpeg", "test", "test");
+    $photo = photo::create($root, MODPATH . "gallery/tests/test.jpg", "test.jpeg", "test", "test");
     $orig_name = $photo->name;
 
     $_POST["filename"] = "test.jpeg";
@@ -58,7 +58,7 @@ class Photos_Controller_Test extends Unit_Test_Case {
   public function change_photo_no_csrf_fails_test() {
     $controller = new Photos_Controller();
     $root = ORM::factory("item", 1);
-    $photo = photo::create($root, DOCROOT . "core/tests/test.jpg", "test", "test", "test");
+    $photo = photo::create($root, MODPATH . "gallery/tests/test.jpg", "test", "test", "test");
     $_POST["name"] = "new name";
     $_POST["title"] = "new title";
     $_POST["description"] = "new description";
diff --git a/core/tests/REST_Controller_Test.php b/modules/gallery/tests/REST_Controller_Test.php
index 8fb04d86..8fb04d86 100644
--- a/core/tests/REST_Controller_Test.php
+++ b/modules/gallery/tests/REST_Controller_Test.php
diff --git a/core/tests/REST_Helper_Test.php b/modules/gallery/tests/REST_Helper_Test.php
index 1bfc63ab..1bfc63ab 100644
--- a/core/tests/REST_Helper_Test.php
+++ b/modules/gallery/tests/REST_Helper_Test.php
diff --git a/core/tests/Sendmail_Test.php b/modules/gallery/tests/Sendmail_Test.php
index 64c1fff0..64c1fff0 100644
--- a/core/tests/Sendmail_Test.php
+++ b/modules/gallery/tests/Sendmail_Test.php
diff --git a/core/tests/Var_Test.php b/modules/gallery/tests/Var_Test.php
index 82370631..355d94a7 100644
--- a/core/tests/Var_Test.php
+++ b/modules/gallery/tests/Var_Test.php
@@ -19,31 +19,31 @@
  */
 class Var_Test extends Unit_Test_Case {
   public function add_parameter_test() {
-    module::set_var("core", "Parameter", "original value");
-    $this->assert_equal("original value", module::get_var("core", "Parameter"));
+    module::set_var("gallery", "Parameter", "original value");
+    $this->assert_equal("original value", module::get_var("gallery", "Parameter"));
 
-    module::set_var("core", "Parameter", "updated value");
-    $this->assert_equal("updated value", module::get_var("core", "Parameter"));
+    module::set_var("gallery", "Parameter", "updated value");
+    $this->assert_equal("updated value", module::get_var("gallery", "Parameter"));
   }
 
   public function clear_parameter_test() {
-    module::set_var("core", "Parameter", "original value");
-    $this->assert_equal("original value", module::get_var("core", "Parameter"));
+    module::set_var("gallery", "Parameter", "original value");
+    $this->assert_equal("original value", module::get_var("gallery", "Parameter"));
 
-    module::clear_var("core", "Parameter");
-    $this->assert_equal(null, module::get_var("core", "Parameter"));
+    module::clear_var("gallery", "Parameter");
+    $this->assert_equal(null, module::get_var("gallery", "Parameter"));
   }
 
   public function incr_parameter_test() {
-    module::set_var("core", "Parameter", "original value");
-    module::incr_var("core", "Parameter");
-    $this->assert_equal("1", module::get_var("core", "Parameter"));
+    module::set_var("gallery", "Parameter", "original value");
+    module::incr_var("gallery", "Parameter");
+    $this->assert_equal("1", module::get_var("gallery", "Parameter"));
 
-    module::set_var("core", "Parameter", "2");
-    module::incr_var("core", "Parameter", "9");
-    $this->assert_equal("11", module::get_var("core", "Parameter"));
+    module::set_var("gallery", "Parameter", "2");
+    module::incr_var("gallery", "Parameter", "9");
+    $this->assert_equal("11", module::get_var("gallery", "Parameter"));
 
-    module::incr_var("core", "NonExistent", "9");
-    $this->assert_equal(null, module::get_var("core", "NonExistent"));
+    module::incr_var("gallery", "NonExistent", "9");
+    $this->assert_equal(null, module::get_var("gallery", "NonExistent"));
   }
 }
\ No newline at end of file
diff --git a/core/tests/images/DSC_0003.jpg b/modules/gallery/tests/images/DSC_0003.jpg
index 5780d9d8..5780d9d8 100644
--- a/core/tests/images/DSC_0003.jpg
+++ b/modules/gallery/tests/images/DSC_0003.jpg
diff --git a/core/tests/images/DSC_0005.jpg b/modules/gallery/tests/images/DSC_0005.jpg
index 4d2b53a9..4d2b53a9 100644
--- a/core/tests/images/DSC_0005.jpg
+++ b/modules/gallery/tests/images/DSC_0005.jpg
diff --git a/core/tests/images/DSC_0017.jpg b/modules/gallery/tests/images/DSC_0017.jpg
index b7f7bb90..b7f7bb90 100644
--- a/core/tests/images/DSC_0017.jpg
+++ b/modules/gallery/tests/images/DSC_0017.jpg
diff --git a/core/tests/images/DSC_0019.jpg b/modules/gallery/tests/images/DSC_0019.jpg
index 0ce25aa4..0ce25aa4 100644
--- a/core/tests/images/DSC_0019.jpg
+++ b/modules/gallery/tests/images/DSC_0019.jpg
diff --git a/core/tests/images/DSC_0067.jpg b/modules/gallery/tests/images/DSC_0067.jpg
index 84f134cb..84f134cb 100644
--- a/core/tests/images/DSC_0067.jpg
+++ b/modules/gallery/tests/images/DSC_0067.jpg
diff --git a/core/tests/images/DSC_0072.jpg b/modules/gallery/tests/images/DSC_0072.jpg
index dfad82b0..dfad82b0 100644
--- a/core/tests/images/DSC_0072.jpg
+++ b/modules/gallery/tests/images/DSC_0072.jpg
diff --git a/core/tests/images/P4050088.jpg b/modules/gallery/tests/images/P4050088.jpg
index 62f4749d..62f4749d 100644
--- a/core/tests/images/P4050088.jpg
+++ b/modules/gallery/tests/images/P4050088.jpg
diff --git a/core/tests/selenium/Add_Album.html b/modules/gallery/tests/selenium/Add_Album.html
index ccd4d0b7..ccd4d0b7 100644
--- a/core/tests/selenium/Add_Album.html
+++ b/modules/gallery/tests/selenium/Add_Album.html
diff --git a/core/tests/selenium/Add_Comment.html b/modules/gallery/tests/selenium/Add_Comment.html
index b4b96ed2..b4b96ed2 100644
--- a/core/tests/selenium/Add_Comment.html
+++ b/modules/gallery/tests/selenium/Add_Comment.html
diff --git a/core/tests/selenium/Add_Item.html b/modules/gallery/tests/selenium/Add_Item.html
index 741dff65..741dff65 100644
--- a/core/tests/selenium/Add_Item.html
+++ b/modules/gallery/tests/selenium/Add_Item.html
diff --git a/core/tests/selenium/Login.html b/modules/gallery/tests/selenium/Login.html
index 5e17a3c7..5e17a3c7 100644
--- a/core/tests/selenium/Login.html
+++ b/modules/gallery/tests/selenium/Login.html
diff --git a/core/tests/test.jpg b/modules/gallery/tests/test.jpg
index 1f3525e5..1f3525e5 100644
--- a/core/tests/test.jpg
+++ b/modules/gallery/tests/test.jpg
diff --git a/core/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 1f3825bd..9f90d671 100644
--- a/core/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -17,7 +17,7 @@
       <th> <?= t("Value") ?></th>
     </tr>
     <? foreach ($vars as $var): ?>
-    <? if ($var->module_name == "core" && $var->name == "_cache") continue ?>
+    <? if ($var->module_name == "gallery" && $var->name == "_cache") continue ?>
     <tr class="setting">
       <td> <?= $var->module_name ?> </td>
       <td> <?= $var->name ?> </td>
diff --git a/core/views/admin_block_log_entries.html.php b/modules/gallery/views/admin_block_log_entries.html.php
index db6313e1..db6313e1 100644
--- a/core/views/admin_block_log_entries.html.php
+++ b/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
index cb276ae5..cb276ae5 100644
--- a/core/views/admin_block_news.html.php
+++ b/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
index e8a4d933..e8a4d933 100644
--- a/core/views/admin_block_photo_stream.html.php
+++ b/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
index 6b79f047..6b79f047 100644
--- a/core/views/admin_block_platform.html.php
+++ b/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
index 2d975073..395ed71d 100644
--- a/core/views/admin_block_stats.html.php
+++ b/modules/gallery/views/admin_block_stats.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul>
   <li>
-    <?= t("Version: %version", array("version" => module::get_var("core", "version"))) ?>
+    <?= t("Version: %version", array("version" => module::get_var("gallery", "version"))) ?>
   </li>
   <li>
     <?= t("Albums: %count", array("count" => $album_count)) ?>
diff --git a/core/views/admin_block_welcome.html.php b/modules/gallery/views/admin_block_welcome.html.php
index 488fa908..488fa908 100644
--- a/core/views/admin_block_welcome.html.php
+++ b/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
index c266d7e1..c266d7e1 100644
--- a/core/views/admin_dashboard.html.php
+++ b/modules/gallery/views/admin_dashboard.html.php
diff --git a/core/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php
index 08374471..08374471 100644
--- a/core/views/admin_graphics.html.php
+++ b/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
index cae68b74..b77da8e3 100644
--- a/core/views/admin_graphics_gd.html.php
+++ b/modules/gallery/views/admin_graphics_gd.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="gd" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->gd["GD Version"] ? " gInstalledToolkit" : " gUnavailable" ?>">
-  <img class="logo" width="170" height="110" src="<?= url::file("core/images/gd.png"); ?>" alt="<? t("Visit the GD lib project site") ?>" />
+  <img class="logo" width="170" height="110" src="<?= url::file("modules/gallery/images/gd.png"); ?>" alt="<? t("Visit the GD lib project site") ?>" />
   <h3> <?= t("GD") ?> </h3>
   <p>
     <?= t("The GD graphics library is an extension to PHP commonly installed most webservers.  Please refer to the <a href=\"%url\">GD website</a> for more information.",
diff --git a/core/views/admin_graphics_graphicsmagick.html.php b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
index 720a9459..e2cd0777 100644
--- a/core/views/admin_graphics_graphicsmagick.html.php
+++ b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="graphicsmagick" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->graphicsmagick ? "  gInstalledToolkit" : " gUnavailable" ?>">
   <h3> <?= t("GraphicsMagick") ?> </h3>
-  <img class="logo" width="107" height="76" src="<?= url::file("core/images/graphicsmagick.png"); ?>" alt="<? t("Visit the GraphicsMagick project site") ?>" />
+  <img class="logo" width="107" height="76" src="<?= url::file("modules/gallery/images/graphicsmagick.png"); ?>" alt="<? t("Visit the GraphicsMagick project site") ?>" />
   <p>
     <?= t("GraphicsMagick is a standalone graphics program available on most Linux systems.  Please refer to the <a href=\"%url\">GraphicsMagick website</a> for more information.",
         array("url" => "http://www.graphicsmagick.org")) ?>
diff --git a/core/views/admin_graphics_imagemagick.html.php b/modules/gallery/views/admin_graphics_imagemagick.html.php
index c7468eed..081ddc15 100644
--- a/core/views/admin_graphics_imagemagick.html.php
+++ b/modules/gallery/views/admin_graphics_imagemagick.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="imagemagick" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->imagemagick ? "  gInstalledToolkit" : " gUnavailable" ?>">
   <h3> <?= t("ImageMagick") ?> </h3>
-  <img class="logo" width="114" height="118" src="<?= url::file("core/images/imagemagick.jpg"); ?>" alt="<? t("Visit the ImageMagick project site") ?>" />
+  <img class="logo" width="114" height="118" src="<?= url::file("modules/gallery/images/imagemagick.jpg"); ?>" alt="<? t("Visit the ImageMagick project site") ?>" />
   <p>
     <?= t("ImageMagick is a standalone graphics program available on most Linux systems.  Please refer to the <a href=\"%url\">ImageMagick website</a> for more information.",
         array("url" => "http://www.imagemagick.org")) ?>
diff --git a/core/views/admin_graphics_none.html.php b/modules/gallery/views/admin_graphics_none.html.php
index 5306a70d..5306a70d 100644
--- a/core/views/admin_graphics_none.html.php
+++ b/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
index 2b43f1b4..f41694b4 100644
--- a/core/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -5,7 +5,7 @@
   <?= $settings_form ?>
 
   <h2> <?= t("Download translations") ?> </h2>
-  <a href="<?= url::site("admin/maintenance/start/core_task::update_l10n?csrf=$csrf") ?>"
+  <a href="<?= url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf") ?>"
      class="gDialogLink">
     <?= t("Get updates") ?>
   </a>
diff --git a/core/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index bc060a7b..bc060a7b 100644
--- a/core/views/admin_maintenance.html.php
+++ b/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
index 1ee02311..1ee02311 100644
--- a/core/views/admin_maintenance_task.html.php
+++ b/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
index 3fddd6cd..3fddd6cd 100644
--- a/core/views/admin_modules.html.php
+++ b/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
index eb450b16..eb450b16 100644
--- a/core/views/admin_theme_details.html.php
+++ b/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
index f85bce70..f85bce70 100644
--- a/core/views/admin_themes.html.php
+++ b/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
index a7aea172..a7aea172 100644
--- a/core/views/admin_themes_preview.html.php
+++ b/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
index aa26858a..aa26858a 100644
--- a/core/views/after_install.html.php
+++ b/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
index baf91eed..baf91eed 100644
--- a/core/views/after_install_loader.html.php
+++ b/modules/gallery/views/after_install_loader.html.php
diff --git a/core/views/form.html.php b/modules/gallery/views/form.html.php
index ec2a56a9..ec2a56a9 100644
--- a/core/views/form.html.php
+++ b/modules/gallery/views/form.html.php
diff --git a/core/views/kohana_error_page.php b/modules/gallery/views/kohana_error_page.php
index d9bf9698..a091bca3 100644
--- a/core/views/kohana_error_page.php
+++ b/modules/gallery/views/kohana_error_page.php
@@ -58,8 +58,9 @@
     <title><?= t("Something went wrong!") ?></title>
   </head>
   <body>
-    <? try { $user = user::active(); } catch (Exception $e) { } ?>
-    <? $admin = isset($user) && $user->admin ?>
+<? // try { $user = user::active(); } catch (Exception $e) { } ?>
+<? // $admin = isset($user) && $user->admin ?>
+<? $admin = 1; ?>
     <div class="big_box" id="framework_error">
       <h1>
         <?= t("Dang...  Something went wrong!") ?>
diff --git a/core/views/kohana_profiler.php b/modules/gallery/views/kohana_profiler.php
index c7534349..c7534349 100644
--- a/core/views/kohana_profiler.php
+++ b/modules/gallery/views/kohana_profiler.php
diff --git a/core/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index 8f4092c7..8f4092c7 100644
--- a/core/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
diff --git a/core/views/maintenance.html.php b/modules/gallery/views/maintenance.html.php
index f80b6e7a..f80b6e7a 100644
--- a/core/views/maintenance.html.php
+++ b/modules/gallery/views/maintenance.html.php
diff --git a/core/views/move_browse.html.php b/modules/gallery/views/move_browse.html.php
index 4f69c0e9..4f69c0e9 100644
--- a/core/views/move_browse.html.php
+++ b/modules/gallery/views/move_browse.html.php
diff --git a/core/views/move_tree.html.php b/modules/gallery/views/move_tree.html.php
index a3a4bc8f..a3a4bc8f 100644
--- a/core/views/move_tree.html.php
+++ b/modules/gallery/views/move_tree.html.php
diff --git a/core/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index afd87c2b..749bee4f 100644
--- a/core/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
@@ -27,7 +27,7 @@
   <? if (!$htaccess_works): ?>
   <ul id="gMessage">
     <li class="gError">
-      <?= t("Oh no!  Your server needs a configuration change in order for you to hide photos!  Ask your server administrator to set <a href=\"%url\"><i>AllowOverride FileInfo Options</i></a> to fix this.", array("url" => "http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride")) ?>
+      <?= t("Oh no!  Your server needs a configuration change in order for you to hide photos!  Ask your server administrator to set <a href=\"%url\"><i>AllowOverride FileInfo Options</i></a> to fix this.", array("url" => "http://httpd.apache.org/docs/2.0/mod/gallery.html#allowoverride")) ?>
     </li>
   </ul>
   <? endif ?>
diff --git a/core/views/permissions_form.html.php b/modules/gallery/views/permissions_form.html.php
index 3dbd0d98..3dbd0d98 100644
--- a/core/views/permissions_form.html.php
+++ b/modules/gallery/views/permissions_form.html.php
diff --git a/core/views/quick_pane.html.php b/modules/gallery/views/quick_pane.html.php
index 95de972b..95de972b 100644
--- a/core/views/quick_pane.html.php
+++ b/modules/gallery/views/quick_pane.html.php
diff --git a/core/views/scaffold.html.php b/modules/gallery/views/scaffold.html.php
index 765464b5..60ce0b57 100644
--- a/core/views/scaffold.html.php
+++ b/modules/gallery/views/scaffold.html.php
@@ -102,7 +102,7 @@
   <body>
     <div class="outer">
       <center>
-        <img src="<?= url::file("core/images/gallery.png") ?>"/>
+        <img src="<?= url::file("modules/gallery/images/gallery.png") ?>"/>
       </center>
       <div class="inner">
         <h1>Gallery3 Scaffold</h1>
diff --git a/core/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index b6725c31..b6725c31 100644
--- a/core/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php
index 5206f9fb..c1457b12 100644
--- a/modules/gallery_unit_test/controllers/gallery_unit_test.php
+++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php
@@ -70,7 +70,6 @@ class Gallery_Unit_Test_Controller extends Controller {
     }
 
     // Find all tests, excluding sample tests that come with the unit_test module.
-    $paths = array(APPPATH . "tests");
     foreach (glob(MODPATH . "*/tests") as $path) {
       if ($path != MODPATH . "unit_test/tests") {
         $paths[] = $path;
@@ -96,15 +95,15 @@ class Gallery_Unit_Test_Controller extends Controller {
     $db->clear_cache();
 
     // Install all modules
-    // Force core and user to be installed first to resolve dependencies.
-    core_installer::install(true);
+    // Force gallery and user to be installed first to resolve dependencies.
+    gallery_installer::install(true);
     module::load_modules();
     module::install("user");
     module::activate("user");
     $modules = array();
     foreach (glob(MODPATH . "*/helpers/*_installer.php") as $file) {
       $module_name = basename(dirname(dirname($file)));
-      if (in_array($module_name, array("core", "user"))) {
+      if (in_array($module_name, array("gallery", "user"))) {
         continue;
       }
       module::install($module_name);
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 7df7d52f..1c4792b2 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -235,7 +235,7 @@ class Organize_Controller extends Controller {
     print $v->render();
   }
 
-  // Handlers for the album/photo edit.  Probably should be in core
+  // Handlers for the album/photo edit.  Probably should be in modules/gallery
   public function general() {
     access::verify_csrf();
 
diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php
index cdd66174..08128ae8 100644
--- a/modules/search/controllers/search.php
+++ b/modules/search/controllers/search.php
@@ -19,7 +19,7 @@
  */
 class Search_Controller extends Controller {
   public function index() {
-    $page_size = module::get_var("core", "page_size", 9);
+    $page_size = module::get_var("gallery", "page_size", 9);
     $q = $this->input->get("q");
     $page = $this->input->get("page", 1);
     $offset = ($page - 1) * $page_size;
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 9090e51d..aecd1db7 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -21,7 +21,7 @@ class Tags_Controller extends REST_Controller {
   protected $resource_type = "tag";
 
   public function _show($tag) {
-    $page_size = module::get_var("core", "page_size", 9);
+    $page_size = module::get_var("gallery", "page_size", 9);
     $page = $this->input->get("page", "1");
     $children_count = $tag->items_count();
     $offset = ($page-1) * $page_size;
diff --git a/kohana/KohanaLicense.html b/system/KohanaLicense.html
index de2d5299..de2d5299 100644
--- a/kohana/KohanaLicense.html
+++ b/system/KohanaLicense.html
diff --git a/kohana/config/cache.php b/system/config/cache.php
index ccd3da4d..ccd3da4d 100644
--- a/kohana/config/cache.php
+++ b/system/config/cache.php
diff --git a/kohana/config/cache_memcache.php b/system/config/cache_memcache.php
index 43d8f205..43d8f205 100644
--- a/kohana/config/cache_memcache.php
+++ b/system/config/cache_memcache.php
diff --git a/kohana/config/cache_sqlite.php b/system/config/cache_sqlite.php
index 818b8932..818b8932 100644
--- a/kohana/config/cache_sqlite.php
+++ b/system/config/cache_sqlite.php
diff --git a/kohana/config/cache_xcache.php b/system/config/cache_xcache.php
index 47aac25a..47aac25a 100644
--- a/kohana/config/cache_xcache.php
+++ b/system/config/cache_xcache.php
diff --git a/kohana/config/cookie.php b/system/config/cookie.php
index b6ddfe4a..b6ddfe4a 100644
--- a/kohana/config/cookie.php
+++ b/system/config/cookie.php
diff --git a/kohana/config/credit_cards.php b/system/config/credit_cards.php
index bfc98420..bfc98420 100644
--- a/kohana/config/credit_cards.php
+++ b/system/config/credit_cards.php
diff --git a/kohana/config/database.php b/system/config/database.php
index 6519156a..6519156a 100644
--- a/kohana/config/database.php
+++ b/system/config/database.php
diff --git a/kohana/config/email.php b/system/config/email.php
index c768367c..c768367c 100644
--- a/kohana/config/email.php
+++ b/system/config/email.php
diff --git a/kohana/config/encryption.php b/system/config/encryption.php
index 589a9def..589a9def 100644
--- a/kohana/config/encryption.php
+++ b/system/config/encryption.php
diff --git a/kohana/config/http.php b/system/config/http.php
index 3c4a86ac..3c4a86ac 100644
--- a/kohana/config/http.php
+++ b/system/config/http.php
diff --git a/kohana/config/image.php b/system/config/image.php
index e38b7cb2..e38b7cb2 100644
--- a/kohana/config/image.php
+++ b/system/config/image.php
diff --git a/kohana/config/inflector.php b/system/config/inflector.php
index 6dcfc2d3..6dcfc2d3 100644
--- a/kohana/config/inflector.php
+++ b/system/config/inflector.php
diff --git a/kohana/config/locale.php b/system/config/locale.php
index 3a268820..3a268820 100644
--- a/kohana/config/locale.php
+++ b/system/config/locale.php
diff --git a/kohana/config/mimes.php b/system/config/mimes.php
index 6a960f24..6a960f24 100644
--- a/kohana/config/mimes.php
+++ b/system/config/mimes.php
diff --git a/kohana/config/pagination.php b/system/config/pagination.php
index 808fc315..808fc315 100644
--- a/kohana/config/pagination.php
+++ b/system/config/pagination.php
diff --git a/kohana/config/profiler.php b/system/config/profiler.php
index 98ab5a49..98ab5a49 100644
--- a/kohana/config/profiler.php
+++ b/system/config/profiler.php
diff --git a/kohana/config/routes.php b/system/config/routes.php
index c677fde0..c677fde0 100644
--- a/kohana/config/routes.php
+++ b/system/config/routes.php
diff --git a/kohana/config/session.php b/system/config/session.php
index e287bae8..e287bae8 100644
--- a/kohana/config/session.php
+++ b/system/config/session.php
diff --git a/kohana/config/sql_types.php b/system/config/sql_types.php
index a4a44bda..a4a44bda 100644
--- a/kohana/config/sql_types.php
+++ b/system/config/sql_types.php
diff --git a/kohana/config/upload.php b/system/config/upload.php
index df26a2d2..df26a2d2 100644
--- a/kohana/config/upload.php
+++ b/system/config/upload.php
diff --git a/kohana/config/user_agents.php b/system/config/user_agents.php
index c968aebe..c968aebe 100644
--- a/kohana/config/user_agents.php
+++ b/system/config/user_agents.php
diff --git a/kohana/config/view.php b/system/config/view.php
index 6bed22e0..6bed22e0 100644
--- a/kohana/config/view.php
+++ b/system/config/view.php
diff --git a/kohana/controllers/template.php b/system/controllers/template.php
index 34d1a226..34d1a226 100644
--- a/kohana/controllers/template.php
+++ b/system/controllers/template.php
diff --git a/kohana/core/Benchmark.php b/system/core/Benchmark.php
index ce230f11..ce230f11 100644
--- a/kohana/core/Benchmark.php
+++ b/system/core/Benchmark.php
diff --git a/kohana/core/Bootstrap.php b/system/core/Bootstrap.php
index edfb086d..edfb086d 100644
--- a/kohana/core/Bootstrap.php
+++ b/system/core/Bootstrap.php
diff --git a/kohana/core/Event.php b/system/core/Event.php
index 22a9f69d..22a9f69d 100644
--- a/kohana/core/Event.php
+++ b/system/core/Event.php
diff --git a/kohana/core/Kohana.php b/system/core/Kohana.php
index ac64b5b8..ac64b5b8 100644
--- a/kohana/core/Kohana.php
+++ b/system/core/Kohana.php
diff --git a/kohana/core/utf8.php b/system/core/utf8.php
index 9f20f421..9f20f421 100644
--- a/kohana/core/utf8.php
+++ b/system/core/utf8.php
diff --git a/kohana/core/utf8/from_unicode.php b/system/core/utf8/from_unicode.php
index 66c6742d..66c6742d 100644
--- a/kohana/core/utf8/from_unicode.php
+++ b/system/core/utf8/from_unicode.php
diff --git a/kohana/core/utf8/ltrim.php b/system/core/utf8/ltrim.php
index 556fe07f..556fe07f 100644
--- a/kohana/core/utf8/ltrim.php
+++ b/system/core/utf8/ltrim.php
diff --git a/kohana/core/utf8/ord.php b/system/core/utf8/ord.php
index 76e31872..76e31872 100644
--- a/kohana/core/utf8/ord.php
+++ b/system/core/utf8/ord.php
diff --git a/kohana/core/utf8/rtrim.php b/system/core/utf8/rtrim.php
index efa0e19d..efa0e19d 100644
--- a/kohana/core/utf8/rtrim.php
+++ b/system/core/utf8/rtrim.php
diff --git a/kohana/core/utf8/str_ireplace.php b/system/core/utf8/str_ireplace.php
index 97ad71a5..97ad71a5 100644
--- a/kohana/core/utf8/str_ireplace.php
+++ b/system/core/utf8/str_ireplace.php
diff --git a/kohana/core/utf8/str_pad.php b/system/core/utf8/str_pad.php
index aab4ccc7..aab4ccc7 100644
--- a/kohana/core/utf8/str_pad.php
+++ b/system/core/utf8/str_pad.php
diff --git a/kohana/core/utf8/str_split.php b/system/core/utf8/str_split.php
index bc382cb6..bc382cb6 100644
--- a/kohana/core/utf8/str_split.php
+++ b/system/core/utf8/str_split.php
diff --git a/kohana/core/utf8/strcasecmp.php b/system/core/utf8/strcasecmp.php
index d06d3ebd..d06d3ebd 100644
--- a/kohana/core/utf8/strcasecmp.php
+++ b/system/core/utf8/strcasecmp.php
diff --git a/kohana/core/utf8/strcspn.php b/system/core/utf8/strcspn.php
index 20d3e802..20d3e802 100644
--- a/kohana/core/utf8/strcspn.php
+++ b/system/core/utf8/strcspn.php
diff --git a/kohana/core/utf8/stristr.php b/system/core/utf8/stristr.php
index 73ea1394..73ea1394 100644
--- a/kohana/core/utf8/stristr.php
+++ b/system/core/utf8/stristr.php
diff --git a/kohana/core/utf8/strlen.php b/system/core/utf8/strlen.php
index f186a9c5..f186a9c5 100644
--- a/kohana/core/utf8/strlen.php
+++ b/system/core/utf8/strlen.php
diff --git a/kohana/core/utf8/strpos.php b/system/core/utf8/strpos.php
index 4a34dbe9..4a34dbe9 100644
--- a/kohana/core/utf8/strpos.php
+++ b/system/core/utf8/strpos.php
diff --git a/kohana/core/utf8/strrev.php b/system/core/utf8/strrev.php
index 89c428cd..89c428cd 100644
--- a/kohana/core/utf8/strrev.php
+++ b/system/core/utf8/strrev.php
diff --git a/kohana/core/utf8/strrpos.php b/system/core/utf8/strrpos.php
index 1ac8f9c8..1ac8f9c8 100644
--- a/kohana/core/utf8/strrpos.php
+++ b/system/core/utf8/strrpos.php
diff --git a/kohana/core/utf8/strspn.php b/system/core/utf8/strspn.php
index bc7e52f6..bc7e52f6 100644
--- a/kohana/core/utf8/strspn.php
+++ b/system/core/utf8/strspn.php
diff --git a/kohana/core/utf8/strtolower.php b/system/core/utf8/strtolower.php
index ff4da857..ff4da857 100644
--- a/kohana/core/utf8/strtolower.php
+++ b/system/core/utf8/strtolower.php
diff --git a/kohana/core/utf8/strtoupper.php b/system/core/utf8/strtoupper.php
index f3ded739..f3ded739 100644
--- a/kohana/core/utf8/strtoupper.php
+++ b/system/core/utf8/strtoupper.php
diff --git a/kohana/core/utf8/substr.php b/system/core/utf8/substr.php
index daf66b81..daf66b81 100644
--- a/kohana/core/utf8/substr.php
+++ b/system/core/utf8/substr.php
diff --git a/kohana/core/utf8/substr_replace.php b/system/core/utf8/substr_replace.php
index 45e2d2a3..45e2d2a3 100644
--- a/kohana/core/utf8/substr_replace.php
+++ b/system/core/utf8/substr_replace.php
diff --git a/kohana/core/utf8/to_unicode.php b/system/core/utf8/to_unicode.php
index 93f741a6..93f741a6 100644
--- a/kohana/core/utf8/to_unicode.php
+++ b/system/core/utf8/to_unicode.php
diff --git a/kohana/core/utf8/transliterate_to_ascii.php b/system/core/utf8/transliterate_to_ascii.php
index 07461fbb..07461fbb 100644
--- a/kohana/core/utf8/transliterate_to_ascii.php
+++ b/system/core/utf8/transliterate_to_ascii.php
diff --git a/kohana/core/utf8/trim.php b/system/core/utf8/trim.php
index 7434102a..7434102a 100644
--- a/kohana/core/utf8/trim.php
+++ b/system/core/utf8/trim.php
diff --git a/kohana/core/utf8/ucfirst.php b/system/core/utf8/ucfirst.php
index 81a4b380..81a4b380 100644
--- a/kohana/core/utf8/ucfirst.php
+++ b/system/core/utf8/ucfirst.php
diff --git a/kohana/core/utf8/ucwords.php b/system/core/utf8/ucwords.php
index 2d4c94b6..2d4c94b6 100644
--- a/kohana/core/utf8/ucwords.php
+++ b/system/core/utf8/ucwords.php
diff --git a/kohana/helpers/arr.php b/system/helpers/arr.php
index 9570c4b5..9570c4b5 100644
--- a/kohana/helpers/arr.php
+++ b/system/helpers/arr.php
diff --git a/kohana/helpers/cookie.php b/system/helpers/cookie.php
index 901b6d86..901b6d86 100644
--- a/kohana/helpers/cookie.php
+++ b/system/helpers/cookie.php
diff --git a/kohana/helpers/date.php b/system/helpers/date.php
index 7d5a9ab6..7d5a9ab6 100644
--- a/kohana/helpers/date.php
+++ b/system/helpers/date.php
diff --git a/kohana/helpers/download.php b/system/helpers/download.php
index 49fed42c..49fed42c 100644
--- a/kohana/helpers/download.php
+++ b/system/helpers/download.php
diff --git a/kohana/helpers/email.php b/system/helpers/email.php
index fb222d0c..fb222d0c 100644
--- a/kohana/helpers/email.php
+++ b/system/helpers/email.php
diff --git a/kohana/helpers/expires.php b/system/helpers/expires.php
index c43cc0cc..c43cc0cc 100644
--- a/kohana/helpers/expires.php
+++ b/system/helpers/expires.php
diff --git a/kohana/helpers/feed.php b/system/helpers/feed.php
index 74bb2f6b..74bb2f6b 100644
--- a/kohana/helpers/feed.php
+++ b/system/helpers/feed.php
diff --git a/kohana/helpers/file.php b/system/helpers/file.php
index b1b71740..b1b71740 100644
--- a/kohana/helpers/file.php
+++ b/system/helpers/file.php
diff --git a/kohana/helpers/form.php b/system/helpers/form.php
index ce8767c5..ce8767c5 100644
--- a/kohana/helpers/form.php
+++ b/system/helpers/form.php
diff --git a/kohana/helpers/format.php b/system/helpers/format.php
index fb8a0294..fb8a0294 100644
--- a/kohana/helpers/format.php
+++ b/system/helpers/format.php
diff --git a/kohana/helpers/html.php b/system/helpers/html.php
index f40c86dc..f40c86dc 100644
--- a/kohana/helpers/html.php
+++ b/system/helpers/html.php
diff --git a/kohana/helpers/inflector.php b/system/helpers/inflector.php
index 1e4fee23..1e4fee23 100644
--- a/kohana/helpers/inflector.php
+++ b/system/helpers/inflector.php
diff --git a/kohana/helpers/num.php b/system/helpers/num.php
index 3eb5d5ac..3eb5d5ac 100644
--- a/kohana/helpers/num.php
+++ b/system/helpers/num.php
diff --git a/kohana/helpers/remote.php b/system/helpers/remote.php
index f9e0267f..f9e0267f 100644
--- a/kohana/helpers/remote.php
+++ b/system/helpers/remote.php
diff --git a/kohana/helpers/request.php b/system/helpers/request.php
index 4203d0e5..4203d0e5 100644
--- a/kohana/helpers/request.php
+++ b/system/helpers/request.php
diff --git a/kohana/helpers/security.php b/system/helpers/security.php
index cd48d2e0..cd48d2e0 100644
--- a/kohana/helpers/security.php
+++ b/system/helpers/security.php
diff --git a/kohana/helpers/text.php b/system/helpers/text.php
index d0e573ec..d0e573ec 100644
--- a/kohana/helpers/text.php
+++ b/system/helpers/text.php
diff --git a/kohana/helpers/upload.php b/system/helpers/upload.php
index 422e9e8d..422e9e8d 100644
--- a/kohana/helpers/upload.php
+++ b/system/helpers/upload.php
diff --git a/kohana/helpers/url.php b/system/helpers/url.php
index f3d0ec8b..f3d0ec8b 100644
--- a/kohana/helpers/url.php
+++ b/system/helpers/url.php
diff --git a/kohana/helpers/valid.php b/system/helpers/valid.php
index 610076f3..610076f3 100644
--- a/kohana/helpers/valid.php
+++ b/system/helpers/valid.php
diff --git a/kohana/i18n/en_US/cache.php b/system/i18n/en_US/cache.php
index bef02793..bef02793 100644
--- a/kohana/i18n/en_US/cache.php
+++ b/system/i18n/en_US/cache.php
diff --git a/kohana/i18n/en_US/calendar.php b/system/i18n/en_US/calendar.php
index 21dad220..21dad220 100644
--- a/kohana/i18n/en_US/calendar.php
+++ b/system/i18n/en_US/calendar.php
diff --git a/kohana/i18n/en_US/core.php b/system/i18n/en_US/core.php
index 9711b7cd..9711b7cd 100644
--- a/kohana/i18n/en_US/core.php
+++ b/system/i18n/en_US/core.php
diff --git a/kohana/i18n/en_US/database.php b/system/i18n/en_US/database.php
index 172e5c90..172e5c90 100644
--- a/kohana/i18n/en_US/database.php
+++ b/system/i18n/en_US/database.php
diff --git a/kohana/i18n/en_US/encrypt.php b/system/i18n/en_US/encrypt.php
index 9afd6208..9afd6208 100644
--- a/kohana/i18n/en_US/encrypt.php
+++ b/system/i18n/en_US/encrypt.php
diff --git a/kohana/i18n/en_US/errors.php b/system/i18n/en_US/errors.php
index 83341a2c..83341a2c 100644
--- a/kohana/i18n/en_US/errors.php
+++ b/system/i18n/en_US/errors.php
diff --git a/kohana/i18n/en_US/event.php b/system/i18n/en_US/event.php
index 282a0a25..282a0a25 100644
--- a/kohana/i18n/en_US/event.php
+++ b/system/i18n/en_US/event.php
diff --git a/kohana/i18n/en_US/image.php b/system/i18n/en_US/image.php
index 9f184930..9f184930 100644
--- a/kohana/i18n/en_US/image.php
+++ b/system/i18n/en_US/image.php
diff --git a/kohana/i18n/en_US/orm.php b/system/i18n/en_US/orm.php
index 3c5720bc..3c5720bc 100644
--- a/kohana/i18n/en_US/orm.php
+++ b/system/i18n/en_US/orm.php
diff --git a/kohana/i18n/en_US/profiler.php b/system/i18n/en_US/profiler.php
index a39c2f51..a39c2f51 100644
--- a/kohana/i18n/en_US/profiler.php
+++ b/system/i18n/en_US/profiler.php
diff --git a/kohana/i18n/en_US/session.php b/system/i18n/en_US/session.php
index ee781c65..ee781c65 100644
--- a/kohana/i18n/en_US/session.php
+++ b/system/i18n/en_US/session.php
diff --git a/kohana/i18n/en_US/upload.php b/system/i18n/en_US/upload.php
index 7f6e216d..7f6e216d 100644
--- a/kohana/i18n/en_US/upload.php
+++ b/system/i18n/en_US/upload.php
diff --git a/kohana/i18n/en_US/validation.php b/system/i18n/en_US/validation.php
index d98e548f..d98e548f 100644
--- a/kohana/i18n/en_US/validation.php
+++ b/system/i18n/en_US/validation.php
diff --git a/kohana/libraries/Cache.php b/system/libraries/Cache.php
index 8a02a905..8a02a905 100644
--- a/kohana/libraries/Cache.php
+++ b/system/libraries/Cache.php
diff --git a/kohana/libraries/Controller.php b/system/libraries/Controller.php
index d111f25e..d111f25e 100644
--- a/kohana/libraries/Controller.php
+++ b/system/libraries/Controller.php
diff --git a/kohana/libraries/Database.php b/system/libraries/Database.php
index 6267f63a..6267f63a 100644
--- a/kohana/libraries/Database.php
+++ b/system/libraries/Database.php
diff --git a/kohana/libraries/Database_Expression.php b/system/libraries/Database_Expression.php
index 940a6363..940a6363 100644
--- a/kohana/libraries/Database_Expression.php
+++ b/system/libraries/Database_Expression.php
diff --git a/kohana/libraries/Encrypt.php b/system/libraries/Encrypt.php
index 3d564f99..3d564f99 100644
--- a/kohana/libraries/Encrypt.php
+++ b/system/libraries/Encrypt.php
diff --git a/kohana/libraries/Event_Observer.php b/system/libraries/Event_Observer.php
index 086c8a23..086c8a23 100644
--- a/kohana/libraries/Event_Observer.php
+++ b/system/libraries/Event_Observer.php
diff --git a/kohana/libraries/Event_Subject.php b/system/libraries/Event_Subject.php
index d1ccc544..d1ccc544 100644
--- a/kohana/libraries/Event_Subject.php
+++ b/system/libraries/Event_Subject.php
diff --git a/kohana/libraries/Image.php b/system/libraries/Image.php
index 08c2957c..08c2957c 100644
--- a/kohana/libraries/Image.php
+++ b/system/libraries/Image.php
diff --git a/kohana/libraries/Input.php b/system/libraries/Input.php
index 0e23c800..0e23c800 100644
--- a/kohana/libraries/Input.php
+++ b/system/libraries/Input.php
diff --git a/kohana/libraries/Model.php b/system/libraries/Model.php
index 0c9fd8d6..0c9fd8d6 100644
--- a/kohana/libraries/Model.php
+++ b/system/libraries/Model.php
diff --git a/kohana/libraries/ORM.php b/system/libraries/ORM.php
index c1048604..c1048604 100644
--- a/kohana/libraries/ORM.php
+++ b/system/libraries/ORM.php
diff --git a/kohana/libraries/ORM_Iterator.php b/system/libraries/ORM_Iterator.php
index 41aa8065..41aa8065 100644
--- a/kohana/libraries/ORM_Iterator.php
+++ b/system/libraries/ORM_Iterator.php
diff --git a/kohana/libraries/ORM_Tree.php b/system/libraries/ORM_Tree.php
index cdb09fd0..cdb09fd0 100644
--- a/kohana/libraries/ORM_Tree.php
+++ b/system/libraries/ORM_Tree.php
diff --git a/kohana/libraries/ORM_Versioned.php b/system/libraries/ORM_Versioned.php
index 078fe16a..078fe16a 100644
--- a/kohana/libraries/ORM_Versioned.php
+++ b/system/libraries/ORM_Versioned.php
diff --git a/kohana/libraries/Pagination.php b/system/libraries/Pagination.php
index a8f7bb19..a8f7bb19 100644
--- a/kohana/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
diff --git a/kohana/libraries/Profiler.php b/system/libraries/Profiler.php
index 47d82ace..47d82ace 100644
--- a/kohana/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
diff --git a/kohana/libraries/Profiler_Table.php b/system/libraries/Profiler_Table.php
index a0058a58..a0058a58 100644
--- a/kohana/libraries/Profiler_Table.php
+++ b/system/libraries/Profiler_Table.php
diff --git a/kohana/libraries/Router.php b/system/libraries/Router.php
index 6dc9b10c..6dc9b10c 100644
--- a/kohana/libraries/Router.php
+++ b/system/libraries/Router.php
diff --git a/kohana/libraries/Session.php b/system/libraries/Session.php
index e03f5dff..e03f5dff 100644
--- a/kohana/libraries/Session.php
+++ b/system/libraries/Session.php
diff --git a/kohana/libraries/URI.php b/system/libraries/URI.php
index d9ccdcf7..d9ccdcf7 100644
--- a/kohana/libraries/URI.php
+++ b/system/libraries/URI.php
diff --git a/kohana/libraries/Validation.php b/system/libraries/Validation.php
index 5a48bfc5..5a48bfc5 100644
--- a/kohana/libraries/Validation.php
+++ b/system/libraries/Validation.php
diff --git a/kohana/libraries/View.php b/system/libraries/View.php
index 2b8471c6..2b8471c6 100644
--- a/kohana/libraries/View.php
+++ b/system/libraries/View.php
diff --git a/kohana/libraries/drivers/Cache.php b/system/libraries/drivers/Cache.php
index 7c5e3c31..7c5e3c31 100644
--- a/kohana/libraries/drivers/Cache.php
+++ b/system/libraries/drivers/Cache.php
diff --git a/kohana/libraries/drivers/Cache/Apc.php b/system/libraries/drivers/Cache/Apc.php
index f7be048f..f7be048f 100644
--- a/kohana/libraries/drivers/Cache/Apc.php
+++ b/system/libraries/drivers/Cache/Apc.php
diff --git a/kohana/libraries/drivers/Cache/Eaccelerator.php b/system/libraries/drivers/Cache/Eaccelerator.php
index a45616d5..a45616d5 100644
--- a/kohana/libraries/drivers/Cache/Eaccelerator.php
+++ b/system/libraries/drivers/Cache/Eaccelerator.php
diff --git a/kohana/libraries/drivers/Cache/File.php b/system/libraries/drivers/Cache/File.php
index cc9d48d3..cc9d48d3 100644
--- a/kohana/libraries/drivers/Cache/File.php
+++ b/system/libraries/drivers/Cache/File.php
diff --git a/kohana/libraries/drivers/Cache/Memcache.php b/system/libraries/drivers/Cache/Memcache.php
index d801de9c..d801de9c 100644
--- a/kohana/libraries/drivers/Cache/Memcache.php
+++ b/system/libraries/drivers/Cache/Memcache.php
diff --git a/kohana/libraries/drivers/Cache/Sqlite.php b/system/libraries/drivers/Cache/Sqlite.php
index 9458d851..9458d851 100644
--- a/kohana/libraries/drivers/Cache/Sqlite.php
+++ b/system/libraries/drivers/Cache/Sqlite.php
diff --git a/kohana/libraries/drivers/Cache/Xcache.php b/system/libraries/drivers/Cache/Xcache.php
index 6254bbb6..6254bbb6 100644
--- a/kohana/libraries/drivers/Cache/Xcache.php
+++ b/system/libraries/drivers/Cache/Xcache.php
diff --git a/kohana/libraries/drivers/Captcha.php b/system/libraries/drivers/Captcha.php
index a4343e19..a4343e19 100644
--- a/kohana/libraries/drivers/Captcha.php
+++ b/system/libraries/drivers/Captcha.php
diff --git a/kohana/libraries/drivers/Captcha/Alpha.php b/system/libraries/drivers/Captcha/Alpha.php
index b3a9c9d7..b3a9c9d7 100644
--- a/kohana/libraries/drivers/Captcha/Alpha.php
+++ b/system/libraries/drivers/Captcha/Alpha.php
diff --git a/kohana/libraries/drivers/Captcha/Basic.php b/system/libraries/drivers/Captcha/Basic.php
index d212e72c..d212e72c 100644
--- a/kohana/libraries/drivers/Captcha/Basic.php
+++ b/system/libraries/drivers/Captcha/Basic.php
diff --git a/kohana/libraries/drivers/Captcha/Black.php b/system/libraries/drivers/Captcha/Black.php
index 6a2e2226..6a2e2226 100644
--- a/kohana/libraries/drivers/Captcha/Black.php
+++ b/system/libraries/drivers/Captcha/Black.php
diff --git a/kohana/libraries/drivers/Captcha/Math.php b/system/libraries/drivers/Captcha/Math.php
index 4ac20248..4ac20248 100644
--- a/kohana/libraries/drivers/Captcha/Math.php
+++ b/system/libraries/drivers/Captcha/Math.php
diff --git a/kohana/libraries/drivers/Captcha/Riddle.php b/system/libraries/drivers/Captcha/Riddle.php
index 765eeaad..765eeaad 100644
--- a/kohana/libraries/drivers/Captcha/Riddle.php
+++ b/system/libraries/drivers/Captcha/Riddle.php
diff --git a/kohana/libraries/drivers/Captcha/Word.php b/system/libraries/drivers/Captcha/Word.php
index 856bd9b4..856bd9b4 100644
--- a/kohana/libraries/drivers/Captcha/Word.php
+++ b/system/libraries/drivers/Captcha/Word.php
diff --git a/kohana/libraries/drivers/Database.php b/system/libraries/drivers/Database.php
index 807469f6..807469f6 100644
--- a/kohana/libraries/drivers/Database.php
+++ b/system/libraries/drivers/Database.php
diff --git a/kohana/libraries/drivers/Database/Mssql.php b/system/libraries/drivers/Database/Mssql.php
index 6947679a..6947679a 100644
--- a/kohana/libraries/drivers/Database/Mssql.php
+++ b/system/libraries/drivers/Database/Mssql.php
diff --git a/kohana/libraries/drivers/Database/Mysql.php b/system/libraries/drivers/Database/Mysql.php
index d5222f50..d5222f50 100644
--- a/kohana/libraries/drivers/Database/Mysql.php
+++ b/system/libraries/drivers/Database/Mysql.php
diff --git a/kohana/libraries/drivers/Database/Mysqli.php b/system/libraries/drivers/Database/Mysqli.php
index 0dd9f05c..0dd9f05c 100644
--- a/kohana/libraries/drivers/Database/Mysqli.php
+++ b/system/libraries/drivers/Database/Mysqli.php
diff --git a/kohana/libraries/drivers/Database/Pdosqlite.php b/system/libraries/drivers/Database/Pdosqlite.php
index c2d1bb21..c2d1bb21 100644
--- a/kohana/libraries/drivers/Database/Pdosqlite.php
+++ b/system/libraries/drivers/Database/Pdosqlite.php
diff --git a/kohana/libraries/drivers/Database/Pgsql.php b/system/libraries/drivers/Database/Pgsql.php
index c53c8439..c53c8439 100644
--- a/kohana/libraries/drivers/Database/Pgsql.php
+++ b/system/libraries/drivers/Database/Pgsql.php
diff --git a/kohana/libraries/drivers/Image.php b/system/libraries/drivers/Image.php
index f89ba953..f89ba953 100644
--- a/kohana/libraries/drivers/Image.php
+++ b/system/libraries/drivers/Image.php
diff --git a/kohana/libraries/drivers/Image/GD.php b/system/libraries/drivers/Image/GD.php
index be2af4e2..be2af4e2 100644
--- a/kohana/libraries/drivers/Image/GD.php
+++ b/system/libraries/drivers/Image/GD.php
diff --git a/kohana/libraries/drivers/Image/GraphicsMagick.php b/system/libraries/drivers/Image/GraphicsMagick.php
index a8bc4d9b..a8bc4d9b 100644
--- a/kohana/libraries/drivers/Image/GraphicsMagick.php
+++ b/system/libraries/drivers/Image/GraphicsMagick.php
diff --git a/kohana/libraries/drivers/Image/ImageMagick.php b/system/libraries/drivers/Image/ImageMagick.php
index 4b381fd6..4b381fd6 100644
--- a/kohana/libraries/drivers/Image/ImageMagick.php
+++ b/system/libraries/drivers/Image/ImageMagick.php
diff --git a/kohana/libraries/drivers/Session.php b/system/libraries/drivers/Session.php
index fb58c8d3..fb58c8d3 100644
--- a/kohana/libraries/drivers/Session.php
+++ b/system/libraries/drivers/Session.php
diff --git a/kohana/libraries/drivers/Session/Cache.php b/system/libraries/drivers/Session/Cache.php
index 7221c9f2..7221c9f2 100644
--- a/kohana/libraries/drivers/Session/Cache.php
+++ b/system/libraries/drivers/Session/Cache.php
diff --git a/kohana/libraries/drivers/Session/Cookie.php b/system/libraries/drivers/Session/Cookie.php
index 7b791064..7b791064 100644
--- a/kohana/libraries/drivers/Session/Cookie.php
+++ b/system/libraries/drivers/Session/Cookie.php
diff --git a/kohana/libraries/drivers/Session/Database.php b/system/libraries/drivers/Session/Database.php
index b4144ffb..b4144ffb 100644
--- a/kohana/libraries/drivers/Session/Database.php
+++ b/system/libraries/drivers/Session/Database.php
diff --git a/kohana/views/kohana/template.php b/system/views/kohana/template.php
index b090fd88..b090fd88 100644
--- a/kohana/views/kohana/template.php
+++ b/system/views/kohana/template.php
diff --git a/kohana/views/kohana_error_disabled.php b/system/views/kohana_error_disabled.php
index cd911328..cd911328 100644
--- a/kohana/views/kohana_error_disabled.php
+++ b/system/views/kohana_error_disabled.php
diff --git a/kohana/views/kohana_error_page.php b/system/views/kohana_error_page.php
index 944064cc..944064cc 100644
--- a/kohana/views/kohana_error_page.php
+++ b/system/views/kohana_error_page.php
diff --git a/kohana/views/kohana_errors.css b/system/views/kohana_errors.css
index 1341f57d..1341f57d 100644
--- a/kohana/views/kohana_errors.css
+++ b/system/views/kohana_errors.css
diff --git a/kohana/views/kohana_profiler.php b/system/views/kohana_profiler.php
index da77a669..da77a669 100644
--- a/kohana/views/kohana_profiler.php
+++ b/system/views/kohana_profiler.php
diff --git a/kohana/views/kohana_profiler_table.css b/system/views/kohana_profiler_table.css
index 6e7601c9..6e7601c9 100644
--- a/kohana/views/kohana_profiler_table.css
+++ b/system/views/kohana_profiler_table.css
diff --git a/kohana/views/kohana_profiler_table.php b/system/views/kohana_profiler_table.php
index b6b46530..b6b46530 100644
--- a/kohana/views/kohana_profiler_table.php
+++ b/system/views/kohana_profiler_table.php
diff --git a/themes/default/views/footer.html.php b/themes/default/views/footer.html.php
index bd17a634..d7111922 100644
--- a/themes/default/views/footer.html.php
+++ b/themes/default/views/footer.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $theme->footer() ?>
-<? if ($footer_text = module::get_var("core", "footer_text")): ?>
+<? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
 <?= $footer_text ?>
 <? else: ?>
 <ul id="gCredits">
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index c70c8a4d..9d058e35 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $theme->header_top() ?>
-<? if ($header_text = module::get_var("core", "header_text")): ?>
+<? if ($header_text = module::get_var("gallery", "header_text")): ?>
 <?= $header_text ?>
 <? else: ?>
 <a href="<?= url::site("albums/1") ?>">