diff --git a/resources/content_server/browse.css b/resources/content_server/browse/browse.css
similarity index 100%
rename from resources/content_server/browse.css
rename to resources/content_server/browse/browse.css
diff --git a/resources/content_server/browse.html b/resources/content_server/browse/browse.html
similarity index 93%
rename from resources/content_server/browse.html
rename to resources/content_server/browse/browse.html
index a71fff9e22..e278c20e39 100644
--- a/resources/content_server/browse.html
+++ b/resources/content_server/browse/browse.html
@@ -10,14 +10,14 @@
     <meta http-equiv="X-UA-Compatible" content="IE=100" />
     <link rel="icon" type="image/x-icon" href="http://calibre-ebook.com/favicon.ico" />
 
-    <link rel="stylesheet" type="text/css" href="/static/browse.css" />
+    <link rel="stylesheet" type="text/css" href="browse.css" />
     <link type="text/css" href="/static/jquery_ui/css/pepper-grinder/jquery-ui-1.8.5.custom.css" rel="stylesheet" />
 
     <script type="text/javascript" src="/static/jquery.js"></script>
     <script type="text/javascript" src="/static/jquery.corner.js"></script>
     <script type="text/javascript" src="/static/jquery_ui/js/jquery-ui-1.8.5.custom.min.js"></script>
 
-    <script type="text/javascript" src="/static/browse.js"></script>
+    <script type="text/javascript" src="browse.js"></script>
 
     <script type="text/javascript">
         $(document).ready(function() {{
diff --git a/resources/content_server/browse.js b/resources/content_server/browse/browse.js
similarity index 100%
rename from resources/content_server/browse.js
rename to resources/content_server/browse/browse.js
diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 42d3d76dfb..b682e3d66f 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -35,7 +35,7 @@ class BrowseServer(object):
                 sort_opts = [(x, fm[x]['name']) for x in fm.sortable_field_keys()
                         if fm[x]['name']]
             prefix = 'category' if category else 'book'
-            ans = P('content_server/browse.html', data=True)
+            ans = P('content_server/browse/browse.html', data=True)
             ans = ans.replace('{sort_select_label}', xml(_('Sort by')+':'))
             opts = ['<option value="%s_%s">%s</option>' % (prefix, xml(k),
                 xml(n)) for k, n in