diff --git a/make b/make
index 7b02912b..bbd3430a 100755
--- a/make
+++ b/make
@@ -5,7 +5,7 @@ import os
 
 def cat():
     print("** Combining js files")
-    cmd = 'cat src/*.js src/backend/*.js > dist/recline.js'
+    cmd = 'cat src/*.js > dist/recline.js'
     os.system(cmd)
     print("** Combining css files")
     cmd = 'cat css/*.css > dist/recline.css'
@@ -16,14 +16,11 @@ def docs():
     print("** Building docs")
 
     docco_executable = os.environ.get('DOCCO_EXECUTABLE','docco')
-    cmd = '%s src/*.js' % (docco_executable)
-    os.system(cmd)
     if os.path.exists('/tmp/recline-docs'):
       shutil.rmtree('/tmp/recline-docs')
     os.makedirs('/tmp/recline-docs')
-    os.system('mkdir -p docs/backend')
-    files = '%s/src/backend/*.js' % os.getcwd()
-    dest = '%s/docs/backend' % os.getcwd()
+    files = '%s/src/*.js' % os.getcwd()
+    dest = '%s/docs/source' % os.getcwd()
     os.system('cd /tmp/recline-docs && %s %s && mv docs/* %s' % (docco_executable,files, dest))
     print("** Docs built ok")
 
diff --git a/src/backend/couchdb.js b/src/backend.couchdb.js
similarity index 100%
rename from src/backend/couchdb.js
rename to src/backend.couchdb.js
diff --git a/src/backend/csv.js b/src/backend.csv.js
similarity index 100%
rename from src/backend/csv.js
rename to src/backend.csv.js
diff --git a/src/backend/dataproxy.js b/src/backend.dataproxy.js
similarity index 100%
rename from src/backend/dataproxy.js
rename to src/backend.dataproxy.js
diff --git a/src/backend/elasticsearch.js b/src/backend.elasticsearch.js
similarity index 100%
rename from src/backend/elasticsearch.js
rename to src/backend.elasticsearch.js
diff --git a/src/backend/gdocs.js b/src/backend.gdocs.js
similarity index 100%
rename from src/backend/gdocs.js
rename to src/backend.gdocs.js
diff --git a/src/backend/memory.js b/src/backend.memory.js
similarity index 100%
rename from src/backend/memory.js
rename to src/backend.memory.js
diff --git a/test/backend/csv.test.js b/test/backend.csv.test.js
similarity index 100%
rename from test/backend/csv.test.js
rename to test/backend.csv.test.js
diff --git a/test/backend/dataproxy.test.js b/test/backend.dataproxy.test.js
similarity index 100%
rename from test/backend/dataproxy.test.js
rename to test/backend.dataproxy.test.js
diff --git a/test/backend/elasticsearch.test.js b/test/backend.elasticsearch.test.js
similarity index 100%
rename from test/backend/elasticsearch.test.js
rename to test/backend.elasticsearch.test.js
diff --git a/test/backend/gdocs.test.js b/test/backend.gdocs.test.js
similarity index 100%
rename from test/backend/gdocs.test.js
rename to test/backend.gdocs.test.js
diff --git a/test/backend/memory.test.js b/test/backend.memory.test.js
similarity index 100%
rename from test/backend/memory.test.js
rename to test/backend.memory.test.js
diff --git a/test/index.html b/test/index.html
index db350c70..7a31b6a0 100644
--- a/test/index.html
+++ b/test/index.html
@@ -29,19 +29,19 @@
 
   <!-- model and backend tests -->
   <script type="text/javascript" src="../src/model.js"></script>
-  <script type="text/javascript" src="../src/backend/base.js"></script>
-  <script type="text/javascript" src="../src/backend/memory.js"></script>
-  <script type="text/javascript" src="../src/backend/dataproxy.js"></script>
-  <script type="text/javascript" src="../src/backend/gdocs.js"></script>
-  <script type="text/javascript" src="../src/backend/elasticsearch.js"></script>
-  <script type="text/javascript" src="../src/backend/csv.js"></script>
+  <script type="text/javascript" src="../src/backend.base.js"></script>
+  <script type="text/javascript" src="../src/backend.memory.js"></script>
+  <script type="text/javascript" src="../src/backend.dataproxy.js"></script>
+  <script type="text/javascript" src="../src/backend.gdocs.js"></script>
+  <script type="text/javascript" src="../src/backend.elasticsearch.js"></script>
+  <script type="text/javascript" src="../src/backend.csv.js"></script>
 
   <script type="text/javascript" src="model.test.js"></script>
-  <script type="text/javascript" src="backend/memory.test.js"></script>
-  <script type="text/javascript" src="backend/dataproxy.test.js"></script>
-  <script type="text/javascript" src="backend/gdocs.test.js"></script>
-  <script type="text/javascript" src="backend/elasticsearch.test.js"></script>
-  <script type="text/javascript" src="backend/csv.test.js"></script>
+  <script type="text/javascript" src="backend.memory.test.js"></script>
+  <script type="text/javascript" src="backend.dataproxy.test.js"></script>
+  <script type="text/javascript" src="backend.gdocs.test.js"></script>
+  <script type="text/javascript" src="backend.elasticsearch.test.js"></script>
+  <script type="text/javascript" src="backend.csv.test.js"></script>
 
   <!-- views and view tests -->
   <script type="text/javascript" src="../src/view.grid.js"></script>