refactored the autoloader includes