Fix submodule paths and update dapps submodule ref