Clean up how we require submodules from lib & export them in our module.