try-comm-central: changeset 64574:0838548ddc02bfc89f3515137746ab94e13bddd4

rename from suite/common/about.js
rename to suite/base/content/about.js

rename from suite/common/about.xhtml
rename to suite/base/content/about.xhtml

rename from suite/common/aboutLife.xhtml
rename to suite/base/content/aboutLife.xhtml

rename from suite/common/aboutPrivateBrowsing.css
rename to suite/base/content/aboutPrivateBrowsing.css

rename from suite/common/aboutPrivateBrowsing.js
rename to suite/base/content/aboutPrivateBrowsing.js

rename from suite/common/aboutPrivateBrowsing.xul
rename to suite/base/content/aboutPrivateBrowsing.xul

rename from suite/common/askViewZoom.js
rename to suite/base/content/askViewZoom.js

rename from suite/common/askViewZoom.xul
rename to suite/base/content/askViewZoom.xul

rename from suite/common/blockedSite.js
rename to suite/base/content/blockedSite.js

rename from suite/common/blockedSite.xhtml
rename to suite/base/content/blockedSite.xhtml

rename from suite/common/certError.css
rename to suite/base/content/certError.css

rename from suite/common/certError.js
rename to suite/base/content/certError.js

rename from suite/common/certError.xhtml
rename to suite/base/content/certError.xhtml

rename from suite/common/certError.xml
rename to suite/base/content/certError.xml

rename from suite/common/charsetOverlay.xul
rename to suite/base/content/charsetOverlay.xul

rename from suite/common/communicator.css
rename to suite/base/content/communicator.css

rename from suite/common/contentAreaClick.js
rename to suite/base/content/contentAreaClick.js

rename from suite/common/contentAreaContextOverlay.xul
rename to suite/base/content/contentAreaContextOverlay.xul

rename from suite/common/defaultClientDialog.js
rename to suite/base/content/defaultClientDialog.js

rename from suite/common/defaultClientDialog.xul
rename to suite/base/content/defaultClientDialog.xul

rename from suite/common/findUtils.js
rename to suite/base/content/findUtils.js

rename from suite/common/fullscreen-video.xhtml
rename to suite/base/content/fullscreen-video.xhtml

rename from suite/common/gopherAddon.xhtml
rename to suite/base/content/gopherAddon.xhtml

rename from suite/common/helpEditorOverlay.xul
rename to suite/base/content/helpEditorOverlay.xul

rename from suite/common/helpMessengerOverlay.xul
rename to suite/base/content/helpMessengerOverlay.xul

rename from suite/common/helpSecurityOverlay.xul
rename to suite/base/content/helpSecurityOverlay.xul

rename from suite/common/mac/platformCommunicatorOverlay.xul
rename to suite/base/content/mac/platformCommunicatorOverlay.xul

rename from suite/common/nsContextMenu.js
rename to suite/base/content/nsContextMenu.js

rename from suite/common/openLocation.js
rename to suite/base/content/openLocation.js

rename from suite/common/openLocation.xul
rename to suite/base/content/openLocation.xul

rename from suite/common/app-license.html
rename to suite/base/content/overrides/app-license.html

rename from suite/common/safeMode.js
rename to suite/base/content/safeMode.js

rename from suite/common/safeMode.xul
rename to suite/base/content/safeMode.xul

rename from suite/common/sanitize.xul
rename to suite/base/content/sanitize.xul

rename from suite/common/tasksOverlay.js
rename to suite/base/content/tasksOverlay.js

rename from suite/common/tasksOverlay.xul
rename to suite/base/content/tasksOverlay.xul

rename from suite/common/unix/platformCommunicatorOverlay.xul
rename to suite/base/content/unix/platformCommunicatorOverlay.xul

rename from suite/common/utilityOverlay.js
rename to suite/base/content/utilityOverlay.js

rename from suite/common/utilityOverlay.xul
rename to suite/base/content/utilityOverlay.xul

rename from suite/common/viewApplyThemeOverlay.js
rename to suite/base/content/viewApplyThemeOverlay.js

rename from suite/common/viewApplyThemeOverlay.xul
rename to suite/base/content/viewApplyThemeOverlay.xul

rename from suite/common/viewSourceOverlay.js
rename to suite/base/content/viewSourceOverlay.js

rename from suite/common/viewSourceOverlay.xul
rename to suite/base/content/viewSourceOverlay.xul

rename from suite/common/viewZoomOverlay.js
rename to suite/base/content/viewZoomOverlay.js

rename from suite/common/viewZoomOverlay.xul
rename to suite/base/content/viewZoomOverlay.xul

rename from suite/common/win/platformCommunicatorOverlay.xul
rename to suite/base/content/win/platformCommunicatorOverlay.xul

rename from suite/common/jar.mn
rename to suite/base/jar.mn
--- a/suite/common/jar.mn
+++ b/suite/base/jar.mn
@@ -1,18 +1,17 @@
 #filter substitution
 
-toolkit.jar:
-   content/global/autocomplete.xml                                  (autocomplete/autocomplete.xml)
+# 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/.comm.jar:
 
 comm.jar:
 % content communicator %content/communicator/ contentaccessible=yes
-% content help %content/communicator/helpviewer/
 % override chrome://global/content/license.html chrome://communicator/content/license.html
-% override chrome://mozapps/content/profile/profileSelection.xul chrome://communicator/content/profile/profileSelection.xul
 % overlay chrome://global/content/viewSource.xul chrome://communicator/content/viewSourceOverlay.xul
 % overlay chrome://global/content/viewPartialSource.xul chrome://communicator/content/viewSourceOverlay.xul
 % overlay chrome://editor/content/EdAdvancedEdit.xul chrome://communicator/content/helpEditorOverlay.xul
 % overlay chrome://editor/content/EdImageProps.xul chrome://communicator/content/helpEditorOverlay.xul
 % overlay chrome://editor/content/EditorPublish.xul chrome://communicator/content/helpEditorOverlay.xul
 % overlay chrome://editor/content/EditorPublishProgress.xul chrome://communicator/content/helpEditorOverlay.xul
 % overlay chrome://editor/content/EditorPublishSettings.xul chrome://communicator/content/helpEditorOverlay.xul
 % overlay chrome://editor/content/EdLinkProps.xul chrome://communicator/content/helpEditorOverlay.xul
@@ -43,189 +42,62 @@ comm.jar:
 % overlay chrome://messenger/content/junkMailInfo.xul chrome://communicator/content/helpMessengerOverlay.xul
 % overlay chrome://messenger/content/msgSelectOfflineFolders.xul chrome://communicator/content/helpMessengerOverlay.xul
 % overlay chrome://messenger/content/subscribe.xul chrome://communicator/content/helpMessengerOverlay.xul
 % overlay chrome://messenger/content/mailViewList.xul chrome://communicator/content/helpMessengerOverlay.xul
 % overlay chrome://messenger/content/mailViewSetup.xul chrome://communicator/content/helpMessengerOverlay.xul
 % overlay chrome://messenger-smime/content/msgCompSecurityInfo.xul chrome://communicator/content/helpMessengerOverlay.xul
 % overlay chrome://messenger-smime/content/msgReadSecurityInfo.xul chrome://communicator/content/helpMessengerOverlay.xul
 % content communicator-region %content/communicator-region/
-   content/communicator/about.js
-   content/communicator/about.xhtml
-   content/communicator/aboutLife.xhtml
-   content/communicator/aboutPrivateBrowsing.css
-   content/communicator/aboutPrivateBrowsing.js
-   content/communicator/aboutPrivateBrowsing.xul
-   content/communicator/aboutSessionRestore.js
-   content/communicator/aboutSessionRestore.xhtml
-   content/communicator/askViewZoom.xul
-   content/communicator/askViewZoom.js
-   content/communicator/blockedSite.js
-   content/communicator/blockedSite.xhtml
-   content/communicator/certError.css
-   content/communicator/certError.js
-   content/communicator/certError.xhtml
-   content/communicator/certError.xml
-   content/communicator/charsetOverlay.xul
-*  content/communicator/communicator.css
-   content/communicator/contentAreaClick.js
-   content/communicator/contentAreaContextOverlay.xul
-   content/communicator/defaultClientDialog.js
-   content/communicator/defaultClientDialog.xul
-   content/communicator/findUtils.js
-   content/communicator/fullscreen-video.xhtml
-   content/communicator/gopherAddon.xhtml
-   content/communicator/helpEditorOverlay.xul
-   content/communicator/helpMessengerOverlay.xul
-   content/communicator/helpSecurityOverlay.xul
+   content/communicator/about.js                                    (content/about.js)
+   content/communicator/about.xhtml                                 (content/about.xhtml)
+   content/communicator/aboutLife.xhtml                             (content/aboutLife.xhtml)
+   content/communicator/aboutPrivateBrowsing.css                    (content/aboutPrivateBrowsing.css)
+   content/communicator/aboutPrivateBrowsing.js                     (content/aboutPrivateBrowsing.js)
+   content/communicator/aboutPrivateBrowsing.xul                    (content/aboutPrivateBrowsing.xul)
+   content/communicator/askViewZoom.xul                             (content/askViewZoom.xul)
+   content/communicator/askViewZoom.js                              (content/askViewZoom.js)
+   content/communicator/blockedSite.js                              (content/blockedSite.js)
+   content/communicator/blockedSite.xhtml                           (content/blockedSite.xhtml)
+   content/communicator/certError.css                               (content/certError.css)
+   content/communicator/certError.js                                (content/certError.js)
+   content/communicator/certError.xhtml                             (content/certError.xhtml)
+   content/communicator/certError.xml                               (content/certError.xml)
+   content/communicator/charsetOverlay.xul                          (content/charsetOverlay.xul)
+*  content/communicator/communicator.css                            (content/communicator.css)
+   content/communicator/contentAreaClick.js                         (content/contentAreaClick.js)
+   content/communicator/contentAreaContextOverlay.xul               (content/contentAreaContextOverlay.xul)
+   content/communicator/defaultClientDialog.js                      (content/defaultClientDialog.js)
+   content/communicator/defaultClientDialog.xul                     (content/defaultClientDialog.xul)
+   content/communicator/findUtils.js                                (content/findUtils.js)
+   content/communicator/fullscreen-video.xhtml                      (content/fullscreen-video.xhtml)
+   content/communicator/gopherAddon.xhtml                           (content/gopherAddon.xhtml)
+   content/communicator/helpEditorOverlay.xul                       (content/helpEditorOverlay.xul)
+   content/communicator/helpMessengerOverlay.xul                    (content/helpMessengerOverlay.xul)
+   content/communicator/helpSecurityOverlay.xul                     (content/helpSecurityOverlay.xul)
    content/communicator/labelsencodings.properties                  (/@mozreltopsrcdir@/dom/encoding/labelsencodings.properties)
 # the following file is a suite-specific override of the generic license.html, using suite/common/app-license.html as input:
 *  content/communicator/license.html                                (/@mozreltopsrcdir@/toolkit/content/license.html)
