diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py
index 05b12e8a8..7738a5755 100644
--- a/IPython/frontend/html/notebook/notebookapp.py
+++ b/IPython/frontend/html/notebook/notebookapp.py
@@ -63,10 +63,10 @@ from tornado import web
 # Our own libraries
 from IPython.frontend.html.notebook import DEFAULT_STATIC_FILES_PATH
 
-from .kernels.kernelmanager import MappingKernelManager
-from .notebooks.nbmanager import NotebookManager
-from .notebooks.filenbmanager import FileNotebookManager
-from .clusters.clustermanager import ClusterManager
+from .services.kernels.kernelmanager import MappingKernelManager
+from .services.notebooks.nbmanager import NotebookManager
+from .services.notebooks.filenbmanager import FileNotebookManager
+from .services.clusters.clustermanager import ClusterManager
 
 from .base.handlers import AuthenticatedFileHandler, FileFindHandler
 
diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index dfe73b071..3d020337a 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -303,7 +303,7 @@ def make_exclude():
         exclusions.append(ipjoin('extensions', 'tests', 'test_rmagic'))
 
     if not have['azure']:
-        exclusions.append(ipjoin('frontend', 'html', 'notebook', 'notebooks', 'azurenbmanager'))
+        exclusions.append(ipjoin('frontend', 'html', 'notebook', 'services', 'notebooks', 'azurenbmanager'))
 
     # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
     if sys.platform == 'win32':