diff --git a/.travis.yml b/.travis.yml
index 6ab3d3a..9a46b2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,8 @@ before_install:
   - echo "TRAVIS_PULL_REQUEST_BRANCH:$TRAVIS_PULL_REQUEST_BRANCH"
   - echo "TRAVIS_TAG:$TRAVIS_TAG"
   - nvm install 10
-  - npm i -g firebase-tools@7.8.1 @angular/cli@8.3.19 selenium-webdriver @commitlint/travis-cli
 install:
-  - npm i -g ncp del-cli @compodoc/compodoc
+  - npm i -g firebase-tools@7.8.1 @angular/cli@8.3.19 selenium-webdriver @commitlint/travis-cli ncp del-cli @compodoc/compodoc
   - npm install
   - cd functions && npm install && cd ..
 before_script:
diff --git a/angular.json b/angular.json
index 0df6bae..6ebaf94 100644
--- a/angular.json
+++ b/angular.json
@@ -41,12 +41,9 @@
                 {
                   "replace": "src/manifest.json",
                   "with": "src/environments/manifest.en.json"
-                },
-                {
-                  "replace": "src/index.html",
-                  "with": "src/environments/index.en.html"
                 }
-              ]
+              ],
+              "index": "src/environments/en/index.html"
             },
             "tr": {
               "aot": true,
@@ -60,12 +57,9 @@
                 {
                   "replace": "src/manifest.json",
                   "with": "src/environments/manifest.tr.json"
-                },
-                {
-                  "replace": "src/index.html",
-                  "with": "src/environments/index.tr.html"
                 }
-              ]
+              ],
+              "index": "src/environments/tr/index.html"
             },
             "beta": {
               "optimization": true,
@@ -103,10 +97,6 @@
                 {
                   "replace": "src/manifest.json",
                   "with": "src/environments/manifest.en.beta.json"
-                },
-                {
-                  "replace": "src/index.html",
-                  "with": "src/environments/index.en.beta.html"
                 }
               ],
               "serviceWorker": true,
@@ -115,7 +105,8 @@
               "i18nFile": "src/locale/messages.en.xlf",
               "i18nFormat": "xlf",
               "i18nLocale": "en-US",
-              "i18nMissingTranslation": "error"
+              "i18nMissingTranslation": "error",
+              "index": "src/environments/en/beta/index.html"
             },
             "beta-tr": {
               "optimization": true,
@@ -135,10 +126,6 @@
                 {
                   "replace": "src/manifest.json",
                   "with": "src/environments/manifest.tr.beta.json"
-                },
-                {
-                  "replace": "src/index.html",
-                  "with": "src/environments/index.tr.beta.html"
                 }
               ],
               "serviceWorker": true,
@@ -147,7 +134,8 @@
               "i18nFile": "src/locale/messages.tr.xlf",
               "i18nFormat": "xlf",
               "i18nLocale": "tr-TR",
-              "i18nMissingTranslation": "error"
+              "i18nMissingTranslation": "error",
+              "index": "src/environments/tr/beta/index.html"
             },
             "production": {
               "optimization": true,
@@ -185,10 +173,6 @@
                 {
                   "replace": "src/manifest.json",
                   "with": "src/environments/manifest.en.prod.json"
-                },
-                {
-                  "replace": "src/index.html",
-                  "with": "src/environments/index.en.prod.html"
                 }
               ],
               "serviceWorker": true,
@@ -197,7 +181,8 @@
               "i18nFile": "src/locale/messages.en.xlf",
               "i18nFormat": "xlf",
               "i18nLocale": "en-US",
-              "i18nMissingTranslation": "error"
+              "i18nMissingTranslation": "error",
+              "index": "src/environments/en/prod/index.html"
             },
             "production-tr": {
               "optimization": true,
@@ -217,10 +202,6 @@
                 {
                   "replace": "src/manifest.json",
                   "with": "src/environments/manifest.tr.prod.json"
-                },
-                {
-                  "replace": "src/index.html",
-                  "with": "src/environments/index.tr.prod.html"
                 }
               ],
               "serviceWorker": true,
@@ -229,7 +210,8 @@
               "i18nFile": "src/locale/messages.tr.xlf",
               "i18nFormat": "xlf",
               "i18nLocale": "tr-TR",
-              "i18nMissingTranslation": "error"
+              "i18nMissingTranslation": "error",
+              "index": "src/environments/tr/prod/index.html"
             }
           }
         },
diff --git a/functions/package.json b/functions/package.json
index 8a71ebe..498c7da 100644
--- a/functions/package.json
+++ b/functions/package.json
@@ -66,6 +66,7 @@
     "@types/jasmine": "~3.5.0",
     "@types/node": "~12.12.12",
     "firebase-functions-test": "^0.1.7",
+    "jasmine": "^3.5.0",
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~4.2.1",
     "jasmine-ts": "^0.3.0",
diff --git a/karma.conf.ts b/karma.conf.ts
index ba6c67e..a1cac86 100644
--- a/karma.conf.ts
+++ b/karma.conf.ts
@@ -19,7 +19,8 @@ module.exports = config => {
             clearContext: false // leave Jasmine Spec Runner output visible in browser
         },
         coverageIstanbulReporter: {
-            dir: require('path').join(__dirname, 'coverage'),
+            dir: require('path')
+                .join(__dirname, 'coverage'),
             reports: ['html', 'lcovonly', 'text-summary', 'json-summary', 'json'],
             fixWebpackSourcePaths: true
         },
diff --git a/src/environments/index.en.beta.html b/src/environments/en/beta/index.html
similarity index 100%
rename from src/environments/index.en.beta.html
rename to src/environments/en/beta/index.html
diff --git a/src/environments/index.en.html b/src/environments/en/index.html
similarity index 100%
rename from src/environments/index.en.html
rename to src/environments/en/index.html
diff --git a/src/environments/index.en.prod.html b/src/environments/en/prod/index.html
similarity index 100%
rename from src/environments/index.en.prod.html
rename to src/environments/en/prod/index.html
diff --git a/src/environments/index.tr.beta.html b/src/environments/tr/beta/index.html
similarity index 100%
rename from src/environments/index.tr.beta.html
rename to src/environments/tr/beta/index.html
diff --git a/src/environments/index.tr.html b/src/environments/tr/index.html
similarity index 100%
rename from src/environments/index.tr.html
rename to src/environments/tr/index.html
diff --git a/src/environments/index.tr.prod.html b/src/environments/tr/prod/index.html
similarity index 100%
rename from src/environments/index.tr.prod.html
rename to src/environments/tr/prod/index.html