-   content/communicator/nsContextMenu.js
-   content/communicator/openLocation.js
-   content/communicator/openLocation.xul
-   content/communicator/safeMode.js
-   content/communicator/safeMode.xul
-   content/communicator/sanitize.xul
-   content/communicator/setDesktopBackground.js
-   content/communicator/setDesktopBackground.xul
-   content/communicator/tasksOverlay.js
-   content/communicator/tasksOverlay.xul
-   content/communicator/utilityOverlay.js
-   content/communicator/utilityOverlay.xul
-   content/communicator/viewApplyThemeOverlay.xul
-   content/communicator/viewApplyThemeOverlay.js
-   content/communicator/viewSourceOverlay.js
-   content/communicator/viewSourceOverlay.xul
-   content/communicator/viewZoomOverlay.xul
-   content/communicator/viewZoomOverlay.js
+   content/communicator/nsContextMenu.js                            (content/nsContextMenu.js)
+   content/communicator/openLocation.js                             (content/openLocation.js)
+   content/communicator/openLocation.xul                            (content/openLocation.xul)
+   content/communicator/safeMode.js                                 (content/safeMode.js)
+   content/communicator/safeMode.xul                                (content/safeMode.xul)
+   content/communicator/sanitize.xul                                (content/sanitize.xul)
+   content/communicator/tasksOverlay.js                             (content/tasksOverlay.js)
+   content/communicator/tasksOverlay.xul                            (content/tasksOverlay.xul)
+   content/communicator/utilityOverlay.js                           (content/utilityOverlay.js)
+   content/communicator/utilityOverlay.xul                          (content/utilityOverlay.xul)
+   content/communicator/viewApplyThemeOverlay.xul                   (content/viewApplyThemeOverlay.xul)
+   content/communicator/viewApplyThemeOverlay.js                    (content/viewApplyThemeOverlay.js)
+   content/communicator/viewSourceOverlay.js                        (content/viewSourceOverlay.js)
+   content/communicator/viewSourceOverlay.xul                       (content/viewSourceOverlay.xul)
+   content/communicator/viewZoomOverlay.xul                         (content/viewZoomOverlay.xul)
+   content/communicator/viewZoomOverlay.js                          (content/viewZoomOverlay.js)
 #ifdef XP_MACOSX
-   content/communicator/platformCommunicatorOverlay.xul             (mac/platformCommunicatorOverlay.xul)
+   content/communicator/platformCommunicatorOverlay.xul             (content/mac/platformCommunicatorOverlay.xul)
 #else
 #ifdef XP_WIN
-   content/communicator/platformCommunicatorOverlay.xul             (win/platformCommunicatorOverlay.xul)
+   content/communicator/platformCommunicatorOverlay.xul             (content/win/platformCommunicatorOverlay.xul)
 #else
-   content/communicator/platformCommunicatorOverlay.xul             (unix/platformCommunicatorOverlay.xul)
+   content/communicator/platformCommunicatorOverlay.xul             (content/unix/platformCommunicatorOverlay.xul)
 #endif
 #endif
-   content/communicator/autocomplete.css                            (autocomplete/autocomplete.css)
-   content/communicator/customizeToolbar.css                        (../../common/src/customizeToolbar.css)
-   content/communicator/customizeToolbar.js                         (../../common/src/customizeToolbar.js)
-*  content/communicator/customizeToolbar.xul                        (../../common/src/customizeToolbar.xul)
-*  content/communicator/bindings/datetimepicker.xml                 (../../common/bindings/datetimepicker.xml)
-   content/communicator/bindings/findbar.xml                        (bindings/findbar.xml)
-   content/communicator/bindings/general.xml                        (bindings/general.xml)
-   content/communicator/bindings/generalBindings.xml                (../../common/bindings/generalBindings.xml)
-   content/communicator/bindings/notification.xml                   (bindings/notification.xml)
-*  content/communicator/bindings/preferences.xml                    (../../common/bindings/preferences.xml)
-*  content/communicator/bindings/toolbar.xml                        (../../common/bindings/toolbar.xml)   
-   content/communicator/bindings/toolbar-xpfe.xml                   (bindings/toolbar-xpfe.xml)
-*  content/communicator/bindings/prefwindow.xml                     (bindings/prefwindow.xml)
-   content/communicator/console/consoleBindings.xml                 (console/consoleBindings.xml)
-   content/communicator/console/console.css                         (console/console.css)
-   content/communicator/console/console.js                          (console/console.js)
-   content/communicator/console/console.xul                         (console/console.xul)
-   content/communicator/dataman/dataman.css                         (dataman/dataman.css)
-   content/communicator/dataman/dataman.js                          (dataman/dataman.js)
-   content/communicator/dataman/dataman.xml                         (dataman/dataman.xml)
-   content/communicator/dataman/dataman.xul                         (dataman/dataman.xul)
-*  content/communicator/helpviewer/help.xul                         (helpviewer/help.xul)
-*  content/communicator/helpviewer/contextHelp.js                   (helpviewer/contextHelp.js)
-*  content/communicator/helpviewer/help.js                          (helpviewer/help.js)
-*  content/communicator/helpviewer/helpContextOverlay.xul           (helpviewer/helpContextOverlay.xul)
-*  content/communicator/helpviewer/platformClasses.css              (helpviewer/platformClasses.css)
-   content/communicator/feeds/subscribe.css                         (feeds/subscribe.css)
-   content/communicator/feeds/subscribe.xhtml                       (feeds/subscribe.xhtml)
-   content/communicator/feeds/subscribe.xml                         (feeds/subscribe.xml)
-   content/communicator/permissions/cookieViewer.js                 (permissions/cookieViewer.js)
-   content/communicator/permissions/cookieViewer.xul                (permissions/cookieViewer.xul)
-   content/communicator/permissions/permissionsManager.js           (permissions/permissionsManager.js)
-   content/communicator/permissions/permissionsManager.xul          (permissions/permissionsManager.xul)
-   content/communicator/permissions/treeUtils.js                    (permissions/treeUtils.js)
-   content/communicator/pref/preferences.xul                        (pref/preferences.xul)
-   content/communicator/pref/preferences.js                         (pref/preferences.js)
-   content/communicator/pref/prefpanels.css                         (pref/prefpanels.css)
-   content/communicator/pref/prefpanels.xml                         (pref/prefpanels.xml)
-   content/communicator/pref/pref-advanced.js                       (pref/pref-advanced.js)
-   content/communicator/pref/pref-advanced.xul                      (pref/pref-advanced.xul)
-   content/communicator/pref/pref-appearance.js                     (pref/pref-appearance.js)
-   content/communicator/pref/pref-appearance.xul                    (pref/pref-appearance.xul)
-   content/communicator/pref/pref-applications.xul                  (pref/pref-applications.xul)
-*  content/communicator/pref/pref-applications.js                   (pref/pref-applications.js)
-   content/communicator/pref/pref-applicationManager.js             (pref/pref-applicationManager.js)
-   content/communicator/pref/pref-applicationManager.xul            (pref/pref-applicationManager.xul)
-   content/communicator/pref/pref-cache.js                          (pref/pref-cache.js)
-   content/communicator/pref/pref-cache.xul                         (pref/pref-cache.xul)
-   content/communicator/pref/pref-colors.js                         (pref/pref-colors.js)
-   content/communicator/pref/pref-colors.xul                        (pref/pref-colors.xul)
-   content/communicator/pref/pref-content.js                        (pref/pref-content.js)
-   content/communicator/pref/pref-content.xul                       (pref/pref-content.xul)
-   content/communicator/pref/pref-cookies.js                        (pref/pref-cookies.js)
-   content/communicator/pref/pref-cookies.xul                       (pref/pref-cookies.xul)
-   content/communicator/pref/pref-download.js                       (pref/pref-download.js)
-   content/communicator/pref/pref-download.xul                      (pref/pref-download.xul)
-   content/communicator/pref/pref-findasyoutype.js                  (pref/pref-findasyoutype.js)
-   content/communicator/pref/pref-findasyoutype.xul                 (pref/pref-findasyoutype.xul)
-   content/communicator/pref/pref-fonts.js                          (pref/pref-fonts.js)
-   content/communicator/pref/pref-fonts.xul                         (pref/pref-fonts.xul)
-   content/communicator/pref/pref-history.js                        (pref/pref-history.js)
-   content/communicator/pref/pref-history.xul                       (pref/pref-history.xul)
-   content/communicator/pref/pref-http.js                           (pref/pref-http.js)
-   content/communicator/pref/pref-http.xul                          (pref/pref-http.xul)
-   content/communicator/pref/pref-images.xul                        (pref/pref-images.xul)
-   content/communicator/pref/pref-keynav.js                         (pref/pref-keynav.js)
-   content/communicator/pref/pref-keynav.xul                        (pref/pref-keynav.xul)
-   content/communicator/pref/pref-languages.js                      (pref/pref-languages.js)
-   content/communicator/pref/pref-languages.xul                     (pref/pref-languages.xul)
-   content/communicator/pref/pref-languages-add.xul                 (pref/pref-languages-add.xul)
-   content/communicator/pref/pref-languages-add.js                  (pref/pref-languages-add.js)
-   content/communicator/pref/pref-links.js                          (pref/pref-links.js)
-   content/communicator/pref/pref-links.xul                         (pref/pref-links.xul)
-   content/communicator/pref/pref-locationbar.js                    (pref/pref-locationbar.js)
-   content/communicator/pref/pref-locationbar.xul                   (pref/pref-locationbar.xul)
-*  content/communicator/pref/pref-media.xul                         (pref/pref-media.xul)
-   content/communicator/pref/pref-mousewheel.js                     (pref/pref-mousewheel.js)
-   content/communicator/pref/pref-mousewheel.xul                    (pref/pref-mousewheel.xul)
-   content/communicator/pref/pref-navigator.js                      (pref/pref-navigator.js)
-   content/communicator/pref/pref-navigator.xul                     (pref/pref-navigator.xul)
-   content/communicator/pref/pref-offlineapps.js                    (pref/pref-offlineapps.js)
-   content/communicator/pref/pref-offlineapps.xul                   (pref/pref-offlineapps.xul)
-   content/communicator/pref/pref-passwords.xul                     (pref/pref-passwords.xul)
-   content/communicator/pref/pref-popups.js                         (pref/pref-popups.js)
-   content/communicator/pref/pref-popups.xul                        (pref/pref-popups.xul)
-   content/communicator/pref/pref-privatedata.js                    (pref/pref-privatedata.js)
-   content/communicator/pref/pref-privatedata.xul                   (pref/pref-privatedata.xul)
-   content/communicator/pref/pref-proxies.js                        (pref/pref-proxies.js)
-   content/communicator/pref/pref-proxies.xul                       (pref/pref-proxies.xul)
-   content/communicator/pref/pref-proxies-advanced.xul              (pref/pref-proxies-advanced.xul)
-   content/communicator/pref/pref-scripts.js                        (pref/pref-scripts.js)
-   content/communicator/pref/pref-scripts.xul                       (pref/pref-scripts.xul)
-   content/communicator/pref/pref-search.js                         (pref/pref-search.js)
-   content/communicator/pref/pref-search.xul                        (pref/pref-search.xul)
-   content/communicator/pref/pref-security.js                       (pref/pref-security.js)
-   content/communicator/pref/pref-security.xul                      (pref/pref-security.xul)
-   content/communicator/pref/pref-smartupdate.js                    (pref/pref-smartupdate.js)
-   content/communicator/pref/pref-smartupdate.xul                   (pref/pref-smartupdate.xul)
-   content/communicator/pref/pref-spelling.js                       (pref/pref-spelling.js)
-   content/communicator/pref/pref-spelling.xul                      (pref/pref-spelling.xul)
-   content/communicator/pref/pref-tabs.xul                          (pref/pref-tabs.xul)
-   content/communicator/profile/profileSelection.js                 (profile/profileSelection.js)
-   content/communicator/profile/profileSelection.xul                (profile/profileSelection.xul)
-   content/communicator/search/engineManager.js                     (search/engineManager.js)
-   content/communicator/search/engineManager.xul                    (search/engineManager.xul)
-   content/communicator/search/search.xml                           (search/search.xml)
-   content/communicator/search/searchbarBindings.css                (search/searchbarBindings.css)
-   content/communicator/search/search-panel.js                      (search/search-panel.js)
-   content/communicator/search/search-panel.xul                     (search/search-panel.xul)
-   content/communicator/sidebar/customize-panel.js                  (sidebar/customize-panel.js)
-   content/communicator/sidebar/customize-panel.xul                 (sidebar/customize-panel.xul)
-   content/communicator/sidebar/customize.js                        (sidebar/customize.js)
-   content/communicator/sidebar/customize.xul                       (sidebar/customize.xul)
-   content/communicator/sidebar/PageNotFound.xul                    (sidebar/PageNotFound.xul)
-   content/communicator/sidebar/preview.js                          (sidebar/preview.js)
-   content/communicator/sidebar/preview.xul                         (sidebar/preview.xul)
-   content/communicator/sidebar/sidebarBindings.xml                 (sidebar/sidebarBindings.xml)
-   content/communicator/sidebar/sidebarOverlay.css                  (sidebar/sidebarOverlay.css)
-   content/communicator/sidebar/sidebarOverlay.js                   (sidebar/sidebarOverlay.js)
-   content/communicator/sidebar/sidebarOverlay.xul                  (sidebar/sidebarOverlay.xul)
-
-   # L10n resource overrides
-% resource search-plugins chrome://communicator/locale/searchplugins/

