Restructure Gulp file

Some cleanup in Gulpfile format.