beginning on cleaning up templates, putting them in their own blueprint directories