diff --git a/server.js b/server.js
index e6b3d0e..4666499 100755
--- a/server.js
+++ b/server.js
@@ -215,12 +215,13 @@ function startBrowserSync() {
 
       const bs = browserSync.create();
 
-      gulp.watch(['src/**/*.js', 'src/**/*.mjs', '!src/**/*.min.js'], {delay: 400}, gulp.series([buildScriptFiles, function (cb) {
+      const files = getJSBundleFiles();
+      gulp.watch(files, {delay: 400}, gulp.series([buildScriptFiles, function (cb) {
         browserSyncReload(bs, 'js', 'Script Files Change');
         return cb();
       }]));
 
-      gulp.watch('src/**/*.scss', {delay: 400}, gulp.series([buildStyleFiles, function (cb) {
+      gulp.watch(path.join(projectPath, 'src/**/*.scss'), {delay: 400}, gulp.series([buildStyleFiles, function (cb) {
         browserSyncReload(bs, 'css', 'Style Files Change');
         return cb();
       }]));
@@ -262,26 +263,31 @@ function browserSyncReload(bs, extension = '', message = '') {
   bs.reload(extension);
 }
 
+function getJSBundleFiles() {
+  return [path.join(projectPath, 'src/**/*.js'), path.join(projectPath, 'src/**/*.mjs'), '!' + path.join(projectPath, 'src/**/*.min.js')];
+}
+
 function buildScriptFiles() {
-  return gulp.src(['src/**/*.js', 'src/**/*.mjs', '!src/**/*.min.js'])
+  const files = getJSBundleFiles();
+  return gulp.src(files)
     .pipe(sourcemaps.init({}))
     .pipe(babel())
-    .pipe(gulp.src('vendor/*.js'))
+    .pipe(gulp.src(path.join(projectPath, 'vendor/*.js')))
     // .pipe(gulp.dest('src/'))
     .pipe(uglify())
     .pipe(rename({extname: '.min.js'}))
     .pipe(sourcemaps.write('.'))
-    .pipe(gulp.dest('src/'));
+    .pipe(gulp.dest(path.join(projectPath, 'src/')));
 }
 
 function buildStyleFiles() {
-  return gulp.src('src/**/*.scss')
+  return gulp.src(path.join(projectPath, 'src/**/*.scss'))
     .pipe(sourcemaps.init({}))
-    .pipe(sass.sync().on('error', sass.logError))
+    .pipe(sass.sync({outputStyle: 'compressed'}).on('error', sass.logError))
     // .pipe(gulp.dest('src/'))
     .pipe(rename({extname: '.min.css'}))
-    .pipe(sourcemaps.write('.'))
-    .pipe(gulp.dest('src/'))
+    .pipe(sourcemaps.write('.', {}))
+    .pipe(gulp.dest(path.join(projectPath, 'src')))
 }
 
 function prepareListOfDataFiles(dataFiles) {
@@ -395,4 +401,3 @@ function handleSyntaxErrors(err, req, res, next) {
 
   next();
 }
-