Fixes loader, segregates templates