Initial removal of deps and adding submodule