diff --git a/src/app/about/about-routing.module.ts b/src/app/about/about-routing.module.ts
deleted file mode 100644
index 5f667dc92..000000000
--- a/src/app/about/about-routing.module.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { Route, extract } from '../core';
-import { AboutComponent } from './about.component';
-
-const routes: Routes = [
-  Route.withShell([
-    {
-      path: 'about',
-      component: AboutComponent,
-      data: { title: extract('About') }
-    }
-  ])
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-  providers: []
-})
-export class AboutRoutingModule { }
diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html
deleted file mode 100644
index 77520f41d..000000000
--- a/src/app/about/about.component.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div>
-  <div>
-    <h1>
-      <span translate>APP_NAME</span>
-    </h1>
-    <p>
-      <span translate>Version</span>{{version}}
-    </p>
-  </div>
-</div>
diff --git a/src/app/about/about.component.scss b/src/app/about/about.component.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/app/about/about.component.spec.ts b/src/app/about/about.component.spec.ts
deleted file mode 100644
index 3ef7c8d6c..000000000
--- a/src/app/about/about.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AboutComponent } from './about.component';
-
-describe('AboutComponent', () => {
-  let component: AboutComponent;
-  let fixture: ComponentFixture<AboutComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-        declarations: [AboutComponent]
-      })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AboutComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts
deleted file mode 100644
index dce963211..000000000
--- a/src/app/about/about.component.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-import { environment } from '../../environments/environment';
-
-@Component({
-  selector: 'mifosx-about',
-  templateUrl: './about.component.html',
-  styleUrls: ['./about.component.scss']
-})
-export class AboutComponent implements OnInit {
-
-  version: string = environment.version;
-
-  constructor() { }
-
-  ngOnInit() { }
-
-}
diff --git a/src/app/about/about.module.ts b/src/app/about/about.module.ts
deleted file mode 100644
index 15ae86aa3..000000000
--- a/src/app/about/about.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-import { TranslateModule } from '@ngx-translate/core';
-
-import { AboutRoutingModule } from './about-routing.module';
-import { AboutComponent } from './about.component';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    TranslateModule,
-    AboutRoutingModule
-  ],
-  declarations: [
-    AboutComponent
-  ]
-})
-export class AboutModule { }
diff --git a/src/app/accounting/accounting-routing.module.ts b/src/app/accounting/accounting-routing.module.ts
index 974bc5e4d..386ae3f96 100644
--- a/src/app/accounting/accounting-routing.module.ts
+++ b/src/app/accounting/accounting-routing.module.ts
@@ -1,7 +1,11 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-import { Route, extract } from '../core';
+/** Routing Imports */
+import { Route } from '../core/route/route.service';
+
+/** Translation Imports */
+import { extract } from '../core/i18n/i18n.service';
 
 import { AccountingComponent } from './accounting.component';
 import { FrequentPostingsComponent } from './frequent-postings/frequent-postings.component';
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 0035548c7..bfdc8f51f 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -22,7 +22,6 @@ import { CoreModule } from './core/core.module';
 import { HomeModule } from './home/home.module';
 import { LoginModule } from './login/login.module';
 import { SettingsModule } from './settings/settings.module';
-import { AboutModule } from './about/about.module'; // TODO: Remove redundant module.
 import { NavigationModule } from './navigation/navigation.module';
 import { ClientsModule} from './clients/clients.module';
 import { GroupsModule } from './groups/groups.module';
@@ -50,7 +49,6 @@ import { AppRoutingModule } from './app-routing.module';
     HomeModule,
     LoginModule,
     SettingsModule,
-    AboutModule,
     NavigationModule,
     ClientsModule,
     GroupsModule,
