diff --git a/README.md b/README.md
index d9d4353..56f1bc3 100644
--- a/README.md
+++ b/README.md
@@ -44,16 +44,16 @@ A production pipe-line should *NOT* be in your way while **developing**. You sho
 
 1. Run `npm install`, this will install all vendor dependencies
 
-2. Start coding in `app`
+2. Start coding in `public`
 
-3. run the `app/index.html` from your favorite web server\*
+3. run the `public/index.html` from your favorite web server\*
 
 > \* try `live-server` from `npm` or via [Visual Studio Code]() plug-in it's awesome!
 
 ### Project Structure
 
 ```
-app/               <-- develop here
+public/            <-- develop here
     css/           <-- your css files
     js/            <-- your javascript files
         app.js     <-- basic routing/utils bootstrap
diff --git a/gulpfile.js b/gulpfile.js
index 25bf551..1cd02a2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -9,7 +9,7 @@ const gulp = require('gulp'),
 
 // build riotjs tags (components)
 gulp.task('tags', () => {
-    return gulp.src('./app/tags/**/*.tag.html')
+    return gulp.src('./public/tags/**/*.tag.html')
         .pipe(concat('tags.js'))
         .pipe(riot({compact: true, whitespace: false}))
         .pipe(minify({ext: {min: '.min.js'}}))
@@ -18,7 +18,7 @@ gulp.task('tags', () => {
 
 // combine javascript files
 gulp.task('javascript', () => {
-    return gulp.src('./app/js/**/*.js')
+    return gulp.src('./public/js/**/*.js')
         .pipe(concat('combined.js'))
         .pipe(minify({ext: {min: '.min.js'}}))
         .pipe(gulp.dest('./dist/js'));
@@ -26,20 +26,20 @@ gulp.task('javascript', () => {
 
 // move fonts
 gulp.task('fonts', () => {
-    return gulp.src('./app/fonts/**/*.ttf')
+    return gulp.src('./public/fonts/**/*.ttf')
         .pipe(gulp.dest('./dist/fonts'));
 });
 
 // move images
 // TODO: minimize
 gulp.task('images', () => {
-    return gulp.src('./app/images/**/*')
+    return gulp.src('./public/images/**/*')
         .pipe(gulp.dest('./dist/images'));
 });
 
 // combine css
 gulp.task('css', () => {
-    return gulp.src('./app/css/*.css')
+    return gulp.src('./public/css/*.css')
         .pipe(concat('styles.css'))
         .pipe(cssmin())
         .pipe(gulp.dest('./dist/css'));
@@ -47,19 +47,19 @@ gulp.task('css', () => {
 
 // move vendor deps
 gulp.task('vendor', () => {
-    return gulp.src('./app/vendor/**/*.min.*')
+    return gulp.src('./public/vendor/**/*.min.*')
         .pipe(gulp.dest('./dist/vendor'));
 });
 
 // move public files
 gulp.task('public', () => {
-    return gulp.src('./app/*.*')
+    return gulp.src('./public/*.*')
         .pipe(gulp.dest('./dist'));
 });
 
 // build index
 gulp.task('index', () => {
-    return gulp.src(['./app/*.html'])
+    return gulp.src(['./public/*.html'])
         .pipe(ref())
         .pipe(gulp.dest('./dist'));
 });
diff --git a/package.json b/package.json
index 0e87e55..6bfb291 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
         "gulp-useref": "^3.1.6"
     },
     "frontendDependencies": {
-        "target": "app/vendor/",
+        "target": "public/vendor/",
         "packages": {
             "riot": {
                 "version": "3.13.2",
diff --git a/app/.htaccess b/public/.htaccess
similarity index 100%
rename from app/.htaccess
rename to public/.htaccess
diff --git a/app/404.html b/public/404.html
similarity index 100%
rename from app/404.html
rename to public/404.html
diff --git a/app/css/main.css b/public/css/main.css
similarity index 100%
rename from app/css/main.css
rename to public/css/main.css
diff --git a/app/favicon.ico b/public/favicon.ico
similarity index 100%
rename from app/favicon.ico
rename to public/favicon.ico
diff --git a/app/humans.txt b/public/humans.txt
similarity index 100%
rename from app/humans.txt
rename to public/humans.txt
diff --git a/app/images/icon.png b/public/images/icon.png
similarity index 100%
rename from app/images/icon.png
rename to public/images/icon.png
diff --git a/app/index.html b/public/index.html
similarity index 100%
rename from app/index.html
rename to public/index.html
diff --git a/app/js/app.js b/public/js/app.js
similarity index 100%
rename from app/js/app.js
rename to public/js/app.js
diff --git a/app/manifest.json b/public/manifest.json
similarity index 100%
rename from app/manifest.json
rename to public/manifest.json
diff --git a/app/robots.txt b/public/robots.txt
similarity index 100%
rename from app/robots.txt
rename to public/robots.txt
diff --git a/app/tags/about.tag.html b/public/tags/about.tag.html
similarity index 100%
rename from app/tags/about.tag.html
rename to public/tags/about.tag.html
diff --git a/app/tags/home.tag.html b/public/tags/home.tag.html
similarity index 100%
rename from app/tags/home.tag.html
rename to public/tags/home.tag.html
diff --git a/app/tags/layout/footer.tag.html b/public/tags/layout/footer.tag.html
similarity index 100%
rename from app/tags/layout/footer.tag.html
rename to public/tags/layout/footer.tag.html
diff --git a/app/tags/layout/header.tag.html b/public/tags/layout/header.tag.html
similarity index 100%
rename from app/tags/layout/header.tag.html
rename to public/tags/layout/header.tag.html
diff --git a/app/tags/layout/page.tag.html b/public/tags/layout/page.tag.html
similarity index 100%
rename from app/tags/layout/page.tag.html
rename to public/tags/layout/page.tag.html
diff --git a/app/vendor/.gitignore b/public/vendor/.gitignore
similarity index 100%
rename from app/vendor/.gitignore
rename to public/vendor/.gitignore