Moving web services into a subdir.

IPython/frontend/html/notebook/notebookapp.py

@@ -194,10 +194,10 b' class NotebookWebApplication(web.Application):'
         handlers.extend(load_handlers('tree.handlers'))
         handlers.extend(load_handlers('auth.login'))
         handlers.extend(load_handlers('auth.logout'))
-        handlers.extend(load_handlers('notebooks.handlers'))
-        handlers.extend(load_handlers('kernels.apihandlers'))
-        handlers.extend(load_handlers('notebooks.apihandlers'))
-        handlers.extend(load_handlers('clusters.apihandlers'))
+        handlers.extend(load_handlers('notebook.handlers'))
+        handlers.extend(load_handlers('services.kernels.handlers'))
+        handlers.extend(load_handlers('services.notebooks.handlers'))
+        handlers.extend(load_handlers('services.clusters.handlers'))
         handlers.extend([
             (r"/files/(.*)", AuthenticatedFileHandler, {'path' : settings['notebook_manager'].notebook_dir}),
         ])

IPython/frontend/html/notebook/services/clusters/handlers.py

@@ -20,7 +20,7 b' from tornado import web'
 
 from zmq.utils import jsonapi
 
-from ..base.handlers import IPythonHandler
+from ...base.handlers import IPythonHandler
 
 #-----------------------------------------------------------------------------
 # Cluster handlers

IPython/frontend/html/notebook/services/kernels/handlers.py

@@ -23,8 +23,8 b' from zmq.utils import jsonapi'
 
 from IPython.utils.jsonutil import date_default
 
-from ..base.handlers import IPythonHandler
-from ..base.zmqhandlers import AuthenticatedZMQStreamHandler
+from ...base.handlers import IPythonHandler
+from ...base.zmqhandlers import AuthenticatedZMQStreamHandler
 
 #-----------------------------------------------------------------------------
 # Kernel handlers

IPython/frontend/html/notebook/services/notebooks/handlers.py

@@ -22,7 +22,7 b' from zmq.utils import jsonapi'
 
 from IPython.utils.jsonutil import date_default
 
-from ..base.handlers import IPythonHandler, authenticate_unless_readonly
+from ...base.handlers import IPythonHandler, authenticate_unless_readonly
 
 #-----------------------------------------------------------------------------
 # Notebook web service handlers