Separate templates and includes