diff --git a/apps/docs/src/app/app-routing.module.ts b/apps/docs/src/app/app-routing.module.ts
index 94b708ab..af0dd816 100644
--- a/apps/docs/src/app/app-routing.module.ts
+++ b/apps/docs/src/app/app-routing.module.ts
@@ -1,19 +1,19 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
+import { LandingComponent } from './containers/landing/landing.component';
 import {
+  PerformanceComponent,
   AngularPerfComponent,
-  ComponentDocsComponent,
-  DocsComponent,
-  FabricComponent,
-  GettingStartedComponent,
-  LandingComponent,
   MixedPerfComponent,
-  PerformanceComponent,
   ProfilesComponent,
+} from './containers/performance/performance.module';
+import {
+  ComponentDocsComponent,
+  FabricComponent,
   SemanticUiComponent,
-  WrappersComponent,
-} from './containers';
+} from './containers/component-docs/component-docs.module';
+import { DocsComponent, GettingStartedComponent, WrappersComponent } from './containers/docs/docs.module';
 
 const routes: Routes = [
   { path: 'landing', redirectTo: '' },
diff --git a/apps/docs/src/app/app.module.ts b/apps/docs/src/app/app.module.ts
index b266c95e..747ff8a7 100644
--- a/apps/docs/src/app/app.module.ts
+++ b/apps/docs/src/app/app.module.ts
@@ -1,19 +1,21 @@
 import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
 import { NxModule } from '@nrwl/nx';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
-import { AngularReactBrowserModule, registerElement } from '@angular-react/core';
+import { AngularReactBrowserModule } from '@angular-react/core';
 
-import { SharedModule } from './shared';
-import { ComponentsModule } from './components';
-import { LandingComponent, ComponentDocsModule, DocsModule, PerformanceModule } from './containers';
 import { MaterialModule } from './material.module';
 import { AppRoutingModule } from './app-routing.module';
-import { ReactComponentsModule } from './react-components';
 import { AppComponent } from './app.component';
 import { FabricModule } from './fabric.module';
 import { SemanticModule } from './semantic.module';
+import { SharedModule } from './shared/shared.module';
+import { ReactComponentsModule } from './react-components/react-components.module';
+import { ComponentsModule } from './components/components.module';
+import { ComponentDocsModule } from './containers/component-docs/component-docs.module';
+import { DocsModule } from './containers/docs/docs.module';
+import { PerformanceModule } from './containers/performance/performance.module';
+import { LandingComponent } from './containers/landing/landing.component';
 
 @NgModule({
   imports: [
diff --git a/apps/docs/src/app/components/components.module.ts b/apps/docs/src/app/components/components.module.ts
index 87bc2aa7..bc38363c 100644
--- a/apps/docs/src/app/components/components.module.ts
+++ b/apps/docs/src/app/components/components.module.ts
@@ -1,18 +1,17 @@
 import { RouterModule } from '@angular/router';
-import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
-import { ReactComponentsModule } from '../react-components';
-
 import { DotComponent } from './dot/dot.component';
 import { TriangleComponent } from './triangle/triangle.component';
 import { NavbarComponent } from './navbar/navbar.component';
 import { MaterialModule } from '../material.module';
 import { IconsComponent } from './icons/icons.component';
 import { SubNavComponent } from './sub-nav/sub-nav.component';
-import { SharedModule } from '../shared';
 import { FabricModule } from '../fabric.module';
 import { PageHeaderComponent } from './page-header/page-header.component';
+import { ReactComponentsModule } from '../react-components/react-components.module';
+import { SharedModule } from '../shared/shared.module';
 
 const components = [
   DotComponent,
diff --git a/apps/docs/src/app/containers/component-docs/component-docs.module.ts b/apps/docs/src/app/containers/component-docs/component-docs.module.ts
index 305658b8..08700e75 100644
--- a/apps/docs/src/app/containers/component-docs/component-docs.module.ts
+++ b/apps/docs/src/app/containers/component-docs/component-docs.module.ts
@@ -2,16 +2,15 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 
-import { ReactComponentsModule } from '../../react-components';
-import { SharedModule } from '../../shared';
-import { ComponentsModule } from '../../components';
-
 import { ComponentDocsComponent } from './component-docs.component';
 import { FabricComponent } from './fabric/fabric.component';
 import { SemanticUiComponent } from './semantic-ui/semantic-ui.component';
 import { MaterialModule } from '../../material.module';
 import { FabricModule } from '../../fabric.module';
 import { SemanticModule } from '../../semantic.module';
+import { ReactComponentsModule } from '../../react-components/react-components.module';
+import { SharedModule } from '../../shared/shared.module';
+import { ComponentsModule } from '../../components/components.module';
 
 const components = [ComponentDocsComponent, FabricComponent, SemanticUiComponent];
 
diff --git a/apps/docs/src/app/containers/docs/docs.module.ts b/apps/docs/src/app/containers/docs/docs.module.ts
index 91de784b..737e8997 100644
--- a/apps/docs/src/app/containers/docs/docs.module.ts
+++ b/apps/docs/src/app/containers/docs/docs.module.ts
@@ -3,14 +3,14 @@ import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 
 import { MaterialModule } from '../../material.module';
-import { ReactComponentsModule } from '../../react-components';
-import { SharedModule } from '../../shared';
-import { ComponentsModule } from '../../components';
 
 import { DocsComponent } from './docs.component';
 import { FabricModule } from '../../fabric.module';
 import { GettingStartedComponent } from './getting-started/getting-started.component';
 import { WrappersComponent } from './wrappers/wrappers.component';
+import { ComponentsModule } from '../../components/components.module';
+import { ReactComponentsModule } from '../../react-components/react-components.module';
+import { SharedModule } from '../../shared/shared.module';
 
 const components = [DocsComponent, GettingStartedComponent, WrappersComponent];
 
diff --git a/apps/docs/src/app/containers/performance/performance.module.ts b/apps/docs/src/app/containers/performance/performance.module.ts
index 5050a139..353ce441 100644
--- a/apps/docs/src/app/containers/performance/performance.module.ts
+++ b/apps/docs/src/app/containers/performance/performance.module.ts
@@ -3,15 +3,15 @@ import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 
 import { MaterialModule } from '../../material.module';
-import { ReactComponentsModule } from '../../react-components';
-import { SharedModule } from '../../shared';
-import { ComponentsModule } from '../../components';
 
 import { AngularPerfComponent } from './angular-perf/angular-perf.component';
 import { MixedPerfComponent } from './mixed-perf/mixed-perf.component';
 import { PerformanceComponent } from './performance.component';
 import { ProfilesComponent } from './profiles/profiles.component';
 import { FabricModule } from '../../fabric.module';
+import { ReactComponentsModule } from '../../react-components/react-components.module';
+import { SharedModule } from '../../shared/shared.module';
+import { ComponentsModule } from '../../components/components.module';
 
 const components = [AngularPerfComponent, MixedPerfComponent, PerformanceComponent, ProfilesComponent];