folder structure, templates added