reorganized files to work with automated gulpjs