diff --git a/docker-test/._.DS_Store b/docker-test/._.DS_Store
new file mode 100644
index 000000000..c9f90aab2
Binary files /dev/null and b/docker-test/._.DS_Store differ
diff --git a/docker-test/Dockerfile b/docker-test/httpd_demo/Dockerfile
similarity index 100%
rename from docker-test/Dockerfile
rename to docker-test/httpd_demo/Dockerfile
diff --git a/docker-test/entrypoint.sh b/docker-test/httpd_demo/entrypoint.sh
similarity index 100%
rename from docker-test/entrypoint.sh
rename to docker-test/httpd_demo/entrypoint.sh
diff --git a/docker-test/htdocs/ZeroTierIcon.png b/docker-test/httpd_demo/htdocs/ZeroTierIcon.png
similarity index 100%
rename from docker-test/htdocs/ZeroTierIcon.png
rename to docker-test/httpd_demo/htdocs/ZeroTierIcon.png
diff --git a/docker-test/htdocs/index.html b/docker-test/httpd_demo/htdocs/index.html
similarity index 100%
rename from docker-test/htdocs/index.html
rename to docker-test/httpd_demo/htdocs/index.html
diff --git a/docker-test/httpd.conf b/docker-test/httpd_demo/httpd.conf
similarity index 100%
rename from docker-test/httpd.conf
rename to docker-test/httpd_demo/httpd.conf
diff --git a/docker-test/intercept b/docker-test/httpd_demo/intercept
similarity index 100%
rename from docker-test/intercept
rename to docker-test/httpd_demo/intercept
diff --git a/docker-test/lib/libintercept.so.1.0 b/docker-test/httpd_demo/lib/libintercept.so.1.0
similarity index 100%
rename from docker-test/lib/libintercept.so.1.0
rename to docker-test/httpd_demo/lib/libintercept.so.1.0
diff --git a/docker-test/throughput-test/Dockerfile b/docker-test/throughput/Dockerfile
similarity index 100%
rename from docker-test/throughput-test/Dockerfile
rename to docker-test/throughput/Dockerfile
diff --git a/docker-test/throughput-test/build.sh b/docker-test/throughput/build.sh
similarity index 100%
rename from docker-test/throughput-test/build.sh
rename to docker-test/throughput/build.sh
diff --git a/docker-test/throughput-test/entrypoint.sh b/docker-test/throughput/entrypoint.sh
similarity index 100%
rename from docker-test/throughput-test/entrypoint.sh
rename to docker-test/throughput/entrypoint.sh
diff --git a/docker-test/throughput-test/generate_file.sh b/docker-test/throughput/generate_file.sh
similarity index 100%
rename from docker-test/throughput-test/generate_file.sh
rename to docker-test/throughput/generate_file.sh
diff --git a/docker-test/throughput-test/intercept b/docker-test/throughput/intercept
similarity index 100%
rename from docker-test/throughput-test/intercept
rename to docker-test/throughput/intercept
diff --git a/docker-test/throughput-test/libintercept.so.1.0 b/docker-test/throughput/libintercept.so.1.0
similarity index 100%
rename from docker-test/throughput-test/libintercept.so.1.0
rename to docker-test/throughput/libintercept.so.1.0
diff --git a/docker-test/throughput-test/liblwip.so b/docker-test/throughput/liblwip.so
similarity index 100%
rename from docker-test/throughput-test/liblwip.so
rename to docker-test/throughput/liblwip.so
diff --git a/docker-test/throughput-test/zerotier-cli b/docker-test/throughput/zerotier-cli
similarity index 100%
rename from docker-test/throughput-test/zerotier-cli
rename to docker-test/throughput/zerotier-cli
diff --git a/docker-test/throughput-test/zerotier-one b/docker-test/throughput/zerotier-one
similarity index 100%
rename from docker-test/throughput-test/zerotier-one
rename to docker-test/throughput/zerotier-one
diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp
index e17acbbff..b4e4eaaf2 100644
--- a/netcon/NetconEthernetTap.cpp
+++ b/netcon/NetconEthernetTap.cpp
@@ -928,12 +928,12 @@ err_t NetconEthernetTap::nc_poll(void* arg, struct tcp_pcb *tpcb)
  */
 err_t NetconEthernetTap::nc_sent(void* arg, struct tcp_pcb *tpcb, u16_t len)
 {
-	dwr(5, " nc_sent()\n");
+	//dwr(5, " nc_sent()\n");
 	Larg *l = (Larg*)arg;
 	if(len) {
 		l->conn->acked+=len;
 		//dwr("W = %d, A = %d\n", l->conn->written, l->conn->acked);
-		dwr("ACK = %d\n", len);
+		//dwr("ACK = %d\n", len);
 		l->tap->_phy.setNotifyReadable(l->conn->dataSock, true);
 		l->tap->_phy.whack();
 	}
@@ -1356,7 +1356,7 @@ void NetconEthernetTap::handle_connect(PhySocket *sock, void **uptr, struct conn
 
 void NetconEthernetTap::handle_write(TcpConnection *conn)
 {
-	dwr(5, " handle_write()\n");
+	//dwr(5, " handle_write()\n");
 	float max = (float)TCP_SND_BUF;
 	int r;