cleaned up submodule mess with base_pkgs