Use new-style main submodule