restructured, templates added