Reorg template imports
Added a missing comma