WIP: make changes to support Cisco pkgs instead of upstream