moving submodules that were broken in the previous merge