diff --git a/IPython/frontend/html/notebook/static/notebooks/js/cell.js b/IPython/frontend/html/notebook/static/notebook/js/cell.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/cell.js
rename to IPython/frontend/html/notebook/static/notebook/js/cell.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/celltoolbar.js b/IPython/frontend/html/notebook/static/notebook/js/celltoolbar.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/celltoolbar.js
rename to IPython/frontend/html/notebook/static/notebook/js/celltoolbar.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/celltoolbarpresets/default.js b/IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/default.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/celltoolbarpresets/default.js
rename to IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/default.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/celltoolbarpresets/example.js b/IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/example.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/celltoolbarpresets/example.js
rename to IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/example.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/celltoolbarpresets/slideshow.js b/IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/slideshow.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/celltoolbarpresets/slideshow.js
rename to IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/slideshow.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/codecell.js b/IPython/frontend/html/notebook/static/notebook/js/codecell.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/codecell.js
rename to IPython/frontend/html/notebook/static/notebook/js/codecell.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/codemirror-ipython.js b/IPython/frontend/html/notebook/static/notebook/js/codemirror-ipython.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/codemirror-ipython.js
rename to IPython/frontend/html/notebook/static/notebook/js/codemirror-ipython.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/completer.js b/IPython/frontend/html/notebook/static/notebook/js/completer.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/completer.js
rename to IPython/frontend/html/notebook/static/notebook/js/completer.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/config.js b/IPython/frontend/html/notebook/static/notebook/js/config.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/config.js
rename to IPython/frontend/html/notebook/static/notebook/js/config.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/contexthint.js b/IPython/frontend/html/notebook/static/notebook/js/contexthint.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/contexthint.js
rename to IPython/frontend/html/notebook/static/notebook/js/contexthint.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/layoutmanager.js b/IPython/frontend/html/notebook/static/notebook/js/layoutmanager.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/layoutmanager.js
rename to IPython/frontend/html/notebook/static/notebook/js/layoutmanager.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/main.js b/IPython/frontend/html/notebook/static/notebook/js/main.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/main.js
rename to IPython/frontend/html/notebook/static/notebook/js/main.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/maintoolbar.js b/IPython/frontend/html/notebook/static/notebook/js/maintoolbar.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/maintoolbar.js
rename to IPython/frontend/html/notebook/static/notebook/js/maintoolbar.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/mathjaxutils.js b/IPython/frontend/html/notebook/static/notebook/js/mathjaxutils.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/mathjaxutils.js
rename to IPython/frontend/html/notebook/static/notebook/js/mathjaxutils.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/menubar.js b/IPython/frontend/html/notebook/static/notebook/js/menubar.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/menubar.js
rename to IPython/frontend/html/notebook/static/notebook/js/menubar.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/notebook.js b/IPython/frontend/html/notebook/static/notebook/js/notebook.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/notebook.js
rename to IPython/frontend/html/notebook/static/notebook/js/notebook.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/notificationarea.js b/IPython/frontend/html/notebook/static/notebook/js/notificationarea.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/notificationarea.js
rename to IPython/frontend/html/notebook/static/notebook/js/notificationarea.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/notificationwidget.js b/IPython/frontend/html/notebook/static/notebook/js/notificationwidget.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/notificationwidget.js
rename to IPython/frontend/html/notebook/static/notebook/js/notificationwidget.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/outputarea.js b/IPython/frontend/html/notebook/static/notebook/js/outputarea.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/outputarea.js
rename to IPython/frontend/html/notebook/static/notebook/js/outputarea.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/pager.js b/IPython/frontend/html/notebook/static/notebook/js/pager.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/pager.js
rename to IPython/frontend/html/notebook/static/notebook/js/pager.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/quickhelp.js b/IPython/frontend/html/notebook/static/notebook/js/quickhelp.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/quickhelp.js
rename to IPython/frontend/html/notebook/static/notebook/js/quickhelp.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/savewidget.js b/IPython/frontend/html/notebook/static/notebook/js/savewidget.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/savewidget.js
rename to IPython/frontend/html/notebook/static/notebook/js/savewidget.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/textcell.js b/IPython/frontend/html/notebook/static/notebook/js/textcell.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/textcell.js
rename to IPython/frontend/html/notebook/static/notebook/js/textcell.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/toolbar.js b/IPython/frontend/html/notebook/static/notebook/js/toolbar.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/toolbar.js
rename to IPython/frontend/html/notebook/static/notebook/js/toolbar.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/js/tooltip.js b/IPython/frontend/html/notebook/static/notebook/js/tooltip.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/js/tooltip.js
rename to IPython/frontend/html/notebook/static/notebook/js/tooltip.js
diff --git a/IPython/frontend/html/notebook/static/notebooks/less/celltoolbar.less b/IPython/frontend/html/notebook/static/notebook/less/celltoolbar.less
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/less/celltoolbar.less
rename to IPython/frontend/html/notebook/static/notebook/less/celltoolbar.less
diff --git a/IPython/frontend/html/notebook/static/notebooks/less/highlight.less b/IPython/frontend/html/notebook/static/notebook/less/highlight.less
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/less/highlight.less
rename to IPython/frontend/html/notebook/static/notebook/less/highlight.less
diff --git a/IPython/frontend/html/notebook/static/notebooks/less/notebook.less b/IPython/frontend/html/notebook/static/notebook/less/notebook.less
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/less/notebook.less
rename to IPython/frontend/html/notebook/static/notebook/less/notebook.less
diff --git a/IPython/frontend/html/notebook/static/notebooks/less/renderedhtml.less b/IPython/frontend/html/notebook/static/notebook/less/renderedhtml.less
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/less/renderedhtml.less
rename to IPython/frontend/html/notebook/static/notebook/less/renderedhtml.less
diff --git a/IPython/frontend/html/notebook/static/notebooks/less/style.less b/IPython/frontend/html/notebook/static/notebook/less/style.less
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/less/style.less
rename to IPython/frontend/html/notebook/static/notebook/less/style.less
diff --git a/IPython/frontend/html/notebook/static/notebooks/less/tooltip.less b/IPython/frontend/html/notebook/static/notebook/less/tooltip.less
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/less/tooltip.less
rename to IPython/frontend/html/notebook/static/notebook/less/tooltip.less
diff --git a/IPython/frontend/html/notebook/static/notebooks/less/variables.less b/IPython/frontend/html/notebook/static/notebook/less/variables.less
similarity index 100%
rename from IPython/frontend/html/notebook/static/notebooks/less/variables.less
rename to IPython/frontend/html/notebook/static/notebook/less/variables.less
diff --git a/IPython/frontend/html/notebook/templates/notebooks.html b/IPython/frontend/html/notebook/templates/notebook.html
similarity index 100%
rename from IPython/frontend/html/notebook/templates/notebooks.html
rename to IPython/frontend/html/notebook/templates/notebook.html