diff --git a/.dockerignore b/.dockerignore
index ac71744..bf899ce 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -11,7 +11,7 @@ LICENSE
 .vscode
 
 # SilverStripe auto-generated content
-Website/silverstripe-cache/
-Website/vendor/
-Website/resources/
-Website/public/resources/
\ No newline at end of file
+/silverstripe-cache/
+/vendor/
+/resources/
+/public/resources/
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index a67d42b..df2914a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,10 @@ composer.phar
 # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
 # composer.lock
+
+# SvilerStripe files
+/silverstripe-cache/
+/vendor/
+/themes/simple/
+/resources/
+/public/resources/
diff --git a/Website/.htaccess b/.htaccess
similarity index 100%
rename from Website/.htaccess
rename to .htaccess
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 068d599..bbe2925 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,10 +4,10 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "Lint Website",
+            "label": "Lint PHP-Code",
             "type": "shell",
             "options": {
-                "cwd": "${workspaceFolder}/Website"
+                "cwd": "${workspaceFolder}"
             },
             "command": "composer",
             "args": [
diff --git a/Dockerfile b/Dockerfile
index f510584..1134a3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,7 +33,7 @@ RUN docker-php-ext-enable \
 ADD https://getcomposer.org/installer composer-setup.php
 RUN php composer-setup.php
 RUN mv composer.phar /usr/local/bin/composer
-COPY --chown=www-data:www-data ./Website/composer.* ./
+COPY --chown=www-data:www-data ./composer.* ./
 RUN sudo -u www-data mkdir public
 RUN sudo -u www-data composer install
 
@@ -41,5 +41,5 @@ COPY --chown=www-data:www-data .docker/.env .env
 
 COPY .docker/xdebug.ini $PHP_INI_DIR/conf.d/
 COPY .docker/date.ini $PHP_INI_DIR/conf.d/
-COPY --chown=www-data:www-data ./Website/ ./
+COPY --chown=www-data:www-data ./ ./
 RUN sudo -u www-data composer vendor-expose
diff --git a/Website/.gitignore b/Website/.gitignore
deleted file mode 100644
index 1dff294..0000000
--- a/Website/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/silverstripe-cache/
-/.env
-/vendor/
-/themes/simple/
-/resources/
-/public/resources/
diff --git a/Website/app/.htaccess b/app/.htaccess
similarity index 100%
rename from Website/app/.htaccess
rename to app/.htaccess
diff --git a/Website/app/_config.php b/app/_config.php
similarity index 100%
rename from Website/app/_config.php
rename to app/_config.php
diff --git a/Website/app/_config/mysite.yml b/app/_config/mysite.yml
similarity index 100%
rename from Website/app/_config/mysite.yml
rename to app/_config/mysite.yml
diff --git a/Website/app/_config/theme.yml b/app/_config/theme.yml
similarity index 100%
rename from Website/app/_config/theme.yml
rename to app/_config/theme.yml
diff --git a/Website/app/src/Page.php b/app/src/Page.php
similarity index 100%
rename from Website/app/src/Page.php
rename to app/src/Page.php
diff --git a/Website/app/src/PageController.php b/app/src/PageController.php
similarity index 100%
rename from Website/app/src/PageController.php
rename to app/src/PageController.php
diff --git a/Website/composer.json b/composer.json
similarity index 100%
rename from Website/composer.json
rename to composer.json
diff --git a/Website/composer.lock b/composer.lock
similarity index 100%
rename from Website/composer.lock
rename to composer.lock
diff --git a/Website/phpcs.xml.dist b/phpcs.xml.dist
similarity index 100%
rename from Website/phpcs.xml.dist
rename to phpcs.xml.dist
diff --git a/Website/public/.htaccess b/public/.htaccess
similarity index 100%
rename from Website/public/.htaccess
rename to public/.htaccess
diff --git a/Website/public/assets/.gitignore b/public/assets/.gitignore
similarity index 100%
rename from Website/public/assets/.gitignore
rename to public/assets/.gitignore
diff --git a/Website/public/assets/.htaccess b/public/assets/.htaccess
similarity index 100%
rename from Website/public/assets/.htaccess
rename to public/assets/.htaccess
diff --git a/Website/public/favicon.ico b/public/favicon.ico
similarity index 100%
rename from Website/public/favicon.ico
rename to public/favicon.ico
diff --git a/Website/public/index.php b/public/index.php
similarity index 100%
rename from Website/public/index.php
rename to public/index.php
diff --git a/Website/public/install-frameworkmissing.html b/public/install-frameworkmissing.html
similarity index 100%
rename from Website/public/install-frameworkmissing.html
rename to public/install-frameworkmissing.html
diff --git a/Website/public/install.php b/public/install.php
similarity index 100%
rename from Website/public/install.php
rename to public/install.php
diff --git a/scripts/install.sh b/scripts/install.sh
index 5a84229..a2505ca 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -8,11 +8,15 @@ find $sourceDir \
     -name "*" -and \
     -not \( \
         \( \
-            -path "Website"
+            -path "$sourceDir/app" \
+            -path "$sourceDir/public" \
+            -path "$sourceDir/vendor" \
+            -path "$sourceDir/themes" \
         \) \
         -prune \
     \) -and \
-    -not -name ".env" \
+    -not -name ".env" -and \
+    -not -name ".htaccess" \
     -print
 
 rsync -a --delete $sourceDir $tempDir