Moved to PSR-4.