Fully cleaned up the structure, moved templates around and made finding the template path simpler and automated