#46 Cleanup of functions to include files other than the autoloader itself