Update Gulp configuration and rearrange file structure