New autoloader class defined and tested
Renamed classes for new autolader