diff --git a/suite/build/moz.build b/suite/build/moz.build
index f85e8693a6..7433b14383 100644
--- a/suite/build/moz.build
+++ b/suite/build/moz.build
@@ -15,8 +15,8 @@ Library('suite')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
+    '../components/shell',
     '../feeds/src',
     '../profile',
     '../profile/migration/src',
-    '../shell/src',
 ]
diff --git a/suite/shell/public/moz.build b/suite/components/moz.build
similarity index 56%
rename from suite/shell/public/moz.build
rename to suite/components/moz.build
index 031552db6a..39f8361e47 100644
--- a/suite/shell/public/moz.build
+++ b/suite/components/moz.build
@@ -3,14 +3,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/.
 
-XPIDL_SOURCES += [
-    'nsIShellService.idl',
+DIRS += [
+    'shell',
 ]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    XPIDL_SOURCES += [
-        'nsIWindowsShellService.idl',
-    ]
-
-XPIDL_MODULE = 'shellservice'
-
diff --git a/suite/shell/src/moz.build b/suite/components/shell/moz.build
similarity index 82%
rename from suite/shell/src/moz.build
rename to suite/components/shell/moz.build
index 9e6b0cf9fd..957b4c4e43 100644
--- a/suite/shell/src/moz.build
+++ b/suite/components/shell/moz.build
@@ -3,6 +3,17 @@
 # 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/.
 
+XPIDL_SOURCES += [
+    'nsIShellService.idl',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    XPIDL_SOURCES += [
+        'nsIWindowsShellService.idl',
+    ]
+
+XPIDL_MODULE = 'shellservice'
+
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         'nsWindowsShellService.cpp',
diff --git a/suite/shell/src/nsGNOMEShellService.cpp b/suite/components/shell/nsGNOMEShellService.cpp
similarity index 100%
rename from suite/shell/src/nsGNOMEShellService.cpp
rename to suite/components/shell/nsGNOMEShellService.cpp
diff --git a/suite/shell/src/nsGNOMEShellService.h b/suite/components/shell/nsGNOMEShellService.h
similarity index 100%
rename from suite/shell/src/nsGNOMEShellService.h
rename to suite/components/shell/nsGNOMEShellService.h
diff --git a/suite/shell/public/nsIShellService.idl b/suite/components/shell/nsIShellService.idl
similarity index 100%
rename from suite/shell/public/nsIShellService.idl
rename to suite/components/shell/nsIShellService.idl
diff --git a/suite/shell/public/nsIWindowsShellService.idl b/suite/components/shell/nsIWindowsShellService.idl
similarity index 100%
rename from suite/shell/public/nsIWindowsShellService.idl
rename to suite/components/shell/nsIWindowsShellService.idl
diff --git a/suite/shell/src/nsMacShellService.cpp b/suite/components/shell/nsMacShellService.cpp
similarity index 100%
rename from suite/shell/src/nsMacShellService.cpp
rename to suite/components/shell/nsMacShellService.cpp
diff --git a/suite/shell/src/nsMacShellService.h b/suite/components/shell/nsMacShellService.h
similarity index 100%
rename from suite/shell/src/nsMacShellService.h
rename to suite/components/shell/nsMacShellService.h
diff --git a/suite/shell/src/nsSetDefault.js b/suite/components/shell/nsSetDefault.js
similarity index 100%
rename from suite/shell/src/nsSetDefault.js
rename to suite/components/shell/nsSetDefault.js
diff --git a/suite/shell/src/nsSetDefault.manifest b/suite/components/shell/nsSetDefault.manifest
similarity index 100%
rename from suite/shell/src/nsSetDefault.manifest
rename to suite/components/shell/nsSetDefault.manifest
diff --git a/suite/shell/src/nsShellService.h b/suite/components/shell/nsShellService.h
similarity index 100%
rename from suite/shell/src/nsShellService.h
rename to suite/components/shell/nsShellService.h
diff --git a/suite/shell/src/nsWindowsShellService.cpp b/suite/components/shell/nsWindowsShellService.cpp
similarity index 100%
rename from suite/shell/src/nsWindowsShellService.cpp
rename to suite/components/shell/nsWindowsShellService.cpp
diff --git a/suite/shell/src/nsWindowsShellService.h b/suite/components/shell/nsWindowsShellService.h
similarity index 100%
rename from suite/shell/src/nsWindowsShellService.h
rename to suite/components/shell/nsWindowsShellService.h
diff --git a/suite/moz.build b/suite/moz.build
index 2181bbef71..b79a625e16 100644
--- a/suite/moz.build
+++ b/suite/moz.build
@@ -8,6 +8,7 @@ CONFIGURE_SUBST_FILES += ['installer/Makefile']
 DIRS += [
     'browser',
     'common',
+    'components',
     'extensions',
     'feeds/public',
     'feeds/src',
@@ -18,8 +19,6 @@ DIRS += [
     'themes/modern',
     'profile',
     'security',
-    'shell/public',
-    'shell/src',
     '../common/src',
 ]