diff --git a/browser/gulpfile.js b/browser/gulpfile.js
index 6cfca5606..ce20d6f06 100644
--- a/browser/gulpfile.js
+++ b/browser/gulpfile.js
@@ -48,6 +48,7 @@ gulp.task('copySamples', gulp.series(browser.findSamples, browser.copySamples));
 gulp.task('generateSampleRouting', browser.generateSampleRouting);
 gulp.task('updateCodeViewer', gulp.series(browser.findSamples, browser.updateCodeViewer));
 gulp.task('listSamples', browser.listSamples);
+gulp.task('moveAppFiles', browser.moveAppFiles);
 
 gulp.task("overwrite-package-json", (done) => {
     const packagesPaths = [
diff --git a/browser/scripts/browser.js b/browser/scripts/browser.js
index 75d2ab2f1..3ecc7f8d0 100644
--- a/browser/scripts/browser.js
+++ b/browser/scripts/browser.js
@@ -725,6 +725,7 @@ function copySamples(cb) {
         for (let i = appIndexRoutingImportStart+1; i < appIndexRoutingImportEnd; i++) {
             appIndexLines[i] = ""; // clearing previously auto-generated inserts
         }
+        routingDataImports = routingDataImports.sort();
         // adding latest auto-generated inserts for JS files
         appIndexLines[appIndexRoutingImportStart + 1] = routingDataImports.join('\r\n');
         appIndexChanged = true;
@@ -734,6 +735,7 @@ function copySamples(cb) {
         for (let i = appIndexRoutingArrayStart+1; i < appIndexRoutingArrayEnd; i++) {
             appIndexLines[i] = ""; // clearing previously auto-generated inserts
         }
+        routingDataArray = routingDataArray.sort();
         // adding latest auto-generated inserts for JS files
         appIndexLines[appIndexRoutingArrayStart + 1] = routingDataArray.join(',\r\n');
         appIndexChanged = true;
@@ -1298,3 +1300,41 @@ function logVersionIgniteUI(cb) {
 } exports.logVersionIgniteUI = logVersionIgniteUI;
 
 
+// move samples files up one level, e.g. /scr/app/*.* to /scr/*.* 
+exports.moveAppFiles = function moveAppFiles(cb) {
+    var appFolders = [];
+
+    gulp.src(
+        "../samples/**/src/app/*.*", 
+        "../samples/**/type-scatter-symbol-series/src/app/*.*", 
+    {allowEmpty: true})
+    .pipe(es.map(function(file, fileCallback) {
+       
+        var fileContent = file.contents.toString();
+        let fileOutput = file.dirname.replace("\\app", "") + "\\" + file.basename; 
+        
+        if (appFolders.indexOf(file.dirname) < 0) {
+            appFolders.push(file.dirname);
+        }
+        // console.log("" + fileOutput);
+
+        fs.writeFileSync(fileOutput, fileContent);
+         fileCallback(null, file);
+    }))
+    .on("end", function() {
+        
+        console.log(appFolders);
+        console.log("moved " + appFolders.length + " samples from /scr/app/*.* to /scr/*.* ");
+        del(appFolders, {force: true});
+
+        for (let i = 0; i < appFolders.length; i++) {
+            
+            var mainPath = appFolders[i].replace("\\app", "") + "\\main.ts";
+            let mainFile = fs.readFileSync(mainPath).toString();
+            mainFile = mainFile.replace("/app/", "/");
+            fs.writeFileSync(mainPath, mainFile);
+         }
+        cb();
+    });
+
+} 
\ No newline at end of file
diff --git a/browser/src/app/index/index.component.ts b/browser/src/app/index/index.component.ts
index 2700cd69a..6213578a9 100644
--- a/browser/src/app/index/index.component.ts
+++ b/browser/src/app/index/index.component.ts
@@ -9,8 +9,8 @@ import BrowserInfo  from "../../browser-info.json";
 // note these section is auto-generated - do not change it:
 // Auto-Insert-Imports-RoutingData-Start
 import { RoutingDataForCharts } from "../../samples/charts/routing-data";
-import { RoutingDataForGauges } from "../../samples/gauges/routing-data";
 import { RoutingDataForExcel } from "../../samples/excel/routing-data";
+import { RoutingDataForGauges } from "../../samples/gauges/routing-data";
 import { RoutingDataForMaps } from "../../samples/maps/routing-data";
 
 
@@ -48,8 +48,8 @@ export class IndexComponent implements OnInit, AfterViewInit {
     private modulesRoutes = [
         // Auto-Insert-SamplesRoutingArray-Start
         { path: "charts", routesData: RoutingDataForCharts },
-        { path: "gauges", routesData: RoutingDataForGauges },
         { path: "excel", routesData: RoutingDataForExcel },
+        { path: "gauges", routesData: RoutingDataForGauges },
         { path: "maps", routesData: RoutingDataForMaps }
 
 
diff --git a/samples/charts/category-chart/annotations/src/app/app.component.html b/samples/charts/category-chart/annotations/src/app.component.html
similarity index 100%
rename from samples/charts/category-chart/annotations/src/app/app.component.html
rename to samples/charts/category-chart/annotations/src/app.component.html
diff --git a/samples/charts/category-chart/annotations/src/app/app.component.scss b/samples/charts/category-chart/annotations/src/app.component.scss
similarity index 100%
rename from samples/charts/category-chart/annotations/src/app/app.component.scss
rename to samples/charts/category-chart/annotations/src/app.component.scss
diff --git a/samples/charts/category-chart/annotations/src/app/app.component.ts b/samples/charts/category-chart/annotations/src/app.component.ts
similarity index 100%
rename from samples/charts/category-chart/annotations/src/app/app.component.ts
rename to samples/charts/category-chart/annotations/src/app.component.ts
diff --git a/samples/charts/category-chart/annotations/src/app/app.module.ts b/samples/charts/category-chart/annotations/src/app.module.ts
similarity index 100%
rename from samples/charts/category-chart/annotations/src/app/app.module.ts
rename to samples/charts/category-chart/annotations/src/app.module.ts
diff --git a/samples/charts/category-chart/annotations/src/main.ts b/samples/charts/category-chart/annotations/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/category-chart/annotations/src/main.ts
+++ b/samples/charts/category-chart/annotations/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/category-chart/column-chart-with-highlighting/src/app/app.component.html b/samples/charts/category-chart/column-chart-with-highlighting/src/app.component.html
similarity index 100%
rename from samples/charts/category-chart/column-chart-with-highlighting/src/app/app.component.html
rename to samples/charts/category-chart/column-chart-with-highlighting/src/app.component.html
diff --git a/samples/charts/category-chart/column-chart-with-highlighting/src/app/app.component.scss b/samples/charts/category-chart/column-chart-with-highlighting/src/app.component.scss
similarity index 100%
rename from samples/charts/category-chart/column-chart-with-highlighting/src/app/app.component.scss
rename to samples/charts/category-chart/column-chart-with-highlighting/src/app.component.scss
diff --git a/samples/charts/category-chart/column-chart-with-highlighting/src/app/app.component.ts b/samples/charts/category-chart/column-chart-with-highlighting/src/app.component.ts
similarity index 100%
rename from samples/charts/category-chart/column-chart-with-highlighting/src/app/app.component.ts
rename to samples/charts/category-chart/column-chart-with-highlighting/src/app.component.ts
diff --git a/samples/charts/category-chart/column-chart-with-highlighting/src/app/app.module.ts b/samples/charts/category-chart/column-chart-with-highlighting/src/app.module.ts
similarity index 100%
rename from samples/charts/category-chart/column-chart-with-highlighting/src/app/app.module.ts
rename to samples/charts/category-chart/column-chart-with-highlighting/src/app.module.ts
diff --git a/samples/charts/category-chart/column-chart-with-highlighting/src/main.ts b/samples/charts/category-chart/column-chart-with-highlighting/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/category-chart/column-chart-with-highlighting/src/main.ts
+++ b/samples/charts/category-chart/column-chart-with-highlighting/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/category-chart/high-frequency/src/app/app.component.html b/samples/charts/category-chart/high-frequency/src/app.component.html
similarity index 100%
rename from samples/charts/category-chart/high-frequency/src/app/app.component.html
rename to samples/charts/category-chart/high-frequency/src/app.component.html
diff --git a/samples/charts/category-chart/high-frequency/src/app/app.component.scss b/samples/charts/category-chart/high-frequency/src/app.component.scss
similarity index 100%
rename from samples/charts/category-chart/high-frequency/src/app/app.component.scss
rename to samples/charts/category-chart/high-frequency/src/app.component.scss
diff --git a/samples/charts/category-chart/high-frequency/src/app/app.component.ts b/samples/charts/category-chart/high-frequency/src/app.component.ts
similarity index 100%
rename from samples/charts/category-chart/high-frequency/src/app/app.component.ts
rename to samples/charts/category-chart/high-frequency/src/app.component.ts
diff --git a/samples/charts/category-chart/high-frequency/src/app/app.module.ts b/samples/charts/category-chart/high-frequency/src/app.module.ts
similarity index 100%
rename from samples/charts/category-chart/high-frequency/src/app/app.module.ts
rename to samples/charts/category-chart/high-frequency/src/app.module.ts
diff --git a/samples/charts/category-chart/high-frequency/src/main.ts b/samples/charts/category-chart/high-frequency/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/category-chart/high-frequency/src/main.ts
+++ b/samples/charts/category-chart/high-frequency/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/category-chart/high-volume/src/app/app.component.html b/samples/charts/category-chart/high-volume/src/app.component.html
similarity index 100%
rename from samples/charts/category-chart/high-volume/src/app/app.component.html
rename to samples/charts/category-chart/high-volume/src/app.component.html
diff --git a/samples/charts/category-chart/high-volume/src/app/app.component.scss b/samples/charts/category-chart/high-volume/src/app.component.scss
similarity index 100%
rename from samples/charts/category-chart/high-volume/src/app/app.component.scss
rename to samples/charts/category-chart/high-volume/src/app.component.scss
diff --git a/samples/charts/category-chart/high-volume/src/app/app.component.ts b/samples/charts/category-chart/high-volume/src/app.component.ts
similarity index 100%
rename from samples/charts/category-chart/high-volume/src/app/app.component.ts
rename to samples/charts/category-chart/high-volume/src/app.component.ts
diff --git a/samples/charts/category-chart/high-volume/src/app/app.module.ts b/samples/charts/category-chart/high-volume/src/app.module.ts
similarity index 100%
rename from samples/charts/category-chart/high-volume/src/app/app.module.ts
rename to samples/charts/category-chart/high-volume/src/app.module.ts
diff --git a/samples/charts/category-chart/high-volume/src/main.ts b/samples/charts/category-chart/high-volume/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/category-chart/high-volume/src/main.ts
+++ b/samples/charts/category-chart/high-volume/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/category-chart/highlighting/src/app/app.component.html b/samples/charts/category-chart/highlighting/src/app.component.html
similarity index 100%
rename from samples/charts/category-chart/highlighting/src/app/app.component.html
rename to samples/charts/category-chart/highlighting/src/app.component.html
diff --git a/samples/charts/category-chart/highlighting/src/app/app.component.scss b/samples/charts/category-chart/highlighting/src/app.component.scss
similarity index 100%
rename from samples/charts/category-chart/highlighting/src/app/app.component.scss
rename to samples/charts/category-chart/highlighting/src/app.component.scss
diff --git a/samples/charts/category-chart/highlighting/src/app/app.component.ts b/samples/charts/category-chart/highlighting/src/app.component.ts
similarity index 100%
rename from samples/charts/category-chart/highlighting/src/app/app.component.ts
rename to samples/charts/category-chart/highlighting/src/app.component.ts
diff --git a/samples/charts/category-chart/highlighting/src/app/app.module.ts b/samples/charts/category-chart/highlighting/src/app.module.ts
similarity index 100%
rename from samples/charts/category-chart/highlighting/src/app/app.module.ts
rename to samples/charts/category-chart/highlighting/src/app.module.ts
diff --git a/samples/charts/category-chart/highlighting/src/main.ts b/samples/charts/category-chart/highlighting/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/category-chart/highlighting/src/main.ts
+++ b/samples/charts/category-chart/highlighting/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/category-chart/line-chart-with-animations/src/app/app.component.html b/samples/charts/category-chart/line-chart-with-animations/src/app.component.html
similarity index 100%
rename from samples/charts/category-chart/line-chart-with-animations/src/app/app.component.html
rename to samples/charts/category-chart/line-chart-with-animations/src/app.component.html
diff --git a/samples/charts/category-chart/line-chart-with-animations/src/app/app.component.scss b/samples/charts/category-chart/line-chart-with-animations/src/app.component.scss
similarity index 100%
rename from samples/charts/category-chart/line-chart-with-animations/src/app/app.component.scss
rename to samples/charts/category-chart/line-chart-with-animations/src/app.component.scss
diff --git a/samples/charts/category-chart/line-chart-with-animations/src/app/app.component.ts b/samples/charts/category-chart/line-chart-with-animations/src/app.component.ts
similarity index 100%
rename from samples/charts/category-chart/line-chart-with-animations/src/app/app.component.ts
rename to samples/charts/category-chart/line-chart-with-animations/src/app.component.ts
diff --git a/samples/charts/category-chart/line-chart-with-animations/src/app/app.module.ts b/samples/charts/category-chart/line-chart-with-animations/src/app.module.ts
similarity index 100%
rename from samples/charts/category-chart/line-chart-with-animations/src/app/app.module.ts
rename to samples/charts/category-chart/line-chart-with-animations/src/app.module.ts
diff --git a/samples/charts/category-chart/line-chart-with-animations/src/main.ts b/samples/charts/category-chart/line-chart-with-animations/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/category-chart/line-chart-with-animations/src/main.ts
+++ b/samples/charts/category-chart/line-chart-with-animations/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/category-chart/line-chart-with-annotations/src/app/app.component.html b/samples/charts/category-chart/line-chart-with-annotations/src/app.component.html
similarity index 100%
rename from samples/charts/category-chart/line-chart-with-annotations/src/app/app.component.html
rename to samples/charts/category-chart/line-chart-with-annotations/src/app.component.html
diff --git a/samples/charts/category-chart/line-chart-with-annotations/src/app/app.component.scss b/samples/charts/category-chart/line-chart-with-annotations/src/app.component.scss
similarity index 100%
rename from samples/charts/category-chart/line-chart-with-annotations/src/app/app.component.scss
rename to samples/charts/category-chart/line-chart-with-annotations/src/app.component.scss
diff --git a/samples/charts/category-chart/line-chart-with-annotations/src/app/app.component.ts b/samples/charts/category-chart/line-chart-with-annotations/src/app.component.ts
similarity index 100%
rename from samples/charts/category-chart/line-chart-with-annotations/src/app/app.component.ts
rename to samples/charts/category-chart/line-chart-with-annotations/src/app.component.ts
diff --git a/samples/charts/category-chart/line-chart-with-annotations/src/app/app.module.ts b/samples/charts/category-chart/line-chart-with-annotations/src/app.module.ts
similarity index 100%
rename from samples/charts/category-chart/line-chart-with-annotations/src/app/app.module.ts
rename to samples/charts/category-chart/line-chart-with-annotations/src/app.module.ts
diff --git a/samples/charts/category-chart/line-chart-with-annotations/src/main.ts b/samples/charts/category-chart/line-chart-with-annotations/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/category-chart/line-chart-with-annotations/src/main.ts
+++ b/samples/charts/category-chart/line-chart-with-annotations/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/category-chart/line-chart-with-legend/src/app/app.component.html b/samples/charts/category-chart/line-chart-with-legend/src/app.component.html
similarity index 100%
rename from samples/charts/category-chart/line-chart-with-legend/src/app/app.component.html
rename to samples/charts/category-chart/line-chart-with-legend/src/app.component.html
diff --git a/samples/charts/category-chart/line-chart-with-legend/src/app/app.component.scss b/samples/charts/category-chart/line-chart-with-legend/src/app.component.scss
similarity index 100%
rename from samples/charts/category-chart/line-chart-with-legend/src/app/app.component.scss
rename to samples/charts/category-chart/line-chart-with-legend/src/app.component.scss
diff --git a/samples/charts/category-chart/line-chart-with-legend/src/app/app.component.ts b/samples/charts/category-chart/line-chart-with-legend/src/app.component.ts
similarity index 100%
rename from samples/charts/category-chart/line-chart-with-legend/src/app/app.component.ts
rename to samples/charts/category-chart/line-chart-with-legend/src/app.component.ts
diff --git a/samples/charts/category-chart/line-chart-with-legend/src/app/app.module.ts b/samples/charts/category-chart/line-chart-with-legend/src/app.module.ts
similarity index 100%
rename from samples/charts/category-chart/line-chart-with-legend/src/app/app.module.ts
rename to samples/charts/category-chart/line-chart-with-legend/src/app.module.ts
diff --git a/samples/charts/category-chart/line-chart-with-legend/src/main.ts b/samples/charts/category-chart/line-chart-with-legend/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/category-chart/line-chart-with-legend/src/main.ts
+++ b/samples/charts/category-chart/line-chart-with-legend/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/category-chart/marker-templates/src/app/app.component.html b/samples/charts/category-chart/marker-templates/src/app.component.html
similarity index 100%
rename from samples/charts/category-chart/marker-templates/src/app/app.component.html
rename to samples/charts/category-chart/marker-templates/src/app.component.html
diff --git a/samples/charts/category-chart/marker-templates/src/app/app.component.scss b/samples/charts/category-chart/marker-templates/src/app.component.scss
similarity index 100%
rename from samples/charts/category-chart/marker-templates/src/app/app.component.scss
rename to samples/charts/category-chart/marker-templates/src/app.component.scss
diff --git a/samples/charts/category-chart/marker-templates/src/app/app.component.ts b/samples/charts/category-chart/marker-templates/src/app.component.ts
similarity index 100%
rename from samples/charts/category-chart/marker-templates/src/app/app.component.ts
rename to samples/charts/category-chart/marker-templates/src/app.component.ts
diff --git a/samples/charts/category-chart/marker-templates/src/app/app.module.ts b/samples/charts/category-chart/marker-templates/src/app.module.ts
similarity index 100%
rename from samples/charts/category-chart/marker-templates/src/app/app.module.ts
rename to samples/charts/category-chart/marker-templates/src/app.module.ts
diff --git a/samples/charts/category-chart/marker-templates/src/main.ts b/samples/charts/category-chart/marker-templates/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/category-chart/marker-templates/src/main.ts
+++ b/samples/charts/category-chart/marker-templates/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/category-chart/stack-columns/src/app/app.component.html b/samples/charts/category-chart/stack-columns/src/app.component.html
similarity index 100%
rename from samples/charts/category-chart/stack-columns/src/app/app.component.html
rename to samples/charts/category-chart/stack-columns/src/app.component.html
diff --git a/samples/charts/category-chart/stack-columns/src/app/app.component.scss b/samples/charts/category-chart/stack-columns/src/app.component.scss
similarity index 100%
rename from samples/charts/category-chart/stack-columns/src/app/app.component.scss
rename to samples/charts/category-chart/stack-columns/src/app.component.scss
diff --git a/samples/charts/category-chart/stack-columns/src/app/app.component.ts b/samples/charts/category-chart/stack-columns/src/app.component.ts
similarity index 100%
rename from samples/charts/category-chart/stack-columns/src/app/app.component.ts
rename to samples/charts/category-chart/stack-columns/src/app.component.ts
diff --git a/samples/charts/category-chart/stack-columns/src/app/app.module.ts b/samples/charts/category-chart/stack-columns/src/app.module.ts
similarity index 100%
rename from samples/charts/category-chart/stack-columns/src/app/app.module.ts
rename to samples/charts/category-chart/stack-columns/src/app.module.ts
diff --git a/samples/charts/category-chart/stack-columns/src/main.ts b/samples/charts/category-chart/stack-columns/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/category-chart/stack-columns/src/main.ts
+++ b/samples/charts/category-chart/stack-columns/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/category-chart/tooltip-template/src/app/app.component.html b/samples/charts/category-chart/tooltip-template/src/app.component.html
similarity index 100%
rename from samples/charts/category-chart/tooltip-template/src/app/app.component.html
rename to samples/charts/category-chart/tooltip-template/src/app.component.html
diff --git a/samples/charts/category-chart/tooltip-template/src/app/app.component.scss b/samples/charts/category-chart/tooltip-template/src/app.component.scss
similarity index 100%
rename from samples/charts/category-chart/tooltip-template/src/app/app.component.scss
rename to samples/charts/category-chart/tooltip-template/src/app.component.scss
diff --git a/samples/charts/category-chart/tooltip-template/src/app/app.component.ts b/samples/charts/category-chart/tooltip-template/src/app.component.ts
similarity index 100%
rename from samples/charts/category-chart/tooltip-template/src/app/app.component.ts
rename to samples/charts/category-chart/tooltip-template/src/app.component.ts
diff --git a/samples/charts/category-chart/tooltip-template/src/app/app.module.ts b/samples/charts/category-chart/tooltip-template/src/app.module.ts
similarity index 100%
rename from samples/charts/category-chart/tooltip-template/src/app/app.module.ts
rename to samples/charts/category-chart/tooltip-template/src/app.module.ts
diff --git a/samples/charts/category-chart/tooltip-template/src/main.ts b/samples/charts/category-chart/tooltip-template/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/category-chart/tooltip-template/src/main.ts
+++ b/samples/charts/category-chart/tooltip-template/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/category-chart/tooltip-types/src/app/app.component.html b/samples/charts/category-chart/tooltip-types/src/app.component.html
similarity index 100%
rename from samples/charts/category-chart/tooltip-types/src/app/app.component.html
rename to samples/charts/category-chart/tooltip-types/src/app.component.html
diff --git a/samples/charts/category-chart/tooltip-types/src/app/app.component.scss b/samples/charts/category-chart/tooltip-types/src/app.component.scss
similarity index 100%
rename from samples/charts/category-chart/tooltip-types/src/app/app.component.scss
rename to samples/charts/category-chart/tooltip-types/src/app.component.scss
diff --git a/samples/charts/category-chart/tooltip-types/src/app/app.component.ts b/samples/charts/category-chart/tooltip-types/src/app.component.ts
similarity index 100%
rename from samples/charts/category-chart/tooltip-types/src/app/app.component.ts
rename to samples/charts/category-chart/tooltip-types/src/app.component.ts
diff --git a/samples/charts/category-chart/tooltip-types/src/app/app.module.ts b/samples/charts/category-chart/tooltip-types/src/app.module.ts
similarity index 100%
rename from samples/charts/category-chart/tooltip-types/src/app/app.module.ts
rename to samples/charts/category-chart/tooltip-types/src/app.module.ts
diff --git a/samples/charts/category-chart/tooltip-types/src/main.ts b/samples/charts/category-chart/tooltip-types/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/category-chart/tooltip-types/src/main.ts
+++ b/samples/charts/category-chart/tooltip-types/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/category-chart/trendline/src/app/app.component.html b/samples/charts/category-chart/trendline/src/app.component.html
similarity index 100%
rename from samples/charts/category-chart/trendline/src/app/app.component.html
rename to samples/charts/category-chart/trendline/src/app.component.html
diff --git a/samples/charts/category-chart/trendline/src/app/app.component.scss b/samples/charts/category-chart/trendline/src/app.component.scss
similarity index 100%
rename from samples/charts/category-chart/trendline/src/app/app.component.scss
rename to samples/charts/category-chart/trendline/src/app.component.scss
diff --git a/samples/charts/category-chart/trendline/src/app/app.component.ts b/samples/charts/category-chart/trendline/src/app.component.ts
similarity index 100%
rename from samples/charts/category-chart/trendline/src/app/app.component.ts
rename to samples/charts/category-chart/trendline/src/app.component.ts
diff --git a/samples/charts/category-chart/trendline/src/app/app.module.ts b/samples/charts/category-chart/trendline/src/app.module.ts
similarity index 100%
rename from samples/charts/category-chart/trendline/src/app/app.module.ts
rename to samples/charts/category-chart/trendline/src/app.module.ts
diff --git a/samples/charts/category-chart/trendline/src/main.ts b/samples/charts/category-chart/trendline/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/category-chart/trendline/src/main.ts
+++ b/samples/charts/category-chart/trendline/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/axis-annotations/src/app/app.component.html b/samples/charts/data-chart/axis-annotations/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/axis-annotations/src/app/app.component.html
rename to samples/charts/data-chart/axis-annotations/src/app.component.html
diff --git a/samples/charts/data-chart/axis-annotations/src/app/app.component.scss b/samples/charts/data-chart/axis-annotations/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/axis-annotations/src/app/app.component.scss
rename to samples/charts/data-chart/axis-annotations/src/app.component.scss
diff --git a/samples/charts/data-chart/axis-annotations/src/app/app.component.ts b/samples/charts/data-chart/axis-annotations/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/axis-annotations/src/app/app.component.ts
rename to samples/charts/data-chart/axis-annotations/src/app.component.ts
diff --git a/samples/charts/data-chart/axis-annotations/src/app/app.module.ts b/samples/charts/data-chart/axis-annotations/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/axis-annotations/src/app/app.module.ts
rename to samples/charts/data-chart/axis-annotations/src/app.module.ts
diff --git a/samples/charts/data-chart/axis-annotations/src/main.ts b/samples/charts/data-chart/axis-annotations/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/axis-annotations/src/main.ts
+++ b/samples/charts/data-chart/axis-annotations/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/axis-crossing/src/app/app.component.html b/samples/charts/data-chart/axis-crossing/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/axis-crossing/src/app/app.component.html
rename to samples/charts/data-chart/axis-crossing/src/app.component.html
diff --git a/samples/charts/data-chart/axis-crossing/src/app/app.component.scss b/samples/charts/data-chart/axis-crossing/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/axis-crossing/src/app/app.component.scss
rename to samples/charts/data-chart/axis-crossing/src/app.component.scss
diff --git a/samples/charts/data-chart/axis-crossing/src/app/app.component.ts b/samples/charts/data-chart/axis-crossing/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/axis-crossing/src/app/app.component.ts
rename to samples/charts/data-chart/axis-crossing/src/app.component.ts
diff --git a/samples/charts/data-chart/axis-crossing/src/app/app.module.ts b/samples/charts/data-chart/axis-crossing/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/axis-crossing/src/app/app.module.ts
rename to samples/charts/data-chart/axis-crossing/src/app.module.ts
diff --git a/samples/charts/data-chart/axis-crossing/src/main.ts b/samples/charts/data-chart/axis-crossing/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/axis-crossing/src/main.ts
+++ b/samples/charts/data-chart/axis-crossing/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/axis-locations/src/app/app.component.html b/samples/charts/data-chart/axis-locations/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/axis-locations/src/app/app.component.html
rename to samples/charts/data-chart/axis-locations/src/app.component.html
diff --git a/samples/charts/data-chart/axis-locations/src/app/app.component.scss b/samples/charts/data-chart/axis-locations/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/axis-locations/src/app/app.component.scss
rename to samples/charts/data-chart/axis-locations/src/app.component.scss
diff --git a/samples/charts/data-chart/axis-locations/src/app/app.component.ts b/samples/charts/data-chart/axis-locations/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/axis-locations/src/app/app.component.ts
rename to samples/charts/data-chart/axis-locations/src/app.component.ts
diff --git a/samples/charts/data-chart/axis-locations/src/app/app.module.ts b/samples/charts/data-chart/axis-locations/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/axis-locations/src/app/app.module.ts
rename to samples/charts/data-chart/axis-locations/src/app.module.ts
diff --git a/samples/charts/data-chart/axis-locations/src/main.ts b/samples/charts/data-chart/axis-locations/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/axis-locations/src/main.ts
+++ b/samples/charts/data-chart/axis-locations/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/axis-settings/src/app/SharedData.ts b/samples/charts/data-chart/axis-settings/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/axis-settings/src/app/SharedData.ts
rename to samples/charts/data-chart/axis-settings/src/SharedData.ts
diff --git a/samples/charts/data-chart/axis-settings/src/app/app.component.html b/samples/charts/data-chart/axis-settings/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/axis-settings/src/app/app.component.html
rename to samples/charts/data-chart/axis-settings/src/app.component.html
diff --git a/samples/charts/data-chart/axis-settings/src/app/app.component.scss b/samples/charts/data-chart/axis-settings/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/axis-settings/src/app/app.component.scss
rename to samples/charts/data-chart/axis-settings/src/app.component.scss
diff --git a/samples/charts/data-chart/axis-settings/src/app/app.component.ts b/samples/charts/data-chart/axis-settings/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/axis-settings/src/app/app.component.ts
rename to samples/charts/data-chart/axis-settings/src/app.component.ts
diff --git a/samples/charts/data-chart/axis-settings/src/app/app.module.ts b/samples/charts/data-chart/axis-settings/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/axis-settings/src/app/app.module.ts
rename to samples/charts/data-chart/axis-settings/src/app.module.ts
diff --git a/samples/charts/data-chart/axis-settings/src/main.ts b/samples/charts/data-chart/axis-settings/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/axis-settings/src/main.ts
+++ b/samples/charts/data-chart/axis-settings/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/axis-sharing/src/app/SampleFinancialData.ts b/samples/charts/data-chart/axis-sharing/src/SampleFinancialData.ts
similarity index 100%
rename from samples/charts/data-chart/axis-sharing/src/app/SampleFinancialData.ts
rename to samples/charts/data-chart/axis-sharing/src/SampleFinancialData.ts
diff --git a/samples/charts/data-chart/axis-sharing/src/app/app.component.html b/samples/charts/data-chart/axis-sharing/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/axis-sharing/src/app/app.component.html
rename to samples/charts/data-chart/axis-sharing/src/app.component.html
diff --git a/samples/charts/data-chart/axis-sharing/src/app/app.component.scss b/samples/charts/data-chart/axis-sharing/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/axis-sharing/src/app/app.component.scss
rename to samples/charts/data-chart/axis-sharing/src/app.component.scss
diff --git a/samples/charts/data-chart/axis-sharing/src/app/app.component.ts b/samples/charts/data-chart/axis-sharing/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/axis-sharing/src/app/app.component.ts
rename to samples/charts/data-chart/axis-sharing/src/app.component.ts
diff --git a/samples/charts/data-chart/axis-sharing/src/app/app.module.ts b/samples/charts/data-chart/axis-sharing/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/axis-sharing/src/app/app.module.ts
rename to samples/charts/data-chart/axis-sharing/src/app.module.ts
diff --git a/samples/charts/data-chart/axis-sharing/src/main.ts b/samples/charts/data-chart/axis-sharing/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/axis-sharing/src/main.ts
+++ b/samples/charts/data-chart/axis-sharing/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/axis-types/src/app/SampleCategoryData.ts b/samples/charts/data-chart/axis-types/src/SampleCategoryData.ts
similarity index 100%
rename from samples/charts/data-chart/axis-types/src/app/SampleCategoryData.ts
rename to samples/charts/data-chart/axis-types/src/SampleCategoryData.ts
diff --git a/samples/charts/data-chart/axis-types/src/app/SampleFinancialData.ts b/samples/charts/data-chart/axis-types/src/SampleFinancialData.ts
similarity index 100%
rename from samples/charts/data-chart/axis-types/src/app/SampleFinancialData.ts
rename to samples/charts/data-chart/axis-types/src/SampleFinancialData.ts
diff --git a/samples/charts/data-chart/axis-types/src/app/SampleScatterData.ts b/samples/charts/data-chart/axis-types/src/SampleScatterData.ts
similarity index 100%
rename from samples/charts/data-chart/axis-types/src/app/SampleScatterData.ts
rename to samples/charts/data-chart/axis-types/src/SampleScatterData.ts
diff --git a/samples/charts/data-chart/axis-types/src/app/app.component.html b/samples/charts/data-chart/axis-types/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/axis-types/src/app/app.component.html
rename to samples/charts/data-chart/axis-types/src/app.component.html
diff --git a/samples/charts/data-chart/axis-types/src/app/app.component.scss b/samples/charts/data-chart/axis-types/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/axis-types/src/app/app.component.scss
rename to samples/charts/data-chart/axis-types/src/app.component.scss
diff --git a/samples/charts/data-chart/axis-types/src/app/app.component.ts b/samples/charts/data-chart/axis-types/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/axis-types/src/app/app.component.ts
rename to samples/charts/data-chart/axis-types/src/app.component.ts
diff --git a/samples/charts/data-chart/axis-types/src/app/app.module.ts b/samples/charts/data-chart/axis-types/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/axis-types/src/app/app.module.ts
rename to samples/charts/data-chart/axis-types/src/app.module.ts
diff --git a/samples/charts/data-chart/axis-types/src/main.ts b/samples/charts/data-chart/axis-types/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/axis-types/src/main.ts
+++ b/samples/charts/data-chart/axis-types/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/chart-navigation/src/app/SampleScatterStats.ts b/samples/charts/data-chart/chart-navigation/src/SampleScatterStats.ts
similarity index 100%
rename from samples/charts/data-chart/chart-navigation/src/app/SampleScatterStats.ts
rename to samples/charts/data-chart/chart-navigation/src/SampleScatterStats.ts
diff --git a/samples/charts/data-chart/chart-navigation/src/app/app.component.html b/samples/charts/data-chart/chart-navigation/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/chart-navigation/src/app/app.component.html
rename to samples/charts/data-chart/chart-navigation/src/app.component.html
diff --git a/samples/charts/data-chart/chart-navigation/src/app/app.component.scss b/samples/charts/data-chart/chart-navigation/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/chart-navigation/src/app/app.component.scss
rename to samples/charts/data-chart/chart-navigation/src/app.component.scss
diff --git a/samples/charts/data-chart/chart-navigation/src/app/app.component.ts b/samples/charts/data-chart/chart-navigation/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/chart-navigation/src/app/app.component.ts
rename to samples/charts/data-chart/chart-navigation/src/app.component.ts
diff --git a/samples/charts/data-chart/chart-navigation/src/app/app.module.ts b/samples/charts/data-chart/chart-navigation/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/chart-navigation/src/app/app.module.ts
rename to samples/charts/data-chart/chart-navigation/src/app.module.ts
diff --git a/samples/charts/data-chart/chart-navigation/src/main.ts b/samples/charts/data-chart/chart-navigation/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/chart-navigation/src/main.ts
+++ b/samples/charts/data-chart/chart-navigation/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/chart-overview/src/app/SampleScatterStats.ts b/samples/charts/data-chart/chart-overview/src/SampleScatterStats.ts
similarity index 100%
rename from samples/charts/data-chart/chart-overview/src/app/SampleScatterStats.ts
rename to samples/charts/data-chart/chart-overview/src/SampleScatterStats.ts
diff --git a/samples/charts/data-chart/chart-overview/src/app/app.component.html b/samples/charts/data-chart/chart-overview/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/chart-overview/src/app/app.component.html
rename to samples/charts/data-chart/chart-overview/src/app.component.html
diff --git a/samples/charts/data-chart/chart-overview/src/app/app.component.scss b/samples/charts/data-chart/chart-overview/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/chart-overview/src/app/app.component.scss
rename to samples/charts/data-chart/chart-overview/src/app.component.scss
diff --git a/samples/charts/data-chart/chart-overview/src/app/app.component.ts b/samples/charts/data-chart/chart-overview/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/chart-overview/src/app/app.component.ts
rename to samples/charts/data-chart/chart-overview/src/app.component.ts
diff --git a/samples/charts/data-chart/chart-overview/src/app/app.module.ts b/samples/charts/data-chart/chart-overview/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/chart-overview/src/app/app.module.ts
rename to samples/charts/data-chart/chart-overview/src/app.module.ts
diff --git a/samples/charts/data-chart/chart-overview/src/main.ts b/samples/charts/data-chart/chart-overview/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/chart-overview/src/main.ts
+++ b/samples/charts/data-chart/chart-overview/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/chart-performance/src/app/SharedData.ts b/samples/charts/data-chart/chart-performance/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/chart-performance/src/app/SharedData.ts
rename to samples/charts/data-chart/chart-performance/src/SharedData.ts
diff --git a/samples/charts/data-chart/chart-performance/src/app/app.component.html b/samples/charts/data-chart/chart-performance/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/chart-performance/src/app/app.component.html
rename to samples/charts/data-chart/chart-performance/src/app.component.html
diff --git a/samples/charts/data-chart/chart-performance/src/app/app.component.scss b/samples/charts/data-chart/chart-performance/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/chart-performance/src/app/app.component.scss
rename to samples/charts/data-chart/chart-performance/src/app.component.scss
diff --git a/samples/charts/data-chart/chart-performance/src/app/app.component.ts b/samples/charts/data-chart/chart-performance/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/chart-performance/src/app/app.component.ts
rename to samples/charts/data-chart/chart-performance/src/app.component.ts
diff --git a/samples/charts/data-chart/chart-performance/src/app/app.module.ts b/samples/charts/data-chart/chart-performance/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/chart-performance/src/app/app.module.ts
rename to samples/charts/data-chart/chart-performance/src/app.module.ts
diff --git a/samples/charts/data-chart/chart-performance/src/main.ts b/samples/charts/data-chart/chart-performance/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/chart-performance/src/main.ts
+++ b/samples/charts/data-chart/chart-performance/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/chart-synchronization/src/app/SharedData.ts b/samples/charts/data-chart/chart-synchronization/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/chart-synchronization/src/app/SharedData.ts
rename to samples/charts/data-chart/chart-synchronization/src/SharedData.ts
diff --git a/samples/charts/data-chart/chart-synchronization/src/app/app.component.html b/samples/charts/data-chart/chart-synchronization/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/chart-synchronization/src/app/app.component.html
rename to samples/charts/data-chart/chart-synchronization/src/app.component.html
diff --git a/samples/charts/data-chart/chart-synchronization/src/app/app.component.scss b/samples/charts/data-chart/chart-synchronization/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/chart-synchronization/src/app/app.component.scss
rename to samples/charts/data-chart/chart-synchronization/src/app.component.scss
diff --git a/samples/charts/data-chart/chart-synchronization/src/app/app.component.ts b/samples/charts/data-chart/chart-synchronization/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/chart-synchronization/src/app/app.component.ts
rename to samples/charts/data-chart/chart-synchronization/src/app.component.ts
diff --git a/samples/charts/data-chart/chart-synchronization/src/app/app.module.ts b/samples/charts/data-chart/chart-synchronization/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/chart-synchronization/src/app/app.module.ts
rename to samples/charts/data-chart/chart-synchronization/src/app.module.ts
diff --git a/samples/charts/data-chart/chart-synchronization/src/main.ts b/samples/charts/data-chart/chart-synchronization/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/chart-synchronization/src/main.ts
+++ b/samples/charts/data-chart/chart-synchronization/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/chart-titles/src/app/SharedData.ts b/samples/charts/data-chart/chart-titles/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/chart-titles/src/app/SharedData.ts
rename to samples/charts/data-chart/chart-titles/src/SharedData.ts
diff --git a/samples/charts/data-chart/chart-titles/src/app/app.component.html b/samples/charts/data-chart/chart-titles/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/chart-titles/src/app/app.component.html
rename to samples/charts/data-chart/chart-titles/src/app.component.html
diff --git a/samples/charts/data-chart/chart-titles/src/app/app.component.scss b/samples/charts/data-chart/chart-titles/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/chart-titles/src/app/app.component.scss
rename to samples/charts/data-chart/chart-titles/src/app.component.scss
diff --git a/samples/charts/data-chart/chart-titles/src/app/app.component.ts b/samples/charts/data-chart/chart-titles/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/chart-titles/src/app/app.component.ts
rename to samples/charts/data-chart/chart-titles/src/app.component.ts
diff --git a/samples/charts/data-chart/chart-titles/src/app/app.module.ts b/samples/charts/data-chart/chart-titles/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/chart-titles/src/app/app.module.ts
rename to samples/charts/data-chart/chart-titles/src/app.module.ts
diff --git a/samples/charts/data-chart/chart-titles/src/main.ts b/samples/charts/data-chart/chart-titles/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/chart-titles/src/main.ts
+++ b/samples/charts/data-chart/chart-titles/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/column-chart-styling/src/app/app.component.html b/samples/charts/data-chart/column-chart-styling/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/column-chart-styling/src/app/app.component.html
rename to samples/charts/data-chart/column-chart-styling/src/app.component.html
diff --git a/samples/charts/data-chart/column-chart-styling/src/app/app.component.scss b/samples/charts/data-chart/column-chart-styling/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/column-chart-styling/src/app/app.component.scss
rename to samples/charts/data-chart/column-chart-styling/src/app.component.scss
diff --git a/samples/charts/data-chart/column-chart-styling/src/app/app.component.ts b/samples/charts/data-chart/column-chart-styling/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/column-chart-styling/src/app/app.component.ts
rename to samples/charts/data-chart/column-chart-styling/src/app.component.ts
diff --git a/samples/charts/data-chart/column-chart-styling/src/app/app.module.ts b/samples/charts/data-chart/column-chart-styling/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/column-chart-styling/src/app/app.module.ts
rename to samples/charts/data-chart/column-chart-styling/src/app.module.ts
diff --git a/samples/charts/data-chart/column-chart-styling/src/main.ts b/samples/charts/data-chart/column-chart-styling/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/column-chart-styling/src/main.ts
+++ b/samples/charts/data-chart/column-chart-styling/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/composite-chart/src/app/app.component.html b/samples/charts/data-chart/composite-chart/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/composite-chart/src/app/app.component.html
rename to samples/charts/data-chart/composite-chart/src/app.component.html
diff --git a/samples/charts/data-chart/composite-chart/src/app/app.component.scss b/samples/charts/data-chart/composite-chart/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/composite-chart/src/app/app.component.scss
rename to samples/charts/data-chart/composite-chart/src/app.component.scss
diff --git a/samples/charts/data-chart/composite-chart/src/app/app.component.ts b/samples/charts/data-chart/composite-chart/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/composite-chart/src/app/app.component.ts
rename to samples/charts/data-chart/composite-chart/src/app.component.ts
diff --git a/samples/charts/data-chart/composite-chart/src/app/app.module.ts b/samples/charts/data-chart/composite-chart/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/composite-chart/src/app/app.module.ts
rename to samples/charts/data-chart/composite-chart/src/app.module.ts
diff --git a/samples/charts/data-chart/composite-chart/src/main.ts b/samples/charts/data-chart/composite-chart/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/composite-chart/src/main.ts
+++ b/samples/charts/data-chart/composite-chart/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/crosshair-layer-styling/src/app/app.component.html b/samples/charts/data-chart/crosshair-layer-styling/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/crosshair-layer-styling/src/app/app.component.html
rename to samples/charts/data-chart/crosshair-layer-styling/src/app.component.html
diff --git a/samples/charts/data-chart/crosshair-layer-styling/src/app/app.component.scss b/samples/charts/data-chart/crosshair-layer-styling/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/crosshair-layer-styling/src/app/app.component.scss
rename to samples/charts/data-chart/crosshair-layer-styling/src/app.component.scss
diff --git a/samples/charts/data-chart/crosshair-layer-styling/src/app/app.component.ts b/samples/charts/data-chart/crosshair-layer-styling/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/crosshair-layer-styling/src/app/app.component.ts
rename to samples/charts/data-chart/crosshair-layer-styling/src/app.component.ts
diff --git a/samples/charts/data-chart/crosshair-layer-styling/src/app/app.module.ts b/samples/charts/data-chart/crosshair-layer-styling/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/crosshair-layer-styling/src/app/app.module.ts
rename to samples/charts/data-chart/crosshair-layer-styling/src/app.module.ts
diff --git a/samples/charts/data-chart/crosshair-layer-styling/src/main.ts b/samples/charts/data-chart/crosshair-layer-styling/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/crosshair-layer-styling/src/main.ts
+++ b/samples/charts/data-chart/crosshair-layer-styling/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/custom-drawing-annotations/src/app/StocksHistory.ts b/samples/charts/data-chart/custom-drawing-annotations/src/StocksHistory.ts
similarity index 100%
rename from samples/charts/data-chart/custom-drawing-annotations/src/app/StocksHistory.ts
rename to samples/charts/data-chart/custom-drawing-annotations/src/StocksHistory.ts
diff --git a/samples/charts/data-chart/custom-drawing-annotations/src/app/app.component.html b/samples/charts/data-chart/custom-drawing-annotations/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/custom-drawing-annotations/src/app/app.component.html
rename to samples/charts/data-chart/custom-drawing-annotations/src/app.component.html
diff --git a/samples/charts/data-chart/custom-drawing-annotations/src/app/app.component.scss b/samples/charts/data-chart/custom-drawing-annotations/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/custom-drawing-annotations/src/app/app.component.scss
rename to samples/charts/data-chart/custom-drawing-annotations/src/app.component.scss
diff --git a/samples/charts/data-chart/custom-drawing-annotations/src/app/app.component.ts b/samples/charts/data-chart/custom-drawing-annotations/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/custom-drawing-annotations/src/app/app.component.ts
rename to samples/charts/data-chart/custom-drawing-annotations/src/app.component.ts
diff --git a/samples/charts/data-chart/custom-drawing-annotations/src/app/app.module.ts b/samples/charts/data-chart/custom-drawing-annotations/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/custom-drawing-annotations/src/app/app.module.ts
rename to samples/charts/data-chart/custom-drawing-annotations/src/app.module.ts
diff --git a/samples/charts/data-chart/custom-drawing-annotations/src/main.ts b/samples/charts/data-chart/custom-drawing-annotations/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/custom-drawing-annotations/src/main.ts
+++ b/samples/charts/data-chart/custom-drawing-annotations/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/custom-editing-data/src/app/EditableDataSource.ts b/samples/charts/data-chart/custom-editing-data/src/EditableDataSource.ts
similarity index 100%
rename from samples/charts/data-chart/custom-editing-data/src/app/EditableDataSource.ts
rename to samples/charts/data-chart/custom-editing-data/src/EditableDataSource.ts
diff --git a/samples/charts/data-chart/custom-editing-data/src/app/app.component.html b/samples/charts/data-chart/custom-editing-data/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/custom-editing-data/src/app/app.component.html
rename to samples/charts/data-chart/custom-editing-data/src/app.component.html
diff --git a/samples/charts/data-chart/custom-editing-data/src/app/app.component.scss b/samples/charts/data-chart/custom-editing-data/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/custom-editing-data/src/app/app.component.scss
rename to samples/charts/data-chart/custom-editing-data/src/app.component.scss
diff --git a/samples/charts/data-chart/custom-editing-data/src/app/app.component.ts b/samples/charts/data-chart/custom-editing-data/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/custom-editing-data/src/app/app.component.ts
rename to samples/charts/data-chart/custom-editing-data/src/app.component.ts
diff --git a/samples/charts/data-chart/custom-editing-data/src/app/app.module.ts b/samples/charts/data-chart/custom-editing-data/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/custom-editing-data/src/app/app.module.ts
rename to samples/charts/data-chart/custom-editing-data/src/app.module.ts
diff --git a/samples/charts/data-chart/custom-editing-data/src/main.ts b/samples/charts/data-chart/custom-editing-data/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/custom-editing-data/src/main.ts
+++ b/samples/charts/data-chart/custom-editing-data/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/final-value-layer-styling/src/app/app.component.html b/samples/charts/data-chart/final-value-layer-styling/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/final-value-layer-styling/src/app/app.component.html
rename to samples/charts/data-chart/final-value-layer-styling/src/app.component.html
diff --git a/samples/charts/data-chart/final-value-layer-styling/src/app/app.component.scss b/samples/charts/data-chart/final-value-layer-styling/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/final-value-layer-styling/src/app/app.component.scss
rename to samples/charts/data-chart/final-value-layer-styling/src/app.component.scss
diff --git a/samples/charts/data-chart/final-value-layer-styling/src/app/app.component.ts b/samples/charts/data-chart/final-value-layer-styling/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/final-value-layer-styling/src/app/app.component.ts
rename to samples/charts/data-chart/final-value-layer-styling/src/app.component.ts
diff --git a/samples/charts/data-chart/final-value-layer-styling/src/app/app.module.ts b/samples/charts/data-chart/final-value-layer-styling/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/final-value-layer-styling/src/app/app.module.ts
rename to samples/charts/data-chart/final-value-layer-styling/src/app.module.ts
diff --git a/samples/charts/data-chart/final-value-layer-styling/src/main.ts b/samples/charts/data-chart/final-value-layer-styling/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/final-value-layer-styling/src/main.ts
+++ b/samples/charts/data-chart/final-value-layer-styling/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/legends/src/app/SharedData.ts b/samples/charts/data-chart/legends/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/legends/src/app/SharedData.ts
rename to samples/charts/data-chart/legends/src/SharedData.ts
diff --git a/samples/charts/data-chart/legends/src/app/app.component.html b/samples/charts/data-chart/legends/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/legends/src/app/app.component.html
rename to samples/charts/data-chart/legends/src/app.component.html
diff --git a/samples/charts/data-chart/legends/src/app/app.component.scss b/samples/charts/data-chart/legends/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/legends/src/app/app.component.scss
rename to samples/charts/data-chart/legends/src/app.component.scss
diff --git a/samples/charts/data-chart/legends/src/app/app.component.ts b/samples/charts/data-chart/legends/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/legends/src/app/app.component.ts
rename to samples/charts/data-chart/legends/src/app.component.ts
diff --git a/samples/charts/data-chart/legends/src/app/app.module.ts b/samples/charts/data-chart/legends/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/legends/src/app/app.module.ts
rename to samples/charts/data-chart/legends/src/app.module.ts
diff --git a/samples/charts/data-chart/legends/src/main.ts b/samples/charts/data-chart/legends/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/legends/src/main.ts
+++ b/samples/charts/data-chart/legends/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/polar-chart-types/src/app/SamplePolarData.ts b/samples/charts/data-chart/polar-chart-types/src/SamplePolarData.ts
similarity index 100%
rename from samples/charts/data-chart/polar-chart-types/src/app/SamplePolarData.ts
rename to samples/charts/data-chart/polar-chart-types/src/SamplePolarData.ts
diff --git a/samples/charts/data-chart/polar-chart-types/src/app/app.component.html b/samples/charts/data-chart/polar-chart-types/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/polar-chart-types/src/app/app.component.html
rename to samples/charts/data-chart/polar-chart-types/src/app.component.html
diff --git a/samples/charts/data-chart/polar-chart-types/src/app/app.component.scss b/samples/charts/data-chart/polar-chart-types/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/polar-chart-types/src/app/app.component.scss
rename to samples/charts/data-chart/polar-chart-types/src/app.component.scss
diff --git a/samples/charts/data-chart/polar-chart-types/src/app/app.component.ts b/samples/charts/data-chart/polar-chart-types/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/polar-chart-types/src/app/app.component.ts
rename to samples/charts/data-chart/polar-chart-types/src/app.component.ts
diff --git a/samples/charts/data-chart/polar-chart-types/src/app/app.module.ts b/samples/charts/data-chart/polar-chart-types/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/polar-chart-types/src/app/app.module.ts
rename to samples/charts/data-chart/polar-chart-types/src/app.module.ts
diff --git a/samples/charts/data-chart/polar-chart-types/src/main.ts b/samples/charts/data-chart/polar-chart-types/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/polar-chart-types/src/main.ts
+++ b/samples/charts/data-chart/polar-chart-types/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/radial-chart-types/src/app/SampleRadialData.ts b/samples/charts/data-chart/radial-chart-types/src/SampleRadialData.ts
similarity index 100%
rename from samples/charts/data-chart/radial-chart-types/src/app/SampleRadialData.ts
rename to samples/charts/data-chart/radial-chart-types/src/SampleRadialData.ts
diff --git a/samples/charts/data-chart/radial-chart-types/src/app/app.component.html b/samples/charts/data-chart/radial-chart-types/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/radial-chart-types/src/app/app.component.html
rename to samples/charts/data-chart/radial-chart-types/src/app.component.html
diff --git a/samples/charts/data-chart/radial-chart-types/src/app/app.component.scss b/samples/charts/data-chart/radial-chart-types/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/radial-chart-types/src/app/app.component.scss
rename to samples/charts/data-chart/radial-chart-types/src/app.component.scss
diff --git a/samples/charts/data-chart/radial-chart-types/src/app/app.component.ts b/samples/charts/data-chart/radial-chart-types/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/radial-chart-types/src/app/app.component.ts
rename to samples/charts/data-chart/radial-chart-types/src/app.component.ts
diff --git a/samples/charts/data-chart/radial-chart-types/src/app/app.module.ts b/samples/charts/data-chart/radial-chart-types/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/radial-chart-types/src/app/app.module.ts
rename to samples/charts/data-chart/radial-chart-types/src/app.module.ts
diff --git a/samples/charts/data-chart/radial-chart-types/src/main.ts b/samples/charts/data-chart/radial-chart-types/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/radial-chart-types/src/main.ts
+++ b/samples/charts/data-chart/radial-chart-types/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/series-animations/src/app/SharedData.ts b/samples/charts/data-chart/series-animations/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/series-animations/src/app/SharedData.ts
rename to samples/charts/data-chart/series-animations/src/SharedData.ts
diff --git a/samples/charts/data-chart/series-animations/src/app/app.component.html b/samples/charts/data-chart/series-animations/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/series-animations/src/app/app.component.html
rename to samples/charts/data-chart/series-animations/src/app.component.html
diff --git a/samples/charts/data-chart/series-animations/src/app/app.component.scss b/samples/charts/data-chart/series-animations/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/series-animations/src/app/app.component.scss
rename to samples/charts/data-chart/series-animations/src/app.component.scss
diff --git a/samples/charts/data-chart/series-animations/src/app/app.component.ts b/samples/charts/data-chart/series-animations/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/series-animations/src/app/app.component.ts
rename to samples/charts/data-chart/series-animations/src/app.component.ts
diff --git a/samples/charts/data-chart/series-animations/src/app/app.module.ts b/samples/charts/data-chart/series-animations/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/series-animations/src/app/app.module.ts
rename to samples/charts/data-chart/series-animations/src/app.module.ts
diff --git a/samples/charts/data-chart/series-animations/src/main.ts b/samples/charts/data-chart/series-animations/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/series-animations/src/main.ts
+++ b/samples/charts/data-chart/series-animations/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/series-annotations/src/app/SharedData.ts b/samples/charts/data-chart/series-annotations/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/series-annotations/src/app/SharedData.ts
rename to samples/charts/data-chart/series-annotations/src/SharedData.ts
diff --git a/samples/charts/data-chart/series-annotations/src/app/app.component.html b/samples/charts/data-chart/series-annotations/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/series-annotations/src/app/app.component.html
rename to samples/charts/data-chart/series-annotations/src/app.component.html
diff --git a/samples/charts/data-chart/series-annotations/src/app/app.component.scss b/samples/charts/data-chart/series-annotations/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/series-annotations/src/app/app.component.scss
rename to samples/charts/data-chart/series-annotations/src/app.component.scss
diff --git a/samples/charts/data-chart/series-annotations/src/app/app.component.ts b/samples/charts/data-chart/series-annotations/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/series-annotations/src/app/app.component.ts
rename to samples/charts/data-chart/series-annotations/src/app.component.ts
diff --git a/samples/charts/data-chart/series-annotations/src/app/app.module.ts b/samples/charts/data-chart/series-annotations/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/series-annotations/src/app/app.module.ts
rename to samples/charts/data-chart/series-annotations/src/app.module.ts
diff --git a/samples/charts/data-chart/series-annotations/src/main.ts b/samples/charts/data-chart/series-annotations/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/series-annotations/src/main.ts
+++ b/samples/charts/data-chart/series-annotations/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/series-highlighting/src/app/SharedData.ts b/samples/charts/data-chart/series-highlighting/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/series-highlighting/src/app/SharedData.ts
rename to samples/charts/data-chart/series-highlighting/src/SharedData.ts
diff --git a/samples/charts/data-chart/series-highlighting/src/app/app.component.html b/samples/charts/data-chart/series-highlighting/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/series-highlighting/src/app/app.component.html
rename to samples/charts/data-chart/series-highlighting/src/app.component.html
diff --git a/samples/charts/data-chart/series-highlighting/src/app/app.component.scss b/samples/charts/data-chart/series-highlighting/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/series-highlighting/src/app/app.component.scss
rename to samples/charts/data-chart/series-highlighting/src/app.component.scss
diff --git a/samples/charts/data-chart/series-highlighting/src/app/app.component.ts b/samples/charts/data-chart/series-highlighting/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/series-highlighting/src/app/app.component.ts
rename to samples/charts/data-chart/series-highlighting/src/app.component.ts
diff --git a/samples/charts/data-chart/series-highlighting/src/app/app.module.ts b/samples/charts/data-chart/series-highlighting/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/series-highlighting/src/app/app.module.ts
rename to samples/charts/data-chart/series-highlighting/src/app.module.ts
diff --git a/samples/charts/data-chart/series-highlighting/src/main.ts b/samples/charts/data-chart/series-highlighting/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/series-highlighting/src/main.ts
+++ b/samples/charts/data-chart/series-highlighting/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/series-marker-template/src/app/app.component.html b/samples/charts/data-chart/series-marker-template/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/series-marker-template/src/app/app.component.html
rename to samples/charts/data-chart/series-marker-template/src/app.component.html
diff --git a/samples/charts/data-chart/series-marker-template/src/app/app.component.scss b/samples/charts/data-chart/series-marker-template/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/series-marker-template/src/app/app.component.scss
rename to samples/charts/data-chart/series-marker-template/src/app.component.scss
diff --git a/samples/charts/data-chart/series-marker-template/src/app/app.component.ts b/samples/charts/data-chart/series-marker-template/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/series-marker-template/src/app/app.component.ts
rename to samples/charts/data-chart/series-marker-template/src/app.component.ts
diff --git a/samples/charts/data-chart/series-marker-template/src/app/app.module.ts b/samples/charts/data-chart/series-marker-template/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/series-marker-template/src/app/app.module.ts
rename to samples/charts/data-chart/series-marker-template/src/app.module.ts
diff --git a/samples/charts/data-chart/series-marker-template/src/main.ts b/samples/charts/data-chart/series-marker-template/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/series-marker-template/src/main.ts
+++ b/samples/charts/data-chart/series-marker-template/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/series-markers/src/app/SharedData.ts b/samples/charts/data-chart/series-markers/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/series-markers/src/app/SharedData.ts
rename to samples/charts/data-chart/series-markers/src/SharedData.ts
diff --git a/samples/charts/data-chart/series-markers/src/app/app.component.html b/samples/charts/data-chart/series-markers/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/series-markers/src/app/app.component.html
rename to samples/charts/data-chart/series-markers/src/app.component.html
diff --git a/samples/charts/data-chart/series-markers/src/app/app.component.scss b/samples/charts/data-chart/series-markers/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/series-markers/src/app/app.component.scss
rename to samples/charts/data-chart/series-markers/src/app.component.scss
diff --git a/samples/charts/data-chart/series-markers/src/app/app.component.ts b/samples/charts/data-chart/series-markers/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/series-markers/src/app/app.component.ts
rename to samples/charts/data-chart/series-markers/src/app.component.ts
diff --git a/samples/charts/data-chart/series-markers/src/app/app.module.ts b/samples/charts/data-chart/series-markers/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/series-markers/src/app/app.module.ts
rename to samples/charts/data-chart/series-markers/src/app.module.ts
diff --git a/samples/charts/data-chart/series-markers/src/main.ts b/samples/charts/data-chart/series-markers/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/series-markers/src/main.ts
+++ b/samples/charts/data-chart/series-markers/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/series-tooltips/src/app/SharedData.ts b/samples/charts/data-chart/series-tooltips/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/series-tooltips/src/app/SharedData.ts
rename to samples/charts/data-chart/series-tooltips/src/SharedData.ts
diff --git a/samples/charts/data-chart/series-tooltips/src/app/app.component.html b/samples/charts/data-chart/series-tooltips/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/series-tooltips/src/app/app.component.html
rename to samples/charts/data-chart/series-tooltips/src/app.component.html
diff --git a/samples/charts/data-chart/series-tooltips/src/app/app.component.scss b/samples/charts/data-chart/series-tooltips/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/series-tooltips/src/app/app.component.scss
rename to samples/charts/data-chart/series-tooltips/src/app.component.scss
diff --git a/samples/charts/data-chart/series-tooltips/src/app/app.component.ts b/samples/charts/data-chart/series-tooltips/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/series-tooltips/src/app/app.component.ts
rename to samples/charts/data-chart/series-tooltips/src/app.component.ts
diff --git a/samples/charts/data-chart/series-tooltips/src/app/app.module.ts b/samples/charts/data-chart/series-tooltips/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/series-tooltips/src/app/app.module.ts
rename to samples/charts/data-chart/series-tooltips/src/app.module.ts
diff --git a/samples/charts/data-chart/series-tooltips/src/main.ts b/samples/charts/data-chart/series-tooltips/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/series-tooltips/src/main.ts
+++ b/samples/charts/data-chart/series-tooltips/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/series-trendlines/src/app/SampleFinancialData.ts b/samples/charts/data-chart/series-trendlines/src/SampleFinancialData.ts
similarity index 100%
rename from samples/charts/data-chart/series-trendlines/src/app/SampleFinancialData.ts
rename to samples/charts/data-chart/series-trendlines/src/SampleFinancialData.ts
diff --git a/samples/charts/data-chart/series-trendlines/src/app/app.component.html b/samples/charts/data-chart/series-trendlines/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/series-trendlines/src/app/app.component.html
rename to samples/charts/data-chart/series-trendlines/src/app.component.html
diff --git a/samples/charts/data-chart/series-trendlines/src/app/app.component.scss b/samples/charts/data-chart/series-trendlines/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/series-trendlines/src/app/app.component.scss
rename to samples/charts/data-chart/series-trendlines/src/app.component.scss
diff --git a/samples/charts/data-chart/series-trendlines/src/app/app.component.ts b/samples/charts/data-chart/series-trendlines/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/series-trendlines/src/app/app.component.ts
rename to samples/charts/data-chart/series-trendlines/src/app.component.ts
diff --git a/samples/charts/data-chart/series-trendlines/src/app/app.module.ts b/samples/charts/data-chart/series-trendlines/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/series-trendlines/src/app/app.module.ts
rename to samples/charts/data-chart/series-trendlines/src/app.module.ts
diff --git a/samples/charts/data-chart/series-trendlines/src/main.ts b/samples/charts/data-chart/series-trendlines/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/series-trendlines/src/main.ts
+++ b/samples/charts/data-chart/series-trendlines/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/series-value-overlay/src/app/SharedData.ts b/samples/charts/data-chart/series-value-overlay/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/series-value-overlay/src/app/SharedData.ts
rename to samples/charts/data-chart/series-value-overlay/src/SharedData.ts
diff --git a/samples/charts/data-chart/series-value-overlay/src/app/app.component.html b/samples/charts/data-chart/series-value-overlay/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/series-value-overlay/src/app/app.component.html
rename to samples/charts/data-chart/series-value-overlay/src/app.component.html
diff --git a/samples/charts/data-chart/series-value-overlay/src/app/app.component.scss b/samples/charts/data-chart/series-value-overlay/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/series-value-overlay/src/app/app.component.scss
rename to samples/charts/data-chart/series-value-overlay/src/app.component.scss
diff --git a/samples/charts/data-chart/series-value-overlay/src/app/app.component.ts b/samples/charts/data-chart/series-value-overlay/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/series-value-overlay/src/app/app.component.ts
rename to samples/charts/data-chart/series-value-overlay/src/app.component.ts
diff --git a/samples/charts/data-chart/series-value-overlay/src/app/app.module.ts b/samples/charts/data-chart/series-value-overlay/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/series-value-overlay/src/app/app.module.ts
rename to samples/charts/data-chart/series-value-overlay/src/app.module.ts
diff --git a/samples/charts/data-chart/series-value-overlay/src/main.ts b/samples/charts/data-chart/series-value-overlay/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/series-value-overlay/src/main.ts
+++ b/samples/charts/data-chart/series-value-overlay/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/stacked-chart-types/src/app/SharedData.ts b/samples/charts/data-chart/stacked-chart-types/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/stacked-chart-types/src/app/SharedData.ts
rename to samples/charts/data-chart/stacked-chart-types/src/SharedData.ts
diff --git a/samples/charts/data-chart/stacked-chart-types/src/app/app.component.html b/samples/charts/data-chart/stacked-chart-types/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/stacked-chart-types/src/app/app.component.html
rename to samples/charts/data-chart/stacked-chart-types/src/app.component.html
diff --git a/samples/charts/data-chart/stacked-chart-types/src/app/app.component.scss b/samples/charts/data-chart/stacked-chart-types/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/stacked-chart-types/src/app/app.component.scss
rename to samples/charts/data-chart/stacked-chart-types/src/app.component.scss
diff --git a/samples/charts/data-chart/stacked-chart-types/src/app/app.component.ts b/samples/charts/data-chart/stacked-chart-types/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/stacked-chart-types/src/app/app.component.ts
rename to samples/charts/data-chart/stacked-chart-types/src/app.component.ts
diff --git a/samples/charts/data-chart/stacked-chart-types/src/app/app.module.ts b/samples/charts/data-chart/stacked-chart-types/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/stacked-chart-types/src/app/app.module.ts
rename to samples/charts/data-chart/stacked-chart-types/src/app.module.ts
diff --git a/samples/charts/data-chart/stacked-chart-types/src/main.ts b/samples/charts/data-chart/stacked-chart-types/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/stacked-chart-types/src/main.ts
+++ b/samples/charts/data-chart/stacked-chart-types/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/tooltip-template/src/app/app.component.html b/samples/charts/data-chart/tooltip-template/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/tooltip-template/src/app/app.component.html
rename to samples/charts/data-chart/tooltip-template/src/app.component.html
diff --git a/samples/charts/data-chart/tooltip-template/src/app/app.component.scss b/samples/charts/data-chart/tooltip-template/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/tooltip-template/src/app/app.component.scss
rename to samples/charts/data-chart/tooltip-template/src/app.component.scss
diff --git a/samples/charts/data-chart/tooltip-template/src/app/app.component.ts b/samples/charts/data-chart/tooltip-template/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/tooltip-template/src/app/app.component.ts
rename to samples/charts/data-chart/tooltip-template/src/app.component.ts
diff --git a/samples/charts/data-chart/tooltip-template/src/app/app.module.ts b/samples/charts/data-chart/tooltip-template/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/tooltip-template/src/app/app.module.ts
rename to samples/charts/data-chart/tooltip-template/src/app.module.ts
diff --git a/samples/charts/data-chart/tooltip-template/src/main.ts b/samples/charts/data-chart/tooltip-template/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/tooltip-template/src/main.ts
+++ b/samples/charts/data-chart/tooltip-template/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-category-area-series/src/app/SampleCategoryData.ts b/samples/charts/data-chart/type-category-area-series/src/SampleCategoryData.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-area-series/src/app/SampleCategoryData.ts
rename to samples/charts/data-chart/type-category-area-series/src/SampleCategoryData.ts
diff --git a/samples/charts/data-chart/type-category-area-series/src/app/app.component.html b/samples/charts/data-chart/type-category-area-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-category-area-series/src/app/app.component.html
rename to samples/charts/data-chart/type-category-area-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-category-area-series/src/app/app.component.scss b/samples/charts/data-chart/type-category-area-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-category-area-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-category-area-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-category-area-series/src/app/app.component.ts b/samples/charts/data-chart/type-category-area-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-area-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-category-area-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-category-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-area-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-area-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-category-area-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-category-area-series/src/main.ts b/samples/charts/data-chart/type-category-area-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-category-area-series/src/main.ts
+++ b/samples/charts/data-chart/type-category-area-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-category-bar-series/src/app/SampleCategoryData.ts b/samples/charts/data-chart/type-category-bar-series/src/SampleCategoryData.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-bar-series/src/app/SampleCategoryData.ts
rename to samples/charts/data-chart/type-category-bar-series/src/SampleCategoryData.ts
diff --git a/samples/charts/data-chart/type-category-bar-series/src/app/app.component.html b/samples/charts/data-chart/type-category-bar-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-category-bar-series/src/app/app.component.html
rename to samples/charts/data-chart/type-category-bar-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-category-bar-series/src/app/app.component.scss b/samples/charts/data-chart/type-category-bar-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-category-bar-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-category-bar-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-category-bar-series/src/app/app.component.ts b/samples/charts/data-chart/type-category-bar-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-bar-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-category-bar-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-category-bar-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-bar-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-bar-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-category-bar-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-category-bar-series/src/main.ts b/samples/charts/data-chart/type-category-bar-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-category-bar-series/src/main.ts
+++ b/samples/charts/data-chart/type-category-bar-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-category-column-series/src/app/SampleCategoryData.ts b/samples/charts/data-chart/type-category-column-series/src/SampleCategoryData.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-column-series/src/app/SampleCategoryData.ts
rename to samples/charts/data-chart/type-category-column-series/src/SampleCategoryData.ts
diff --git a/samples/charts/data-chart/type-category-column-series/src/app/app.component.html b/samples/charts/data-chart/type-category-column-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-category-column-series/src/app/app.component.html
rename to samples/charts/data-chart/type-category-column-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-category-column-series/src/app/app.component.scss b/samples/charts/data-chart/type-category-column-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-category-column-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-category-column-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-category-column-series/src/app/app.component.ts b/samples/charts/data-chart/type-category-column-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-column-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-category-column-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-category-column-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-column-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-column-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-category-column-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-category-column-series/src/main.ts b/samples/charts/data-chart/type-category-column-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-category-column-series/src/main.ts
+++ b/samples/charts/data-chart/type-category-column-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-category-line-series/src/app/SampleCategoryData.ts b/samples/charts/data-chart/type-category-line-series/src/SampleCategoryData.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-line-series/src/app/SampleCategoryData.ts
rename to samples/charts/data-chart/type-category-line-series/src/SampleCategoryData.ts
diff --git a/samples/charts/data-chart/type-category-line-series/src/app/app.component.html b/samples/charts/data-chart/type-category-line-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-category-line-series/src/app/app.component.html
rename to samples/charts/data-chart/type-category-line-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-category-line-series/src/app/app.component.scss b/samples/charts/data-chart/type-category-line-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-category-line-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-category-line-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-category-line-series/src/app/app.component.ts b/samples/charts/data-chart/type-category-line-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-line-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-category-line-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-category-line-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-line-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-line-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-category-line-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-category-line-series/src/main.ts b/samples/charts/data-chart/type-category-line-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-category-line-series/src/main.ts
+++ b/samples/charts/data-chart/type-category-line-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-category-point-series/src/app/SampleCategoryData.ts b/samples/charts/data-chart/type-category-point-series/src/SampleCategoryData.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-point-series/src/app/SampleCategoryData.ts
rename to samples/charts/data-chart/type-category-point-series/src/SampleCategoryData.ts
diff --git a/samples/charts/data-chart/type-category-point-series/src/app/app.component.html b/samples/charts/data-chart/type-category-point-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-category-point-series/src/app/app.component.html
rename to samples/charts/data-chart/type-category-point-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-category-point-series/src/app/app.component.scss b/samples/charts/data-chart/type-category-point-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-category-point-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-category-point-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-category-point-series/src/app/app.component.ts b/samples/charts/data-chart/type-category-point-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-point-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-category-point-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-category-point-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-point-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-point-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-category-point-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-category-point-series/src/main.ts b/samples/charts/data-chart/type-category-point-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-category-point-series/src/main.ts
+++ b/samples/charts/data-chart/type-category-point-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-category-series/src/app/SampleCategoryData.ts b/samples/charts/data-chart/type-category-series/src/SampleCategoryData.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-series/src/app/SampleCategoryData.ts
rename to samples/charts/data-chart/type-category-series/src/SampleCategoryData.ts
diff --git a/samples/charts/data-chart/type-category-series/src/app/app.component.html b/samples/charts/data-chart/type-category-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-category-series/src/app/app.component.html
rename to samples/charts/data-chart/type-category-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-category-series/src/app/app.component.scss b/samples/charts/data-chart/type-category-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-category-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-category-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-category-series/src/app/app.component.ts b/samples/charts/data-chart/type-category-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-category-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-category-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-category-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-category-series/src/main.ts b/samples/charts/data-chart/type-category-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-category-series/src/main.ts
+++ b/samples/charts/data-chart/type-category-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-category-spline-area-series/src/app/SampleCategoryData.ts b/samples/charts/data-chart/type-category-spline-area-series/src/SampleCategoryData.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-spline-area-series/src/app/SampleCategoryData.ts
rename to samples/charts/data-chart/type-category-spline-area-series/src/SampleCategoryData.ts
diff --git a/samples/charts/data-chart/type-category-spline-area-series/src/app/app.component.html b/samples/charts/data-chart/type-category-spline-area-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-category-spline-area-series/src/app/app.component.html
rename to samples/charts/data-chart/type-category-spline-area-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-category-spline-area-series/src/app/app.component.scss b/samples/charts/data-chart/type-category-spline-area-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-category-spline-area-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-category-spline-area-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-category-spline-area-series/src/app/app.component.ts b/samples/charts/data-chart/type-category-spline-area-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-spline-area-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-category-spline-area-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-category-spline-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-spline-area-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-spline-area-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-category-spline-area-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-category-spline-area-series/src/main.ts b/samples/charts/data-chart/type-category-spline-area-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-category-spline-area-series/src/main.ts
+++ b/samples/charts/data-chart/type-category-spline-area-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-category-spline-series/src/app/SampleCategoryData.ts b/samples/charts/data-chart/type-category-spline-series/src/SampleCategoryData.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-spline-series/src/app/SampleCategoryData.ts
rename to samples/charts/data-chart/type-category-spline-series/src/SampleCategoryData.ts
diff --git a/samples/charts/data-chart/type-category-spline-series/src/app/app.component.html b/samples/charts/data-chart/type-category-spline-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-category-spline-series/src/app/app.component.html
rename to samples/charts/data-chart/type-category-spline-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-category-spline-series/src/app/app.component.scss b/samples/charts/data-chart/type-category-spline-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-category-spline-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-category-spline-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-category-spline-series/src/app/app.component.ts b/samples/charts/data-chart/type-category-spline-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-spline-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-category-spline-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-category-spline-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-spline-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-spline-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-category-spline-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-category-spline-series/src/main.ts b/samples/charts/data-chart/type-category-spline-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-category-spline-series/src/main.ts
+++ b/samples/charts/data-chart/type-category-spline-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-category-step-area-series/src/app/SampleCategoryData.ts b/samples/charts/data-chart/type-category-step-area-series/src/SampleCategoryData.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-step-area-series/src/app/SampleCategoryData.ts
rename to samples/charts/data-chart/type-category-step-area-series/src/SampleCategoryData.ts
diff --git a/samples/charts/data-chart/type-category-step-area-series/src/app/app.component.html b/samples/charts/data-chart/type-category-step-area-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-category-step-area-series/src/app/app.component.html
rename to samples/charts/data-chart/type-category-step-area-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-category-step-area-series/src/app/app.component.scss b/samples/charts/data-chart/type-category-step-area-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-category-step-area-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-category-step-area-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-category-step-area-series/src/app/app.component.ts b/samples/charts/data-chart/type-category-step-area-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-step-area-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-category-step-area-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-category-step-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-step-area-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-step-area-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-category-step-area-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-category-step-area-series/src/main.ts b/samples/charts/data-chart/type-category-step-area-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-category-step-area-series/src/main.ts
+++ b/samples/charts/data-chart/type-category-step-area-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-category-step-line-series/src/app/SampleCategoryData.ts b/samples/charts/data-chart/type-category-step-line-series/src/SampleCategoryData.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-step-line-series/src/app/SampleCategoryData.ts
rename to samples/charts/data-chart/type-category-step-line-series/src/SampleCategoryData.ts
diff --git a/samples/charts/data-chart/type-category-step-line-series/src/app/app.component.html b/samples/charts/data-chart/type-category-step-line-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-category-step-line-series/src/app/app.component.html
rename to samples/charts/data-chart/type-category-step-line-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-category-step-line-series/src/app/app.component.scss b/samples/charts/data-chart/type-category-step-line-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-category-step-line-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-category-step-line-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-category-step-line-series/src/app/app.component.ts b/samples/charts/data-chart/type-category-step-line-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-step-line-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-category-step-line-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-category-step-line-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-step-line-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-step-line-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-category-step-line-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-category-step-line-series/src/main.ts b/samples/charts/data-chart/type-category-step-line-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-category-step-line-series/src/main.ts
+++ b/samples/charts/data-chart/type-category-step-line-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-category-waterfall-series/src/app/SampleCategoryData.ts b/samples/charts/data-chart/type-category-waterfall-series/src/SampleCategoryData.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-waterfall-series/src/app/SampleCategoryData.ts
rename to samples/charts/data-chart/type-category-waterfall-series/src/SampleCategoryData.ts
diff --git a/samples/charts/data-chart/type-category-waterfall-series/src/app/app.component.html b/samples/charts/data-chart/type-category-waterfall-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-category-waterfall-series/src/app/app.component.html
rename to samples/charts/data-chart/type-category-waterfall-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-category-waterfall-series/src/app/app.component.scss b/samples/charts/data-chart/type-category-waterfall-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-category-waterfall-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-category-waterfall-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-category-waterfall-series/src/app/app.component.ts b/samples/charts/data-chart/type-category-waterfall-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-waterfall-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-category-waterfall-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-category-waterfall-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-waterfall-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-category-waterfall-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-category-waterfall-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-category-waterfall-series/src/main.ts b/samples/charts/data-chart/type-category-waterfall-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-category-waterfall-series/src/main.ts
+++ b/samples/charts/data-chart/type-category-waterfall-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-financial-area-indicators/src/app/SampleFinancialData.ts b/samples/charts/data-chart/type-financial-area-indicators/src/SampleFinancialData.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-area-indicators/src/app/SampleFinancialData.ts
rename to samples/charts/data-chart/type-financial-area-indicators/src/SampleFinancialData.ts
diff --git a/samples/charts/data-chart/type-financial-area-indicators/src/app/app.component.html b/samples/charts/data-chart/type-financial-area-indicators/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-financial-area-indicators/src/app/app.component.html
rename to samples/charts/data-chart/type-financial-area-indicators/src/app.component.html
diff --git a/samples/charts/data-chart/type-financial-area-indicators/src/app/app.component.scss b/samples/charts/data-chart/type-financial-area-indicators/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-financial-area-indicators/src/app/app.component.scss
rename to samples/charts/data-chart/type-financial-area-indicators/src/app.component.scss
diff --git a/samples/charts/data-chart/type-financial-area-indicators/src/app/app.component.ts b/samples/charts/data-chart/type-financial-area-indicators/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-area-indicators/src/app/app.component.ts
rename to samples/charts/data-chart/type-financial-area-indicators/src/app.component.ts
diff --git a/samples/charts/data-chart/type-financial-area-indicators/src/app/app.module.ts b/samples/charts/data-chart/type-financial-area-indicators/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-area-indicators/src/app/app.module.ts
rename to samples/charts/data-chart/type-financial-area-indicators/src/app.module.ts
diff --git a/samples/charts/data-chart/type-financial-area-indicators/src/main.ts b/samples/charts/data-chart/type-financial-area-indicators/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-financial-area-indicators/src/main.ts
+++ b/samples/charts/data-chart/type-financial-area-indicators/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-financial-candlestick-series/src/app/SampleFinancialData.ts b/samples/charts/data-chart/type-financial-candlestick-series/src/SampleFinancialData.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-candlestick-series/src/app/SampleFinancialData.ts
rename to samples/charts/data-chart/type-financial-candlestick-series/src/SampleFinancialData.ts
diff --git a/samples/charts/data-chart/type-financial-candlestick-series/src/app/app.component.html b/samples/charts/data-chart/type-financial-candlestick-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-financial-candlestick-series/src/app/app.component.html
rename to samples/charts/data-chart/type-financial-candlestick-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-financial-candlestick-series/src/app/app.component.scss b/samples/charts/data-chart/type-financial-candlestick-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-financial-candlestick-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-financial-candlestick-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-financial-candlestick-series/src/app/app.component.ts b/samples/charts/data-chart/type-financial-candlestick-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-candlestick-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-financial-candlestick-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-financial-candlestick-series/src/app/app.module.ts b/samples/charts/data-chart/type-financial-candlestick-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-candlestick-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-financial-candlestick-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-financial-candlestick-series/src/main.ts b/samples/charts/data-chart/type-financial-candlestick-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-financial-candlestick-series/src/main.ts
+++ b/samples/charts/data-chart/type-financial-candlestick-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-financial-column-indicators/src/app/SampleFinancialData.ts b/samples/charts/data-chart/type-financial-column-indicators/src/SampleFinancialData.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-column-indicators/src/app/SampleFinancialData.ts
rename to samples/charts/data-chart/type-financial-column-indicators/src/SampleFinancialData.ts
diff --git a/samples/charts/data-chart/type-financial-column-indicators/src/app/app.component.html b/samples/charts/data-chart/type-financial-column-indicators/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-financial-column-indicators/src/app/app.component.html
rename to samples/charts/data-chart/type-financial-column-indicators/src/app.component.html
diff --git a/samples/charts/data-chart/type-financial-column-indicators/src/app/app.component.scss b/samples/charts/data-chart/type-financial-column-indicators/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-financial-column-indicators/src/app/app.component.scss
rename to samples/charts/data-chart/type-financial-column-indicators/src/app.component.scss
diff --git a/samples/charts/data-chart/type-financial-column-indicators/src/app/app.component.ts b/samples/charts/data-chart/type-financial-column-indicators/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-column-indicators/src/app/app.component.ts
rename to samples/charts/data-chart/type-financial-column-indicators/src/app.component.ts
diff --git a/samples/charts/data-chart/type-financial-column-indicators/src/app/app.module.ts b/samples/charts/data-chart/type-financial-column-indicators/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-column-indicators/src/app/app.module.ts
rename to samples/charts/data-chart/type-financial-column-indicators/src/app.module.ts
diff --git a/samples/charts/data-chart/type-financial-column-indicators/src/main.ts b/samples/charts/data-chart/type-financial-column-indicators/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-financial-column-indicators/src/main.ts
+++ b/samples/charts/data-chart/type-financial-column-indicators/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-financial-line-indicators/src/app/SampleFinancialData.ts b/samples/charts/data-chart/type-financial-line-indicators/src/SampleFinancialData.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-line-indicators/src/app/SampleFinancialData.ts
rename to samples/charts/data-chart/type-financial-line-indicators/src/SampleFinancialData.ts
diff --git a/samples/charts/data-chart/type-financial-line-indicators/src/app/app.component.html b/samples/charts/data-chart/type-financial-line-indicators/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-financial-line-indicators/src/app/app.component.html
rename to samples/charts/data-chart/type-financial-line-indicators/src/app.component.html
diff --git a/samples/charts/data-chart/type-financial-line-indicators/src/app/app.component.scss b/samples/charts/data-chart/type-financial-line-indicators/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-financial-line-indicators/src/app/app.component.scss
rename to samples/charts/data-chart/type-financial-line-indicators/src/app.component.scss
diff --git a/samples/charts/data-chart/type-financial-line-indicators/src/app/app.component.ts b/samples/charts/data-chart/type-financial-line-indicators/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-line-indicators/src/app/app.component.ts
rename to samples/charts/data-chart/type-financial-line-indicators/src/app.component.ts
diff --git a/samples/charts/data-chart/type-financial-line-indicators/src/app/app.module.ts b/samples/charts/data-chart/type-financial-line-indicators/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-line-indicators/src/app/app.module.ts
rename to samples/charts/data-chart/type-financial-line-indicators/src/app.module.ts
diff --git a/samples/charts/data-chart/type-financial-line-indicators/src/main.ts b/samples/charts/data-chart/type-financial-line-indicators/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-financial-line-indicators/src/main.ts
+++ b/samples/charts/data-chart/type-financial-line-indicators/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-financial-ohlc-series/src/app/SampleFinancialData.ts b/samples/charts/data-chart/type-financial-ohlc-series/src/SampleFinancialData.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-ohlc-series/src/app/SampleFinancialData.ts
rename to samples/charts/data-chart/type-financial-ohlc-series/src/SampleFinancialData.ts
diff --git a/samples/charts/data-chart/type-financial-ohlc-series/src/app/app.component.html b/samples/charts/data-chart/type-financial-ohlc-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-financial-ohlc-series/src/app/app.component.html
rename to samples/charts/data-chart/type-financial-ohlc-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-financial-ohlc-series/src/app/app.component.scss b/samples/charts/data-chart/type-financial-ohlc-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-financial-ohlc-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-financial-ohlc-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-financial-ohlc-series/src/app/app.component.ts b/samples/charts/data-chart/type-financial-ohlc-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-ohlc-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-financial-ohlc-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-financial-ohlc-series/src/app/app.module.ts b/samples/charts/data-chart/type-financial-ohlc-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-ohlc-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-financial-ohlc-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-financial-ohlc-series/src/main.ts b/samples/charts/data-chart/type-financial-ohlc-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-financial-ohlc-series/src/main.ts
+++ b/samples/charts/data-chart/type-financial-ohlc-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-financial-overlays/src/app/SampleFinancialData.ts b/samples/charts/data-chart/type-financial-overlays/src/SampleFinancialData.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-overlays/src/app/SampleFinancialData.ts
rename to samples/charts/data-chart/type-financial-overlays/src/SampleFinancialData.ts
diff --git a/samples/charts/data-chart/type-financial-overlays/src/app/app.component.html b/samples/charts/data-chart/type-financial-overlays/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-financial-overlays/src/app/app.component.html
rename to samples/charts/data-chart/type-financial-overlays/src/app.component.html
diff --git a/samples/charts/data-chart/type-financial-overlays/src/app/app.component.scss b/samples/charts/data-chart/type-financial-overlays/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-financial-overlays/src/app/app.component.scss
rename to samples/charts/data-chart/type-financial-overlays/src/app.component.scss
diff --git a/samples/charts/data-chart/type-financial-overlays/src/app/app.component.ts b/samples/charts/data-chart/type-financial-overlays/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-overlays/src/app/app.component.ts
rename to samples/charts/data-chart/type-financial-overlays/src/app.component.ts
diff --git a/samples/charts/data-chart/type-financial-overlays/src/app/app.module.ts b/samples/charts/data-chart/type-financial-overlays/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-overlays/src/app/app.module.ts
rename to samples/charts/data-chart/type-financial-overlays/src/app.module.ts
diff --git a/samples/charts/data-chart/type-financial-overlays/src/main.ts b/samples/charts/data-chart/type-financial-overlays/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-financial-overlays/src/main.ts
+++ b/samples/charts/data-chart/type-financial-overlays/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-financial-series/src/app/SampleFinancialData.ts b/samples/charts/data-chart/type-financial-series/src/SampleFinancialData.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-series/src/app/SampleFinancialData.ts
rename to samples/charts/data-chart/type-financial-series/src/SampleFinancialData.ts
diff --git a/samples/charts/data-chart/type-financial-series/src/app/app.component.html b/samples/charts/data-chart/type-financial-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-financial-series/src/app/app.component.html
rename to samples/charts/data-chart/type-financial-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-financial-series/src/app/app.component.scss b/samples/charts/data-chart/type-financial-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-financial-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-financial-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-financial-series/src/app/app.component.ts b/samples/charts/data-chart/type-financial-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-financial-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-financial-series/src/app/app.module.ts b/samples/charts/data-chart/type-financial-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-financial-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-financial-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-financial-series/src/main.ts b/samples/charts/data-chart/type-financial-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-financial-series/src/main.ts
+++ b/samples/charts/data-chart/type-financial-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-radial-area-series/src/app/SampleRadialData.ts b/samples/charts/data-chart/type-radial-area-series/src/SampleRadialData.ts
similarity index 100%
rename from samples/charts/data-chart/type-radial-area-series/src/app/SampleRadialData.ts
rename to samples/charts/data-chart/type-radial-area-series/src/SampleRadialData.ts
diff --git a/samples/charts/data-chart/type-radial-area-series/src/app/app.component.html b/samples/charts/data-chart/type-radial-area-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-radial-area-series/src/app/app.component.html
rename to samples/charts/data-chart/type-radial-area-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-radial-area-series/src/app/app.component.scss b/samples/charts/data-chart/type-radial-area-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-radial-area-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-radial-area-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-radial-area-series/src/app/app.component.ts b/samples/charts/data-chart/type-radial-area-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-radial-area-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-radial-area-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-radial-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-radial-area-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-radial-area-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-radial-area-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-radial-area-series/src/main.ts b/samples/charts/data-chart/type-radial-area-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-radial-area-series/src/main.ts
+++ b/samples/charts/data-chart/type-radial-area-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-radial-column-series/src/app/SampleRadialData.ts b/samples/charts/data-chart/type-radial-column-series/src/SampleRadialData.ts
similarity index 100%
rename from samples/charts/data-chart/type-radial-column-series/src/app/SampleRadialData.ts
rename to samples/charts/data-chart/type-radial-column-series/src/SampleRadialData.ts
diff --git a/samples/charts/data-chart/type-radial-column-series/src/app/app.component.html b/samples/charts/data-chart/type-radial-column-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-radial-column-series/src/app/app.component.html
rename to samples/charts/data-chart/type-radial-column-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-radial-column-series/src/app/app.component.scss b/samples/charts/data-chart/type-radial-column-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-radial-column-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-radial-column-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-radial-column-series/src/app/app.component.ts b/samples/charts/data-chart/type-radial-column-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-radial-column-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-radial-column-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-radial-column-series/src/app/app.module.ts b/samples/charts/data-chart/type-radial-column-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-radial-column-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-radial-column-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-radial-column-series/src/main.ts b/samples/charts/data-chart/type-radial-column-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-radial-column-series/src/main.ts
+++ b/samples/charts/data-chart/type-radial-column-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-radial-line-series/src/app/SampleRadialData.ts b/samples/charts/data-chart/type-radial-line-series/src/SampleRadialData.ts
similarity index 100%
rename from samples/charts/data-chart/type-radial-line-series/src/app/SampleRadialData.ts
rename to samples/charts/data-chart/type-radial-line-series/src/SampleRadialData.ts
diff --git a/samples/charts/data-chart/type-radial-line-series/src/app/app.component.html b/samples/charts/data-chart/type-radial-line-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-radial-line-series/src/app/app.component.html
rename to samples/charts/data-chart/type-radial-line-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-radial-line-series/src/app/app.component.scss b/samples/charts/data-chart/type-radial-line-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-radial-line-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-radial-line-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-radial-line-series/src/app/app.component.ts b/samples/charts/data-chart/type-radial-line-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-radial-line-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-radial-line-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-radial-line-series/src/app/app.module.ts b/samples/charts/data-chart/type-radial-line-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-radial-line-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-radial-line-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-radial-line-series/src/main.ts b/samples/charts/data-chart/type-radial-line-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-radial-line-series/src/main.ts
+++ b/samples/charts/data-chart/type-radial-line-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-radial-pie-series/src/app/SampleRadialData.ts b/samples/charts/data-chart/type-radial-pie-series/src/SampleRadialData.ts
similarity index 100%
rename from samples/charts/data-chart/type-radial-pie-series/src/app/SampleRadialData.ts
rename to samples/charts/data-chart/type-radial-pie-series/src/SampleRadialData.ts
diff --git a/samples/charts/data-chart/type-radial-pie-series/src/app/app.component.html b/samples/charts/data-chart/type-radial-pie-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-radial-pie-series/src/app/app.component.html
rename to samples/charts/data-chart/type-radial-pie-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-radial-pie-series/src/app/app.component.scss b/samples/charts/data-chart/type-radial-pie-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-radial-pie-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-radial-pie-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-radial-pie-series/src/app/app.component.ts b/samples/charts/data-chart/type-radial-pie-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-radial-pie-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-radial-pie-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-radial-pie-series/src/app/app.module.ts b/samples/charts/data-chart/type-radial-pie-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-radial-pie-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-radial-pie-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-radial-pie-series/src/main.ts b/samples/charts/data-chart/type-radial-pie-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-radial-pie-series/src/main.ts
+++ b/samples/charts/data-chart/type-radial-pie-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-range-area-series/src/app/SampleRangeData.ts b/samples/charts/data-chart/type-range-area-series/src/SampleRangeData.ts
similarity index 100%
rename from samples/charts/data-chart/type-range-area-series/src/app/SampleRangeData.ts
rename to samples/charts/data-chart/type-range-area-series/src/SampleRangeData.ts
diff --git a/samples/charts/data-chart/type-range-area-series/src/app/app.component.html b/samples/charts/data-chart/type-range-area-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-range-area-series/src/app/app.component.html
rename to samples/charts/data-chart/type-range-area-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-range-area-series/src/app/app.component.scss b/samples/charts/data-chart/type-range-area-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-range-area-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-range-area-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-range-area-series/src/app/app.component.ts b/samples/charts/data-chart/type-range-area-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-range-area-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-range-area-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-range-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-range-area-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-range-area-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-range-area-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-range-area-series/src/main.ts b/samples/charts/data-chart/type-range-area-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-range-area-series/src/main.ts
+++ b/samples/charts/data-chart/type-range-area-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-range-column-series/src/app/SampleRangeData.ts b/samples/charts/data-chart/type-range-column-series/src/SampleRangeData.ts
similarity index 100%
rename from samples/charts/data-chart/type-range-column-series/src/app/SampleRangeData.ts
rename to samples/charts/data-chart/type-range-column-series/src/SampleRangeData.ts
diff --git a/samples/charts/data-chart/type-range-column-series/src/app/app.component.html b/samples/charts/data-chart/type-range-column-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-range-column-series/src/app/app.component.html
rename to samples/charts/data-chart/type-range-column-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-range-column-series/src/app/app.component.scss b/samples/charts/data-chart/type-range-column-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-range-column-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-range-column-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-range-column-series/src/app/app.component.ts b/samples/charts/data-chart/type-range-column-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-range-column-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-range-column-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-range-column-series/src/app/app.module.ts b/samples/charts/data-chart/type-range-column-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-range-column-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-range-column-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-range-column-series/src/main.ts b/samples/charts/data-chart/type-range-column-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-range-column-series/src/main.ts
+++ b/samples/charts/data-chart/type-range-column-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-range-series/src/app/SampleRangeData.ts b/samples/charts/data-chart/type-range-series/src/SampleRangeData.ts
similarity index 100%
rename from samples/charts/data-chart/type-range-series/src/app/SampleRangeData.ts
rename to samples/charts/data-chart/type-range-series/src/SampleRangeData.ts
diff --git a/samples/charts/data-chart/type-range-series/src/app/app.component.html b/samples/charts/data-chart/type-range-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-range-series/src/app/app.component.html
rename to samples/charts/data-chart/type-range-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-range-series/src/app/app.component.scss b/samples/charts/data-chart/type-range-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-range-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-range-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-range-series/src/app/app.component.ts b/samples/charts/data-chart/type-range-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-range-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-range-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-range-series/src/app/app.module.ts b/samples/charts/data-chart/type-range-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-range-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-range-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-range-series/src/main.ts b/samples/charts/data-chart/type-range-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-range-series/src/main.ts
+++ b/samples/charts/data-chart/type-range-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-scatter-area-series/src/app/SampleScatterData.ts b/samples/charts/data-chart/type-scatter-area-series/src/SampleScatterData.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-area-series/src/app/SampleScatterData.ts
rename to samples/charts/data-chart/type-scatter-area-series/src/SampleScatterData.ts
diff --git a/samples/charts/data-chart/type-scatter-area-series/src/app/app.component.html b/samples/charts/data-chart/type-scatter-area-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-scatter-area-series/src/app/app.component.html
rename to samples/charts/data-chart/type-scatter-area-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-scatter-area-series/src/app/app.component.scss b/samples/charts/data-chart/type-scatter-area-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-scatter-area-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-scatter-area-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-scatter-area-series/src/app/app.component.ts b/samples/charts/data-chart/type-scatter-area-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-area-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-scatter-area-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-scatter-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-area-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-area-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-scatter-area-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-scatter-area-series/src/main.ts b/samples/charts/data-chart/type-scatter-area-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-scatter-area-series/src/main.ts
+++ b/samples/charts/data-chart/type-scatter-area-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-scatter-bubble-series/src/app/SampleScatterStats.ts b/samples/charts/data-chart/type-scatter-bubble-series/src/SampleScatterStats.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-bubble-series/src/app/SampleScatterStats.ts
rename to samples/charts/data-chart/type-scatter-bubble-series/src/SampleScatterStats.ts
diff --git a/samples/charts/data-chart/type-scatter-bubble-series/src/app/app.component.html b/samples/charts/data-chart/type-scatter-bubble-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-scatter-bubble-series/src/app/app.component.html
rename to samples/charts/data-chart/type-scatter-bubble-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-scatter-bubble-series/src/app/app.component.scss b/samples/charts/data-chart/type-scatter-bubble-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-scatter-bubble-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-scatter-bubble-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-scatter-bubble-series/src/app/app.component.ts b/samples/charts/data-chart/type-scatter-bubble-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-bubble-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-scatter-bubble-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-scatter-bubble-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-bubble-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-bubble-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-scatter-bubble-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-scatter-bubble-series/src/main.ts b/samples/charts/data-chart/type-scatter-bubble-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-scatter-bubble-series/src/main.ts
+++ b/samples/charts/data-chart/type-scatter-bubble-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-scatter-contour-series/src/app/SampleScatterData.ts b/samples/charts/data-chart/type-scatter-contour-series/src/SampleScatterData.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-contour-series/src/app/SampleScatterData.ts
rename to samples/charts/data-chart/type-scatter-contour-series/src/SampleScatterData.ts
diff --git a/samples/charts/data-chart/type-scatter-contour-series/src/app/app.component.html b/samples/charts/data-chart/type-scatter-contour-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-scatter-contour-series/src/app/app.component.html
rename to samples/charts/data-chart/type-scatter-contour-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-scatter-contour-series/src/app/app.component.scss b/samples/charts/data-chart/type-scatter-contour-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-scatter-contour-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-scatter-contour-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-scatter-contour-series/src/app/app.component.ts b/samples/charts/data-chart/type-scatter-contour-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-contour-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-scatter-contour-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-scatter-contour-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-contour-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-contour-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-scatter-contour-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-scatter-contour-series/src/main.ts b/samples/charts/data-chart/type-scatter-contour-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-scatter-contour-series/src/main.ts
+++ b/samples/charts/data-chart/type-scatter-contour-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-scatter-hd-series/src/app/SampleDensityData.ts b/samples/charts/data-chart/type-scatter-hd-series/src/SampleDensityData.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-hd-series/src/app/SampleDensityData.ts
rename to samples/charts/data-chart/type-scatter-hd-series/src/SampleDensityData.ts
diff --git a/samples/charts/data-chart/type-scatter-hd-series/src/app/app.component.html b/samples/charts/data-chart/type-scatter-hd-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-scatter-hd-series/src/app/app.component.html
rename to samples/charts/data-chart/type-scatter-hd-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-scatter-hd-series/src/app/app.component.scss b/samples/charts/data-chart/type-scatter-hd-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-scatter-hd-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-scatter-hd-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-scatter-hd-series/src/app/app.component.ts b/samples/charts/data-chart/type-scatter-hd-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-hd-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-scatter-hd-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-scatter-hd-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-hd-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-hd-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-scatter-hd-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-scatter-hd-series/src/main.ts b/samples/charts/data-chart/type-scatter-hd-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-scatter-hd-series/src/main.ts
+++ b/samples/charts/data-chart/type-scatter-hd-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-scatter-line-series/src/app/SampleScatterStats.ts b/samples/charts/data-chart/type-scatter-line-series/src/SampleScatterStats.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-line-series/src/app/SampleScatterStats.ts
rename to samples/charts/data-chart/type-scatter-line-series/src/SampleScatterStats.ts
diff --git a/samples/charts/data-chart/type-scatter-line-series/src/app/app.component.html b/samples/charts/data-chart/type-scatter-line-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-scatter-line-series/src/app/app.component.html
rename to samples/charts/data-chart/type-scatter-line-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-scatter-line-series/src/app/app.component.scss b/samples/charts/data-chart/type-scatter-line-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-scatter-line-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-scatter-line-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-scatter-line-series/src/app/app.component.ts b/samples/charts/data-chart/type-scatter-line-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-line-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-scatter-line-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-scatter-line-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-line-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-line-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-scatter-line-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-scatter-line-series/src/main.ts b/samples/charts/data-chart/type-scatter-line-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-scatter-line-series/src/main.ts
+++ b/samples/charts/data-chart/type-scatter-line-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-scatter-point-series/src/app/SampleScatterStats.ts b/samples/charts/data-chart/type-scatter-point-series/src/SampleScatterStats.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-point-series/src/app/SampleScatterStats.ts
rename to samples/charts/data-chart/type-scatter-point-series/src/SampleScatterStats.ts
diff --git a/samples/charts/data-chart/type-scatter-point-series/src/app/app.component.html b/samples/charts/data-chart/type-scatter-point-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-scatter-point-series/src/app/app.component.html
rename to samples/charts/data-chart/type-scatter-point-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-scatter-point-series/src/app/app.component.scss b/samples/charts/data-chart/type-scatter-point-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-scatter-point-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-scatter-point-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-scatter-point-series/src/app/app.component.ts b/samples/charts/data-chart/type-scatter-point-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-point-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-scatter-point-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-scatter-point-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-point-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-point-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-scatter-point-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-scatter-point-series/src/main.ts b/samples/charts/data-chart/type-scatter-point-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-scatter-point-series/src/main.ts
+++ b/samples/charts/data-chart/type-scatter-point-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-scatter-polygon-series/src/app/app.component.html b/samples/charts/data-chart/type-scatter-polygon-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-scatter-polygon-series/src/app/app.component.html
rename to samples/charts/data-chart/type-scatter-polygon-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-scatter-polygon-series/src/app/app.component.scss b/samples/charts/data-chart/type-scatter-polygon-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-scatter-polygon-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-scatter-polygon-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-scatter-polygon-series/src/app/app.component.ts b/samples/charts/data-chart/type-scatter-polygon-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-polygon-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-scatter-polygon-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-scatter-polygon-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-polygon-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-polygon-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-scatter-polygon-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-scatter-polygon-series/src/main.ts b/samples/charts/data-chart/type-scatter-polygon-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-scatter-polygon-series/src/main.ts
+++ b/samples/charts/data-chart/type-scatter-polygon-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-scatter-polyline-series/src/app/app.component.html b/samples/charts/data-chart/type-scatter-polyline-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-scatter-polyline-series/src/app/app.component.html
rename to samples/charts/data-chart/type-scatter-polyline-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-scatter-polyline-series/src/app/app.component.scss b/samples/charts/data-chart/type-scatter-polyline-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-scatter-polyline-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-scatter-polyline-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-scatter-polyline-series/src/app/app.component.ts b/samples/charts/data-chart/type-scatter-polyline-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-polyline-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-scatter-polyline-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-scatter-polyline-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-polyline-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-polyline-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-scatter-polyline-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-scatter-polyline-series/src/main.ts b/samples/charts/data-chart/type-scatter-polyline-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-scatter-polyline-series/src/main.ts
+++ b/samples/charts/data-chart/type-scatter-polyline-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-scatter-series/src/app/SampleScatterStats.ts b/samples/charts/data-chart/type-scatter-series/src/SampleScatterStats.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-series/src/app/SampleScatterStats.ts
rename to samples/charts/data-chart/type-scatter-series/src/SampleScatterStats.ts
diff --git a/samples/charts/data-chart/type-scatter-series/src/app/app.component.html b/samples/charts/data-chart/type-scatter-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-scatter-series/src/app/app.component.html
rename to samples/charts/data-chart/type-scatter-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-scatter-series/src/app/app.component.scss b/samples/charts/data-chart/type-scatter-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-scatter-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-scatter-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-scatter-series/src/app/app.component.ts b/samples/charts/data-chart/type-scatter-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-scatter-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-scatter-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-scatter-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-scatter-series/src/main.ts b/samples/charts/data-chart/type-scatter-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-scatter-series/src/main.ts
+++ b/samples/charts/data-chart/type-scatter-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-scatter-spline-series/src/app/SampleScatterStats.ts b/samples/charts/data-chart/type-scatter-spline-series/src/SampleScatterStats.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-spline-series/src/app/SampleScatterStats.ts
rename to samples/charts/data-chart/type-scatter-spline-series/src/SampleScatterStats.ts
diff --git a/samples/charts/data-chart/type-scatter-spline-series/src/app/app.component.html b/samples/charts/data-chart/type-scatter-spline-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-scatter-spline-series/src/app/app.component.html
rename to samples/charts/data-chart/type-scatter-spline-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-scatter-spline-series/src/app/app.component.scss b/samples/charts/data-chart/type-scatter-spline-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-scatter-spline-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-scatter-spline-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-scatter-spline-series/src/app/app.component.ts b/samples/charts/data-chart/type-scatter-spline-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-spline-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-scatter-spline-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-scatter-spline-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-spline-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-scatter-spline-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-scatter-spline-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-scatter-spline-series/src/main.ts b/samples/charts/data-chart/type-scatter-spline-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-scatter-spline-series/src/main.ts
+++ b/samples/charts/data-chart/type-scatter-spline-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-shape-series/src/app/SampleShapeData.ts b/samples/charts/data-chart/type-shape-series/src/SampleShapeData.ts
similarity index 100%
rename from samples/charts/data-chart/type-shape-series/src/app/SampleShapeData.ts
rename to samples/charts/data-chart/type-shape-series/src/SampleShapeData.ts
diff --git a/samples/charts/data-chart/type-shape-series/src/app/app.component.html b/samples/charts/data-chart/type-shape-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-shape-series/src/app/app.component.html
rename to samples/charts/data-chart/type-shape-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-shape-series/src/app/app.component.scss b/samples/charts/data-chart/type-shape-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-shape-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-shape-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-shape-series/src/app/app.component.ts b/samples/charts/data-chart/type-shape-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-shape-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-shape-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-shape-series/src/app/app.module.ts b/samples/charts/data-chart/type-shape-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-shape-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-shape-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-shape-series/src/main.ts b/samples/charts/data-chart/type-shape-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-shape-series/src/main.ts
+++ b/samples/charts/data-chart/type-shape-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-stacked-100-area-series/src/app/SharedData.ts b/samples/charts/data-chart/type-stacked-100-area-series/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-area-series/src/app/SharedData.ts
rename to samples/charts/data-chart/type-stacked-100-area-series/src/SharedData.ts
diff --git a/samples/charts/data-chart/type-stacked-100-area-series/src/app/app.component.html b/samples/charts/data-chart/type-stacked-100-area-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-area-series/src/app/app.component.html
rename to samples/charts/data-chart/type-stacked-100-area-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-stacked-100-area-series/src/app/app.component.scss b/samples/charts/data-chart/type-stacked-100-area-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-area-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-stacked-100-area-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-stacked-100-area-series/src/app/app.component.ts b/samples/charts/data-chart/type-stacked-100-area-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-area-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-stacked-100-area-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-stacked-100-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-100-area-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-area-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-stacked-100-area-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-stacked-100-area-series/src/main.ts b/samples/charts/data-chart/type-stacked-100-area-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-stacked-100-area-series/src/main.ts
+++ b/samples/charts/data-chart/type-stacked-100-area-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-stacked-100-bar-series/src/app/SharedData.ts b/samples/charts/data-chart/type-stacked-100-bar-series/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-bar-series/src/app/SharedData.ts
rename to samples/charts/data-chart/type-stacked-100-bar-series/src/SharedData.ts
diff --git a/samples/charts/data-chart/type-stacked-100-bar-series/src/app/app.component.html b/samples/charts/data-chart/type-stacked-100-bar-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-bar-series/src/app/app.component.html
rename to samples/charts/data-chart/type-stacked-100-bar-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-stacked-100-bar-series/src/app/app.component.scss b/samples/charts/data-chart/type-stacked-100-bar-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-bar-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-stacked-100-bar-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-stacked-100-bar-series/src/app/app.component.ts b/samples/charts/data-chart/type-stacked-100-bar-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-bar-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-stacked-100-bar-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-stacked-100-bar-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-100-bar-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-bar-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-stacked-100-bar-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-stacked-100-bar-series/src/main.ts b/samples/charts/data-chart/type-stacked-100-bar-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-stacked-100-bar-series/src/main.ts
+++ b/samples/charts/data-chart/type-stacked-100-bar-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-stacked-100-column-series/src/app/SharedData.ts b/samples/charts/data-chart/type-stacked-100-column-series/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-column-series/src/app/SharedData.ts
rename to samples/charts/data-chart/type-stacked-100-column-series/src/SharedData.ts
diff --git a/samples/charts/data-chart/type-stacked-100-column-series/src/app/app.component.html b/samples/charts/data-chart/type-stacked-100-column-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-column-series/src/app/app.component.html
rename to samples/charts/data-chart/type-stacked-100-column-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-stacked-100-column-series/src/app/app.component.scss b/samples/charts/data-chart/type-stacked-100-column-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-column-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-stacked-100-column-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-stacked-100-column-series/src/app/app.component.ts b/samples/charts/data-chart/type-stacked-100-column-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-column-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-stacked-100-column-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-stacked-100-column-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-100-column-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-column-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-stacked-100-column-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-stacked-100-column-series/src/main.ts b/samples/charts/data-chart/type-stacked-100-column-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-stacked-100-column-series/src/main.ts
+++ b/samples/charts/data-chart/type-stacked-100-column-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-stacked-100-line-series/src/app/SharedData.ts b/samples/charts/data-chart/type-stacked-100-line-series/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-line-series/src/app/SharedData.ts
rename to samples/charts/data-chart/type-stacked-100-line-series/src/SharedData.ts
diff --git a/samples/charts/data-chart/type-stacked-100-line-series/src/app/app.component.html b/samples/charts/data-chart/type-stacked-100-line-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-line-series/src/app/app.component.html
rename to samples/charts/data-chart/type-stacked-100-line-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-stacked-100-line-series/src/app/app.component.scss b/samples/charts/data-chart/type-stacked-100-line-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-line-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-stacked-100-line-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-stacked-100-line-series/src/app/app.component.ts b/samples/charts/data-chart/type-stacked-100-line-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-line-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-stacked-100-line-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-stacked-100-line-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-100-line-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-line-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-stacked-100-line-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-stacked-100-line-series/src/main.ts b/samples/charts/data-chart/type-stacked-100-line-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-stacked-100-line-series/src/main.ts
+++ b/samples/charts/data-chart/type-stacked-100-line-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-stacked-100-spline-area-series/src/app/SharedData.ts b/samples/charts/data-chart/type-stacked-100-spline-area-series/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-spline-area-series/src/app/SharedData.ts
rename to samples/charts/data-chart/type-stacked-100-spline-area-series/src/SharedData.ts
diff --git a/samples/charts/data-chart/type-stacked-100-spline-area-series/src/app/app.component.html b/samples/charts/data-chart/type-stacked-100-spline-area-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-spline-area-series/src/app/app.component.html
rename to samples/charts/data-chart/type-stacked-100-spline-area-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-stacked-100-spline-area-series/src/app/app.component.scss b/samples/charts/data-chart/type-stacked-100-spline-area-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-spline-area-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-stacked-100-spline-area-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-stacked-100-spline-area-series/src/app/app.component.ts b/samples/charts/data-chart/type-stacked-100-spline-area-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-spline-area-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-stacked-100-spline-area-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-stacked-100-spline-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-100-spline-area-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-spline-area-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-stacked-100-spline-area-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-stacked-100-spline-area-series/src/main.ts b/samples/charts/data-chart/type-stacked-100-spline-area-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-stacked-100-spline-area-series/src/main.ts
+++ b/samples/charts/data-chart/type-stacked-100-spline-area-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-stacked-100-spline-series/src/app/SharedData.ts b/samples/charts/data-chart/type-stacked-100-spline-series/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-spline-series/src/app/SharedData.ts
rename to samples/charts/data-chart/type-stacked-100-spline-series/src/SharedData.ts
diff --git a/samples/charts/data-chart/type-stacked-100-spline-series/src/app/app.component.html b/samples/charts/data-chart/type-stacked-100-spline-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-spline-series/src/app/app.component.html
rename to samples/charts/data-chart/type-stacked-100-spline-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-stacked-100-spline-series/src/app/app.component.scss b/samples/charts/data-chart/type-stacked-100-spline-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-spline-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-stacked-100-spline-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-stacked-100-spline-series/src/app/app.component.ts b/samples/charts/data-chart/type-stacked-100-spline-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-spline-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-stacked-100-spline-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-stacked-100-spline-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-100-spline-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-100-spline-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-stacked-100-spline-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-stacked-100-spline-series/src/main.ts b/samples/charts/data-chart/type-stacked-100-spline-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-stacked-100-spline-series/src/main.ts
+++ b/samples/charts/data-chart/type-stacked-100-spline-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-stacked-area-series/src/app/SharedData.ts b/samples/charts/data-chart/type-stacked-area-series/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-area-series/src/app/SharedData.ts
rename to samples/charts/data-chart/type-stacked-area-series/src/SharedData.ts
diff --git a/samples/charts/data-chart/type-stacked-area-series/src/app/app.component.html b/samples/charts/data-chart/type-stacked-area-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-stacked-area-series/src/app/app.component.html
rename to samples/charts/data-chart/type-stacked-area-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-stacked-area-series/src/app/app.component.scss b/samples/charts/data-chart/type-stacked-area-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-stacked-area-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-stacked-area-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-stacked-area-series/src/app/app.component.ts b/samples/charts/data-chart/type-stacked-area-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-area-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-stacked-area-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-stacked-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-area-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-area-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-stacked-area-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-stacked-area-series/src/main.ts b/samples/charts/data-chart/type-stacked-area-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-stacked-area-series/src/main.ts
+++ b/samples/charts/data-chart/type-stacked-area-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-stacked-bar-series/src/app/SharedData.ts b/samples/charts/data-chart/type-stacked-bar-series/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-bar-series/src/app/SharedData.ts
rename to samples/charts/data-chart/type-stacked-bar-series/src/SharedData.ts
diff --git a/samples/charts/data-chart/type-stacked-bar-series/src/app/app.component.html b/samples/charts/data-chart/type-stacked-bar-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-stacked-bar-series/src/app/app.component.html
rename to samples/charts/data-chart/type-stacked-bar-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-stacked-bar-series/src/app/app.component.scss b/samples/charts/data-chart/type-stacked-bar-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-stacked-bar-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-stacked-bar-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-stacked-bar-series/src/app/app.component.ts b/samples/charts/data-chart/type-stacked-bar-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-bar-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-stacked-bar-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-stacked-bar-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-bar-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-bar-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-stacked-bar-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-stacked-bar-series/src/main.ts b/samples/charts/data-chart/type-stacked-bar-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-stacked-bar-series/src/main.ts
+++ b/samples/charts/data-chart/type-stacked-bar-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-stacked-column-series/src/app/SharedData.ts b/samples/charts/data-chart/type-stacked-column-series/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-column-series/src/app/SharedData.ts
rename to samples/charts/data-chart/type-stacked-column-series/src/SharedData.ts
diff --git a/samples/charts/data-chart/type-stacked-column-series/src/app/app.component.html b/samples/charts/data-chart/type-stacked-column-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-stacked-column-series/src/app/app.component.html
rename to samples/charts/data-chart/type-stacked-column-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-stacked-column-series/src/app/app.component.scss b/samples/charts/data-chart/type-stacked-column-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-stacked-column-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-stacked-column-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-stacked-column-series/src/app/app.component.ts b/samples/charts/data-chart/type-stacked-column-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-column-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-stacked-column-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-stacked-column-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-column-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-column-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-stacked-column-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-stacked-column-series/src/main.ts b/samples/charts/data-chart/type-stacked-column-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-stacked-column-series/src/main.ts
+++ b/samples/charts/data-chart/type-stacked-column-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-stacked-line-series/src/app/SharedData.ts b/samples/charts/data-chart/type-stacked-line-series/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-line-series/src/app/SharedData.ts
rename to samples/charts/data-chart/type-stacked-line-series/src/SharedData.ts
diff --git a/samples/charts/data-chart/type-stacked-line-series/src/app/app.component.html b/samples/charts/data-chart/type-stacked-line-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-stacked-line-series/src/app/app.component.html
rename to samples/charts/data-chart/type-stacked-line-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-stacked-line-series/src/app/app.component.scss b/samples/charts/data-chart/type-stacked-line-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-stacked-line-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-stacked-line-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-stacked-line-series/src/app/app.component.ts b/samples/charts/data-chart/type-stacked-line-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-line-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-stacked-line-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-stacked-line-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-line-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-line-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-stacked-line-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-stacked-line-series/src/main.ts b/samples/charts/data-chart/type-stacked-line-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-stacked-line-series/src/main.ts
+++ b/samples/charts/data-chart/type-stacked-line-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-stacked-spline-area-series/src/app/SharedData.ts b/samples/charts/data-chart/type-stacked-spline-area-series/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-spline-area-series/src/app/SharedData.ts
rename to samples/charts/data-chart/type-stacked-spline-area-series/src/SharedData.ts
diff --git a/samples/charts/data-chart/type-stacked-spline-area-series/src/app/app.component.html b/samples/charts/data-chart/type-stacked-spline-area-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-stacked-spline-area-series/src/app/app.component.html
rename to samples/charts/data-chart/type-stacked-spline-area-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-stacked-spline-area-series/src/app/app.component.scss b/samples/charts/data-chart/type-stacked-spline-area-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-stacked-spline-area-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-stacked-spline-area-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-stacked-spline-area-series/src/app/app.component.ts b/samples/charts/data-chart/type-stacked-spline-area-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-spline-area-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-stacked-spline-area-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-stacked-spline-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-spline-area-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-spline-area-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-stacked-spline-area-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-stacked-spline-area-series/src/main.ts b/samples/charts/data-chart/type-stacked-spline-area-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-stacked-spline-area-series/src/main.ts
+++ b/samples/charts/data-chart/type-stacked-spline-area-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/data-chart/type-stacked-spline-series/src/app/SharedData.ts b/samples/charts/data-chart/type-stacked-spline-series/src/SharedData.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-spline-series/src/app/SharedData.ts
rename to samples/charts/data-chart/type-stacked-spline-series/src/SharedData.ts
diff --git a/samples/charts/data-chart/type-stacked-spline-series/src/app/app.component.html b/samples/charts/data-chart/type-stacked-spline-series/src/app.component.html
similarity index 100%
rename from samples/charts/data-chart/type-stacked-spline-series/src/app/app.component.html
rename to samples/charts/data-chart/type-stacked-spline-series/src/app.component.html
diff --git a/samples/charts/data-chart/type-stacked-spline-series/src/app/app.component.scss b/samples/charts/data-chart/type-stacked-spline-series/src/app.component.scss
similarity index 100%
rename from samples/charts/data-chart/type-stacked-spline-series/src/app/app.component.scss
rename to samples/charts/data-chart/type-stacked-spline-series/src/app.component.scss
diff --git a/samples/charts/data-chart/type-stacked-spline-series/src/app/app.component.ts b/samples/charts/data-chart/type-stacked-spline-series/src/app.component.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-spline-series/src/app/app.component.ts
rename to samples/charts/data-chart/type-stacked-spline-series/src/app.component.ts
diff --git a/samples/charts/data-chart/type-stacked-spline-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-spline-series/src/app.module.ts
similarity index 100%
rename from samples/charts/data-chart/type-stacked-spline-series/src/app/app.module.ts
rename to samples/charts/data-chart/type-stacked-spline-series/src/app.module.ts
diff --git a/samples/charts/data-chart/type-stacked-spline-series/src/main.ts b/samples/charts/data-chart/type-stacked-spline-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/data-chart/type-stacked-spline-series/src/main.ts
+++ b/samples/charts/data-chart/type-stacked-spline-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/doughnut-chart/animation/src/app/app.component.html b/samples/charts/doughnut-chart/animation/src/app.component.html
similarity index 100%
rename from samples/charts/doughnut-chart/animation/src/app/app.component.html
rename to samples/charts/doughnut-chart/animation/src/app.component.html
diff --git a/samples/charts/doughnut-chart/animation/src/app/app.component.scss b/samples/charts/doughnut-chart/animation/src/app.component.scss
similarity index 100%
rename from samples/charts/doughnut-chart/animation/src/app/app.component.scss
rename to samples/charts/doughnut-chart/animation/src/app.component.scss
diff --git a/samples/charts/doughnut-chart/animation/src/app/app.component.ts b/samples/charts/doughnut-chart/animation/src/app.component.ts
similarity index 100%
rename from samples/charts/doughnut-chart/animation/src/app/app.component.ts
rename to samples/charts/doughnut-chart/animation/src/app.component.ts
diff --git a/samples/charts/doughnut-chart/animation/src/app/app.module.ts b/samples/charts/doughnut-chart/animation/src/app.module.ts
similarity index 100%
rename from samples/charts/doughnut-chart/animation/src/app/app.module.ts
rename to samples/charts/doughnut-chart/animation/src/app.module.ts
diff --git a/samples/charts/doughnut-chart/animation/src/main.ts b/samples/charts/doughnut-chart/animation/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/doughnut-chart/animation/src/main.ts
+++ b/samples/charts/doughnut-chart/animation/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/doughnut-chart/explosion/src/app/app.component.html b/samples/charts/doughnut-chart/explosion/src/app.component.html
similarity index 100%
rename from samples/charts/doughnut-chart/explosion/src/app/app.component.html
rename to samples/charts/doughnut-chart/explosion/src/app.component.html
diff --git a/samples/charts/doughnut-chart/explosion/src/app/app.component.scss b/samples/charts/doughnut-chart/explosion/src/app.component.scss
similarity index 100%
rename from samples/charts/doughnut-chart/explosion/src/app/app.component.scss
rename to samples/charts/doughnut-chart/explosion/src/app.component.scss
diff --git a/samples/charts/doughnut-chart/explosion/src/app/app.component.ts b/samples/charts/doughnut-chart/explosion/src/app.component.ts
similarity index 100%
rename from samples/charts/doughnut-chart/explosion/src/app/app.component.ts
rename to samples/charts/doughnut-chart/explosion/src/app.component.ts
diff --git a/samples/charts/doughnut-chart/explosion/src/app/app.module.ts b/samples/charts/doughnut-chart/explosion/src/app.module.ts
similarity index 100%
rename from samples/charts/doughnut-chart/explosion/src/app/app.module.ts
rename to samples/charts/doughnut-chart/explosion/src/app.module.ts
diff --git a/samples/charts/doughnut-chart/explosion/src/main.ts b/samples/charts/doughnut-chart/explosion/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/doughnut-chart/explosion/src/main.ts
+++ b/samples/charts/doughnut-chart/explosion/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/doughnut-chart/selection/src/app/app.component.html b/samples/charts/doughnut-chart/selection/src/app.component.html
similarity index 100%
rename from samples/charts/doughnut-chart/selection/src/app/app.component.html
rename to samples/charts/doughnut-chart/selection/src/app.component.html
diff --git a/samples/charts/doughnut-chart/selection/src/app/app.component.scss b/samples/charts/doughnut-chart/selection/src/app.component.scss
similarity index 100%
rename from samples/charts/doughnut-chart/selection/src/app/app.component.scss
rename to samples/charts/doughnut-chart/selection/src/app.component.scss
diff --git a/samples/charts/doughnut-chart/selection/src/app/app.component.ts b/samples/charts/doughnut-chart/selection/src/app.component.ts
similarity index 100%
rename from samples/charts/doughnut-chart/selection/src/app/app.component.ts
rename to samples/charts/doughnut-chart/selection/src/app.component.ts
diff --git a/samples/charts/doughnut-chart/selection/src/app/app.module.ts b/samples/charts/doughnut-chart/selection/src/app.module.ts
similarity index 100%
rename from samples/charts/doughnut-chart/selection/src/app/app.module.ts
rename to samples/charts/doughnut-chart/selection/src/app.module.ts
diff --git a/samples/charts/doughnut-chart/selection/src/main.ts b/samples/charts/doughnut-chart/selection/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/doughnut-chart/selection/src/main.ts
+++ b/samples/charts/doughnut-chart/selection/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/annotations/src/app/StocksUtility.ts b/samples/charts/financial-chart/annotations/src/StocksUtility.ts
similarity index 100%
rename from samples/charts/financial-chart/annotations/src/app/StocksUtility.ts
rename to samples/charts/financial-chart/annotations/src/StocksUtility.ts
diff --git a/samples/charts/financial-chart/annotations/src/app/app.component.html b/samples/charts/financial-chart/annotations/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/annotations/src/app/app.component.html
rename to samples/charts/financial-chart/annotations/src/app.component.html
diff --git a/samples/charts/financial-chart/annotations/src/app/app.component.scss b/samples/charts/financial-chart/annotations/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/annotations/src/app/app.component.scss
rename to samples/charts/financial-chart/annotations/src/app.component.scss
diff --git a/samples/charts/financial-chart/annotations/src/app/app.component.ts b/samples/charts/financial-chart/annotations/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/annotations/src/app/app.component.ts
rename to samples/charts/financial-chart/annotations/src/app.component.ts
diff --git a/samples/charts/financial-chart/annotations/src/app/app.module.ts b/samples/charts/financial-chart/annotations/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/annotations/src/app/app.module.ts
rename to samples/charts/financial-chart/annotations/src/app.module.ts
diff --git a/samples/charts/financial-chart/annotations/src/main.ts b/samples/charts/financial-chart/annotations/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/annotations/src/main.ts
+++ b/samples/charts/financial-chart/annotations/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/axis-types/src/app/FinancialDataService.ts b/samples/charts/financial-chart/axis-types/src/FinancialDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/axis-types/src/app/FinancialDataService.ts
rename to samples/charts/financial-chart/axis-types/src/FinancialDataService.ts
diff --git a/samples/charts/financial-chart/axis-types/src/app/app.component.html b/samples/charts/financial-chart/axis-types/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/axis-types/src/app/app.component.html
rename to samples/charts/financial-chart/axis-types/src/app.component.html
diff --git a/samples/charts/financial-chart/axis-types/src/app/app.component.scss b/samples/charts/financial-chart/axis-types/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/axis-types/src/app/app.component.scss
rename to samples/charts/financial-chart/axis-types/src/app.component.scss
diff --git a/samples/charts/financial-chart/axis-types/src/app/app.component.ts b/samples/charts/financial-chart/axis-types/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/axis-types/src/app/app.component.ts
rename to samples/charts/financial-chart/axis-types/src/app.component.ts
diff --git a/samples/charts/financial-chart/axis-types/src/app/app.module.ts b/samples/charts/financial-chart/axis-types/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/axis-types/src/app/app.module.ts
rename to samples/charts/financial-chart/axis-types/src/app.module.ts
diff --git a/samples/charts/financial-chart/axis-types/src/main.ts b/samples/charts/financial-chart/axis-types/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/axis-types/src/main.ts
+++ b/samples/charts/financial-chart/axis-types/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/high-frequency/src/app/app.component.html b/samples/charts/financial-chart/high-frequency/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/high-frequency/src/app/app.component.html
rename to samples/charts/financial-chart/high-frequency/src/app.component.html
diff --git a/samples/charts/financial-chart/high-frequency/src/app/app.component.scss b/samples/charts/financial-chart/high-frequency/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/high-frequency/src/app/app.component.scss
rename to samples/charts/financial-chart/high-frequency/src/app.component.scss
diff --git a/samples/charts/financial-chart/high-frequency/src/app/app.component.ts b/samples/charts/financial-chart/high-frequency/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/high-frequency/src/app/app.component.ts
rename to samples/charts/financial-chart/high-frequency/src/app.component.ts
diff --git a/samples/charts/financial-chart/high-frequency/src/app/app.module.ts b/samples/charts/financial-chart/high-frequency/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/high-frequency/src/app/app.module.ts
rename to samples/charts/financial-chart/high-frequency/src/app.module.ts
diff --git a/samples/charts/financial-chart/high-frequency/src/main.ts b/samples/charts/financial-chart/high-frequency/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/high-frequency/src/main.ts
+++ b/samples/charts/financial-chart/high-frequency/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/high-volume/src/app/GenerateHourlyPricesService.ts b/samples/charts/financial-chart/high-volume/src/GenerateHourlyPricesService.ts
similarity index 100%
rename from samples/charts/financial-chart/high-volume/src/app/GenerateHourlyPricesService.ts
rename to samples/charts/financial-chart/high-volume/src/GenerateHourlyPricesService.ts
diff --git a/samples/charts/financial-chart/high-volume/src/app/app.component.html b/samples/charts/financial-chart/high-volume/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/high-volume/src/app/app.component.html
rename to samples/charts/financial-chart/high-volume/src/app.component.html
diff --git a/samples/charts/financial-chart/high-volume/src/app/app.component.scss b/samples/charts/financial-chart/high-volume/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/high-volume/src/app/app.component.scss
rename to samples/charts/financial-chart/high-volume/src/app.component.scss
diff --git a/samples/charts/financial-chart/high-volume/src/app/app.component.ts b/samples/charts/financial-chart/high-volume/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/high-volume/src/app/app.component.ts
rename to samples/charts/financial-chart/high-volume/src/app.component.ts
diff --git a/samples/charts/financial-chart/high-volume/src/app/app.module.ts b/samples/charts/financial-chart/high-volume/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/high-volume/src/app/app.module.ts
rename to samples/charts/financial-chart/high-volume/src/app.module.ts
diff --git a/samples/charts/financial-chart/high-volume/src/main.ts b/samples/charts/financial-chart/high-volume/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/high-volume/src/main.ts
+++ b/samples/charts/financial-chart/high-volume/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/indicator-customization/src/app/FinancialDataService.ts b/samples/charts/financial-chart/indicator-customization/src/FinancialDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/indicator-customization/src/app/FinancialDataService.ts
rename to samples/charts/financial-chart/indicator-customization/src/FinancialDataService.ts
diff --git a/samples/charts/financial-chart/indicator-customization/src/app/app.component.html b/samples/charts/financial-chart/indicator-customization/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/indicator-customization/src/app/app.component.html
rename to samples/charts/financial-chart/indicator-customization/src/app.component.html
diff --git a/samples/charts/financial-chart/indicator-customization/src/app/app.component.scss b/samples/charts/financial-chart/indicator-customization/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/indicator-customization/src/app/app.component.scss
rename to samples/charts/financial-chart/indicator-customization/src/app.component.scss
diff --git a/samples/charts/financial-chart/indicator-customization/src/app/app.component.ts b/samples/charts/financial-chart/indicator-customization/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/indicator-customization/src/app/app.component.ts
rename to samples/charts/financial-chart/indicator-customization/src/app.component.ts
diff --git a/samples/charts/financial-chart/indicator-customization/src/app/app.module.ts b/samples/charts/financial-chart/indicator-customization/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/indicator-customization/src/app/app.module.ts
rename to samples/charts/financial-chart/indicator-customization/src/app.module.ts
diff --git a/samples/charts/financial-chart/indicator-customization/src/main.ts b/samples/charts/financial-chart/indicator-customization/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/indicator-customization/src/main.ts
+++ b/samples/charts/financial-chart/indicator-customization/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/indicator-types/src/app/FinancialDataService.ts b/samples/charts/financial-chart/indicator-types/src/FinancialDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/indicator-types/src/app/FinancialDataService.ts
rename to samples/charts/financial-chart/indicator-types/src/FinancialDataService.ts
diff --git a/samples/charts/financial-chart/indicator-types/src/app/app.component.html b/samples/charts/financial-chart/indicator-types/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/indicator-types/src/app/app.component.html
rename to samples/charts/financial-chart/indicator-types/src/app.component.html
diff --git a/samples/charts/financial-chart/indicator-types/src/app/app.component.scss b/samples/charts/financial-chart/indicator-types/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/indicator-types/src/app/app.component.scss
rename to samples/charts/financial-chart/indicator-types/src/app.component.scss
diff --git a/samples/charts/financial-chart/indicator-types/src/app/app.component.ts b/samples/charts/financial-chart/indicator-types/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/indicator-types/src/app/app.component.ts
rename to samples/charts/financial-chart/indicator-types/src/app.component.ts
diff --git a/samples/charts/financial-chart/indicator-types/src/app/app.module.ts b/samples/charts/financial-chart/indicator-types/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/indicator-types/src/app/app.module.ts
rename to samples/charts/financial-chart/indicator-types/src/app.module.ts
diff --git a/samples/charts/financial-chart/indicator-types/src/main.ts b/samples/charts/financial-chart/indicator-types/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/indicator-types/src/main.ts
+++ b/samples/charts/financial-chart/indicator-types/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/multiple-data/src/app/FinancialDataService.ts b/samples/charts/financial-chart/multiple-data/src/FinancialDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/multiple-data/src/app/FinancialDataService.ts
rename to samples/charts/financial-chart/multiple-data/src/FinancialDataService.ts
diff --git a/samples/charts/financial-chart/multiple-data/src/app/app.component.html b/samples/charts/financial-chart/multiple-data/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/multiple-data/src/app/app.component.html
rename to samples/charts/financial-chart/multiple-data/src/app.component.html
diff --git a/samples/charts/financial-chart/multiple-data/src/app/app.component.scss b/samples/charts/financial-chart/multiple-data/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/multiple-data/src/app/app.component.scss
rename to samples/charts/financial-chart/multiple-data/src/app.component.scss
diff --git a/samples/charts/financial-chart/multiple-data/src/app/app.component.ts b/samples/charts/financial-chart/multiple-data/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/multiple-data/src/app/app.component.ts
rename to samples/charts/financial-chart/multiple-data/src/app.component.ts
diff --git a/samples/charts/financial-chart/multiple-data/src/app/app.module.ts b/samples/charts/financial-chart/multiple-data/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/multiple-data/src/app/app.module.ts
rename to samples/charts/financial-chart/multiple-data/src/app.module.ts
diff --git a/samples/charts/financial-chart/multiple-data/src/main.ts b/samples/charts/financial-chart/multiple-data/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/multiple-data/src/main.ts
+++ b/samples/charts/financial-chart/multiple-data/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/multiple-feeds/src/app/app.component.html b/samples/charts/financial-chart/multiple-feeds/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/multiple-feeds/src/app/app.component.html
rename to samples/charts/financial-chart/multiple-feeds/src/app.component.html
diff --git a/samples/charts/financial-chart/multiple-feeds/src/app/app.component.scss b/samples/charts/financial-chart/multiple-feeds/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/multiple-feeds/src/app/app.component.scss
rename to samples/charts/financial-chart/multiple-feeds/src/app.component.scss
diff --git a/samples/charts/financial-chart/multiple-feeds/src/app/app.component.ts b/samples/charts/financial-chart/multiple-feeds/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/multiple-feeds/src/app/app.component.ts
rename to samples/charts/financial-chart/multiple-feeds/src/app.component.ts
diff --git a/samples/charts/financial-chart/multiple-feeds/src/app/app.module.ts b/samples/charts/financial-chart/multiple-feeds/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/multiple-feeds/src/app/app.module.ts
rename to samples/charts/financial-chart/multiple-feeds/src/app.module.ts
diff --git a/samples/charts/financial-chart/multiple-feeds/src/main.ts b/samples/charts/financial-chart/multiple-feeds/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/multiple-feeds/src/main.ts
+++ b/samples/charts/financial-chart/multiple-feeds/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/overview/src/app/FinancialDataService.ts b/samples/charts/financial-chart/overview/src/FinancialDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/overview/src/app/FinancialDataService.ts
rename to samples/charts/financial-chart/overview/src/FinancialDataService.ts
diff --git a/samples/charts/financial-chart/overview/src/app/app.component.html b/samples/charts/financial-chart/overview/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/overview/src/app/app.component.html
rename to samples/charts/financial-chart/overview/src/app.component.html
diff --git a/samples/charts/financial-chart/overview/src/app/app.component.scss b/samples/charts/financial-chart/overview/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/overview/src/app/app.component.scss
rename to samples/charts/financial-chart/overview/src/app.component.scss
diff --git a/samples/charts/financial-chart/overview/src/app/app.component.ts b/samples/charts/financial-chart/overview/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/overview/src/app/app.component.ts
rename to samples/charts/financial-chart/overview/src/app.component.ts
diff --git a/samples/charts/financial-chart/overview/src/app/app.module.ts b/samples/charts/financial-chart/overview/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/overview/src/app/app.module.ts
rename to samples/charts/financial-chart/overview/src/app.module.ts
diff --git a/samples/charts/financial-chart/overview/src/main.ts b/samples/charts/financial-chart/overview/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/overview/src/main.ts
+++ b/samples/charts/financial-chart/overview/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/panes/src/app/StockDataService.ts b/samples/charts/financial-chart/panes/src/StockDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/panes/src/app/StockDataService.ts
rename to samples/charts/financial-chart/panes/src/StockDataService.ts
diff --git a/samples/charts/financial-chart/panes/src/app/app.component.html b/samples/charts/financial-chart/panes/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/panes/src/app/app.component.html
rename to samples/charts/financial-chart/panes/src/app.component.html
diff --git a/samples/charts/financial-chart/panes/src/app/app.component.scss b/samples/charts/financial-chart/panes/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/panes/src/app/app.component.scss
rename to samples/charts/financial-chart/panes/src/app.component.scss
diff --git a/samples/charts/financial-chart/panes/src/app/app.component.ts b/samples/charts/financial-chart/panes/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/panes/src/app/app.component.ts
rename to samples/charts/financial-chart/panes/src/app.component.ts
diff --git a/samples/charts/financial-chart/panes/src/app/app.module.ts b/samples/charts/financial-chart/panes/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/panes/src/app/app.module.ts
rename to samples/charts/financial-chart/panes/src/app.module.ts
diff --git a/samples/charts/financial-chart/panes/src/main.ts b/samples/charts/financial-chart/panes/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/panes/src/main.ts
+++ b/samples/charts/financial-chart/panes/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/performance/src/app/GenerateOhlcPricesService.ts b/samples/charts/financial-chart/performance/src/GenerateOhlcPricesService.ts
similarity index 100%
rename from samples/charts/financial-chart/performance/src/app/GenerateOhlcPricesService.ts
rename to samples/charts/financial-chart/performance/src/GenerateOhlcPricesService.ts
diff --git a/samples/charts/financial-chart/performance/src/app/app.component.html b/samples/charts/financial-chart/performance/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/performance/src/app/app.component.html
rename to samples/charts/financial-chart/performance/src/app.component.html
diff --git a/samples/charts/financial-chart/performance/src/app/app.component.scss b/samples/charts/financial-chart/performance/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/performance/src/app/app.component.scss
rename to samples/charts/financial-chart/performance/src/app.component.scss
diff --git a/samples/charts/financial-chart/performance/src/app/app.component.ts b/samples/charts/financial-chart/performance/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/performance/src/app/app.component.ts
rename to samples/charts/financial-chart/performance/src/app.component.ts
diff --git a/samples/charts/financial-chart/performance/src/app/app.module.ts b/samples/charts/financial-chart/performance/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/performance/src/app/app.module.ts
rename to samples/charts/financial-chart/performance/src/app.module.ts
diff --git a/samples/charts/financial-chart/performance/src/main.ts b/samples/charts/financial-chart/performance/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/performance/src/main.ts
+++ b/samples/charts/financial-chart/performance/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/stock-index-chart/src/app/StockIndexDataService.ts b/samples/charts/financial-chart/stock-index-chart/src/StockIndexDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/stock-index-chart/src/app/StockIndexDataService.ts
rename to samples/charts/financial-chart/stock-index-chart/src/StockIndexDataService.ts
diff --git a/samples/charts/financial-chart/stock-index-chart/src/app/app.component.html b/samples/charts/financial-chart/stock-index-chart/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/stock-index-chart/src/app/app.component.html
rename to samples/charts/financial-chart/stock-index-chart/src/app.component.html
diff --git a/samples/charts/financial-chart/stock-index-chart/src/app/app.component.scss b/samples/charts/financial-chart/stock-index-chart/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/stock-index-chart/src/app/app.component.scss
rename to samples/charts/financial-chart/stock-index-chart/src/app.component.scss
diff --git a/samples/charts/financial-chart/stock-index-chart/src/app/app.component.ts b/samples/charts/financial-chart/stock-index-chart/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/stock-index-chart/src/app/app.component.ts
rename to samples/charts/financial-chart/stock-index-chart/src/app.component.ts
diff --git a/samples/charts/financial-chart/stock-index-chart/src/app/app.module.ts b/samples/charts/financial-chart/stock-index-chart/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/stock-index-chart/src/app/app.module.ts
rename to samples/charts/financial-chart/stock-index-chart/src/app.module.ts
diff --git a/samples/charts/financial-chart/stock-index-chart/src/main.ts b/samples/charts/financial-chart/stock-index-chart/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/stock-index-chart/src/main.ts
+++ b/samples/charts/financial-chart/stock-index-chart/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/styling/src/app/FinancialDataService.ts b/samples/charts/financial-chart/styling/src/FinancialDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/styling/src/app/FinancialDataService.ts
rename to samples/charts/financial-chart/styling/src/FinancialDataService.ts
diff --git a/samples/charts/financial-chart/styling/src/app/app.component.html b/samples/charts/financial-chart/styling/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/styling/src/app/app.component.html
rename to samples/charts/financial-chart/styling/src/app.component.html
diff --git a/samples/charts/financial-chart/styling/src/app/app.component.scss b/samples/charts/financial-chart/styling/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/styling/src/app/app.component.scss
rename to samples/charts/financial-chart/styling/src/app.component.scss
diff --git a/samples/charts/financial-chart/styling/src/app/app.component.ts b/samples/charts/financial-chart/styling/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/styling/src/app/app.component.ts
rename to samples/charts/financial-chart/styling/src/app.component.ts
diff --git a/samples/charts/financial-chart/styling/src/app/app.module.ts b/samples/charts/financial-chart/styling/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/styling/src/app/app.module.ts
rename to samples/charts/financial-chart/styling/src/app.module.ts
diff --git a/samples/charts/financial-chart/styling/src/main.ts b/samples/charts/financial-chart/styling/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/styling/src/main.ts
+++ b/samples/charts/financial-chart/styling/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/theming/src/app/StockDataService.ts b/samples/charts/financial-chart/theming/src/StockDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/theming/src/app/StockDataService.ts
rename to samples/charts/financial-chart/theming/src/StockDataService.ts
diff --git a/samples/charts/financial-chart/theming/src/app/app.component.html b/samples/charts/financial-chart/theming/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/theming/src/app/app.component.html
rename to samples/charts/financial-chart/theming/src/app.component.html
diff --git a/samples/charts/financial-chart/theming/src/app/app.component.scss b/samples/charts/financial-chart/theming/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/theming/src/app/app.component.scss
rename to samples/charts/financial-chart/theming/src/app.component.scss
diff --git a/samples/charts/financial-chart/theming/src/app/app.component.ts b/samples/charts/financial-chart/theming/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/theming/src/app/app.component.ts
rename to samples/charts/financial-chart/theming/src/app.component.ts
diff --git a/samples/charts/financial-chart/theming/src/app/app.module.ts b/samples/charts/financial-chart/theming/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/theming/src/app/app.module.ts
rename to samples/charts/financial-chart/theming/src/app.module.ts
diff --git a/samples/charts/financial-chart/theming/src/app/dark-theme-financial-chart.css b/samples/charts/financial-chart/theming/src/dark-theme-financial-chart.css
similarity index 100%
rename from samples/charts/financial-chart/theming/src/app/dark-theme-financial-chart.css
rename to samples/charts/financial-chart/theming/src/dark-theme-financial-chart.css
diff --git a/samples/charts/financial-chart/theming/src/app/dark-theme-legend.css b/samples/charts/financial-chart/theming/src/dark-theme-legend.css
similarity index 100%
rename from samples/charts/financial-chart/theming/src/app/dark-theme-legend.css
rename to samples/charts/financial-chart/theming/src/dark-theme-legend.css
diff --git a/samples/charts/financial-chart/theming/src/app/dark-theme-tooltips.css b/samples/charts/financial-chart/theming/src/dark-theme-tooltips.css
similarity index 100%
rename from samples/charts/financial-chart/theming/src/app/dark-theme-tooltips.css
rename to samples/charts/financial-chart/theming/src/dark-theme-tooltips.css
diff --git a/samples/charts/financial-chart/theming/src/app/dark-theme-zoom-slider.css b/samples/charts/financial-chart/theming/src/dark-theme-zoom-slider.css
similarity index 100%
rename from samples/charts/financial-chart/theming/src/app/dark-theme-zoom-slider.css
rename to samples/charts/financial-chart/theming/src/dark-theme-zoom-slider.css
diff --git a/samples/charts/financial-chart/theming/src/main.ts b/samples/charts/financial-chart/theming/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/theming/src/main.ts
+++ b/samples/charts/financial-chart/theming/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/time-based-data/src/app/FinancialDataService.ts b/samples/charts/financial-chart/time-based-data/src/FinancialDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/time-based-data/src/app/FinancialDataService.ts
rename to samples/charts/financial-chart/time-based-data/src/FinancialDataService.ts
diff --git a/samples/charts/financial-chart/time-based-data/src/app/app.component.html b/samples/charts/financial-chart/time-based-data/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/time-based-data/src/app/app.component.html
rename to samples/charts/financial-chart/time-based-data/src/app.component.html
diff --git a/samples/charts/financial-chart/time-based-data/src/app/app.component.scss b/samples/charts/financial-chart/time-based-data/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/time-based-data/src/app/app.component.scss
rename to samples/charts/financial-chart/time-based-data/src/app.component.scss
diff --git a/samples/charts/financial-chart/time-based-data/src/app/app.component.ts b/samples/charts/financial-chart/time-based-data/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/time-based-data/src/app/app.component.ts
rename to samples/charts/financial-chart/time-based-data/src/app.component.ts
diff --git a/samples/charts/financial-chart/time-based-data/src/app/app.module.ts b/samples/charts/financial-chart/time-based-data/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/time-based-data/src/app/app.module.ts
rename to samples/charts/financial-chart/time-based-data/src/app.module.ts
diff --git a/samples/charts/financial-chart/time-based-data/src/main.ts b/samples/charts/financial-chart/time-based-data/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/time-based-data/src/main.ts
+++ b/samples/charts/financial-chart/time-based-data/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/titles/src/app/StockDataService.ts b/samples/charts/financial-chart/titles/src/StockDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/titles/src/app/StockDataService.ts
rename to samples/charts/financial-chart/titles/src/StockDataService.ts
diff --git a/samples/charts/financial-chart/titles/src/app/app.component.html b/samples/charts/financial-chart/titles/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/titles/src/app/app.component.html
rename to samples/charts/financial-chart/titles/src/app.component.html
diff --git a/samples/charts/financial-chart/titles/src/app/app.component.scss b/samples/charts/financial-chart/titles/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/titles/src/app/app.component.scss
rename to samples/charts/financial-chart/titles/src/app.component.scss
diff --git a/samples/charts/financial-chart/titles/src/app/app.component.ts b/samples/charts/financial-chart/titles/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/titles/src/app/app.component.ts
rename to samples/charts/financial-chart/titles/src/app.component.ts
diff --git a/samples/charts/financial-chart/titles/src/app/app.module.ts b/samples/charts/financial-chart/titles/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/titles/src/app/app.module.ts
rename to samples/charts/financial-chart/titles/src/app.module.ts
diff --git a/samples/charts/financial-chart/titles/src/main.ts b/samples/charts/financial-chart/titles/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/titles/src/main.ts
+++ b/samples/charts/financial-chart/titles/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/tooltip-template/src/app/FinancialDataService.ts b/samples/charts/financial-chart/tooltip-template/src/FinancialDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/tooltip-template/src/app/FinancialDataService.ts
rename to samples/charts/financial-chart/tooltip-template/src/FinancialDataService.ts
diff --git a/samples/charts/financial-chart/tooltip-template/src/app/app.component.html b/samples/charts/financial-chart/tooltip-template/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/tooltip-template/src/app/app.component.html
rename to samples/charts/financial-chart/tooltip-template/src/app.component.html
diff --git a/samples/charts/financial-chart/tooltip-template/src/app/app.component.scss b/samples/charts/financial-chart/tooltip-template/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/tooltip-template/src/app/app.component.scss
rename to samples/charts/financial-chart/tooltip-template/src/app.component.scss
diff --git a/samples/charts/financial-chart/tooltip-template/src/app/app.component.ts b/samples/charts/financial-chart/tooltip-template/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/tooltip-template/src/app/app.component.ts
rename to samples/charts/financial-chart/tooltip-template/src/app.component.ts
diff --git a/samples/charts/financial-chart/tooltip-template/src/app/app.module.ts b/samples/charts/financial-chart/tooltip-template/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/tooltip-template/src/app/app.module.ts
rename to samples/charts/financial-chart/tooltip-template/src/app.module.ts
diff --git a/samples/charts/financial-chart/tooltip-template/src/main.ts b/samples/charts/financial-chart/tooltip-template/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/tooltip-template/src/main.ts
+++ b/samples/charts/financial-chart/tooltip-template/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/tooltip-types/src/app/FinancialDataService.ts b/samples/charts/financial-chart/tooltip-types/src/FinancialDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/tooltip-types/src/app/FinancialDataService.ts
rename to samples/charts/financial-chart/tooltip-types/src/FinancialDataService.ts
diff --git a/samples/charts/financial-chart/tooltip-types/src/app/app.component.html b/samples/charts/financial-chart/tooltip-types/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/tooltip-types/src/app/app.component.html
rename to samples/charts/financial-chart/tooltip-types/src/app.component.html
diff --git a/samples/charts/financial-chart/tooltip-types/src/app/app.component.scss b/samples/charts/financial-chart/tooltip-types/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/tooltip-types/src/app/app.component.scss
rename to samples/charts/financial-chart/tooltip-types/src/app.component.scss
diff --git a/samples/charts/financial-chart/tooltip-types/src/app/app.component.ts b/samples/charts/financial-chart/tooltip-types/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/tooltip-types/src/app/app.component.ts
rename to samples/charts/financial-chart/tooltip-types/src/app.component.ts
diff --git a/samples/charts/financial-chart/tooltip-types/src/app/app.module.ts b/samples/charts/financial-chart/tooltip-types/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/tooltip-types/src/app/app.module.ts
rename to samples/charts/financial-chart/tooltip-types/src/app.module.ts
diff --git a/samples/charts/financial-chart/tooltip-types/src/main.ts b/samples/charts/financial-chart/tooltip-types/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/tooltip-types/src/main.ts
+++ b/samples/charts/financial-chart/tooltip-types/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/trendlines/src/app/FinancialDataService.ts b/samples/charts/financial-chart/trendlines/src/FinancialDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/trendlines/src/app/FinancialDataService.ts
rename to samples/charts/financial-chart/trendlines/src/FinancialDataService.ts
diff --git a/samples/charts/financial-chart/trendlines/src/app/app.component.html b/samples/charts/financial-chart/trendlines/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/trendlines/src/app/app.component.html
rename to samples/charts/financial-chart/trendlines/src/app.component.html
diff --git a/samples/charts/financial-chart/trendlines/src/app/app.component.scss b/samples/charts/financial-chart/trendlines/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/trendlines/src/app/app.component.scss
rename to samples/charts/financial-chart/trendlines/src/app.component.scss
diff --git a/samples/charts/financial-chart/trendlines/src/app/app.component.ts b/samples/charts/financial-chart/trendlines/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/trendlines/src/app/app.component.ts
rename to samples/charts/financial-chart/trendlines/src/app.component.ts
diff --git a/samples/charts/financial-chart/trendlines/src/app/app.module.ts b/samples/charts/financial-chart/trendlines/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/trendlines/src/app/app.module.ts
rename to samples/charts/financial-chart/trendlines/src/app.module.ts
diff --git a/samples/charts/financial-chart/trendlines/src/main.ts b/samples/charts/financial-chart/trendlines/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/trendlines/src/main.ts
+++ b/samples/charts/financial-chart/trendlines/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/financial-chart/volume-types/src/app/FinancialDataService.ts b/samples/charts/financial-chart/volume-types/src/FinancialDataService.ts
similarity index 100%
rename from samples/charts/financial-chart/volume-types/src/app/FinancialDataService.ts
rename to samples/charts/financial-chart/volume-types/src/FinancialDataService.ts
diff --git a/samples/charts/financial-chart/volume-types/src/app/app.component.html b/samples/charts/financial-chart/volume-types/src/app.component.html
similarity index 100%
rename from samples/charts/financial-chart/volume-types/src/app/app.component.html
rename to samples/charts/financial-chart/volume-types/src/app.component.html
diff --git a/samples/charts/financial-chart/volume-types/src/app/app.component.scss b/samples/charts/financial-chart/volume-types/src/app.component.scss
similarity index 100%
rename from samples/charts/financial-chart/volume-types/src/app/app.component.scss
rename to samples/charts/financial-chart/volume-types/src/app.component.scss
diff --git a/samples/charts/financial-chart/volume-types/src/app/app.component.ts b/samples/charts/financial-chart/volume-types/src/app.component.ts
similarity index 100%
rename from samples/charts/financial-chart/volume-types/src/app/app.component.ts
rename to samples/charts/financial-chart/volume-types/src/app.component.ts
diff --git a/samples/charts/financial-chart/volume-types/src/app/app.module.ts b/samples/charts/financial-chart/volume-types/src/app.module.ts
similarity index 100%
rename from samples/charts/financial-chart/volume-types/src/app/app.module.ts
rename to samples/charts/financial-chart/volume-types/src/app.module.ts
diff --git a/samples/charts/financial-chart/volume-types/src/main.ts b/samples/charts/financial-chart/volume-types/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/financial-chart/volume-types/src/main.ts
+++ b/samples/charts/financial-chart/volume-types/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/pie-chart/animation/src/app/app.component.html b/samples/charts/pie-chart/animation/src/app.component.html
similarity index 100%
rename from samples/charts/pie-chart/animation/src/app/app.component.html
rename to samples/charts/pie-chart/animation/src/app.component.html
diff --git a/samples/charts/pie-chart/animation/src/app/app.component.scss b/samples/charts/pie-chart/animation/src/app.component.scss
similarity index 100%
rename from samples/charts/pie-chart/animation/src/app/app.component.scss
rename to samples/charts/pie-chart/animation/src/app.component.scss
diff --git a/samples/charts/pie-chart/animation/src/app/app.component.ts b/samples/charts/pie-chart/animation/src/app.component.ts
similarity index 100%
rename from samples/charts/pie-chart/animation/src/app/app.component.ts
rename to samples/charts/pie-chart/animation/src/app.component.ts
diff --git a/samples/charts/pie-chart/animation/src/app/app.module.ts b/samples/charts/pie-chart/animation/src/app.module.ts
similarity index 100%
rename from samples/charts/pie-chart/animation/src/app/app.module.ts
rename to samples/charts/pie-chart/animation/src/app.module.ts
diff --git a/samples/charts/pie-chart/animation/src/main.ts b/samples/charts/pie-chart/animation/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/pie-chart/animation/src/main.ts
+++ b/samples/charts/pie-chart/animation/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/pie-chart/explosion/src/app/app.component.html b/samples/charts/pie-chart/explosion/src/app.component.html
similarity index 100%
rename from samples/charts/pie-chart/explosion/src/app/app.component.html
rename to samples/charts/pie-chart/explosion/src/app.component.html
diff --git a/samples/charts/pie-chart/explosion/src/app/app.component.scss b/samples/charts/pie-chart/explosion/src/app.component.scss
similarity index 100%
rename from samples/charts/pie-chart/explosion/src/app/app.component.scss
rename to samples/charts/pie-chart/explosion/src/app.component.scss
diff --git a/samples/charts/pie-chart/explosion/src/app/app.component.ts b/samples/charts/pie-chart/explosion/src/app.component.ts
similarity index 100%
rename from samples/charts/pie-chart/explosion/src/app/app.component.ts
rename to samples/charts/pie-chart/explosion/src/app.component.ts
diff --git a/samples/charts/pie-chart/explosion/src/app/app.module.ts b/samples/charts/pie-chart/explosion/src/app.module.ts
similarity index 100%
rename from samples/charts/pie-chart/explosion/src/app/app.module.ts
rename to samples/charts/pie-chart/explosion/src/app.module.ts
diff --git a/samples/charts/pie-chart/explosion/src/main.ts b/samples/charts/pie-chart/explosion/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/pie-chart/explosion/src/main.ts
+++ b/samples/charts/pie-chart/explosion/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/pie-chart/selection/src/app/app.component.html b/samples/charts/pie-chart/selection/src/app.component.html
similarity index 100%
rename from samples/charts/pie-chart/selection/src/app/app.component.html
rename to samples/charts/pie-chart/selection/src/app.component.html
diff --git a/samples/charts/pie-chart/selection/src/app/app.component.scss b/samples/charts/pie-chart/selection/src/app.component.scss
similarity index 100%
rename from samples/charts/pie-chart/selection/src/app/app.component.scss
rename to samples/charts/pie-chart/selection/src/app.component.scss
diff --git a/samples/charts/pie-chart/selection/src/app/app.component.ts b/samples/charts/pie-chart/selection/src/app.component.ts
similarity index 100%
rename from samples/charts/pie-chart/selection/src/app/app.component.ts
rename to samples/charts/pie-chart/selection/src/app.component.ts
diff --git a/samples/charts/pie-chart/selection/src/app/app.module.ts b/samples/charts/pie-chart/selection/src/app.module.ts
similarity index 100%
rename from samples/charts/pie-chart/selection/src/app/app.module.ts
rename to samples/charts/pie-chart/selection/src/app.module.ts
diff --git a/samples/charts/pie-chart/selection/src/main.ts b/samples/charts/pie-chart/selection/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/pie-chart/selection/src/main.ts
+++ b/samples/charts/pie-chart/selection/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/sparkline/display-types/src/app/SharedData.ts b/samples/charts/sparkline/display-types/src/SharedData.ts
similarity index 100%
rename from samples/charts/sparkline/display-types/src/app/SharedData.ts
rename to samples/charts/sparkline/display-types/src/SharedData.ts
diff --git a/samples/charts/sparkline/display-types/src/app/app.component.html b/samples/charts/sparkline/display-types/src/app.component.html
similarity index 100%
rename from samples/charts/sparkline/display-types/src/app/app.component.html
rename to samples/charts/sparkline/display-types/src/app.component.html
diff --git a/samples/charts/sparkline/display-types/src/app/app.component.scss b/samples/charts/sparkline/display-types/src/app.component.scss
similarity index 100%
rename from samples/charts/sparkline/display-types/src/app/app.component.scss
rename to samples/charts/sparkline/display-types/src/app.component.scss
diff --git a/samples/charts/sparkline/display-types/src/app/app.component.ts b/samples/charts/sparkline/display-types/src/app.component.ts
similarity index 100%
rename from samples/charts/sparkline/display-types/src/app/app.component.ts
rename to samples/charts/sparkline/display-types/src/app.component.ts
diff --git a/samples/charts/sparkline/display-types/src/app/app.module.ts b/samples/charts/sparkline/display-types/src/app.module.ts
similarity index 100%
rename from samples/charts/sparkline/display-types/src/app/app.module.ts
rename to samples/charts/sparkline/display-types/src/app.module.ts
diff --git a/samples/charts/sparkline/display-types/src/main.ts b/samples/charts/sparkline/display-types/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/sparkline/display-types/src/main.ts
+++ b/samples/charts/sparkline/display-types/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/sparkline/grid/src/app/Products.ts b/samples/charts/sparkline/grid/src/Products.ts
similarity index 100%
rename from samples/charts/sparkline/grid/src/app/Products.ts
rename to samples/charts/sparkline/grid/src/Products.ts
diff --git a/samples/charts/sparkline/grid/src/app/app.component.html b/samples/charts/sparkline/grid/src/app.component.html
similarity index 100%
rename from samples/charts/sparkline/grid/src/app/app.component.html
rename to samples/charts/sparkline/grid/src/app.component.html
diff --git a/samples/charts/sparkline/grid/src/app/app.component.scss b/samples/charts/sparkline/grid/src/app.component.scss
similarity index 100%
rename from samples/charts/sparkline/grid/src/app/app.component.scss
rename to samples/charts/sparkline/grid/src/app.component.scss
diff --git a/samples/charts/sparkline/grid/src/app/app.component.ts b/samples/charts/sparkline/grid/src/app.component.ts
similarity index 100%
rename from samples/charts/sparkline/grid/src/app/app.component.ts
rename to samples/charts/sparkline/grid/src/app.component.ts
diff --git a/samples/charts/sparkline/grid/src/app/app.module.ts b/samples/charts/sparkline/grid/src/app.module.ts
similarity index 100%
rename from samples/charts/sparkline/grid/src/app/app.module.ts
rename to samples/charts/sparkline/grid/src/app.module.ts
diff --git a/samples/charts/sparkline/grid/src/main.ts b/samples/charts/sparkline/grid/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/sparkline/grid/src/main.ts
+++ b/samples/charts/sparkline/grid/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/tree-map/events/src/app/app.component.html b/samples/charts/tree-map/events/src/app.component.html
similarity index 100%
rename from samples/charts/tree-map/events/src/app/app.component.html
rename to samples/charts/tree-map/events/src/app.component.html
diff --git a/samples/charts/tree-map/events/src/app/app.component.scss b/samples/charts/tree-map/events/src/app.component.scss
similarity index 100%
rename from samples/charts/tree-map/events/src/app/app.component.scss
rename to samples/charts/tree-map/events/src/app.component.scss
diff --git a/samples/charts/tree-map/events/src/app/app.component.ts b/samples/charts/tree-map/events/src/app.component.ts
similarity index 100%
rename from samples/charts/tree-map/events/src/app/app.component.ts
rename to samples/charts/tree-map/events/src/app.component.ts
diff --git a/samples/charts/tree-map/events/src/app/app.module.ts b/samples/charts/tree-map/events/src/app.module.ts
similarity index 100%
rename from samples/charts/tree-map/events/src/app/app.module.ts
rename to samples/charts/tree-map/events/src/app.module.ts
diff --git a/samples/charts/tree-map/events/src/main.ts b/samples/charts/tree-map/events/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/tree-map/events/src/main.ts
+++ b/samples/charts/tree-map/events/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/charts/tree-map/highlighting-percent-based/ReadMe.md b/samples/charts/tree-map/highlighting-percent-based/ReadMe.md
new file mode 100644
index 000000000..3d8dc96f9
--- /dev/null
+++ b/samples/charts/tree-map/highlighting-percent-based/ReadMe.md
@@ -0,0 +1,58 @@
+<!-- NOTE: do not change this file because it's auto re-generated from template: -->
+<!-- https://github.com/IgniteUI/igniteui-angular-examples/tree/vnext/samples/templates/ReadMe.md -->
+
+This folder contains Angular application with example of Highlighting Percent Based feature using [TreeMap](https://www.infragistics.com/products/ignite-ui-angular/angular/components/general-getting-started.html) component.
+
+
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+    <body>
+        <a target="_blank" href="https://www.infragistics.com/products/ignite-ui-angular/angular/components/general-getting-started.html" rel="noopener noreferrer">
+            <img height="40px" style="border-radius: 0rem" alt="View Docs" src="https://github.com/IgniteUI/igniteui-blazor-examples/raw/vnext/templates/sample/images/button-docs.png"/>
+        </a>
+        <a target="_blank" href="./src/app/app.component.html" rel="noopener noreferrer">
+            <img height="40px" style="border-radius: 0rem; max-width: 100%;" alt="View Code" src="https://github.com/IgniteUI/igniteui-blazor-examples/raw/vnext/templates/sample/images/button-code.png"/>
+        </a>
+        <a target="_blank" href="https://infragistics.com/angular-demos-dv/samples/charts/tree-map-highlighting-percent-based" rel="noopener noreferrer">
+            <img height="40px" style="border-radius: 0rem; max-width: 100%;" alt="Run Sample" src="https://github.com/IgniteUI/igniteui-blazor-examples/raw/vnext/templates/sample/images/button-run.png"/>
+        </a>
+        <a target="_blank" href="https://codesandbox.io/s/github/IgniteUI/igniteui-angular-examples/tree/master/samples/charts/tree-map/highlighting-percent-based?fontsize=14&hidenavigation=1&theme=dark&view=preview&file=/src/app.component.html" rel="noopener noreferrer">
+            <img height="40px" style="border-radius: 0rem; max-width: 100%;" alt="Run Sample" src="https://github.com/IgniteUI/igniteui-blazor-examples/raw/vnext/templates/sample/images/button-sandbox.png"/>
+        </a>
+    </body>
+</html>
+
+## Branches
+
+> **_NOTE:_** You should use [master](https://github.com/IgniteUI/igniteui-angular-examples/tree/master) branch of this repository if you want to run samples on your computer. Use the [vnext](https://github.com/IgniteUI/igniteui-angular-examples/tree/vnext) branch only when you want to contribute new samples to this repository.
+
+## Instructions
+
+Follow these instructions to run this example:
+
+
+- clone and navigate to this sample in terminal window
+
+```
+git clone https://github.com/IgniteUI/igniteui-angular-examples.git
+git checkout master
+cd ../samples/charts/tree-map/highlighting-percent-based
+```
+<!-- cd ./igniteui-angular-examples -->
+
+- open above folder in VS Code or type:
+```
+code .
+```
+
+- In terminal window, run:
+```
+npm install --legacy-peer-deps
+npm run-script start
+```
+
+- open http://localhost:4200/ in your browser
+
+
+## Learn More
+
+To learn more about **Ignite UI for Angular** components, check out the [Angular documentation](https://www.infragistics.com/products/ignite-ui-angular/angular/components/general-getting-started.html).
diff --git a/samples/charts/zoomslider/overview/src/app/SampleScatterStats.ts b/samples/charts/zoomslider/overview/src/SampleScatterStats.ts
similarity index 100%
rename from samples/charts/zoomslider/overview/src/app/SampleScatterStats.ts
rename to samples/charts/zoomslider/overview/src/SampleScatterStats.ts
diff --git a/samples/charts/zoomslider/overview/src/app/app.component.html b/samples/charts/zoomslider/overview/src/app.component.html
similarity index 100%
rename from samples/charts/zoomslider/overview/src/app/app.component.html
rename to samples/charts/zoomslider/overview/src/app.component.html
diff --git a/samples/charts/zoomslider/overview/src/app/app.component.scss b/samples/charts/zoomslider/overview/src/app.component.scss
similarity index 100%
rename from samples/charts/zoomslider/overview/src/app/app.component.scss
rename to samples/charts/zoomslider/overview/src/app.component.scss
diff --git a/samples/charts/zoomslider/overview/src/app/app.component.ts b/samples/charts/zoomslider/overview/src/app.component.ts
similarity index 100%
rename from samples/charts/zoomslider/overview/src/app/app.component.ts
rename to samples/charts/zoomslider/overview/src/app.component.ts
diff --git a/samples/charts/zoomslider/overview/src/app/app.module.ts b/samples/charts/zoomslider/overview/src/app.module.ts
similarity index 100%
rename from samples/charts/zoomslider/overview/src/app/app.module.ts
rename to samples/charts/zoomslider/overview/src/app.module.ts
diff --git a/samples/charts/zoomslider/overview/src/main.ts b/samples/charts/zoomslider/overview/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/charts/zoomslider/overview/src/main.ts
+++ b/samples/charts/zoomslider/overview/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/excel-library/operations-on-workbooks/src/app/ExcelUtility.ts b/samples/excel/excel-library/operations-on-workbooks/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/excel-library/operations-on-workbooks/src/app/ExcelUtility.ts
rename to samples/excel/excel-library/operations-on-workbooks/src/ExcelUtility.ts
diff --git a/samples/excel/excel-library/operations-on-workbooks/src/app/app.component.html b/samples/excel/excel-library/operations-on-workbooks/src/app.component.html
similarity index 100%
rename from samples/excel/excel-library/operations-on-workbooks/src/app/app.component.html
rename to samples/excel/excel-library/operations-on-workbooks/src/app.component.html
diff --git a/samples/excel/excel-library/operations-on-workbooks/src/app/app.component.scss b/samples/excel/excel-library/operations-on-workbooks/src/app.component.scss
similarity index 100%
rename from samples/excel/excel-library/operations-on-workbooks/src/app/app.component.scss
rename to samples/excel/excel-library/operations-on-workbooks/src/app.component.scss
diff --git a/samples/excel/excel-library/operations-on-workbooks/src/app/app.component.ts b/samples/excel/excel-library/operations-on-workbooks/src/app.component.ts
similarity index 100%
rename from samples/excel/excel-library/operations-on-workbooks/src/app/app.component.ts
rename to samples/excel/excel-library/operations-on-workbooks/src/app.component.ts
diff --git a/samples/excel/excel-library/operations-on-workbooks/src/app/app.module.ts b/samples/excel/excel-library/operations-on-workbooks/src/app.module.ts
similarity index 100%
rename from samples/excel/excel-library/operations-on-workbooks/src/app/app.module.ts
rename to samples/excel/excel-library/operations-on-workbooks/src/app.module.ts
diff --git a/samples/excel/excel-library/operations-on-workbooks/src/main.ts b/samples/excel/excel-library/operations-on-workbooks/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/excel-library/operations-on-workbooks/src/main.ts
+++ b/samples/excel/excel-library/operations-on-workbooks/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/excel-library/operations-on-worksheets/src/app/ExcelUtility.ts b/samples/excel/excel-library/operations-on-worksheets/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/excel-library/operations-on-worksheets/src/app/ExcelUtility.ts
rename to samples/excel/excel-library/operations-on-worksheets/src/ExcelUtility.ts
diff --git a/samples/excel/excel-library/operations-on-worksheets/src/app/app.component.html b/samples/excel/excel-library/operations-on-worksheets/src/app.component.html
similarity index 100%
rename from samples/excel/excel-library/operations-on-worksheets/src/app/app.component.html
rename to samples/excel/excel-library/operations-on-worksheets/src/app.component.html
diff --git a/samples/excel/excel-library/operations-on-worksheets/src/app/app.component.scss b/samples/excel/excel-library/operations-on-worksheets/src/app.component.scss
similarity index 100%
rename from samples/excel/excel-library/operations-on-worksheets/src/app/app.component.scss
rename to samples/excel/excel-library/operations-on-worksheets/src/app.component.scss
diff --git a/samples/excel/excel-library/operations-on-worksheets/src/app/app.component.ts b/samples/excel/excel-library/operations-on-worksheets/src/app.component.ts
similarity index 100%
rename from samples/excel/excel-library/operations-on-worksheets/src/app/app.component.ts
rename to samples/excel/excel-library/operations-on-worksheets/src/app.component.ts
diff --git a/samples/excel/excel-library/operations-on-worksheets/src/app/app.module.ts b/samples/excel/excel-library/operations-on-worksheets/src/app.module.ts
similarity index 100%
rename from samples/excel/excel-library/operations-on-worksheets/src/app/app.module.ts
rename to samples/excel/excel-library/operations-on-worksheets/src/app.module.ts
diff --git a/samples/excel/excel-library/operations-on-worksheets/src/main.ts b/samples/excel/excel-library/operations-on-worksheets/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/excel-library/operations-on-worksheets/src/main.ts
+++ b/samples/excel/excel-library/operations-on-worksheets/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/excel-library/overview/src/app/ExcelUtility.ts b/samples/excel/excel-library/overview/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/excel-library/overview/src/app/ExcelUtility.ts
rename to samples/excel/excel-library/overview/src/ExcelUtility.ts
diff --git a/samples/excel/excel-library/overview/src/app/app.component.html b/samples/excel/excel-library/overview/src/app.component.html
similarity index 100%
rename from samples/excel/excel-library/overview/src/app/app.component.html
rename to samples/excel/excel-library/overview/src/app.component.html
diff --git a/samples/excel/excel-library/overview/src/app/app.component.scss b/samples/excel/excel-library/overview/src/app.component.scss
similarity index 100%
rename from samples/excel/excel-library/overview/src/app/app.component.scss
rename to samples/excel/excel-library/overview/src/app.component.scss
diff --git a/samples/excel/excel-library/overview/src/app/app.component.ts b/samples/excel/excel-library/overview/src/app.component.ts
similarity index 100%
rename from samples/excel/excel-library/overview/src/app/app.component.ts
rename to samples/excel/excel-library/overview/src/app.component.ts
diff --git a/samples/excel/excel-library/overview/src/app/app.module.ts b/samples/excel/excel-library/overview/src/app.module.ts
similarity index 100%
rename from samples/excel/excel-library/overview/src/app/app.module.ts
rename to samples/excel/excel-library/overview/src/app.module.ts
diff --git a/samples/excel/excel-library/overview/src/main.ts b/samples/excel/excel-library/overview/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/excel-library/overview/src/main.ts
+++ b/samples/excel/excel-library/overview/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/excel-library/working-with-cells/src/app/ExcelUtility.ts b/samples/excel/excel-library/working-with-cells/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/excel-library/working-with-cells/src/app/ExcelUtility.ts
rename to samples/excel/excel-library/working-with-cells/src/ExcelUtility.ts
diff --git a/samples/excel/excel-library/working-with-cells/src/app/app.component.html b/samples/excel/excel-library/working-with-cells/src/app.component.html
similarity index 100%
rename from samples/excel/excel-library/working-with-cells/src/app/app.component.html
rename to samples/excel/excel-library/working-with-cells/src/app.component.html
diff --git a/samples/excel/excel-library/working-with-cells/src/app/app.component.scss b/samples/excel/excel-library/working-with-cells/src/app.component.scss
similarity index 100%
rename from samples/excel/excel-library/working-with-cells/src/app/app.component.scss
rename to samples/excel/excel-library/working-with-cells/src/app.component.scss
diff --git a/samples/excel/excel-library/working-with-cells/src/app/app.component.ts b/samples/excel/excel-library/working-with-cells/src/app.component.ts
similarity index 100%
rename from samples/excel/excel-library/working-with-cells/src/app/app.component.ts
rename to samples/excel/excel-library/working-with-cells/src/app.component.ts
diff --git a/samples/excel/excel-library/working-with-cells/src/app/app.module.ts b/samples/excel/excel-library/working-with-cells/src/app.module.ts
similarity index 100%
rename from samples/excel/excel-library/working-with-cells/src/app/app.module.ts
rename to samples/excel/excel-library/working-with-cells/src/app.module.ts
diff --git a/samples/excel/excel-library/working-with-cells/src/main.ts b/samples/excel/excel-library/working-with-cells/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/excel-library/working-with-cells/src/main.ts
+++ b/samples/excel/excel-library/working-with-cells/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/excel-library/working-with-charts/src/app/ExcelUtility.ts b/samples/excel/excel-library/working-with-charts/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/excel-library/working-with-charts/src/app/ExcelUtility.ts
rename to samples/excel/excel-library/working-with-charts/src/ExcelUtility.ts
diff --git a/samples/excel/excel-library/working-with-charts/src/app/app.component.html b/samples/excel/excel-library/working-with-charts/src/app.component.html
similarity index 100%
rename from samples/excel/excel-library/working-with-charts/src/app/app.component.html
rename to samples/excel/excel-library/working-with-charts/src/app.component.html
diff --git a/samples/excel/excel-library/working-with-charts/src/app/app.component.scss b/samples/excel/excel-library/working-with-charts/src/app.component.scss
similarity index 100%
rename from samples/excel/excel-library/working-with-charts/src/app/app.component.scss
rename to samples/excel/excel-library/working-with-charts/src/app.component.scss
diff --git a/samples/excel/excel-library/working-with-charts/src/app/app.component.ts b/samples/excel/excel-library/working-with-charts/src/app.component.ts
similarity index 100%
rename from samples/excel/excel-library/working-with-charts/src/app/app.component.ts
rename to samples/excel/excel-library/working-with-charts/src/app.component.ts
diff --git a/samples/excel/excel-library/working-with-charts/src/app/app.module.ts b/samples/excel/excel-library/working-with-charts/src/app.module.ts
similarity index 100%
rename from samples/excel/excel-library/working-with-charts/src/app/app.module.ts
rename to samples/excel/excel-library/working-with-charts/src/app.module.ts
diff --git a/samples/excel/excel-library/working-with-charts/src/main.ts b/samples/excel/excel-library/working-with-charts/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/excel-library/working-with-charts/src/main.ts
+++ b/samples/excel/excel-library/working-with-charts/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/excel-library/working-with-sparklines/src/app/ExcelUtility.ts b/samples/excel/excel-library/working-with-sparklines/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/excel-library/working-with-sparklines/src/app/ExcelUtility.ts
rename to samples/excel/excel-library/working-with-sparklines/src/ExcelUtility.ts
diff --git a/samples/excel/excel-library/working-with-sparklines/src/app/app.component.html b/samples/excel/excel-library/working-with-sparklines/src/app.component.html
similarity index 100%
rename from samples/excel/excel-library/working-with-sparklines/src/app/app.component.html
rename to samples/excel/excel-library/working-with-sparklines/src/app.component.html
diff --git a/samples/excel/excel-library/working-with-sparklines/src/app/app.component.scss b/samples/excel/excel-library/working-with-sparklines/src/app.component.scss
similarity index 100%
rename from samples/excel/excel-library/working-with-sparklines/src/app/app.component.scss
rename to samples/excel/excel-library/working-with-sparklines/src/app.component.scss
diff --git a/samples/excel/excel-library/working-with-sparklines/src/app/app.component.ts b/samples/excel/excel-library/working-with-sparklines/src/app.component.ts
similarity index 100%
rename from samples/excel/excel-library/working-with-sparklines/src/app/app.component.ts
rename to samples/excel/excel-library/working-with-sparklines/src/app.component.ts
diff --git a/samples/excel/excel-library/working-with-sparklines/src/app/app.module.ts b/samples/excel/excel-library/working-with-sparklines/src/app.module.ts
similarity index 100%
rename from samples/excel/excel-library/working-with-sparklines/src/app/app.module.ts
rename to samples/excel/excel-library/working-with-sparklines/src/app.module.ts
diff --git a/samples/excel/excel-library/working-with-sparklines/src/main.ts b/samples/excel/excel-library/working-with-sparklines/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/excel-library/working-with-sparklines/src/main.ts
+++ b/samples/excel/excel-library/working-with-sparklines/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/excel-library/working-with-tables/src/app/ExcelUtility.ts b/samples/excel/excel-library/working-with-tables/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/excel-library/working-with-tables/src/app/ExcelUtility.ts
rename to samples/excel/excel-library/working-with-tables/src/ExcelUtility.ts
diff --git a/samples/excel/excel-library/working-with-tables/src/app/app.component.html b/samples/excel/excel-library/working-with-tables/src/app.component.html
similarity index 100%
rename from samples/excel/excel-library/working-with-tables/src/app/app.component.html
rename to samples/excel/excel-library/working-with-tables/src/app.component.html
diff --git a/samples/excel/excel-library/working-with-tables/src/app/app.component.scss b/samples/excel/excel-library/working-with-tables/src/app.component.scss
similarity index 100%
rename from samples/excel/excel-library/working-with-tables/src/app/app.component.scss
rename to samples/excel/excel-library/working-with-tables/src/app.component.scss
diff --git a/samples/excel/excel-library/working-with-tables/src/app/app.component.ts b/samples/excel/excel-library/working-with-tables/src/app.component.ts
similarity index 100%
rename from samples/excel/excel-library/working-with-tables/src/app/app.component.ts
rename to samples/excel/excel-library/working-with-tables/src/app.component.ts
diff --git a/samples/excel/excel-library/working-with-tables/src/app/app.module.ts b/samples/excel/excel-library/working-with-tables/src/app.module.ts
similarity index 100%
rename from samples/excel/excel-library/working-with-tables/src/app/app.module.ts
rename to samples/excel/excel-library/working-with-tables/src/app.module.ts
diff --git a/samples/excel/excel-library/working-with-tables/src/main.ts b/samples/excel/excel-library/working-with-tables/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/excel-library/working-with-tables/src/main.ts
+++ b/samples/excel/excel-library/working-with-tables/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/spreadsheet/activation/src/app/ExcelUtility.ts b/samples/excel/spreadsheet/activation/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/spreadsheet/activation/src/app/ExcelUtility.ts
rename to samples/excel/spreadsheet/activation/src/ExcelUtility.ts
diff --git a/samples/excel/spreadsheet/activation/src/app/app.component.html b/samples/excel/spreadsheet/activation/src/app.component.html
similarity index 100%
rename from samples/excel/spreadsheet/activation/src/app/app.component.html
rename to samples/excel/spreadsheet/activation/src/app.component.html
diff --git a/samples/excel/spreadsheet/activation/src/app/app.component.scss b/samples/excel/spreadsheet/activation/src/app.component.scss
similarity index 100%
rename from samples/excel/spreadsheet/activation/src/app/app.component.scss
rename to samples/excel/spreadsheet/activation/src/app.component.scss
diff --git a/samples/excel/spreadsheet/activation/src/app/app.component.ts b/samples/excel/spreadsheet/activation/src/app.component.ts
similarity index 100%
rename from samples/excel/spreadsheet/activation/src/app/app.component.ts
rename to samples/excel/spreadsheet/activation/src/app.component.ts
diff --git a/samples/excel/spreadsheet/activation/src/app/app.module.ts b/samples/excel/spreadsheet/activation/src/app.module.ts
similarity index 100%
rename from samples/excel/spreadsheet/activation/src/app/app.module.ts
rename to samples/excel/spreadsheet/activation/src/app.module.ts
diff --git a/samples/excel/spreadsheet/activation/src/main.ts b/samples/excel/spreadsheet/activation/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/spreadsheet/activation/src/main.ts
+++ b/samples/excel/spreadsheet/activation/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/spreadsheet/adapter-chart/src/app/ExcelUtility.ts b/samples/excel/spreadsheet/adapter-chart/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/spreadsheet/adapter-chart/src/app/ExcelUtility.ts
rename to samples/excel/spreadsheet/adapter-chart/src/ExcelUtility.ts
diff --git a/samples/excel/spreadsheet/adapter-chart/src/app/app.component.html b/samples/excel/spreadsheet/adapter-chart/src/app.component.html
similarity index 100%
rename from samples/excel/spreadsheet/adapter-chart/src/app/app.component.html
rename to samples/excel/spreadsheet/adapter-chart/src/app.component.html
diff --git a/samples/excel/spreadsheet/adapter-chart/src/app/app.component.scss b/samples/excel/spreadsheet/adapter-chart/src/app.component.scss
similarity index 100%
rename from samples/excel/spreadsheet/adapter-chart/src/app/app.component.scss
rename to samples/excel/spreadsheet/adapter-chart/src/app.component.scss
diff --git a/samples/excel/spreadsheet/adapter-chart/src/app/app.component.ts b/samples/excel/spreadsheet/adapter-chart/src/app.component.ts
similarity index 100%
rename from samples/excel/spreadsheet/adapter-chart/src/app/app.component.ts
rename to samples/excel/spreadsheet/adapter-chart/src/app.component.ts
diff --git a/samples/excel/spreadsheet/adapter-chart/src/app/app.module.ts b/samples/excel/spreadsheet/adapter-chart/src/app.module.ts
similarity index 100%
rename from samples/excel/spreadsheet/adapter-chart/src/app/app.module.ts
rename to samples/excel/spreadsheet/adapter-chart/src/app.module.ts
diff --git a/samples/excel/spreadsheet/adapter-chart/src/main.ts b/samples/excel/spreadsheet/adapter-chart/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/spreadsheet/adapter-chart/src/main.ts
+++ b/samples/excel/spreadsheet/adapter-chart/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/spreadsheet/adapter-combo/src/app/ExcelUtility.ts b/samples/excel/spreadsheet/adapter-combo/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/spreadsheet/adapter-combo/src/app/ExcelUtility.ts
rename to samples/excel/spreadsheet/adapter-combo/src/ExcelUtility.ts
diff --git a/samples/excel/spreadsheet/adapter-combo/src/app/app.component.html b/samples/excel/spreadsheet/adapter-combo/src/app.component.html
similarity index 100%
rename from samples/excel/spreadsheet/adapter-combo/src/app/app.component.html
rename to samples/excel/spreadsheet/adapter-combo/src/app.component.html
diff --git a/samples/excel/spreadsheet/adapter-combo/src/app/app.component.scss b/samples/excel/spreadsheet/adapter-combo/src/app.component.scss
similarity index 100%
rename from samples/excel/spreadsheet/adapter-combo/src/app/app.component.scss
rename to samples/excel/spreadsheet/adapter-combo/src/app.component.scss
diff --git a/samples/excel/spreadsheet/adapter-combo/src/app/app.component.ts b/samples/excel/spreadsheet/adapter-combo/src/app.component.ts
similarity index 100%
rename from samples/excel/spreadsheet/adapter-combo/src/app/app.component.ts
rename to samples/excel/spreadsheet/adapter-combo/src/app.component.ts
diff --git a/samples/excel/spreadsheet/adapter-combo/src/app/app.module.ts b/samples/excel/spreadsheet/adapter-combo/src/app.module.ts
similarity index 100%
rename from samples/excel/spreadsheet/adapter-combo/src/app/app.module.ts
rename to samples/excel/spreadsheet/adapter-combo/src/app.module.ts
diff --git a/samples/excel/spreadsheet/adapter-combo/src/main.ts b/samples/excel/spreadsheet/adapter-combo/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/spreadsheet/adapter-combo/src/main.ts
+++ b/samples/excel/spreadsheet/adapter-combo/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/spreadsheet/clipboard/src/app/ExcelUtility.ts b/samples/excel/spreadsheet/clipboard/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/spreadsheet/clipboard/src/app/ExcelUtility.ts
rename to samples/excel/spreadsheet/clipboard/src/ExcelUtility.ts
diff --git a/samples/excel/spreadsheet/clipboard/src/app/app.component.html b/samples/excel/spreadsheet/clipboard/src/app.component.html
similarity index 100%
rename from samples/excel/spreadsheet/clipboard/src/app/app.component.html
rename to samples/excel/spreadsheet/clipboard/src/app.component.html
diff --git a/samples/excel/spreadsheet/clipboard/src/app/app.component.scss b/samples/excel/spreadsheet/clipboard/src/app.component.scss
similarity index 100%
rename from samples/excel/spreadsheet/clipboard/src/app/app.component.scss
rename to samples/excel/spreadsheet/clipboard/src/app.component.scss
diff --git a/samples/excel/spreadsheet/clipboard/src/app/app.component.ts b/samples/excel/spreadsheet/clipboard/src/app.component.ts
similarity index 100%
rename from samples/excel/spreadsheet/clipboard/src/app/app.component.ts
rename to samples/excel/spreadsheet/clipboard/src/app.component.ts
diff --git a/samples/excel/spreadsheet/clipboard/src/app/app.module.ts b/samples/excel/spreadsheet/clipboard/src/app.module.ts
similarity index 100%
rename from samples/excel/spreadsheet/clipboard/src/app/app.module.ts
rename to samples/excel/spreadsheet/clipboard/src/app.module.ts
diff --git a/samples/excel/spreadsheet/clipboard/src/main.ts b/samples/excel/spreadsheet/clipboard/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/spreadsheet/clipboard/src/main.ts
+++ b/samples/excel/spreadsheet/clipboard/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/spreadsheet/commands/src/app/ExcelUtility.ts b/samples/excel/spreadsheet/commands/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/spreadsheet/commands/src/app/ExcelUtility.ts
rename to samples/excel/spreadsheet/commands/src/ExcelUtility.ts
diff --git a/samples/excel/spreadsheet/commands/src/app/app.component.html b/samples/excel/spreadsheet/commands/src/app.component.html
similarity index 100%
rename from samples/excel/spreadsheet/commands/src/app/app.component.html
rename to samples/excel/spreadsheet/commands/src/app.component.html
diff --git a/samples/excel/spreadsheet/commands/src/app/app.component.scss b/samples/excel/spreadsheet/commands/src/app.component.scss
similarity index 100%
rename from samples/excel/spreadsheet/commands/src/app/app.component.scss
rename to samples/excel/spreadsheet/commands/src/app.component.scss
diff --git a/samples/excel/spreadsheet/commands/src/app/app.component.ts b/samples/excel/spreadsheet/commands/src/app.component.ts
similarity index 100%
rename from samples/excel/spreadsheet/commands/src/app/app.component.ts
rename to samples/excel/spreadsheet/commands/src/app.component.ts
diff --git a/samples/excel/spreadsheet/commands/src/app/app.module.ts b/samples/excel/spreadsheet/commands/src/app.module.ts
similarity index 100%
rename from samples/excel/spreadsheet/commands/src/app/app.module.ts
rename to samples/excel/spreadsheet/commands/src/app.module.ts
diff --git a/samples/excel/spreadsheet/commands/src/main.ts b/samples/excel/spreadsheet/commands/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/spreadsheet/commands/src/main.ts
+++ b/samples/excel/spreadsheet/commands/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/spreadsheet/conditional-formatting/src/app/ExcelUtility.ts b/samples/excel/spreadsheet/conditional-formatting/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/spreadsheet/conditional-formatting/src/app/ExcelUtility.ts
rename to samples/excel/spreadsheet/conditional-formatting/src/ExcelUtility.ts
diff --git a/samples/excel/spreadsheet/conditional-formatting/src/app/app.component.html b/samples/excel/spreadsheet/conditional-formatting/src/app.component.html
similarity index 100%
rename from samples/excel/spreadsheet/conditional-formatting/src/app/app.component.html
rename to samples/excel/spreadsheet/conditional-formatting/src/app.component.html
diff --git a/samples/excel/spreadsheet/conditional-formatting/src/app/app.component.scss b/samples/excel/spreadsheet/conditional-formatting/src/app.component.scss
similarity index 100%
rename from samples/excel/spreadsheet/conditional-formatting/src/app/app.component.scss
rename to samples/excel/spreadsheet/conditional-formatting/src/app.component.scss
diff --git a/samples/excel/spreadsheet/conditional-formatting/src/app/app.component.ts b/samples/excel/spreadsheet/conditional-formatting/src/app.component.ts
similarity index 100%
rename from samples/excel/spreadsheet/conditional-formatting/src/app/app.component.ts
rename to samples/excel/spreadsheet/conditional-formatting/src/app.component.ts
diff --git a/samples/excel/spreadsheet/conditional-formatting/src/app/app.module.ts b/samples/excel/spreadsheet/conditional-formatting/src/app.module.ts
similarity index 100%
rename from samples/excel/spreadsheet/conditional-formatting/src/app/app.module.ts
rename to samples/excel/spreadsheet/conditional-formatting/src/app.module.ts
diff --git a/samples/excel/spreadsheet/conditional-formatting/src/main.ts b/samples/excel/spreadsheet/conditional-formatting/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/spreadsheet/conditional-formatting/src/main.ts
+++ b/samples/excel/spreadsheet/conditional-formatting/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/spreadsheet/config-options/src/app/ExcelUtility.ts b/samples/excel/spreadsheet/config-options/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/spreadsheet/config-options/src/app/ExcelUtility.ts
rename to samples/excel/spreadsheet/config-options/src/ExcelUtility.ts
diff --git a/samples/excel/spreadsheet/config-options/src/app/app.component.html b/samples/excel/spreadsheet/config-options/src/app.component.html
similarity index 100%
rename from samples/excel/spreadsheet/config-options/src/app/app.component.html
rename to samples/excel/spreadsheet/config-options/src/app.component.html
diff --git a/samples/excel/spreadsheet/config-options/src/app/app.component.scss b/samples/excel/spreadsheet/config-options/src/app.component.scss
similarity index 100%
rename from samples/excel/spreadsheet/config-options/src/app/app.component.scss
rename to samples/excel/spreadsheet/config-options/src/app.component.scss
diff --git a/samples/excel/spreadsheet/config-options/src/app/app.component.ts b/samples/excel/spreadsheet/config-options/src/app.component.ts
similarity index 100%
rename from samples/excel/spreadsheet/config-options/src/app/app.component.ts
rename to samples/excel/spreadsheet/config-options/src/app.component.ts
diff --git a/samples/excel/spreadsheet/config-options/src/app/app.module.ts b/samples/excel/spreadsheet/config-options/src/app.module.ts
similarity index 100%
rename from samples/excel/spreadsheet/config-options/src/app/app.module.ts
rename to samples/excel/spreadsheet/config-options/src/app.module.ts
diff --git a/samples/excel/spreadsheet/config-options/src/main.ts b/samples/excel/spreadsheet/config-options/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/spreadsheet/config-options/src/main.ts
+++ b/samples/excel/spreadsheet/config-options/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/spreadsheet/data-validation/src/app/app.component.html b/samples/excel/spreadsheet/data-validation/src/app.component.html
similarity index 100%
rename from samples/excel/spreadsheet/data-validation/src/app/app.component.html
rename to samples/excel/spreadsheet/data-validation/src/app.component.html
diff --git a/samples/excel/spreadsheet/data-validation/src/app/app.component.scss b/samples/excel/spreadsheet/data-validation/src/app.component.scss
similarity index 100%
rename from samples/excel/spreadsheet/data-validation/src/app/app.component.scss
rename to samples/excel/spreadsheet/data-validation/src/app.component.scss
diff --git a/samples/excel/spreadsheet/data-validation/src/app/app.component.ts b/samples/excel/spreadsheet/data-validation/src/app.component.ts
similarity index 100%
rename from samples/excel/spreadsheet/data-validation/src/app/app.component.ts
rename to samples/excel/spreadsheet/data-validation/src/app.component.ts
diff --git a/samples/excel/spreadsheet/data-validation/src/app/app.module.ts b/samples/excel/spreadsheet/data-validation/src/app.module.ts
similarity index 100%
rename from samples/excel/spreadsheet/data-validation/src/app/app.module.ts
rename to samples/excel/spreadsheet/data-validation/src/app.module.ts
diff --git a/samples/excel/spreadsheet/data-validation/src/main.ts b/samples/excel/spreadsheet/data-validation/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/spreadsheet/data-validation/src/main.ts
+++ b/samples/excel/spreadsheet/data-validation/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/spreadsheet/hyperlinks/src/app/ExcelUtility.ts b/samples/excel/spreadsheet/hyperlinks/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/spreadsheet/hyperlinks/src/app/ExcelUtility.ts
rename to samples/excel/spreadsheet/hyperlinks/src/ExcelUtility.ts
diff --git a/samples/excel/spreadsheet/hyperlinks/src/app/app.component.html b/samples/excel/spreadsheet/hyperlinks/src/app.component.html
similarity index 100%
rename from samples/excel/spreadsheet/hyperlinks/src/app/app.component.html
rename to samples/excel/spreadsheet/hyperlinks/src/app.component.html
diff --git a/samples/excel/spreadsheet/hyperlinks/src/app/app.component.scss b/samples/excel/spreadsheet/hyperlinks/src/app.component.scss
similarity index 100%
rename from samples/excel/spreadsheet/hyperlinks/src/app/app.component.scss
rename to samples/excel/spreadsheet/hyperlinks/src/app.component.scss
diff --git a/samples/excel/spreadsheet/hyperlinks/src/app/app.component.ts b/samples/excel/spreadsheet/hyperlinks/src/app.component.ts
similarity index 100%
rename from samples/excel/spreadsheet/hyperlinks/src/app/app.component.ts
rename to samples/excel/spreadsheet/hyperlinks/src/app.component.ts
diff --git a/samples/excel/spreadsheet/hyperlinks/src/app/app.module.ts b/samples/excel/spreadsheet/hyperlinks/src/app.module.ts
similarity index 100%
rename from samples/excel/spreadsheet/hyperlinks/src/app/app.module.ts
rename to samples/excel/spreadsheet/hyperlinks/src/app.module.ts
diff --git a/samples/excel/spreadsheet/hyperlinks/src/main.ts b/samples/excel/spreadsheet/hyperlinks/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/spreadsheet/hyperlinks/src/main.ts
+++ b/samples/excel/spreadsheet/hyperlinks/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/excel/spreadsheet/overview/src/app/ExcelUtility.ts b/samples/excel/spreadsheet/overview/src/ExcelUtility.ts
similarity index 100%
rename from samples/excel/spreadsheet/overview/src/app/ExcelUtility.ts
rename to samples/excel/spreadsheet/overview/src/ExcelUtility.ts
diff --git a/samples/excel/spreadsheet/overview/src/app/app.component.html b/samples/excel/spreadsheet/overview/src/app.component.html
similarity index 100%
rename from samples/excel/spreadsheet/overview/src/app/app.component.html
rename to samples/excel/spreadsheet/overview/src/app.component.html
diff --git a/samples/excel/spreadsheet/overview/src/app/app.component.scss b/samples/excel/spreadsheet/overview/src/app.component.scss
similarity index 100%
rename from samples/excel/spreadsheet/overview/src/app/app.component.scss
rename to samples/excel/spreadsheet/overview/src/app.component.scss
diff --git a/samples/excel/spreadsheet/overview/src/app/app.component.ts b/samples/excel/spreadsheet/overview/src/app.component.ts
similarity index 100%
rename from samples/excel/spreadsheet/overview/src/app/app.component.ts
rename to samples/excel/spreadsheet/overview/src/app.component.ts
diff --git a/samples/excel/spreadsheet/overview/src/app/app.module.ts b/samples/excel/spreadsheet/overview/src/app.module.ts
similarity index 100%
rename from samples/excel/spreadsheet/overview/src/app/app.module.ts
rename to samples/excel/spreadsheet/overview/src/app.module.ts
diff --git a/samples/excel/spreadsheet/overview/src/main.ts b/samples/excel/spreadsheet/overview/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/excel/spreadsheet/overview/src/main.ts
+++ b/samples/excel/spreadsheet/overview/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/bullet-graph/animation/src/app/app.component.html b/samples/gauges/bullet-graph/animation/src/app.component.html
similarity index 100%
rename from samples/gauges/bullet-graph/animation/src/app/app.component.html
rename to samples/gauges/bullet-graph/animation/src/app.component.html
diff --git a/samples/gauges/bullet-graph/animation/src/app/app.component.scss b/samples/gauges/bullet-graph/animation/src/app.component.scss
similarity index 100%
rename from samples/gauges/bullet-graph/animation/src/app/app.component.scss
rename to samples/gauges/bullet-graph/animation/src/app.component.scss
diff --git a/samples/gauges/bullet-graph/animation/src/app/app.component.ts b/samples/gauges/bullet-graph/animation/src/app.component.ts
similarity index 100%
rename from samples/gauges/bullet-graph/animation/src/app/app.component.ts
rename to samples/gauges/bullet-graph/animation/src/app.component.ts
diff --git a/samples/gauges/bullet-graph/animation/src/app/app.module.ts b/samples/gauges/bullet-graph/animation/src/app.module.ts
similarity index 100%
rename from samples/gauges/bullet-graph/animation/src/app/app.module.ts
rename to samples/gauges/bullet-graph/animation/src/app.module.ts
diff --git a/samples/gauges/bullet-graph/animation/src/main.ts b/samples/gauges/bullet-graph/animation/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/bullet-graph/animation/src/main.ts
+++ b/samples/gauges/bullet-graph/animation/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/bullet-graph/background/src/app/app.component.html b/samples/gauges/bullet-graph/background/src/app.component.html
similarity index 100%
rename from samples/gauges/bullet-graph/background/src/app/app.component.html
rename to samples/gauges/bullet-graph/background/src/app.component.html
diff --git a/samples/gauges/bullet-graph/background/src/app/app.component.scss b/samples/gauges/bullet-graph/background/src/app.component.scss
similarity index 100%
rename from samples/gauges/bullet-graph/background/src/app/app.component.scss
rename to samples/gauges/bullet-graph/background/src/app.component.scss
diff --git a/samples/gauges/bullet-graph/background/src/app/app.component.ts b/samples/gauges/bullet-graph/background/src/app.component.ts
similarity index 100%
rename from samples/gauges/bullet-graph/background/src/app/app.component.ts
rename to samples/gauges/bullet-graph/background/src/app.component.ts
diff --git a/samples/gauges/bullet-graph/background/src/app/app.module.ts b/samples/gauges/bullet-graph/background/src/app.module.ts
similarity index 100%
rename from samples/gauges/bullet-graph/background/src/app/app.module.ts
rename to samples/gauges/bullet-graph/background/src/app.module.ts
diff --git a/samples/gauges/bullet-graph/background/src/main.ts b/samples/gauges/bullet-graph/background/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/bullet-graph/background/src/main.ts
+++ b/samples/gauges/bullet-graph/background/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/bullet-graph/highlight-needle/src/app/app.component.html b/samples/gauges/bullet-graph/highlight-needle/src/app.component.html
similarity index 100%
rename from samples/gauges/bullet-graph/highlight-needle/src/app/app.component.html
rename to samples/gauges/bullet-graph/highlight-needle/src/app.component.html
diff --git a/samples/gauges/bullet-graph/highlight-needle/src/app/app.component.scss b/samples/gauges/bullet-graph/highlight-needle/src/app.component.scss
similarity index 100%
rename from samples/gauges/bullet-graph/highlight-needle/src/app/app.component.scss
rename to samples/gauges/bullet-graph/highlight-needle/src/app.component.scss
diff --git a/samples/gauges/bullet-graph/highlight-needle/src/app/app.component.ts b/samples/gauges/bullet-graph/highlight-needle/src/app.component.ts
similarity index 100%
rename from samples/gauges/bullet-graph/highlight-needle/src/app/app.component.ts
rename to samples/gauges/bullet-graph/highlight-needle/src/app.component.ts
diff --git a/samples/gauges/bullet-graph/highlight-needle/src/app/app.module.ts b/samples/gauges/bullet-graph/highlight-needle/src/app.module.ts
similarity index 100%
rename from samples/gauges/bullet-graph/highlight-needle/src/app/app.module.ts
rename to samples/gauges/bullet-graph/highlight-needle/src/app.module.ts
diff --git a/samples/gauges/bullet-graph/highlight-needle/src/main.ts b/samples/gauges/bullet-graph/highlight-needle/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/bullet-graph/highlight-needle/src/main.ts
+++ b/samples/gauges/bullet-graph/highlight-needle/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/bullet-graph/labels/src/app/app.component.html b/samples/gauges/bullet-graph/labels/src/app.component.html
similarity index 100%
rename from samples/gauges/bullet-graph/labels/src/app/app.component.html
rename to samples/gauges/bullet-graph/labels/src/app.component.html
diff --git a/samples/gauges/bullet-graph/labels/src/app/app.component.scss b/samples/gauges/bullet-graph/labels/src/app.component.scss
similarity index 100%
rename from samples/gauges/bullet-graph/labels/src/app/app.component.scss
rename to samples/gauges/bullet-graph/labels/src/app.component.scss
diff --git a/samples/gauges/bullet-graph/labels/src/app/app.component.ts b/samples/gauges/bullet-graph/labels/src/app.component.ts
similarity index 100%
rename from samples/gauges/bullet-graph/labels/src/app/app.component.ts
rename to samples/gauges/bullet-graph/labels/src/app.component.ts
diff --git a/samples/gauges/bullet-graph/labels/src/app/app.module.ts b/samples/gauges/bullet-graph/labels/src/app.module.ts
similarity index 100%
rename from samples/gauges/bullet-graph/labels/src/app/app.module.ts
rename to samples/gauges/bullet-graph/labels/src/app.module.ts
diff --git a/samples/gauges/bullet-graph/labels/src/main.ts b/samples/gauges/bullet-graph/labels/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/bullet-graph/labels/src/main.ts
+++ b/samples/gauges/bullet-graph/labels/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/bullet-graph/measures/src/app/app.component.html b/samples/gauges/bullet-graph/measures/src/app.component.html
similarity index 100%
rename from samples/gauges/bullet-graph/measures/src/app/app.component.html
rename to samples/gauges/bullet-graph/measures/src/app.component.html
diff --git a/samples/gauges/bullet-graph/measures/src/app/app.component.scss b/samples/gauges/bullet-graph/measures/src/app.component.scss
similarity index 100%
rename from samples/gauges/bullet-graph/measures/src/app/app.component.scss
rename to samples/gauges/bullet-graph/measures/src/app.component.scss
diff --git a/samples/gauges/bullet-graph/measures/src/app/app.component.ts b/samples/gauges/bullet-graph/measures/src/app.component.ts
similarity index 100%
rename from samples/gauges/bullet-graph/measures/src/app/app.component.ts
rename to samples/gauges/bullet-graph/measures/src/app.component.ts
diff --git a/samples/gauges/bullet-graph/measures/src/app/app.module.ts b/samples/gauges/bullet-graph/measures/src/app.module.ts
similarity index 100%
rename from samples/gauges/bullet-graph/measures/src/app/app.module.ts
rename to samples/gauges/bullet-graph/measures/src/app.module.ts
diff --git a/samples/gauges/bullet-graph/measures/src/main.ts b/samples/gauges/bullet-graph/measures/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/bullet-graph/measures/src/main.ts
+++ b/samples/gauges/bullet-graph/measures/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/bullet-graph/ranges/src/app/app.component.html b/samples/gauges/bullet-graph/ranges/src/app.component.html
similarity index 100%
rename from samples/gauges/bullet-graph/ranges/src/app/app.component.html
rename to samples/gauges/bullet-graph/ranges/src/app.component.html
diff --git a/samples/gauges/bullet-graph/ranges/src/app/app.component.scss b/samples/gauges/bullet-graph/ranges/src/app.component.scss
similarity index 100%
rename from samples/gauges/bullet-graph/ranges/src/app/app.component.scss
rename to samples/gauges/bullet-graph/ranges/src/app.component.scss
diff --git a/samples/gauges/bullet-graph/ranges/src/app/app.component.ts b/samples/gauges/bullet-graph/ranges/src/app.component.ts
similarity index 100%
rename from samples/gauges/bullet-graph/ranges/src/app/app.component.ts
rename to samples/gauges/bullet-graph/ranges/src/app.component.ts
diff --git a/samples/gauges/bullet-graph/ranges/src/app/app.module.ts b/samples/gauges/bullet-graph/ranges/src/app.module.ts
similarity index 100%
rename from samples/gauges/bullet-graph/ranges/src/app/app.module.ts
rename to samples/gauges/bullet-graph/ranges/src/app.module.ts
diff --git a/samples/gauges/bullet-graph/ranges/src/main.ts b/samples/gauges/bullet-graph/ranges/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/bullet-graph/ranges/src/main.ts
+++ b/samples/gauges/bullet-graph/ranges/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/bullet-graph/scale/src/app/app.component.html b/samples/gauges/bullet-graph/scale/src/app.component.html
similarity index 100%
rename from samples/gauges/bullet-graph/scale/src/app/app.component.html
rename to samples/gauges/bullet-graph/scale/src/app.component.html
diff --git a/samples/gauges/bullet-graph/scale/src/app/app.component.scss b/samples/gauges/bullet-graph/scale/src/app.component.scss
similarity index 100%
rename from samples/gauges/bullet-graph/scale/src/app/app.component.scss
rename to samples/gauges/bullet-graph/scale/src/app.component.scss
diff --git a/samples/gauges/bullet-graph/scale/src/app/app.component.ts b/samples/gauges/bullet-graph/scale/src/app.component.ts
similarity index 100%
rename from samples/gauges/bullet-graph/scale/src/app/app.component.ts
rename to samples/gauges/bullet-graph/scale/src/app.component.ts
diff --git a/samples/gauges/bullet-graph/scale/src/app/app.module.ts b/samples/gauges/bullet-graph/scale/src/app.module.ts
similarity index 100%
rename from samples/gauges/bullet-graph/scale/src/app/app.module.ts
rename to samples/gauges/bullet-graph/scale/src/app.module.ts
diff --git a/samples/gauges/bullet-graph/scale/src/main.ts b/samples/gauges/bullet-graph/scale/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/bullet-graph/scale/src/main.ts
+++ b/samples/gauges/bullet-graph/scale/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/bullet-graph/tickmarks/src/app/app.component.html b/samples/gauges/bullet-graph/tickmarks/src/app.component.html
similarity index 100%
rename from samples/gauges/bullet-graph/tickmarks/src/app/app.component.html
rename to samples/gauges/bullet-graph/tickmarks/src/app.component.html
diff --git a/samples/gauges/bullet-graph/tickmarks/src/app/app.component.scss b/samples/gauges/bullet-graph/tickmarks/src/app.component.scss
similarity index 100%
rename from samples/gauges/bullet-graph/tickmarks/src/app/app.component.scss
rename to samples/gauges/bullet-graph/tickmarks/src/app.component.scss
diff --git a/samples/gauges/bullet-graph/tickmarks/src/app/app.component.ts b/samples/gauges/bullet-graph/tickmarks/src/app.component.ts
similarity index 100%
rename from samples/gauges/bullet-graph/tickmarks/src/app/app.component.ts
rename to samples/gauges/bullet-graph/tickmarks/src/app.component.ts
diff --git a/samples/gauges/bullet-graph/tickmarks/src/app/app.module.ts b/samples/gauges/bullet-graph/tickmarks/src/app.module.ts
similarity index 100%
rename from samples/gauges/bullet-graph/tickmarks/src/app/app.module.ts
rename to samples/gauges/bullet-graph/tickmarks/src/app.module.ts
diff --git a/samples/gauges/bullet-graph/tickmarks/src/main.ts b/samples/gauges/bullet-graph/tickmarks/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/bullet-graph/tickmarks/src/main.ts
+++ b/samples/gauges/bullet-graph/tickmarks/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/linear-gauge/animation/src/app/app.component.html b/samples/gauges/linear-gauge/animation/src/app.component.html
similarity index 100%
rename from samples/gauges/linear-gauge/animation/src/app/app.component.html
rename to samples/gauges/linear-gauge/animation/src/app.component.html
diff --git a/samples/gauges/linear-gauge/animation/src/app/app.component.scss b/samples/gauges/linear-gauge/animation/src/app.component.scss
similarity index 100%
rename from samples/gauges/linear-gauge/animation/src/app/app.component.scss
rename to samples/gauges/linear-gauge/animation/src/app.component.scss
diff --git a/samples/gauges/linear-gauge/animation/src/app/app.component.ts b/samples/gauges/linear-gauge/animation/src/app.component.ts
similarity index 100%
rename from samples/gauges/linear-gauge/animation/src/app/app.component.ts
rename to samples/gauges/linear-gauge/animation/src/app.component.ts
diff --git a/samples/gauges/linear-gauge/animation/src/app/app.module.ts b/samples/gauges/linear-gauge/animation/src/app.module.ts
similarity index 100%
rename from samples/gauges/linear-gauge/animation/src/app/app.module.ts
rename to samples/gauges/linear-gauge/animation/src/app.module.ts
diff --git a/samples/gauges/linear-gauge/animation/src/main.ts b/samples/gauges/linear-gauge/animation/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/linear-gauge/animation/src/main.ts
+++ b/samples/gauges/linear-gauge/animation/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/linear-gauge/backing/src/app/app.component.html b/samples/gauges/linear-gauge/backing/src/app.component.html
similarity index 100%
rename from samples/gauges/linear-gauge/backing/src/app/app.component.html
rename to samples/gauges/linear-gauge/backing/src/app.component.html
diff --git a/samples/gauges/linear-gauge/backing/src/app/app.component.scss b/samples/gauges/linear-gauge/backing/src/app.component.scss
similarity index 100%
rename from samples/gauges/linear-gauge/backing/src/app/app.component.scss
rename to samples/gauges/linear-gauge/backing/src/app.component.scss
diff --git a/samples/gauges/linear-gauge/backing/src/app/app.component.ts b/samples/gauges/linear-gauge/backing/src/app.component.ts
similarity index 100%
rename from samples/gauges/linear-gauge/backing/src/app/app.component.ts
rename to samples/gauges/linear-gauge/backing/src/app.component.ts
diff --git a/samples/gauges/linear-gauge/backing/src/app/app.module.ts b/samples/gauges/linear-gauge/backing/src/app.module.ts
similarity index 100%
rename from samples/gauges/linear-gauge/backing/src/app/app.module.ts
rename to samples/gauges/linear-gauge/backing/src/app.module.ts
diff --git a/samples/gauges/linear-gauge/backing/src/main.ts b/samples/gauges/linear-gauge/backing/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/linear-gauge/backing/src/main.ts
+++ b/samples/gauges/linear-gauge/backing/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/linear-gauge/highlight-needle/src/app/app.component.html b/samples/gauges/linear-gauge/highlight-needle/src/app.component.html
similarity index 100%
rename from samples/gauges/linear-gauge/highlight-needle/src/app/app.component.html
rename to samples/gauges/linear-gauge/highlight-needle/src/app.component.html
diff --git a/samples/gauges/linear-gauge/highlight-needle/src/app/app.component.scss b/samples/gauges/linear-gauge/highlight-needle/src/app.component.scss
similarity index 100%
rename from samples/gauges/linear-gauge/highlight-needle/src/app/app.component.scss
rename to samples/gauges/linear-gauge/highlight-needle/src/app.component.scss
diff --git a/samples/gauges/linear-gauge/highlight-needle/src/app/app.component.ts b/samples/gauges/linear-gauge/highlight-needle/src/app.component.ts
similarity index 100%
rename from samples/gauges/linear-gauge/highlight-needle/src/app/app.component.ts
rename to samples/gauges/linear-gauge/highlight-needle/src/app.component.ts
diff --git a/samples/gauges/linear-gauge/highlight-needle/src/app/app.module.ts b/samples/gauges/linear-gauge/highlight-needle/src/app.module.ts
similarity index 100%
rename from samples/gauges/linear-gauge/highlight-needle/src/app/app.module.ts
rename to samples/gauges/linear-gauge/highlight-needle/src/app.module.ts
diff --git a/samples/gauges/linear-gauge/highlight-needle/src/main.ts b/samples/gauges/linear-gauge/highlight-needle/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/linear-gauge/highlight-needle/src/main.ts
+++ b/samples/gauges/linear-gauge/highlight-needle/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/linear-gauge/labels/src/app/app.component.html b/samples/gauges/linear-gauge/labels/src/app.component.html
similarity index 100%
rename from samples/gauges/linear-gauge/labels/src/app/app.component.html
rename to samples/gauges/linear-gauge/labels/src/app.component.html
diff --git a/samples/gauges/linear-gauge/labels/src/app/app.component.scss b/samples/gauges/linear-gauge/labels/src/app.component.scss
similarity index 100%
rename from samples/gauges/linear-gauge/labels/src/app/app.component.scss
rename to samples/gauges/linear-gauge/labels/src/app.component.scss
diff --git a/samples/gauges/linear-gauge/labels/src/app/app.component.ts b/samples/gauges/linear-gauge/labels/src/app.component.ts
similarity index 100%
rename from samples/gauges/linear-gauge/labels/src/app/app.component.ts
rename to samples/gauges/linear-gauge/labels/src/app.component.ts
diff --git a/samples/gauges/linear-gauge/labels/src/app/app.module.ts b/samples/gauges/linear-gauge/labels/src/app.module.ts
similarity index 100%
rename from samples/gauges/linear-gauge/labels/src/app/app.module.ts
rename to samples/gauges/linear-gauge/labels/src/app.module.ts
diff --git a/samples/gauges/linear-gauge/labels/src/main.ts b/samples/gauges/linear-gauge/labels/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/linear-gauge/labels/src/main.ts
+++ b/samples/gauges/linear-gauge/labels/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/linear-gauge/needle/src/app/app.component.html b/samples/gauges/linear-gauge/needle/src/app.component.html
similarity index 100%
rename from samples/gauges/linear-gauge/needle/src/app/app.component.html
rename to samples/gauges/linear-gauge/needle/src/app.component.html
diff --git a/samples/gauges/linear-gauge/needle/src/app/app.component.scss b/samples/gauges/linear-gauge/needle/src/app.component.scss
similarity index 100%
rename from samples/gauges/linear-gauge/needle/src/app/app.component.scss
rename to samples/gauges/linear-gauge/needle/src/app.component.scss
diff --git a/samples/gauges/linear-gauge/needle/src/app/app.component.ts b/samples/gauges/linear-gauge/needle/src/app.component.ts
similarity index 100%
rename from samples/gauges/linear-gauge/needle/src/app/app.component.ts
rename to samples/gauges/linear-gauge/needle/src/app.component.ts
diff --git a/samples/gauges/linear-gauge/needle/src/app/app.module.ts b/samples/gauges/linear-gauge/needle/src/app.module.ts
similarity index 100%
rename from samples/gauges/linear-gauge/needle/src/app/app.module.ts
rename to samples/gauges/linear-gauge/needle/src/app.module.ts
diff --git a/samples/gauges/linear-gauge/needle/src/main.ts b/samples/gauges/linear-gauge/needle/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/linear-gauge/needle/src/main.ts
+++ b/samples/gauges/linear-gauge/needle/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/linear-gauge/ranges/src/app/app.component.html b/samples/gauges/linear-gauge/ranges/src/app.component.html
similarity index 100%
rename from samples/gauges/linear-gauge/ranges/src/app/app.component.html
rename to samples/gauges/linear-gauge/ranges/src/app.component.html
diff --git a/samples/gauges/linear-gauge/ranges/src/app/app.component.scss b/samples/gauges/linear-gauge/ranges/src/app.component.scss
similarity index 100%
rename from samples/gauges/linear-gauge/ranges/src/app/app.component.scss
rename to samples/gauges/linear-gauge/ranges/src/app.component.scss
diff --git a/samples/gauges/linear-gauge/ranges/src/app/app.component.ts b/samples/gauges/linear-gauge/ranges/src/app.component.ts
similarity index 100%
rename from samples/gauges/linear-gauge/ranges/src/app/app.component.ts
rename to samples/gauges/linear-gauge/ranges/src/app.component.ts
diff --git a/samples/gauges/linear-gauge/ranges/src/app/app.module.ts b/samples/gauges/linear-gauge/ranges/src/app.module.ts
similarity index 100%
rename from samples/gauges/linear-gauge/ranges/src/app/app.module.ts
rename to samples/gauges/linear-gauge/ranges/src/app.module.ts
diff --git a/samples/gauges/linear-gauge/ranges/src/main.ts b/samples/gauges/linear-gauge/ranges/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/linear-gauge/ranges/src/main.ts
+++ b/samples/gauges/linear-gauge/ranges/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/linear-gauge/scale/src/app/app.component.html b/samples/gauges/linear-gauge/scale/src/app.component.html
similarity index 100%
rename from samples/gauges/linear-gauge/scale/src/app/app.component.html
rename to samples/gauges/linear-gauge/scale/src/app.component.html
diff --git a/samples/gauges/linear-gauge/scale/src/app/app.component.scss b/samples/gauges/linear-gauge/scale/src/app.component.scss
similarity index 100%
rename from samples/gauges/linear-gauge/scale/src/app/app.component.scss
rename to samples/gauges/linear-gauge/scale/src/app.component.scss
diff --git a/samples/gauges/linear-gauge/scale/src/app/app.component.ts b/samples/gauges/linear-gauge/scale/src/app.component.ts
similarity index 100%
rename from samples/gauges/linear-gauge/scale/src/app/app.component.ts
rename to samples/gauges/linear-gauge/scale/src/app.component.ts
diff --git a/samples/gauges/linear-gauge/scale/src/app/app.module.ts b/samples/gauges/linear-gauge/scale/src/app.module.ts
similarity index 100%
rename from samples/gauges/linear-gauge/scale/src/app/app.module.ts
rename to samples/gauges/linear-gauge/scale/src/app.module.ts
diff --git a/samples/gauges/linear-gauge/scale/src/main.ts b/samples/gauges/linear-gauge/scale/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/linear-gauge/scale/src/main.ts
+++ b/samples/gauges/linear-gauge/scale/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/linear-gauge/tickmarks/src/app/app.component.html b/samples/gauges/linear-gauge/tickmarks/src/app.component.html
similarity index 100%
rename from samples/gauges/linear-gauge/tickmarks/src/app/app.component.html
rename to samples/gauges/linear-gauge/tickmarks/src/app.component.html
diff --git a/samples/gauges/linear-gauge/tickmarks/src/app/app.component.scss b/samples/gauges/linear-gauge/tickmarks/src/app.component.scss
similarity index 100%
rename from samples/gauges/linear-gauge/tickmarks/src/app/app.component.scss
rename to samples/gauges/linear-gauge/tickmarks/src/app.component.scss
diff --git a/samples/gauges/linear-gauge/tickmarks/src/app/app.component.ts b/samples/gauges/linear-gauge/tickmarks/src/app.component.ts
similarity index 100%
rename from samples/gauges/linear-gauge/tickmarks/src/app/app.component.ts
rename to samples/gauges/linear-gauge/tickmarks/src/app.component.ts
diff --git a/samples/gauges/linear-gauge/tickmarks/src/app/app.module.ts b/samples/gauges/linear-gauge/tickmarks/src/app.module.ts
similarity index 100%
rename from samples/gauges/linear-gauge/tickmarks/src/app/app.module.ts
rename to samples/gauges/linear-gauge/tickmarks/src/app.module.ts
diff --git a/samples/gauges/linear-gauge/tickmarks/src/main.ts b/samples/gauges/linear-gauge/tickmarks/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/linear-gauge/tickmarks/src/main.ts
+++ b/samples/gauges/linear-gauge/tickmarks/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/radial-gauge/animation/src/app/app.component.html b/samples/gauges/radial-gauge/animation/src/app.component.html
similarity index 100%
rename from samples/gauges/radial-gauge/animation/src/app/app.component.html
rename to samples/gauges/radial-gauge/animation/src/app.component.html
diff --git a/samples/gauges/radial-gauge/animation/src/app/app.component.scss b/samples/gauges/radial-gauge/animation/src/app.component.scss
similarity index 100%
rename from samples/gauges/radial-gauge/animation/src/app/app.component.scss
rename to samples/gauges/radial-gauge/animation/src/app.component.scss
diff --git a/samples/gauges/radial-gauge/animation/src/app/app.component.ts b/samples/gauges/radial-gauge/animation/src/app.component.ts
similarity index 100%
rename from samples/gauges/radial-gauge/animation/src/app/app.component.ts
rename to samples/gauges/radial-gauge/animation/src/app.component.ts
diff --git a/samples/gauges/radial-gauge/animation/src/app/app.module.ts b/samples/gauges/radial-gauge/animation/src/app.module.ts
similarity index 100%
rename from samples/gauges/radial-gauge/animation/src/app/app.module.ts
rename to samples/gauges/radial-gauge/animation/src/app.module.ts
diff --git a/samples/gauges/radial-gauge/animation/src/main.ts b/samples/gauges/radial-gauge/animation/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/radial-gauge/animation/src/main.ts
+++ b/samples/gauges/radial-gauge/animation/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/radial-gauge/backing/src/app/app.component.html b/samples/gauges/radial-gauge/backing/src/app.component.html
similarity index 100%
rename from samples/gauges/radial-gauge/backing/src/app/app.component.html
rename to samples/gauges/radial-gauge/backing/src/app.component.html
diff --git a/samples/gauges/radial-gauge/backing/src/app/app.component.scss b/samples/gauges/radial-gauge/backing/src/app.component.scss
similarity index 100%
rename from samples/gauges/radial-gauge/backing/src/app/app.component.scss
rename to samples/gauges/radial-gauge/backing/src/app.component.scss
diff --git a/samples/gauges/radial-gauge/backing/src/app/app.component.ts b/samples/gauges/radial-gauge/backing/src/app.component.ts
similarity index 100%
rename from samples/gauges/radial-gauge/backing/src/app/app.component.ts
rename to samples/gauges/radial-gauge/backing/src/app.component.ts
diff --git a/samples/gauges/radial-gauge/backing/src/app/app.module.ts b/samples/gauges/radial-gauge/backing/src/app.module.ts
similarity index 100%
rename from samples/gauges/radial-gauge/backing/src/app/app.module.ts
rename to samples/gauges/radial-gauge/backing/src/app.module.ts
diff --git a/samples/gauges/radial-gauge/backing/src/main.ts b/samples/gauges/radial-gauge/backing/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/radial-gauge/backing/src/main.ts
+++ b/samples/gauges/radial-gauge/backing/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/radial-gauge/highlight-needle/src/app/app.component.html b/samples/gauges/radial-gauge/highlight-needle/src/app.component.html
similarity index 100%
rename from samples/gauges/radial-gauge/highlight-needle/src/app/app.component.html
rename to samples/gauges/radial-gauge/highlight-needle/src/app.component.html
diff --git a/samples/gauges/radial-gauge/highlight-needle/src/app/app.component.scss b/samples/gauges/radial-gauge/highlight-needle/src/app.component.scss
similarity index 100%
rename from samples/gauges/radial-gauge/highlight-needle/src/app/app.component.scss
rename to samples/gauges/radial-gauge/highlight-needle/src/app.component.scss
diff --git a/samples/gauges/radial-gauge/highlight-needle/src/app/app.component.ts b/samples/gauges/radial-gauge/highlight-needle/src/app.component.ts
similarity index 100%
rename from samples/gauges/radial-gauge/highlight-needle/src/app/app.component.ts
rename to samples/gauges/radial-gauge/highlight-needle/src/app.component.ts
diff --git a/samples/gauges/radial-gauge/highlight-needle/src/app/app.module.ts b/samples/gauges/radial-gauge/highlight-needle/src/app.module.ts
similarity index 100%
rename from samples/gauges/radial-gauge/highlight-needle/src/app/app.module.ts
rename to samples/gauges/radial-gauge/highlight-needle/src/app.module.ts
diff --git a/samples/gauges/radial-gauge/highlight-needle/src/main.ts b/samples/gauges/radial-gauge/highlight-needle/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/radial-gauge/highlight-needle/src/main.ts
+++ b/samples/gauges/radial-gauge/highlight-needle/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/radial-gauge/labels/src/app/app.component.html b/samples/gauges/radial-gauge/labels/src/app.component.html
similarity index 100%
rename from samples/gauges/radial-gauge/labels/src/app/app.component.html
rename to samples/gauges/radial-gauge/labels/src/app.component.html
diff --git a/samples/gauges/radial-gauge/labels/src/app/app.component.scss b/samples/gauges/radial-gauge/labels/src/app.component.scss
similarity index 100%
rename from samples/gauges/radial-gauge/labels/src/app/app.component.scss
rename to samples/gauges/radial-gauge/labels/src/app.component.scss
diff --git a/samples/gauges/radial-gauge/labels/src/app/app.component.ts b/samples/gauges/radial-gauge/labels/src/app.component.ts
similarity index 100%
rename from samples/gauges/radial-gauge/labels/src/app/app.component.ts
rename to samples/gauges/radial-gauge/labels/src/app.component.ts
diff --git a/samples/gauges/radial-gauge/labels/src/app/app.module.ts b/samples/gauges/radial-gauge/labels/src/app.module.ts
similarity index 100%
rename from samples/gauges/radial-gauge/labels/src/app/app.module.ts
rename to samples/gauges/radial-gauge/labels/src/app.module.ts
diff --git a/samples/gauges/radial-gauge/labels/src/main.ts b/samples/gauges/radial-gauge/labels/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/radial-gauge/labels/src/main.ts
+++ b/samples/gauges/radial-gauge/labels/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/radial-gauge/needle/src/app/app.component.html b/samples/gauges/radial-gauge/needle/src/app.component.html
similarity index 100%
rename from samples/gauges/radial-gauge/needle/src/app/app.component.html
rename to samples/gauges/radial-gauge/needle/src/app.component.html
diff --git a/samples/gauges/radial-gauge/needle/src/app/app.component.scss b/samples/gauges/radial-gauge/needle/src/app.component.scss
similarity index 100%
rename from samples/gauges/radial-gauge/needle/src/app/app.component.scss
rename to samples/gauges/radial-gauge/needle/src/app.component.scss
diff --git a/samples/gauges/radial-gauge/needle/src/app/app.component.ts b/samples/gauges/radial-gauge/needle/src/app.component.ts
similarity index 100%
rename from samples/gauges/radial-gauge/needle/src/app/app.component.ts
rename to samples/gauges/radial-gauge/needle/src/app.component.ts
diff --git a/samples/gauges/radial-gauge/needle/src/app/app.module.ts b/samples/gauges/radial-gauge/needle/src/app.module.ts
similarity index 100%
rename from samples/gauges/radial-gauge/needle/src/app/app.module.ts
rename to samples/gauges/radial-gauge/needle/src/app.module.ts
diff --git a/samples/gauges/radial-gauge/needle/src/main.ts b/samples/gauges/radial-gauge/needle/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/radial-gauge/needle/src/main.ts
+++ b/samples/gauges/radial-gauge/needle/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/radial-gauge/optical-scaling/src/app/app.component.html b/samples/gauges/radial-gauge/optical-scaling/src/app.component.html
similarity index 100%
rename from samples/gauges/radial-gauge/optical-scaling/src/app/app.component.html
rename to samples/gauges/radial-gauge/optical-scaling/src/app.component.html
diff --git a/samples/gauges/radial-gauge/optical-scaling/src/app/app.component.scss b/samples/gauges/radial-gauge/optical-scaling/src/app.component.scss
similarity index 100%
rename from samples/gauges/radial-gauge/optical-scaling/src/app/app.component.scss
rename to samples/gauges/radial-gauge/optical-scaling/src/app.component.scss
diff --git a/samples/gauges/radial-gauge/optical-scaling/src/app/app.component.ts b/samples/gauges/radial-gauge/optical-scaling/src/app.component.ts
similarity index 100%
rename from samples/gauges/radial-gauge/optical-scaling/src/app/app.component.ts
rename to samples/gauges/radial-gauge/optical-scaling/src/app.component.ts
diff --git a/samples/gauges/radial-gauge/optical-scaling/src/app/app.module.ts b/samples/gauges/radial-gauge/optical-scaling/src/app.module.ts
similarity index 100%
rename from samples/gauges/radial-gauge/optical-scaling/src/app/app.module.ts
rename to samples/gauges/radial-gauge/optical-scaling/src/app.module.ts
diff --git a/samples/gauges/radial-gauge/optical-scaling/src/main.ts b/samples/gauges/radial-gauge/optical-scaling/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/radial-gauge/optical-scaling/src/main.ts
+++ b/samples/gauges/radial-gauge/optical-scaling/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/radial-gauge/ranges/src/app/app.component.html b/samples/gauges/radial-gauge/ranges/src/app.component.html
similarity index 100%
rename from samples/gauges/radial-gauge/ranges/src/app/app.component.html
rename to samples/gauges/radial-gauge/ranges/src/app.component.html
diff --git a/samples/gauges/radial-gauge/ranges/src/app/app.component.scss b/samples/gauges/radial-gauge/ranges/src/app.component.scss
similarity index 100%
rename from samples/gauges/radial-gauge/ranges/src/app/app.component.scss
rename to samples/gauges/radial-gauge/ranges/src/app.component.scss
diff --git a/samples/gauges/radial-gauge/ranges/src/app/app.component.ts b/samples/gauges/radial-gauge/ranges/src/app.component.ts
similarity index 100%
rename from samples/gauges/radial-gauge/ranges/src/app/app.component.ts
rename to samples/gauges/radial-gauge/ranges/src/app.component.ts
diff --git a/samples/gauges/radial-gauge/ranges/src/app/app.module.ts b/samples/gauges/radial-gauge/ranges/src/app.module.ts
similarity index 100%
rename from samples/gauges/radial-gauge/ranges/src/app/app.module.ts
rename to samples/gauges/radial-gauge/ranges/src/app.module.ts
diff --git a/samples/gauges/radial-gauge/ranges/src/main.ts b/samples/gauges/radial-gauge/ranges/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/radial-gauge/ranges/src/main.ts
+++ b/samples/gauges/radial-gauge/ranges/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/radial-gauge/scale/src/app/app.component.html b/samples/gauges/radial-gauge/scale/src/app.component.html
similarity index 100%
rename from samples/gauges/radial-gauge/scale/src/app/app.component.html
rename to samples/gauges/radial-gauge/scale/src/app.component.html
diff --git a/samples/gauges/radial-gauge/scale/src/app/app.component.scss b/samples/gauges/radial-gauge/scale/src/app.component.scss
similarity index 100%
rename from samples/gauges/radial-gauge/scale/src/app/app.component.scss
rename to samples/gauges/radial-gauge/scale/src/app.component.scss
diff --git a/samples/gauges/radial-gauge/scale/src/app/app.component.ts b/samples/gauges/radial-gauge/scale/src/app.component.ts
similarity index 100%
rename from samples/gauges/radial-gauge/scale/src/app/app.component.ts
rename to samples/gauges/radial-gauge/scale/src/app.component.ts
diff --git a/samples/gauges/radial-gauge/scale/src/app/app.module.ts b/samples/gauges/radial-gauge/scale/src/app.module.ts
similarity index 100%
rename from samples/gauges/radial-gauge/scale/src/app/app.module.ts
rename to samples/gauges/radial-gauge/scale/src/app.module.ts
diff --git a/samples/gauges/radial-gauge/scale/src/main.ts b/samples/gauges/radial-gauge/scale/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/radial-gauge/scale/src/main.ts
+++ b/samples/gauges/radial-gauge/scale/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/gauges/radial-gauge/tickmarks/src/app/app.component.html b/samples/gauges/radial-gauge/tickmarks/src/app.component.html
similarity index 100%
rename from samples/gauges/radial-gauge/tickmarks/src/app/app.component.html
rename to samples/gauges/radial-gauge/tickmarks/src/app.component.html
diff --git a/samples/gauges/radial-gauge/tickmarks/src/app/app.component.scss b/samples/gauges/radial-gauge/tickmarks/src/app.component.scss
similarity index 100%
rename from samples/gauges/radial-gauge/tickmarks/src/app/app.component.scss
rename to samples/gauges/radial-gauge/tickmarks/src/app.component.scss
diff --git a/samples/gauges/radial-gauge/tickmarks/src/app/app.component.ts b/samples/gauges/radial-gauge/tickmarks/src/app.component.ts
similarity index 100%
rename from samples/gauges/radial-gauge/tickmarks/src/app/app.component.ts
rename to samples/gauges/radial-gauge/tickmarks/src/app.component.ts
diff --git a/samples/gauges/radial-gauge/tickmarks/src/app/app.module.ts b/samples/gauges/radial-gauge/tickmarks/src/app.module.ts
similarity index 100%
rename from samples/gauges/radial-gauge/tickmarks/src/app/app.module.ts
rename to samples/gauges/radial-gauge/tickmarks/src/app.module.ts
diff --git a/samples/gauges/radial-gauge/tickmarks/src/main.ts b/samples/gauges/radial-gauge/tickmarks/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/gauges/radial-gauge/tickmarks/src/main.ts
+++ b/samples/gauges/radial-gauge/tickmarks/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/binding-data-csv/src/app/app.component.html b/samples/maps/geo-map/binding-data-csv/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/binding-data-csv/src/app/app.component.html
rename to samples/maps/geo-map/binding-data-csv/src/app.component.html
diff --git a/samples/maps/geo-map/binding-data-csv/src/app/app.component.scss b/samples/maps/geo-map/binding-data-csv/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/binding-data-csv/src/app/app.component.scss
rename to samples/maps/geo-map/binding-data-csv/src/app.component.scss
diff --git a/samples/maps/geo-map/binding-data-csv/src/app/app.component.ts b/samples/maps/geo-map/binding-data-csv/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/binding-data-csv/src/app/app.component.ts
rename to samples/maps/geo-map/binding-data-csv/src/app.component.ts
diff --git a/samples/maps/geo-map/binding-data-csv/src/app/app.module.ts b/samples/maps/geo-map/binding-data-csv/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/binding-data-csv/src/app/app.module.ts
rename to samples/maps/geo-map/binding-data-csv/src/app.module.ts
diff --git a/samples/maps/geo-map/binding-data-csv/src/main.ts b/samples/maps/geo-map/binding-data-csv/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/binding-data-csv/src/main.ts
+++ b/samples/maps/geo-map/binding-data-csv/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/binding-data-json-points/src/app/app.component.html b/samples/maps/geo-map/binding-data-json-points/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/binding-data-json-points/src/app/app.component.html
rename to samples/maps/geo-map/binding-data-json-points/src/app.component.html
diff --git a/samples/maps/geo-map/binding-data-json-points/src/app/app.component.scss b/samples/maps/geo-map/binding-data-json-points/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/binding-data-json-points/src/app/app.component.scss
rename to samples/maps/geo-map/binding-data-json-points/src/app.component.scss
diff --git a/samples/maps/geo-map/binding-data-json-points/src/app/app.component.ts b/samples/maps/geo-map/binding-data-json-points/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/binding-data-json-points/src/app/app.component.ts
rename to samples/maps/geo-map/binding-data-json-points/src/app.component.ts
diff --git a/samples/maps/geo-map/binding-data-json-points/src/app/app.module.ts b/samples/maps/geo-map/binding-data-json-points/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/binding-data-json-points/src/app/app.module.ts
rename to samples/maps/geo-map/binding-data-json-points/src/app.module.ts
diff --git a/samples/maps/geo-map/binding-data-json-points/src/main.ts b/samples/maps/geo-map/binding-data-json-points/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/binding-data-json-points/src/main.ts
+++ b/samples/maps/geo-map/binding-data-json-points/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/binding-data-model/src/app/WorldUtility.ts b/samples/maps/geo-map/binding-data-model/src/WorldUtility.ts
similarity index 100%
rename from samples/maps/geo-map/binding-data-model/src/app/WorldUtility.ts
rename to samples/maps/geo-map/binding-data-model/src/WorldUtility.ts
diff --git a/samples/maps/geo-map/binding-data-model/src/app/app.component.html b/samples/maps/geo-map/binding-data-model/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/binding-data-model/src/app/app.component.html
rename to samples/maps/geo-map/binding-data-model/src/app.component.html
diff --git a/samples/maps/geo-map/binding-data-model/src/app/app.component.scss b/samples/maps/geo-map/binding-data-model/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/binding-data-model/src/app/app.component.scss
rename to samples/maps/geo-map/binding-data-model/src/app.component.scss
diff --git a/samples/maps/geo-map/binding-data-model/src/app/app.component.ts b/samples/maps/geo-map/binding-data-model/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/binding-data-model/src/app/app.component.ts
rename to samples/maps/geo-map/binding-data-model/src/app.component.ts
diff --git a/samples/maps/geo-map/binding-data-model/src/app/app.module.ts b/samples/maps/geo-map/binding-data-model/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/binding-data-model/src/app/app.module.ts
rename to samples/maps/geo-map/binding-data-model/src/app.module.ts
diff --git a/samples/maps/geo-map/binding-data-model/src/main.ts b/samples/maps/geo-map/binding-data-model/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/binding-data-model/src/main.ts
+++ b/samples/maps/geo-map/binding-data-model/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/binding-multiple-shapes/src/app/app.component.html b/samples/maps/geo-map/binding-multiple-shapes/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/binding-multiple-shapes/src/app/app.component.html
rename to samples/maps/geo-map/binding-multiple-shapes/src/app.component.html
diff --git a/samples/maps/geo-map/binding-multiple-shapes/src/app/app.component.scss b/samples/maps/geo-map/binding-multiple-shapes/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/binding-multiple-shapes/src/app/app.component.scss
rename to samples/maps/geo-map/binding-multiple-shapes/src/app.component.scss
diff --git a/samples/maps/geo-map/binding-multiple-shapes/src/app/app.component.ts b/samples/maps/geo-map/binding-multiple-shapes/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/binding-multiple-shapes/src/app/app.component.ts
rename to samples/maps/geo-map/binding-multiple-shapes/src/app.component.ts
diff --git a/samples/maps/geo-map/binding-multiple-shapes/src/app/app.module.ts b/samples/maps/geo-map/binding-multiple-shapes/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/binding-multiple-shapes/src/app/app.module.ts
rename to samples/maps/geo-map/binding-multiple-shapes/src/app.module.ts
diff --git a/samples/maps/geo-map/binding-multiple-shapes/src/main.ts b/samples/maps/geo-map/binding-multiple-shapes/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/binding-multiple-shapes/src/main.ts
+++ b/samples/maps/geo-map/binding-multiple-shapes/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/binding-multiple-sources/src/app/WorldConnections.ts b/samples/maps/geo-map/binding-multiple-sources/src/WorldConnections.ts
similarity index 100%
rename from samples/maps/geo-map/binding-multiple-sources/src/app/WorldConnections.ts
rename to samples/maps/geo-map/binding-multiple-sources/src/WorldConnections.ts
diff --git a/samples/maps/geo-map/binding-multiple-sources/src/app/WorldLocations.ts b/samples/maps/geo-map/binding-multiple-sources/src/WorldLocations.ts
similarity index 100%
rename from samples/maps/geo-map/binding-multiple-sources/src/app/WorldLocations.ts
rename to samples/maps/geo-map/binding-multiple-sources/src/WorldLocations.ts
diff --git a/samples/maps/geo-map/binding-multiple-sources/src/app/WorldUtility.ts b/samples/maps/geo-map/binding-multiple-sources/src/WorldUtility.ts
similarity index 100%
rename from samples/maps/geo-map/binding-multiple-sources/src/app/WorldUtility.ts
rename to samples/maps/geo-map/binding-multiple-sources/src/WorldUtility.ts
diff --git a/samples/maps/geo-map/binding-multiple-sources/src/app/app.component.html b/samples/maps/geo-map/binding-multiple-sources/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/binding-multiple-sources/src/app/app.component.html
rename to samples/maps/geo-map/binding-multiple-sources/src/app.component.html
diff --git a/samples/maps/geo-map/binding-multiple-sources/src/app/app.component.scss b/samples/maps/geo-map/binding-multiple-sources/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/binding-multiple-sources/src/app/app.component.scss
rename to samples/maps/geo-map/binding-multiple-sources/src/app.component.scss
diff --git a/samples/maps/geo-map/binding-multiple-sources/src/app/app.component.ts b/samples/maps/geo-map/binding-multiple-sources/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/binding-multiple-sources/src/app/app.component.ts
rename to samples/maps/geo-map/binding-multiple-sources/src/app.component.ts
diff --git a/samples/maps/geo-map/binding-multiple-sources/src/app/app.module.ts b/samples/maps/geo-map/binding-multiple-sources/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/binding-multiple-sources/src/app/app.module.ts
rename to samples/maps/geo-map/binding-multiple-sources/src/app.module.ts
diff --git a/samples/maps/geo-map/binding-multiple-sources/src/main.ts b/samples/maps/geo-map/binding-multiple-sources/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/binding-multiple-sources/src/main.ts
+++ b/samples/maps/geo-map/binding-multiple-sources/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/binding-shp-points/src/app/app.component.html b/samples/maps/geo-map/binding-shp-points/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/binding-shp-points/src/app/app.component.html
rename to samples/maps/geo-map/binding-shp-points/src/app.component.html
diff --git a/samples/maps/geo-map/binding-shp-points/src/app/app.component.scss b/samples/maps/geo-map/binding-shp-points/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/binding-shp-points/src/app/app.component.scss
rename to samples/maps/geo-map/binding-shp-points/src/app.component.scss
diff --git a/samples/maps/geo-map/binding-shp-points/src/app/app.component.ts b/samples/maps/geo-map/binding-shp-points/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/binding-shp-points/src/app/app.component.ts
rename to samples/maps/geo-map/binding-shp-points/src/app.component.ts
diff --git a/samples/maps/geo-map/binding-shp-points/src/app/app.module.ts b/samples/maps/geo-map/binding-shp-points/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/binding-shp-points/src/app/app.module.ts
rename to samples/maps/geo-map/binding-shp-points/src/app.module.ts
diff --git a/samples/maps/geo-map/binding-shp-points/src/main.ts b/samples/maps/geo-map/binding-shp-points/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/binding-shp-points/src/main.ts
+++ b/samples/maps/geo-map/binding-shp-points/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/binding-shp-polygons/src/app/app.component.html b/samples/maps/geo-map/binding-shp-polygons/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/binding-shp-polygons/src/app/app.component.html
rename to samples/maps/geo-map/binding-shp-polygons/src/app.component.html
diff --git a/samples/maps/geo-map/binding-shp-polygons/src/app/app.component.scss b/samples/maps/geo-map/binding-shp-polygons/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/binding-shp-polygons/src/app/app.component.scss
rename to samples/maps/geo-map/binding-shp-polygons/src/app.component.scss
diff --git a/samples/maps/geo-map/binding-shp-polygons/src/app/app.component.ts b/samples/maps/geo-map/binding-shp-polygons/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/binding-shp-polygons/src/app/app.component.ts
rename to samples/maps/geo-map/binding-shp-polygons/src/app.component.ts
diff --git a/samples/maps/geo-map/binding-shp-polygons/src/app/app.module.ts b/samples/maps/geo-map/binding-shp-polygons/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/binding-shp-polygons/src/app/app.module.ts
rename to samples/maps/geo-map/binding-shp-polygons/src/app.module.ts
diff --git a/samples/maps/geo-map/binding-shp-polygons/src/main.ts b/samples/maps/geo-map/binding-shp-polygons/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/binding-shp-polygons/src/main.ts
+++ b/samples/maps/geo-map/binding-shp-polygons/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/binding-shp-polylines/src/app/app.component.html b/samples/maps/geo-map/binding-shp-polylines/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/binding-shp-polylines/src/app/app.component.html
rename to samples/maps/geo-map/binding-shp-polylines/src/app.component.html
diff --git a/samples/maps/geo-map/binding-shp-polylines/src/app/app.component.scss b/samples/maps/geo-map/binding-shp-polylines/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/binding-shp-polylines/src/app/app.component.scss
rename to samples/maps/geo-map/binding-shp-polylines/src/app.component.scss
diff --git a/samples/maps/geo-map/binding-shp-polylines/src/app/app.component.ts b/samples/maps/geo-map/binding-shp-polylines/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/binding-shp-polylines/src/app/app.component.ts
rename to samples/maps/geo-map/binding-shp-polylines/src/app.component.ts
diff --git a/samples/maps/geo-map/binding-shp-polylines/src/app/app.module.ts b/samples/maps/geo-map/binding-shp-polylines/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/binding-shp-polylines/src/app/app.module.ts
rename to samples/maps/geo-map/binding-shp-polylines/src/app.module.ts
diff --git a/samples/maps/geo-map/binding-shp-polylines/src/main.ts b/samples/maps/geo-map/binding-shp-polylines/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/binding-shp-polylines/src/main.ts
+++ b/samples/maps/geo-map/binding-shp-polylines/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/custom-tooltips/src/app/app.component.html b/samples/maps/geo-map/custom-tooltips/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/custom-tooltips/src/app/app.component.html
rename to samples/maps/geo-map/custom-tooltips/src/app.component.html
diff --git a/samples/maps/geo-map/custom-tooltips/src/app/app.component.scss b/samples/maps/geo-map/custom-tooltips/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/custom-tooltips/src/app/app.component.scss
rename to samples/maps/geo-map/custom-tooltips/src/app.component.scss
diff --git a/samples/maps/geo-map/custom-tooltips/src/app/app.component.ts b/samples/maps/geo-map/custom-tooltips/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/custom-tooltips/src/app/app.component.ts
rename to samples/maps/geo-map/custom-tooltips/src/app.component.ts
diff --git a/samples/maps/geo-map/custom-tooltips/src/app/app.module.ts b/samples/maps/geo-map/custom-tooltips/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/custom-tooltips/src/app/app.module.ts
rename to samples/maps/geo-map/custom-tooltips/src/app.module.ts
diff --git a/samples/maps/geo-map/custom-tooltips/src/main.ts b/samples/maps/geo-map/custom-tooltips/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/custom-tooltips/src/main.ts
+++ b/samples/maps/geo-map/custom-tooltips/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/display-bing-imagery/src/app/MapUtility.ts b/samples/maps/geo-map/display-bing-imagery/src/MapUtility.ts
similarity index 100%
rename from samples/maps/geo-map/display-bing-imagery/src/app/MapUtility.ts
rename to samples/maps/geo-map/display-bing-imagery/src/MapUtility.ts
diff --git a/samples/maps/geo-map/display-bing-imagery/src/app/app.component.html b/samples/maps/geo-map/display-bing-imagery/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/display-bing-imagery/src/app/app.component.html
rename to samples/maps/geo-map/display-bing-imagery/src/app.component.html
diff --git a/samples/maps/geo-map/display-bing-imagery/src/app/app.component.scss b/samples/maps/geo-map/display-bing-imagery/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/display-bing-imagery/src/app/app.component.scss
rename to samples/maps/geo-map/display-bing-imagery/src/app.component.scss
diff --git a/samples/maps/geo-map/display-bing-imagery/src/app/app.component.ts b/samples/maps/geo-map/display-bing-imagery/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/display-bing-imagery/src/app/app.component.ts
rename to samples/maps/geo-map/display-bing-imagery/src/app.component.ts
diff --git a/samples/maps/geo-map/display-bing-imagery/src/app/app.module.ts b/samples/maps/geo-map/display-bing-imagery/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/display-bing-imagery/src/app/app.module.ts
rename to samples/maps/geo-map/display-bing-imagery/src/app.module.ts
diff --git a/samples/maps/geo-map/display-bing-imagery/src/main.ts b/samples/maps/geo-map/display-bing-imagery/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/display-bing-imagery/src/main.ts
+++ b/samples/maps/geo-map/display-bing-imagery/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/display-esri-imagery/src/app/EsriUtility.ts b/samples/maps/geo-map/display-esri-imagery/src/EsriUtility.ts
similarity index 100%
rename from samples/maps/geo-map/display-esri-imagery/src/app/EsriUtility.ts
rename to samples/maps/geo-map/display-esri-imagery/src/EsriUtility.ts
diff --git a/samples/maps/geo-map/display-esri-imagery/src/app/app.component.html b/samples/maps/geo-map/display-esri-imagery/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/display-esri-imagery/src/app/app.component.html
rename to samples/maps/geo-map/display-esri-imagery/src/app.component.html
diff --git a/samples/maps/geo-map/display-esri-imagery/src/app/app.component.scss b/samples/maps/geo-map/display-esri-imagery/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/display-esri-imagery/src/app/app.component.scss
rename to samples/maps/geo-map/display-esri-imagery/src/app.component.scss
diff --git a/samples/maps/geo-map/display-esri-imagery/src/app/app.component.ts b/samples/maps/geo-map/display-esri-imagery/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/display-esri-imagery/src/app/app.component.ts
rename to samples/maps/geo-map/display-esri-imagery/src/app.component.ts
diff --git a/samples/maps/geo-map/display-esri-imagery/src/app/app.module.ts b/samples/maps/geo-map/display-esri-imagery/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/display-esri-imagery/src/app/app.module.ts
rename to samples/maps/geo-map/display-esri-imagery/src/app.module.ts
diff --git a/samples/maps/geo-map/display-esri-imagery/src/main.ts b/samples/maps/geo-map/display-esri-imagery/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/display-esri-imagery/src/main.ts
+++ b/samples/maps/geo-map/display-esri-imagery/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/display-heat-imagery/src/app/HeatmapWorker.ts b/samples/maps/geo-map/display-heat-imagery/src/HeatmapWorker.ts
similarity index 100%
rename from samples/maps/geo-map/display-heat-imagery/src/app/HeatmapWorker.ts
rename to samples/maps/geo-map/display-heat-imagery/src/HeatmapWorker.ts
diff --git a/samples/maps/geo-map/display-heat-imagery/src/app/app.component.html b/samples/maps/geo-map/display-heat-imagery/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/display-heat-imagery/src/app/app.component.html
rename to samples/maps/geo-map/display-heat-imagery/src/app.component.html
diff --git a/samples/maps/geo-map/display-heat-imagery/src/app/app.component.scss b/samples/maps/geo-map/display-heat-imagery/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/display-heat-imagery/src/app/app.component.scss
rename to samples/maps/geo-map/display-heat-imagery/src/app.component.scss
diff --git a/samples/maps/geo-map/display-heat-imagery/src/app/app.component.ts b/samples/maps/geo-map/display-heat-imagery/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/display-heat-imagery/src/app/app.component.ts
rename to samples/maps/geo-map/display-heat-imagery/src/app.component.ts
diff --git a/samples/maps/geo-map/display-heat-imagery/src/app/app.module.ts b/samples/maps/geo-map/display-heat-imagery/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/display-heat-imagery/src/app/app.module.ts
rename to samples/maps/geo-map/display-heat-imagery/src/app.module.ts
diff --git a/samples/maps/geo-map/display-heat-imagery/src/main.ts b/samples/maps/geo-map/display-heat-imagery/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/display-heat-imagery/src/main.ts
+++ b/samples/maps/geo-map/display-heat-imagery/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/display-osm-imagery/src/app/app.component.html b/samples/maps/geo-map/display-osm-imagery/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/display-osm-imagery/src/app/app.component.html
rename to samples/maps/geo-map/display-osm-imagery/src/app.component.html
diff --git a/samples/maps/geo-map/display-osm-imagery/src/app/app.component.scss b/samples/maps/geo-map/display-osm-imagery/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/display-osm-imagery/src/app/app.component.scss
rename to samples/maps/geo-map/display-osm-imagery/src/app.component.scss
diff --git a/samples/maps/geo-map/display-osm-imagery/src/app/app.component.ts b/samples/maps/geo-map/display-osm-imagery/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/display-osm-imagery/src/app/app.component.ts
rename to samples/maps/geo-map/display-osm-imagery/src/app.component.ts
diff --git a/samples/maps/geo-map/display-osm-imagery/src/app/app.module.ts b/samples/maps/geo-map/display-osm-imagery/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/display-osm-imagery/src/app/app.module.ts
rename to samples/maps/geo-map/display-osm-imagery/src/app.module.ts
diff --git a/samples/maps/geo-map/display-osm-imagery/src/main.ts b/samples/maps/geo-map/display-osm-imagery/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/display-osm-imagery/src/main.ts
+++ b/samples/maps/geo-map/display-osm-imagery/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/marker-layouts/src/app/WorldLocations.ts b/samples/maps/geo-map/marker-layouts/src/WorldLocations.ts
similarity index 100%
rename from samples/maps/geo-map/marker-layouts/src/app/WorldLocations.ts
rename to samples/maps/geo-map/marker-layouts/src/WorldLocations.ts
diff --git a/samples/maps/geo-map/marker-layouts/src/app/app.component.html b/samples/maps/geo-map/marker-layouts/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/marker-layouts/src/app/app.component.html
rename to samples/maps/geo-map/marker-layouts/src/app.component.html
diff --git a/samples/maps/geo-map/marker-layouts/src/app/app.component.scss b/samples/maps/geo-map/marker-layouts/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/marker-layouts/src/app/app.component.scss
rename to samples/maps/geo-map/marker-layouts/src/app.component.scss
diff --git a/samples/maps/geo-map/marker-layouts/src/app/app.component.ts b/samples/maps/geo-map/marker-layouts/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/marker-layouts/src/app/app.component.ts
rename to samples/maps/geo-map/marker-layouts/src/app.component.ts
diff --git a/samples/maps/geo-map/marker-layouts/src/app/app.module.ts b/samples/maps/geo-map/marker-layouts/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/marker-layouts/src/app/app.module.ts
rename to samples/maps/geo-map/marker-layouts/src/app.module.ts
diff --git a/samples/maps/geo-map/marker-layouts/src/main.ts b/samples/maps/geo-map/marker-layouts/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/marker-layouts/src/main.ts
+++ b/samples/maps/geo-map/marker-layouts/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/marker-template/src/app/WorldLocations.ts b/samples/maps/geo-map/marker-template/src/WorldLocations.ts
similarity index 100%
rename from samples/maps/geo-map/marker-template/src/app/WorldLocations.ts
rename to samples/maps/geo-map/marker-template/src/WorldLocations.ts
diff --git a/samples/maps/geo-map/marker-template/src/app/app.component.html b/samples/maps/geo-map/marker-template/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/marker-template/src/app/app.component.html
rename to samples/maps/geo-map/marker-template/src/app.component.html
diff --git a/samples/maps/geo-map/marker-template/src/app/app.component.scss b/samples/maps/geo-map/marker-template/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/marker-template/src/app/app.component.scss
rename to samples/maps/geo-map/marker-template/src/app.component.scss
diff --git a/samples/maps/geo-map/marker-template/src/app/app.component.ts b/samples/maps/geo-map/marker-template/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/marker-template/src/app/app.component.ts
rename to samples/maps/geo-map/marker-template/src/app.component.ts
diff --git a/samples/maps/geo-map/marker-template/src/app/app.module.ts b/samples/maps/geo-map/marker-template/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/marker-template/src/app/app.module.ts
rename to samples/maps/geo-map/marker-template/src/app.module.ts
diff --git a/samples/maps/geo-map/marker-template/src/main.ts b/samples/maps/geo-map/marker-template/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/marker-template/src/main.ts
+++ b/samples/maps/geo-map/marker-template/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/marker-type/src/app/WorldLocations.ts b/samples/maps/geo-map/marker-type/src/WorldLocations.ts
similarity index 100%
rename from samples/maps/geo-map/marker-type/src/app/WorldLocations.ts
rename to samples/maps/geo-map/marker-type/src/WorldLocations.ts
diff --git a/samples/maps/geo-map/marker-type/src/app/app.component.html b/samples/maps/geo-map/marker-type/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/marker-type/src/app/app.component.html
rename to samples/maps/geo-map/marker-type/src/app.component.html
diff --git a/samples/maps/geo-map/marker-type/src/app/app.component.scss b/samples/maps/geo-map/marker-type/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/marker-type/src/app/app.component.scss
rename to samples/maps/geo-map/marker-type/src/app.component.scss
diff --git a/samples/maps/geo-map/marker-type/src/app/app.component.ts b/samples/maps/geo-map/marker-type/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/marker-type/src/app/app.component.ts
rename to samples/maps/geo-map/marker-type/src/app.component.ts
diff --git a/samples/maps/geo-map/marker-type/src/app/app.module.ts b/samples/maps/geo-map/marker-type/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/marker-type/src/app/app.module.ts
rename to samples/maps/geo-map/marker-type/src/app.module.ts
diff --git a/samples/maps/geo-map/marker-type/src/main.ts b/samples/maps/geo-map/marker-type/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/marker-type/src/main.ts
+++ b/samples/maps/geo-map/marker-type/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/navigation/src/app/EsriUtility.ts b/samples/maps/geo-map/navigation/src/EsriUtility.ts
similarity index 100%
rename from samples/maps/geo-map/navigation/src/app/EsriUtility.ts
rename to samples/maps/geo-map/navigation/src/EsriUtility.ts
diff --git a/samples/maps/geo-map/navigation/src/app/MapUtility.ts b/samples/maps/geo-map/navigation/src/MapUtility.ts
similarity index 100%
rename from samples/maps/geo-map/navigation/src/app/MapUtility.ts
rename to samples/maps/geo-map/navigation/src/MapUtility.ts
diff --git a/samples/maps/geo-map/navigation/src/app/WorldUtility.ts b/samples/maps/geo-map/navigation/src/WorldUtility.ts
similarity index 100%
rename from samples/maps/geo-map/navigation/src/app/WorldUtility.ts
rename to samples/maps/geo-map/navigation/src/WorldUtility.ts
diff --git a/samples/maps/geo-map/navigation/src/app/app.component.html b/samples/maps/geo-map/navigation/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/navigation/src/app/app.component.html
rename to samples/maps/geo-map/navigation/src/app.component.html
diff --git a/samples/maps/geo-map/navigation/src/app/app.component.scss b/samples/maps/geo-map/navigation/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/navigation/src/app/app.component.scss
rename to samples/maps/geo-map/navigation/src/app.component.scss
diff --git a/samples/maps/geo-map/navigation/src/app/app.component.ts b/samples/maps/geo-map/navigation/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/navigation/src/app/app.component.ts
rename to samples/maps/geo-map/navigation/src/app.component.ts
diff --git a/samples/maps/geo-map/navigation/src/app/app.module.ts b/samples/maps/geo-map/navigation/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/navigation/src/app/app.module.ts
rename to samples/maps/geo-map/navigation/src/app.module.ts
diff --git a/samples/maps/geo-map/navigation/src/main.ts b/samples/maps/geo-map/navigation/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/navigation/src/main.ts
+++ b/samples/maps/geo-map/navigation/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/overview/src/app/app.component.html b/samples/maps/geo-map/overview/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/overview/src/app/app.component.html
rename to samples/maps/geo-map/overview/src/app.component.html
diff --git a/samples/maps/geo-map/overview/src/app/app.component.scss b/samples/maps/geo-map/overview/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/overview/src/app/app.component.scss
rename to samples/maps/geo-map/overview/src/app.component.scss
diff --git a/samples/maps/geo-map/overview/src/app/app.component.ts b/samples/maps/geo-map/overview/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/overview/src/app/app.component.ts
rename to samples/maps/geo-map/overview/src/app.component.ts
diff --git a/samples/maps/geo-map/overview/src/app/app.module.ts b/samples/maps/geo-map/overview/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/overview/src/app/app.module.ts
rename to samples/maps/geo-map/overview/src/app.module.ts
diff --git a/samples/maps/geo-map/overview/src/main.ts b/samples/maps/geo-map/overview/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/overview/src/main.ts
+++ b/samples/maps/geo-map/overview/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/shape-styling/src/app/app.component.html b/samples/maps/geo-map/shape-styling/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/shape-styling/src/app/app.component.html
rename to samples/maps/geo-map/shape-styling/src/app.component.html
diff --git a/samples/maps/geo-map/shape-styling/src/app/app.component.scss b/samples/maps/geo-map/shape-styling/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/shape-styling/src/app/app.component.scss
rename to samples/maps/geo-map/shape-styling/src/app.component.scss
diff --git a/samples/maps/geo-map/shape-styling/src/app/app.component.ts b/samples/maps/geo-map/shape-styling/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/shape-styling/src/app/app.component.ts
rename to samples/maps/geo-map/shape-styling/src/app.component.ts
diff --git a/samples/maps/geo-map/shape-styling/src/app/app.module.ts b/samples/maps/geo-map/shape-styling/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/shape-styling/src/app/app.module.ts
rename to samples/maps/geo-map/shape-styling/src/app.module.ts
diff --git a/samples/maps/geo-map/shape-styling/src/main.ts b/samples/maps/geo-map/shape-styling/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/shape-styling/src/main.ts
+++ b/samples/maps/geo-map/shape-styling/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/triangulating-data/src/app/app.component.html b/samples/maps/geo-map/triangulating-data/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/triangulating-data/src/app/app.component.html
rename to samples/maps/geo-map/triangulating-data/src/app.component.html
diff --git a/samples/maps/geo-map/triangulating-data/src/app/app.component.scss b/samples/maps/geo-map/triangulating-data/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/triangulating-data/src/app/app.component.scss
rename to samples/maps/geo-map/triangulating-data/src/app.component.scss
diff --git a/samples/maps/geo-map/triangulating-data/src/app/app.component.ts b/samples/maps/geo-map/triangulating-data/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/triangulating-data/src/app/app.component.ts
rename to samples/maps/geo-map/triangulating-data/src/app.component.ts
diff --git a/samples/maps/geo-map/triangulating-data/src/app/app.module.ts b/samples/maps/geo-map/triangulating-data/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/triangulating-data/src/app/app.module.ts
rename to samples/maps/geo-map/triangulating-data/src/app.module.ts
diff --git a/samples/maps/geo-map/triangulating-data/src/main.ts b/samples/maps/geo-map/triangulating-data/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/triangulating-data/src/main.ts
+++ b/samples/maps/geo-map/triangulating-data/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/type-scatter-area-series/src/app/app.component.html b/samples/maps/geo-map/type-scatter-area-series/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/type-scatter-area-series/src/app/app.component.html
rename to samples/maps/geo-map/type-scatter-area-series/src/app.component.html
diff --git a/samples/maps/geo-map/type-scatter-area-series/src/app/app.component.scss b/samples/maps/geo-map/type-scatter-area-series/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/type-scatter-area-series/src/app/app.component.scss
rename to samples/maps/geo-map/type-scatter-area-series/src/app.component.scss
diff --git a/samples/maps/geo-map/type-scatter-area-series/src/app/app.component.ts b/samples/maps/geo-map/type-scatter-area-series/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/type-scatter-area-series/src/app/app.component.ts
rename to samples/maps/geo-map/type-scatter-area-series/src/app.component.ts
diff --git a/samples/maps/geo-map/type-scatter-area-series/src/app/app.module.ts b/samples/maps/geo-map/type-scatter-area-series/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/type-scatter-area-series/src/app/app.module.ts
rename to samples/maps/geo-map/type-scatter-area-series/src/app.module.ts
diff --git a/samples/maps/geo-map/type-scatter-area-series/src/main.ts b/samples/maps/geo-map/type-scatter-area-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/type-scatter-area-series/src/main.ts
+++ b/samples/maps/geo-map/type-scatter-area-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/type-scatter-bubble-series/src/app/WorldLocations.ts b/samples/maps/geo-map/type-scatter-bubble-series/src/WorldLocations.ts
similarity index 100%
rename from samples/maps/geo-map/type-scatter-bubble-series/src/app/WorldLocations.ts
rename to samples/maps/geo-map/type-scatter-bubble-series/src/WorldLocations.ts
diff --git a/samples/maps/geo-map/type-scatter-bubble-series/src/app/app.component.html b/samples/maps/geo-map/type-scatter-bubble-series/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/type-scatter-bubble-series/src/app/app.component.html
rename to samples/maps/geo-map/type-scatter-bubble-series/src/app.component.html
diff --git a/samples/maps/geo-map/type-scatter-bubble-series/src/app/app.component.scss b/samples/maps/geo-map/type-scatter-bubble-series/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/type-scatter-bubble-series/src/app/app.component.scss
rename to samples/maps/geo-map/type-scatter-bubble-series/src/app.component.scss
diff --git a/samples/maps/geo-map/type-scatter-bubble-series/src/app/app.component.ts b/samples/maps/geo-map/type-scatter-bubble-series/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/type-scatter-bubble-series/src/app/app.component.ts
rename to samples/maps/geo-map/type-scatter-bubble-series/src/app.component.ts
diff --git a/samples/maps/geo-map/type-scatter-bubble-series/src/app/app.module.ts b/samples/maps/geo-map/type-scatter-bubble-series/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/type-scatter-bubble-series/src/app/app.module.ts
rename to samples/maps/geo-map/type-scatter-bubble-series/src/app.module.ts
diff --git a/samples/maps/geo-map/type-scatter-bubble-series/src/main.ts b/samples/maps/geo-map/type-scatter-bubble-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/type-scatter-bubble-series/src/main.ts
+++ b/samples/maps/geo-map/type-scatter-bubble-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/type-scatter-contour-series/src/app/app.component.html b/samples/maps/geo-map/type-scatter-contour-series/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/type-scatter-contour-series/src/app/app.component.html
rename to samples/maps/geo-map/type-scatter-contour-series/src/app.component.html
diff --git a/samples/maps/geo-map/type-scatter-contour-series/src/app/app.component.scss b/samples/maps/geo-map/type-scatter-contour-series/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/type-scatter-contour-series/src/app/app.component.scss
rename to samples/maps/geo-map/type-scatter-contour-series/src/app.component.scss
diff --git a/samples/maps/geo-map/type-scatter-contour-series/src/app/app.component.ts b/samples/maps/geo-map/type-scatter-contour-series/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/type-scatter-contour-series/src/app/app.component.ts
rename to samples/maps/geo-map/type-scatter-contour-series/src/app.component.ts
diff --git a/samples/maps/geo-map/type-scatter-contour-series/src/app/app.module.ts b/samples/maps/geo-map/type-scatter-contour-series/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/type-scatter-contour-series/src/app/app.module.ts
rename to samples/maps/geo-map/type-scatter-contour-series/src/app.module.ts
diff --git a/samples/maps/geo-map/type-scatter-contour-series/src/main.ts b/samples/maps/geo-map/type-scatter-contour-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/type-scatter-contour-series/src/main.ts
+++ b/samples/maps/geo-map/type-scatter-contour-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/type-scatter-density-series/src/app/WorldUtility.ts b/samples/maps/geo-map/type-scatter-density-series/src/WorldUtility.ts
similarity index 100%
rename from samples/maps/geo-map/type-scatter-density-series/src/app/WorldUtility.ts
rename to samples/maps/geo-map/type-scatter-density-series/src/WorldUtility.ts
diff --git a/samples/maps/geo-map/type-scatter-density-series/src/app/app.component.html b/samples/maps/geo-map/type-scatter-density-series/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/type-scatter-density-series/src/app/app.component.html
rename to samples/maps/geo-map/type-scatter-density-series/src/app.component.html
diff --git a/samples/maps/geo-map/type-scatter-density-series/src/app/app.component.scss b/samples/maps/geo-map/type-scatter-density-series/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/type-scatter-density-series/src/app/app.component.scss
rename to samples/maps/geo-map/type-scatter-density-series/src/app.component.scss
diff --git a/samples/maps/geo-map/type-scatter-density-series/src/app/app.component.ts b/samples/maps/geo-map/type-scatter-density-series/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/type-scatter-density-series/src/app/app.component.ts
rename to samples/maps/geo-map/type-scatter-density-series/src/app.component.ts
diff --git a/samples/maps/geo-map/type-scatter-density-series/src/app/app.module.ts b/samples/maps/geo-map/type-scatter-density-series/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/type-scatter-density-series/src/app/app.module.ts
rename to samples/maps/geo-map/type-scatter-density-series/src/app.module.ts
diff --git a/samples/maps/geo-map/type-scatter-density-series/src/main.ts b/samples/maps/geo-map/type-scatter-density-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/type-scatter-density-series/src/main.ts
+++ b/samples/maps/geo-map/type-scatter-density-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/type-scatter-symbol-series/src/app/WorldLocations.ts b/samples/maps/geo-map/type-scatter-symbol-series/src/WorldLocations.ts
similarity index 100%
rename from samples/maps/geo-map/type-scatter-symbol-series/src/app/WorldLocations.ts
rename to samples/maps/geo-map/type-scatter-symbol-series/src/WorldLocations.ts
diff --git a/samples/maps/geo-map/type-scatter-symbol-series/src/app/app.component.html b/samples/maps/geo-map/type-scatter-symbol-series/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/type-scatter-symbol-series/src/app/app.component.html
rename to samples/maps/geo-map/type-scatter-symbol-series/src/app.component.html
diff --git a/samples/maps/geo-map/type-scatter-symbol-series/src/app/app.component.scss b/samples/maps/geo-map/type-scatter-symbol-series/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/type-scatter-symbol-series/src/app/app.component.scss
rename to samples/maps/geo-map/type-scatter-symbol-series/src/app.component.scss
diff --git a/samples/maps/geo-map/type-scatter-symbol-series/src/app/app.component.ts b/samples/maps/geo-map/type-scatter-symbol-series/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/type-scatter-symbol-series/src/app/app.component.ts
rename to samples/maps/geo-map/type-scatter-symbol-series/src/app.component.ts
diff --git a/samples/maps/geo-map/type-scatter-symbol-series/src/app/app.module.ts b/samples/maps/geo-map/type-scatter-symbol-series/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/type-scatter-symbol-series/src/app/app.module.ts
rename to samples/maps/geo-map/type-scatter-symbol-series/src/app.module.ts
diff --git a/samples/maps/geo-map/type-scatter-symbol-series/src/main.ts b/samples/maps/geo-map/type-scatter-symbol-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/type-scatter-symbol-series/src/main.ts
+++ b/samples/maps/geo-map/type-scatter-symbol-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/type-shape-polygon-series/src/app/app.component.html b/samples/maps/geo-map/type-shape-polygon-series/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/type-shape-polygon-series/src/app/app.component.html
rename to samples/maps/geo-map/type-shape-polygon-series/src/app.component.html
diff --git a/samples/maps/geo-map/type-shape-polygon-series/src/app/app.component.scss b/samples/maps/geo-map/type-shape-polygon-series/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/type-shape-polygon-series/src/app/app.component.scss
rename to samples/maps/geo-map/type-shape-polygon-series/src/app.component.scss
diff --git a/samples/maps/geo-map/type-shape-polygon-series/src/app/app.component.ts b/samples/maps/geo-map/type-shape-polygon-series/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/type-shape-polygon-series/src/app/app.component.ts
rename to samples/maps/geo-map/type-shape-polygon-series/src/app.component.ts
diff --git a/samples/maps/geo-map/type-shape-polygon-series/src/app/app.module.ts b/samples/maps/geo-map/type-shape-polygon-series/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/type-shape-polygon-series/src/app/app.module.ts
rename to samples/maps/geo-map/type-shape-polygon-series/src/app.module.ts
diff --git a/samples/maps/geo-map/type-shape-polygon-series/src/main.ts b/samples/maps/geo-map/type-shape-polygon-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/type-shape-polygon-series/src/main.ts
+++ b/samples/maps/geo-map/type-shape-polygon-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.
diff --git a/samples/maps/geo-map/type-shape-polyline-series/src/app/app.component.html b/samples/maps/geo-map/type-shape-polyline-series/src/app.component.html
similarity index 100%
rename from samples/maps/geo-map/type-shape-polyline-series/src/app/app.component.html
rename to samples/maps/geo-map/type-shape-polyline-series/src/app.component.html
diff --git a/samples/maps/geo-map/type-shape-polyline-series/src/app/app.component.scss b/samples/maps/geo-map/type-shape-polyline-series/src/app.component.scss
similarity index 100%
rename from samples/maps/geo-map/type-shape-polyline-series/src/app/app.component.scss
rename to samples/maps/geo-map/type-shape-polyline-series/src/app.component.scss
diff --git a/samples/maps/geo-map/type-shape-polyline-series/src/app/app.component.ts b/samples/maps/geo-map/type-shape-polyline-series/src/app.component.ts
similarity index 100%
rename from samples/maps/geo-map/type-shape-polyline-series/src/app/app.component.ts
rename to samples/maps/geo-map/type-shape-polyline-series/src/app.component.ts
diff --git a/samples/maps/geo-map/type-shape-polyline-series/src/app/app.module.ts b/samples/maps/geo-map/type-shape-polyline-series/src/app.module.ts
similarity index 100%
rename from samples/maps/geo-map/type-shape-polyline-series/src/app/app.module.ts
rename to samples/maps/geo-map/type-shape-polyline-series/src/app.module.ts
diff --git a/samples/maps/geo-map/type-shape-polyline-series/src/main.ts b/samples/maps/geo-map/type-shape-polyline-series/src/main.ts
index 8b0ce4164..ec9adcd4a 100644
--- a/samples/maps/geo-map/type-shape-polyline-series/src/main.ts
+++ b/samples/maps/geo-map/type-shape-polyline-series/src/main.ts
@@ -2,7 +2,7 @@
 import "./polyfills";
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { AppModule } from "./app/app.module";
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {
   // ensure Angular destroys itself on hot reloads.