rename from suite/common/moz.build
rename to suite/base/moz.build
--- a/suite/common/moz.build
+++ b/suite/base/moz.build
@@ -1,31 +1,17 @@
+# -*- 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/.
 
-DIRS += [
-    'console',
-    'places',
-    'public',
-    'src',
-]
-
-BROWSER_CHROME_MANIFESTS += [
-    'dataman/tests/browser.ini',
-    'tests/preferences/browser.ini',
-]
-
-MOCHITEST_CHROME_MANIFESTS += [
-    'tests/chrome/chrome.ini',
-]
-
 JAR_MANIFESTS += ['jar.mn']
 
 # DEFINES for preprocessing
-# Use suite/common/app-license.html as input when generating 
-# chrome://content/communicator/license.html to override 
+
+# Use suite/base/content/overrides/app-license.html as input when generating
+# chrome://content/communicator/license.html to override
 # chrome://global/content/license.html (about:license)
-DEFINES['APP_LICENSE_BLOCK'] = '%s/app-license.html' % SRCDIR
+DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR
 
 for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME', 'mozreltopsrcdir'):
     DEFINES[var] = CONFIG[var]

deleted file mode 100644
--- a/suite/common/src/moz.build
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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 += [
-    'nsAbout.js',
-    'nsGopherProtocolStubHandler.js',
-    'nsSessionStartup.js',
-    'nsSidebar.js',
-    'nsSuiteGlue.js',
-    'SuiteCommon.manifest',
-]
-
-EXTRA_PP_COMPONENTS += [
-    'nsSessionStore.js',
-]

rename from suite/common/src/SuiteCommon.manifest
rename to suite/components/SuiteComponents.manifest
--- a/suite/common/src/SuiteCommon.manifest
+++ b/suite/components/SuiteComponents.manifest
@@ -6,22 +6,13 @@ contract @mozilla.org/network/protocol/a
 contract @mozilla.org/network/protocol/about;1?what=feeds {d54f2c89-8fd6-4eeb-a7a4-51d4dcdf460f}
 contract @mozilla.org/network/protocol/about;1?what=life {d54f2c89-8fd6-4eeb-a7a4-51d4dcdf460f}
 contract @mozilla.org/network/protocol/about;1?what=newserror {d54f2c89-8fd6-4eeb-a7a4-51d4dcdf460f}
 contract @mozilla.org/network/protocol/about;1?what=privatebrowsing {d54f2c89-8fd6-4eeb-a7a4-51d4dcdf460f}
 contract @mozilla.org/network/protocol/about;1?what=rights {d54f2c89-8fd6-4eeb-a7a4-51d4dcdf460f}
 contract @mozilla.org/network/protocol/about;1?what=sessionrestore {d54f2c89-8fd6-4eeb-a7a4-51d4dcdf460f}
 component {22042bdb-56e4-47c6-8b12-fdfa859c05a9} nsGopherProtocolStubHandler.js
 contract @mozilla.org/network/protocol;1?name=gopher {22042bdb-56e4-47c6-8b12-fdfa859c05a9}
-component {4e6c1112-57b6-44ba-adf9-99fb573b0a30} nsSessionStartup.js
-contract @mozilla.org/suite/sessionstartup;1 {4e6c1112-57b6-44ba-adf9-99fb573b0a30}
-category app-startup SessionStartup service,@mozilla.org/suite/sessionstartup;1
-component {d37ccdf1-496f-4135-9575-037180af010d} nsSessionStore.js
-contract @mozilla.org/suite/sessionstore;1 {d37ccdf1-496f-4135-9575-037180af010d}
 component {bbbbe845-5a1b-40ee-813c-f84b8faaa07c} nsSuiteGlue.js
 contract @mozilla.org/suite/suiteglue;1 {bbbbe845-5a1b-40ee-813c-f84b8faaa07c}
 category app-startup nsSuiteGlue service,@mozilla.org/suite/suiteglue;1
 component {9d4c845d-3f09-402a-b66d-50f291d7d50f} nsSuiteGlue.js
 contract @mozilla.org/content-permission/prompt;1 {9d4c845d-3f09-402a-b66d-50f291d7d50f}
-component {22117140-9c6e-11d3-aaf1-00805f8a4905} nsSidebar.js
-contract @mozilla.org/sidebar;1 {22117140-9c6e-11d3-aaf1-00805f8a4905}
-category JavaScript-global-property sidebar @mozilla.org/sidebar;1
-category JavaScript-global-property external @mozilla.org/sidebar;1

rename from suite/common/autocomplete/autocomplete.css
rename to suite/components/autocomplete/content/autocomplete.css

rename from suite/common/autocomplete/autocomplete.xml
rename to suite/components/autocomplete/content/autocomplete.xml

new file mode 100644
--- /dev/null
+++ b/suite/components/autocomplete/jar.mn
@@ -0,0 +1,9 @@
+# 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/.
+
+toolkit.jar:
+   content/global/autocomplete.xml                                  (content/autocomplete.xml)
+
+comm.jar:
+   content/communicator/autocomplete.css                            (content/autocomplete.css)

new file mode 100644
--- /dev/null
+++ b/suite/components/autocomplete/moz.build
@@ -0,0 +1,7 @@
+# -*- 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/.
+
+JAR_MANIFESTS += ['jar.mn']

rename from suite/common/bindings/findbar.xml
rename to suite/components/bindings/findbar.xml

rename from suite/common/bindings/general.xml
rename to suite/components/bindings/general.xml

new file mode 100644
--- /dev/null
+++ b/suite/components/bindings/jar.mn
@@ -0,0 +1,17 @@
+# 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/.
+
+comm.jar:
+   content/communicator/customizeToolbar.css                        (../../../common/src/customizeToolbar.css)
+   content/communicator/customizeToolbar.js                         (../../../common/src/customizeToolbar.js)
+*  content/communicator/customizeToolbar.xul                        (../../../common/src/customizeToolbar.xul)
+*  content/communicator/bindings/datetimepicker.xml                 (../../../common/bindings/datetimepicker.xml)
+   content/communicator/bindings/findbar.xml                        (findbar.xml)
+   content/communicator/bindings/general.xml                        (general.xml)
+   content/communicator/bindings/generalBindings.xml                (../../../common/bindings/generalBindings.xml)
+   content/communicator/bindings/notification.xml                   (notification.xml)
+*  content/communicator/bindings/preferences.xml                    (../../../common/bindings/preferences.xml)
+*  content/communicator/bindings/toolbar.xml                        (../../../common/bindings/toolbar.xml)
+   content/communicator/bindings/toolbar-xpfe.xml                   (toolbar-xpfe.xml)
+*  content/communicator/bindings/prefwindow.xml                     (prefwindow.xml)

new file mode 100644
--- /dev/null
+++ b/suite/components/bindings/moz.build
@@ -0,0 +1,7 @@
+# -*- 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/.
+
+JAR_MANIFESTS += ['jar.mn']

rename from suite/common/bindings/notification.xml
rename to suite/components/bindings/notification.xml

rename from suite/common/bindings/prefwindow.xml
rename to suite/components/bindings/prefwindow.xml

rename from suite/common/bindings/toolbar-xpfe.xml
rename to suite/components/bindings/toolbar-xpfe.xml

--- a/suite/components/build/moz.build
+++ b/suite/components/build/moz.build
@@ -1,8 +1,9 @@
+# -*- 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/.
 
 EXPORTS += [
     'nsSuiteCID.h',
 ]

rename from suite/common/console/console.css
rename to suite/components/console/content/console.css

rename from suite/common/console/console.js
rename to suite/components/console/content/console.js

rename from suite/common/console/console.xul
rename to suite/components/console/content/console.xul

rename from suite/common/console/consoleBindings.xml
rename to suite/components/console/content/consoleBindings.xml

new file mode 100644
--- /dev/null
+++ b/suite/components/console/jar.mn
@@ -0,0 +1,9 @@
+# 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/.
+
+comm.jar:
+   content/communicator/console/consoleBindings.xml                 (content/consoleBindings.xml)
+   content/communicator/console/console.css                         (content/console.css)
+   content/communicator/console/console.js                          (content/console.js)
+   content/communicator/console/console.xul                         (content/console.xul)

rename from suite/common/console/jsconsole-clhandler.js
rename to suite/components/console/jsconsole-clhandler.js

rename from suite/common/console/jsconsole-clhandler.manifest
rename to suite/components/console/jsconsole-clhandler.manifest

rename from suite/common/console/moz.build
rename to suite/components/console/moz.build
--- a/suite/common/console/moz.build
+++ b/suite/components/console/moz.build
@@ -1,10 +1,12 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# -*- 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 += [
     'jsconsole-clhandler.js',
     'jsconsole-clhandler.manifest',
 ]
+
+JAR_MANIFESTS += ['jar.mn']

rename from suite/common/dataman/dataman.css
rename to suite/components/dataman/content/dataman.css

rename from suite/common/dataman/dataman.js
rename to suite/components/dataman/content/dataman.js

rename from suite/common/dataman/dataman.xml
rename to suite/components/dataman/content/dataman.xml

rename from suite/common/dataman/dataman.xul
rename to suite/components/dataman/content/dataman.xul

