diff --git a/Makefile b/Makefile
index e1221d766..3dfd97f4e 100644
--- a/Makefile
+++ b/Makefile
@@ -25,15 +25,15 @@ central-controller-docker: FORCE
 	docker build -t registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP} -f controller/central-docker/Dockerfile .
 
 clean: FORCE
-	rm -rf ${BUILDDIR} rust-zerotier-core/target rust-zerotier-service/target rust-zerotier-core/src/capi.rs rust-zerotier-service/src/osdep.rs
+	rm -rf ${BUILDDIR} rust-zerotier-core/target service/target rust-zerotier-core/src/capi.rs service/src/osdep.rs
 
 distclean: FORCE
 	rm -rf ${BUILDDIR}
 
 rust-bindgen: FORCE
 	cargo install bindgen
-	rm -f rust-zerotier-core/src/capi.rs rust-zerotier-service/src/osdep.rs
+	rm -f rust-zerotier-core/src/capi.rs service/src/osdep.rs
 	bindgen --no-doc-comments --no-layout-tests --no-derive-debug core/zerotier.h >rust-zerotier-core/src/capi.rs
-	bindgen --no-doc-comments --no-layout-tests --no-derive-debug osdep/rust-osdep.h >rust-zerotier-service/src/osdep.rs
+	bindgen --no-doc-comments --no-layout-tests --no-derive-debug osdep/rust-osdep.h >service/src/osdep.rs
 
 FORCE:
