diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac7506d59..183d9f378 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,7 +113,7 @@ set(
 
 add_custom_target(zerotier ALL
 	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-	COMMAND rm -f ./build/zerotier && go build -trimpath -ldflags -s -o ./build/zerotier cmd/zerotier/zerotier.go
+	COMMAND rm -f ./build/zerotier && go build -trimpath -ldflags -s -w -buildmode=pie -o ./build/zerotier cmd/zerotier/zerotier.go
 )
 add_dependencies(zerotier zt_osdep zt_core zt_controller zt_service_io_core)
 ADDITIONAL_CLEAN_FILES(./build/zerotier)
diff --git a/Makefile b/Makefile
index 5fbe6562f..ddeb7d316 100644
--- a/Makefile
+++ b/Makefile
@@ -18,4 +18,4 @@ clean:
 	rm -rf ${BUILDDIR}
 
 distclean:
-	rm -rf ${BUILDDIR} cmake-build-*
+	rm -rf ${BUILDDIR}
diff --git a/installation/linux/zerotier-containerized/Dockerfile b/installsupport/linux/zerotier-containerized/Dockerfile
similarity index 100%
rename from installation/linux/zerotier-containerized/Dockerfile
rename to installsupport/linux/zerotier-containerized/Dockerfile
diff --git a/installation/linux/zerotier-containerized/main.sh b/installsupport/linux/zerotier-containerized/main.sh
similarity index 100%
rename from installation/linux/zerotier-containerized/main.sh
rename to installsupport/linux/zerotier-containerized/main.sh
diff --git a/installation/linux/zerotier-one.init.rhel6 b/installsupport/linux/zerotier-one.init.rhel6
similarity index 100%
rename from installation/linux/zerotier-one.init.rhel6
rename to installsupport/linux/zerotier-one.init.rhel6
diff --git a/installation/mac/ZeroTier One.pkgproj b/installsupport/mac/ZeroTier One.pkgproj
similarity index 100%
rename from installation/mac/ZeroTier One.pkgproj
rename to installsupport/mac/ZeroTier One.pkgproj
diff --git a/installation/mac/com.zerotier.one.plist b/installsupport/mac/com.zerotier.one.plist
similarity index 100%
rename from installation/mac/com.zerotier.one.plist
rename to installsupport/mac/com.zerotier.one.plist
diff --git a/installation/mac/get-proxy-settings.sh b/installsupport/mac/get-proxy-settings.sh
similarity index 100%
rename from installation/mac/get-proxy-settings.sh
rename to installsupport/mac/get-proxy-settings.sh
diff --git a/installation/mac/launch.sh b/installsupport/mac/launch.sh
similarity index 100%
rename from installation/mac/launch.sh
rename to installsupport/mac/launch.sh
diff --git a/installation/mac/postinst.sh b/installsupport/mac/postinst.sh
similarity index 100%
rename from installation/mac/postinst.sh
rename to installsupport/mac/postinst.sh
diff --git a/installation/mac/preinst.sh b/installsupport/mac/preinst.sh
similarity index 100%
rename from installation/mac/preinst.sh
rename to installsupport/mac/preinst.sh
diff --git a/installation/mac/uninstall.sh b/installsupport/mac/uninstall.sh
similarity index 100%
rename from installation/mac/uninstall.sh
rename to installsupport/mac/uninstall.sh
diff --git a/installation/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip b/installsupport/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip
similarity index 100%
rename from installation/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip
rename to installsupport/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip
diff --git a/installation/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip b/installsupport/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip
similarity index 100%
rename from installation/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip
rename to installsupport/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip
diff --git a/installation/windows/ZeroTier One.aip b/installsupport/windows/ZeroTier One.aip
similarity index 100%
rename from installation/windows/ZeroTier One.aip
rename to installsupport/windows/ZeroTier One.aip
diff --git a/installation/windows/tap-windows-ndis6/certutil.exe b/installsupport/windows/tap-windows-ndis6/certutil.exe
similarity index 100%
rename from installation/windows/tap-windows-ndis6/certutil.exe
rename to installsupport/windows/tap-windows-ndis6/certutil.exe
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/TapDriver6.vcxproj b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/TapDriver6.vcxproj
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/TapDriver6.vcxproj
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/TapDriver6.vcxproj
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/TapDriver6.vcxproj.filters b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/TapDriver6.vcxproj.filters
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/TapDriver6.vcxproj.filters
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/TapDriver6.vcxproj.filters
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/adapter.c b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/adapter.c
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/adapter.c
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/adapter.c
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/adapter.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/adapter.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/adapter.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/adapter.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/config.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/config.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/config.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/config.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/constants.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/constants.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/constants.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/constants.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/device.c b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/device.c
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/device.c
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/device.c
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/device.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/device.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/device.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/device.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/endian.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/endian.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/endian.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/endian.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/error.c b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/error.c
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/error.c
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/error.c
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/error.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/error.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/error.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/error.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/hexdump.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/hexdump.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/hexdump.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/hexdump.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/lock.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/lock.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/lock.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/lock.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/macinfo.c b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/macinfo.c
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/macinfo.c
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/macinfo.c
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/macinfo.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/macinfo.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/macinfo.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/macinfo.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/mem.c b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/mem.c
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/mem.c
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/mem.c
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/mem.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/mem.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/mem.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/mem.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/oidrequest.c b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/oidrequest.c
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/oidrequest.c
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/oidrequest.c
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/proto.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/proto.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/proto.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/proto.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/prototypes.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/prototypes.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/prototypes.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/prototypes.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/resource.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/resource.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/resource.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/resource.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/resource.rc b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/resource.rc
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/resource.rc
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/resource.rc
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/rxpath.c b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/rxpath.c
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/rxpath.c
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/rxpath.c
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/tap-windows.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/tap-windows.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/tap-windows.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/tap-windows.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/tap.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/tap.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/tap.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/tap.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/tapdrvr.c b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/tapdrvr.c
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/tapdrvr.c
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/tapdrvr.c
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/txpath.c b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/txpath.c
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/txpath.c
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/txpath.c
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/types.h b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/types.h
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/types.h
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/types.h
diff --git a/installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/zttap300.inf b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/zttap300.inf
similarity index 100%
rename from installation/windows/tap-windows-ndis6/src/tap-windows-ndis6/zttap300.inf
rename to installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/zttap300.inf
diff --git a/installation/windows/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi b/installsupport/windows/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi
similarity index 100%
rename from installation/windows/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi
rename to installsupport/windows/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi
diff --git a/installation/windows/tap-windows-ndis6/x64/zttap300.cat b/installsupport/windows/tap-windows-ndis6/x64/zttap300.cat
similarity index 100%
rename from installation/windows/tap-windows-ndis6/x64/zttap300.cat
rename to installsupport/windows/tap-windows-ndis6/x64/zttap300.cat
diff --git a/installation/windows/tap-windows-ndis6/x64/zttap300.inf b/installsupport/windows/tap-windows-ndis6/x64/zttap300.inf
similarity index 100%
rename from installation/windows/tap-windows-ndis6/x64/zttap300.inf
rename to installsupport/windows/tap-windows-ndis6/x64/zttap300.inf
diff --git a/installation/windows/tap-windows-ndis6/x64/zttap300.sys b/installsupport/windows/tap-windows-ndis6/x64/zttap300.sys
similarity index 100%
rename from installation/windows/tap-windows-ndis6/x64/zttap300.sys
rename to installsupport/windows/tap-windows-ndis6/x64/zttap300.sys
diff --git a/installation/windows/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi b/installsupport/windows/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi
similarity index 100%
rename from installation/windows/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi
rename to installsupport/windows/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi
diff --git a/installation/windows/tap-windows-ndis6/x86/zttap300.cat b/installsupport/windows/tap-windows-ndis6/x86/zttap300.cat
similarity index 100%
rename from installation/windows/tap-windows-ndis6/x86/zttap300.cat
rename to installsupport/windows/tap-windows-ndis6/x86/zttap300.cat
diff --git a/installation/windows/tap-windows-ndis6/x86/zttap300.inf b/installsupport/windows/tap-windows-ndis6/x86/zttap300.inf
similarity index 100%
rename from installation/windows/tap-windows-ndis6/x86/zttap300.inf
rename to installsupport/windows/tap-windows-ndis6/x86/zttap300.inf
diff --git a/installation/windows/tap-windows-ndis6/x86/zttap300.sys b/installsupport/windows/tap-windows-ndis6/x86/zttap300.sys
similarity index 100%
rename from installation/windows/tap-windows-ndis6/x86/zttap300.sys
rename to installsupport/windows/tap-windows-ndis6/x86/zttap300.sys
diff --git a/installation/windows/tap-windows-ndis6/zttap300.cer b/installsupport/windows/tap-windows-ndis6/zttap300.cer
similarity index 100%
rename from installation/windows/tap-windows-ndis6/zttap300.cer
rename to installsupport/windows/tap-windows-ndis6/zttap300.cer
diff --git a/pkg/zerotier/endpoint.go b/pkg/zerotier/endpoint.go
index d50569e77..1d230984e 100644
--- a/pkg/zerotier/endpoint.go
+++ b/pkg/zerotier/endpoint.go
@@ -1,6 +1,6 @@
 package zerotier
 
-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 // static inline const ZT_Fingerprint *_getFP(const ZT_Endpoint *ep) { return &(ep->value.fp); }
 // static inline uint64_t _getAddress(const ZT_Endpoint *ep) { return ep->value.fp.address; }
 // static inline uint64_t _getMAC(const ZT_Endpoint *ep) { return ep->value.mac; }
diff --git a/pkg/zerotier/fingerprint.go b/pkg/zerotier/fingerprint.go
index d7fdc3ef2..6269464e0 100644
--- a/pkg/zerotier/fingerprint.go
+++ b/pkg/zerotier/fingerprint.go
@@ -13,7 +13,7 @@
 
 package zerotier
 
-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"
 
 import (
diff --git a/pkg/zerotier/identity.go b/pkg/zerotier/identity.go
index 07957f325..8b11afddf 100644
--- a/pkg/zerotier/identity.go
+++ b/pkg/zerotier/identity.go
@@ -13,7 +13,7 @@
 
 package zerotier
 
-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"
 
 import (
diff --git a/pkg/zerotier/inetaddress.go b/pkg/zerotier/inetaddress.go
index 2e4b9e2af..c8317907d 100644
--- a/pkg/zerotier/inetaddress.go
+++ b/pkg/zerotier/inetaddress.go
@@ -13,7 +13,7 @@
 
 package zerotier
 
-//#include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"
 
 import (
diff --git a/pkg/zerotier/locator.go b/pkg/zerotier/locator.go
index 24bb827b6..c0fc23926 100644
--- a/pkg/zerotier/locator.go
+++ b/pkg/zerotier/locator.go
@@ -13,7 +13,7 @@
 
 package zerotier
 
-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"
 
 import (
diff --git a/pkg/zerotier/nativetap.go b/pkg/zerotier/nativetap.go
index bba58a1cb..403961dd3 100644
--- a/pkg/zerotier/nativetap.go
+++ b/pkg/zerotier/nativetap.go
@@ -16,7 +16,7 @@
 package zerotier
 
 //#cgo CFLAGS: -O3
-//#include "../../native/GoGlue.h"
+//#include "../../serviceiocore/GoGlue.h"
 import "C"
 
 import (
diff --git a/pkg/zerotier/node.go b/pkg/zerotier/node.go
index c799af50d..d2c7c41fc 100644
--- a/pkg/zerotier/node.go
+++ b/pkg/zerotier/node.go
@@ -16,7 +16,7 @@ package zerotier
 // #cgo CFLAGS: -O3
 // #cgo darwin LDFLAGS: ${SRCDIR}/../../../build/go/native/libzt_go_native.a ${SRCDIR}/../../../build/node/libzt_core.a ${SRCDIR}/../../../build/osdep/libzt_osdep.a -lc++ -lpthread
 // #cgo linux android LDFLAGS: ${SRCDIR}/../../../build/go/native/libzt_go_native.a ${SRCDIR}/../../../build/node/libzt_core.a ${SRCDIR}/../../../build/osdep/libzt_osdep.a -lstdc++ -lpthread -lm
-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"
 
 import (
diff --git a/pkg/zerotier/path.go b/pkg/zerotier/path.go
index 11d39f72b..f97d6e395 100644
--- a/pkg/zerotier/path.go
+++ b/pkg/zerotier/path.go
@@ -13,7 +13,7 @@
 
 package zerotier
 
-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"
 
 // Path is a path to another peer on the network
diff --git a/pkg/zerotier/peer.go b/pkg/zerotier/peer.go
index 5f1a73236..5f5a23154 100644
--- a/pkg/zerotier/peer.go
+++ b/pkg/zerotier/peer.go
@@ -13,7 +13,7 @@
 
 package zerotier
 
-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"
 
 import "unsafe"