Fixed PSR compliance, incorporated autoloading