Refactor logic into functions, first pass at warning about non-bootstrapped modules