new file mode 100644
--- /dev/null
+++ b/suite/components/dataman/jar.mn
@@ -0,0 +1,9 @@
+# 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/.
+
+comm.jar:
+   content/communicator/dataman/dataman.css                         (content/dataman.css)
+   content/communicator/dataman/dataman.js                          (content/dataman.js)
+   content/communicator/dataman/dataman.xml                         (content/dataman.xml)
+   content/communicator/dataman/dataman.xul                         (content/dataman.xul)

new file mode 100644
--- /dev/null
+++ b/suite/components/dataman/moz.build
@@ -0,0 +1,11 @@
+# -*- 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/.
+
+BROWSER_CHROME_MANIFESTS += [
+    'tests/browser.ini',
+]
+
+JAR_MANIFESTS += ['jar.mn']

rename from suite/common/dataman/tests/browser.ini
rename to suite/components/dataman/tests/browser.ini

rename from suite/common/dataman/tests/browser_dataman_basics.js
rename to suite/components/dataman/tests/browser_dataman_basics.js

rename from suite/common/dataman/tests/browser_dataman_callviews.js
rename to suite/components/dataman/tests/browser_dataman_callviews.js

rename from suite/common/dataman/tests/dataman_storage.appcache
rename to suite/components/dataman/tests/dataman_storage.appcache

rename from suite/common/dataman/tests/dataman_storage.appcache^headers^
rename to suite/components/dataman/tests/dataman_storage.appcache^headers^

rename from suite/common/dataman/tests/dataman_storage.html
rename to suite/components/dataman/tests/dataman_storage.html

rename from suite/common/feeds/subscribe.css
rename to suite/components/feeds/content/subscribe.css

rename from suite/common/feeds/subscribe.xhtml
rename to suite/components/feeds/content/subscribe.xhtml

rename from suite/common/feeds/subscribe.xml
rename to suite/components/feeds/content/subscribe.xml

new file mode 100644
--- /dev/null
+++ b/suite/components/feeds/jar.mn
@@ -0,0 +1,8 @@
+# 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/.
+
+comm.jar:
+   content/communicator/feeds/subscribe.css                         (content/subscribe.css)
+   content/communicator/feeds/subscribe.xhtml                       (content/subscribe.xhtml)
+   content/communicator/feeds/subscribe.xml                         (content/subscribe.xml)

--- a/suite/components/feeds/moz.build
+++ b/suite/components/feeds/moz.build
@@ -1,25 +1,27 @@
+# -*- 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/.
 
 XPIDL_SOURCES += [
     'nsIFeedResultService.idl',
     'nsIWebContentConverterRegistrar.idl',
 ]
 
-XPIDL_MODULE = 'suitefeeds'
+XPIDL_MODULE = 'suite-feeds'
 
 SOURCES += [
     'nsFeedSniffer.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'FeedConverter.js',
     'FeedWriter.js',
     'SuiteFeeds.manifest',
     'WebContentConverter.js',
 ]
 
 FINAL_LIBRARY = 'suite'
 
+JAR_MANIFESTS += ['jar.mn']

rename from suite/common/helpviewer/contextHelp.js
rename to suite/components/helpviewer/content/contextHelp.js

rename from suite/common/helpviewer/help.js
rename to suite/components/helpviewer/content/help.js

rename from suite/common/helpviewer/help.xul
rename to suite/components/helpviewer/content/help.xul

rename from suite/common/helpviewer/helpContextOverlay.xul
rename to suite/components/helpviewer/content/helpContextOverlay.xul

rename from suite/common/helpviewer/platformClasses.css
rename to suite/components/helpviewer/content/platformClasses.css

new file mode 100644
--- /dev/null
+++ b/suite/components/helpviewer/jar.mn
@@ -0,0 +1,11 @@
+# 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/.
+
+comm.jar:
+% content help %content/communicator/helpviewer/
+*  content/communicator/helpviewer/help.xul                         (content/help.xul)
+*  content/communicator/helpviewer/contextHelp.js                   (content/contextHelp.js)
+*  content/communicator/helpviewer/help.js                          (content/help.js)
+*  content/communicator/helpviewer/helpContextOverlay.xul           (content/helpContextOverlay.xul)
+*  content/communicator/helpviewer/platformClasses.css              (content/platformClasses.css)

new file mode 100644
--- /dev/null
+++ b/suite/components/helpviewer/moz.build
@@ -0,0 +1,7 @@
+# -*- 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/.
+
+JAR_MANIFESTS += ['jar.mn']

--- a/suite/components/moz.build
+++ b/suite/components/moz.build
@@ -1,16 +1,49 @@
+# -*- 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/.
 
 DIRS += [
+    'autocomplete',
+    'bindings',
+    'console',
+    'dataman',
     'downloads',
     'feeds',
+    'helpviewer',
+    'permissions',
+    'places',
+    'pref',
     'profile',
+    'search',
+    'sessionstore',
     'shell',
+    'sidebar',
 ]
 
 # build is always last as it adds the local includes from the other components.
 DIRS += [
     'build',
 ]
+
+BROWSER_CHROME_MANIFESTS += [
+    'tests/browser/browser.ini',
+]
+
+MOCHITEST_CHROME_MANIFESTS += [
+    'tests/chrome/chrome.ini',
+]
+
+XPIDL_SOURCES += [
+    'nsISuiteGlue.idl',
+]
+
+XPIDL_MODULE = 'suite-components'
+
+EXTRA_COMPONENTS += [
+    'nsAbout.js',
+    'nsGopherProtocolStubHandler.js',
+    'nsSuiteGlue.js',
+    'SuiteComponents.manifest',
+]

rename from suite/common/src/nsAbout.js
rename to suite/components/nsAbout.js

rename from suite/common/src/nsGopherProtocolStubHandler.js
rename to suite/components/nsGopherProtocolStubHandler.js

rename from suite/common/public/nsISuiteGlue.idl
rename to suite/components/nsISuiteGlue.idl

rename from suite/common/src/nsSuiteGlue.js
rename to suite/components/nsSuiteGlue.js

rename from suite/common/permissions/cookieViewer.js
rename to suite/components/permissions/content/cookieViewer.js

rename from suite/common/permissions/cookieViewer.xul
rename to suite/components/permissions/content/cookieViewer.xul

rename from suite/common/permissions/permissionsManager.js
rename to suite/components/permissions/content/permissionsManager.js

rename from suite/common/permissions/permissionsManager.xul
rename to suite/components/permissions/content/permissionsManager.xul

rename from suite/common/permissions/treeUtils.js
rename to suite/components/permissions/content/treeUtils.js

new file mode 100644
--- /dev/null
+++ b/suite/components/permissions/jar.mn
@@ -0,0 +1,10 @@
+# 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/.
+
+comm.jar:
+   content/communicator/permissions/cookieViewer.js                 (content/cookieViewer.js)
+   content/communicator/permissions/cookieViewer.xul                (content/cookieViewer.xul)
+   content/communicator/permissions/permissionsManager.js           (content/permissionsManager.js)
+   content/communicator/permissions/permissionsManager.xul          (content/permissionsManager.xul)
+   content/communicator/permissions/treeUtils.js                    (content/treeUtils.js)

new file mode 100644
--- /dev/null
+++ b/suite/components/permissions/moz.build
@@ -0,0 +1,7 @@
+# -*- 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/.
+
+JAR_MANIFESTS += ['jar.mn']

rename from suite/common/places/PlacesUIUtils.jsm
rename to suite/components/places/PlacesUIUtils.jsm

rename from suite/common/places/content/bookmarkProperties.js
rename to suite/components/places/content/bookmarkProperties.js

rename from suite/common/places/content/bookmarkProperties.xul
rename to suite/components/places/content/bookmarkProperties.xul

rename from suite/common/places/content/bookmarksPanel.js
rename to suite/components/places/content/bookmarksPanel.js

rename from suite/common/places/content/bookmarksPanel.xul
rename to suite/components/places/content/bookmarksPanel.xul

rename from suite/common/places/content/browserPlacesViews.js
rename to suite/components/places/content/browserPlacesViews.js

rename from suite/common/places/content/controller.js
rename to suite/components/places/content/controller.js

rename from suite/common/places/content/editBookmarkOverlay.js
rename to suite/components/places/content/editBookmarkOverlay.js

rename from suite/common/places/content/editBookmarkOverlay.xul
rename to suite/components/places/content/editBookmarkOverlay.xul

rename from suite/common/places/content/history-panel.js
rename to suite/components/places/content/history-panel.js

rename from suite/common/places/content/history-panel.xul
rename to suite/components/places/content/history-panel.xul

rename from suite/common/places/content/menu.xml
rename to suite/components/places/content/menu.xml

rename from suite/common/places/content/organizer.css
rename to suite/components/places/content/organizer.css

rename from suite/common/places/content/places.css
rename to suite/components/places/content/places.css

rename from suite/common/places/content/places.js
rename to suite/components/places/content/places.js

rename from suite/common/places/content/places.xul
rename to suite/components/places/content/places.xul

rename from suite/common/places/content/placesOverlay.xul
rename to suite/components/places/content/placesOverlay.xul

rename from suite/common/places/content/sidebarUtils.js
rename to suite/components/places/content/sidebarUtils.js

rename from suite/common/places/content/tree.xml
rename to suite/components/places/content/tree.xml

rename from suite/common/places/content/treeView.js
rename to suite/components/places/content/treeView.js

rename from suite/common/places/jar.mn
rename to suite/components/places/jar.mn

rename from suite/common/places/moz.build
rename to suite/components/places/moz.build

rename from suite/common/places/nsPlacesAutoComplete.js
rename to suite/components/places/nsPlacesAutoComplete.js

rename from suite/common/places/nsPlacesAutoComplete.manifest
rename to suite/components/places/nsPlacesAutoComplete.manifest

rename from suite/common/places/tests/autocomplete/.eslintrc
rename to suite/components/places/tests/autocomplete/.eslintrc

rename from suite/common/places/tests/autocomplete/head_autocomplete.js
rename to suite/components/places/tests/autocomplete/head_autocomplete.js

rename from suite/common/places/tests/autocomplete/test_416211.js
rename to suite/components/places/tests/autocomplete/test_416211.js

rename from suite/common/places/tests/autocomplete/test_416214.js
rename to suite/components/places/tests/autocomplete/test_416214.js

rename from suite/common/places/tests/autocomplete/test_417798.js
rename to suite/components/places/tests/autocomplete/test_417798.js

rename from suite/common/places/tests/autocomplete/test_418257.js
rename to suite/components/places/tests/autocomplete/test_418257.js

rename from suite/common/places/tests/autocomplete/test_422277.js
rename to suite/components/places/tests/autocomplete/test_422277.js

rename from suite/common/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js
rename to suite/components/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js

rename from suite/common/places/tests/autocomplete/test_download_embed_bookmarks.js
rename to suite/components/places/tests/autocomplete/test_download_embed_bookmarks.js

rename from suite/common/places/tests/autocomplete/test_empty_search.js
rename to suite/components/places/tests/autocomplete/test_empty_search.js

rename from suite/common/places/tests/autocomplete/test_enabled.js
rename to suite/components/places/tests/autocomplete/test_enabled.js

rename from suite/common/places/tests/autocomplete/test_escape_self.js
rename to suite/components/places/tests/autocomplete/test_escape_self.js

rename from suite/common/places/tests/autocomplete/test_ignore_protocol.js
rename to suite/components/places/tests/autocomplete/test_ignore_protocol.js

