Rearanged the templates for namespacing