5 files changed, 10 insertions, 9 deletions

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 555f412e7..e9bb800f4 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -16,8 +16,6 @@ import { LoginModule } from './login';
 import { SharedModule } from './shared';
 import { VideosModule } from './videos';
 
-import { MenuComponent } from './menu.component';
-
 const metaConfig: MetaConfig = {
   //Append a title suffix such as a site name to all titles
   //Defaults to false
@@ -35,8 +33,7 @@ const APP_PROVIDERS = [
 @NgModule({
   bootstrap: [ AppComponent ],
   declarations: [
-    AppComponent,
-    MenuComponent
+    AppComponent
   ],
   imports: [
     BrowserModule,
diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
index be29b88da..27e6ee1fb 100644
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core.module.ts
@@ -1,17 +1,20 @@
 import { NgModule, Optional, SkipSelf } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { HttpModule } from '@angular/http';
+import { RouterModule } from '@angular/router';
 
 import { AuthService } from './auth';
+import { MenuComponent } from './menu';
 import { throwIfAlreadyLoaded } from './module-import-guard';
 
 @NgModule({
   imports: [
     CommonModule,
-    HttpModule
+    HttpModule,
+    RouterModule
   ],
-  declarations: [ ],
-  exports: [ ],
+  declarations: [ MenuComponent ],
+  exports: [ MenuComponent ],
   providers: [ AuthService ]
 })
 export class CoreModule {
diff --git a/client/src/app/core/menu/index.ts b/client/src/app/core/menu/index.ts
new file mode 100644
index 000000000..d07a1144c
--- /dev/null
+++ b/client/src/app/core/menu/index.ts
@@ -0,0 +1 @@
+export * from './menu.component';
diff --git a/client/src/app/menu.component.html b/client/src/app/core/menu/menu.component.html
index 1e9a53246..1e9a53246 100644
--- a/client/src/app/menu.component.html
+++ b/client/src/app/core/menu/menu.component.html
diff --git a/client/src/app/menu.component.ts b/client/src/app/core/menu/menu.component.ts
index d1a1d51e7..f1bf6966d 100644
--- a/client/src/app/menu.component.ts
+++ b/client/src/app/core/menu/menu.component.ts
@@ -1,8 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { AuthService } from './core';
-import { AuthStatus } from './shared';
+import { AuthService } from '../auth';
+import { AuthStatus } from '../../shared';
 
 @Component({
   selector: 'my-menu',