Changed folder structure, multiple templates p/f