Switch to submodules, add stuff, etc.