Switched to psr-4 autoloading