Convert to PSR-4. Step 1. Broken commit!