Rearrange files for Gulp workflow
Finish reorganizing for gulp

gulp watch works now