reorganize templates/partials