Add autobuild, refactor autoload calls