change templates/layers structure
Merge branch 'scaffolds'