Restructure template hierarchy
Add resume scaffolding