Gulp task modularization and improvements