Fixing up class autoloader