Adding PSR-4 standard support (part 2)