diff --git a/angular.json b/angular.json
index 49eb3a4..49f3ea1 100644
--- a/angular.json
+++ b/angular.json
@@ -11,33 +11,28 @@
         }
       },
       "root": "",
-      "sourceRoot": "src",
+      "sourceRoot": "src/angular",
       "prefix": "app",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/electron-angular-quick-start",
-            "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "outputPath": "dist/angular",
+            "index": "src/angular/index.html",
+            "main": "src/angular/main.ts",
+            "polyfills": "src/angular/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
             "aot": true,
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
+            "assets": ["src/angular/favicon.ico", "src/angular/assets"],
+            "styles": ["src/angular/styles.scss"],
             "scripts": []
           },
           "configurations": {
             "production": {
               "fileReplacements": [
                 {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
+                  "replace": "src/angular/environments/environment.ts",
+                  "with": "src/angular/environments/environment.prod.ts"
                 }
               ],
               "optimization": true,
@@ -83,17 +78,12 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
+            "main": "src/angular/test.ts",
+            "polyfills": "src/angular/polyfills.ts",
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
+            "assets": ["src/angular/favicon.ico", "src/angular/assets"],
+            "styles": ["src/angular/styles.scss"],
             "scripts": []
           }
         },
@@ -103,17 +93,15 @@
             "tsConfig": [
               "tsconfig.app.json",
               "tsconfig.spec.json",
-              "e2e/tsconfig.json"
+              "e2e/angular/tsconfig.json"
             ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
           }
         },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
-            "protractorConfig": "e2e/protractor.conf.js",
+            "protractorConfig": "e2e/angular/protractor.conf.js",
             "devServerTarget": "electron-angular-quick-start:serve"
           },
           "configurations": {
@@ -123,6 +111,7 @@
           }
         }
       }
-    }},
+    }
+  },
   "defaultProject": "electron-angular-quick-start"
 }
diff --git a/e2e/angular/protractor.conf.js b/e2e/angular/protractor.conf.js
new file mode 100644
index 0000000..fab6296
--- /dev/null
+++ b/e2e/angular/protractor.conf.js
@@ -0,0 +1,32 @@
+// @ts-check
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+const { SpecReporter } = require("jasmine-spec-reporter");
+
+/**
+ * @type { import("protractor").Config }
+ */
+exports.config = {
+  allScriptsTimeout: 11000,
+  specs: ["./src/**/*.e2e-spec.ts"],
+  capabilities: {
+    browserName: "chrome",
+  },
+  directConnect: true,
+  baseUrl: "http://localhost:4200/",
+  framework: "jasmine",
+  jasmineNodeOpts: {
+    showColors: true,
+    defaultTimeoutInterval: 30000,
+    print: function () {},
+  },
+  onPrepare() {
+    require("ts-node").register({
+      project: require("path").join(__dirname, "./tsconfig.json"),
+    });
+    jasmine
+      .getEnv()
+      .addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+  },
+};
diff --git a/e2e/src/app.e2e-spec.ts b/e2e/angular/src/app.e2e-spec.ts
similarity index 100%
rename from e2e/src/app.e2e-spec.ts
rename to e2e/angular/src/app.e2e-spec.ts
diff --git a/e2e/src/app.po.ts b/e2e/angular/src/app.po.ts
similarity index 100%
rename from e2e/src/app.po.ts
rename to e2e/angular/src/app.po.ts
diff --git a/e2e/tsconfig.json b/e2e/angular/tsconfig.json
similarity index 51%
rename from e2e/tsconfig.json
rename to e2e/angular/tsconfig.json
index 39b800f..8ad53b9 100644
--- a/e2e/tsconfig.json
+++ b/e2e/angular/tsconfig.json
@@ -1,13 +1,9 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",
     "target": "es5",
-    "types": [
-      "jasmine",
-      "jasminewd2",
-      "node"
-    ]
+    "types": ["jasmine", "jasminewd2", "node"]
   }
 }
diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js
deleted file mode 100644
index 7c798cf..0000000
--- a/e2e/protractor.conf.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// @ts-check
-// Protractor configuration file, see link for more information
-// https://github.com/angular/protractor/blob/master/lib/config.ts
-
-const { SpecReporter } = require('jasmine-spec-reporter');
-
-/**
- * @type { import("protractor").Config }
- */
-exports.config = {
-  allScriptsTimeout: 11000,
-  specs: [
-    './src/**/*.e2e-spec.ts'
-  ],
-  capabilities: {
-    browserName: 'chrome'
-  },
-  directConnect: true,
-  baseUrl: 'http://localhost:4200/',
-  framework: 'jasmine',
-  jasmineNodeOpts: {
-    showColors: true,
-    defaultTimeoutInterval: 30000,
-    print: function() {}
-  },
-  onPrepare() {
-    require('ts-node').register({
-      project: require('path').join(__dirname, './tsconfig.json')
-    });
-    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
-  }
-};
\ No newline at end of file
diff --git a/package.json b/package.json
index 6d58cea..4ac5e7c 100644
--- a/package.json
+++ b/package.json
@@ -3,11 +3,11 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve",
-    "build": "ng build",
-    "test": "ng test",
-    "lint": "ng lint",
-    "e2e": "ng e2e"
+    "ng:test": "ng test",
+    "ng:lint": "ng lint",
+    "ng:e2e": "ng e2e",
+    "ng:serve": "ng serve",
+    "ng:build": "ng build --prod --base-href ./"
   },
   "private": true,
   "dependencies": {
diff --git a/src/app/app-routing.module.ts b/src/angular/app/app-routing.module.ts
similarity index 100%
rename from src/app/app-routing.module.ts
rename to src/angular/app/app-routing.module.ts
diff --git a/src/app/app.component.html b/src/angular/app/app.component.html
similarity index 100%
rename from src/app/app.component.html
rename to src/angular/app/app.component.html
diff --git a/src/app/app.component.scss b/src/angular/app/app.component.scss
similarity index 100%
rename from src/app/app.component.scss
rename to src/angular/app/app.component.scss
diff --git a/src/app/app.component.spec.ts b/src/angular/app/app.component.spec.ts
similarity index 100%
rename from src/app/app.component.spec.ts
rename to src/angular/app/app.component.spec.ts
diff --git a/src/app/app.component.ts b/src/angular/app/app.component.ts
similarity index 100%
rename from src/app/app.component.ts
rename to src/angular/app/app.component.ts
diff --git a/src/app/app.module.ts b/src/angular/app/app.module.ts
similarity index 100%
rename from src/app/app.module.ts
rename to src/angular/app/app.module.ts
diff --git a/src/assets/.gitkeep b/src/angular/assets/.gitkeep
similarity index 100%
rename from src/assets/.gitkeep
rename to src/angular/assets/.gitkeep
diff --git a/src/environments/environment.prod.ts b/src/angular/environments/environment.prod.ts
similarity index 100%
rename from src/environments/environment.prod.ts
rename to src/angular/environments/environment.prod.ts
diff --git a/src/environments/environment.ts b/src/angular/environments/environment.ts
similarity index 100%
rename from src/environments/environment.ts
rename to src/angular/environments/environment.ts
diff --git a/src/favicon.ico b/src/angular/favicon.ico
similarity index 100%
rename from src/favicon.ico
rename to src/angular/favicon.ico
diff --git a/src/index.html b/src/angular/index.html
similarity index 100%
rename from src/index.html
rename to src/angular/index.html
diff --git a/src/main.ts b/src/angular/main.ts
similarity index 100%
rename from src/main.ts
rename to src/angular/main.ts
diff --git a/src/polyfills.ts b/src/angular/polyfills.ts
similarity index 100%
rename from src/polyfills.ts
rename to src/angular/polyfills.ts
diff --git a/src/styles.scss b/src/angular/styles.scss
similarity index 100%
rename from src/styles.scss
rename to src/angular/styles.scss
diff --git a/src/test.ts b/src/angular/test.ts
similarity index 100%
rename from src/test.ts
rename to src/angular/test.ts
diff --git a/tsconfig.app.json b/tsconfig.app.json
index f758d98..4154c31 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -4,11 +4,6 @@
     "outDir": "./out-tsc/app",
     "types": []
   },
-  "files": [
-    "src/main.ts",
-    "src/polyfills.ts"
-  ],
-  "include": [
-    "src/**/*.d.ts"
-  ]
+  "files": ["src/angular/main.ts", "src/angular/polyfills.ts"],
+  "include": ["src/angular/**/*.d.ts"]
 }
diff --git a/tsconfig.json b/tsconfig.json
index 8c4ef3b..bfb9c5b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
-    "baseUrl": "./",
+    "baseUrl": "./src/",
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
     "declaration": false,
@@ -11,10 +11,7 @@
     "moduleResolution": "node",
     "importHelpers": true,
     "target": "es2015",
-    "lib": [
-      "es2018",
-      "dom"
-    ]
+    "lib": ["es2018", "dom"]
   },
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
index 6400fde..464bc66 100644
--- a/tsconfig.spec.json
+++ b/tsconfig.spec.json
@@ -2,17 +2,8 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/spec",
-    "types": [
-      "jasmine",
-      "node"
-    ]
+    "types": ["jasmine", "node"]
   },
-  "files": [
-    "src/test.ts",
-    "src/polyfills.ts"
-  ],
-  "include": [
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
-  ]
+  "files": ["src/angular/test.ts", "src/angular/polyfills.ts"],
+  "include": ["src/angular/**/*.spec.ts", "src/angular/**/*.d.ts"]
 }