Get rid of common submodule - again
Add non-git submodule