adjust gulpfile and some directory management