Move away from template to correct location