Changed autoload from psr-0 to psr-2