restructured templates, removed unused files