diff --git a/Makefile.am b/Makefile.am
index cd861141..e1fe9021 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,9 +16,12 @@ endif
 if WANT_DAEMON
   DAEMON		= scripts daemon
 endif
+if WANT_NETNS
+  NETNS 		= netns
+endif
 
 # keep docs last due to dependencies on binaries
-SUBDIRS			= ${GUI} ${DAEMON} ${DOCS}
+SUBDIRS			= ${GUI} ${DAEMON} ${DOCS} ${NETNS}
 
 ACLOCAL_AMFLAGS 	= -I config
 
@@ -113,7 +116,7 @@ fpm: clean-local-fpm
 		-d "libev" \
 		-d "net-tools" \
 		-d "python >= 2.7, python < 3.0" \
-		daemon/src/setup.py daemon/setup.py
+		netns/setup.py daemon/setup.py
 	fpm -s python -t deb \
 		-m "$(CORE_MAINTAINERS)" \
 		--vendor "$(CORE_VENDOR)" \
@@ -126,7 +129,7 @@ fpm: clean-local-fpm
 		-d "libev4" \
 		-d "python (>= 2.7), python (<< 3.0)" \
 		--deb-recommends quagga \
-		daemon/src/setup.py daemon/setup.py
+		netns/setup.py daemon/setup.py
 
 .PHONY: clean-local-fpm
 clean-local-fpm:
diff --git a/configure.ac b/configure.ac
index 8227c1f5..4bc5238f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ CORE_VENDOR="CORE Developers"
 #
 # autoconf and automake initialization
 #
-AC_CONFIG_SRCDIR([daemon/src/version.h.in])
+AC_CONFIG_SRCDIR([netns/version.h.in])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(config)
 AC_CONFIG_HEADERS([config.h])
