diff --git a/Gruntfile.js b/assets/Gruntfile.js
similarity index 84%
rename from Gruntfile.js
rename to assets/Gruntfile.js
index 7fc5ab44..181c4c6f 100644
--- a/Gruntfile.js
+++ b/assets/Gruntfile.js
@@ -8,11 +8,11 @@ module.exports = function(grunt) {
   grunt.initConfig({
     watch: {
       sass: {
-        files: ['assets/public_src/css/**/*.css'],
+        files: ['src/css/**/*.css'],
         tasks: ['concat', 'cssmin']
       },
       js: {
-        files: ['assets/public_src/js/**/*.js'],
+        files: ['src/js/**/*.js'],
         tasks: ['uglify:main']
       },
     },
@@ -24,7 +24,7 @@ module.exports = function(grunt) {
           'node_modules/animate.css/source/bouncing_entrances/bounceInRight.css',
           'node_modules/animate.css/source/fading_entrances/fadeIn.css',
           'node_modules/animate.css/source/fading_exits/fadeOut.css',
-          'assets/public_src/css/main.css'
+          'src/css/main.css'
         ],
         dest: 'temp/css/main.css',
       },
@@ -35,7 +35,7 @@ module.exports = function(grunt) {
           expand: true,
           flatten: true,
           src: ['node_modules/font-awesome/fonts/**'],
-          dest: 'assets/public/fonts'
+          dest: 'assets/dist/public/fonts'
         }],
       },
     },
@@ -56,7 +56,7 @@ module.exports = function(grunt) {
     uglify: {
       plugins: {
         files: {
-          'assets/public/js/plugins.min.js': ['node_modules/jquery/dist/jquery.min.js',
+          'assets/dist/public/js/plugins.min.js': ['node_modules/jquery/dist/jquery.min.js',
             'node_modules/perfect-scrollbar/dist/js/min/perfect-scrollbar.jquery.min.js',
             'node_modules/showdown/dist/showdown.min.js',
             'node_modules/noty/js/noty/packaged/jquery.noty.packaged.min.js',
@@ -67,7 +67,7 @@ module.exports = function(grunt) {
       },
       main: {
         files: {
-          'assets/public/js/app.min.js': ['assets/public_src/js/**/*.js']
+          'assets/dist/public/js/app.min.js': ['src/js/**/*.js']
         }
       }
     }
diff --git a/assets/public/css/main.min.css b/assets/dist/public/css/main.min.css
similarity index 100%
rename from assets/public/css/main.min.css
rename to assets/dist/public/css/main.min.css
diff --git a/assets/public/fonts/FontAwesome.otf b/assets/dist/public/fonts/FontAwesome.otf
similarity index 100%
rename from assets/public/fonts/FontAwesome.otf
rename to assets/dist/public/fonts/FontAwesome.otf
diff --git a/assets/public/fonts/fontawesome-webfont.eot b/assets/dist/public/fonts/fontawesome-webfont.eot
similarity index 100%
rename from assets/public/fonts/fontawesome-webfont.eot
rename to assets/dist/public/fonts/fontawesome-webfont.eot
diff --git a/assets/public/fonts/fontawesome-webfont.svg b/assets/dist/public/fonts/fontawesome-webfont.svg
similarity index 100%
rename from assets/public/fonts/fontawesome-webfont.svg
rename to assets/dist/public/fonts/fontawesome-webfont.svg
diff --git a/assets/public/fonts/fontawesome-webfont.ttf b/assets/dist/public/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from assets/public/fonts/fontawesome-webfont.ttf
rename to assets/dist/public/fonts/fontawesome-webfont.ttf
diff --git a/assets/public/fonts/fontawesome-webfont.woff b/assets/dist/public/fonts/fontawesome-webfont.woff
similarity index 100%
rename from assets/public/fonts/fontawesome-webfont.woff
rename to assets/dist/public/fonts/fontawesome-webfont.woff
diff --git a/assets/public/fonts/fontawesome-webfont.woff2 b/assets/dist/public/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from assets/public/fonts/fontawesome-webfont.woff2
rename to assets/dist/public/fonts/fontawesome-webfont.woff2
diff --git a/assets/public/js/app.min.js b/assets/dist/public/js/app.min.js
similarity index 100%
rename from assets/public/js/app.min.js
rename to assets/dist/public/js/app.min.js
diff --git a/assets/public/js/plugins.min.js b/assets/dist/public/js/plugins.min.js
similarity index 100%
rename from assets/public/js/plugins.min.js
rename to assets/dist/public/js/plugins.min.js
diff --git a/assets/templates/base_full.tmpl b/assets/dist/templates/base_full.tmpl
similarity index 100%
rename from assets/templates/base_full.tmpl
rename to assets/dist/templates/base_full.tmpl
diff --git a/assets/templates/base_minimal.tmpl b/assets/dist/templates/base_minimal.tmpl
similarity index 100%
rename from assets/templates/base_minimal.tmpl
rename to assets/dist/templates/base_minimal.tmpl
diff --git a/assets/templates/browse.tmpl b/assets/dist/templates/browse.tmpl
similarity index 100%
rename from assets/templates/browse.tmpl
rename to assets/dist/templates/browse.tmpl
diff --git a/assets/templates/editor.tmpl b/assets/dist/templates/editor.tmpl
similarity index 100%
rename from assets/templates/editor.tmpl
rename to assets/dist/templates/editor.tmpl
diff --git a/assets/templates/error.tmpl b/assets/dist/templates/error.tmpl
similarity index 100%
rename from assets/templates/error.tmpl
rename to assets/dist/templates/error.tmpl
diff --git a/assets/templates/frontmatter.tmpl b/assets/dist/templates/frontmatter.tmpl
similarity index 100%
rename from assets/templates/frontmatter.tmpl
rename to assets/dist/templates/frontmatter.tmpl
diff --git a/package.json b/assets/package.json
similarity index 100%
rename from package.json
rename to assets/package.json
diff --git a/assets/public_src/css/main.css b/assets/src/css/main.css
similarity index 100%
rename from assets/public_src/css/main.css
rename to assets/src/css/main.css
diff --git a/assets/public_src/js/app.js b/assets/src/js/app.js
similarity index 100%
rename from assets/public_src/js/app.js
rename to assets/src/js/app.js
diff --git a/assets/public_src/js/browse.js b/assets/src/js/browse.js
similarity index 100%
rename from assets/public_src/js/browse.js
rename to assets/src/js/browse.js
diff --git a/assets/public_src/js/editor.js b/assets/src/js/editor.js
similarity index 100%
rename from assets/public_src/js/editor.js
rename to assets/src/js/editor.js
diff --git a/assets/public_src/js/notifications.js b/assets/src/js/notifications.js
similarity index 100%
rename from assets/public_src/js/notifications.js
rename to assets/src/js/notifications.js
diff --git a/hugo.go b/hugo.go
index dbeda19a..ff1fc28e 100644
--- a/hugo.go
+++ b/hugo.go
@@ -1,6 +1,6 @@
 //go:generate go get github.com/jteeuwen/go-bindata
 //go:generate go install github.com/jteeuwen/go-bindata/go-bindata
-//go:generate go-bindata -prefix assets/ -pkg assets -o routes/assets/assets.go assets/templates/ assets/public/...
+//go:generate go-bindata -prefix assets/dist -pkg assets -o routes/assets/assets.go assets/dist/...
 
 // Package hugo makes the bridge between the static website generator Hugo
 // and the webserver Caddy, also providing an administrative user interface.