Changed the autoloading to use PSR-4