rename from suite/common/places/tests/autocomplete/test_keyword_search.js
rename to suite/components/places/tests/autocomplete/test_keyword_search.js

rename from suite/common/places/tests/autocomplete/test_match_beginning.js
rename to suite/components/places/tests/autocomplete/test_match_beginning.js

rename from suite/common/places/tests/autocomplete/test_multi_word_search.js
rename to suite/components/places/tests/autocomplete/test_multi_word_search.js

rename from suite/common/places/tests/autocomplete/test_special_search.js
rename to suite/components/places/tests/autocomplete/test_special_search.js

rename from suite/common/places/tests/autocomplete/test_swap_protocol.js
rename to suite/components/places/tests/autocomplete/test_swap_protocol.js

rename from suite/common/places/tests/autocomplete/test_tabmatches.js
rename to suite/components/places/tests/autocomplete/test_tabmatches.js

rename from suite/common/places/tests/autocomplete/test_word_boundary_search.js
rename to suite/components/places/tests/autocomplete/test_word_boundary_search.js

rename from suite/common/places/tests/autocomplete/xpcshell.ini
rename to suite/components/places/tests/autocomplete/xpcshell.ini

rename from suite/common/places/tests/browser/browser.ini
rename to suite/components/places/tests/browser/browser.ini

rename from suite/common/places/tests/browser/browser_0_library_left_pane_migration.js
rename to suite/components/places/tests/browser/browser_0_library_left_pane_migration.js

rename from suite/common/places/tests/browser/browser_423515.js
rename to suite/components/places/tests/browser/browser_423515.js

rename from suite/common/places/tests/browser/browser_425884.js
rename to suite/components/places/tests/browser/browser_425884.js

rename from suite/common/places/tests/browser/browser_drag_bookmarks_on_toolbar.js
rename to suite/components/places/tests/browser/browser_drag_bookmarks_on_toolbar.js

rename from suite/common/places/tests/browser/browser_library_infoBox.js
rename to suite/components/places/tests/browser/browser_library_infoBox.js

rename from suite/common/places/tests/browser/browser_library_left_pane_commands.js
rename to suite/components/places/tests/browser/browser_library_left_pane_commands.js

rename from suite/common/places/tests/browser/browser_library_left_pane_fixnames.js
rename to suite/components/places/tests/browser/browser_library_left_pane_fixnames.js

rename from suite/common/places/tests/browser/browser_library_open_leak.js
rename to suite/components/places/tests/browser/browser_library_open_leak.js

rename from suite/common/places/tests/browser/browser_library_views_liveupdate.js
rename to suite/components/places/tests/browser/browser_library_views_liveupdate.js

rename from suite/common/places/tests/browser/browser_sort_in_library.js
rename to suite/components/places/tests/browser/browser_sort_in_library.js

rename from suite/common/places/tests/browser/head.js
rename to suite/components/places/tests/browser/head.js

rename from suite/common/places/tests/chrome/chrome.ini
rename to suite/components/places/tests/chrome/chrome.ini

rename from suite/common/places/tests/chrome/head.js
rename to suite/components/places/tests/chrome/head.js

rename from suite/common/places/tests/chrome/test_0_bug510634.xul
rename to suite/components/places/tests/chrome/test_0_bug510634.xul

rename from suite/common/places/tests/chrome/test_0_multiple_left_pane.xul
rename to suite/components/places/tests/chrome/test_0_multiple_left_pane.xul

rename from suite/common/places/tests/chrome/test_bug427633_no_newfolder_if_noip.xul
rename to suite/components/places/tests/chrome/test_bug427633_no_newfolder_if_noip.xul

rename from suite/common/places/tests/chrome/test_bug485100-change-case-loses-tag.xul
rename to suite/components/places/tests/chrome/test_bug485100-change-case-loses-tag.xul

rename from suite/common/places/tests/chrome/test_bug549192.xul
rename to suite/components/places/tests/chrome/test_bug549192.xul

rename from suite/common/places/tests/chrome/test_bug549491.xul
rename to suite/components/places/tests/chrome/test_bug549491.xul

rename from suite/common/places/tests/chrome/test_treeview_date.xul
rename to suite/components/places/tests/chrome/test_treeview_date.xul

rename from suite/common/places/tests/head_common.js
rename to suite/components/places/tests/head_common.js

rename from suite/common/places/tests/unit/bookmarks.glue.html
rename to suite/components/places/tests/unit/bookmarks.glue.html

rename from suite/common/places/tests/unit/bookmarks.glue.json
rename to suite/components/places/tests/unit/bookmarks.glue.json

rename from suite/common/places/tests/unit/corruptDB.sqlite
rename to suite/components/places/tests/unit/corruptDB.sqlite

rename from suite/common/places/tests/unit/distribution.ini
rename to suite/components/places/tests/unit/distribution.ini

rename from suite/common/places/tests/unit/head_bookmarks.js
rename to suite/components/places/tests/unit/head_bookmarks.js

rename from suite/common/places/tests/unit/test_421483.js
rename to suite/components/places/tests/unit/test_421483.js

rename from suite/common/places/tests/unit/test_PUIU_makeTransaction.js
rename to suite/components/places/tests/unit/test_PUIU_makeTransaction.js

rename from suite/common/places/tests/unit/test_browserGlue_corrupt.js
rename to suite/components/places/tests/unit/test_browserGlue_corrupt.js

rename from suite/common/places/tests/unit/test_browserGlue_corrupt_nobackup.js
rename to suite/components/places/tests/unit/test_browserGlue_corrupt_nobackup.js

rename from suite/common/places/tests/unit/test_browserGlue_corrupt_nobackup_default.js
rename to suite/components/places/tests/unit/test_browserGlue_corrupt_nobackup_default.js

rename from suite/common/places/tests/unit/test_browserGlue_distribution.js
rename to suite/components/places/tests/unit/test_browserGlue_distribution.js

rename from suite/common/places/tests/unit/test_browserGlue_migrate.js
rename to suite/components/places/tests/unit/test_browserGlue_migrate.js

rename from suite/common/places/tests/unit/test_browserGlue_prefs.js
rename to suite/components/places/tests/unit/test_browserGlue_prefs.js

rename from suite/common/places/tests/unit/test_browserGlue_restore.js
rename to suite/components/places/tests/unit/test_browserGlue_restore.js

rename from suite/common/places/tests/unit/test_browserGlue_shutdown.js
rename to suite/components/places/tests/unit/test_browserGlue_shutdown.js

rename from suite/common/places/tests/unit/test_browserGlue_smartBookmarks.js
rename to suite/components/places/tests/unit/test_browserGlue_smartBookmarks.js

rename from suite/common/places/tests/unit/test_clearHistory_shutdown.js
rename to suite/components/places/tests/unit/test_clearHistory_shutdown.js

rename from suite/common/places/tests/unit/test_leftpane_corruption_handling.js
rename to suite/components/places/tests/unit/test_leftpane_corruption_handling.js

rename from suite/common/places/tests/unit/xpcshell.ini
rename to suite/components/places/tests/unit/xpcshell.ini

rename from suite/common/pref/pref-advanced.js
rename to suite/components/pref/content/pref-advanced.js

rename from suite/common/pref/pref-advanced.xul
rename to suite/components/pref/content/pref-advanced.xul

rename from suite/common/pref/pref-appearance.js
rename to suite/components/pref/content/pref-appearance.js

rename from suite/common/pref/pref-appearance.xul
rename to suite/components/pref/content/pref-appearance.xul

rename from suite/common/pref/pref-applicationManager.js
rename to suite/components/pref/content/pref-applicationManager.js

rename from suite/common/pref/pref-applicationManager.xul
rename to suite/components/pref/content/pref-applicationManager.xul

rename from suite/common/pref/pref-applications.js
rename to suite/components/pref/content/pref-applications.js

rename from suite/common/pref/pref-applications.xul
rename to suite/components/pref/content/pref-applications.xul

rename from suite/common/pref/pref-cache.js
rename to suite/components/pref/content/pref-cache.js

rename from suite/common/pref/pref-cache.xul
rename to suite/components/pref/content/pref-cache.xul

rename from suite/common/pref/pref-colors.js
rename to suite/components/pref/content/pref-colors.js

rename from suite/common/pref/pref-colors.xul
rename to suite/components/pref/content/pref-colors.xul

rename from suite/common/pref/pref-content.js
rename to suite/components/pref/content/pref-content.js

rename from suite/common/pref/pref-content.xul
rename to suite/components/pref/content/pref-content.xul

rename from suite/common/pref/pref-cookies.js
rename to suite/components/pref/content/pref-cookies.js

rename from suite/common/pref/pref-cookies.xul
rename to suite/components/pref/content/pref-cookies.xul

rename from suite/common/pref/pref-download.js
rename to suite/components/pref/content/pref-download.js

rename from suite/common/pref/pref-download.xul
rename to suite/components/pref/content/pref-download.xul

rename from suite/common/pref/pref-findasyoutype.js
rename to suite/components/pref/content/pref-findasyoutype.js

rename from suite/common/pref/pref-findasyoutype.xul
rename to suite/components/pref/content/pref-findasyoutype.xul

rename from suite/common/pref/pref-fonts.js
rename to suite/components/pref/content/pref-fonts.js

rename from suite/common/pref/pref-fonts.xul
rename to suite/components/pref/content/pref-fonts.xul

rename from suite/common/pref/pref-history.js
rename to suite/components/pref/content/pref-history.js

rename from suite/common/pref/pref-history.xul
rename to suite/components/pref/content/pref-history.xul

rename from suite/common/pref/pref-http.js
rename to suite/components/pref/content/pref-http.js

rename from suite/common/pref/pref-http.xul
rename to suite/components/pref/content/pref-http.xul

rename from suite/common/pref/pref-images.xul
rename to suite/components/pref/content/pref-images.xul

rename from suite/common/pref/pref-keynav.js
rename to suite/components/pref/content/pref-keynav.js

rename from suite/common/pref/pref-keynav.xul
rename to suite/components/pref/content/pref-keynav.xul

rename from suite/common/pref/pref-languages-add.js
rename to suite/components/pref/content/pref-languages-add.js

rename from suite/common/pref/pref-languages-add.xul
rename to suite/components/pref/content/pref-languages-add.xul

rename from suite/common/pref/pref-languages.js
rename to suite/components/pref/content/pref-languages.js

rename from suite/common/pref/pref-languages.xul
rename to suite/components/pref/content/pref-languages.xul

rename from suite/common/pref/pref-links.js
rename to suite/components/pref/content/pref-links.js

rename from suite/common/pref/pref-links.xul
rename to suite/components/pref/content/pref-links.xul

rename from suite/common/pref/pref-locationbar.js
rename to suite/components/pref/content/pref-locationbar.js

rename from suite/common/pref/pref-locationbar.xul
rename to suite/components/pref/content/pref-locationbar.xul

rename from suite/common/pref/pref-media.xul
rename to suite/components/pref/content/pref-media.xul

rename from suite/common/pref/pref-mousewheel.js
rename to suite/components/pref/content/pref-mousewheel.js

rename from suite/common/pref/pref-mousewheel.xul
rename to suite/components/pref/content/pref-mousewheel.xul

rename from suite/common/pref/pref-navigator.js
rename to suite/components/pref/content/pref-navigator.js

