Began restructuring of templates and static files