diff --git a/application/basilisk/components/search/moz.build b/application/basilisk/components/search/moz.build
index aac3a838c..b406d5f16 100644
--- a/application/basilisk/components/search/moz.build
+++ b/application/basilisk/components/search/moz.build
@@ -4,4 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+DIRS += ['service']
+
 JAR_MANIFESTS += ['jar.mn']
diff --git a/toolkit/components/search/current/SearchStaticData.jsm b/application/basilisk/components/search/service/SearchStaticData.jsm
similarity index 100%
rename from toolkit/components/search/current/SearchStaticData.jsm
rename to application/basilisk/components/search/service/SearchStaticData.jsm
diff --git a/toolkit/components/search/current/SearchSuggestionController.jsm b/application/basilisk/components/search/service/SearchSuggestionController.jsm
similarity index 100%
rename from toolkit/components/search/current/SearchSuggestionController.jsm
rename to application/basilisk/components/search/service/SearchSuggestionController.jsm
diff --git a/toolkit/components/search/orginal/moz.build b/application/basilisk/components/search/service/moz.build
similarity index 73%
rename from toolkit/components/search/orginal/moz.build
rename to application/basilisk/components/search/service/moz.build
index 4ca679087..423faeffd 100644
--- a/toolkit/components/search/orginal/moz.build
+++ b/application/basilisk/components/search/service/moz.build
@@ -4,28 +4,21 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+DIST_SUBDIR = ''
+
+DEFINES['HAVE_SIDEBAR'] = True
+
 EXTRA_COMPONENTS += [
     'nsSearchSuggestions.js',
+    'nsSidebar.js',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'nsSearchService.js',
-]
-
-if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
-    DEFINES['HAVE_SIDEBAR'] = True
-    EXTRA_COMPONENTS += [
-    'nsSidebar.js',
-    ]
-
-EXTRA_JS_MODULES += [
-    'SearchSuggestionController.jsm',
-]
-
-EXTRA_PP_COMPONENTS += [
     'toolkitsearch.manifest',
 ]
 
 EXTRA_JS_MODULES += [
     'SearchStaticData.jsm',
+    'SearchSuggestionController.jsm',
 ]
diff --git a/toolkit/components/search/current/nsSearchService.js b/application/basilisk/components/search/service/nsSearchService.js
similarity index 99%
rename from toolkit/components/search/current/nsSearchService.js
rename to application/basilisk/components/search/service/nsSearchService.js
index 831983a49..2ea9384f5 100644
--- a/toolkit/components/search/current/nsSearchService.js
+++ b/application/basilisk/components/search/service/nsSearchService.js
@@ -75,7 +75,6 @@ const SEARCH_ENGINE_CHANGED      = "engine-changed";
 const SEARCH_ENGINE_LOADED       = "engine-loaded";
 const SEARCH_ENGINE_CURRENT      = "engine-current";
 const SEARCH_ENGINE_DEFAULT      = "engine-default";
-const SEARCH_ENGINE_RENAMED      = "engine-renamed";
 
 // The following constants are left undocumented in nsIBrowserSearchService.idl
 // For the moment, they are meant for testing/debugging purposes only.
@@ -4153,20 +4152,6 @@ SearchService.prototype = {
             // Invalidate the map used to parse URLs to search engines.
             this._parseSubmissionMap = null;
             break;
-          case SEARCH_ENGINE_RENAMED:
-            if (aEngine && ("wrappedJSObject" in aEngine)) {
-              let wjo = aEngine.wrappedJSObject;
-              if (wjo && ("__old_name" in wjo)) {
-                delete this._engines[wjo.__old_name];
-                this._engines[wjo._name] = wjo;
-                delete wjo.__old_name;
-                this.batchTask.disarm();
-                this.batchTask.arm();
-                // Invalidate the map used to parse URLs to search engines.
-                this._parseSubmissionMap = null;
-              }
-            }
-            break;
         }
         break;
 
diff --git a/toolkit/components/search/current/nsSearchSuggestions.js b/application/basilisk/components/search/service/nsSearchSuggestions.js
similarity index 100%
rename from toolkit/components/search/current/nsSearchSuggestions.js
rename to application/basilisk/components/search/service/nsSearchSuggestions.js
diff --git a/toolkit/components/search/current/nsSidebar.js b/application/basilisk/components/search/service/nsSidebar.js
similarity index 100%
rename from toolkit/components/search/current/nsSidebar.js
rename to application/basilisk/components/search/service/nsSidebar.js
diff --git a/toolkit/components/search/current/toolkitsearch.manifest b/application/basilisk/components/search/service/toolkitsearch.manifest
similarity index 100%
rename from toolkit/components/search/current/toolkitsearch.manifest
rename to application/basilisk/components/search/service/toolkitsearch.manifest
diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index 194754e7f..7385cb73b 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -89,7 +89,9 @@ if CONFIG['MOZ_XUL']:
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
     DIRS += ['filepicker']
 
-if CONFIG['MOZ_TOOLKIT_SEARCH']:
+if CONFIG['MOZ_TOOLKIT_SEARCH'] and not CONFIG['MC_BASILISK'] \
+                                and not CONFIG['HYPE_ICEWEASEL'] \
+                                and not CONFIG['HYPE_ICEDOVE']:
     DIRS += ['search']
 
 if CONFIG['MOZ_URL_CLASSIFIER']:
