reorganize templates and partials