Move templates and fix importer