Minor edit to template and config restructure