diff --git a/.bowerrc b/.bowerrc
new file mode 100644
index 00000000..0de6429e
--- /dev/null
+++ b/.bowerrc
@@ -0,0 +1,3 @@
+{
+	"directory": "public/bower_components"
+}
diff --git a/.gitignore b/.gitignore
index 63717e04..f73a575d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/bower_components
+/public/bower_components
 /vendor
 /.release
diff --git a/README.md b/README.md
index d35cd315..8ac67322 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ For now my main focus is on stock management, ERP your fridge!
 Public demo of the latest version → [https://demo.grocy.info](https://demo.grocy.info) 
 
 ## How to install
-Just unpack the [latest release](https://github.com/berrnd/grocy/releases/latest) on your PHP (7.0 or later required) enabled webserver, copy `config-dist.php` to `data/config.php`, edit it to your needs, ensure that the `data` directory is writable and you're ready to go. Alternatively clone this repository and install Composer and Bower dependencies manually.
+Just unpack the [latest release](https://github.com/berrnd/grocy/releases/latest) on your PHP (7.0 or later required) enabled webserver (root is the `/public` directory), copy `config-dist.php` to `data/config.php`, edit it to your needs, ensure that the `data` directory is writable and you're ready to go. Alternatively clone this repository and install Composer and Bower dependencies manually.
 
 If you use nginx as your webserver, please include `try_files $uri /index.php;` in your location block.
 
diff --git a/index.php b/bootstrap.php
similarity index 100%
rename from index.php
rename to bootstrap.php
diff --git a/build.bat b/build.bat
index 09b38c85..61463931 100644
--- a/build.bat
+++ b/build.bat
@@ -9,4 +9,4 @@ for /f "tokens=*" %%a in ('type version.txt') do set version=%%a
 del "%releasePath%\grocy_%version%.zip"
 "build_tools\7za.exe" a -r "%releasePath%\grocy_%version%.zip" "%projectPath%\*" -xr!.* -xr!build_tools -xr!build.bat -xr!composer.json -xr!composer.lock -xr!bower.json -xr!publication_assets
 "build_tools\7za.exe" a -r "%releasePath%\grocy_%version%.zip" "%projectPath%\.htaccess"
-"build_tools\7za.exe" d "%releasePath%\grocy_%version%.zip" data\*.* data\sessions
+"build_tools\7za.exe" d "%releasePath%\grocy_%version%.zip" data\*.* data\sessions data\viewcache\*
diff --git a/views/css/grocy.css b/public/css/grocy.css
similarity index 100%
rename from views/css/grocy.css
rename to public/css/grocy.css
diff --git a/views/img/grocy.png b/public/img/grocy.png
similarity index 100%
rename from views/img/grocy.png
rename to public/img/grocy.png
diff --git a/public/index.php b/public/index.php
new file mode 100644
index 00000000..bf457d54
--- /dev/null
+++ b/public/index.php
@@ -0,0 +1,3 @@
+<?php
+
+require_once __DIR__ . '/../bootstrap.php';
diff --git a/views/js/grocy.js b/public/js/grocy.js
similarity index 100%
rename from views/js/grocy.js
rename to public/js/grocy.js
diff --git a/robots.txt b/public/robots.txt
similarity index 100%
rename from robots.txt
rename to public/robots.txt
diff --git a/views/viewjs/batteries.js b/public/viewjs/batteries.js
similarity index 100%
rename from views/viewjs/batteries.js
rename to public/viewjs/batteries.js
diff --git a/views/viewjs/batteriesoverview.js b/public/viewjs/batteriesoverview.js
similarity index 100%
rename from views/viewjs/batteriesoverview.js
rename to public/viewjs/batteriesoverview.js
diff --git a/views/viewjs/batteryform.js b/public/viewjs/batteryform.js
similarity index 100%
rename from views/viewjs/batteryform.js
rename to public/viewjs/batteryform.js
diff --git a/views/viewjs/batterytracking.js b/public/viewjs/batterytracking.js
similarity index 100%
rename from views/viewjs/batterytracking.js
rename to public/viewjs/batterytracking.js
diff --git a/views/viewjs/consume.js b/public/viewjs/consume.js
similarity index 100%
rename from views/viewjs/consume.js
rename to public/viewjs/consume.js
diff --git a/views/viewjs/habitform.js b/public/viewjs/habitform.js
similarity index 100%
rename from views/viewjs/habitform.js
rename to public/viewjs/habitform.js
diff --git a/views/viewjs/habits.js b/public/viewjs/habits.js
similarity index 100%
rename from views/viewjs/habits.js
rename to public/viewjs/habits.js
diff --git a/views/viewjs/habitsoverview.js b/public/viewjs/habitsoverview.js
similarity index 100%
rename from views/viewjs/habitsoverview.js
rename to public/viewjs/habitsoverview.js
diff --git a/views/viewjs/habittracking.js b/public/viewjs/habittracking.js
similarity index 100%
rename from views/viewjs/habittracking.js
rename to public/viewjs/habittracking.js
diff --git a/views/viewjs/inventory.js b/public/viewjs/inventory.js
similarity index 100%
rename from views/viewjs/inventory.js
rename to public/viewjs/inventory.js
diff --git a/views/viewjs/locationform.js b/public/viewjs/locationform.js
similarity index 100%
rename from views/viewjs/locationform.js
rename to public/viewjs/locationform.js
diff --git a/views/viewjs/locations.js b/public/viewjs/locations.js
similarity index 100%
rename from views/viewjs/locations.js
rename to public/viewjs/locations.js
diff --git a/views/viewjs/login.js b/public/viewjs/login.js
similarity index 100%
rename from views/viewjs/login.js
rename to public/viewjs/login.js
diff --git a/views/viewjs/productform.js b/public/viewjs/productform.js
similarity index 100%
rename from views/viewjs/productform.js
rename to public/viewjs/productform.js
diff --git a/views/viewjs/products.js b/public/viewjs/products.js
similarity index 100%
rename from views/viewjs/products.js
rename to public/viewjs/products.js
diff --git a/views/viewjs/purchase.js b/public/viewjs/purchase.js
similarity index 100%
rename from views/viewjs/purchase.js
rename to public/viewjs/purchase.js
diff --git a/views/viewjs/quantityunitform.js b/public/viewjs/quantityunitform.js
similarity index 100%
rename from views/viewjs/quantityunitform.js
rename to public/viewjs/quantityunitform.js
diff --git a/views/viewjs/quantityunits.js b/public/viewjs/quantityunits.js
similarity index 100%
rename from views/viewjs/quantityunits.js
rename to public/viewjs/quantityunits.js
diff --git a/views/viewjs/shoppinglist.js b/public/viewjs/shoppinglist.js
similarity index 100%
rename from views/viewjs/shoppinglist.js
rename to public/viewjs/shoppinglist.js
diff --git a/views/viewjs/shoppinglistform.js b/public/viewjs/shoppinglistform.js
similarity index 100%
rename from views/viewjs/shoppinglistform.js
rename to public/viewjs/shoppinglistform.js
diff --git a/views/viewjs/stockoverview.js b/public/viewjs/stockoverview.js
similarity index 100%
rename from views/viewjs/stockoverview.js
rename to public/viewjs/stockoverview.js
diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php
index 3d72ce30..3dbde224 100644
--- a/views/layout/default.blade.php
+++ b/views/layout/default.blade.php
@@ -16,7 +16,7 @@ $applicationService = new ApplicationService();
 	<meta name="format-detection" content="telephone=no">
 
 	<meta name="author" content="Bernd Bestel (bernd@berrnd.de)">
-	<link rel="icon" type="image/png" sizes="200x200" href="/views/img/grocy.png">
+	<link rel="icon" type="image/png" sizes="200x200" href="/img/grocy.png">
 
 	<title><?php echo $title; ?> | grocy</title>
 
@@ -30,10 +30,10 @@ $applicationService = new ApplicationService();
 	<link href="/bower_components/tagmanager/tagmanager.css?v=<?php echo $applicationService->GetInstalledVersion(); ?>" rel="stylesheet">
 	<link href="/bower_components/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css?v=<?php echo $applicationService->GetInstalledVersion(); ?>" rel="stylesheet">
 	<link href="/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin.css?v=<?php echo $applicationService->GetInstalledVersion(); ?>" rel="stylesheet">
-	<link href="/views/css/grocy.css?v=<?php echo $applicationService->GetInstalledVersion(); ?>" rel="stylesheet">
+	<link href="/css/grocy.css?v=<?php echo $applicationService->GetInstalledVersion(); ?>" rel="stylesheet">
 
 	<script src="/bower_components/jquery/dist/jquery.min.js?v=<?php echo $applicationService->GetInstalledVersion(); ?>"></script>
-	<script src="/views/js/grocy.js?v=<?php echo $applicationService->GetInstalledVersion(); ?>"></script>
+	<script src="/js/grocy.js?v=<?php echo $applicationService->GetInstalledVersion(); ?>"></script>
 </head>
 
 <body>
@@ -234,8 +234,8 @@ $applicationService = new ApplicationService();
 	<script src="/bower_components/tagmanager/tagmanager.js?v=<?php echo $applicationService->GetInstalledVersion(); ?>"></script>
 	<script src="/bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js?v=<?php echo $applicationService->GetInstalledVersion(); ?>"></script>
 
-	<?php if (file_exists(__DIR__ . '/../../views/viewjs/' . str_replace('.php', '.js', $contentPage))) : ?>
-		<script src="/views/viewjs/<?php echo str_replace('.php', '.js', $contentPage) . '?v=' . $applicationService->GetInstalledVersion(); ?>"></script>
+	<?php if (file_exists(__DIR__ . '/../../public/viewjs/' . str_replace('.php', '.js', $contentPage))) : ?>
+		<script src="/viewjs/<?php echo str_replace('.php', '.js', $contentPage) . '?v=' . $applicationService->GetInstalledVersion(); ?>"></script>
 	<?php endif; ?>
 
 	<?php if (file_exists(__DIR__ . '/../data/add_before_end_body.html')) include __DIR__ . '/../data/add_before_end_body.html' ?>