Renamed templates and simplified file structure