Fixed autoloader order