Added PSR-4 autoloading and other minor fixes