diff --git a/dev/oophm/overlay/com/google/gwt/dev/BootStrapPlatform.java b/dev/core/src/com/google/gwt/dev/BootStrapPlatform.java
similarity index 100%
rename from dev/oophm/overlay/com/google/gwt/dev/BootStrapPlatform.java
rename to dev/core/src/com/google/gwt/dev/BootStrapPlatform.java
diff --git a/dev/oophm/overlay/com/google/gwt/dev/DevMode.java b/dev/core/src/com/google/gwt/dev/DevMode.java
similarity index 100%
rename from dev/oophm/overlay/com/google/gwt/dev/DevMode.java
rename to dev/core/src/com/google/gwt/dev/DevMode.java
diff --git a/dev/oophm/src/com/google/gwt/dev/DevelModeTabKey.java b/dev/core/src/com/google/gwt/dev/DevelModeTabKey.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/DevelModeTabKey.java
rename to dev/core/src/com/google/gwt/dev/DevelModeTabKey.java
diff --git a/dev/oophm/src/com/google/gwt/dev/Disconnectable.java b/dev/core/src/com/google/gwt/dev/Disconnectable.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/Disconnectable.java
rename to dev/core/src/com/google/gwt/dev/Disconnectable.java
diff --git a/dev/oophm/overlay/com/google/gwt/dev/GWTShell.java b/dev/core/src/com/google/gwt/dev/GWTShell.java
similarity index 100%
rename from dev/oophm/overlay/com/google/gwt/dev/GWTShell.java
rename to dev/core/src/com/google/gwt/dev/GWTShell.java
diff --git a/dev/oophm/src/com/google/gwt/dev/ModulePanel.java b/dev/core/src/com/google/gwt/dev/ModulePanel.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/ModulePanel.java
rename to dev/core/src/com/google/gwt/dev/ModulePanel.java
diff --git a/dev/oophm/src/com/google/gwt/dev/ModuleTabPanel.java b/dev/core/src/com/google/gwt/dev/ModuleTabPanel.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/ModuleTabPanel.java
rename to dev/core/src/com/google/gwt/dev/ModuleTabPanel.java
diff --git a/dev/oophm/src/com/google/gwt/dev/SessionModule.java b/dev/core/src/com/google/gwt/dev/SessionModule.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/SessionModule.java
rename to dev/core/src/com/google/gwt/dev/SessionModule.java
diff --git a/dev/oophm/src/com/google/gwt/dev/WebServerPanel.java b/dev/core/src/com/google/gwt/dev/WebServerPanel.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/WebServerPanel.java
rename to dev/core/src/com/google/gwt/dev/WebServerPanel.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannel.java b/dev/core/src/com/google/gwt/dev/shell/BrowserChannel.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/BrowserChannel.java
rename to dev/core/src/com/google/gwt/dev/shell/BrowserChannel.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelClient.java b/dev/core/src/com/google/gwt/dev/shell/BrowserChannelClient.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelClient.java
rename to dev/core/src/com/google/gwt/dev/shell/BrowserChannelClient.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelException.java b/dev/core/src/com/google/gwt/dev/shell/BrowserChannelException.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelException.java
rename to dev/core/src/com/google/gwt/dev/shell/BrowserChannelException.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelServer.java b/dev/core/src/com/google/gwt/dev/shell/BrowserChannelServer.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelServer.java
rename to dev/core/src/com/google/gwt/dev/shell/BrowserChannelServer.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/BrowserListener.java b/dev/core/src/com/google/gwt/dev/shell/BrowserListener.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/BrowserListener.java
rename to dev/core/src/com/google/gwt/dev/shell/BrowserListener.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/CloseButton.java b/dev/core/src/com/google/gwt/dev/shell/CloseButton.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/CloseButton.java
rename to dev/core/src/com/google/gwt/dev/shell/CloseButton.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/HostedModePluginObject.java b/dev/core/src/com/google/gwt/dev/shell/HostedModePluginObject.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/HostedModePluginObject.java
rename to dev/core/src/com/google/gwt/dev/shell/HostedModePluginObject.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java b/dev/core/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java
rename to dev/core/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/Icons.java b/dev/core/src/com/google/gwt/dev/shell/Icons.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/Icons.java
rename to dev/core/src/com/google/gwt/dev/shell/Icons.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/JavaObject.java b/dev/core/src/com/google/gwt/dev/shell/JavaObject.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/JavaObject.java
rename to dev/core/src/com/google/gwt/dev/shell/JavaObject.java
diff --git a/dev/oophm/overlay/com/google/gwt/dev/shell/JsValue.java b/dev/core/src/com/google/gwt/dev/shell/JsValue.java
similarity index 100%
rename from dev/oophm/overlay/com/google/gwt/dev/shell/JsValue.java
rename to dev/core/src/com/google/gwt/dev/shell/JsValue.java
diff --git a/dev/oophm/overlay/com/google/gwt/dev/shell/JsValueGlue.java b/dev/core/src/com/google/gwt/dev/shell/JsValueGlue.java
similarity index 100%
rename from dev/oophm/overlay/com/google/gwt/dev/shell/JsValueGlue.java
rename to dev/core/src/com/google/gwt/dev/shell/JsValueGlue.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/JsValueOOPHM.java b/dev/core/src/com/google/gwt/dev/shell/JsValueOOPHM.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/JsValueOOPHM.java
rename to dev/core/src/com/google/gwt/dev/shell/JsValueOOPHM.java
diff --git a/dev/oophm/overlay/com/google/gwt/dev/shell/Jsni.java b/dev/core/src/com/google/gwt/dev/shell/Jsni.java
similarity index 100%
rename from dev/oophm/overlay/com/google/gwt/dev/shell/Jsni.java
rename to dev/core/src/com/google/gwt/dev/shell/Jsni.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/MethodDispatch.java b/dev/core/src/com/google/gwt/dev/shell/MethodDispatch.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/MethodDispatch.java
rename to dev/core/src/com/google/gwt/dev/shell/MethodDispatch.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/ModuleSpaceOOPHM.java b/dev/core/src/com/google/gwt/dev/shell/ModuleSpaceOOPHM.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/ModuleSpaceOOPHM.java
rename to dev/core/src/com/google/gwt/dev/shell/ModuleSpaceOOPHM.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/OophmSessionHandler.java b/dev/core/src/com/google/gwt/dev/shell/OophmSessionHandler.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/OophmSessionHandler.java
rename to dev/core/src/com/google/gwt/dev/shell/OophmSessionHandler.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/RemoteObjectTable.java b/dev/core/src/com/google/gwt/dev/shell/RemoteObjectTable.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/RemoteObjectTable.java
rename to dev/core/src/com/google/gwt/dev/shell/RemoteObjectTable.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/ServerMethods.java b/dev/core/src/com/google/gwt/dev/shell/ServerMethods.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/ServerMethods.java
rename to dev/core/src/com/google/gwt/dev/shell/ServerMethods.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/ServerObjectsTable.java b/dev/core/src/com/google/gwt/dev/shell/ServerObjectsTable.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/ServerObjectsTable.java
rename to dev/core/src/com/google/gwt/dev/shell/ServerObjectsTable.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/SessionData.java b/dev/core/src/com/google/gwt/dev/shell/SessionData.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/SessionData.java
rename to dev/core/src/com/google/gwt/dev/shell/SessionData.java
diff --git a/dev/oophm/overlay/com/google/gwt/dev/shell/ShellMainWindow.java b/dev/core/src/com/google/gwt/dev/shell/ShellMainWindow.java
similarity index 100%
rename from dev/oophm/overlay/com/google/gwt/dev/shell/ShellMainWindow.java
rename to dev/core/src/com/google/gwt/dev/shell/ShellMainWindow.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/close.png b/dev/core/src/com/google/gwt/dev/shell/close.png
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/close.png
rename to dev/core/src/com/google/gwt/dev/shell/close.png
Binary files differ
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java b/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
rename to dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/log/SwingTreeLogger.java b/dev/core/src/com/google/gwt/dev/shell/log/SwingTreeLogger.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/log/SwingTreeLogger.java
rename to dev/core/src/com/google/gwt/dev/shell/log/SwingTreeLogger.java
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/log/icon-close.png b/dev/core/src/com/google/gwt/dev/shell/log/icon-close.png
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/shell/log/icon-close.png
rename to dev/core/src/com/google/gwt/dev/shell/log/icon-close.png
Binary files differ
diff --git a/dev/oophm/src/com/google/gwt/dev/util/BrowserInfo.java b/dev/core/src/com/google/gwt/dev/util/BrowserInfo.java
similarity index 100%
rename from dev/oophm/src/com/google/gwt/dev/util/BrowserInfo.java
rename to dev/core/src/com/google/gwt/dev/util/BrowserInfo.java
diff --git a/dev/oophm/test/com/google/gwt/dev/DevelModeTabKeyTest.java b/dev/core/test/com/google/gwt/dev/DevelModeTabKeyTest.java
similarity index 100%
rename from dev/oophm/test/com/google/gwt/dev/DevelModeTabKeyTest.java
rename to dev/core/test/com/google/gwt/dev/DevelModeTabKeyTest.java
diff --git a/dev/oophm/test/com/google/gwt/dev/SessionModuleTest.java b/dev/core/test/com/google/gwt/dev/SessionModuleTest.java
similarity index 100%
rename from dev/oophm/test/com/google/gwt/dev/SessionModuleTest.java
rename to dev/core/test/com/google/gwt/dev/SessionModuleTest.java
diff --git a/dev/oophm/test/com/google/gwt/dev/shell/BrowserChannelTest.java b/dev/core/test/com/google/gwt/dev/shell/BrowserChannelTest.java
similarity index 100%
rename from dev/oophm/test/com/google/gwt/dev/shell/BrowserChannelTest.java
rename to dev/core/test/com/google/gwt/dev/shell/BrowserChannelTest.java
diff --git a/dev/oophm/test/com/google/gwt/dev/shell/RemoteObjectTableTest.java b/dev/core/test/com/google/gwt/dev/shell/RemoteObjectTableTest.java
similarity index 100%
rename from dev/oophm/test/com/google/gwt/dev/shell/RemoteObjectTableTest.java
rename to dev/core/test/com/google/gwt/dev/shell/RemoteObjectTableTest.java