change templates/layers structure

simplify layers and templates usage of scaffold