Restructured files, added templates and route