more work on moving classes to autoload