diff --git a/daemon/job/active.go b/daemon/job/active.go
index edf24e9..791530e 100644
--- a/daemon/job/active.go
+++ b/daemon/job/active.go
@@ -6,7 +6,7 @@ import (
 	"github.com/problame/go-streamrpc"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/connecter"
+	"github.com/zrepl/zrepl/daemon/transport/connecter"
 	"github.com/zrepl/zrepl/daemon/filters"
 	"github.com/zrepl/zrepl/daemon/pruner"
 	"github.com/zrepl/zrepl/endpoint"
diff --git a/daemon/job/passive.go b/daemon/job/passive.go
index ac843b3..99071a8 100644
--- a/daemon/job/passive.go
+++ b/daemon/job/passive.go
@@ -8,7 +8,7 @@ import (
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/daemon/filters"
 	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/daemon/serve"
+	"github.com/zrepl/zrepl/daemon/transport/serve"
 	"github.com/zrepl/zrepl/daemon/snapper"
 	"github.com/zrepl/zrepl/endpoint"
 	"github.com/zrepl/zrepl/zfs"
diff --git a/daemon/logging/build_logging.go b/daemon/logging/build_logging.go
index 754fa2f..fcc1fa4 100644
--- a/daemon/logging/build_logging.go
+++ b/daemon/logging/build_logging.go
@@ -15,7 +15,7 @@ import (
 	"github.com/zrepl/zrepl/tlsconf"
 	"os"
 	"github.com/zrepl/zrepl/daemon/snapper"
-	"github.com/zrepl/zrepl/daemon/serve"
+	"github.com/zrepl/zrepl/daemon/transport/serve"
 )
 
 func OutletsFromConfig(in config.LoggingOutletEnumList) (*logger.Outlets, error) {
diff --git a/daemon/connecter/connect_local.go b/daemon/transport/connecter/connect_local.go
similarity index 93%
rename from daemon/connecter/connect_local.go
rename to daemon/transport/connecter/connect_local.go
index c70b285..45c3d68 100644
--- a/daemon/connecter/connect_local.go
+++ b/daemon/transport/connecter/connect_local.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/serve"
+	"github.com/zrepl/zrepl/daemon/transport/serve"
 	"net"
 )
 
diff --git a/daemon/connecter/connect_ssh.go b/daemon/transport/connecter/connect_ssh.go
similarity index 100%
rename from daemon/connecter/connect_ssh.go
rename to daemon/transport/connecter/connect_ssh.go
diff --git a/daemon/connecter/connect_tcp.go b/daemon/transport/connecter/connect_tcp.go
similarity index 100%
rename from daemon/connecter/connect_tcp.go
rename to daemon/transport/connecter/connect_tcp.go
diff --git a/daemon/connecter/connect_tls.go b/daemon/transport/connecter/connect_tls.go
similarity index 100%
rename from daemon/connecter/connect_tls.go
rename to daemon/transport/connecter/connect_tls.go
diff --git a/daemon/connecter/connecter.go b/daemon/transport/connecter/connecter.go
similarity index 100%
rename from daemon/connecter/connecter.go
rename to daemon/transport/connecter/connecter.go
diff --git a/daemon/serve/serve.go b/daemon/transport/serve/serve.go
similarity index 100%
rename from daemon/serve/serve.go
rename to daemon/transport/serve/serve.go
diff --git a/daemon/serve/serve_local.go b/daemon/transport/serve/serve_local.go
similarity index 100%
rename from daemon/serve/serve_local.go
rename to daemon/transport/serve/serve_local.go
diff --git a/daemon/serve/serve_stdinserver.go b/daemon/transport/serve/serve_stdinserver.go
similarity index 100%
rename from daemon/serve/serve_stdinserver.go
rename to daemon/transport/serve/serve_stdinserver.go
diff --git a/daemon/serve/serve_tcp.go b/daemon/transport/serve/serve_tcp.go
similarity index 100%
rename from daemon/serve/serve_tcp.go
rename to daemon/transport/serve/serve_tcp.go
diff --git a/daemon/serve/serve_tls.go b/daemon/transport/serve/serve_tls.go
similarity index 100%
rename from daemon/serve/serve_tls.go
rename to daemon/transport/serve/serve_tls.go