move Autoload out of class map