Moved Template in line with how things are being organized now