diff --git a/src/app/centers/centers-routing.module.ts b/src/app/centers/centers-routing.module.ts
index a5cb3fdbf..33baf3f76 100644
--- a/src/app/centers/centers-routing.module.ts
+++ b/src/app/centers/centers-routing.module.ts
@@ -1,7 +1,12 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-import { Route, extract } from '../core';
+/** Routing Imports */
+import { Route } from '../core/route/route.service';
+
+/** Translation Imports */
+import { extract } from '../core/i18n/i18n.service';
+
 import { CentersComponent } from './centers.component';
 
 const routes: Routes = [
diff --git a/src/app/clients/clients-routing.module.ts b/src/app/clients/clients-routing.module.ts
index 83df39606..1efed1a7a 100644
--- a/src/app/clients/clients-routing.module.ts
+++ b/src/app/clients/clients-routing.module.ts
@@ -1,7 +1,12 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-import { Route, extract } from '../core';
+/** Routing Imports */
+import { Route } from '../core/route/route.service';
+
+/** Translation Imports */
+import { extract } from '../core/i18n/i18n.service';
+
 import { ClientsComponent } from './clients.component';
 import { CreateClientComponent} from './create-client/create-client.component';
 import { ViewClientComponent } from './view-client/view-client.component';
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index f2ca9d220..94881acc3 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -27,7 +27,7 @@ import { AuthenticationInterceptor } from './authentication/authentication.inter
 import { RouteReusableStrategy } from './route/route-reusable-strategy';
 
 /** Custom Modules */
-import { SharedModule } from '../shared';
+import { SharedModule } from '../shared/shared.module';
 
 /** Custom Components */
 import { ShellComponent } from './shell/shell.component';
diff --git a/src/app/core/index.ts b/src/app/core/index.ts
deleted file mode 100644
index d558e053f..000000000
--- a/src/app/core/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export * from './core.module';
-export * from './authentication/authentication.service';
-export * from './authentication/authentication.guard';
-export * from './http/http.service';
-export * from './http/http-cache.service';
-export * from './http/api-prefix.interceptor';
-export * from './http/cache.interceptor';
-export * from './http/error-handler.interceptor';
-export * from './i18n/i18n.service';
-export * from './route/route.service';
diff --git a/src/app/groups/groups-routing.module.ts b/src/app/groups/groups-routing.module.ts
index c2b0a0f05..342428bc5 100644
--- a/src/app/groups/groups-routing.module.ts
+++ b/src/app/groups/groups-routing.module.ts
@@ -1,7 +1,12 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-import { Route, extract } from '../core';
+/** Routing Imports */
+import { Route } from '../core/route/route.service';
+
+/** Translation Imports */
+import { extract } from '../core/i18n/i18n.service';
+
 import { GroupsComponent } from './groups.component';
 
 const routes: Routes = [
diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 55bb7a0b7..8a77aa333 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -1,7 +1,12 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-import { Route, extract } from '../core';
+/** Routing Imports */
+import { Route } from '../core/route/route.service';
+
+/** Translation Imports */
+import { extract } from '../core/i18n/i18n.service';
+
 import { HomeComponent } from './home.component';
 import { DashboardComponent } from './dashboard/dashboard.component';
 
diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts
index bd1d94e7a..c4920b319 100644
--- a/src/app/home/home.module.ts
+++ b/src/app/home/home.module.ts
@@ -5,7 +5,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { CoreModule } from '../core/core.module';
-import { SharedModule } from '../shared';
+import { SharedModule } from '../shared/shared.module';
 import { HomeRoutingModule } from './home-routing.module';
 import { HomeComponent } from './home.component';
 import { QuoteService } from './quote.service';
diff --git a/src/app/login/login-form/login-form.component.ts b/src/app/login/login-form/login-form.component.ts
index 57809a608..5864f7dea 100644
--- a/src/app/login/login-form/login-form.component.ts
+++ b/src/app/login/login-form/login-form.component.ts
@@ -6,7 +6,7 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { finalize } from 'rxjs/operators';
 
 /** Custom Services */
-import { AuthenticationService } from '../../core';
+import { AuthenticationService } from '../../core/authentication/authentication.service';
 
 /**
  * Login form component.
diff --git a/src/app/login/login-routing.module.ts b/src/app/login/login-routing.module.ts
index 47654f7ca..1b9246ffb 100644
--- a/src/app/login/login-routing.module.ts
+++ b/src/app/login/login-routing.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
 /** Transalation Imports */
-import { extract } from '../core';
+import { extract } from '../core/i18n/i18n.service';
 
 /** Custom Components */
 import { LoginComponent } from './login.component';
diff --git a/src/app/login/login.module.ts b/src/app/login/login.module.ts
index 644893078..6fd2304cc 100644
--- a/src/app/login/login.module.ts
+++ b/src/app/login/login.module.ts
@@ -2,7 +2,7 @@
 import { NgModule } from '@angular/core';
 
 /** Custom Modules */
-import { SharedModule } from '../shared';
+import { SharedModule } from '../shared/shared.module';
 import { LoginRoutingModule } from './login-routing.module';
 
 /** Custom Components */
diff --git a/src/app/login/reset-password/reset-password.component.ts b/src/app/login/reset-password/reset-password.component.ts
index 22190eed3..a7291fb72 100644
--- a/src/app/login/reset-password/reset-password.component.ts
+++ b/src/app/login/reset-password/reset-password.component.ts
@@ -6,7 +6,7 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { finalize } from 'rxjs/operators';
 
 /** Custom Services */
-import { AuthenticationService } from '../../core';
+import { AuthenticationService } from '../../core/authentication/authentication.service';
 
 /** Custom Validators */
 import { confirmPasswordValidator } from './confirm-password.validator';
diff --git a/src/app/login/two-factor-authentication/two-factor-authentication.component.ts b/src/app/login/two-factor-authentication/two-factor-authentication.component.ts
index 0a9e60cf4..bd7c61bdc 100644
--- a/src/app/login/two-factor-authentication/two-factor-authentication.component.ts
+++ b/src/app/login/two-factor-authentication/two-factor-authentication.component.ts
@@ -6,7 +6,7 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { finalize } from 'rxjs/operators';
 
 /** Custom Services */
-import { AuthenticationService } from '../../core';
+import { AuthenticationService } from '../../core/authentication/authentication.service';
 
 /**
  * Two factor authentication component.
diff --git a/src/app/navigation/navigation-routing.module.ts b/src/app/navigation/navigation-routing.module.ts
index 593209374..ee38cf9bc 100644
--- a/src/app/navigation/navigation-routing.module.ts
+++ b/src/app/navigation/navigation-routing.module.ts
@@ -1,9 +1,17 @@
+/** Angular Imports */
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-import { Route, extract } from '../core';
+/** Routing Imports */
+import { Route } from '../core/route/route.service';
+
+/** Translation Imports */
+import { extract } from '../core/i18n/i18n.service';
+
+/** Custom Components */
 import { NavigationComponent } from './navigation.component';
 
+/** Navigation Routes */
 const routes: Routes = [
   Route.withShell([
     {
@@ -14,6 +22,11 @@ const routes: Routes = [
   ])
 ];
 
+/**
+ * Navigation Module
+ *
+ * Configures the navigation (by offices) routes.
+ */
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule],
diff --git a/src/app/self-service/self-service-routing.module.ts b/src/app/self-service/self-service-routing.module.ts
index 5333270e4..1ed274688 100644
--- a/src/app/self-service/self-service-routing.module.ts
+++ b/src/app/self-service/self-service-routing.module.ts
@@ -3,10 +3,10 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
 /** Routing Imports */
-import { Route } from '../core';
+import { Route } from '../core/route/route.service';
 
 /** Translation Imports */
-import { extract } from '../core';
+import { extract } from '../core/i18n/i18n.service';
 
 /** Custom Components */
 import { SelfServiceComponent } from './self-service.component';
diff --git a/src/app/settings/settings-routing.module.ts b/src/app/settings/settings-routing.module.ts
index 14c564320..db7d17c9d 100644
--- a/src/app/settings/settings-routing.module.ts
+++ b/src/app/settings/settings-routing.module.ts
@@ -3,10 +3,10 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
 /** Routing Imports */
-import { Route } from '../core';
+import { Route } from '../core/route/route.service';
 
 /** Translation Imports */
-import { extract } from '../core';
+import { extract } from '../core/i18n/i18n.service';
 
 /** Custom Components */
 import { SettingsComponent } from './settings.component';
diff --git a/src/app/shared/index.ts b/src/app/shared/index.ts
deleted file mode 100644
index fd2a53c9c..000000000
--- a/src/app/shared/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { SharedModule } from './shared.module';
-export { DeleteDialogComponent } from './delete-dialog/delete-dialog.component';