Add Face class and refactor scrambler generator