Trying to get rid of the submodule