diff --git a/app/index.html b/app/index.html
index 11d576c8..c07eec7f 100644
--- a/app/index.html
+++ b/app/index.html
@@ -58,12 +58,12 @@
   <script type="text/javascript" src="../src/backend/gdocs.js"></script>
   <script type="text/javascript" src="../src/backend/csv.js"></script>
 
-  <script type="text/javascript" src="../src/view-grid.js"></script>
-  <script type="text/javascript" src="../src/view-slickgrid.js"></script>
-  <script type="text/javascript" src="../src/view-transform-dialog.js"></script>
-  <script type="text/javascript" src="../src/view-graph.js"></script>
-  <script type="text/javascript" src="../src/view-map.js"></script>
-  <script type="text/javascript" src="../src/view-timeline.js"></script>
+  <script type="text/javascript" src="../src/view.grid.js"></script>
+  <script type="text/javascript" src="../src/view.slickgrid.js"></script>
+  <script type="text/javascript" src="../src/view.transform.js"></script>
+  <script type="text/javascript" src="../src/view.graph.js"></script>
+  <script type="text/javascript" src="../src/view.map.js"></script>
+  <script type="text/javascript" src="../src/view.timeline.js"></script>
   <script type="text/javascript" src="../src/widget.pager.js"></script>
   <script type="text/javascript" src="../src/widget.queryeditor.js"></script>
   <script type="text/javascript" src="../src/widget.filtereditor.js"></script>
diff --git a/src/view-graph.js b/src/view.graph.js
similarity index 100%
rename from src/view-graph.js
rename to src/view.graph.js
diff --git a/src/view-grid.js b/src/view.grid.js
similarity index 100%
rename from src/view-grid.js
rename to src/view.grid.js
diff --git a/src/view-map.js b/src/view.map.js
similarity index 100%
rename from src/view-map.js
rename to src/view.map.js
diff --git a/src/view-slickgrid.js b/src/view.slickgrid.js
similarity index 100%
rename from src/view-slickgrid.js
rename to src/view.slickgrid.js
diff --git a/src/view-timeline.js b/src/view.timeline.js
similarity index 100%
rename from src/view-timeline.js
rename to src/view.timeline.js
diff --git a/src/view-transform-dialog.js b/src/view.transform.js
similarity index 100%
rename from src/view-transform-dialog.js
rename to src/view.transform.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/index.html b/test/index.html
index 26fed5dd..62eb36ac 100644
--- a/test/index.html
+++ b/test/index.html
@@ -27,6 +27,7 @@
 
   <script type="text/javascript" src="base.js"></script>
 
+  <!-- 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>
@@ -34,29 +35,31 @@
   <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.test.js"></script>
   <script type="text/javascript" src="backend/memory.test.js"></script>
-  <script type="text/javascript" src="backend.elasticsearch.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="../src/view-grid.js"></script>
-  <script type="text/javascript" src="../src/view-slickgrid.js"></script>
-  <script type="text/javascript" src="../src/view-transform-dialog.js"></script>
-  <script type="text/javascript" src="../src/view-graph.js"></script>
-  <script type="text/javascript" src="../src/view-map.js"></script>
-  <script type="text/javascript" src="../src/view-timeline.js"></script>
+  <!-- views and view tests -->
+  <script type="text/javascript" src="../src/view.grid.js"></script>
+  <script type="text/javascript" src="../src/view.slickgrid.js"></script>
+  <script type="text/javascript" src="../src/view.transform.js"></script>
+  <script type="text/javascript" src="../src/view.graph.js"></script>
+  <script type="text/javascript" src="../src/view.map.js"></script>
+  <script type="text/javascript" src="../src/view.timeline.js"></script>
   <script type="text/javascript" src="../src/widget.pager.js"></script>
   <script type="text/javascript" src="../src/widget.queryeditor.js"></script>
   <script type="text/javascript" src="../src/widget.filtereditor.js"></script>
   <script type="text/javascript" src="../src/widget.fields.js"></script>
   <script type="text/javascript" src="../src/view.multiview.js"></script>
 
-  <script type="text/javascript" src="view-grid.test.js"></script>
-  <script type="text/javascript" src="view-slickgrid.test.js"></script>
-  <script type="text/javascript" src="view-graph.test.js"></script>
-  <script type="text/javascript" src="view-map.test.js"></script>
-  <script type="text/javascript" src="view-timeline.test.js"></script>
+  <script type="text/javascript" src="view.grid.test.js"></script>
+  <script type="text/javascript" src="view.slickgrid.test.js"></script>
+  <script type="text/javascript" src="view.graph.test.js"></script>
+  <script type="text/javascript" src="view.map.test.js"></script>
+  <script type="text/javascript" src="view.timeline.test.js"></script>
   <script type="text/javascript" src="view.multiview.test.js"></script>
   <script type="text/javascript" src="util.test.js"></script>
 </head>
diff --git a/test/view-graph.test.js b/test/view.graph.test.js
similarity index 100%
rename from test/view-graph.test.js
rename to test/view.graph.test.js
diff --git a/test/view-grid.test.js b/test/view.grid.test.js
similarity index 100%
rename from test/view-grid.test.js
rename to test/view.grid.test.js
diff --git a/test/view-map.test.js b/test/view.map.test.js
similarity index 100%
rename from test/view-map.test.js
rename to test/view.map.test.js
diff --git a/test/view-slickgrid.test.js b/test/view.slickgrid.test.js
similarity index 100%
rename from test/view-slickgrid.test.js
rename to test/view.slickgrid.test.js
diff --git a/test/view-timeline.test.js b/test/view.timeline.test.js
similarity index 100%
rename from test/view-timeline.test.js
rename to test/view.timeline.test.js