PhpScanner renamed to Scanner, custom iterator moved to Scanner dir