changed directory structure, better gulpfile