Feature. Updated to PSR-4 over PSR-0