Index: desktop-directories/System-Settings.directory.in
===================================================================
--- desktop-directories/System-Settings.directory.in	(revision 607)
+++ desktop-directories/System-Settings.directory.in	(working copy)
@@ -4,3 +4,4 @@
 _Comment=Change systemwide settings (affects all users)
 Icon=gnome-system
 Encoding=UTF-8
+NoDisplay=true
Index: desktop-directories/Preferences.directory.in
===================================================================
--- desktop-directories/Preferences.directory.in	(revision 607)
+++ desktop-directories/Preferences.directory.in	(working copy)
@@ -4,3 +4,4 @@
 Icon=gnome-settings
 Type=Directory
 Encoding=UTF-8
+NoDisplay=true
Index: layout/settings.menu
===================================================================
--- layout/settings.menu	(revision 607)
+++ layout/settings.menu	(working copy)
@@ -6,6 +6,9 @@
   <Name>Desktop</Name>
   <Directory>Desktop.directory</Directory>
 
+  <!-- Ensure we read from the old capplets .desktop location -->
+  <LegacyDir>/usr/share/control-center-2.0/capplets</LegacyDir>
+
   <!-- Read standard .directory and .desktop file locations -->
   <DefaultAppDirs/>
   <DefaultDirectoryDirs/>
@@ -18,4 +21,22 @@
     <Filename>gnomecc.desktop</Filename>
   </Include>
 
-</Menu> <!-- End Applications -->
+  <!-- Merge in these other files as submenus -->
+  <Menu>
+    <Name>Preferences</Name>
+    <MergeFile>preferences.menu</MergeFile>
+  </Menu>
+  
+  <!-- System Settings -->
+  <Menu>
+    <Name>Administration</Name>
+    <Directory>System-Settings.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>System</Category>
+      </And>
+    </Include>
+  </Menu>     <!-- End System Settings -->
+  
+</Menu> <!-- End Settings -->
Index: layout/preferences.menu
===================================================================
--- layout/preferences.menu	(revision 607)
+++ layout/preferences.menu	(working copy)
@@ -12,28 +12,14 @@
   <!-- Read in overrides and child menus from preferences-merged/ -->
   <DefaultMergeDirs/>
 
-  <!-- Sort the control center categories -->
-  <Layout>
-    <Menuname>Personal</Menuname>
-    <Menuname>Look and Feel</Menuname>
-    <Menuname>Internet and Network</Menuname>
-    <Menuname>Hardware</Menuname>
-    <Menuname>System</Menuname>
-    <Merge type="all" />
-  </Layout>
-  
   <!-- Stuff in the toplevel -->
   <Include>
     <And>
       <Category>Settings</Category>
       <Not>
         <Or>
-          <Category>X-GNOME-PersonalSettings</Category>
-          <Category>DesktopSettings</Category>
-          <Category>X-GNOME-NetworkSettings</Category>
-          <Category>HardwareSettings</Category>
-          <Category>X-GNOME-SystemSettings</Category>
           <Category>System</Category>
+          <Category>Accessibility</Category>
         </Or>
       </Not>
     </And>
@@ -44,77 +30,16 @@
     <Filename>gnomecc.desktop</Filename>
   </Exclude>
 
-  <!-- Personal submenu -->
+  <!-- Accessibility -->
   <Menu>
-    <Name>Personal</Name>
-    <Directory>Personal.directory</Directory>
+    <Name>Accessibility</Name>
+    <Directory>Settings-Accessibility.directory</Directory>
     <Include>
       <And>
         <Category>Settings</Category>
-        <Category>X-GNOME-PersonalSettings</Category>
+        <Category>Accessibility</Category>
       </And>
     </Include>
-  </Menu> <!-- End Personal -->
+  </Menu>
 
-  <!-- Look and Feel submenu -->
-  <Menu>
-    <Name>Look and Feel</Name>
-    <Directory>LookAndFeel.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>DesktopSettings</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Look and Feel -->
-
-  <!-- Internet and Network submenu -->
-  <Menu>
-    <Name>Internet and Network</Name>
-    <Directory>InternetAndNetwork.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>X-GNOME-NetworkSettings</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Internet and Network -->
-  
-  <!-- Hardware submenu -->
-  <Menu>
-    <Name>Hardware</Name>
-    <Directory>Hardware.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>HardwareSettings</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Hardware -->
-
-  <!-- System submenu -->
-  <Menu>
-    <Name>System</Name>
-    <Directory>System.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Or>
-          <Category>X-GNOME-SystemSettings</Category>
-          <And>
-            <Category>System</Category>
-            <Not>
-              <Or>
-                <Category>X-GNOME-PersonalSettings</Category>
-                <Category>DesktopSettings</Category>
-                <Category>HardwareSettings</Category>
-                <Category>X-GNOME-NetworkSettings</Category> 
-              </Or>
-            </Not>
-          </And>
-        </Or>
-      </And>
-    </Include>
-  </Menu> <!-- End System -->
-
 </Menu>     <!-- End Prefs -->
