Refactor templates and and make includes for upcoming python file refactor into core and user. Also making templates easier to edit and read overall.