Updates to autoloader, reorganizing base code