diff --git a/mozilla/browser/Makefile.in b/mozilla/browser/Makefile.in
index c31dd4dcc8a..56442831786 100644
--- a/mozilla/browser/Makefile.in
+++ b/mozilla/browser/Makefile.in
@@ -42,6 +42,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = core components
+DIRS = base components
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/browser/base/resources/content/browser.xul b/mozilla/browser/base/resources/content/browser.xul
index 4519ce5bb8b..4bfa2c62282 100644
--- a/mozilla/browser/base/resources/content/browser.xul
+++ b/mozilla/browser/base/resources/content/browser.xul
@@ -25,11 +25,10 @@ Contributor(s): ______________________________________. -->
 
 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/navExtraOverlay.xul"?>
-<?xul-overlay href="chrome://navigator/content/linkToolbarOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/securityOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/bookmarks/bookmarksOverlay.xul"?>
+<?xul-overlay href="chrome://browser/content/bookmarks/bookmarksOverlay.xul"?>
 
 
 <!DOCTYPE window [
@@ -70,7 +69,7 @@ Contributor(s): ______________________________________. -->
   <script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
 
   <!-- Shared Bookmarks Utility Library -->
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksOverlay.js"/>
   <script type="application/x-javascript" src="chrome://navigator/content/personalToolbar.js"/>
   
   <!-- Navigator -->
diff --git a/mozilla/browser/base/resources/content/contents.rdf b/mozilla/browser/base/resources/content/contents.rdf
index 279eb9702c0..a23799e8ea7 100644
--- a/mozilla/browser/base/resources/content/contents.rdf
+++ b/mozilla/browser/base/resources/content/contents.rdf
@@ -4,14 +4,14 @@
 
   <!-- list all the packages being supplied by this jar -->
   <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:navigator"/>
+    <RDF:li resource="urn:mozilla:package:browser"/>
   </RDF:Seq>
 
   <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:navigator"
-        chrome:displayName="Navigator"
+  <RDF:Description about="urn:mozilla:package:browser"
+        chrome:displayName="Browser"
         chrome:author="mozilla.org"
-        chrome:name="navigator"
+        chrome:name="browser"
         chrome:localeVersion="0.9.9"
         chrome:skinVersion="1.0">
   </RDF:Description>
diff --git a/mozilla/browser/base/resources/jar.mn b/mozilla/browser/base/resources/jar.mn
index c0d7ea04533..d79f13f61cc 100644
--- a/mozilla/browser/base/resources/jar.mn
+++ b/mozilla/browser/base/resources/jar.mn
@@ -1,7 +1,34 @@
 browser.jar:
-  content/browser/contents.rdf          (content/contents.rdf)
-  content/browser/browser.xul           (content/browser.xul)
-  content/browser/browser.js            (content/browser.js)
-  locale/browser/contents.rdf           (locale/contents.rdf)
-  locale/browser/browser.ent            (locale/browser.ent)
+        content/browser/contents.rdf                 (content/contents.rdf)
+        content/browser/browser.js                   (content/browser-2.js)
+        content/browser/pageInfo.js                  (content/pageInfo.js)
+        content/browser/pageInfo.xul                 (content/pageInfo.xul)
+        content/browser/navigator.xul                (content/browser.xul)
+        content/browser/sessionHistoryUI.js          (content/sessionHistoryUI.js)
+        content/browser/navigatorOverlay.xul         (content/navigatorOverlay.xul)
+        content/browser/navExtraOverlay.xul          (content/navExtraOverlay.xul)
+        content/browser/navigator.js                 (content/browser.js)
+        content/browser/navigatorDD.js               (content/navigatorDD.js)
+        content/browser/nsBrowserStatusHandler.js    (content/nsBrowserStatusHandler.js)
+        content/browser/nsBrowserContentListener.js  (content/nsBrowserContentListener.js)
+        content/browser/urlbarBindings.xml           (content/urlbarBindings.xml)
+        content/browser/navigator.css                (content/navigator.css)
+        content/browser/metadata.xul                 (content/metadata.xul)
+        content/browser/metadata.js                  (content/metadata.js)
+        content/browser/personalToolbar.js           (content/personalToolbar.js)
+        content/browser/turboDialog.xul              (content/turboDialog.xul)
+        content/browser/viewsource.js                (content/viewsource.js)
+        content/browser/viewSource.xul               (content/viewSource.xul)
+
+en-US.jar:
+        locale/en-US/browser/contents.rdf            (locale/contents.rdf)
+        locale/en-US/browser/viewSource.dtd          (locale/viewSource.dtd)
+        locale/en-US/browser/pageInfo.dtd            (locale/pageInfo.dtd)
+        locale/en-US/browser/pageInfo.properties     (locale/pageInfo.properties)
+        locale/en-US/browser/navigator.dtd           (locale/navigator.dtd)
+        locale/en-US/browser/navigator.properties    (locale/navigator.properties)
+        locale/en-US/browser/metadata.dtd            (locale/metadata.dtd)
+        locale/en-US/browser/metadata.properties     (locale/metadata.properties)
+        locale/en-US/browser/turboDialog.dtd         (locale/turboDialog.dtd)
+        locale/en-US/browser/turboMenu.properties    (locale/turboMenu.properties)
 
diff --git a/mozilla/browser/base/resources/locale/contents.rdf b/mozilla/browser/base/resources/locale/contents.rdf
index 8fd74a01134..7d2276d6345 100644
--- a/mozilla/browser/base/resources/locale/contents.rdf
+++ b/mozilla/browser/base/resources/locale/contents.rdf
@@ -11,13 +11,13 @@
   <RDF:Description about="urn:mozilla:locale:en-US">
     <chrome:packages>
       <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:navigator"/>
+        <RDF:li resource="urn:mozilla:locale:en-US:browser"/>
       </RDF:Seq>
     </chrome:packages>
   </RDF:Description>
 
   <!-- Version Information.  State that we work only with major version of this
        package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:navigator"
+  <RDF:Description about="urn:mozilla:locale:en-US:browser"
 	chrome:localeVersion="0.9.9"/>
 </RDF:RDF>
diff --git a/mozilla/browser/components/bookmarks/resources/jar.mn b/mozilla/browser/components/bookmarks/resources/jar.mn
index bcd7919fee1..2493e668811 100644
--- a/mozilla/browser/components/bookmarks/resources/jar.mn
+++ b/mozilla/browser/components/bookmarks/resources/jar.mn
@@ -17,31 +17,28 @@
 #
 # Contributor(s): 
 
-comm.jar:
-	content/communicator/bookmarks/addBookmark.xul
-	content/communicator/bookmarks/addBookmark.js
-	content/communicator/bookmarks/bm-props.js
-	content/communicator/bookmarks/bm-props.xul
-	content/communicator/bookmarks/bookmarksDD.js
-	content/communicator/bookmarks/bookmarks.xul
-	content/communicator/bookmarks/bookmarks.js
-	content/communicator/bookmarks/bookmarks.css
-	content/communicator/bookmarks/bookmarks.xml
-	content/communicator/bookmarks/bookmarksTree.js
-	content/communicator/bookmarks/bookmarksOverlay.xul
-	content/communicator/bookmarks/bookmarksOverlay.js
-	content/communicator/bookmarks/bm-panel.xul
-	content/communicator/bookmarks/bookmarksPanel.js
-	content/communicator/bookmarks/findBookmark.js
-	content/communicator/bookmarks/findBookmark.xul
-	content/communicator/bookmarks/pref-bookmarks.xul
-	content/communicator/bookmarks/oTest.xul
+browser.jar:
+	content/browser/bookmarks/addBookmark.xul              (content/addBookmark.xul)
+	content/browser/bookmarks/addBookmark.js               (content/addBookmark.js)
+	content/browser/bookmarks/bm-props.js                  (content/bm-props.js)
+	content/browser/bookmarks/bm-props.xul                 (content/bm-props.xul)
+	content/browser/bookmarks/bookmarksDD.js               (content/bookmarksDD.js)
+	content/browser/bookmarks/bookmarks.xul                (content/bookmarks.xul)
+	content/browser/bookmarks/bookmarks.js                 (content/bookmarks.js)
+	content/browser/bookmarks/bookmarks.css                (content/bookmarks.css)
+	content/browser/bookmarks/bookmarks.xml                (content/bookmarks.xml)
+	content/browser/bookmarks/bookmarksTree.js             (content/bookmarksTree.js)
+	content/browser/bookmarks/bookmarksOverlay.xul         (content/bookmarksOverlay.xul)
+	content/browser/bookmarks/bookmarksOverlay.js          (content/bookmarksOverlay.js)
+	content/browser/bookmarks/bm-panel.xul                 (content/bm-panel.xul)
+	content/browser/bookmarks/bookmarksPanel.js            (content/bookmarksPanel.js)
+	content/browser/bookmarks/findBookmark.js              (content/findBookmark.js)
+	content/browser/bookmarks/findBookmark.xul             (content/findBookmark.xul)
 
 en-US.jar:
-	locale/en-US/communicator/bookmarks/addBookmark.dtd         (locale/en-US/addBookmark.dtd)
-	locale/en-US/communicator/bookmarks/bm-props.dtd            (locale/en-US/bm-props.dtd)
-	locale/en-US/communicator/bookmarks/bookmarks.dtd           (locale/en-US/bookmarks.dtd)
-	locale/en-US/communicator/bookmarks/bookmark.properties     (locale/en-US/bookmark.properties)
-	locale/en-US/communicator/bookmarks/bookmarksOverlay.dtd    (locale/en-US/bookmarksOverlay.dtd)
-	locale/en-US/communicator/bookmarks/findBookmark.dtd	    (locale/en-US/findBookmark.dtd)
-	locale/en-US/communicator/bookmarks/pref-bookmarks.dtd	    (locale/en-US/pref-bookmarks.dtd)
+	locale/en-US/browser/bookmarks/addBookmark.dtd         (locale/addBookmark.dtd)
+	locale/en-US/browser/bookmarks/bm-props.dtd            (locale/bm-props.dtd)
+	locale/en-US/browser/bookmarks/bookmarks.dtd           (locale/bookmarks.dtd)
+	locale/en-US/browser/bookmarks/bookmark.properties     (locale/bookmark.properties)
+	locale/en-US/browser/bookmarks/bookmarksOverlay.dtd    (locale/bookmarksOverlay.dtd)
+	locale/en-US/browser/bookmarks/findBookmark.dtd	      (locale/findBookmark.dtd)
diff --git a/mozilla/browser/components/bookmarks/resources/locale/pref-bookmarks.dtd b/mozilla/browser/components/bookmarks/resources/locale/pref-bookmarks.dtd
deleted file mode 100644
index 9dce68e9460..00000000000
--- a/mozilla/browser/components/bookmarks/resources/locale/pref-bookmarks.dtd
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<!ENTITY  lHeader                       "Bookmarks">
-<!ENTITY  filingBookmarks.label         "Adding Bookmarks">
-<!ENTITY  autoFile.label                "&brandShortName; will ask you to choose a title and folder when adding a new Bookmark.">
-<!ENTITY  enableAutoFile.label          "Automatically set title and destination">
-<!ENTITY  defaultFolder.label           "By default, all new Bookmarks will be added into this folder:">
-<!ENTITY  chooseDefaultFolder.label     "Choose Folder...">
-<!ENTITY  chooseDefaultFolder.accesskey "c">
-<!ENTITY  extendedDataViews.label       "Extended Data Views">
-<!ENTITY  extendedDataExplanation.label "&brandShortName; can display some types of special data (e.g. local file folders and ftp directories) in the bookmarks window or menu as folders, rather than as normal links.">
-<!ENTITY  showExtendedData.label        "Show Extended Data as folders in the Bookmarks window and menu">
-<!ENTITY  showExtendedData.accesskey    "x">
-
diff --git a/mozilla/browser/components/build/nsModule.cpp b/mozilla/browser/components/build/nsModule.cpp
index 8011ad9991f..47e2bc85656 100644
--- a/mozilla/browser/components/build/nsModule.cpp
+++ b/mozilla/browser/components/build/nsModule.cpp
@@ -53,7 +53,6 @@
 #include "nsFontPackageHandler.h"
 #if defined(XP_WIN)
 #include "nsAlertsService.h" 
-#include "nsUrlWidget.h"
 #include "nsWindowsHooks.h"
 #endif // Windows
 #if defined(MOZ_LDAP_XPCOM)
@@ -77,7 +76,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUrlbarHistory)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontPackageHandler)
 #if defined(XP_WIN)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUrlWidget, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsHooks)
 #endif // Windows
 #if defined(MOZ_LDAP_XPCOM)
@@ -185,8 +183,6 @@ static const nsModuleComponentInfo components[] = {
       "@mozilla.org/locale/default-font-package-handler;1",
       nsFontPackageHandlerConstructor },
 #if defined(XP_WIN)
-    { NS_IURLWIDGET_CLASSNAME, NS_IURLWIDGET_CID, NS_IURLWIDGET_CONTRACTID,
-      nsUrlWidgetConstructor },
     { "nsAlertsService", NS_ALERTSSERVICE_CID, NS_ALERTSERVICE_CONTRACTID, nsAlertsServiceConstructor},
     { NS_IWINDOWSHOOKS_CLASSNAME, NS_IWINDOWSHOOKS_CID, NS_IWINDOWSHOOKS_CONTRACTID,
       nsWindowsHooksConstructor },