diff --git a/src/app/app.js b/src/app/app.js
index bcffff159c..f17e0172a4 100644
--- a/src/app/app.js
+++ b/src/app/app.js
@@ -19,5 +19,6 @@
         'bit.vault',
         'bit.settings',
         'bit.tools',
-        'bit.organization'
+        'bit.organization',
+        'bit.reports'
     ]);
diff --git a/src/app/config.js b/src/app/config.js
index 70da5607ae..be5970d556 100644
--- a/src/app/config.js
+++ b/src/app/config.js
@@ -112,10 +112,10 @@ angular
                 controller: 'toolsController',
                 data: { pageTitle: 'Tools' }
             })
-            .state('backend.user.toolsReportBreach', {
+            .state('backend.user.reportsBreach', {
                 url: '^/reports/breach',
-                templateUrl: 'app/tools/views/toolsReportBreach.html',
-                controller: 'toolsReportBreachController',
+                templateUrl: 'app/reports/views/reportsBreach.html',
+                controller: 'reportsBreachController',
                 data: { pageTitle: 'Data Breach Report' }
             })
             .state('backend.user.apps', {
diff --git a/src/app/tools/toolsReportBreachController.js b/src/app/reports/reportsBreachController.js
similarity index 94%
rename from src/app/tools/toolsReportBreachController.js
rename to src/app/reports/reportsBreachController.js
index 440e597904..ddcb86c0d2 100644
--- a/src/app/tools/toolsReportBreachController.js
+++ b/src/app/reports/reportsBreachController.js
@@ -1,7 +1,7 @@
 angular
     .module('bit.tools')
 
-    .controller('toolsReportBreachController', function ($scope, apiService, toastr, authService) {
+    .controller('reportsBreachController', function ($scope, apiService, toastr, authService) {
         $scope.loading = true;
         $scope.error = false;
         $scope.breachAccounts = [];
diff --git a/src/app/reports/reportsModule.js b/src/app/reports/reportsModule.js
new file mode 100644
index 0000000000..1ccbf4d588
--- /dev/null
+++ b/src/app/reports/reportsModule.js
@@ -0,0 +1,2 @@
+angular
+    .module('bit.reports', ['toastr', 'ngSanitize']);
diff --git a/src/app/tools/views/toolsReportBreach.html b/src/app/reports/views/reportsBreach.html
similarity index 99%
rename from src/app/tools/views/toolsReportBreach.html
rename to src/app/reports/views/reportsBreach.html
index 9c8ca5e9c7..34691dd52b 100644
--- a/src/app/tools/views/toolsReportBreach.html
+++ b/src/app/reports/views/reportsBreach.html
@@ -1,6 +1,6 @@
 <section class="content-header">
     <h1>
-        Reports: Data Breach
+        Data Breach Report
         <small>have you been pwned?</small>
     </h1>
 </section>
diff --git a/src/app/tools/toolsModule.js b/src/app/tools/toolsModule.js
index c15cba0148..98191f4998 100644
--- a/src/app/tools/toolsModule.js
+++ b/src/app/tools/toolsModule.js
@@ -1,2 +1,2 @@
 angular
-    .module('bit.tools', ['ui.bootstrap', 'toastr', 'ngSanitize']);
+    .module('bit.tools', ['ui.bootstrap', 'toastr']);
diff --git a/src/app/views/userLayout.html b/src/app/views/userLayout.html
index 0b3d88e9d4..1dd18c0d4f 100644
--- a/src/app/views/userLayout.html
+++ b/src/app/views/userLayout.html
@@ -61,11 +61,13 @@
                     <i class="fa fa-share-alt fa-fw"></i> <span>Shared</span>
                 </a>
             </li>
-            <li class="treeview" ng-class="{active: $state.includes('backend.user.tools')}">
+            <li class="treeview" ng-class="{active: $state.is('backend.user.tools') || 
+                $state.is('backend.user.reportsBreach')}">
                 <a ui-sref="backend.user.tools"><i class="fa fa-wrench fa-fw"></i> <span>Tools</span></a>
-                <ul class="treeview-menu" ng-class="{'menu-open': $state.includes('backend.user.tools')}">
-                    <li ng-class="{active: $state.is('backend.user.toolsReportBreach')}">
-                        <a ui-sref="backend.user.toolsReportBreach">
+                <ul class="treeview-menu" ng-class="{'menu-open': $state.is('backend.user.tools') || 
+                    $state.is('backend.user.reportsBreach')}">
+                    <li ng-class="{active: $state.is('backend.user.reportsBreach')}">
+                        <a ui-sref="backend.user.reportsBreach">
                             <i class="fa fa-circle-o fa-fw"></i> Data Breach Report
                         </a>
                     </li>
diff --git a/src/index.html b/src/index.html
index 3e46faac88..c575be2fc9 100644
--- a/src/index.html
+++ b/src/index.html
@@ -170,7 +170,9 @@
     <script src="app/tools/toolsController.js"></script>
     <script src="app/tools/toolsImportController.js"></script>
     <script src="app/tools/toolsExportController.js"></script>
-    <script src="app/tools/toolsReportBreachController.js"></script>
+
+    <script src="app/reports/reportsModule.js"></script>
+    <script src="app/reports/reportsBreachController.js"></script>
     <!-- @endexclude -->
 </body>
 </html>