rename submodule directories

review/merge