Gulpfile & assets structure changed