re-arrange for submodule