Update submodule names
Rename submodules
Reorganize repo
I graddled