Revert "move submodules"

This reverts commit 244c910c93b1c5026c0ab64344d96609617426d3.