var gulp = require('gulp'),
        usemin = require('gulp-usemin'),
        wrap = require('gulp-wrap'),
        connect = require('gulp-connect'),
        watch = require('gulp-watch'),
        minifyCss = require('gulp-cssnano'),
        minifyJs = require('gulp-uglify'),
        concat = require('gulp-concat'),
        less = require('gulp-less'),
        rename = require('gulp-rename'),
        minifyHTML = require('gulp-htmlmin');

var paths = {
    scripts: 'src/js/**/*.*',
    styles: 'src/less/**/*.*',
    images: 'src/img/**/*.*',
    templates: 'src/templates/**/*.html',
    index: 'src/index.html',
    bower_fonts: 'src/components/**/*.{ttf,woff,eof,svg}',
};

/**
 * Handle bower components from index
 */
gulp.task('usemin', function () {
    return gulp.src(paths.index)
            .pipe(usemin({
                js: [minifyJs(), 'concat'],
                css: [minifyCss({keepSpecialComments: 0}), 'concat'],
            }))
            .pipe(gulp.dest('dist/'));
});

/**
 * Copy assets
 */
gulp.task('build-assets', ['copy-bower_fonts']);

gulp.task('copy-bower_fonts', function () {
    return gulp.src(paths.bower_fonts)
            .pipe(rename({
                dirname: '/fonts'
            }))
            .pipe(gulp.dest('dist/lib'));
});

/**
 * Handle custom files
 */
gulp.task('build-custom', ['custom-images', 'custom-js', 'custom-less', 'custom-templates']);

gulp.task('custom-images', function () {
    return gulp.src(paths.images)
            .pipe(gulp.dest('dist/img'));
});

gulp.task('custom-js', function () {
    return gulp.src(paths.scripts)
            .pipe(minifyJs())
            .pipe(concat('dashboard.min.js'))
            .pipe(gulp.dest('dist/js'));
});

gulp.task('custom-less', function () {
    return gulp.src(paths.styles)
            .pipe(less())
            .pipe(gulp.dest('dist/css'));
});

gulp.task('custom-templates', function () {
    return gulp.src(paths.templates)
            .pipe(minifyHTML())
            .pipe(gulp.dest('dist/templates'));
});

/**
 * Watch custom files
 */
gulp.task('watch', function () {
    gulp.watch([paths.images], ['custom-images']);
    gulp.watch([paths.styles], ['custom-less']);
    gulp.watch([paths.scripts], ['custom-js']);
    gulp.watch([paths.templates], ['custom-templates']);
    gulp.watch([paths.index], ['usemin']);
});

/**
 * Live reload server
 */
gulp.task('webserver', function () {
    connect.server({
        root: 'dist',
        livereload: true,
        port: 1642
    });
});

gulp.task('livereload', function () {
    gulp.src(['dist/**/*.*'])
            .pipe(watch(['dist/**/*.*']))
            .pipe(connect.reload());
});

/**
 * Gulp tasks
 */
gulp.task('build', ['usemin', 'build-assets', 'build-custom']);
gulp.task('default', ['build', 'watch']);
@@ -467,16 +467,23 @@
 s: 'src/
+client/
 js/**/*.
@@ -503,16 +503,23 @@
 s: 'src/
+client/
 less/**/
@@ -541,16 +541,23 @@
 s: 'src/
+client/
 img/**/*
@@ -581,16 +581,23 @@
 s: 'src/
+client/
 template
@@ -626,16 +626,23 @@
 x: 'src/
+client/
 index.ht
@@ -668,16 +668,23 @@
 s: 'src/
+client/
 componen

Fix source path in gulp file