diff --git a/dist/index.html b/dist/index.html
index 7f5fc6f36606f6e273fa96d222d0c6cfaad11490..bdfa225b4961086dc0138d09f8e48377f775374a 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -77,5 +77,6 @@
         <script src="js/chartsController.js"></script>
         <script src="js/userToggleController.js"></script>
         <script src="js/dataModelController.js"></script>
+        <script src="js/analyzerController.js"></script>
     </body>
 </html>
diff --git a/dist/js/analyzerController.js b/dist/js/analyzerController.js
new file mode 100644
index 0000000000000000000000000000000000000000..a38b949850a3f44a3acdf8526d7e68ea1333ce1f
--- /dev/null
+++ b/dist/js/analyzerController.js
@@ -0,0 +1,2 @@
+app.controller('analyzerController', ['$scope', function ($scope) {
+}]);
diff --git a/dist/js/app.js b/dist/js/app.js
index a4e30acdd88fbb4766ae3d69598384b3805fedf1..2ce9fd180f6aa717866208c5b5335d55fe3ab440 100644
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -5,31 +5,36 @@ app.config(function ($stateProvider, $urlRouterProvider) {
         .state('home', {
             url: '/',
             controller: 'homeController',
-            templateUrl: 'views/homeView.html'
+            templateUrl: 'views/home.html'
         })
         .state('charts', {
             url: '/charts',
             controller: 'chartsController',
-            templateUrl: 'views/chartsView.html'
+            templateUrl: 'views/charts.html'
         })
         .state('userToggle', {
             url: '/userToggle',
             controller: 'userToggleController',
-            templateUrl: 'views/userToggleView.html'
+            templateUrl: 'views/userToggle.html'
         })
         .state('lorem', {
             url: '/lorem',
-            templateUrl: 'views/loremView.html'
+            templateUrl: 'views/lorem.html'
         })
-        .state('dataModel', {
+        .state('analyzer', {
+            url: '/analyzer',
+            controller: 'analyzerController',
+            templateUrl: 'views/analyzer.html'
+        })
+        .state('analyzer.dataModel', {
             url: '/dataModel',
             controller: 'dataModelController',
-            templateUrl: 'views/dataModelView.html'
+            templateUrl: 'views/analyzer.dataModel.html'
         })
         .state('details', {
             url: '/uppercase/:name',
             controller: 'uppercaseController',
-            templateUrl: 'views/uppercaseView.html'
+            templateUrl: 'views/uppercase.html'
         });
     $urlRouterProvider.otherwise('/');
 });
diff --git a/dist/views/analyzer.dataModel.html b/dist/views/analyzer.dataModel.html
new file mode 100644
index 0000000000000000000000000000000000000000..b97d3680438b9bda6b850124a43ef5fd085f4b69
--- /dev/null
+++ b/dist/views/analyzer.dataModel.html
@@ -0,0 +1,34 @@
+<div class="expand-collapse-links"><a ng-click="selectAllDataModelKeys()">Expand all</a> <a ng-click="unselectAllDataModelKeys()">Collapse all</a></div>
+<table class="data-model-table">
+    <tbody>
+        <tr class="data-model-table-key-row"  ng-class='{selected: datapoint.detailsVisible}' ng-click="selectDataModelKey($index)" ng-repeat-start="datapoint in datapoints">
+            <td><span class="data-model-table-expand-icon"></span></td>
+            <td>{{datapoint.key}}</td>
+            <td>{{datapoint.description}}</td>
+        </tr>
+        <tr class="data-model-table-details-row"  ng-class='{selected: datapoint.detailsVisible}' ng-repeat-end>
+            <td colspan="3">
+                <table>
+                    <tbody>
+                        <tr class="data-model-details-text">
+                            <td>Description:</td>
+                            <td>{{datapoint.description}}</td>
+                        </tr>
+                        <tr class="data-model-details-text">
+                            <td>Type:</td>
+                            <td>{{datapoint.type}}</td>
+                        </tr>
+                        <tr class="data-model-details-text" ng-if="datapoint.states != null">
+                            <td>States:</td>
+                            <td>{{datapoint.states}}</td>
+                        </tr>
+                        <tr class="data-model-details-text" ng-if="datapoint.type == 'number'">
+                            <td>Range:</td>
+                            <td><span ng-if="datapoint.rangeMin != null">{{datapoint.rangeMin}}</span><span ng-if="datapoint.rangeMin == null">-&infin;</span> to <span ng-if="datapoint.rangeMax != null">{{datapoint.rangeMax}}</span><span ng-if="datapoint.rangeMax == null">&infin;</span></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </td>
+        </tr>
+    </tbody>
+</table>
diff --git a/dist/views/dataModelView.html b/dist/views/analyzer.html
similarity index 54%
rename from dist/views/dataModelView.html
rename to dist/views/analyzer.html
index 0707eb895f117787760de1a663c12071cee58e82..48fd835e25853a460b5d5eab96c7de78d397b9ef 100644
--- a/dist/views/dataModelView.html
+++ b/dist/views/analyzer.html
@@ -1,8 +1,8 @@
 <div class="analyzer-header">
     <div class="analyzer-title">
         <div class="analyzer-icon">
-          <i class="analyzer-icon-bottom"></i>
-          <i class="analyzer-icon-top"></i>
+            <i class="analyzer-icon-bottom"></i>
+            <i class="analyzer-icon-top"></i>
         </div>
 
         <div class="analyzer-title-text">
@@ -23,42 +23,7 @@
 <hr/>
 
 <div class="analyzer-container">
-    <div class="analyzer-content">
-        <div class="expand-collapse-links"><a ng-click="selectAllDataModelKeys()">Expand all</a> <a ng-click="unselectAllDataModelKeys()">Collapse all</a></div>
-        <table class="data-model-table">
-            <tbody>
-                <tr class="data-model-table-key-row"  ng-class='{selected: datapoint.detailsVisible}' ng-click="selectDataModelKey($index)" ng-repeat-start="datapoint in datapoints">
-                    <td><span class="data-model-table-expand-icon"></span></td>
-                    <td>{{datapoint.key}}</td>
-                    <td>{{datapoint.description}}</td>
-                </tr>
-                <tr class="data-model-table-details-row"  ng-class='{selected: datapoint.detailsVisible}' ng-repeat-end>
-                    <td colspan="3">
-                        <table>
-                            <tbody>
-                                <tr class="data-model-details-text">
-                                    <td>Description:</td>
-                                    <td>{{datapoint.description}}</td>
-                                </tr>
-                                <tr class="data-model-details-text">
-                                    <td>Type:</td>
-                                    <td>{{datapoint.type}}</td>
-                                </tr>
-                                <tr class="data-model-details-text" ng-if="datapoint.states != null">
-                                    <td>States:</td>
-                                    <td>{{datapoint.states}}</td>
-                                </tr>
-                                <tr class="data-model-details-text" ng-if="datapoint.type == 'number'">
-                                    <td>Range:</td>
-                                    <td><span ng-if="datapoint.rangeMin != null">{{datapoint.rangeMin}}</span><span ng-if="datapoint.rangeMin == null">-&infin;</span> to <span ng-if="datapoint.rangeMax != null">{{datapoint.rangeMax}}</span><span ng-if="datapoint.rangeMax == null">&infin;</span></td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
+    <div class="analyzer-content" ui-view></div>
     <div class="analyzer-nav">
         <nav role="navigation">
             <ul class="analyzer-nav-group">
diff --git a/dist/views/chartsView.html b/dist/views/charts.html
similarity index 100%
rename from dist/views/chartsView.html
rename to dist/views/charts.html
diff --git a/dist/views/homeView.html b/dist/views/home.html
similarity index 80%
rename from dist/views/homeView.html
rename to dist/views/home.html
index e8f02c737d8079f54f71f89833d1dcecdb04ed5d..e9997e3e3ba90d91ce44dab9a6238334cbd51896 100644
--- a/dist/views/homeView.html
+++ b/dist/views/home.html
@@ -4,4 +4,4 @@
 <a ui-sref="charts">Demo nv d3</a><br/>
 <a ui-sref="lorem">Just a bunch of text</a><br/>
 <a ui-sref="userToggle">Toggle User States</a><br/>
-<a ui-sref="dataModel">View a dataset</a><br/>
+<a ui-sref="analyzer.dataModel">View an analyzer</a><br/>
diff --git a/dist/views/loremView.html b/dist/views/lorem.html
similarity index 100%
rename from dist/views/loremView.html
rename to dist/views/lorem.html
diff --git a/dist/views/uppercaseView.html b/dist/views/uppercase.html
similarity index 100%
rename from dist/views/uppercaseView.html
rename to dist/views/uppercase.html
diff --git a/dist/views/userToggleView.html b/dist/views/userToggle.html
similarity index 100%
rename from dist/views/userToggleView.html
rename to dist/views/userToggle.html