moved submodule dirs to upstream