Make this not a submodule
And back again