diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
deleted file mode 100644
index 89349a1db5e..00000000000
--- a/suite/browser/navigator.xul
+++ /dev/null
@@ -1,360 +0,0 @@
-<?xml version="1.0"?> <!-- -*- Mode: HTML -*- --> 
-
-<!-- The contents of this file are subject to the Netscape Public
-License Version 1.1 (the "License"); you may not use this file
-except in compliance with the License. You may obtain a copy of
-the License at http://www.mozilla.org/NPL/
-
-Software distributed under the License is distributed on an "AS
-IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-implied. See the License for the specific language governing
-rights and limitations under the License.
-
-The Original Code is Mozilla Communicator client code, released
-March 31, 1998.
-
-The Initial Developer of the Original Code is Netscape
-Communications Corporation. Portions created by Netscape are
-Copyright (C) 1998-2000 Netscape Communications Corporation. All
-Rights Reserved.
-
-Contributor(s): ______________________________________. -->
-
-
-<?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
-<!-- XXX - the placement of this include could be temporary -->
-<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarksToolbar.css" type="text/css"?> 
-
-<?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
-<?xul-overlay href="chrome://navigator/content/navExtraOverlay.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/contentAreaContextOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/bookmarks/bookmarksOverlay.xul"?>
-
-
-<!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % buildDTD SYSTEM "chrome://global/content/build.dtd" >
-%buildDTD;
-<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
-%navigatorDTD;
-]>
-
-<window id="main-window" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="Startup()" onunload="Shutdown()"
-        contenttitlesetting="true"
-        title="&mainWindow.title;" 
-        titlemodifier="&mainWindow.titlemodifier;" 
-        titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
-        windowtype="navigator:browser" orient="vertical"
-        width="640" height="480"
-        screenX="10" screenY="10"
-        persist="screenX screenY width height sizemode"> 
-
-  <!-- Generic Utility -->
-  <script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsUserSettings.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsClipboard.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  
-  <!-- Content Area -->
-  <script type="application/x-javascript" src="chrome://navigator/content/nsBrowserStatusHandler.js"/>
-  <script type="application/x-javascript" src="chrome://navigator/content/nsBrowserContentListener.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
-  <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://navigator/content/personalToolbar.js"/>
-  
-  <!-- Navigator -->
-  <script type="application/x-javascript" src="chrome://navigator/content/navigator.js"/>
-  <script type="application/x-javascript" src="tooltip.js"/>
-  <script type="application/x-javascript" src="navigatorDD.js"/>
-  <script type="application/x-javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
-
-  <!-- hook for stringbundle overlays -->
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_navigator" src="chrome://navigator/locale/navigator.properties"/>
-    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
-    <stringbundle id="bundle_navigator_region" src="chrome://navigator-region/locale/region.properties"/>
-    <stringbundle id="bundle_brand_region" src="chrome://global-region/locale/region.properties"/>
-    <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
-  </stringbundleset>
-
-<resourcebundle id="resource_bundle_navigator" />
-
-  <commandset id="commands">    
-    <commandset id="globalEditMenuItems"/>
-    <commandset id="selectEditMenuItems"/>
-    <commandset id="undoEditMenuItems"/>
-    <commandset id="clipboardEditMenuItems"/>
-    <!-- <command id="cmd_pageSetup"/> -->
-    <command id="toggleSidebar"/>
-  </commandset>
-    
-  <!-- broadcasters are appended from the overlay -->
-  <broadcasterset id="navBroadcasters"/>
-   
-  <!-- keys are appended from the overlay -->
-  <keyset id="navKeys">
-    <key id="showHideSidebar"/>
-  </keyset>
-  
-  <popupset id="aHTMLTooltipSet">
-    <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);" > 
-      <vbox id="HTML_TOOLTIP_tooltipBox"/>
-    </tooltip>
-    <popup id="backMenu" position="after_start" onpopupshowing="return BrowserBackMenu(event);" oncommand="gotoHistoryIndex(event);"/>
-    <popup id="forwardMenu" position="after_start" onpopupshowing="return BrowserForwardMenu(event);" oncommand="gotoHistoryIndex(event);"/>
-    <popup id="sidebarPopup"/>
-
-    <popupset id="bookmarksPopupset"/>
- 
-    <!-- context menu -->
-    <popupset id="contentAreaContextSet"/>
-    
-    <!-- tooltips -->
-    <popupset id="aTooltipSet"/>
-  </popupset>
-  
-  <script type="application/x-javascript">
-    var gBookmarkPopup = null;
-  </script>
-
-  <toolbox id="navigator-toolbox" class="toolbox-top" deferattached="true">
-    <!-- Menu -->
-    <menubar id="main-menubar" persist="collapsed"/>
-
-    <toolbar class="toolbar-primary chromeclass-toolbar" id="nav-bar" persist="collapsed" 
-             tbalign="stretch">
-      <hbox id="nav-bar-buttons">
-        <menubutton id="back-button" label="&backButton.label;" tooltiptext="&backButton.tooltip;"
-                    oncommand="gotoHistoryIndex(event);" buttonaction="BrowserBack();" context="backMenu"
-                    class="menubutton-dual top" crop="right" tooltip="aTooltip" observes="canGoBack">  
-          <menupopup context="" onpopupshowing="BrowserBackMenu(event);"/>
-        </menubutton>
-        <menubutton id="forward-button" label="&forwardButton.label;" tooltiptext="&forwardButton.tooltip;"
-                    oncommand="gotoHistoryIndex(event);" buttonaction="BrowserForward();" context="forwardMenu"
-                    class="menubutton-dual top" crop="right" tooltip="aTooltip" observes="canGoForward">
-          <menupopup context="" onpopupshowing="BrowserForwardMenu(event);"/>
-        </menubutton>
-
-        <button class="button-toolbar-1 top" id="reload-button" crop="right" oncommand="if (event.shiftKey) BrowserReloadSkipCache(); else BrowserReload();" label="&reloadButton.label;" 
-                tooltip="aTooltip" tooltiptext="&reloadButton.tooltip;"/>
-        <button class="button-toolbar-1 top" id="stop-button" crop="right" observes="canStop" oncommand="BrowserStop();" label="&stopButton.label;" 
-                tooltip="aTooltip" tooltiptext="&stopButton.tooltip;"/>
-      </hbox>
-                
-      <hbox id="nav-bar-inner" flex="1">
-        <hbox id="urlbar-group" class="box-toolbar-group chromeclass-location" flex="1">
-          <hbox flex="1" id="urlbar-container">
-            <textbox id="urlbar" class="plain" flex="1"
-                     type="autocomplete" searchSessions="history" 
-                     timeout="50" maxrows="6" alwaysOpenPopup="true"
-                     defaultSearchEngine="true" tabScrolling="true"
-                     showCommentColumn="true"
-                     tooltip="aTooltip" tooltiptext="&locationBar.tooltip;"
-                     ontextcommand="return handleURLBarCommand(userAction);"
-                     ontextrevert="return handleURLBarRevert();"
-                     onfocus="URLBarFocusHandler(event);"
-                     onblur="URLBarBlurHandler(event);">
-              <image id="page-proxy-button" allowevents="true"
-                     ondraggesture="PageProxyDragGesture(event);"/>
-              <menupopup id="ubhist-popup" class="autocomplete-history-popup"
-                         popupalign="topleft" popupanchor="bottomleft"
-                         onpopupshowing="createUBHistoryMenu(event.target);" 
-                         oncommand="executeUrlBarHistoryCommand(event.target);"/>
-            </textbox>
-          </hbox>
-        </hbox>
-
-        <button class="button-toolbar-3 chromeclass-location" id="go-button" persist="hidden" hidden="true" label="&goButton.label;"
-                oncommand="addToUrlbarHistory(); BrowserLoadURL();" ondragover="nsDragAndDrop.dragOver(event, goButtonObserver);"
-                ondragdrop="nsDragAndDrop.drop(event, goButtonObserver);" ondragexit="nsDragAndDrop.dragExit(event, goButtonObserver);"
-                tooltip="aTooltip" tooltiptext="&goButton.tooltip;"/> 
-
-        <button class="button-toolbar-3 chromeclass-location" persist="hidden" 
-                id="search-button" label="&searchButton.label;"  ondragover="nsDragAndDrop.dragOver(event, searchButtonObserver);"
-                ondragdrop="nsDragAndDrop.drop(event, searchButtonObserver);" ondragexit="nsDragAndDrop.dragExit(event, searchButtonObserver);"
-                oncommand="OpenSearch('internet',false, document.getElementById('urlbar').value);" 
-                tooltip="aTooltip" tooltiptext="&searchButton.tooltip;"/> 
-      </hbox>
-
-      <menubutton class="menubutton-dual top" id="print-button" persist="hidden" label="&printButton.label;" 
-                  crop="right" buttonaction="BrowserPrint()" tooltip="aTooltip" tooltiptext="&printButton.tooltip;">  
-        <menupopup id="printMenu" popupalign="topright" popupanchor="bottomright">
-          <menuitem label="&printCmd.label;" accesskey="&printCmd.accesskey;" oncommand="BrowserPrint()" default="true"/>
-        </menupopup>
-      </menubutton>
-
-      <hbox id="throbber-box" align="center">
-        <button id="navigator-throbber" oncommand="goClickThrobber('browser.throbber.url')" tooltip="aTooltip" tooltiptext="&throbber.tooltip;"/>
-      </hbox>
-    </toolbar>
-  
-    <toolbar id="PersonalToolbar" class="chromeclass-directories" persist="collapsed" dragdroparea="innermostBox"
-             ondragover="nsDragAndDrop.dragOver(event, personalToolbarObserver);"
-             ondragdrop="nsDragAndDrop.drop(event, personalToolbarObserver);"
-             ondraggesture="nsDragAndDrop.startDrag(event, personalToolbarObserver);"
-             ondragexit="nsDragAndDrop.dragExit(event, personalToolbarObserver);"
-             tbalign="stretch">
-
-      <button class="button-toolbar bookmark-item" id="home-button" label="&homeButton.label;"
-              tooltip="aTooltip" persist="hidden"
-              ondraggesture="nsDragAndDrop.startDrag(event, homeButtonObserver);"
-              ondragover="nsDragAndDrop.dragOver(event, homeButtonObserver);"
-              ondragdrop="nsDragAndDrop.drop(event, homeButtonObserver);"
-              ondragexit="nsDragAndDrop.dragExit(event, homeButtonObserver);"
-              oncommand="BrowserHome(); event.preventBubble();"/>
-  
-      <toolbarseparator/>
- 
-      <!-- "Bookmarks" button on personal toolbar -->                           
-      <menubutton class="button-toolbar bookmark-item" id="bookmarks-button"   
-                  persist="hidden" label="&bookmarksButton.label;" hidden="false"
-                  datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch"
-                  ref="NC:BookmarksRoot" container="true" flags="dont-test-empty"
-                  oncommand="OpenBookmarkURL(event.target,document.getElementById('BookmarksMenu').database)" 
-                  ondragover="nsDragAndDrop.dragOver(event, bookmarksButtonObserver);"
-                  template="bookmarksMenuTemplate">
-        <menupopup onpopuphiding="gDidOpen = false;" ondragdrop="nsDragAndDrop.drop(event, menuDNDObserver); event.preventBubble();"
-                   ondragexit="nsDragAndDrop.dragExit(event, menuDNDObserver); event.preventBubble();"
-                   ondragover="nsDragAndDrop.dragOver(event, menuDNDObserver); event.preventBubble();">
-          <menuitem accesskey="&addCurPageCmd.accesskey;" key="addBookmarkKb" observes="Browser:AddBookmark"
-                    ondragover="event.preventBubble(); return false;"/>
-          <menuitem accesskey="&addCurPageAsCmd.accesskey;" key="addBookmarkAsKb" observes="Browser:AddBookmarkAs"
-                    ondragover="event.preventBubble(); return false;"/>
-          <menuseparator ondragover="event.preventBubble(); return false;"/>
-          <menuitem accesskey="&manBookmarksCmd.accesskey;" key="manBookmarkKb" observes="Browser:ManageBookmark"
-                    ondragover="event.preventBubble(); return false;"/>
-          <menuseparator/>
-        </menupopup>
-      </menubutton>
-
-      <!-- Personal toolbar items -->
-      <hbox id="innermostBox" flex="1" style="min-width: 1px;" context="bmContext" 
-           datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch"
-           ref="NC:PersonalToolbarFolder" flags="dont-test-empty"
-           type="http://home.netscape.com/NC-rdf#Folder"
-           oncommand="OpenBookmarkURL(event.target, document.getElementById('innermostBox').database)">
-        <template>
-          <rule parent="hbox" rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
-            <toolbarseparator uri="rdf:*"
-                              type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
-          </rule>
-
-          <!-- yes, the type attribute is necessary otherwise all leaves are 
-               treated as containers for some reason -->
-          <rule parent="hbox" iscontainer="true" isempty="true"
-                rdf:type="http://home.netscape.com/NC-rdf#Folder">
-            <menubutton class="button-toolbar bookmark-item" uri="rdf:*" editable="true" 
-                        type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
-                        label="rdf:http://home.netscape.com/NC-rdf#Name"
-                        ondraggesture="if (!event.altKey) { event.preventBubble(); return false; }">
-              <menupopup>
-                <menuitem label="&emptyItem.label;" disabled="true"/>
-              </menupopup>
-            </menubutton>
-          </rule>
-
-          <rule parent="hbox" iscontainer="true">
-            <menubutton class="button-toolbar bookmark-item" uri="rdf:*" editable="true" 
-                        type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
-                        label="rdf:http://home.netscape.com/NC-rdf#Name"
-                        ondraggesture="if (!event.altKey) { event.preventBubble(); return false; }">
-              <menupopup ondraggesture="nsDragAndDrop.startDrag(event, personalToolbarObserver);"/>
-            </menubutton>
-          </rule>
-
-          <rule parent="hbox">
-            <button class="button-toolbar bookmark-item" uri="rdf:*" editable="true" 
-                    status="rdf:http://home.netscape.com/WEB-rdf#status"
-                    tooltip="aTooltip" tooltiptext="rdf:http://home.netscape.com/NC-rdf#URL"
-                    type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
-                    label="rdf:http://home.netscape.com/NC-rdf#Name" crop="right"/>
-          </rule>
-
-          <rule iscontainer="true" isempty="true"
-                rdf:type="http://home.netscape.com/NC-rdf#Folder">
-            <menupopup>
-              <menu class="menu-iconic bookmark-item" uri="rdf:*" 
-                    type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
-                    label="rdf:http://home.netscape.com/NC-rdf#Name">
-                <menupopup>
-                  <menuitem label="&emptyItem.label;" disabled="true"
-                            ondraggesture="event.preventBubble(); return false;"/>
-                </menupopup>
-              </menu>
-            </menupopup>
-          </rule>
-
-          <rule iscontainer="true">
-            <menupopup>
-              <menu class="menu-iconic bookmark-item" uri="rdf:*" 
-                    type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
-                    label="rdf:http://home.netscape.com/NC-rdf#Name">
-                <menupopup/>
-              </menu>
-            </menupopup>
-          </rule>
-
-          <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
-            <menupopup>
-              <menuseparator uri="rdf:*"
-                             type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
-            </menupopup>
-          </rule>
-          <rule>
-            <menupopup>
-              <menuitem class="menuitem-iconic bookmark-item" uri="rdf:*"
-                        status="rdf:http://home.netscape.com/WEB-rdf#status"
-                        type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
-                        label="rdf:http://home.netscape.com/NC-rdf#Name"/>
-            </menupopup>
-          </rule>
-        </template>
-      </hbox>
-    </toolbar>
-
-  </toolbox>
-    
-  <hbox flex="1">
-    <vbox id="sidebar-box" class="chromeclass-extrachrome"/>
-    <splitter id="sidebar-splitter" class="chromeclass-extrachrome" />
-  
-    <vbox id="appcontent" flex="1"
-         ondragover="nsDragAndDrop.dragOver(event, contentAreaDNDObserver);"
-         ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
-
-      <!-- this box is temporary, pending XBLified <browser> -->
-      <hbox id="browser" flex="1">
-        <browser id="content" type="content-primary" src="about:blank"
-                 flex="1" tooltip="aHTMLTooltip"
-                 context="contentAreaContextMenu"
-                 onclick="return contentAreaClick(event);"
-                 ondraggesture="nsDragAndDrop.startDrag(event, contentAreaDNDObserver);"/>
-      </hbox>
-    </vbox>  
-  </hbox>
-
-  <statusbar id="status-bar" class="chromeclass-status"
-             ondragover="nsDragAndDrop.dragOver(event, contentAreaDNDObserver);"
-             ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
-        <hbox id="component-bar"/>
-        <statusbarpanel id="statusbar-display" label="&statusText.label;" crop="right" flex="1"/>
-        <progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0"/>
-        <statusbarpanel class="statusbarpanel-icononly" id="offline-status"/>
-        <statusbarpanel class="statusbarpanel-icononly" id="security-button"/>
-  </statusbar> 
-
-</window>