diff --git a/toolkit/components/search/orginal/SearchStaticData.jsm b/toolkit/components/search/SearchStaticData.jsm
similarity index 100%
rename from toolkit/components/search/orginal/SearchStaticData.jsm
rename to toolkit/components/search/SearchStaticData.jsm
diff --git a/toolkit/components/search/orginal/SearchSuggestionController.jsm b/toolkit/components/search/SearchSuggestionController.jsm
similarity index 100%
rename from toolkit/components/search/orginal/SearchSuggestionController.jsm
rename to toolkit/components/search/SearchSuggestionController.jsm
diff --git a/toolkit/components/search/current/moz.build b/toolkit/components/search/current/moz.build
deleted file mode 100644
index 4ca679087..000000000
--- a/toolkit/components/search/current/moz.build
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXTRA_COMPONENTS += [
-    'nsSearchSuggestions.js',
-]
-
-EXTRA_PP_COMPONENTS += [
-    'nsSearchService.js',
-]
-
-if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
-    DEFINES['HAVE_SIDEBAR'] = True
-    EXTRA_COMPONENTS += [
-    'nsSidebar.js',
-    ]
-
-EXTRA_JS_MODULES += [
-    'SearchSuggestionController.jsm',
-]
-
-EXTRA_PP_COMPONENTS += [
-    'toolkitsearch.manifest',
-]
-
-EXTRA_JS_MODULES += [
-    'SearchStaticData.jsm',
-]
diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build
index e19e70f18..2f8b3e54c 100644
--- a/toolkit/components/search/moz.build
+++ b/toolkit/components/search/moz.build
@@ -4,7 +4,19 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-if CONFIG['MC_BASILISK'] or CONFIG['HYPE_ICEWEASEL'] or CONFIG['HYPE_ICEDOVE']:
-    DIRS += ['current']
-else:
-    DIRS += ['orginal']
+EXTRA_COMPONENTS += ['nsSearchSuggestions.js']
+
+EXTRA_PP_COMPONENTS += [
+    'nsSearchService.js',
+    'toolkitsearch.manifest',
+]
+
+if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
+    DEFINES['HAVE_SIDEBAR'] = True
+    EXTRA_COMPONENTS += ['nsSidebar.js']
+
+EXTRA_JS_MODULES += [
+    'SearchStaticData.jsm',
+    'SearchSuggestionController.jsm',
+]
+
diff --git a/toolkit/components/search/orginal/nsSearchService.js b/toolkit/components/search/nsSearchService.js
similarity index 99%
rename from toolkit/components/search/orginal/nsSearchService.js
rename to toolkit/components/search/nsSearchService.js
index 760f13e72..399c4924e 100644
--- a/toolkit/components/search/orginal/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -76,6 +76,7 @@ const SEARCH_ENGINE_CHANGED      = "engine-changed";
 const SEARCH_ENGINE_LOADED       = "engine-loaded";
 const SEARCH_ENGINE_CURRENT      = "engine-current";
 const SEARCH_ENGINE_DEFAULT      = "engine-default";
+const SEARCH_ENGINE_RENAMED      = "engine-renamed";
 
 // The following constants are left undocumented in nsIBrowserSearchService.idl
 // For the moment, they are meant for testing/debugging purposes only.
@@ -4144,6 +4145,20 @@ SearchService.prototype = {
             // Invalidate the map used to parse URLs to search engines.
             this._parseSubmissionMap = null;
             break;
+          case SEARCH_ENGINE_RENAMED:
+            if (aEngine && ("wrappedJSObject" in aEngine)) {
+              let wjo = aEngine.wrappedJSObject;
+              if (wjo && ("__old_name" in wjo)) {
+                delete this._engines[wjo.__old_name];
+                this._engines[wjo._name] = wjo;
+                delete wjo.__old_name;
+                this.batchTask.disarm();
+                this.batchTask.arm();
+                // Invalidate the map used to parse URLs to search engines.
+                this._parseSubmissionMap = null;
+              }
+            }
+            break;
         }
         break;
 
@@ -4556,4 +4571,4 @@ var engineUpdateService = {
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SearchService]);
 
-#include ../../../../toolkit/modules/debug.js
+#include ../../../toolkit/modules/debug.js
diff --git a/toolkit/components/search/orginal/nsSearchSuggestions.js b/toolkit/components/search/nsSearchSuggestions.js
similarity index 100%
rename from toolkit/components/search/orginal/nsSearchSuggestions.js
rename to toolkit/components/search/nsSearchSuggestions.js
diff --git a/toolkit/components/search/orginal/nsSidebar.js b/toolkit/components/search/nsSidebar.js
similarity index 100%
rename from toolkit/components/search/orginal/nsSidebar.js
rename to toolkit/components/search/nsSidebar.js
diff --git a/toolkit/components/search/orginal/toolkitsearch.manifest b/toolkit/components/search/toolkitsearch.manifest
similarity index 100%
rename from toolkit/components/search/orginal/toolkitsearch.manifest
rename to toolkit/components/search/toolkitsearch.manifest