diff --git a/.bowerrc b/.bowerrc
index 02fa60b4..42eabc3d 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "share/jupyter/static/components"
+  "directory": "share/jupyter/hub/static/components"
 }
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index bc783efb..de3322be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,8 @@ dist
 /jupyterhub_config.py
 jupyterhub_cookie_secret
 jupyterhub.sqlite
-share/jupyter/static/components
-share/jupyter/static/css/style.min.css
-share/jupyter/static/css/style.min.css.map
+share/jupyter/hub/static/components
+share/jupyter/hub/static/css/style.min.css
+share/jupyter/hub/static/css/style.min.css.map
 *.egg-info
 MANIFEST
diff --git a/MANIFEST.in b/MANIFEST.in
index 0a4c5723..a2f937ed 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,7 +7,7 @@ include *requirements.txt
 graft jupyterhub
 graft scripts
 graft share
-prune share/jupyter/static/components
+prune share/jupyter/hub/static/components
 
 # Documentation
 graft docs
diff --git a/jupyterhub/_data.py b/jupyterhub/_data.py
index 08469161..ba5a9af8 100644
--- a/jupyterhub/_data.py
+++ b/jupyterhub/_data.py
@@ -1,7 +1,7 @@
 """Get the data files for this package."""
 
 def get_data_files():
-    """Walk up until we find share/jupyter"""
+    """Walk up until we find share/jupyter/hub"""
     import sys
     from os.path import join, abspath, dirname, exists, split
     path = abspath(dirname(__file__))
@@ -11,7 +11,7 @@ def get_data_files():
     for path in starting_points:
         # walk up, looking for prefix/share/jupyter
         while path != '/':
-            share_jupyter = join(path, 'share', 'jupyter')
+            share_jupyter = join(path, 'share', 'jupyter', 'hub')
             if exists(join(share_jupyter, 'static', 'components')):
                 return share_jupyter
             path, _ = split(path)
diff --git a/jupyterhub/app.py b/jupyterhub/app.py
index c377aef1..377afa8d 100644
--- a/jupyterhub/app.py
+++ b/jupyterhub/app.py
@@ -133,7 +133,7 @@ class JupyterHub(Application):
     )
     
     data_files_path = Unicode(DATA_FILES_PATH, config=True,
-        help="The location of jupyter data files (e.g. /usr/local/share/jupyter)"
+        help="The location of jupyterhub data files (e.g. /usr/local/share/jupyter/hub)"
     )
     
     ssl_key = Unicode('', config=True,
diff --git a/setup.py b/setup.py
index d1eda5af..f2380019 100755
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ from subprocess import check_call
 pjoin = os.path.join
 
 here = os.path.abspath(os.path.dirname(__file__))
-share_jupyter = pjoin(here, 'share', 'jupyter')
+share_jupyter = pjoin(here, 'share', 'jupyter', 'hub')
 static = pjoin(share_jupyter, 'static')
 
 #---------------------------------------------------------------------------
diff --git a/share/jupyter/static/favicon.ico b/share/jupyter/hub/static/favicon.ico
similarity index 100%
rename from share/jupyter/static/favicon.ico
rename to share/jupyter/hub/static/favicon.ico
diff --git a/share/jupyter/static/images/jupyterhub-80.png b/share/jupyter/hub/static/images/jupyterhub-80.png
similarity index 100%
rename from share/jupyter/static/images/jupyterhub-80.png
rename to share/jupyter/hub/static/images/jupyterhub-80.png
diff --git a/share/jupyter/static/js/admin.js b/share/jupyter/hub/static/js/admin.js
similarity index 100%
rename from share/jupyter/static/js/admin.js
rename to share/jupyter/hub/static/js/admin.js
diff --git a/share/jupyter/static/js/home.js b/share/jupyter/hub/static/js/home.js
similarity index 100%
rename from share/jupyter/static/js/home.js
rename to share/jupyter/hub/static/js/home.js
diff --git a/share/jupyter/static/js/jhapi.js b/share/jupyter/hub/static/js/jhapi.js
similarity index 100%
rename from share/jupyter/static/js/jhapi.js
rename to share/jupyter/hub/static/js/jhapi.js
diff --git a/share/jupyter/static/js/utils.js b/share/jupyter/hub/static/js/utils.js
similarity index 100%
rename from share/jupyter/static/js/utils.js
rename to share/jupyter/hub/static/js/utils.js
diff --git a/share/jupyter/static/less/error.less b/share/jupyter/hub/static/less/error.less
similarity index 100%
rename from share/jupyter/static/less/error.less
rename to share/jupyter/hub/static/less/error.less
diff --git a/share/jupyter/static/less/login.less b/share/jupyter/hub/static/less/login.less
similarity index 100%
rename from share/jupyter/static/less/login.less
rename to share/jupyter/hub/static/less/login.less
diff --git a/share/jupyter/static/less/logout.less b/share/jupyter/hub/static/less/logout.less
similarity index 100%
rename from share/jupyter/static/less/logout.less
rename to share/jupyter/hub/static/less/logout.less
diff --git a/share/jupyter/static/less/page.less b/share/jupyter/hub/static/less/page.less
similarity index 100%
rename from share/jupyter/static/less/page.less
rename to share/jupyter/hub/static/less/page.less
diff --git a/share/jupyter/static/less/style.less b/share/jupyter/hub/static/less/style.less
similarity index 100%
rename from share/jupyter/static/less/style.less
rename to share/jupyter/hub/static/less/style.less
diff --git a/share/jupyter/static/less/variables.less b/share/jupyter/hub/static/less/variables.less
similarity index 100%
rename from share/jupyter/static/less/variables.less
rename to share/jupyter/hub/static/less/variables.less
diff --git a/share/jupyter/templates/404.html b/share/jupyter/hub/templates/404.html
similarity index 100%
rename from share/jupyter/templates/404.html
rename to share/jupyter/hub/templates/404.html
diff --git a/share/jupyter/templates/admin.html b/share/jupyter/hub/templates/admin.html
similarity index 100%
rename from share/jupyter/templates/admin.html
rename to share/jupyter/hub/templates/admin.html
diff --git a/share/jupyter/templates/error.html b/share/jupyter/hub/templates/error.html
similarity index 100%
rename from share/jupyter/templates/error.html
rename to share/jupyter/hub/templates/error.html
diff --git a/share/jupyter/templates/home.html b/share/jupyter/hub/templates/home.html
similarity index 100%
rename from share/jupyter/templates/home.html
rename to share/jupyter/hub/templates/home.html
diff --git a/share/jupyter/templates/index.html b/share/jupyter/hub/templates/index.html
similarity index 100%
rename from share/jupyter/templates/index.html
rename to share/jupyter/hub/templates/index.html
diff --git a/share/jupyter/templates/login.html b/share/jupyter/hub/templates/login.html
similarity index 100%
rename from share/jupyter/templates/login.html
rename to share/jupyter/hub/templates/login.html
diff --git a/share/jupyter/templates/logout.html b/share/jupyter/hub/templates/logout.html
similarity index 100%
rename from share/jupyter/templates/logout.html
rename to share/jupyter/hub/templates/logout.html
diff --git a/share/jupyter/templates/page.html b/share/jupyter/hub/templates/page.html
similarity index 100%
rename from share/jupyter/templates/page.html
rename to share/jupyter/hub/templates/page.html
diff --git a/share/jupyter/templates/spawn_pending.html b/share/jupyter/hub/templates/spawn_pending.html
similarity index 100%
rename from share/jupyter/templates/spawn_pending.html
rename to share/jupyter/hub/templates/spawn_pending.html