restructured code a bit and improved gulpfile