US32 - Changed custom classes to PSR-4