Use PSR-4 instead of PSR-0 (continues)