diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 86ec76c1a..20c9636a8 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -2,6 +2,8 @@ import { NgModule, Optional, SkipSelf } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { HTTP_INTERCEPTORS, HttpClient, HttpClientModule } from '@angular/common/http';
 import { RouteReuseStrategy, RouterModule } from '@angular/router';
+
+// To be removed, replace by shared material module
 import { LayoutModule } from '@angular/cdk/layout';
 import { FlexLayoutModule } from '@angular/flex-layout';
 
diff --git a/src/app/shared/material.module.ts b/src/app/shared/material.module.ts
new file mode 100644
index 000000000..5c0c4aee8
--- /dev/null
+++ b/src/app/shared/material.module.ts
@@ -0,0 +1,81 @@
+import { NgModule } from '@angular/core';
+import { LayoutModule } from '@angular/cdk/layout';
+import { FlexLayoutModule } from '@angular/flex-layout';
+import {
+  MatAutocompleteModule,
+  MatButtonModule,
+  MatButtonToggleModule,
+  MatCardModule,
+  MatCheckboxModule,
+  MatChipsModule,
+  MatDatepickerModule,
+  MatDialogModule,
+  MatDividerModule,
+  MatExpansionModule,
+  MatFormFieldModule,
+  MatGridListModule,
+  MatIconModule,
+  MatInputModule,
+  MatListModule,
+  MatMenuModule,
+  MatNativeDateModule,
+  MatPaginatorModule,
+  MatProgressBarModule,
+  MatProgressSpinnerModule,
+  MatRadioModule,
+  MatSelectModule,
+  MatSidenavModule,
+  MatSliderModule,
+  MatSlideToggleModule,
+  MatSnackBarModule,
+  MatSortModule,
+  MatStepperModule,
+  MatTableModule,
+  MatTabsModule,
+  MatToolbarModule,
+  MatTooltipModule,
+  MatTreeModule
+} from '@angular/material';
+
+@NgModule({
+  imports: [],
+  declarations: [],
+  exports: [
+    FlexLayoutModule,
+    LayoutModule,
+    MatAutocompleteModule,
+    MatButtonModule,
+    MatButtonToggleModule,
+    MatCardModule,
+    MatCheckboxModule,
+    MatChipsModule,
+    MatDatepickerModule,
+    MatDialogModule,
+    MatDividerModule,
+    MatExpansionModule,
+    MatFormFieldModule,
+    MatGridListModule,
+    MatIconModule,
+    MatInputModule,
+    MatListModule,
+    MatMenuModule,
+    MatNativeDateModule,
+    MatPaginatorModule,
+    MatProgressBarModule,
+    MatProgressSpinnerModule,
+    MatRadioModule,
+    MatSelectModule,
+    MatSidenavModule,
+    MatSliderModule,
+    MatSlideToggleModule,
+    MatSnackBarModule,
+    MatSortModule,
+    MatStepperModule,
+    MatTableModule,
+    MatTabsModule,
+    MatToolbarModule,
+    MatTooltipModule,
+    MatTreeModule
+  ]
+})
+export class MaterialModule { }
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 714ef1c0d..ee613e850 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -3,13 +3,13 @@ import { CommonModule } from '@angular/common';
 
 import { LoaderComponent } from './loader/loader.component';
 import { FileUploadComponent } from './file-upload/file-upload.component';
-import { CoreModule } from '../core/core.module';
 import { DeleteDialogComponent } from './delete-dialog/delete-dialog.component';
+import { MaterialModule } from './material.module';
 
 @NgModule({
   imports: [
     CommonModule,
-    CoreModule
+    MaterialModule
   ],
   declarations: [
     LoaderComponent,
@@ -17,8 +17,10 @@ import { DeleteDialogComponent } from './delete-dialog/delete-dialog.component';
     DeleteDialogComponent
   ],
   exports: [
+    CommonModule,
+    FileUploadComponent,
     LoaderComponent,
-    FileUploadComponent
+    MaterialModule
   ],
   entryComponents: [
     DeleteDialogComponent
diff --git a/src/main.ts b/src/main.ts
index b9ee8df3b..45fa4c4a8 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,4 +1,4 @@
-/*
+/**
  * Entry point of the application.
  * Only platform bootstrapping code should be here.
  * For app-specific initialization, use `app/web-app.component.ts`.
@@ -7,6 +7,7 @@
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
+/** Provides gesture support for angular-material components */
 import 'hammerjs';
 
 import { AppModule } from './app/app.module';