Remove broken submodule pointers
Re-add submodules with non-broken pointers

I hate submodules. :(