Updated autoloader for new class file names