diff --git a/_layouts/default.html b/_layouts/default.html
index e8ba51d6..aabb7e65 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -30,7 +30,7 @@
       <a class="brand" href="/"><strong>Recline.js</strong> &ndash; relax with your data</a>
       <ul class="nav">
         <li>
-          <a href="library.html">
+          <a href="/docs/library.html">
             <i class="icon-book icon-white"></i>
             Documentation
           </a>
diff --git a/library.html b/docs/index.html
similarity index 72%
rename from library.html
rename to docs/index.html
index 9189dd84..eb5b787d 100644
--- a/library.html
+++ b/docs/index.html
@@ -1,6 +1,7 @@
 ---
 layout: default
 title: Library - Home
+root: ../
 ---
 
 <div class="container library">
@@ -24,19 +25,19 @@ title: Library - Home
   <div class="span4">
     <div class="well">
       <h3>Models</h3>
-      <p>Models help you structure your work with data by providing some standard objects such as Dataset and Record &ndash; a Dataset being a collection of Records. <a href="library-model.html">More &raquo;</a></p>
+      <p>Models help you structure your work with data by providing some standard objects such as Dataset and Record &ndash; a Dataset being a collection of Records. <a href="models.html">More &raquo;</a></p>
     </div>
   </div>
   <div class="span4">
     <div class="well">
       <h3>Backends</h3>
-      <p>Backends connect your Models to data sources (and stores) &ndash; for example Google Docs spreadsheets, local CSV files, the DataHub, ElasticSearch etc. <a href="example-backends.html">More &raquo;</a></p>
+      <p>Backends connect your Models to data sources (and stores) &ndash; for example Google Docs spreadsheets, local CSV files, the DataHub, ElasticSearch etc. <a href="backends.html">More &raquo;</a></p>
     </div>
   </div>
   <div class="span4">
     <div class="well">
       <h3>Views</h3>
-      <p>Views are user interface components for displaying, editing or interacting with the data. For example, maps, graphs, data grids or a query editor. <a href="library-view.html">More &raquo;</a></p>
+      <p>Views are user interface components for displaying, editing or interacting with the data. For example, maps, graphs, data grids or a query editor. <a href="views.html">More &raquo;</a></p>
     </div>
   </div>
 </div>
@@ -106,27 +107,27 @@ title: Library - Home
   <div class="span4">
     <h4>Models</h4>
     <ul>
-      <li><a href="docs/model.html">Models</a></li>
+      <li><a href="model.html">Models</a></li>
     </ul>
   </div>
   <div class="span4">
     <h4>Backends</h4>
     <ul>
-      <li><a href="docs/backend/base.html">Base module providing convenience functions</a></li>
-      <li><a href="docs/backend/memory.html">memory: Memory Backend (local data)</a></li>
-      <li><a href="docs/backend/elasticsearch.html">elasticsearch: ElasticSearch Backend</a></li>
-      <li><a href="docs/backend/dataproxy.html">dataproxy: DataProxy Backend (CSV and XLS on the Web)</a></li>
-      <li><a href="docs/backend/gdocs.html">gdocs: Google Docs (Spreadsheet) Backend</a></li>
-      <li><a href="docs/backend/csv.html">csv: Local CSV file backend</a></li>
+      <li><a href="backend/base.html">Base module providing convenience functions</a></li>
+      <li><a href="backend/memory.html">memory: Memory Backend (local data)</a></li>
+      <li><a href="backend/elasticsearch.html">elasticsearch: ElasticSearch Backend</a></li>
+      <li><a href="backend/dataproxy.html">dataproxy: DataProxy Backend (CSV and XLS on the Web)</a></li>
+      <li><a href="backend/gdocs.html">gdocs: Google Docs (Spreadsheet) Backend</a></li>
+      <li><a href="backend/csv.html">csv: Local CSV file backend</a></li>
     </ul>
   </div>
   <div class="span4">
     <h4>Dataset Views and Widgets</h4>
     <ul>
-      <li><a href="docs/view.multiview.html">MultiView View (plus common view code)</a></li>
-      <li><a href="docs/view-grid.html">(Data) Grid View</a></li>
-      <li><a href="docs/view-graph.html">Graph View (based on Flot)</a></li>
-      <li><a href="docs/view-map.html">Map View (based on Leaflet)</a></li>
+      <li><a href="view.multiview.html">MultiView View (plus common view code)</a></li>
+      <li><a href="view-grid.html">(Data) Grid View</a></li>
+      <li><a href="view-graph.html">Graph View (based on Flot)</a></li>
+      <li><a href="view-map.html">Map View (based on Leaflet)</a></li>
     </ul>
   </div>
 </div>
diff --git a/library-view.markdown b/docs/views.markdown
similarity index 99%
rename from library-view.markdown
rename to docs/views.markdown
index 96ab9353..4b41fc92 100644
--- a/library-view.markdown
+++ b/docs/views.markdown
@@ -1,6 +1,7 @@
 ---
 layout: container
 title: Library - Views
+root: ../
 ---
 
 <div class="page-header">