Reorganize goblins and imps.