Removing packages to use submodules