Adjusting code to PSR-4.