diff --git a/IPython/html/notebook/README.md b/IPython/html/README.md
similarity index 100%
rename from IPython/html/notebook/README.md
rename to IPython/html/README.md
diff --git a/IPython/html/__init__.py b/IPython/html/__init__.py
index e69de29..3eff790 100644
--- a/IPython/html/__init__.py
+++ b/IPython/html/__init__.py
@@ -0,0 +1,7 @@
+"""The IPython HTML Notebook"""
+
+import os
+# Packagers: modify this line if you store the notebook static files elsewhere
+DEFAULT_STATIC_FILES_PATH = os.path.join(os.path.dirname(__file__), "static")
+
+del os
diff --git a/IPython/html/notebook/auth/__init__.py b/IPython/html/auth/__init__.py
similarity index 100%
rename from IPython/html/notebook/auth/__init__.py
rename to IPython/html/auth/__init__.py
diff --git a/IPython/html/notebook/auth/login.py b/IPython/html/auth/login.py
similarity index 100%
rename from IPython/html/notebook/auth/login.py
rename to IPython/html/auth/login.py
diff --git a/IPython/html/notebook/auth/logout.py b/IPython/html/auth/logout.py
similarity index 100%
rename from IPython/html/notebook/auth/logout.py
rename to IPython/html/auth/logout.py
diff --git a/IPython/html/notebook/base/__init__.py b/IPython/html/base/__init__.py
similarity index 100%
rename from IPython/html/notebook/base/__init__.py
rename to IPython/html/base/__init__.py
diff --git a/IPython/html/notebook/base/handlers.py b/IPython/html/base/handlers.py
similarity index 100%
rename from IPython/html/notebook/base/handlers.py
rename to IPython/html/base/handlers.py
diff --git a/IPython/html/notebook/base/zmqhandlers.py b/IPython/html/base/zmqhandlers.py
similarity index 100%
rename from IPython/html/notebook/base/zmqhandlers.py
rename to IPython/html/base/zmqhandlers.py
diff --git a/IPython/html/notebook/fabfile.py b/IPython/html/fabfile.py
similarity index 100%
rename from IPython/html/notebook/fabfile.py
rename to IPython/html/fabfile.py
diff --git a/IPython/html/notebook/__init__.py b/IPython/html/notebook/__init__.py
index 3eff790..e69de29 100644
--- a/IPython/html/notebook/__init__.py
+++ b/IPython/html/notebook/__init__.py
@@ -1,7 +0,0 @@
-"""The IPython HTML Notebook"""
-
-import os
-# Packagers: modify this line if you store the notebook static files elsewhere
-DEFAULT_STATIC_FILES_PATH = os.path.join(os.path.dirname(__file__), "static")
-
-del os
diff --git a/IPython/html/notebook/notebook/handlers.py b/IPython/html/notebook/handlers.py
similarity index 100%
rename from IPython/html/notebook/notebook/handlers.py
rename to IPython/html/notebook/handlers.py
diff --git a/IPython/html/notebook/tree/__init__.py b/IPython/html/notebook/tree/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/IPython/html/notebook/tree/__init__.py
+++ /dev/null
diff --git a/IPython/html/notebook/notebookapp.py b/IPython/html/notebookapp.py
similarity index 100%
rename from IPython/html/notebook/notebookapp.py
rename to IPython/html/notebookapp.py
diff --git a/IPython/html/notebook/notebook/__init__.py b/IPython/html/services/__init__.py
similarity index 100%
rename from IPython/html/notebook/notebook/__init__.py
rename to IPython/html/services/__init__.py
diff --git a/IPython/html/notebook/services/__init__.py b/IPython/html/services/clusters/__init__.py
similarity index 100%
rename from IPython/html/notebook/services/__init__.py
rename to IPython/html/services/clusters/__init__.py
diff --git a/IPython/html/notebook/services/clusters/clustermanager.py b/IPython/html/services/clusters/clustermanager.py
similarity index 100%
rename from IPython/html/notebook/services/clusters/clustermanager.py
rename to IPython/html/services/clusters/clustermanager.py
diff --git a/IPython/html/notebook/services/clusters/handlers.py b/IPython/html/services/clusters/handlers.py
similarity index 100%
rename from IPython/html/notebook/services/clusters/handlers.py
rename to IPython/html/services/clusters/handlers.py
diff --git a/IPython/html/notebook/services/clusters/__init__.py b/IPython/html/services/kernels/__init__.py
similarity index 100%
rename from IPython/html/notebook/services/clusters/__init__.py
rename to IPython/html/services/kernels/__init__.py
diff --git a/IPython/html/notebook/services/kernels/handlers.py b/IPython/html/services/kernels/handlers.py
similarity index 100%
rename from IPython/html/notebook/services/kernels/handlers.py
rename to IPython/html/services/kernels/handlers.py
diff --git a/IPython/html/notebook/services/kernels/kernelmanager.py b/IPython/html/services/kernels/kernelmanager.py
similarity index 100%
rename from IPython/html/notebook/services/kernels/kernelmanager.py
rename to IPython/html/services/kernels/kernelmanager.py
diff --git a/IPython/html/notebook/services/kernels/__init__.py b/IPython/html/services/notebooks/__init__.py
similarity index 100%
rename from IPython/html/notebook/services/kernels/__init__.py
rename to IPython/html/services/notebooks/__init__.py
diff --git a/IPython/html/notebook/services/notebooks/azurenbmanager.py b/IPython/html/services/notebooks/azurenbmanager.py
similarity index 100%
rename from IPython/html/notebook/services/notebooks/azurenbmanager.py
rename to IPython/html/services/notebooks/azurenbmanager.py
diff --git a/IPython/html/notebook/services/notebooks/filenbmanager.py b/IPython/html/services/notebooks/filenbmanager.py
similarity index 100%
rename from IPython/html/notebook/services/notebooks/filenbmanager.py
rename to IPython/html/services/notebooks/filenbmanager.py
diff --git a/IPython/html/notebook/services/notebooks/handlers.py b/IPython/html/services/notebooks/handlers.py
similarity index 100%
rename from IPython/html/notebook/services/notebooks/handlers.py
rename to IPython/html/services/notebooks/handlers.py
diff --git a/IPython/html/notebook/services/notebooks/nbmanager.py b/IPython/html/services/notebooks/nbmanager.py
similarity index 100%
rename from IPython/html/notebook/services/notebooks/nbmanager.py
rename to IPython/html/services/notebooks/nbmanager.py
diff --git a/IPython/html/notebook/services/notebooks/__init__.py b/IPython/html/services/notebooks/tests/__init__.py
similarity index 100%
rename from IPython/html/notebook/services/notebooks/__init__.py
rename to IPython/html/services/notebooks/tests/__init__.py
diff --git a/IPython/html/notebook/services/notebooks/tests/test_nbmanager.py b/IPython/html/services/notebooks/tests/test_nbmanager.py
similarity index 100%
rename from IPython/html/notebook/services/notebooks/tests/test_nbmanager.py
rename to IPython/html/services/notebooks/tests/test_nbmanager.py
diff --git a/IPython/html/notebook/static/auth/css/override.css b/IPython/html/static/auth/css/override.css
similarity index 100%
rename from IPython/html/notebook/static/auth/css/override.css
rename to IPython/html/static/auth/css/override.css
diff --git a/IPython/html/notebook/static/auth/js/loginmain.js b/IPython/html/static/auth/js/loginmain.js
similarity index 100%
rename from IPython/html/notebook/static/auth/js/loginmain.js
rename to IPython/html/static/auth/js/loginmain.js
diff --git a/IPython/html/notebook/static/auth/js/loginwidget.js b/IPython/html/static/auth/js/loginwidget.js
similarity index 100%
rename from IPython/html/notebook/static/auth/js/loginwidget.js
rename to IPython/html/static/auth/js/loginwidget.js
diff --git a/IPython/html/notebook/static/auth/js/logoutmain.js b/IPython/html/static/auth/js/logoutmain.js
similarity index 100%
rename from IPython/html/notebook/static/auth/js/logoutmain.js
rename to IPython/html/static/auth/js/logoutmain.js
diff --git a/IPython/html/notebook/static/auth/less/login.less b/IPython/html/static/auth/less/login.less
similarity index 100%
rename from IPython/html/notebook/static/auth/less/login.less
rename to IPython/html/static/auth/less/login.less
diff --git a/IPython/html/notebook/static/auth/less/logout.less b/IPython/html/static/auth/less/logout.less
similarity index 100%
rename from IPython/html/notebook/static/auth/less/logout.less
rename to IPython/html/static/auth/less/logout.less
diff --git a/IPython/html/notebook/static/auth/less/style.less b/IPython/html/static/auth/less/style.less
similarity index 100%
rename from IPython/html/notebook/static/auth/less/style.less
rename to IPython/html/static/auth/less/style.less
diff --git a/IPython/html/notebook/static/base/css/boilerplate.css b/IPython/html/static/base/css/boilerplate.css
similarity index 100%
rename from IPython/html/notebook/static/base/css/boilerplate.css
rename to IPython/html/static/base/css/boilerplate.css
diff --git a/IPython/html/notebook/static/base/images/favicon.ico b/IPython/html/static/base/images/favicon.ico
similarity index 100%
rename from IPython/html/notebook/static/base/images/favicon.ico
rename to IPython/html/static/base/images/favicon.ico
Binary files a/IPython/html/notebook/static/base/images/favicon.ico and b/IPython/html/static/base/images/favicon.ico differ
diff --git a/IPython/html/notebook/static/base/images/ipynblogo.png b/IPython/html/static/base/images/ipynblogo.png
similarity index 100%
rename from IPython/html/notebook/static/base/images/ipynblogo.png
rename to IPython/html/static/base/images/ipynblogo.png
Binary files a/IPython/html/notebook/static/base/images/ipynblogo.png and b/IPython/html/static/base/images/ipynblogo.png differ
diff --git a/IPython/html/notebook/static/base/images/ipynblogo.svg b/IPython/html/static/base/images/ipynblogo.svg
similarity index 100%
rename from IPython/html/notebook/static/base/images/ipynblogo.svg
rename to IPython/html/static/base/images/ipynblogo.svg
diff --git a/IPython/frontend/html/notebook/static/base/js/dialog.js b/IPython/html/static/base/js/dialog.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/base/js/dialog.js
rename to IPython/html/static/base/js/dialog.js
diff --git a/IPython/html/notebook/static/base/js/events.js b/IPython/html/static/base/js/events.js
similarity index 100%
rename from IPython/html/notebook/static/base/js/events.js
rename to IPython/html/static/base/js/events.js
diff --git a/IPython/html/notebook/static/base/js/namespace.js b/IPython/html/static/base/js/namespace.js
similarity index 100%
rename from IPython/html/notebook/static/base/js/namespace.js
rename to IPython/html/static/base/js/namespace.js
diff --git a/IPython/html/notebook/static/base/js/page.js b/IPython/html/static/base/js/page.js
similarity index 100%
rename from IPython/html/notebook/static/base/js/page.js
rename to IPython/html/static/base/js/page.js
diff --git a/IPython/html/notebook/static/base/js/pagemain.js b/IPython/html/static/base/js/pagemain.js
similarity index 100%
rename from IPython/html/notebook/static/base/js/pagemain.js
rename to IPython/html/static/base/js/pagemain.js
diff --git a/IPython/html/notebook/static/base/js/utils.js b/IPython/html/static/base/js/utils.js
similarity index 100%
rename from IPython/html/notebook/static/base/js/utils.js
rename to IPython/html/static/base/js/utils.js
diff --git a/IPython/html/notebook/static/base/less/flexbox.less b/IPython/html/static/base/less/flexbox.less
similarity index 100%
rename from IPython/html/notebook/static/base/less/flexbox.less
rename to IPython/html/static/base/less/flexbox.less
diff --git a/IPython/html/notebook/static/base/less/mixins.less b/IPython/html/static/base/less/mixins.less
similarity index 100%
rename from IPython/html/notebook/static/base/less/mixins.less
rename to IPython/html/static/base/less/mixins.less
diff --git a/IPython/html/notebook/static/base/less/page.less b/IPython/html/static/base/less/page.less
similarity index 100%
rename from IPython/html/notebook/static/base/less/page.less
rename to IPython/html/static/base/less/page.less
diff --git a/IPython/html/notebook/static/base/less/style.less b/IPython/html/static/base/less/style.less
similarity index 100%
rename from IPython/html/notebook/static/base/less/style.less
rename to IPython/html/static/base/less/style.less
diff --git a/IPython/html/notebook/static/base/less/variables.less b/IPython/html/static/base/less/variables.less
similarity index 100%
rename from IPython/html/notebook/static/base/less/variables.less
rename to IPython/html/static/base/less/variables.less
diff --git a/IPython/html/notebook/static/custom/custom.css b/IPython/html/static/custom/custom.css
similarity index 100%
rename from IPython/html/notebook/static/custom/custom.css
rename to IPython/html/static/custom/custom.css
diff --git a/IPython/html/notebook/static/custom/custom.js b/IPython/html/static/custom/custom.js
similarity index 100%
rename from IPython/html/notebook/static/custom/custom.js
rename to IPython/html/static/custom/custom.js
diff --git a/IPython/html/notebook/static/dateformat/date.format.js b/IPython/html/static/dateformat/date.format.js
similarity index 100%
rename from IPython/html/notebook/static/dateformat/date.format.js
rename to IPython/html/static/dateformat/date.format.js
diff --git a/IPython/html/notebook/static/notebook/css/override.css b/IPython/html/static/notebook/css/override.css
similarity index 100%
rename from IPython/html/notebook/static/notebook/css/override.css
rename to IPython/html/static/notebook/css/override.css
diff --git a/IPython/html/notebook/static/notebook/js/cell.js b/IPython/html/static/notebook/js/cell.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/cell.js
rename to IPython/html/static/notebook/js/cell.js
diff --git a/IPython/html/notebook/static/notebook/js/celltoolbar.js b/IPython/html/static/notebook/js/celltoolbar.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/celltoolbar.js
rename to IPython/html/static/notebook/js/celltoolbar.js
diff --git a/IPython/html/notebook/static/notebook/js/celltoolbarpresets/default.js b/IPython/html/static/notebook/js/celltoolbarpresets/default.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/celltoolbarpresets/default.js
rename to IPython/html/static/notebook/js/celltoolbarpresets/default.js
diff --git a/IPython/html/notebook/static/notebook/js/celltoolbarpresets/example.js b/IPython/html/static/notebook/js/celltoolbarpresets/example.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/celltoolbarpresets/example.js
rename to IPython/html/static/notebook/js/celltoolbarpresets/example.js
diff --git a/IPython/html/notebook/static/notebook/js/celltoolbarpresets/slideshow.js b/IPython/html/static/notebook/js/celltoolbarpresets/slideshow.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/celltoolbarpresets/slideshow.js
rename to IPython/html/static/notebook/js/celltoolbarpresets/slideshow.js
diff --git a/IPython/html/notebook/static/notebook/js/codecell.js b/IPython/html/static/notebook/js/codecell.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/codecell.js
rename to IPython/html/static/notebook/js/codecell.js
diff --git a/IPython/html/notebook/static/notebook/js/codemirror-ipython.js b/IPython/html/static/notebook/js/codemirror-ipython.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/codemirror-ipython.js
rename to IPython/html/static/notebook/js/codemirror-ipython.js
diff --git a/IPython/html/notebook/static/notebook/js/completer.js b/IPython/html/static/notebook/js/completer.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/completer.js
rename to IPython/html/static/notebook/js/completer.js
diff --git a/IPython/html/notebook/static/notebook/js/config.js b/IPython/html/static/notebook/js/config.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/config.js
rename to IPython/html/static/notebook/js/config.js
diff --git a/IPython/html/notebook/static/notebook/js/contexthint.js b/IPython/html/static/notebook/js/contexthint.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/contexthint.js
rename to IPython/html/static/notebook/js/contexthint.js
diff --git a/IPython/html/notebook/static/notebook/js/layoutmanager.js b/IPython/html/static/notebook/js/layoutmanager.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/layoutmanager.js
rename to IPython/html/static/notebook/js/layoutmanager.js
diff --git a/IPython/html/notebook/static/notebook/js/main.js b/IPython/html/static/notebook/js/main.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/main.js
rename to IPython/html/static/notebook/js/main.js
diff --git a/IPython/html/notebook/static/notebook/js/maintoolbar.js b/IPython/html/static/notebook/js/maintoolbar.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/maintoolbar.js
rename to IPython/html/static/notebook/js/maintoolbar.js
diff --git a/IPython/html/notebook/static/notebook/js/mathjaxutils.js b/IPython/html/static/notebook/js/mathjaxutils.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/mathjaxutils.js
rename to IPython/html/static/notebook/js/mathjaxutils.js
diff --git a/IPython/html/notebook/static/notebook/js/menubar.js b/IPython/html/static/notebook/js/menubar.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/menubar.js
rename to IPython/html/static/notebook/js/menubar.js
diff --git a/IPython/html/notebook/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/notebook.js
rename to IPython/html/static/notebook/js/notebook.js
diff --git a/IPython/html/notebook/static/notebook/js/notificationarea.js b/IPython/html/static/notebook/js/notificationarea.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/notificationarea.js
rename to IPython/html/static/notebook/js/notificationarea.js
diff --git a/IPython/html/notebook/static/notebook/js/notificationwidget.js b/IPython/html/static/notebook/js/notificationwidget.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/notificationwidget.js
rename to IPython/html/static/notebook/js/notificationwidget.js
diff --git a/IPython/html/notebook/static/notebook/js/outputarea.js b/IPython/html/static/notebook/js/outputarea.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/outputarea.js
rename to IPython/html/static/notebook/js/outputarea.js
diff --git a/IPython/html/notebook/static/notebook/js/pager.js b/IPython/html/static/notebook/js/pager.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/pager.js
rename to IPython/html/static/notebook/js/pager.js
diff --git a/IPython/html/notebook/static/notebook/js/quickhelp.js b/IPython/html/static/notebook/js/quickhelp.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/quickhelp.js
rename to IPython/html/static/notebook/js/quickhelp.js
diff --git a/IPython/html/notebook/static/notebook/js/savewidget.js b/IPython/html/static/notebook/js/savewidget.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/savewidget.js
rename to IPython/html/static/notebook/js/savewidget.js
diff --git a/IPython/html/notebook/static/notebook/js/textcell.js b/IPython/html/static/notebook/js/textcell.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/textcell.js
rename to IPython/html/static/notebook/js/textcell.js
diff --git a/IPython/html/notebook/static/notebook/js/toolbar.js b/IPython/html/static/notebook/js/toolbar.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/toolbar.js
rename to IPython/html/static/notebook/js/toolbar.js
diff --git a/IPython/html/notebook/static/notebook/js/tooltip.js b/IPython/html/static/notebook/js/tooltip.js
similarity index 100%
rename from IPython/html/notebook/static/notebook/js/tooltip.js
rename to IPython/html/static/notebook/js/tooltip.js
diff --git a/IPython/html/notebook/static/notebook/less/ansicolors.less b/IPython/html/static/notebook/less/ansicolors.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/ansicolors.less
rename to IPython/html/static/notebook/less/ansicolors.less
diff --git a/IPython/html/notebook/static/notebook/less/cell.less b/IPython/html/static/notebook/less/cell.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/cell.less
rename to IPython/html/static/notebook/less/cell.less
diff --git a/IPython/html/notebook/static/notebook/less/celltoolbar.less b/IPython/html/static/notebook/less/celltoolbar.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/celltoolbar.less
rename to IPython/html/static/notebook/less/celltoolbar.less
diff --git a/IPython/html/notebook/static/notebook/less/codecell.less b/IPython/html/static/notebook/less/codecell.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/codecell.less
rename to IPython/html/static/notebook/less/codecell.less
diff --git a/IPython/html/notebook/static/notebook/less/codemirror.less b/IPython/html/static/notebook/less/codemirror.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/codemirror.less
rename to IPython/html/static/notebook/less/codemirror.less
diff --git a/IPython/html/notebook/static/notebook/less/completer.less b/IPython/html/static/notebook/less/completer.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/completer.less
rename to IPython/html/static/notebook/less/completer.less
diff --git a/IPython/html/notebook/static/notebook/less/highlight.less b/IPython/html/static/notebook/less/highlight.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/highlight.less
rename to IPython/html/static/notebook/less/highlight.less
diff --git a/IPython/html/notebook/static/notebook/less/menubar.less b/IPython/html/static/notebook/less/menubar.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/menubar.less
rename to IPython/html/static/notebook/less/menubar.less
diff --git a/IPython/html/notebook/static/notebook/less/notebook.less b/IPython/html/static/notebook/less/notebook.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/notebook.less
rename to IPython/html/static/notebook/less/notebook.less
diff --git a/IPython/html/notebook/static/notebook/less/notificationarea.less b/IPython/html/static/notebook/less/notificationarea.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/notificationarea.less
rename to IPython/html/static/notebook/less/notificationarea.less
diff --git a/IPython/html/notebook/static/notebook/less/notificationwidget.less b/IPython/html/static/notebook/less/notificationwidget.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/notificationwidget.less
rename to IPython/html/static/notebook/less/notificationwidget.less
diff --git a/IPython/html/notebook/static/notebook/less/outputarea.less b/IPython/html/static/notebook/less/outputarea.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/outputarea.less
rename to IPython/html/static/notebook/less/outputarea.less
diff --git a/IPython/html/notebook/static/notebook/less/pager.less b/IPython/html/static/notebook/less/pager.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/pager.less
rename to IPython/html/static/notebook/less/pager.less
diff --git a/IPython/html/notebook/static/notebook/less/quickhelp.less b/IPython/html/static/notebook/less/quickhelp.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/quickhelp.less
rename to IPython/html/static/notebook/less/quickhelp.less
diff --git a/IPython/html/notebook/static/notebook/less/renderedhtml.less b/IPython/html/static/notebook/less/renderedhtml.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/renderedhtml.less
rename to IPython/html/static/notebook/less/renderedhtml.less
diff --git a/IPython/html/notebook/static/notebook/less/savewidget.less b/IPython/html/static/notebook/less/savewidget.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/savewidget.less
rename to IPython/html/static/notebook/less/savewidget.less
diff --git a/IPython/html/notebook/static/notebook/less/style.less b/IPython/html/static/notebook/less/style.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/style.less
rename to IPython/html/static/notebook/less/style.less
diff --git a/IPython/html/notebook/static/notebook/less/textcell.less b/IPython/html/static/notebook/less/textcell.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/textcell.less
rename to IPython/html/static/notebook/less/textcell.less
diff --git a/IPython/html/notebook/static/notebook/less/toolbar.less b/IPython/html/static/notebook/less/toolbar.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/toolbar.less
rename to IPython/html/static/notebook/less/toolbar.less
diff --git a/IPython/html/notebook/static/notebook/less/tooltip.less b/IPython/html/static/notebook/less/tooltip.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/tooltip.less
rename to IPython/html/static/notebook/less/tooltip.less
diff --git a/IPython/html/notebook/static/notebook/less/variables.less b/IPython/html/static/notebook/less/variables.less
similarity index 100%
rename from IPython/html/notebook/static/notebook/less/variables.less
rename to IPython/html/static/notebook/less/variables.less
diff --git a/IPython/html/notebook/static/services/kernels/js/kernel.js b/IPython/html/static/services/kernels/js/kernel.js
similarity index 100%
rename from IPython/html/notebook/static/services/kernels/js/kernel.js
rename to IPython/html/static/services/kernels/js/kernel.js
diff --git a/IPython/html/notebook/static/style/style.less b/IPython/html/static/style/style.less
similarity index 100%
rename from IPython/html/notebook/static/style/style.less
rename to IPython/html/static/style/style.less
diff --git a/IPython/html/notebook/static/style/style.min.css b/IPython/html/static/style/style.min.css
similarity index 100%
rename from IPython/html/notebook/static/style/style.min.css
rename to IPython/html/static/style/style.min.css
diff --git a/IPython/html/notebook/static/tree/css/override.css b/IPython/html/static/tree/css/override.css
similarity index 100%
rename from IPython/html/notebook/static/tree/css/override.css
rename to IPython/html/static/tree/css/override.css
diff --git a/IPython/html/notebook/static/tree/js/clusterlist.js b/IPython/html/static/tree/js/clusterlist.js
similarity index 100%
rename from IPython/html/notebook/static/tree/js/clusterlist.js
rename to IPython/html/static/tree/js/clusterlist.js
diff --git a/IPython/html/notebook/static/tree/js/main.js b/IPython/html/static/tree/js/main.js
similarity index 100%
rename from IPython/html/notebook/static/tree/js/main.js
rename to IPython/html/static/tree/js/main.js
diff --git a/IPython/html/notebook/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js
similarity index 100%
rename from IPython/html/notebook/static/tree/js/notebooklist.js
rename to IPython/html/static/tree/js/notebooklist.js
diff --git a/IPython/html/notebook/static/tree/less/altuploadform.less b/IPython/html/static/tree/less/altuploadform.less
similarity index 100%
rename from IPython/html/notebook/static/tree/less/altuploadform.less
rename to IPython/html/static/tree/less/altuploadform.less
diff --git a/IPython/html/notebook/static/tree/less/style.less b/IPython/html/static/tree/less/style.less
similarity index 100%
rename from IPython/html/notebook/static/tree/less/style.less
rename to IPython/html/static/tree/less/style.less
diff --git a/IPython/html/notebook/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less
similarity index 100%
rename from IPython/html/notebook/static/tree/less/tree.less
rename to IPython/html/static/tree/less/tree.less
diff --git a/IPython/html/notebook/templates/login.html b/IPython/html/templates/login.html
similarity index 100%
rename from IPython/html/notebook/templates/login.html
rename to IPython/html/templates/login.html
diff --git a/IPython/html/notebook/templates/logout.html b/IPython/html/templates/logout.html
similarity index 100%
rename from IPython/html/notebook/templates/logout.html
rename to IPython/html/templates/logout.html
diff --git a/IPython/html/notebook/templates/notebook.html b/IPython/html/templates/notebook.html
similarity index 100%
rename from IPython/html/notebook/templates/notebook.html
rename to IPython/html/templates/notebook.html
diff --git a/IPython/html/notebook/templates/page.html b/IPython/html/templates/page.html
similarity index 100%
rename from IPython/html/notebook/templates/page.html
rename to IPython/html/templates/page.html
diff --git a/IPython/html/notebook/templates/tree.html b/IPython/html/templates/tree.html
similarity index 100%
rename from IPython/html/notebook/templates/tree.html
rename to IPython/html/templates/tree.html
diff --git a/IPython/html/notebook/services/notebooks/tests/__init__.py b/IPython/html/tests/__init__.py
similarity index 100%
rename from IPython/html/notebook/services/notebooks/tests/__init__.py
rename to IPython/html/tests/__init__.py
diff --git a/IPython/html/notebook/tests/test_hist.sqlite b/IPython/html/tests/test_hist.sqlite
similarity index 100%
rename from IPython/html/notebook/tests/test_hist.sqlite
rename to IPython/html/tests/test_hist.sqlite
Binary files a/IPython/html/notebook/tests/test_hist.sqlite and b/IPython/html/tests/test_hist.sqlite differ
diff --git a/IPython/html/notebook/tests/__init__.py b/IPython/html/tree/__init__.py
similarity index 100%
rename from IPython/html/notebook/tests/__init__.py
rename to IPython/html/tree/__init__.py
diff --git a/IPython/html/notebook/tree/handlers.py b/IPython/html/tree/handlers.py
similarity index 100%
rename from IPython/html/notebook/tree/handlers.py
rename to IPython/html/tree/handlers.py
diff --git a/IPython/html/notebook/utils.py b/IPython/html/utils.py
similarity index 100%
rename from IPython/html/notebook/utils.py
rename to IPython/html/utils.py