Reorg template imports