diff --git a/ndnmap-data-collector/Makefile b/ndnmap-data-collector/Makefile
deleted file mode 100644
index a61c161..0000000
--- a/ndnmap-data-collector/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# URL for git clone
-GIT_URL=https://github.com/cawka/ndnmapDataCollector
-
-# Tag name or commit hash for checkout
-GIT_VERSION=b8e197dbdbc80c6631e31212278f1b70e9165175
-
-# Package name
-NAME=ndnmap-data-collector
-
-# Package version
-VERSION=0.1.0-18-gb8e197db
-
-# PPA version
-PPA_VERSION=2
-
-include ../packaging.mk
diff --git a/ndnmap-data-collector/debian/changelog b/ndnmap-data-collector/debian/changelog
deleted file mode 100644
index ab8ec64..0000000
--- a/ndnmap-data-collector/debian/changelog
+++ /dev/null
@@ -1,187 +0,0 @@
-ndnmap-data-collector (0.1.0-18-gb8e197db-ppa2~DISTRO) DISTRO; urgency=low
-
-  * Version based on b8e197dbdbc80c6631e31212278f1b70e9165175
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alex Afanasyev <aa@cs.fiu.edu>  Thu, 17 Feb 2022 21:56:55 +0000
-
-ndnmap-data-collector (0.1.0-18-gb8e197db-ppa1~DISTRO) DISTRO; urgency=low
-
-  * Version based on b8e197dbdbc80c6631e31212278f1b70e9165175
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alex Afanasyev <aa@cs.fiu.edu>  Thu, 17 Feb 2022 21:31:13 +0000
-
-ndnmap-data-collector (0.1.0-17-g793e4b6-ppa1~DISTRO) DISTRO; urgency=low
-
-  * Version based on 793e4b6ff8cf37120d93e4611e777225bd9c1c93
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alex Afanasyev <aa@cs.fiu.edu>  Mon, 23 Nov 2020 01:33:48 +0000
-
-ndnmap-data-collector (0.1.0-16-g29c1984-ppa1~DISTRO) DISTRO; urgency=low
-
-  * Version based on 29c1984601f7bd78b9946a2bd147cda16dcef236
-    (https://github.com/WU-ARL/ndnmapDataCollector)
-
- -- Alex Afanasyev <aa@cs.fiu.edu>  Mon, 23 Nov 2020 01:07:32 +0000
-
-ndnmap-data-collector (0.1.0-15-g29c1984-ppa5~DISTRO) DISTRO; urgency=low
-
-  * Version based on 29c1984601f7bd78b9946a2bd147cda16dcef236
-    (https://github.com/WU-ARL/ndnmapDataCollector)
-
- -- Alex Afanasyev <aa@cs.fiu.edu>  Sun, 22 Nov 2020 22:09:16 +0000
-
-ndnmap-data-collector (0.1.0-15-g29c1984-ppa4~DISTRO) DISTRO; urgency=low
-
-  * Version based on 29c1984601f7bd78b9946a2bd147cda16dcef236
-    (https://github.com/WU-ARL/ndnmapDataCollector)
-
- -- Alexander Afanasyev <aa@cs.fiu.edu>  Wed, 15 Jan 2020 19:16:51 +0000
-
-ndnmap-data-collector (0.1.0-15-g29c1984-ppa2~DISTRO) DISTRO; urgency=low
-
-  * Version based on 29c1984601f7bd78b9946a2bd147cda16dcef236
-    (https://github.com/WU-ARL/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Thu, 02 May 2019 20:23:05 +0000
-
-ndnmap-data-collector (0.1.0-15-g29c1984-ppa1~DISTRO) DISTRO; urgency=low
-
-  * Version based on 29c1984601f7bd78b9946a2bd147cda16dcef236
-    (https://github.com/WU-ARL/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Mon, 18 Mar 2019 17:02:36 +0000
-
-ndnmap-data-collector (0.1.0-14-gbb2a951809-ppa1~DISTRO) DISTRO; urgency=low
-
-  * Version based on bb2a95180940568be42d4072ce2e212ef523cc58
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Thu, 07 Mar 2019 23:22:01 +0000
-
-ndnmap-data-collector (0.1.0-13-gbc63136-ppa2~DISTRO) DISTRO; urgency=low
-
-  * Version based on bc631369cce10318269be6d2811038bac1d9f11c
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Thu, 07 Mar 2019 22:25:29 +0000
-
-ndnmap-data-collector (0.1.0-13-gbc63136-ppa1~DISTRO) DISTRO; urgency=low
-
-  * Version based on bc631369cce10318269be6d2811038bac1d9f11c
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Tue, 16 Oct 2018 16:47:04 +0000
-
-ndnmap-data-collector (0.1.0-12-gaff60ff-ppa5~DISTRO) DISTRO; urgency=low
-
-  * Version based on aff60ff4d524c013d051e2d2229fab9f6d0ca0c4
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Tue, 16 Oct 2018 16:29:14 +0000
-
-ndnmap-data-collector (0.1.0-12-gaff60ff-ppa4~DISTRO) DISTRO; urgency=low
-
-  * Version based on aff60ff4d524c013d051e2d2229fab9f6d0ca0c4
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Mon, 07 May 2018 06:32:25 +0000
-
-ndnmap-data-collector (0.1.0-12-gaff60ff-ppa3~DISTRO) DISTRO; urgency=low
-
-  * Version based on aff60ff4d524c013d051e2d2229fab9f6d0ca0c4
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Fri, 23 Feb 2018 15:19:08 +0000
-
-ndnmap-data-collector (0.1.0-12-gaff60ff-ppa2~DISTRO) DISTRO; urgency=low
-
-  * New version based on aff60ff4d524c013d051e2d2229fab9f6d0ca0c4
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Mon, 12 Feb 2018 00:56:48 +0000
-
-ndnmap-data-collector (0.1.0-12-gaff60ff-ppa1~DISTRO) DISTRO; urgency=low
-
-  * New version based on aff60ff4d524c013d051e2d2229fab9f6d0ca0c4
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Thu, 01 Feb 2018 15:31:00 +0000
-
-ndnmap-data-collector (0.1.0-11-g2c5c790-ppa1~DISTRO) DISTRO; urgency=low
-
-  * New version based on 2c5c7907629cd6cf66a923a97b352580c84c24cd
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Wed, 03 Jan 2018 17:38:31 +0000
-
-ndnmap-data-collector (0.1.0-5-g28df4d5-ppa1~DISTRO) DISTRO; urgency=low
-
-  * New version based on 28df4d5435ee4b94b967133d5f17ecf68167cbe6
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Mon, 12 Jun 2017 22:39:48 +0000
-
-ndnmap-data-collector (0.1.0-4-dc14d62-ppa1~DISTRO) DISTRO; urgency=low
-
-  * New version based on dc14d62b86adf365d3109bcd86dfad0fa81daa81
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Mon, 12 Jun 2017 22:31:40 +0000
-
-ndnmap-data-collector (0.1.0-3-g66d2a5-ppa3~DISTRO) DISTRO; urgency=low
-
-  * New version based on 66d2a5b956b686e591d9b773bc1b8ad9331cf2e3
-    (https://github.com/WU-ARL/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Mon, 12 Jun 2017 22:23:08 +0000
-
-ndnmap-data-collector (0.1.0-3-g66d2a5-ppa2~DISTRO) DISTRO; urgency=low
-
-  * New version based on 66d2a5b956b686e591d9b773bc1b8ad9331cf2e3
-    (https://github.com/WU-ARL/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Thu, 26 Jan 2017 05:30:07 +0000
-
-ndnmap-data-collector (0.1.0-3-g66d2a5-ppa1~DISTRO) DISTRO; urgency=low
-
-  * New version based on 66d2a5b956b686e591d9b773bc1b8ad9331cf2e3
-    (https://github.com/WU-ARL/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Fri, 09 Dec 2016 13:02:08 +0000
-
-ndnmap-data-collector (0.1.0-2-ge2e25-ppa1~DISTRO) DISTRO; urgency=low
-
-  * New version based on e2e251ac27be8869fc62fc195db1b8a698b1aff6
-    (https://github.com/cawka/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Wed, 05 Oct 2016 06:21:10 +0000
-
-ndnmap-data-collector (0.1.0-1-ppa5~DISTRO) DISTRO; urgency=low
-
-  * New version based on 3785a75abf04176e9e5a7f2642a1e11f31c87bdd
-    (https://github.com/WU-ARL/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Wed, 05 Oct 2016 05:58:33 +0000
-
-ndnmap-data-collector (0.1.0-1-ppa4~DISTRO) DISTRO; urgency=low
-
-  * New version based on 3785a75abf04176e9e5a7f2642a1e11f31c87bdd
-    (https://github.com/WU-ARL/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Wed, 20 Jul 2016 08:56:26 +0000
-
-ndnmap-data-collector (0.1.0-1-ppa3~DISTRO) DISTRO; urgency=low
-
-  * New version based on 3785a75abf04176e9e5a7f2642a1e11f31c87bdd
-    (https://github.com/WU-ARL/ndnmapDataCollector)
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Tue, 28 Jun 2016 16:50:10 +0000
-
-ndnmap-data-collector (0.0.0~ppa0~DISTRO) DISTRO; urgency=low
-
-  * Version 0
-
- -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Sat, 24 May 2014 16:58:30 -0800
diff --git a/ndnmap-data-collector/debian/compat b/ndnmap-data-collector/debian/compat
deleted file mode 100644
index 45a4fb7..0000000
--- a/ndnmap-data-collector/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/ndnmap-data-collector/debian/control b/ndnmap-data-collector/debian/control
deleted file mode 100644
index e87d2b2..0000000
--- a/ndnmap-data-collector/debian/control
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: ndnmap-data-collector
-Section: net
-Priority: optional
-Maintainer: John DeHart <jdd@wustl.edu>
-Build-Depends: debhelper (>= 9.20160709),
- python3 (>= 3.6.0),
- pkg-config (>= 0.29),
- libboost-all-dev (>= 1.65.1),
- libndn-cxx-dev (>= 0.8.0)
-Standards-Version: 3.9.2
-Homepage: https://github.com/WU-ARL/ndnmapDataCollector
-Vcs-Browser: https://github.com/WU-ARL/ndnmapDataCollector
-Vcs-Git: https://github.com/WU-ARL/ndnmapDataCollector.git
-
-Package: ndnmap-data-collector
-Architecture: i386 amd64 arm64 armel armhf ppc64el
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: data collector daemons for ndnmap.arl.wustl.edu
- This tool is designed to generate ndn interests to each NDN Testbed node
- to collect link usage data for display on the ndnmap.arl.wustl.edu web page.
diff --git a/ndnmap-data-collector/debian/copyright b/ndnmap-data-collector/debian/copyright
deleted file mode 100644
index a8fce47..0000000
--- a/ndnmap-data-collector/debian/copyright
+++ /dev/null
@@ -1,25 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: ndnmapDataCollector
-Source: http://github.com/WU-ARL/ndnmapDataCollector
-
-Files: *
-Copyright: Copyright (C) 2016 Washington University
-License: Unknown
-
-Files: debian/*
-Copyright: Copyright (c) 2013-2016, Alexander Afanasyev <alexander.afanasyev@ucla.edu>
-License: Apache 2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
-     http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian systems, the complete text of the Apache License 2.0 can
- be found in "/usr/share/common-licenses/Apache-2.0"
diff --git a/ndnmap-data-collector/debian/ndnmap-data-collector.default b/ndnmap-data-collector/debian/ndnmap-data-collector.default
deleted file mode 100644
index 7117a7d..0000000
--- a/ndnmap-data-collector/debian/ndnmap-data-collector.default
+++ /dev/null
@@ -1,6 +0,0 @@
-# defaults for ndnmapDataCollector client
-
-# Local Prefix for Interests
-PREFIX="/ndn/edu/wustl/ndnmap/stats"
-
-FLAGS=""
diff --git a/ndnmap-data-collector/debian/ndnmap-data-collector.dirs b/ndnmap-data-collector/debian/ndnmap-data-collector.dirs
deleted file mode 100644
index 18488c7..0000000
--- a/ndnmap-data-collector/debian/ndnmap-data-collector.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-etc
-usr/bin
diff --git a/ndnmap-data-collector/debian/ndnmap-data-collector.install b/ndnmap-data-collector/debian/ndnmap-data-collector.install
deleted file mode 100644
index 5b43ece..0000000
--- a/ndnmap-data-collector/debian/ndnmap-data-collector.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/ndnmapDataCollectorServer
-usr/bin/ndnmapDataCollectorClient
diff --git a/ndnmap-data-collector/debian/ndnmap-data-collector.postinst b/ndnmap-data-collector/debian/ndnmap-data-collector.postinst
deleted file mode 100644
index 413d850..0000000
--- a/ndnmap-data-collector/debian/ndnmap-data-collector.postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" != "configure" ]; then
-    exit 0
-fi
-
-# Create HOME and generate self-signed NDN certificate
-mkdir -p "/var/lib/ndn/ndnmapDataCollector/.ndn"
-
-chown -R ndn:ndn "/var/lib/ndn/ndnmapDataCollector"
-
-#DEBHELPER#
-
-exit 0
diff --git a/ndnmap-data-collector/debian/ndnmap-data-collector.service b/ndnmap-data-collector/debian/ndnmap-data-collector.service
deleted file mode 100644
index 000770e..0000000
--- a/ndnmap-data-collector/debian/ndnmap-data-collector.service
+++ /dev/null
@@ -1,23 +0,0 @@
-# Authors:
-# - John DeHart <jdd@wustl.edu>
-
-[Unit]
-Description=Data collection daemons for ndnmap.
-Documentation=man:ndnmapDataCollector
-Requires=nfd.service
-After=nfd.service
-
-[Service]
-Environment=HOME=/var/lib/ndn/ndnmapDataCollector
-EnvironmentFile=-/etc/default/ndnmap-data-collector
-User=ndn
-Group=ndn
-ExecStart=/usr/bin/ndnmapDataCollectorClient $FLAGS -p "$PREFIX"
-Restart=on-failure
-ProtectSystem=full
-PrivateTmp=yes
-PrivateDevices=yes
-ProtectHome=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/ndnmap-data-collector/debian/rules b/ndnmap-data-collector/debian/rules
deleted file mode 100755
index f0fb8ef..0000000
--- a/ndnmap-data-collector/debian/rules
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
-LIBDIR := /usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-%:
-	dh $@ --parallel --with=systemd
-
-override_dh_auto_configure:
-	CXXFLAGS="$(CXXFLAGS)" LINKFLAGS="$(LDFLAGS)" ./waf configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --boost-libs="$(LIBDIR)"
-
-override_dh_auto_build:
-	./waf build
-
-override_dh_auto_install:
-	./waf install --destdir=debian/tmp
-
-override_dh_auto_clean:
-	./waf distclean
-
-override_dh_clean:
-	dh_clean
-	./waf distclean
-	rm -rf .waf-1*
-	rm -rf .waf3-1*
-	rm -f .waf-tools/*.pyc
-	rm -rf .waf-tools/__pycache__
-	rm -rf docs/__pycache__
-
-override_dh_auto_test:
diff --git a/ndnmap-data-collector/debian/source/format b/ndnmap-data-collector/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/ndnmap-data-collector/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)