Update submodule paths
Merge submodule update