Switched to psr-4 autoloader