diff --git a/src/accounts/index.ts b/src/accounts/index.ts
index 0811f3f..29022cd 100644
--- a/src/accounts/index.ts
+++ b/src/accounts/index.ts
@@ -25,10 +25,27 @@ import {
     downgradeComponent
 } from '@angular/upgrade/static';
 
+import uiRouter from '@uirouter/angularjs';
+
 import { AccountService } from './account.service';
 import { AccountListComponent } from './accountList.component';
 
-export default angular.module('accountant.accounts', [])
+export default angular.module('accountant.accounts', [
+    uiRouter
+])
+
+    .factory('accountIdService', function() {
+        var accountId: null;
+
+        return {
+            get: () => {
+                return accountId;
+            },
+            set: (value) => {
+                accountId = value;
+            }
+        }
+    })
 
     .factory('AccountService', downgradeInjectable(AccountService))
 
@@ -36,4 +53,10 @@ export default angular.module('accountant.accounts', [])
         component: AccountListComponent
     }))
 
+    .run(function($transitions, accountIdService) {
+        $transitions.onSuccess({}, (transition) => {
+            accountIdService.set(transition.params().accountId);
+        });
+    })
+
     .name;
diff --git a/src/scheduler/index.ts b/src/scheduler/index.ts
index 957c965..53cf72f 100644
--- a/src/scheduler/index.ts
+++ b/src/scheduler/index.ts
@@ -30,14 +30,15 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { ToastrService } from 'ngx-toastr';
 
 var ngStrap          = require('angular-strap');
-import uiRouter from '@uirouter/angularjs';
+
+import accountModule from '@accountant/accounts';
 
 import { ScheduleListComponent } from './scheduleList.component';
 import { ScheduleService } from './schedule.service';
 
 export default angular.module('accountant.scheduler', [
-    uiRouter,
-    ngStrap
+    ngStrap,
+    accountModule
 ])
     .factory('toastrService', downgradeInjectable(ToastrService))
 
@@ -45,29 +46,10 @@ export default angular.module('accountant.scheduler', [
 
     .factory('logger', downgradeInjectable(Logger))
 
-    .factory('accountIdService', function() {
-        var accountId: null;
-
-        return {
-            get: () => {
-                return accountId;
-            },
-            set: (value) => {
-                accountId = value;
-            }
-        }
-    })
-
     .factory('scheduleService', downgradeInjectable(ScheduleService))
 
     .directive('scheduleListComponent', downgradeComponent({
         component: ScheduleListComponent
     }))
 
-    .run(function($transitions, accountIdService) {
-        $transitions.onSuccess({}, (transition) => {
-            accountIdService.set(transition.params().accountId);
-        });
-    })
-
     .name;