Changed autoload from PSR-0 to classmap to allow better naming of classes