Adding PSR-4 support