re-organize templates and partials