Upgrade submodules
Remove wrong submodules
Rename common submodules