rename from suite/common/pref/pref-navigator.xul
rename to suite/components/pref/content/pref-navigator.xul

rename from suite/common/pref/pref-offlineapps.js
rename to suite/components/pref/content/pref-offlineapps.js

rename from suite/common/pref/pref-offlineapps.xul
rename to suite/components/pref/content/pref-offlineapps.xul

rename from suite/common/pref/pref-passwords.xul
rename to suite/components/pref/content/pref-passwords.xul

rename from suite/common/pref/pref-popups.js
rename to suite/components/pref/content/pref-popups.js

rename from suite/common/pref/pref-popups.xul
rename to suite/components/pref/content/pref-popups.xul

rename from suite/common/pref/pref-privatedata.js
rename to suite/components/pref/content/pref-privatedata.js

rename from suite/common/pref/pref-privatedata.xul
rename to suite/components/pref/content/pref-privatedata.xul

rename from suite/common/pref/pref-proxies-advanced.xul
rename to suite/components/pref/content/pref-proxies-advanced.xul

rename from suite/common/pref/pref-proxies.js
rename to suite/components/pref/content/pref-proxies.js

rename from suite/common/pref/pref-proxies.xul
rename to suite/components/pref/content/pref-proxies.xul

rename from suite/common/pref/pref-scripts.js
rename to suite/components/pref/content/pref-scripts.js

rename from suite/common/pref/pref-scripts.xul
rename to suite/components/pref/content/pref-scripts.xul

rename from suite/common/pref/pref-search.js
rename to suite/components/pref/content/pref-search.js

rename from suite/common/pref/pref-search.xul
rename to suite/components/pref/content/pref-search.xul

rename from suite/common/pref/pref-security.js
rename to suite/components/pref/content/pref-security.js

rename from suite/common/pref/pref-security.xul
rename to suite/components/pref/content/pref-security.xul

rename from suite/common/pref/pref-smartupdate.js
rename to suite/components/pref/content/pref-smartupdate.js

rename from suite/common/pref/pref-smartupdate.xul
rename to suite/components/pref/content/pref-smartupdate.xul

rename from suite/common/pref/pref-spelling.js
rename to suite/components/pref/content/pref-spelling.js

rename from suite/common/pref/pref-spelling.xul
rename to suite/components/pref/content/pref-spelling.xul

rename from suite/common/pref/pref-sync.js
rename to suite/components/pref/content/pref-sync.js

rename from suite/common/pref/pref-sync.xul
rename to suite/components/pref/content/pref-sync.xul

rename from suite/common/pref/pref-tabs.xul
rename to suite/components/pref/content/pref-tabs.xul

rename from suite/common/pref/preferences.js
rename to suite/components/pref/content/preferences.js

rename from suite/common/pref/preferences.xul
rename to suite/components/pref/content/preferences.xul

rename from suite/common/pref/prefpanels.css
rename to suite/components/pref/content/prefpanels.css

rename from suite/common/pref/prefpanels.xml
rename to suite/components/pref/content/prefpanels.xml

new file mode 100644
--- /dev/null
+++ b/suite/components/pref/jar.mn
@@ -0,0 +1,72 @@
+# 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/.
+
+comm.jar:
+   content/communicator/pref/preferences.xul                        (content/preferences.xul)
+   content/communicator/pref/preferences.js                         (content/preferences.js)
+   content/communicator/pref/prefpanels.css                         (content/prefpanels.css)
+   content/communicator/pref/prefpanels.xml                         (content/prefpanels.xml)
+   content/communicator/pref/pref-advanced.js                       (content/pref-advanced.js)
+   content/communicator/pref/pref-advanced.xul                      (content/pref-advanced.xul)
+   content/communicator/pref/pref-appearance.js                     (content/pref-appearance.js)
+   content/communicator/pref/pref-appearance.xul                    (content/pref-appearance.xul)
+   content/communicator/pref/pref-applications.xul                  (content/pref-applications.xul)
+*  content/communicator/pref/pref-applications.js                   (content/pref-applications.js)
+   content/communicator/pref/pref-applicationManager.js             (content/pref-applicationManager.js)
+   content/communicator/pref/pref-applicationManager.xul            (content/pref-applicationManager.xul)
+   content/communicator/pref/pref-cache.js                          (content/pref-cache.js)
+   content/communicator/pref/pref-cache.xul                         (content/pref-cache.xul)
+   content/communicator/pref/pref-colors.js                         (content/pref-colors.js)
+   content/communicator/pref/pref-colors.xul                        (content/pref-colors.xul)
+   content/communicator/pref/pref-content.js                        (content/pref-content.js)
+   content/communicator/pref/pref-content.xul                       (content/pref-content.xul)
+   content/communicator/pref/pref-cookies.js                        (content/pref-cookies.js)
+   content/communicator/pref/pref-cookies.xul                       (content/pref-cookies.xul)
+   content/communicator/pref/pref-download.js                       (content/pref-download.js)
+   content/communicator/pref/pref-download.xul                      (content/pref-download.xul)
+   content/communicator/pref/pref-findasyoutype.js                  (content/pref-findasyoutype.js)
+   content/communicator/pref/pref-findasyoutype.xul                 (content/pref-findasyoutype.xul)
+   content/communicator/pref/pref-fonts.js                          (content/pref-fonts.js)
+   content/communicator/pref/pref-fonts.xul                         (content/pref-fonts.xul)
+   content/communicator/pref/pref-history.js                        (content/pref-history.js)
+   content/communicator/pref/pref-history.xul                       (content/pref-history.xul)
+   content/communicator/pref/pref-http.js                           (content/pref-http.js)
+   content/communicator/pref/pref-http.xul                          (content/pref-http.xul)
+   content/communicator/pref/pref-images.xul                        (content/pref-images.xul)
+   content/communicator/pref/pref-keynav.js                         (content/pref-keynav.js)
+   content/communicator/pref/pref-keynav.xul                        (content/pref-keynav.xul)
+   content/communicator/pref/pref-languages.js                      (content/pref-languages.js)
+   content/communicator/pref/pref-languages.xul                     (content/pref-languages.xul)
+   content/communicator/pref/pref-languages-add.xul                 (content/pref-languages-add.xul)
+   content/communicator/pref/pref-languages-add.js                  (content/pref-languages-add.js)
+   content/communicator/pref/pref-links.js                          (content/pref-links.js)
+   content/communicator/pref/pref-links.xul                         (content/pref-links.xul)
+   content/communicator/pref/pref-locationbar.js                    (content/pref-locationbar.js)
+   content/communicator/pref/pref-locationbar.xul                   (content/pref-locationbar.xul)
+*  content/communicator/pref/pref-media.xul                         (content/pref-media.xul)
+   content/communicator/pref/pref-mousewheel.js                     (content/pref-mousewheel.js)
+   content/communicator/pref/pref-mousewheel.xul                    (content/pref-mousewheel.xul)
+   content/communicator/pref/pref-navigator.js                      (content/pref-navigator.js)
+   content/communicator/pref/pref-navigator.xul                     (content/pref-navigator.xul)
+   content/communicator/pref/pref-offlineapps.js                    (content/pref-offlineapps.js)
+   content/communicator/pref/pref-offlineapps.xul                   (content/pref-offlineapps.xul)
+   content/communicator/pref/pref-passwords.xul                     (content/pref-passwords.xul)
+   content/communicator/pref/pref-popups.js                         (content/pref-popups.js)
+   content/communicator/pref/pref-popups.xul                        (content/pref-popups.xul)
+   content/communicator/pref/pref-privatedata.js                    (content/pref-privatedata.js)
+   content/communicator/pref/pref-privatedata.xul                   (content/pref-privatedata.xul)
+   content/communicator/pref/pref-proxies.js                        (content/pref-proxies.js)
+   content/communicator/pref/pref-proxies.xul                       (content/pref-proxies.xul)
+   content/communicator/pref/pref-proxies-advanced.xul              (content/pref-proxies-advanced.xul)
+   content/communicator/pref/pref-scripts.js                        (content/pref-scripts.js)
+   content/communicator/pref/pref-scripts.xul                       (content/pref-scripts.xul)
+   content/communicator/pref/pref-search.js                         (content/pref-search.js)
+   content/communicator/pref/pref-search.xul                        (content/pref-search.xul)
+   content/communicator/pref/pref-security.js                       (content/pref-security.js)
+   content/communicator/pref/pref-security.xul                      (content/pref-security.xul)
+   content/communicator/pref/pref-smartupdate.js                    (content/pref-smartupdate.js)
+   content/communicator/pref/pref-smartupdate.xul                   (content/pref-smartupdate.xul)
+   content/communicator/pref/pref-spelling.js                       (content/pref-spelling.js)
+   content/communicator/pref/pref-spelling.xul                      (content/pref-spelling.xul)
+   content/communicator/pref/pref-tabs.xul                          (content/pref-tabs.xul)

new file mode 100644
--- /dev/null
+++ b/suite/components/pref/moz.build
@@ -0,0 +1,11 @@
+# -*- 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/.
+
+BROWSER_CHROME_MANIFESTS += [
+    'tests/browser/browser.ini',
+]
+
+JAR_MANIFESTS += ['jar.mn']

rename from suite/common/tests/preferences/browser.ini
rename to suite/components/pref/tests/browser/browser.ini

rename from suite/common/tests/preferences/browser_bug410900.js
rename to suite/components/pref/tests/browser/browser_bug410900.js

rename from suite/components/profile/migration.js
rename to suite/components/profile/content/migration.js

rename from suite/components/profile/migration.xul
rename to suite/components/profile/content/migration.xul

rename from suite/common/profile/profileSelection.js
rename to suite/components/profile/content/profileSelection.js

rename from suite/common/profile/profileSelection.xul
rename to suite/components/profile/content/profileSelection.xul

--- a/suite/components/profile/jar.mn
+++ b/suite/components/profile/jar.mn
@@ -1,7 +1,11 @@
 # 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/.
 
 comm.jar:
-  content/communicator/migration/migration.xul
-  content/communicator/migration/migration.js
+% override chrome://mozapps/content/profile/profileSelection.xul chrome://communicator/content/profile/profileSelection.xul
+  content/communicator/migration/migration.xul                     (content/migration.xul)
+  content/communicator/migration/migration.js                      (content/migration.js)
+  content/communicator/profile/profileSelection.js                 (content/profileSelection.js)
+  content/communicator/profile/profileSelection.xul                (content/profileSelection.xul)
+

--- a/suite/components/profile/moz.build
+++ b/suite/components/profile/moz.build
@@ -1,8 +1,9 @@
+# -*- 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/.
 
 XPIDL_SOURCES += [
     'nsISuiteProfileMigrator.idl',
 ]

rename from suite/common/search/engineManager.js
rename to suite/components/search/content/engineManager.js

rename from suite/common/search/engineManager.xul
rename to suite/components/search/content/engineManager.xul

rename from suite/common/search/search-panel.js
rename to suite/components/search/content/search-panel.js

rename from suite/common/search/search-panel.xul
rename to suite/components/search/content/search-panel.xul

rename from suite/common/search/search.xml
rename to suite/components/search/content/search.xml

rename from suite/common/search/searchbarBindings.css
rename to suite/components/search/content/searchbarBindings.css

