Update gulpfile and structure