fix directory name & rename submodule path