-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';
+import { HotkeyModule } from 'angular2-hotkeys'
+import { MessageService } from 'primeng/api'
+import { ToastModule } from 'primeng/toast'
+import { CommonModule } from '@angular/common'
+import { NgModule, Optional, SkipSelf } from '@angular/core'
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
+import { PeerTubeSocket } from '@app/core/notification/peertube-socket.service'
+import { HooksService, PluginService } from '@app/core/plugins'
+import { AuthService } from './auth'
+import { ConfirmService } from './confirm'
+import { CheatSheetComponent } from './hotkeys'
+import { MenuService } from './menu'
+import { throwIfAlreadyLoaded } from './module-import-guard'
+import { Notifier } from './notification'
+import { HtmlRendererService, LinkifierService, MarkdownService } from './renderer'
+import { RestExtractor, RestService } from './rest'
+import {
+ HomepageRedirectComponent,
+ LoginGuard,
+ MetaGuard,
+ MetaService,
+ PeerTubeRouterService,
+ RedirectService,
+ ScrollService,
+ UnloggedGuard,
+ UserRightGuard
+} from './routing'
+import { CanDeactivateGuard } from './routing/can-deactivate-guard.service'
+import { ServerConfigResolver } from './routing/server-config-resolver.service'
+import { ScopedTokensService } from './scoped-tokens'
+import { ServerService } from './server'
+import { ThemeService } from './theme'
+import { UserLocalStorageService, UserService } from './users'
+import { LocalStorageService, ScreenService, SessionStorageService } from './wrappers'