Actually...switiching back to submodules, should be easier