Skip internal option setting.
Move to PSR-4.
Merge branch 'psr-4' into incoming