new file mode 100644
--- /dev/null
+++ b/suite/components/search/jar.mn
@@ -0,0 +1,15 @@
+# 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/.
+
+comm.jar:
+% content communicator %content/communicator/ contentaccessible=yes
+   content/communicator/search/engineManager.js                     (content/engineManager.js)
+   content/communicator/search/engineManager.xul                    (content/engineManager.xul)
+   content/communicator/search/search.xml                           (content/search.xml)
+   content/communicator/search/searchbarBindings.css                (content/searchbarBindings.css)
+   content/communicator/search/search-panel.js                      (content/search-panel.js)
+   content/communicator/search/search-panel.xul                     (content/search-panel.xul)
+
+# L10n resource overrides
+% resource search-plugins chrome://communicator/locale/searchplugins/

new file mode 100644
--- /dev/null
+++ b/suite/components/search/moz.build
@@ -0,0 +1,7 @@
+# -*- 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/.
+
+JAR_MANIFESTS += ['jar.mn']

rename from suite/common/aboutSessionRestore.js
rename to suite/components/sessionstore/content/aboutSessionRestore.js

rename from suite/common/aboutSessionRestore.xhtml
rename to suite/components/sessionstore/content/aboutSessionRestore.xhtml

new file mode 100644
--- /dev/null
+++ b/suite/components/sessionstore/jar.mn
@@ -0,0 +1,7 @@
+# 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/.
+
+comm.jar:
+    content/communicator/aboutSessionRestore.js    (content/aboutSessionRestore.js)
+    content/communicator/aboutSessionRestore.xhtml (content/aboutSessionRestore.xhtml)

rename from suite/common/public/moz.build
rename to suite/components/sessionstore/moz.build
--- a/suite/common/public/moz.build
+++ b/suite/components/sessionstore/moz.build
@@ -1,14 +1,23 @@
+# -*- 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/.
 
 XPIDL_SOURCES += [
     'nsISessionStartup.idl',
     'nsISessionStore.idl',
-    'nsISidebar.idl',
-    'nsISuiteGlue.idl',
 ]
 
 XPIDL_MODULE = 'suitecommon'
 
+EXTRA_COMPONENTS += [
+    'nsSessionStartup.js',
+    'nsSessionStartup.manifest',
+]
+
+EXTRA_PP_COMPONENTS += [
+    'nsSessionStore.js',
+]
+
+JAR_MANIFESTS += ['jar.mn']

rename from suite/common/public/nsISessionStartup.idl
rename to suite/components/sessionstore/nsISessionStartup.idl

rename from suite/common/public/nsISessionStore.idl
rename to suite/components/sessionstore/nsISessionStore.idl

rename from suite/common/src/nsSessionStartup.js
rename to suite/components/sessionstore/nsSessionStartup.js

new file mode 100644
--- /dev/null
+++ b/suite/components/sessionstore/nsSessionStartup.manifest
@@ -0,0 +1,11 @@
+# This components must restrict its registration for the app-startup category
+# to the specific list of apps that use it so it doesn't get loaded in xpcshell.
+# Thus we restrict it to these apps:
+#
+#   suite {4e6c1112-57b6-44ba-adf9-99fb573b0a30}
+
+component {4e6c1112-57b6-44ba-adf9-99fb573b0a30} nsSessionStartup.js
+contract @mozilla.org/suite/sessionstartup;1 {4e6c1112-57b6-44ba-adf9-99fb573b0a30}
+category app-startup SessionStartup service,@mozilla.org/suite/sessionstartup;1
+component {d37ccdf1-496f-4135-9575-037180af010d} nsSessionStore.js
+contract @mozilla.org/suite/sessionstore;1 {d37ccdf1-496f-4135-9575-037180af010d}

rename from suite/common/src/nsSessionStore.js
rename to suite/components/sessionstore/nsSessionStore.js

rename from suite/common/setDesktopBackground.js
rename to suite/components/shell/content/setDesktopBackground.js

rename from suite/common/setDesktopBackground.xul
rename to suite/components/shell/content/setDesktopBackground.xul

new file mode 100644
--- /dev/null
+++ b/suite/components/shell/jar.mn
@@ -0,0 +1,7 @@
+# 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/.
+
+comm.jar:
+    content/communicator/setDesktopBackground.js       (content/setDesktopBackground.js)
+    content/communicator/setDesktopBackground.xul      (content/setDesktopBackground.xul)

--- a/suite/components/shell/moz.build
+++ b/suite/components/shell/moz.build
@@ -1,8 +1,9 @@
+# -*- 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/.
 
 XPIDL_SOURCES += [
     'nsIShellService.idl',
 ]
@@ -36,8 +37,10 @@ if SOURCES:
     EXTRA_COMPONENTS += [
         'nsSetDefault.js',
         'nsSetDefault.manifest',
     ]
 
 FINAL_LIBRARY = 'suite'
 
 CXXFLAGS += CONFIG['TK_CFLAGS']
+
+JAR_MANIFESTS += ['jar.mn']

new file mode 100644
--- /dev/null
+++ b/suite/components/sidebar/SuiteSidebar.manifest
@@ -0,0 +1,4 @@
+component {22117140-9c6e-11d3-aaf1-00805f8a4905} nsSidebar.js
+contract @mozilla.org/sidebar;1 {22117140-9c6e-11d3-aaf1-00805f8a4905}
+category JavaScript-global-property sidebar @mozilla.org/sidebar;1
+category JavaScript-global-property external @mozilla.org/sidebar;1

rename from suite/common/sidebar/PageNotFound.xul
rename to suite/components/sidebar/content/PageNotFound.xul

rename from suite/common/sidebar/customize-panel.js
rename to suite/components/sidebar/content/customize-panel.js

rename from suite/common/sidebar/customize-panel.xul
rename to suite/components/sidebar/content/customize-panel.xul

rename from suite/common/sidebar/customize.js
rename to suite/components/sidebar/content/customize.js

rename from suite/common/sidebar/customize.xul
rename to suite/components/sidebar/content/customize.xul

rename from suite/common/sidebar/preview.js
rename to suite/components/sidebar/content/preview.js

rename from suite/common/sidebar/preview.xul
rename to suite/components/sidebar/content/preview.xul

rename from suite/common/sidebar/sidebarBindings.xml
rename to suite/components/sidebar/content/sidebarBindings.xml

rename from suite/common/sidebar/sidebarOverlay.css
rename to suite/components/sidebar/content/sidebarOverlay.css

rename from suite/common/sidebar/sidebarOverlay.js
rename to suite/components/sidebar/content/sidebarOverlay.js

rename from suite/common/sidebar/sidebarOverlay.xul
rename to suite/components/sidebar/content/sidebarOverlay.xul

new file mode 100644
--- /dev/null
+++ b/suite/components/sidebar/jar.mn
@@ -0,0 +1,16 @@
+# 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/.
+
+comm.jar:
+   content/communicator/sidebar/customize-panel.js                  (content/customize-panel.js)
+   content/communicator/sidebar/customize-panel.xul                 (content/customize-panel.xul)
+   content/communicator/sidebar/customize.js                        (content/customize.js)
+   content/communicator/sidebar/customize.xul                       (content/customize.xul)
+   content/communicator/sidebar/PageNotFound.xul                    (content/PageNotFound.xul)
+   content/communicator/sidebar/preview.js                          (content/preview.js)
+   content/communicator/sidebar/preview.xul                         (content/preview.xul)
+   content/communicator/sidebar/sidebarBindings.xml                 (content/sidebarBindings.xml)
+   content/communicator/sidebar/sidebarOverlay.css                  (content/sidebarOverlay.css)
+   content/communicator/sidebar/sidebarOverlay.js                   (content/sidebarOverlay.js)
+   content/communicator/sidebar/sidebarOverlay.xul                  (content/sidebarOverlay.xul)

new file mode 100644
--- /dev/null
+++ b/suite/components/sidebar/moz.build
@@ -0,0 +1,18 @@
+# -*- 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/.
+
+XPIDL_SOURCES += [
+    'nsISidebar.idl',
+]
+
+XPIDL_MODULE = 'suite-sidebar'
+
+EXTRA_COMPONENTS += [
+    'nsSidebar.js',
+    'SuiteSidebar.manifest',
+]
+
+JAR_MANIFESTS += ['jar.mn']

rename from suite/common/public/nsISidebar.idl
rename to suite/components/sidebar/nsISidebar.idl

rename from suite/common/src/nsSidebar.js
rename to suite/components/sidebar/nsSidebar.js

rename from suite/common/sync/aboutSyncTabs-bindings.xml
rename to suite/components/sync/content/aboutSyncTabs-bindings.xml

rename from suite/common/sync/aboutSyncTabs.css
rename to suite/components/sync/content/aboutSyncTabs.css

rename from suite/common/sync/aboutSyncTabs.js
rename to suite/components/sync/content/aboutSyncTabs.js

rename from suite/common/sync/aboutSyncTabs.xul
rename to suite/components/sync/content/aboutSyncTabs.xul

rename from suite/common/sync/syncAddDevice.js
rename to suite/components/sync/content/syncAddDevice.js

rename from suite/common/sync/syncAddDevice.xul
rename to suite/components/sync/content/syncAddDevice.xul

rename from suite/common/sync/syncGenericChange.js
rename to suite/components/sync/content/syncGenericChange.js

rename from suite/common/sync/syncGenericChange.xul
rename to suite/components/sync/content/syncGenericChange.xul

rename from suite/common/sync/syncKey.xhtml
rename to suite/components/sync/content/syncKey.xhtml

rename from suite/common/sync/syncNotification.xml
rename to suite/components/sync/content/syncNotification.xml

rename from suite/common/sync/syncQuota.js
rename to suite/components/sync/content/syncQuota.js

rename from suite/common/sync/syncQuota.xul
rename to suite/components/sync/content/syncQuota.xul

rename from suite/common/sync/syncSetup.js
rename to suite/components/sync/content/syncSetup.js

rename from suite/common/sync/syncSetup.xul
rename to suite/components/sync/content/syncSetup.xul

rename from suite/common/sync/syncUI.js
rename to suite/components/sync/content/syncUI.js

rename from suite/common/sync/syncUtils.js
rename to suite/components/sync/content/syncUtils.js

new file mode 100644
--- /dev/null
+++ b/suite/components/sync/jar.mn
@@ -0,0 +1,21 @@
+# 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/.
+
+comm.jar:
+   content/communicator/aboutSyncTabs.xul                           (content/aboutSyncTabs.xul)
+   content/communicator/aboutSyncTabs.js                            (content/aboutSyncTabs.js)
+   content/communicator/aboutSyncTabs.css                           (content/aboutSyncTabs.css)
+   content/communicator/aboutSyncTabs-bindings.xml                  (content/aboutSyncTabs-bindings.xml)
+   content/communicator/sync/syncAddDevice.xul                      (content/syncAddDevice.xul)
+   content/communicator/sync/syncAddDevice.js                       (content/syncAddDevice.js)
+   content/communicator/sync/syncSetup.xul                          (content/syncSetup.xul)
+   content/communicator/sync/syncSetup.js                           (content/syncSetup.js)
+   content/communicator/sync/syncGenericChange.xul                  (content/syncGenericChange.xul)
+   content/communicator/sync/syncGenericChange.js                   (content/syncGenericChange.js)
+   content/communicator/sync/syncKey.xhtml                          (content/syncKey.xhtml)
+   content/communicator/sync/syncNotification.xml                   (content/syncNotification.xml)
+   content/communicator/sync/syncQuota.xul                          (content/syncQuota.xul)
+   content/communicator/sync/syncQuota.js                           (content/syncQuota.js)
+   content/communicator/sync/syncUtils.js                           (content/syncUtils.js)
+   content/communicator/sync/syncUI.js                              (content/syncUI.js)

