Updateds to submodule layout.