Updated directory structure && updated Gulpfile.