diff --git a/.gitignore b/.gitignore
index 2a89d38..d5a62f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,20 +22,20 @@ Icon
 .DS_Store
 
 # Temporary files
-/media/*
-!/media/index.html
+/public/media/*
+!/public/media/index.html
 
 # --------------------------------------------------
 # SECURITY
 # --------------------------------------------------
 
 # Accounts
-/site/accounts/*
-!/site/accounts/index.html
+/storage/accounts/*
+!/storage/accounts/index.html
 
 # Cache Files
-/site/cache/*
-!/site/cache/index.html
+/storage/cache/*
+!/storage/cache/index.html
 
 # Configuration files
 /site/config/config.xiaowang.fr.php
@@ -45,5 +45,5 @@ Icon
 /site/config/.license
 
 # Sessions
-/site/sessions/*
-!/site/sessions/index.html
+/storage/sessions/*
+!/storage/sessions/index.html
diff --git a/htdocs b/htdocs
new file mode 120000
index 0000000..d70ebaa
--- /dev/null
+++ b/htdocs
@@ -0,0 +1 @@
+public
\ No newline at end of file
diff --git a/htdocs/.htaccess b/htdocs/.htaccess
deleted file mode 120000
index 79eb93b..0000000
--- a/htdocs/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-.htaccess
\ No newline at end of file
diff --git a/htdocs/assets b/htdocs/assets
deleted file mode 120000
index f40fe05..0000000
--- a/htdocs/assets
+++ /dev/null
@@ -1 +0,0 @@
-assets
\ No newline at end of file
diff --git a/htdocs/content b/htdocs/content
deleted file mode 120000
index 6b584e8..0000000
--- a/htdocs/content
+++ /dev/null
@@ -1 +0,0 @@
-content
\ No newline at end of file
diff --git a/htdocs/index.php b/htdocs/index.php
deleted file mode 120000
index 0012f7d..0000000
--- a/htdocs/index.php
+++ /dev/null
@@ -1 +0,0 @@
-index.php
\ No newline at end of file
diff --git a/htdocs/kirby b/htdocs/kirby
deleted file mode 120000
index 6b29959..0000000
--- a/htdocs/kirby
+++ /dev/null
@@ -1 +0,0 @@
-kirby
\ No newline at end of file
diff --git a/htdocs/media b/htdocs/media
deleted file mode 120000
index 27949aa..0000000
--- a/htdocs/media
+++ /dev/null
@@ -1 +0,0 @@
-media
\ No newline at end of file
diff --git a/htdocs/robots.txt b/htdocs/robots.txt
deleted file mode 120000
index 445383f..0000000
--- a/htdocs/robots.txt
+++ /dev/null
@@ -1 +0,0 @@
-robots.txt
\ No newline at end of file
diff --git a/htdocs/site b/htdocs/site
deleted file mode 120000
index d97e100..0000000
--- a/htdocs/site
+++ /dev/null
@@ -1 +0,0 @@
-site
\ No newline at end of file
diff --git a/htdocs/vendor b/htdocs/vendor
deleted file mode 120000
index 5657f6e..0000000
--- a/htdocs/vendor
+++ /dev/null
@@ -1 +0,0 @@
-vendor
\ No newline at end of file
diff --git a/index.php b/index.php
deleted file mode 100644
index 87ed01d..0000000
--- a/index.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-require 'kirby/bootstrap.php';
-
-echo (new Kirby)->render();
diff --git a/.htaccess b/public/.htaccess
similarity index 100%
rename from .htaccess
rename to public/.htaccess
diff --git a/assets/css/panel.min.css b/public/assets/css/panel.min.css
similarity index 100%
rename from assets/css/panel.min.css
rename to public/assets/css/panel.min.css
diff --git a/assets/css/panel.min.css.map b/public/assets/css/panel.min.css.map
similarity index 100%
rename from assets/css/panel.min.css.map
rename to public/assets/css/panel.min.css.map
diff --git a/assets/css/panel.scss b/public/assets/css/panel.scss
similarity index 100%
rename from assets/css/panel.scss
rename to public/assets/css/panel.scss
diff --git a/assets/css/partials/_animations.scss b/public/assets/css/partials/_animations.scss
similarity index 100%
rename from assets/css/partials/_animations.scss
rename to public/assets/css/partials/_animations.scss
diff --git a/assets/css/partials/_fonts.scss b/public/assets/css/partials/_fonts.scss
similarity index 100%
rename from assets/css/partials/_fonts.scss
rename to public/assets/css/partials/_fonts.scss
diff --git a/assets/css/partials/_minireset.css b/public/assets/css/partials/_minireset.css
similarity index 100%
rename from assets/css/partials/_minireset.css
rename to public/assets/css/partials/_minireset.css
diff --git a/assets/css/partials/_variables.scss b/public/assets/css/partials/_variables.scss
similarity index 100%
rename from assets/css/partials/_variables.scss
rename to public/assets/css/partials/_variables.scss
diff --git a/assets/css/style.min.css b/public/assets/css/style.min.css
similarity index 100%
rename from assets/css/style.min.css
rename to public/assets/css/style.min.css
diff --git a/assets/css/style.min.css.map b/public/assets/css/style.min.css.map
similarity index 100%
rename from assets/css/style.min.css.map
rename to public/assets/css/style.min.css.map
diff --git a/assets/css/style.scss b/public/assets/css/style.scss
similarity index 100%
rename from assets/css/style.scss
rename to public/assets/css/style.scss
diff --git a/assets/favicon/xiao-wang-apple-touch-icon.png b/public/assets/favicon/xiao-wang-apple-touch-icon.png
similarity index 100%
rename from assets/favicon/xiao-wang-apple-touch-icon.png
rename to public/assets/favicon/xiao-wang-apple-touch-icon.png
diff --git a/assets/favicon/xiao-wang-favicon-192px.png b/public/assets/favicon/xiao-wang-favicon-192px.png
similarity index 100%
rename from assets/favicon/xiao-wang-favicon-192px.png
rename to public/assets/favicon/xiao-wang-favicon-192px.png
diff --git a/assets/favicon/xiao-wang-favicon-512px.png b/public/assets/favicon/xiao-wang-favicon-512px.png
similarity index 100%
rename from assets/favicon/xiao-wang-favicon-512px.png
rename to public/assets/favicon/xiao-wang-favicon-512px.png
diff --git a/assets/favicon/xiao-wang-favicon.ico b/public/assets/favicon/xiao-wang-favicon.ico
similarity index 100%
rename from assets/favicon/xiao-wang-favicon.ico
rename to public/assets/favicon/xiao-wang-favicon.ico
diff --git a/assets/favicon/xiao-wang-favicon.svg b/public/assets/favicon/xiao-wang-favicon.svg
similarity index 100%
rename from assets/favicon/xiao-wang-favicon.svg
rename to public/assets/favicon/xiao-wang-favicon.svg
diff --git a/assets/favicon/xiao-wang.webmanifest b/public/assets/favicon/xiao-wang.webmanifest
similarity index 100%
rename from assets/favicon/xiao-wang.webmanifest
rename to public/assets/favicon/xiao-wang.webmanifest
diff --git a/assets/fonts/gloria-hallelujah/GloriaHallelujah-Regular.ttf b/public/assets/fonts/gloria-hallelujah/GloriaHallelujah-Regular.ttf
similarity index 100%
rename from assets/fonts/gloria-hallelujah/GloriaHallelujah-Regular.ttf
rename to public/assets/fonts/gloria-hallelujah/GloriaHallelujah-Regular.ttf
diff --git a/assets/fonts/nunito/Nunito-Bold.ttf b/public/assets/fonts/nunito/Nunito-Bold.ttf
similarity index 100%
rename from assets/fonts/nunito/Nunito-Bold.ttf
rename to public/assets/fonts/nunito/Nunito-Bold.ttf
diff --git a/assets/fonts/nunito/Nunito-BoldItalic.ttf b/public/assets/fonts/nunito/Nunito-BoldItalic.ttf
similarity index 100%
rename from assets/fonts/nunito/Nunito-BoldItalic.ttf
rename to public/assets/fonts/nunito/Nunito-BoldItalic.ttf
diff --git a/assets/fonts/nunito/Nunito-Italic.ttf b/public/assets/fonts/nunito/Nunito-Italic.ttf
similarity index 100%
rename from assets/fonts/nunito/Nunito-Italic.ttf
rename to public/assets/fonts/nunito/Nunito-Italic.ttf
diff --git a/assets/fonts/nunito/Nunito-Medium.ttf b/public/assets/fonts/nunito/Nunito-Medium.ttf
similarity index 100%
rename from assets/fonts/nunito/Nunito-Medium.ttf
rename to public/assets/fonts/nunito/Nunito-Medium.ttf
diff --git a/assets/fonts/nunito/Nunito-MediumItalic.ttf b/public/assets/fonts/nunito/Nunito-MediumItalic.ttf
similarity index 100%
rename from assets/fonts/nunito/Nunito-MediumItalic.ttf
rename to public/assets/fonts/nunito/Nunito-MediumItalic.ttf
diff --git a/assets/fonts/nunito/Nunito-Regular.ttf b/public/assets/fonts/nunito/Nunito-Regular.ttf
similarity index 100%
rename from assets/fonts/nunito/Nunito-Regular.ttf
rename to public/assets/fonts/nunito/Nunito-Regular.ttf
diff --git a/assets/fonts/nunito/Nunito-SemiBold.ttf b/public/assets/fonts/nunito/Nunito-SemiBold.ttf
similarity index 100%
rename from assets/fonts/nunito/Nunito-SemiBold.ttf
rename to public/assets/fonts/nunito/Nunito-SemiBold.ttf
diff --git a/assets/fonts/nunito/Nunito-SemiBoldItalic.ttf b/public/assets/fonts/nunito/Nunito-SemiBoldItalic.ttf
similarity index 100%
rename from assets/fonts/nunito/Nunito-SemiBoldItalic.ttf
rename to public/assets/fonts/nunito/Nunito-SemiBoldItalic.ttf
diff --git a/assets/js/app.js b/public/assets/js/app.js
similarity index 100%
rename from assets/js/app.js
rename to public/assets/js/app.js
diff --git a/assets/libraries/circletype.min.js b/public/assets/libraries/circletype.min.js
similarity index 100%
rename from assets/libraries/circletype.min.js
rename to public/assets/libraries/circletype.min.js
diff --git a/assets/libraries/plyr.min.css b/public/assets/libraries/plyr.min.css
similarity index 100%
rename from assets/libraries/plyr.min.css
rename to public/assets/libraries/plyr.min.css
diff --git a/assets/libraries/plyr.min.js b/public/assets/libraries/plyr.min.js
similarity index 100%
rename from assets/libraries/plyr.min.js
rename to public/assets/libraries/plyr.min.js
diff --git a/public/index.php b/public/index.php
new file mode 100644
index 0000000..fca9cd8
--- /dev/null
+++ b/public/index.php
@@ -0,0 +1,18 @@
+<?php
+
+include __DIR__ . '/../kirby/vendor/autoload.php';
+
+$kirby = new Kirby([
+    'roots' => [
+        'index'    => __DIR__,
+        'base'     => $base    = dirname(__DIR__),
+        'content'  => $base . '/content',
+        'site'     => $base . '/site',
+        'storage'  => $storage = $base . '/storage',
+        'accounts' => $storage . '/accounts',
+        'cache'    => $storage . '/cache',
+        'sessions' => $storage . '/sessions',
+    ]
+]);
+
+echo $kirby->render();
diff --git a/media/index.html b/public/media/index.html
similarity index 100%
rename from media/index.html
rename to public/media/index.html
diff --git a/robots.txt b/public/robots.txt
similarity index 100%
rename from robots.txt
rename to public/robots.txt
diff --git a/site/accounts/index.html b/storage/accounts/index.html
similarity index 100%
rename from site/accounts/index.html
rename to storage/accounts/index.html
diff --git a/site/cache/index.html b/storage/cache/index.html
similarity index 100%
rename from site/cache/index.html
rename to storage/cache/index.html
diff --git a/site/sessions/index.html b/storage/sessions/index.html
similarity index 100%
rename from site/sessions/index.html
rename to storage/sessions/index.html