diff --git a/apps/docs/src/app/core/component-docs/alert/alert-docs.component.ts b/apps/docs/src/app/core/component-docs/alert/alert-docs.component.ts
index d244a26e377..44fae06b526 100644
--- a/apps/docs/src/app/core/component-docs/alert/alert-docs.component.ts
+++ b/apps/docs/src/app/core/component-docs/alert/alert-docs.component.ts
@@ -95,6 +95,9 @@ export class AlertDocsComponent implements OnInit {
             fileName: 'alert-component-as-content-example',
             code: alertComponentAsContentExample,
             component: 'AlertComponentAsContentExampleComponent',
+            entryComponent: 'AlertContentComponent, AlertComponentAsContentExampleComponent',
+            declarationArray: 'AlertContentComponent',
+            imports: `import { AlertContentComponent } from './alert-content.component';`
 
         },
         {
@@ -103,14 +106,7 @@ export class AlertDocsComponent implements OnInit {
             name: 'Alert Content',
             fileName: 'alert-content',
             secondFile: 'alert-content'
-        },
-        {
-            language: 'typescript',
-            code: alertComponentAsContentExampleModule,
-            name: 'Module',
-            module: 'app.module.ts'
         }
-
     ];
 
     alertInlineExample: ExampleFile[] = [
diff --git a/apps/docs/src/app/core/component-docs/alert/examples/alert-component-as-content.module.ts b/apps/docs/src/app/core/component-docs/alert/examples/alert-component-as-content.module.ts
deleted file mode 100644
index b96a783f063..00000000000
--- a/apps/docs/src/app/core/component-docs/alert/examples/alert-component-as-content.module.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { FundamentalNgxCoreModule } from '@fundamental-ngx/core';
-import { HttpClientModule, HttpClient } from '@angular/common/http';
-import { RouterModule, Routes } from '@angular/router'
-import { AlertComponentAsContentExampleComponent } from './alert-component-as-content-example.component';
-import { AlertContentComponent } from './alert-content.component';
-
-
-@NgModule({
-    declarations: [
-    ],
-    imports: [
-        BrowserModule,
-        FormsModule,
-        HttpClientModule,
-        RouterModule.forRoot([{ path: '#', component: AlertComponentAsContentExampleComponent }],
-            { useHash: true }),
-        ReactiveFormsModule,
-        FundamentalNgxCoreModule,
-        BrowserAnimationsModule
-    ],
-    providers: [],
-    bootstrap: [AlertComponentAsContentExampleComponent],
-    entryComponents: [AlertContentComponent, AlertComponentAsContentExampleComponent
-
-    ]
-
-})
-export class AppModule { }
diff --git a/apps/docs/src/app/core/component-docs/modal/examples/stackable-modals/modal-in-modal-example.module.ts b/apps/docs/src/app/core/component-docs/modal/examples/stackable-modals/modal-in-modal-example.module.ts
deleted file mode 100644
index 508726f51b0..00000000000
--- a/apps/docs/src/app/core/component-docs/modal/examples/stackable-modals/modal-in-modal-example.module.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { FundamentalNgxCoreModule } from '@fundamental-ngx/core';
-import { RouterModule, Routes } from '@angular/router'
-import { ModalInModalComponent } from './modal-in-modal-stacked-example.component';
-import { ModalInModalFirstComponent } from './modal-in-modal-first-example.component';
-import { ModalInModalSecondComponent } from './modal-in-modal-second-example.component';
-import { ModalService, ModalRef } from '@fundamental-ngx/core';
-
-
-
-@NgModule({
-    declarations: [
-    ],
-    imports: [
-        BrowserModule,
-        FormsModule,
-        RouterModule.forRoot([{ path: '#', component: ModalInModalComponent }],
-            { useHash: true }),
-        ReactiveFormsModule,
-        FundamentalNgxCoreModule,
-        BrowserAnimationsModule
-    ],
-    providers: [ModalService, ModalRef],
-    entryComponents: [
-        ModalInModalSecondComponent,
-        ModalInModalFirstComponent,
-        ModalInModalComponent,
-    ],
-    bootstrap: [ModalInModalComponent]
-})
-export class AppModule { }
diff --git a/apps/docs/src/app/core/component-docs/modal/modal-docs.component.ts b/apps/docs/src/app/core/component-docs/modal/modal-docs.component.ts
index 88bc67a4247..d5216559748 100644
--- a/apps/docs/src/app/core/component-docs/modal/modal-docs.component.ts
+++ b/apps/docs/src/app/core/component-docs/modal/modal-docs.component.ts
@@ -97,6 +97,9 @@ export class ModalDocsComponent implements OnInit {
             secondFile: 'modal-content',
             fileName: 'modal-content',
             component: 'ModalContentComponent',
+            imports: `import { ModalContentComponent } from './modal-content.component';`,
+            entryComponent: 'ModalContentComponent, ModalComponentAsContentExampleComponent',
+            declarationArray: 'ModalContentComponent'
         },
         {
             language: 'typescript',
@@ -104,12 +107,6 @@ export class ModalDocsComponent implements OnInit {
             fileName: 'modal-component-as-content-example',
             component: 'ModalComponentAsContentExampleComponent',
         },
-        {
-            language: 'typescript',
-            code: componentAsContentModule,
-            name: 'Module',
-            module: 'app.module.ts',
-        },
     ];
 
     modalInModalExample: ExampleFile[] = [
@@ -120,7 +117,11 @@ export class ModalDocsComponent implements OnInit {
             name: 'Second Modal',
             thirdFile: 'modal-in-modal-second-example',
             fileName: 'modal-in-modal-second-example',
-            component: 'ModalInModalSecondComponent'
+            component: 'ModalInModalSecondComponent',
+            imports: `import { ModalInModalFirstComponent } from './modal-in-modal-first-example.component';
+            import { ModalInModalSecondComponent } from './modal-in-modal-second-example.component';`,
+            declarationArray: 'ModalInModalComponent, ModalInModalFirstComponent,ModalInModalSecondComponent',
+            entryComponent: 'ModalInModalComponent, ModalInModalFirstComponent, ModalInModalSecondComponent'
         },
         {
             language: 'typescript',
@@ -136,12 +137,6 @@ export class ModalDocsComponent implements OnInit {
             fileName: 'modal-in-modal-stacked-example',
             component: 'ModalInModalComponent'
         },
-        {
-            language: 'typescript',
-            code: modalInModalModule,
-            name: 'Module',
-            module: 'app.module.ts',
-        }
     ];
 
     fullScreenSource: ExampleFile[] = [
diff --git a/apps/docs/src/app/documentation/core-helpers/code-example/code-example.component.ts b/apps/docs/src/app/documentation/core-helpers/code-example/code-example.component.ts
index 055abe5bfc0..ab96bc5ac69 100644
--- a/apps/docs/src/app/documentation/core-helpers/code-example/code-example.component.ts
+++ b/apps/docs/src/app/documentation/core-helpers/code-example/code-example.component.ts
@@ -49,7 +49,10 @@ export class CodeExampleComponent implements OnInit, AfterViewInit {
         app_component_html: '',
         app_component_ts: '',
         app_component_html_path: '',
-        app_component_ts_path: ''
+        app_component_ts_path: '',
+        app_module_entryComponents: '',
+        app_module_imports: '',
+        app_module_declarationArray: ''
     };
 
     app_app_component = ``
@@ -139,6 +142,15 @@ export class CodeExampleComponent implements OnInit, AfterViewInit {
                 } else {
                     this.parameters.html_tag = 'fd-' + example.fileName;
                 }
+                if (example.entryComponent !== undefined) {
+                    this.parameters.app_module_entryComponents = example.entryComponent;
+                }
+                if (example.declarationArray !== undefined) {
+                    this.parameters.app_module_declarationArray = example.declarationArray;
+                }
+                if (example.imports !== undefined) {
+                    this.parameters.app_module_imports = example.imports;
+                }
                 this.parameters.app_module = 'AppModule';
                 this.parameters.app_module_file = 'app.module';
                 this.parameters.app_component = example.component;
@@ -181,24 +193,23 @@ export class CodeExampleComponent implements OnInit, AfterViewInit {
                     this.project.files[_pathTS] = example.typescriptFileCode.default;
                 }
             }
-            if (example.language === 'typescript' && (example.secondFile === undefined && example.thirdFile === undefined && example.module === undefined)) {
+            if (example.language === 'typescript' && (example.secondFile === undefined && example.thirdFile === undefined)) {
                 const _pathTS = `src/app/${example.fileName}.component.ts`;
                 this.project.files[_pathTS] = example.code.default;
             }
             // tslint:disable-next-line: max-line-length
-            else if (example.language === 'typescript' && (example.secondFile !== undefined && example.thirdFile === undefined && example.module === undefined)) {
+            else if (example.language === 'typescript' && (example.secondFile !== undefined && example.thirdFile === undefined)) {
                 const _pathTS2 = `src/app/${example.secondFile}.component.ts`;
                 this.project.files[_pathTS2] = example.code.default;
 
             }
             // tslint:disable-next-line: max-line-length
-            else if (example.language === 'typescript' && (example.thirdFile !== undefined && example.secondFile === undefined && example.module === undefined)) {
+            else if (example.language === 'typescript' && (example.thirdFile !== undefined && example.secondFile === undefined)) {
                 const _pathTS2 = `src/app/${example.thirdFile}.component.ts`;
                 this.project.files[_pathTS2] = example.code.default;
 
             }
-            if (example.module === undefined) {
-                this.project.files['src/app/app.module.ts'] = `
+            this.project.files['src/app/app.module.ts'] = `
                 import { BrowserModule } from '@angular/platform-browser';
                 import { NgModule } from '@angular/core';
                 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -212,11 +223,11 @@ export class CodeExampleComponent implements OnInit, AfterViewInit {
                 import { DragDropModule } from '@angular/cdk/drag-drop';
                 import {RouterModule, Routes} from '@angular/router'
                 import { ${this.parameters.app_component} } from './${this.parameters.app_component_basis}';
-
+                ${this.parameters.app_module_imports}
 
                 @NgModule({
                   declarations: [
-                    ${this.parameters.app_component},
+                    ${this.parameters.app_component},${this.parameters.app_module_declarationArray}
                   ],
                   imports: [
                     BrowserModule,
@@ -234,14 +245,11 @@ export class CodeExampleComponent implements OnInit, AfterViewInit {
                     BrowserAnimationsModule
                   ],
                   providers: [],
+                  entryComponents: [${this.parameters.app_module_entryComponents}],
                   bootstrap: [${this.parameters.app_component}]
                 })
                 export class ${this.parameters.app_module} { }
                 `;
-            }
-            else if (example.language === 'typescript' && example.secondFile === undefined && example.thirdFile === undefined && example.module !== undefined) {
-                this.project.files['src/app/app.module.ts'] = example.code.default;
-            }
         });
 
         this.project.files['src/index.html'] = `
diff --git a/apps/docs/src/app/documentation/core-helpers/code-example/example-file.ts b/apps/docs/src/app/documentation/core-helpers/code-example/example-file.ts
index c724cdb7271..8a76b4fdc58 100644
--- a/apps/docs/src/app/documentation/core-helpers/code-example/example-file.ts
+++ b/apps/docs/src/app/documentation/core-helpers/code-example/example-file.ts
@@ -11,10 +11,11 @@ export interface ExampleFile {
     scssFileCode?: {
         default: string
     };
-    module?: string;
     secondFile?: string;
     thirdFile?: string;
     component?: string;
     fileName?: string;
-    styleAddon?: string;
+    entryComponent?: string;
+    declarationArray?: string;
+    imports?: string;
 }