diff --git a/gulpfile.js b/gulpfile.js
index 4cca6b5..2aa2a0c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -9,10 +9,10 @@ const gulp = require('gulp'),
 
 // build riotjs tags (components)
 gulp.task('tags', () => {
-    return gulp.src('./src/public/views/**/*.tag.html')
+    return gulp.src('./src/public/tags/**/*.tag.html')
         .pipe(concat('tags.js'))
         .pipe(riot({compact: true, whitespace: false}))
-        .pipe(minify())
+        .pipe(minify({ext: {min: '.min.js'}}))
         .pipe(gulp.dest('./dist/js'));
 });
 
@@ -20,7 +20,7 @@ gulp.task('tags', () => {
 gulp.task('javascript', () => {
     return gulp.src('./src/public/js/**/*.js')
         .pipe(concat('combined.js'))
-        .pipe(minify())
+        .pipe(minify({ext: {min: '.min.js'}}))
         .pipe(gulp.dest('./dist/js'));
 });
 
@@ -34,23 +34,41 @@ gulp.task('fonts', () => {
 // TODO: minimize
 gulp.task('images', () => {
     return gulp.src('./src/public/images/**/*')
-        .pipe(gulp.dest('./dist/img'));
+        .pipe(gulp.dest('./dist/images'));
 });
 
 // combine css
 gulp.task('css', () => {
-    return gulp.src('css/*.css')
+    return gulp.src('./src/public/css/*.css')
         .pipe(concat('styles.css'))
         .pipe(cssmin())
         .pipe(gulp.dest('./dist/css'));
 });
 
-// build everything for production distribution
-gulp.task('build', gulp.series('tags', 'javascript', 'css', 'fonts', 'images'), () => {
-    return gulp.src(['./src/public/index.html'])
+// move vendor deps
+gulp.task('vendor', () => {
+    return gulp.src('./src/public/vendor/**/*.min.*')
+        .pipe(gulp.dest('./dist/vendor'));
+});
+
+// move public files
+gulp.task('public', () => {
+    return gulp.src('./src/public/*.*')
+        .pipe(gulp.dest('./dist'));
+});
+
+// build index
+gulp.task('index', () => {
+    return gulp.src(['./src/public/*.html'])
         .pipe(ref())
         .pipe(gulp.dest('./dist'));
 });
 
+// build all assets
+gulp.task('assets', gulp.parallel('css', 'fonts', 'images', 'javascript', 'vendor'), () => {});
+
+// build everything for production distribution
+gulp.task('build', gulp.series('assets', 'public', 'index', 'tags'), () => {});
+
 // create task
 gulp.task('default', gulp.series('build'), () => {});