Updated for PSR-4 autoloading