Refactor

-Break out templates into their own file.