Fixed submodule structure and upstream updates