diff --git a/rust-zerotier-service/Cargo.lock b/service/Cargo.lock
similarity index 100%
rename from rust-zerotier-service/Cargo.lock
rename to service/Cargo.lock
diff --git a/rust-zerotier-service/Cargo.toml b/service/Cargo.toml
similarity index 100%
rename from rust-zerotier-service/Cargo.toml
rename to service/Cargo.toml
diff --git a/rust-zerotier-service/build.rs b/service/build.rs
similarity index 100%
rename from rust-zerotier-service/build.rs
rename to service/build.rs
diff --git a/rust-zerotier-service/src/api/mod.rs b/service/src/api/mod.rs
similarity index 100%
rename from rust-zerotier-service/src/api/mod.rs
rename to service/src/api/mod.rs
diff --git a/rust-zerotier-service/src/cli.rs b/service/src/cli.rs
similarity index 100%
rename from rust-zerotier-service/src/cli.rs
rename to service/src/cli.rs
diff --git a/rust-zerotier-service/src/commands/cert.rs b/service/src/commands/cert.rs
similarity index 100%
rename from rust-zerotier-service/src/commands/cert.rs
rename to service/src/commands/cert.rs
diff --git a/rust-zerotier-service/src/commands/controller.rs b/service/src/commands/controller.rs
similarity index 100%
rename from rust-zerotier-service/src/commands/controller.rs
rename to service/src/commands/controller.rs
diff --git a/rust-zerotier-service/src/commands/identity.rs b/service/src/commands/identity.rs
similarity index 100%
rename from rust-zerotier-service/src/commands/identity.rs
rename to service/src/commands/identity.rs
diff --git a/rust-zerotier-service/src/commands/join.rs b/service/src/commands/join.rs
similarity index 100%
rename from rust-zerotier-service/src/commands/join.rs
rename to service/src/commands/join.rs
diff --git a/rust-zerotier-service/src/commands/leave.rs b/service/src/commands/leave.rs
similarity index 100%
rename from rust-zerotier-service/src/commands/leave.rs
rename to service/src/commands/leave.rs
diff --git a/rust-zerotier-service/src/commands/locator.rs b/service/src/commands/locator.rs
similarity index 100%
rename from rust-zerotier-service/src/commands/locator.rs
rename to service/src/commands/locator.rs
diff --git a/rust-zerotier-service/src/commands/mod.rs b/service/src/commands/mod.rs
similarity index 100%
rename from rust-zerotier-service/src/commands/mod.rs
rename to service/src/commands/mod.rs
diff --git a/rust-zerotier-service/src/commands/network.rs b/service/src/commands/network.rs
similarity index 100%
rename from rust-zerotier-service/src/commands/network.rs
rename to service/src/commands/network.rs
diff --git a/rust-zerotier-service/src/commands/peer.rs b/service/src/commands/peer.rs
similarity index 100%
rename from rust-zerotier-service/src/commands/peer.rs
rename to service/src/commands/peer.rs
diff --git a/rust-zerotier-service/src/commands/set.rs b/service/src/commands/set.rs
similarity index 100%
rename from rust-zerotier-service/src/commands/set.rs
rename to service/src/commands/set.rs
diff --git a/rust-zerotier-service/src/commands/status.rs b/service/src/commands/status.rs
similarity index 100%
rename from rust-zerotier-service/src/commands/status.rs
rename to service/src/commands/status.rs
diff --git a/rust-zerotier-service/src/fastudpsocket.rs b/service/src/fastudpsocket.rs
similarity index 100%
rename from rust-zerotier-service/src/fastudpsocket.rs
rename to service/src/fastudpsocket.rs
diff --git a/rust-zerotier-service/src/getifaddrs.rs b/service/src/getifaddrs.rs
similarity index 100%
rename from rust-zerotier-service/src/getifaddrs.rs
rename to service/src/getifaddrs.rs
diff --git a/rust-zerotier-service/src/localconfig.rs b/service/src/localconfig.rs
similarity index 100%
rename from rust-zerotier-service/src/localconfig.rs
rename to service/src/localconfig.rs
diff --git a/rust-zerotier-service/src/log.rs b/service/src/log.rs
similarity index 100%
rename from rust-zerotier-service/src/log.rs
rename to service/src/log.rs
diff --git a/rust-zerotier-service/src/main.rs b/service/src/main.rs
similarity index 100%
rename from rust-zerotier-service/src/main.rs
rename to service/src/main.rs
diff --git a/rust-zerotier-service/src/network.rs b/service/src/network.rs
similarity index 100%
rename from rust-zerotier-service/src/network.rs
rename to service/src/network.rs
diff --git a/rust-zerotier-service/src/service.rs b/service/src/service.rs
similarity index 100%
rename from rust-zerotier-service/src/service.rs
rename to service/src/service.rs
diff --git a/rust-zerotier-service/src/store.rs b/service/src/store.rs
similarity index 100%
rename from rust-zerotier-service/src/store.rs
rename to service/src/store.rs
diff --git a/rust-zerotier-service/src/utils.rs b/service/src/utils.rs
similarity index 100%
rename from rust-zerotier-service/src/utils.rs
rename to service/src/utils.rs
diff --git a/rust-zerotier-service/src/vnic/common.rs b/service/src/vnic/common.rs
similarity index 100%
rename from rust-zerotier-service/src/vnic/common.rs
rename to service/src/vnic/common.rs
diff --git a/rust-zerotier-service/src/vnic/mac_feth_tap.rs b/service/src/vnic/mac_feth_tap.rs
similarity index 100%
rename from rust-zerotier-service/src/vnic/mac_feth_tap.rs
rename to service/src/vnic/mac_feth_tap.rs
diff --git a/rust-zerotier-service/src/vnic/mod.rs b/service/src/vnic/mod.rs
similarity index 100%
rename from rust-zerotier-service/src/vnic/mod.rs
rename to service/src/vnic/mod.rs
diff --git a/rust-zerotier-service/src/vnic/vnic.rs b/service/src/vnic/vnic.rs
similarity index 100%
rename from rust-zerotier-service/src/vnic/vnic.rs
rename to service/src/vnic/vnic.rs
diff --git a/rust-zerotier-service/src/weblistener.rs b/service/src/weblistener.rs
similarity index 100%
rename from rust-zerotier-service/src/weblistener.rs
rename to service/src/weblistener.rs