Re-did the autoload class map