switching over from old-style paths to separate submodule