oops, fix the submodule layout too