@@ -331,8 +331,8 @@ AC_CONFIG_FILES([Makefile
 		doc/man/Makefile
 		doc/figures/Makefile
 		daemon/Makefile
-		daemon/src/Makefile
-		daemon/src/version.h
+		netns/Makefile
+		netns/version.h
 		daemon/core/constants.py
 		daemon/ns3/Makefile
 		daemon/ns3/corens3/constants.py
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index cf903a44..4b1f589c 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -11,7 +11,7 @@ SETUPPY		= setup.py
 SETUPPYFLAGS	= -v
 
 if WANT_NETNS
-  SUBDIRS 	= src ns3
+  SUBDIRS 	= ns3
 endif
 
 SBIN_FILES		=			\
diff --git a/daemon/requirements.txt b/daemon/requirements.txt
index 8d1241db..977eb416 100644
--- a/daemon/requirements.txt
+++ b/daemon/requirements.txt
@@ -1,7 +1,4 @@
 enum34==1.1.6
-logzero==1.3.0
-grpcio==1.0.0
-grpcio-tools==1.0.0
 mock==1.3.0
 pycco==0.5.1
 pytest==3.0.7
diff --git a/doc/devguide.rst b/doc/devguide.rst
index e2f83e98..04fae329 100644
--- a/doc/devguide.rst
+++ b/doc/devguide.rst
@@ -34,7 +34,7 @@ These are being actively developed as of CORE |version|:
   project.
 * *daemon* - Python modules are found in the :file:`daemon/core` directory, the
   daemon under :file:`daemon/sbin/core-daemon`, and Python extension modules for
-  Linux Network Namespace support are in :file:`daemon/src`.
+  Linux Network Namespace support are in :file:`netns`.
 * *doc* - Documentation for the manual lives here in reStructuredText format.
 * *packaging* - Control files and script for building CORE packages are here.
 
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index d08c5445..5f688b2b 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -19,9 +19,9 @@ man_MANS	= $(GUI_MANS) $(DAEMON_MANS)
 .PHONY: generate-mans
 generate-mans:
 	$(HELP2MAN) --source CORE 'sh $(top_srcdir)/gui/core-gui' -o core-gui.1.new
-	$(HELP2MAN) --no-info --source CORE $(top_srcdir)/daemon/src/vnoded -o vnoded.1.new
-	$(HELP2MAN) --no-info --source CORE $(top_srcdir)/daemon/src/vcmd -o vcmd.1.new
-	$(HELP2MAN) --no-info --source CORE $(top_srcdir)/daemon/src/netns -o netns.1.new
+	$(HELP2MAN) --no-info --source CORE $(top_srcdir)/netns/vnoded -o vnoded.1.new
+	$(HELP2MAN) --no-info --source CORE $(top_srcdir)/netns/vcmd -o vcmd.1.new
+	$(HELP2MAN) --no-info --source CORE $(top_srcdir)/netns/netns -o netns.1.new
 	$(HELP2MAN) --version-string=$(CORE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/sbin/core-daemon -o core-daemon.1.new
 	$(HELP2MAN) --version-string=$(CORE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/sbin/coresendmsg -o coresendmsg.1.new
 	$(HELP2MAN) --version-string=$(CORE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/sbin/core-cleanup -o core-cleanup.1.new
diff --git a/daemon/src/.gitignore b/netns/.gitignore
similarity index 100%
rename from daemon/src/.gitignore
rename to netns/.gitignore
diff --git a/daemon/src/MANIFEST.in b/netns/MANIFEST.in
similarity index 100%
rename from daemon/src/MANIFEST.in
rename to netns/MANIFEST.in
diff --git a/daemon/src/Makefile.am b/netns/Makefile.am
similarity index 100%
rename from daemon/src/Makefile.am
rename to netns/Makefile.am
diff --git a/daemon/src/myerr.h b/netns/myerr.h
similarity index 100%
rename from daemon/src/myerr.h
rename to netns/myerr.h
diff --git a/daemon/src/netns.c b/netns/netns.c
similarity index 100%
rename from daemon/src/netns.c
rename to netns/netns.c
diff --git a/daemon/src/netns.h b/netns/netns.h
similarity index 100%
rename from daemon/src/netns.h
rename to netns/netns.h
diff --git a/daemon/src/netns_main.c b/netns/netns_main.c
similarity index 100%
rename from daemon/src/netns_main.c
rename to netns/netns_main.c
diff --git a/daemon/src/netnsmodule.c b/netns/netnsmodule.c
similarity index 100%
rename from daemon/src/netnsmodule.c
rename to netns/netnsmodule.c
diff --git a/daemon/src/setup.py b/netns/setup.py
similarity index 100%
rename from daemon/src/setup.py
rename to netns/setup.py
diff --git a/daemon/src/vcmd_main.c b/netns/vcmd_main.c
similarity index 100%
rename from daemon/src/vcmd_main.c
rename to netns/vcmd_main.c
diff --git a/daemon/src/vcmdmodule.c b/netns/vcmdmodule.c
similarity index 100%
rename from daemon/src/vcmdmodule.c
rename to netns/vcmdmodule.c
diff --git a/daemon/src/version.h.in b/netns/version.h.in
similarity index 100%
rename from daemon/src/version.h.in
rename to netns/version.h.in
diff --git a/daemon/src/vnode_chnl.c b/netns/vnode_chnl.c
similarity index 100%
rename from daemon/src/vnode_chnl.c
rename to netns/vnode_chnl.c
diff --git a/daemon/src/vnode_chnl.h b/netns/vnode_chnl.h
similarity index 100%
rename from daemon/src/vnode_chnl.h
rename to netns/vnode_chnl.h
diff --git a/daemon/src/vnode_client.c b/netns/vnode_client.c
similarity index 100%
rename from daemon/src/vnode_client.c
rename to netns/vnode_client.c
diff --git a/daemon/src/vnode_client.h b/netns/vnode_client.h
similarity index 100%
rename from daemon/src/vnode_client.h
rename to netns/vnode_client.h
diff --git a/daemon/src/vnode_cmd.c b/netns/vnode_cmd.c
similarity index 100%
rename from daemon/src/vnode_cmd.c
rename to netns/vnode_cmd.c
diff --git a/daemon/src/vnode_cmd.h b/netns/vnode_cmd.h
similarity index 100%
rename from daemon/src/vnode_cmd.h
rename to netns/vnode_cmd.h
diff --git a/daemon/src/vnode_io.c b/netns/vnode_io.c
similarity index 100%
rename from daemon/src/vnode_io.c
rename to netns/vnode_io.c
diff --git a/daemon/src/vnode_io.h b/netns/vnode_io.h
similarity index 100%
rename from daemon/src/vnode_io.h
rename to netns/vnode_io.h
diff --git a/daemon/src/vnode_msg.c b/netns/vnode_msg.c
similarity index 100%
rename from daemon/src/vnode_msg.c
rename to netns/vnode_msg.c
diff --git a/daemon/src/vnode_msg.h b/netns/vnode_msg.h
similarity index 100%
rename from daemon/src/vnode_msg.h
rename to netns/vnode_msg.h
diff --git a/daemon/src/vnode_server.c b/netns/vnode_server.c
similarity index 100%
rename from daemon/src/vnode_server.c
rename to netns/vnode_server.c
diff --git a/daemon/src/vnode_server.h b/netns/vnode_server.h
similarity index 100%
rename from daemon/src/vnode_server.h
rename to netns/vnode_server.h
diff --git a/daemon/src/vnode_tlv.h b/netns/vnode_tlv.h
similarity index 100%
rename from daemon/src/vnode_tlv.h
rename to netns/vnode_tlv.h
diff --git a/daemon/src/vnoded_main.c b/netns/vnoded_main.c
similarity index 100%
rename from daemon/src/vnoded_main.c
rename to netns/vnoded_main.c