diff --git a/IPython/frontend/html/notebook/handlers/__init__.py b/IPython/frontend/html/notebook/auth/__init__.py
similarity index 100%
rename from IPython/frontend/html/notebook/handlers/__init__.py
rename to IPython/frontend/html/notebook/auth/__init__.py
diff --git a/IPython/frontend/html/notebook/handlers/login.py b/IPython/frontend/html/notebook/auth/login.py
similarity index 100%
rename from IPython/frontend/html/notebook/handlers/login.py
rename to IPython/frontend/html/notebook/auth/login.py
diff --git a/IPython/frontend/html/notebook/handlers/logout.py b/IPython/frontend/html/notebook/auth/logout.py
similarity index 100%
rename from IPython/frontend/html/notebook/handlers/logout.py
rename to IPython/frontend/html/notebook/auth/logout.py
diff --git a/IPython/frontend/html/notebook/base/__init__.py b/IPython/frontend/html/notebook/base/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/IPython/frontend/html/notebook/base/__init__.py
diff --git a/IPython/frontend/html/notebook/handlers/files.py b/IPython/frontend/html/notebook/base/files.py
similarity index 100%
rename from IPython/frontend/html/notebook/handlers/files.py
rename to IPython/frontend/html/notebook/base/files.py
diff --git a/IPython/frontend/html/notebook/handlers/base.py b/IPython/frontend/html/notebook/base/handlers.py
similarity index 100%
rename from IPython/frontend/html/notebook/handlers/base.py
rename to IPython/frontend/html/notebook/base/handlers.py
diff --git a/IPython/frontend/html/notebook/clusters/__init__.py b/IPython/frontend/html/notebook/clusters/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/IPython/frontend/html/notebook/clusters/__init__.py
diff --git a/IPython/frontend/html/notebook/clustermanager.py b/IPython/frontend/html/notebook/clusters/clustermanager.py
similarity index 100%
rename from IPython/frontend/html/notebook/clustermanager.py
rename to IPython/frontend/html/notebook/clusters/clustermanager.py
diff --git a/IPython/frontend/html/notebook/handlers/clustersapi.py b/IPython/frontend/html/notebook/clusters/handlers.py
similarity index 100%
rename from IPython/frontend/html/notebook/handlers/clustersapi.py
rename to IPython/frontend/html/notebook/clusters/handlers.py
diff --git a/IPython/frontend/html/notebook/kernels/__init__.py b/IPython/frontend/html/notebook/kernels/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/IPython/frontend/html/notebook/kernels/__init__.py
diff --git a/IPython/frontend/html/notebook/handlers/kernelsapi.py b/IPython/frontend/html/notebook/kernels/handlers.py
similarity index 100%
rename from IPython/frontend/html/notebook/handlers/kernelsapi.py
rename to IPython/frontend/html/notebook/kernels/handlers.py
diff --git a/IPython/frontend/html/notebook/kernelmanager.py b/IPython/frontend/html/notebook/kernels/kernelmanager.py
similarity index 100%
rename from IPython/frontend/html/notebook/kernelmanager.py
rename to IPython/frontend/html/notebook/kernels/kernelmanager.py
diff --git a/IPython/frontend/html/notebook/notebooks/__init__.py b/IPython/frontend/html/notebook/notebooks/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/IPython/frontend/html/notebook/notebooks/__init__.py
diff --git a/IPython/frontend/html/notebook/handlers/notebooksapi.py b/IPython/frontend/html/notebook/notebooks/apihandlers.py
similarity index 100%
rename from IPython/frontend/html/notebook/handlers/notebooksapi.py
rename to IPython/frontend/html/notebook/notebooks/apihandlers.py
diff --git a/IPython/frontend/html/notebook/azurenbmanager.py b/IPython/frontend/html/notebook/notebooks/azurenbmanager.py
similarity index 100%
rename from IPython/frontend/html/notebook/azurenbmanager.py
rename to IPython/frontend/html/notebook/notebooks/azurenbmanager.py
diff --git a/IPython/frontend/html/notebook/filenbmanager.py b/IPython/frontend/html/notebook/notebooks/filenbmanager.py
similarity index 100%
rename from IPython/frontend/html/notebook/filenbmanager.py
rename to IPython/frontend/html/notebook/notebooks/filenbmanager.py
diff --git a/IPython/frontend/html/notebook/handlers/notebooks.py b/IPython/frontend/html/notebook/notebooks/handlers.py
similarity index 100%
rename from IPython/frontend/html/notebook/handlers/notebooks.py
rename to IPython/frontend/html/notebook/notebooks/handlers.py
diff --git a/IPython/frontend/html/notebook/nbmanager.py b/IPython/frontend/html/notebook/notebooks/nbmanager.py
similarity index 100%
rename from IPython/frontend/html/notebook/nbmanager.py
rename to IPython/frontend/html/notebook/notebooks/nbmanager.py
diff --git a/IPython/frontend/html/notebook/tree/__init__.py b/IPython/frontend/html/notebook/tree/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/IPython/frontend/html/notebook/tree/__init__.py
diff --git a/IPython/frontend/html/notebook/handlers/tree.py b/IPython/frontend/html/notebook/tree/handlers.py
similarity index 100%
rename from IPython/frontend/html/notebook/handlers/tree.py
rename to IPython/frontend/html/notebook/tree/handlers.py