App/resources: templates reorg