new file mode 100644
--- /dev/null
+++ b/suite/components/sync/moz.build
@@ -0,0 +1,7 @@
+# -*- 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/.
+
+JAR_MANIFESTS += ['jar.mn']

rename from suite/common/tests/browser/browser.ini
rename to suite/components/tests/browser/browser.ini

rename from suite/common/tests/browser/browser_339445.js
rename to suite/components/tests/browser/browser_339445.js

rename from suite/common/tests/browser/browser_339445_sample.html
rename to suite/components/tests/browser/browser_339445_sample.html

rename from suite/common/tests/browser/browser_345898.js
rename to suite/components/tests/browser/browser_345898.js

rename from suite/common/tests/browser/browser_346337.js
rename to suite/components/tests/browser/browser_346337.js

rename from suite/common/tests/browser/browser_346337_sample.html
rename to suite/components/tests/browser/browser_346337_sample.html

rename from suite/common/tests/browser/browser_350525.js
rename to suite/components/tests/browser/browser_350525.js

rename from suite/common/tests/browser/browser_354894.js
rename to suite/components/tests/browser/browser_354894.js

rename from suite/common/tests/browser/browser_367052.js
rename to suite/components/tests/browser/browser_367052.js

rename from suite/common/tests/browser/browser_393716.js
rename to suite/components/tests/browser/browser_393716.js

rename from suite/common/tests/browser/browser_394759_basic.js
rename to suite/components/tests/browser/browser_394759_basic.js

rename from suite/common/tests/browser/browser_394759_behavior.js
rename to suite/components/tests/browser/browser_394759_behavior.js

rename from suite/common/tests/browser/browser_408470.js
rename to suite/components/tests/browser/browser_408470.js

rename from suite/common/tests/browser/browser_408470_sample.html
rename to suite/components/tests/browser/browser_408470_sample.html

rename from suite/common/tests/browser/browser_423132.js
rename to suite/components/tests/browser/browser_423132.js

rename from suite/common/tests/browser/browser_423132_sample.html
rename to suite/components/tests/browser/browser_423132_sample.html

rename from suite/common/tests/browser/browser_447951.js
rename to suite/components/tests/browser/browser_447951.js

rename from suite/common/tests/browser/browser_447951_sample.html
rename to suite/components/tests/browser/browser_447951_sample.html

rename from suite/common/tests/browser/browser_448741.js
rename to suite/components/tests/browser/browser_448741.js

rename from suite/common/tests/browser/browser_454908.js
rename to suite/components/tests/browser/browser_454908.js

rename from suite/common/tests/browser/browser_454908_sample.html
rename to suite/components/tests/browser/browser_454908_sample.html

rename from suite/common/tests/browser/browser_456342.js
rename to suite/components/tests/browser/browser_456342.js

rename from suite/common/tests/browser/browser_456342_sample.xhtml
rename to suite/components/tests/browser/browser_456342_sample.xhtml

rename from suite/common/tests/browser/browser_461634.js
rename to suite/components/tests/browser/browser_461634.js

rename from suite/common/tests/browser/browser_463206.js
rename to suite/components/tests/browser/browser_463206.js

rename from suite/common/tests/browser/browser_463206_sample.html
rename to suite/components/tests/browser/browser_463206_sample.html

rename from suite/common/tests/browser/browser_465215.js
rename to suite/components/tests/browser/browser_465215.js

rename from suite/common/tests/browser/browser_465223.js
rename to suite/components/tests/browser/browser_465223.js

rename from suite/common/tests/browser/browser_466937.js
rename to suite/components/tests/browser/browser_466937.js

rename from suite/common/tests/browser/browser_466937_sample.html
rename to suite/components/tests/browser/browser_466937_sample.html

rename from suite/common/tests/browser/browser_477657.js
rename to suite/components/tests/browser/browser_477657.js

rename from suite/common/tests/browser/browser_480893.js
rename to suite/components/tests/browser/browser_480893.js

rename from suite/common/tests/browser/browser_483330.js
rename to suite/components/tests/browser/browser_483330.js

rename from suite/common/tests/browser/browser_485482.js
rename to suite/components/tests/browser/browser_485482.js

rename from suite/common/tests/browser/browser_485482_sample.html
rename to suite/components/tests/browser/browser_485482_sample.html

rename from suite/common/tests/browser/browser_490040.js
rename to suite/components/tests/browser/browser_490040.js

rename from suite/common/tests/browser/browser_491168.js
rename to suite/components/tests/browser/browser_491168.js

rename from suite/common/tests/browser/browser_493467.js
rename to suite/components/tests/browser/browser_493467.js

rename from suite/common/tests/browser/browser_500328.js
rename to suite/components/tests/browser/browser_500328.js

rename from suite/common/tests/browser/browser_514751.js
rename to suite/components/tests/browser/browser_514751.js

rename from suite/common/tests/browser/browser_522545.js
rename to suite/components/tests/browser/browser_522545.js

rename from suite/common/tests/browser/browser_524745.js
rename to suite/components/tests/browser/browser_524745.js

rename from suite/common/tests/browser/browser_526613.js
rename to suite/components/tests/browser/browser_526613.js

rename from suite/common/tests/browser/browser_528776.js
rename to suite/components/tests/browser/browser_528776.js

rename from suite/common/tests/browser/browser_581937.js
rename to suite/components/tests/browser/browser_581937.js

rename from suite/common/tests/browser/browser_586068-cascaded_restore.js
rename to suite/components/tests/browser/browser_586068-cascaded_restore.js

rename from suite/common/tests/browser/browser_597315.js
rename to suite/components/tests/browser/browser_597315.js

rename from suite/common/tests/browser/browser_597315_a.html
rename to suite/components/tests/browser/browser_597315_a.html

rename from suite/common/tests/browser/browser_597315_b.html
rename to suite/components/tests/browser/browser_597315_b.html

rename from suite/common/tests/browser/browser_597315_c.html
rename to suite/components/tests/browser/browser_597315_c.html

rename from suite/common/tests/browser/browser_597315_c1.html
rename to suite/components/tests/browser/browser_597315_c1.html

rename from suite/common/tests/browser/browser_597315_c2.html
rename to suite/components/tests/browser/browser_597315_c2.html

rename from suite/common/tests/browser/browser_597315_index.html
rename to suite/components/tests/browser/browser_597315_index.html

rename from suite/common/tests/browser/browser_607016.js
rename to suite/components/tests/browser/browser_607016.js

rename from suite/common/tests/browser/browser_615394-SSWindowState_events.js
rename to suite/components/tests/browser/browser_615394-SSWindowState_events.js

rename from suite/common/tests/browser/browser_625257.js
rename to suite/components/tests/browser/browser_625257.js

rename from suite/common/tests/browser/browser_636279.js
rename to suite/components/tests/browser/browser_636279.js

rename from suite/common/tests/browser/browser_637020.js
rename to suite/components/tests/browser/browser_637020.js

rename from suite/common/tests/browser/browser_637020_slow.sjs
rename to suite/components/tests/browser/browser_637020_slow.sjs

rename from suite/common/tests/browser/browser_665702-state_session.js
rename to suite/components/tests/browser/browser_665702-state_session.js

rename from suite/common/tests/browser/browser_687710.js
rename to suite/components/tests/browser/browser_687710.js

rename from suite/common/tests/browser/browser_687710_2.js
rename to suite/components/tests/browser/browser_687710_2.js

rename from suite/common/tests/browser/browser_694378.js
rename to suite/components/tests/browser/browser_694378.js

rename from suite/common/tests/browser/browser_bug431826.js
rename to suite/components/tests/browser/browser_bug431826.js

rename from suite/common/tests/browser/browser_form_restore_events.js
rename to suite/components/tests/browser/browser_form_restore_events.js

rename from suite/common/tests/browser/browser_form_restore_events_sample.html
rename to suite/components/tests/browser/browser_form_restore_events_sample.html

rename from suite/common/tests/browser/browser_isempty.js
rename to suite/components/tests/browser/browser_isempty.js

rename from suite/common/tests/browser/browser_markPageAsFollowedLink.js
rename to suite/components/tests/browser/browser_markPageAsFollowedLink.js

rename from suite/common/tests/browser/frameLeft.html
rename to suite/components/tests/browser/frameLeft.html

rename from suite/common/tests/browser/frameRight.html
rename to suite/components/tests/browser/frameRight.html

rename from suite/common/tests/browser/framedPage.html
rename to suite/components/tests/browser/framedPage.html

rename from suite/common/tests/browser/head.js
rename to suite/components/tests/browser/head.js

rename from suite/common/tests/chrome/chrome.ini
rename to suite/components/tests/chrome/chrome.ini

rename from suite/common/tests/chrome/test_idcheck.xul
rename to suite/components/tests/chrome/test_idcheck.xul

--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -164,18 +164,20 @@
 @BINPATH@/IA2Marshal.dll
 #endif
 #endif
 @RESPATH@/components/extensions.manifest
 @RESPATH@/components/mozIntl.manifest
 @RESPATH@/components/mozIntl.js
 @RESPATH@/components/satchel.manifest
 @RESPATH@/components/SuiteBrowser.manifest
-@RESPATH@/components/SuiteCommon.manifest
+@RESPATH@/components/SuiteComponents.manifest
 @RESPATH@/components/SuiteFeeds.manifest
+@RESPATH@/components/SuiteProfileMigrator.manifest
+@RESPATH@/components/SuiteSidebar.manifest
 @RESPATH@/components/toolkitplaces.manifest
 @RESPATH@/components/toolkitsearch.manifest
 ; Security Reports
 @RESPATH@/components/SecurityReporter.manifest
 @RESPATH@/components/SecurityReporter.js
 ; JavaScript components
 @RESPATH@/components/addonManager.js
 @RESPATH@/components/amContentHandler.js

--- a/suite/moz.build
+++ b/suite/moz.build
@@ -1,18 +1,18 @@
 # 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/.
 
 CONFIGURE_SUBST_FILES += ['installer/Makefile']
 
 DIRS += [
+    'base',
     'browser',
-    'common',
     'components',
     'extensions',
     'locales',
     'mailnews',
     'modules',
     'themes/classic',
     'themes/modern',
     'security',

author	Frank-Rainer Grahl <frgrahl@gmx.net>
	Thu, 28 Jun 2018 21:03:03 +0200
changeset 64574	0838548ddc02bfc89f3515137746ab94e13bddd4
parent 64573	25adf10ec9f905a17acfe94dfcf68b2eb1b02525
child 64575	3122f5e25eb5eb0c0468a92d8d1e9d2b47efdfd2
push id	6448
push user	mozilla@jorgk.com
push date	Thu, 28 Jun 2018 22:14:49 +0000
treeherder	try-comm-central@d3bf84767ea4 [default view] [failures only]
reviewers	IanN
bugs	1453046