diff --git a/Makefile b/Makefile
index 7d55740..584fb35 100644
--- a/Makefile
+++ b/Makefile
@@ -177,14 +177,14 @@ wrapup-and-checksum:
 	tar --mtime='1970-01-01' --sort=name \
 		--transform 's/$(ARTIFACTDIR)/zrepl-$(_ZREPL_VERSION)-noarch/' \
 		--transform 's#dist#zrepl-$(_ZREPL_VERSION)-noarch/dist#' \
-		--transform 's#config/samples#zrepl-$(_ZREPL_VERSION)-noarch/config#' \
+		--transform 's#internal/config/samples#zrepl-$(_ZREPL_VERSION)-noarch/config#' \
 		-acf $(NOARCH_TARBALL) \
 		$(ARTIFACTDIR)/docs/html \
 		$(ARTIFACTDIR)/bash_completion \
 		$(ARTIFACTDIR)/_zrepl.zsh_completion \
 		$(ARTIFACTDIR)/go_env.txt \
 		dist \
-		config/samples
+		internal/config/samples
 	rm -rf "$(ARTIFACTDIR)/release"
 	mkdir -p "$(ARTIFACTDIR)/release"
 	cp -l $(ARTIFACTDIR)/zrepl* \
@@ -282,7 +282,7 @@ cover-platform:
 
 TEST_PLATFORM_BIN_PATH := $(ARTIFACTDIR)/platformtest-$(ZREPL_TARGET_TUPLE)
 test-platform-bin:
-	$(GO_BUILD) -o "$(TEST_PLATFORM_BIN_PATH)" ./platformtest/harness
+	$(GO_BUILD) -o "$(TEST_PLATFORM_BIN_PATH)" ./internal/platformtest/harness
 test-platform:
 	export _TEST_PLATFORM_CMD="\"$(TEST_PLATFORM_BIN_PATH)\""; \
 		$(MAKE) _test-or-cover-platform-impl
@@ -299,7 +299,7 @@ ifndef _TEST_PLATFORM_CMD
 endif
 	rm -f "$(ZREPL_PLATFORMTEST_ZFS_LOG)"
 	rm -f "$(ARTIFACTDIR)/platformtest.cover"
-	platformtest/logmockzfs/logzfsenv "$(ZREPL_PLATFORMTEST_ZFS_LOG)" `which zfs` \
+	internal/platformtest/logmockzfs/logzfsenv "$(ZREPL_PLATFORMTEST_ZFS_LOG)" `which zfs` \
 		$(_TEST_PLATFORM_CMD) \
 		-poolname "$(ZREPL_PLATFORMTEST_POOLNAME)" \
 		-imagepath "$(ZREPL_PLATFORMTEST_IMAGEPATH)" \
diff --git a/docs/conf.py b/docs/conf.py
index 28a9a41..79e3cab 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -181,7 +181,7 @@ texinfo_documents = [
 extlinks = {
     'issue':('https://github.com/zrepl/zrepl/issues/%s', 'issue #%s'),
     'repomasterlink':('https://github.com/zrepl/zrepl/blob/master/%s', '%s'),
-    'sampleconf':('https://github.com/zrepl/zrepl/blob/master/config/samples%s', 'config/samples%s'),
+    'sampleconf':('https://github.com/zrepl/zrepl/blob/master/internal/config/samples%s', 'internal/config/samples%s'),
     'commit':('https://github.com/zrepl/zrepl/commit/%s', 'commit %s'),
         }
 
diff --git a/docs/quickstart/backup_to_external_disk.rst b/docs/quickstart/backup_to_external_disk.rst
index 6019bcf..5e47545 100644
--- a/docs/quickstart/backup_to_external_disk.rst
+++ b/docs/quickstart/backup_to_external_disk.rst
@@ -31,7 +31,7 @@ A few additional requirements:
 The following config snippet implements the setup described above.
 You will likely want to customize some aspects mentioned in the top comment in the file.
 
-.. literalinclude:: ../../config/samples/quickstart_backup_to_external_disk.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_backup_to_external_disk.yml
 
 
 Offline Backups with two (or more) External Disks
@@ -43,7 +43,7 @@ To accomplish this,
 * create one zpool per external HDD, each with a unique name, and
 * define a pair of ``push`` and ``sink`` job **for each** of these zpools, each with a unique ``name``, ``listener_name``, and ``root_fs``.
 
-The unique names ensure that the jobs don't step on each others' toes when managing :ref:`zrepl's ZFS abstractions <zrepl-zfs-abstractions>` . 
+The unique names ensure that the jobs don't step on each others' toes when managing :ref:`zrepl's ZFS abstractions <zrepl-zfs-abstractions>` .
 
 
-:ref:`Click here <quickstart-apply-config>` to go back to the quickstart guide.
\ No newline at end of file
+:ref:`Click here <quickstart-apply-config>` to go back to the quickstart guide.
diff --git a/docs/quickstart/continuous_server_backup.rst b/docs/quickstart/continuous_server_backup.rst
index ef76d8c..2f01810 100644
--- a/docs/quickstart/continuous_server_backup.rst
+++ b/docs/quickstart/continuous_server_backup.rst
@@ -77,7 +77,7 @@ Configure server ``prod``
 
 We define a **push job** named ``prod_to_backups`` in ``/etc/zrepl/zrepl.yml`` on host ``prod`` :
 
-.. literalinclude:: ../../config/samples/quickstart_continuous_server_backup_sender.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_continuous_server_backup_sender.yml
 
 .. _tutorial-configure-prod:
 
@@ -86,7 +86,7 @@ Configure server ``backups``
 
 We define a corresponding **sink job** named ``sink`` in ``/etc/zrepl/zrepl.yml`` on host ``backups`` :
 
-.. literalinclude:: ../../config/samples/quickstart_continuous_server_backup_receiver.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_continuous_server_backup_receiver.yml
 
 Go Back To Quickstart Guide
 ---------------------------
diff --git a/docs/quickstart/fan_out_replication.rst b/docs/quickstart/fan_out_replication.rst
index 6c546e9..d986777 100644
--- a/docs/quickstart/fan_out_replication.rst
+++ b/docs/quickstart/fan_out_replication.rst
@@ -80,12 +80,12 @@ Mutual TLS via the :ref:`TLS client authentication transport <transport-tcp+tlsc
 Configure source server A
 -------------------------
 
-.. literalinclude:: ../../config/samples/quickstart_fan_out_replication_source.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_fan_out_replication_source.yml
 
 Configure each target server
 ----------------------------
 
-.. literalinclude:: ../../config/samples/quickstart_fan_out_replication_target.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_fan_out_replication_target.yml
 
 Go Back To Quickstart Guide
 ---------------------------
diff --git a/cli/cli.go b/internal/cli/cli.go
similarity index 97%
rename from cli/cli.go
rename to internal/cli/cli.go
index a88cfe7..1cee802 100644
--- a/cli/cli.go
+++ b/internal/cli/cli.go
@@ -8,9 +8,9 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
 )
 
 var rootArgs struct {
diff --git a/client/configcheck.go b/internal/client/configcheck.go
similarity index 93%
rename from client/configcheck.go
rename to internal/client/configcheck.go
index 15b9b4a..2bfaeec 100644
--- a/client/configcheck.go
+++ b/internal/client/configcheck.go
@@ -11,11 +11,11 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/zrepl/yaml-config"
 
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/job"
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/cli"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/job"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 var configcheckArgs struct {
diff --git a/client/jsonclient.go b/internal/client/jsonclient.go
similarity index 100%
rename from client/jsonclient.go
rename to internal/client/jsonclient.go
diff --git a/client/migrate.go b/internal/client/migrate.go
similarity index 97%
rename from client/migrate.go
rename to internal/client/migrate.go
index eddb787..ae252f9 100644
--- a/client/migrate.go
+++ b/internal/client/migrate.go
@@ -9,12 +9,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/daemon/job"
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/daemon/job"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/zfs"
 
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/cli"
+	"github.com/zrepl/zrepl/internal/config"
 )
 
 var (
diff --git a/client/migrate_test.go b/internal/client/migrate_test.go
similarity index 100%
rename from client/migrate_test.go
rename to internal/client/migrate_test.go
diff --git a/client/pprof.go b/internal/client/pprof.go
similarity index 80%
rename from client/pprof.go
rename to internal/client/pprof.go
index 96d36ef..f4b3413 100644
--- a/client/pprof.go
+++ b/internal/client/pprof.go
@@ -1,6 +1,6 @@
 package client
 
-import "github.com/zrepl/zrepl/cli"
+import "github.com/zrepl/zrepl/internal/cli"
 
 var PprofCmd = &cli.Subcommand{
 	Use: "pprof",
diff --git a/client/pprof_activity_trace.go b/internal/client/pprof_activity_trace.go
similarity index 95%
rename from client/pprof_activity_trace.go
rename to internal/client/pprof_activity_trace.go
index 12658fc..e5dad64 100644
--- a/client/pprof_activity_trace.go
+++ b/internal/client/pprof_activity_trace.go
@@ -8,7 +8,7 @@ import (
 
 	"golang.org/x/net/websocket"
 
-	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/internal/cli"
 )
 
 var pprofActivityTraceCmd = &cli.Subcommand{
diff --git a/client/pprof_listen.go b/internal/client/pprof_listen.go
similarity index 92%
rename from client/pprof_listen.go
rename to internal/client/pprof_listen.go
index e1d79f1..0560236 100644
--- a/client/pprof_listen.go
+++ b/internal/client/pprof_listen.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon"
+	"github.com/zrepl/zrepl/internal/cli"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon"
 )
 
 var pprofListenCmd struct {
diff --git a/client/signal.go b/internal/client/signal.go
similarity index 86%
rename from client/signal.go
rename to internal/client/signal.go
index 27eea32..07a923b 100644
--- a/client/signal.go
+++ b/internal/client/signal.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon"
+	"github.com/zrepl/zrepl/internal/cli"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon"
 )
 
 var SignalCmd = &cli.Subcommand{
diff --git a/client/status/client/client.go b/internal/client/status/client/client.go
similarity index 98%
rename from client/status/client/client.go
rename to internal/client/status/client/client.go
index 350031e..95c1494 100644
--- a/client/status/client/client.go
+++ b/internal/client/status/client/client.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/daemon"
+	"github.com/zrepl/zrepl/internal/daemon"
 )
 
 type Client struct {
diff --git a/client/status/status.go b/internal/client/status/status.go
similarity index 91%
rename from client/status/status.go
rename to internal/client/status/status.go
index 4eb0b16..e77712f 100644
--- a/client/status/status.go
+++ b/internal/client/status/status.go
@@ -9,11 +9,11 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/client/status/client"
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon"
-	"github.com/zrepl/zrepl/util/choices"
+	"github.com/zrepl/zrepl/internal/cli"
+	"github.com/zrepl/zrepl/internal/client/status/client"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon"
+	"github.com/zrepl/zrepl/internal/util/choices"
 )
 
 type Client interface {
diff --git a/client/status/status_dump.go b/internal/client/status/status_dump.go
similarity index 95%
rename from client/status/status_dump.go
rename to internal/client/status/status_dump.go
index 6a0b113..c071697 100644
--- a/client/status/status_dump.go
+++ b/internal/client/status/status_dump.go
@@ -9,7 +9,7 @@ import (
 	"github.com/mattn/go-isatty"
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/client/status/viewmodel"
+	"github.com/zrepl/zrepl/internal/client/status/viewmodel"
 )
 
 func dump(c Client, job string) error {
diff --git a/client/status/status_interactive.go b/internal/client/status/status_interactive.go
similarity index 99%
rename from client/status/status_interactive.go
rename to internal/client/status/status_interactive.go
index 30f25bf..2abfd1e 100644
--- a/client/status/status_interactive.go
+++ b/internal/client/status/status_interactive.go
@@ -10,7 +10,7 @@ import (
 	tview "code.rocketnine.space/tslocum/cview"
 	"github.com/gdamore/tcell/v2"
 
-	"github.com/zrepl/zrepl/client/status/viewmodel"
+	"github.com/zrepl/zrepl/internal/client/status/viewmodel"
 )
 
 func interactive(c Client, flag statusFlags) error {
diff --git a/client/status/status_legacy.go b/internal/client/status/status_legacy.go
similarity index 98%
rename from client/status/status_legacy.go
rename to internal/client/status/status_legacy.go
index 6b8e22e..db898de 100644
--- a/client/status/status_legacy.go
+++ b/internal/client/status/status_legacy.go
@@ -12,7 +12,7 @@ import (
 	"github.com/mattn/go-isatty"
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/client/status/viewmodel"
+	"github.com/zrepl/zrepl/internal/client/status/viewmodel"
 )
 
 func legacy(c Client, flag statusFlags) error {
diff --git a/client/status/status_raw.go b/internal/client/status/status_raw.go
similarity index 100%
rename from client/status/status_raw.go
rename to internal/client/status/status_raw.go
diff --git a/client/status/viewmodel/bytecountbinary.go b/internal/client/status/viewmodel/bytecountbinary.go
similarity index 100%
rename from client/status/viewmodel/bytecountbinary.go
rename to internal/client/status/viewmodel/bytecountbinary.go
diff --git a/client/status/viewmodel/bytesprogresshistory.go b/internal/client/status/viewmodel/bytesprogresshistory.go
similarity index 100%
rename from client/status/viewmodel/bytesprogresshistory.go
rename to internal/client/status/viewmodel/bytesprogresshistory.go
diff --git a/client/status/viewmodel/render.go b/internal/client/status/viewmodel/render.go
similarity index 98%
rename from client/status/viewmodel/render.go
rename to internal/client/status/viewmodel/render.go
index c72b46e..971e420 100644
--- a/client/status/viewmodel/render.go
+++ b/internal/client/status/viewmodel/render.go
@@ -10,12 +10,12 @@ import (
 	"github.com/go-playground/validator/v10"
 	yaml "github.com/zrepl/yaml-config"
 
-	"github.com/zrepl/zrepl/client/status/viewmodel/stringbuilder"
-	"github.com/zrepl/zrepl/daemon"
-	"github.com/zrepl/zrepl/daemon/job"
-	"github.com/zrepl/zrepl/daemon/pruner"
-	"github.com/zrepl/zrepl/daemon/snapper"
-	"github.com/zrepl/zrepl/replication/report"
+	"github.com/zrepl/zrepl/internal/client/status/viewmodel/stringbuilder"
+	"github.com/zrepl/zrepl/internal/daemon"
+	"github.com/zrepl/zrepl/internal/daemon/job"
+	"github.com/zrepl/zrepl/internal/daemon/pruner"
+	"github.com/zrepl/zrepl/internal/daemon/snapper"
+	"github.com/zrepl/zrepl/internal/replication/report"
 )
 
 type M struct {
diff --git a/client/status/viewmodel/stringbuilder/stringbuilder.go b/internal/client/status/viewmodel/stringbuilder/stringbuilder.go
similarity index 100%
rename from client/status/viewmodel/stringbuilder/stringbuilder.go
rename to internal/client/status/viewmodel/stringbuilder/stringbuilder.go
diff --git a/client/stdinserver.go b/internal/client/stdinserver.go
similarity index 93%
rename from client/stdinserver.go
rename to internal/client/stdinserver.go
index 6800dc7..7c46cb6 100644
--- a/client/stdinserver.go
+++ b/internal/client/stdinserver.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/problame/go-netssh"
 
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/cli"
+	"github.com/zrepl/zrepl/internal/config"
 
 	"context"
 	"errors"
diff --git a/client/testcmd.go b/internal/client/testcmd.go
similarity index 97%
rename from client/testcmd.go
rename to internal/client/testcmd.go
index 145b3b8..d9fabe1 100644
--- a/client/testcmd.go
+++ b/internal/client/testcmd.go
@@ -9,10 +9,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/filters"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/cli"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 var TestCmd = &cli.Subcommand{
diff --git a/client/version.go b/internal/client/version.go
similarity index 91%
rename from client/version.go
rename to internal/client/version.go
index fe56b0c..c6485f9 100644
--- a/client/version.go
+++ b/internal/client/version.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon"
-	"github.com/zrepl/zrepl/version"
+	"github.com/zrepl/zrepl/internal/cli"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon"
+	"github.com/zrepl/zrepl/internal/version"
 )
 
 var versionArgs struct {
diff --git a/client/zfsabstractions.go b/internal/client/zfsabstractions.go
similarity index 96%
rename from client/zfsabstractions.go
rename to internal/client/zfsabstractions.go
index c747286..9660430 100644
--- a/client/zfsabstractions.go
+++ b/internal/client/zfsabstractions.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/daemon/filters"
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/cli"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 var (
diff --git a/client/zfsabstractions_create.go b/internal/client/zfsabstractions_create.go
similarity index 88%
rename from client/zfsabstractions_create.go
rename to internal/client/zfsabstractions_create.go
index 381c6e6..a81c455 100644
--- a/client/zfsabstractions_create.go
+++ b/internal/client/zfsabstractions_create.go
@@ -1,6 +1,6 @@
 package client
 
-import "github.com/zrepl/zrepl/cli"
+import "github.com/zrepl/zrepl/internal/cli"
 
 var zabsCmdCreate = &cli.Subcommand{
 	Use:             "create",
diff --git a/client/zfsabstractions_create_step_hold.go b/internal/client/zfsabstractions_create_step_hold.go
similarity index 91%
rename from client/zfsabstractions_create_step_hold.go
rename to internal/client/zfsabstractions_create_step_hold.go
index 917699b..764c25c 100644
--- a/client/zfsabstractions_create_step_hold.go
+++ b/internal/client/zfsabstractions_create_step_hold.go
@@ -7,9 +7,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/cli"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 var zabsCreateStepHoldFlags struct {
diff --git a/client/zfsabstractions_list.go b/internal/client/zfsabstractions_list.go
similarity index 93%
rename from client/zfsabstractions_list.go
rename to internal/client/zfsabstractions_list.go
index ed0c40f..db7182c 100644
--- a/client/zfsabstractions_list.go
+++ b/internal/client/zfsabstractions_list.go
@@ -11,9 +11,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/util/chainlock"
+	"github.com/zrepl/zrepl/internal/cli"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/util/chainlock"
 )
 
 var zabsListFlags struct {
diff --git a/client/zfsabstractions_release.go b/internal/client/zfsabstractions_release.go
similarity index 97%
rename from client/zfsabstractions_release.go
rename to internal/client/zfsabstractions_release.go
index cd71e2a..d928687 100644
--- a/client/zfsabstractions_release.go
+++ b/internal/client/zfsabstractions_release.go
@@ -10,8 +10,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/cli"
+	"github.com/zrepl/zrepl/internal/endpoint"
 )
 
 // shared between release-all and release-step
diff --git a/config/config.go b/internal/config/config.go
similarity index 99%
rename from config/config.go
rename to internal/config/config.go
index f27ba78..7722c6a 100644
--- a/config/config.go
+++ b/internal/config/config.go
@@ -10,8 +10,8 @@ import (
 	"github.com/robfig/cron/v3"
 	"github.com/zrepl/yaml-config"
 
-	"github.com/zrepl/zrepl/util/datasizeunit"
-	zfsprop "github.com/zrepl/zrepl/zfs/property"
+	"github.com/zrepl/zrepl/internal/util/datasizeunit"
+	zfsprop "github.com/zrepl/zrepl/internal/zfs/property"
 )
 
 type ParseFlags uint
diff --git a/config/config_dep_test.go b/internal/config/config_dep_test.go
similarity index 100%
rename from config/config_dep_test.go
rename to internal/config/config_dep_test.go
diff --git a/config/config_duration.go b/internal/config/config_duration.go
similarity index 100%
rename from config/config_duration.go
rename to internal/config/config_duration.go
diff --git a/config/config_global_test.go b/internal/config/config_global_test.go
similarity index 100%
rename from config/config_global_test.go
rename to internal/config/config_global_test.go
diff --git a/config/config_jobid_test.go b/internal/config/config_jobid_test.go
similarity index 100%
rename from config/config_jobid_test.go
rename to internal/config/config_jobid_test.go
diff --git a/config/config_minimal_test.go b/internal/config/config_minimal_test.go
similarity index 100%
rename from config/config_minimal_test.go
rename to internal/config/config_minimal_test.go
diff --git a/config/config_positiveintervalormanual_test.go b/internal/config/config_positiveintervalormanual_test.go
similarity index 100%
rename from config/config_positiveintervalormanual_test.go
rename to internal/config/config_positiveintervalormanual_test.go
diff --git a/config/config_recv_test.go b/internal/config/config_recv_test.go
similarity index 97%
rename from config/config_recv_test.go
rename to internal/config/config_recv_test.go
index d793546..774ca3f 100644
--- a/config/config_recv_test.go
+++ b/internal/config/config_recv_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	zfsprop "github.com/zrepl/zrepl/zfs/property"
+	zfsprop "github.com/zrepl/zrepl/internal/zfs/property"
 )
 
 func TestRecvOptions(t *testing.T) {
diff --git a/config/config_send_test.go b/internal/config/config_send_test.go
similarity index 100%
rename from config/config_send_test.go
rename to internal/config/config_send_test.go
diff --git a/config/config_snapshotting_test.go b/internal/config/config_snapshotting_test.go
similarity index 100%
rename from config/config_snapshotting_test.go
rename to internal/config/config_snapshotting_test.go
diff --git a/config/config_test.go b/internal/config/config_test.go
similarity index 97%
rename from config/config_test.go
rename to internal/config/config_test.go
index 52387fb..4a59399 100644
--- a/config/config_test.go
+++ b/internal/config/config_test.go
@@ -22,7 +22,7 @@ func TestSampleConfigsAreParsedWithoutErrors(t *testing.T) {
 		t.Errorf("glob failed: %+v", err)
 	}
 
-	paths = append(paths, "../packaging/systemd-default-zrepl.yml")
+	paths = append(paths, "../../packaging/systemd-default-zrepl.yml")
 
 	for _, p := range paths {
 
diff --git a/config/config_transport_test.go b/internal/config/config_transport_test.go
similarity index 100%
rename from config/config_transport_test.go
rename to internal/config/config_transport_test.go
diff --git a/config/retentiongrid.go b/internal/config/retentiongrid.go
similarity index 100%
rename from config/retentiongrid.go
rename to internal/config/retentiongrid.go
diff --git a/config/samples/bandwidth_limit.yml b/internal/config/samples/bandwidth_limit.yml
similarity index 100%
rename from config/samples/bandwidth_limit.yml
rename to internal/config/samples/bandwidth_limit.yml
diff --git a/config/samples/empty.yml b/internal/config/samples/empty.yml
similarity index 100%
rename from config/samples/empty.yml
rename to internal/config/samples/empty.yml
diff --git a/config/samples/hooks/template.sh b/internal/config/samples/hooks/template.sh
similarity index 100%
rename from config/samples/hooks/template.sh
rename to internal/config/samples/hooks/template.sh
diff --git a/config/samples/local.yml b/internal/config/samples/local.yml
similarity index 100%
rename from config/samples/local.yml
rename to internal/config/samples/local.yml
diff --git a/config/samples/pull.yml b/internal/config/samples/pull.yml
similarity index 100%
rename from config/samples/pull.yml
rename to internal/config/samples/pull.yml
diff --git a/config/samples/pull_ssh.yml b/internal/config/samples/pull_ssh.yml
similarity index 100%
rename from config/samples/pull_ssh.yml
rename to internal/config/samples/pull_ssh.yml
diff --git a/config/samples/push.yml b/internal/config/samples/push.yml
similarity index 100%
rename from config/samples/push.yml
rename to internal/config/samples/push.yml
diff --git a/config/samples/quickstart_backup_to_external_disk.yml b/internal/config/samples/quickstart_backup_to_external_disk.yml
similarity index 100%
rename from config/samples/quickstart_backup_to_external_disk.yml
rename to internal/config/samples/quickstart_backup_to_external_disk.yml
diff --git a/config/samples/quickstart_continuous_server_backup_receiver.yml b/internal/config/samples/quickstart_continuous_server_backup_receiver.yml
similarity index 100%
rename from config/samples/quickstart_continuous_server_backup_receiver.yml
rename to internal/config/samples/quickstart_continuous_server_backup_receiver.yml
diff --git a/config/samples/quickstart_continuous_server_backup_sender.yml b/internal/config/samples/quickstart_continuous_server_backup_sender.yml
similarity index 100%
rename from config/samples/quickstart_continuous_server_backup_sender.yml
rename to internal/config/samples/quickstart_continuous_server_backup_sender.yml
diff --git a/config/samples/quickstart_fan_out_replication_source.yml b/internal/config/samples/quickstart_fan_out_replication_source.yml
similarity index 100%
rename from config/samples/quickstart_fan_out_replication_source.yml
rename to internal/config/samples/quickstart_fan_out_replication_source.yml
diff --git a/config/samples/quickstart_fan_out_replication_target.yml b/internal/config/samples/quickstart_fan_out_replication_target.yml
similarity index 100%
rename from config/samples/quickstart_fan_out_replication_target.yml
rename to internal/config/samples/quickstart_fan_out_replication_target.yml
diff --git a/config/samples/sink.yml b/internal/config/samples/sink.yml
similarity index 100%
rename from config/samples/sink.yml
rename to internal/config/samples/sink.yml
diff --git a/config/samples/snap.yml b/internal/config/samples/snap.yml
similarity index 100%
rename from config/samples/snap.yml
rename to internal/config/samples/snap.yml
diff --git a/config/samples/snap_cron.yml b/internal/config/samples/snap_cron.yml
similarity index 100%
rename from config/samples/snap_cron.yml
rename to internal/config/samples/snap_cron.yml
diff --git a/config/samples/source.yml b/internal/config/samples/source.yml
similarity index 100%
rename from config/samples/source.yml
rename to internal/config/samples/source.yml
diff --git a/config/samples/source_ssh.yml b/internal/config/samples/source_ssh.yml
similarity index 100%
rename from config/samples/source_ssh.yml
rename to internal/config/samples/source_ssh.yml
diff --git a/daemon/control.go b/internal/daemon/control.go
similarity index 95%
rename from daemon/control.go
rename to internal/daemon/control.go
index 45bddb7..d74a02e 100644
--- a/daemon/control.go
+++ b/internal/daemon/control.go
@@ -14,14 +14,14 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/daemon/job"
-	"github.com/zrepl/zrepl/daemon/nethelpers"
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/util/envconst"
-	"github.com/zrepl/zrepl/version"
-	"github.com/zrepl/zrepl/zfs"
-	"github.com/zrepl/zrepl/zfs/zfscmd"
+	"github.com/zrepl/zrepl/internal/daemon/job"
+	"github.com/zrepl/zrepl/internal/daemon/nethelpers"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/util/envconst"
+	"github.com/zrepl/zrepl/internal/version"
+	"github.com/zrepl/zrepl/internal/zfs"
+	"github.com/zrepl/zrepl/internal/zfs/zfscmd"
 )
 
 type controlJob struct {
diff --git a/daemon/daemon.go b/internal/daemon/daemon.go
similarity index 91%
rename from daemon/daemon.go
rename to internal/daemon/daemon.go
index f83b758..95d1f54 100644
--- a/daemon/daemon.go
+++ b/internal/daemon/daemon.go
@@ -13,18 +13,18 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/job"
-	"github.com/zrepl/zrepl/daemon/job/reset"
-	"github.com/zrepl/zrepl/daemon/job/wakeup"
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/version"
-	"github.com/zrepl/zrepl/zfs/zfscmd"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/job"
+	"github.com/zrepl/zrepl/internal/daemon/job/reset"
+	"github.com/zrepl/zrepl/internal/daemon/job/wakeup"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/version"
+	"github.com/zrepl/zrepl/internal/zfs/zfscmd"
 )
 
 func Run(ctx context.Context, conf *config.Config) error {
diff --git a/daemon/filters/fsmapfilter.go b/internal/daemon/filters/fsmapfilter.go
similarity index 98%
rename from daemon/filters/fsmapfilter.go
rename to internal/daemon/filters/fsmapfilter.go
index b28da20..ab95c4c 100644
--- a/daemon/filters/fsmapfilter.go
+++ b/internal/daemon/filters/fsmapfilter.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type DatasetMapFilter struct {
diff --git a/daemon/filters/fsmapfilter_test.go b/internal/daemon/filters/fsmapfilter_test.go
similarity index 97%
rename from daemon/filters/fsmapfilter_test.go
rename to internal/daemon/filters/fsmapfilter_test.go
index eccd59d..1061981 100644
--- a/daemon/filters/fsmapfilter_test.go
+++ b/internal/daemon/filters/fsmapfilter_test.go
@@ -3,7 +3,7 @@ package filters
 import (
 	"testing"
 
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func TestDatasetMapFilter(t *testing.T) {
diff --git a/daemon/hooks/edge_string.go b/internal/daemon/hooks/edge_string.go
similarity index 100%
rename from daemon/hooks/edge_string.go
rename to internal/daemon/hooks/edge_string.go
diff --git a/daemon/hooks/hook_config.go b/internal/daemon/hooks/hook_config.go
similarity index 92%
rename from daemon/hooks/hook_config.go
rename to internal/daemon/hooks/hook_config.go
index 6ff193b..752d011 100644
--- a/daemon/hooks/hook_config.go
+++ b/internal/daemon/hooks/hook_config.go
@@ -3,8 +3,8 @@ package hooks
 import (
 	"fmt"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type List []Hook
diff --git a/daemon/hooks/hook_docs.go b/internal/daemon/hooks/hook_docs.go
similarity index 100%
rename from daemon/hooks/hook_docs.go
rename to internal/daemon/hooks/hook_docs.go
diff --git a/daemon/hooks/hook_exec.go b/internal/daemon/hooks/hook_exec.go
similarity index 99%
rename from daemon/hooks/hook_exec.go
rename to internal/daemon/hooks/hook_exec.go
index 299bd59..82dd6db 100644
--- a/daemon/hooks/hook_exec.go
+++ b/internal/daemon/hooks/hook_exec.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 // Re-export type here so that
diff --git a/daemon/hooks/hook_logging.go b/internal/daemon/hooks/hook_logging.go
similarity index 92%
rename from daemon/hooks/hook_logging.go
rename to internal/daemon/hooks/hook_logging.go
index e5fbe18..388d8f8 100644
--- a/daemon/hooks/hook_logging.go
+++ b/internal/daemon/hooks/hook_logging.go
@@ -6,9 +6,9 @@ import (
 	"context"
 	"sync"
 
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 type Logger = logger.Logger
diff --git a/daemon/hooks/hook_type_callback.go b/internal/daemon/hooks/hook_type_callback.go
similarity index 94%
rename from daemon/hooks/hook_type_callback.go
rename to internal/daemon/hooks/hook_type_callback.go
index 63fa5d2..bb319aa 100644
--- a/daemon/hooks/hook_type_callback.go
+++ b/internal/daemon/hooks/hook_type_callback.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/zrepl/zrepl/daemon/filters"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type HookJobCallback func(ctx context.Context) error
diff --git a/daemon/hooks/hook_type_command.go b/internal/daemon/hooks/hook_type_command.go
similarity index 95%
rename from daemon/hooks/hook_type_command.go
rename to internal/daemon/hooks/hook_type_command.go
index b1933a3..14590aa 100644
--- a/daemon/hooks/hook_type_command.go
+++ b/internal/daemon/hooks/hook_type_command.go
@@ -12,11 +12,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/filters"
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/util/circlog"
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/util/circlog"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 type HookEnvVar string
diff --git a/daemon/hooks/hook_type_mysql_lock_tables.go b/internal/daemon/hooks/hook_type_mysql_lock_tables.go
similarity index 96%
rename from daemon/hooks/hook_type_mysql_lock_tables.go
rename to internal/daemon/hooks/hook_type_mysql_lock_tables.go
index 6dbf682..77dc04e 100644
--- a/daemon/hooks/hook_type_mysql_lock_tables.go
+++ b/internal/daemon/hooks/hook_type_mysql_lock_tables.go
@@ -12,9 +12,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/filters"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 // Hook to implement the following recommmendation from MySQL docs
diff --git a/daemon/hooks/hook_type_postgres_checkpoint.go b/internal/daemon/hooks/hook_type_postgres_checkpoint.go
similarity index 94%
rename from daemon/hooks/hook_type_postgres_checkpoint.go
rename to internal/daemon/hooks/hook_type_postgres_checkpoint.go
index 60af3c3..8719381 100644
--- a/daemon/hooks/hook_type_postgres_checkpoint.go
+++ b/internal/daemon/hooks/hook_type_postgres_checkpoint.go
@@ -10,9 +10,9 @@ import (
 	"github.com/lib/pq"
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/filters"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type PgChkptHook struct {
diff --git a/daemon/hooks/hooks_test.go b/internal/daemon/hooks/hooks_test.go
similarity index 98%
rename from daemon/hooks/hooks_test.go
rename to internal/daemon/hooks/hooks_test.go
index 5e23d4d..c5a3c45 100644
--- a/daemon/hooks/hooks_test.go
+++ b/internal/daemon/hooks/hooks_test.go
@@ -11,13 +11,13 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/hooks"
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/hooks"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type comparisonAssertionFunc func(require.TestingT, interface{}, interface{}, ...interface{})
diff --git a/daemon/hooks/stepstatus_enumer.go b/internal/daemon/hooks/stepstatus_enumer.go
similarity index 100%
rename from daemon/hooks/stepstatus_enumer.go
rename to internal/daemon/hooks/stepstatus_enumer.go
diff --git a/daemon/hooks/test/test-error.sh b/internal/daemon/hooks/test/test-error.sh
similarity index 100%
rename from daemon/hooks/test/test-error.sh
rename to internal/daemon/hooks/test/test-error.sh
diff --git a/daemon/hooks/test/test-large-stdout.sh b/internal/daemon/hooks/test/test-large-stdout.sh
similarity index 100%
rename from daemon/hooks/test/test-large-stdout.sh
rename to internal/daemon/hooks/test/test-large-stdout.sh
diff --git a/daemon/hooks/test/test-post-error.sh b/internal/daemon/hooks/test/test-post-error.sh
similarity index 100%
rename from daemon/hooks/test/test-post-error.sh
rename to internal/daemon/hooks/test/test-post-error.sh
diff --git a/daemon/hooks/test/test-pre-error-post-ok.sh b/internal/daemon/hooks/test/test-pre-error-post-ok.sh
similarity index 100%
rename from daemon/hooks/test/test-pre-error-post-ok.sh
rename to internal/daemon/hooks/test/test-pre-error-post-ok.sh
diff --git a/daemon/hooks/test/test-report-env.sh b/internal/daemon/hooks/test/test-report-env.sh
similarity index 100%
rename from daemon/hooks/test/test-report-env.sh
rename to internal/daemon/hooks/test/test-report-env.sh
diff --git a/daemon/hooks/test/test-timeout.sh b/internal/daemon/hooks/test/test-timeout.sh
similarity index 100%
rename from daemon/hooks/test/test-timeout.sh
rename to internal/daemon/hooks/test/test-timeout.sh
diff --git a/daemon/job/active.go b/internal/daemon/job/active.go
similarity index 95%
rename from daemon/job/active.go
rename to internal/daemon/job/active.go
index 704e692..b00b659 100644
--- a/daemon/job/active.go
+++ b/internal/daemon/job/active.go
@@ -9,23 +9,23 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/job/reset"
-	"github.com/zrepl/zrepl/daemon/job/wakeup"
-	"github.com/zrepl/zrepl/daemon/pruner"
-	"github.com/zrepl/zrepl/daemon/snapper"
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/replication"
-	"github.com/zrepl/zrepl/replication/driver"
-	"github.com/zrepl/zrepl/replication/logic"
-	"github.com/zrepl/zrepl/replication/report"
-	"github.com/zrepl/zrepl/rpc"
-	"github.com/zrepl/zrepl/transport"
-	"github.com/zrepl/zrepl/transport/fromconfig"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/job/reset"
+	"github.com/zrepl/zrepl/internal/daemon/job/wakeup"
+	"github.com/zrepl/zrepl/internal/daemon/pruner"
+	"github.com/zrepl/zrepl/internal/daemon/snapper"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/replication"
+	"github.com/zrepl/zrepl/internal/replication/driver"
+	"github.com/zrepl/zrepl/internal/replication/logic"
+	"github.com/zrepl/zrepl/internal/replication/report"
+	"github.com/zrepl/zrepl/internal/rpc"
+	"github.com/zrepl/zrepl/internal/transport"
+	"github.com/zrepl/zrepl/internal/transport/fromconfig"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type ActiveSide struct {
diff --git a/daemon/job/active_test.go b/internal/daemon/job/active_test.go
similarity index 84%
rename from daemon/job/active_test.go
rename to internal/daemon/job/active_test.go
index 0affb06..2d12d4d 100644
--- a/daemon/job/active_test.go
+++ b/internal/daemon/job/active_test.go
@@ -6,8 +6,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 func TestFakeActiveSideDirectMethodInvocationClientIdentityDoesNotPassValidityTest(t *testing.T) {
diff --git a/daemon/job/activesidestate_enumer.go b/internal/daemon/job/activesidestate_enumer.go
similarity index 100%
rename from daemon/job/activesidestate_enumer.go
rename to internal/daemon/job/activesidestate_enumer.go
diff --git a/daemon/job/build_jobs.go b/internal/daemon/job/build_jobs.go
similarity index 96%
rename from daemon/job/build_jobs.go
rename to internal/daemon/job/build_jobs.go
index dc2de92..2986750 100644
--- a/daemon/job/build_jobs.go
+++ b/internal/daemon/job/build_jobs.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/util/bandwidthlimit"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/util/bandwidthlimit"
 )
 
 func JobsFromConfig(c *config.Config, parseFlags config.ParseFlags) ([]Job, error) {
diff --git a/daemon/job/build_jobs_sendrecvoptions.go b/internal/daemon/job/build_jobs_sendrecvoptions.go
similarity index 92%
rename from daemon/job/build_jobs_sendrecvoptions.go
rename to internal/daemon/job/build_jobs_sendrecvoptions.go
index c403acc..a03e395 100644
--- a/daemon/job/build_jobs_sendrecvoptions.go
+++ b/internal/daemon/job/build_jobs_sendrecvoptions.go
@@ -3,11 +3,11 @@ package job
 import (
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/filters"
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/util/nodefault"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type SendingJobConfig interface {
diff --git a/daemon/job/build_jobs_test.go b/internal/daemon/job/build_jobs_test.go
similarity index 98%
rename from daemon/job/build_jobs_test.go
rename to internal/daemon/job/build_jobs_test.go
index ef0196a..c86a267 100644
--- a/daemon/job/build_jobs_test.go
+++ b/internal/daemon/job/build_jobs_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
 )
 
 func TestValidateReceivingSidesDoNotOverlap(t *testing.T) {
@@ -113,7 +113,7 @@ jobs:
 }
 
 func TestSampleConfigsAreBuiltWithoutErrors(t *testing.T) {
-	paths, err := filepath.Glob("../../config/samples/*")
+	paths, err := filepath.Glob("../../../internal/config/samples/*")
 	if err != nil {
 		t.Errorf("glob failed: %+v", err)
 	}
diff --git a/daemon/job/job.go b/internal/daemon/job/job.go
similarity index 92%
rename from daemon/job/job.go
rename to internal/daemon/job/job.go
index 57aeecd..d29a58b 100644
--- a/daemon/job/job.go
+++ b/internal/daemon/job/job.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type Logger = logger.Logger
diff --git a/daemon/job/passive.go b/internal/daemon/job/passive.go
similarity index 91%
rename from daemon/job/passive.go
rename to internal/daemon/job/passive.go
index b6f99b8..871fb06 100644
--- a/daemon/job/passive.go
+++ b/internal/daemon/job/passive.go
@@ -7,16 +7,16 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/daemon/snapper"
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/rpc"
-	"github.com/zrepl/zrepl/transport"
-	"github.com/zrepl/zrepl/transport/fromconfig"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/daemon/snapper"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/rpc"
+	"github.com/zrepl/zrepl/internal/transport"
+	"github.com/zrepl/zrepl/internal/transport/fromconfig"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type PassiveSide struct {
diff --git a/daemon/job/reset/reset.go b/internal/daemon/job/reset/reset.go
similarity index 100%
rename from daemon/job/reset/reset.go
rename to internal/daemon/job/reset/reset.go
diff --git a/daemon/job/snapjob.go b/internal/daemon/job/snapjob.go
similarity index 90%
rename from daemon/job/snapjob.go
rename to internal/daemon/job/snapjob.go
index 700bfbb..7b09199 100644
--- a/daemon/job/snapjob.go
+++ b/internal/daemon/job/snapjob.go
@@ -9,18 +9,18 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
-	"github.com/zrepl/zrepl/util/bandwidthlimit"
-	"github.com/zrepl/zrepl/util/nodefault"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/util/bandwidthlimit"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/filters"
-	"github.com/zrepl/zrepl/daemon/job/wakeup"
-	"github.com/zrepl/zrepl/daemon/pruner"
-	"github.com/zrepl/zrepl/daemon/snapper"
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/replication/logic/pdu"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
+	"github.com/zrepl/zrepl/internal/daemon/job/wakeup"
+	"github.com/zrepl/zrepl/internal/daemon/pruner"
+	"github.com/zrepl/zrepl/internal/daemon/snapper"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/replication/logic/pdu"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type SnapJob struct {
diff --git a/daemon/job/wakeup/wakeup.go b/internal/daemon/job/wakeup/wakeup.go
similarity index 100%
rename from daemon/job/wakeup/wakeup.go
rename to internal/daemon/job/wakeup/wakeup.go
diff --git a/daemon/logging/build_logging.go b/internal/daemon/logging/build_logging.go
similarity index 97%
rename from daemon/logging/build_logging.go
rename to internal/daemon/logging/build_logging.go
index 0aff33e..ece5bb1 100644
--- a/daemon/logging/build_logging.go
+++ b/internal/daemon/logging/build_logging.go
@@ -10,10 +10,10 @@ import (
 	"github.com/mattn/go-isatty"
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/logging/trace"
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/tlsconf"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/tlsconf"
 )
 
 func OutletsFromConfig(in config.LoggingOutletEnumList) (*logger.Outlets, error) {
diff --git a/daemon/logging/logging_context.go b/internal/daemon/logging/logging_context.go
similarity index 100%
rename from daemon/logging/logging_context.go
rename to internal/daemon/logging/logging_context.go
diff --git a/daemon/logging/logging_formatters.go b/internal/daemon/logging/logging_formatters.go
similarity index 99%
rename from daemon/logging/logging_formatters.go
rename to internal/daemon/logging/logging_formatters.go
index eacbeeb..aec7592 100644
--- a/daemon/logging/logging_formatters.go
+++ b/internal/daemon/logging/logging_formatters.go
@@ -10,7 +10,7 @@ import (
 	"github.com/go-logfmt/logfmt"
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 const (
diff --git a/daemon/logging/logging_outlets.go b/internal/daemon/logging/logging_outlets.go
similarity index 98%
rename from daemon/logging/logging_outlets.go
rename to internal/daemon/logging/logging_outlets.go
index b1638e8..e07ccf4 100644
--- a/daemon/logging/logging_outlets.go
+++ b/internal/daemon/logging/logging_outlets.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 type EntryFormatter interface {
diff --git a/daemon/logging/trace/trace.go b/internal/daemon/logging/trace/trace.go
similarity index 99%
rename from daemon/logging/trace/trace.go
rename to internal/daemon/logging/trace/trace.go
index ee39ece..18c08fd 100644
--- a/daemon/logging/trace/trace.go
+++ b/internal/daemon/logging/trace/trace.go
@@ -99,7 +99,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/util/chainlock"
+	"github.com/zrepl/zrepl/internal/util/chainlock"
 )
 
 var metrics struct {
diff --git a/daemon/logging/trace/trace_callback.go b/internal/daemon/logging/trace/trace_callback.go
similarity index 95%
rename from daemon/logging/trace/trace_callback.go
rename to internal/daemon/logging/trace/trace_callback.go
index 1ecdc41..1f49ea1 100644
--- a/daemon/logging/trace/trace_callback.go
+++ b/internal/daemon/logging/trace/trace_callback.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/zrepl/zrepl/util/chainlock"
+	"github.com/zrepl/zrepl/internal/util/chainlock"
 )
 
 type SpanInfo interface {
diff --git a/daemon/logging/trace/trace_chrometrace.go b/internal/daemon/logging/trace/trace_chrometrace.go
similarity index 99%
rename from daemon/logging/trace/trace_chrometrace.go
rename to internal/daemon/logging/trace/trace_chrometrace.go
index e80f2b7..591a265 100644
--- a/daemon/logging/trace/trace_chrometrace.go
+++ b/internal/daemon/logging/trace/trace_chrometrace.go
@@ -24,7 +24,7 @@ import (
 
 	"golang.org/x/net/websocket"
 
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 var chrometracePID string
diff --git a/daemon/logging/trace/trace_context.go b/internal/daemon/logging/trace/trace_context.go
similarity index 100%
rename from daemon/logging/trace/trace_context.go
rename to internal/daemon/logging/trace/trace_context.go
diff --git a/daemon/logging/trace/trace_convenience.go b/internal/daemon/logging/trace/trace_convenience.go
similarity index 100%
rename from daemon/logging/trace/trace_convenience.go
rename to internal/daemon/logging/trace/trace_convenience.go
diff --git a/daemon/logging/trace/trace_convenience_test.go b/internal/daemon/logging/trace/trace_convenience_test.go
similarity index 94%
rename from daemon/logging/trace/trace_convenience_test.go
rename to internal/daemon/logging/trace/trace_convenience_test.go
index ce2a07b..a85b9b4 100644
--- a/daemon/logging/trace/trace_convenience_test.go
+++ b/internal/daemon/logging/trace/trace_convenience_test.go
@@ -15,7 +15,7 @@ func TestGetCallerOrPanic(t *testing.T) {
 	}
 	ret := withStackFromCtxMock()
 	// zrepl prefix is stripped
-	assert.Equal(t, "daemon/logging/trace.TestGetCallerOrPanic", ret)
+	assert.Equal(t, "internal/daemon/logging/trace.TestGetCallerOrPanic", ret)
 }
 
 func TestWithTaskGroupRunTasksConcurrently(t *testing.T) {
diff --git a/daemon/logging/trace/trace_debug.go b/internal/daemon/logging/trace/trace_debug.go
similarity index 85%
rename from daemon/logging/trace/trace_debug.go
rename to internal/daemon/logging/trace/trace_debug.go
index c12f80f..b433493 100644
--- a/daemon/logging/trace/trace_debug.go
+++ b/internal/daemon/logging/trace/trace_debug.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 const debugEnabledEnvVar = "ZREPL_TRACE_DEBUG_ENABLED"
diff --git a/daemon/logging/trace/trace_genID.go b/internal/daemon/logging/trace/trace_genID.go
similarity index 92%
rename from daemon/logging/trace/trace_genID.go
rename to internal/daemon/logging/trace/trace_genID.go
index f8ac7bf..f6a8a50 100644
--- a/daemon/logging/trace/trace_genID.go
+++ b/internal/daemon/logging/trace/trace_genID.go
@@ -5,7 +5,7 @@ import (
 	"encoding/base64"
 	"strings"
 
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 var genIdNumBytes = envconst.Int("ZREPL_TRACE_ID_NUM_BYTES", 3)
diff --git a/daemon/logging/trace/trace_test.go b/internal/daemon/logging/trace/trace_test.go
similarity index 100%
rename from daemon/logging/trace/trace_test.go
rename to internal/daemon/logging/trace/trace_test.go
diff --git a/daemon/logging/trace/trace_unique_concurrent_task_namer.go b/internal/daemon/logging/trace/trace_unique_concurrent_task_namer.go
similarity index 100%
rename from daemon/logging/trace/trace_unique_concurrent_task_namer.go
rename to internal/daemon/logging/trace/trace_unique_concurrent_task_namer.go
diff --git a/daemon/logging/trace/trace_unique_concurrent_task_namer_test.go b/internal/daemon/logging/trace/trace_unique_concurrent_task_namer_test.go
similarity index 100%
rename from daemon/logging/trace/trace_unique_concurrent_task_namer_test.go
rename to internal/daemon/logging/trace/trace_unique_concurrent_task_namer_test.go
diff --git a/daemon/main.go b/internal/daemon/main.go
similarity index 77%
rename from daemon/main.go
rename to internal/daemon/main.go
index fe8c2e2..dd24686 100644
--- a/daemon/main.go
+++ b/internal/daemon/main.go
@@ -3,8 +3,8 @@ package daemon
 import (
 	"context"
 
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/cli"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 type Logger = logger.Logger
diff --git a/daemon/nethelpers/helpers.go b/internal/daemon/nethelpers/helpers.go
similarity index 100%
rename from daemon/nethelpers/helpers.go
rename to internal/daemon/nethelpers/helpers.go
diff --git a/daemon/pprof.go b/internal/daemon/pprof.go
similarity index 95%
rename from daemon/pprof.go
rename to internal/daemon/pprof.go
index 8c85ae3..ada2689 100644
--- a/daemon/pprof.go
+++ b/internal/daemon/pprof.go
@@ -11,8 +11,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"golang.org/x/net/websocket"
 
-	"github.com/zrepl/zrepl/daemon/job"
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/job"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
 )
 
 type pprofServer struct {
diff --git a/daemon/prometheus.go b/internal/daemon/prometheus.go
similarity index 86%
rename from daemon/prometheus.go
rename to internal/daemon/prometheus.go
index c63c33f..ca7f326 100644
--- a/daemon/prometheus.go
+++ b/internal/daemon/prometheus.go
@@ -8,14 +8,14 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/job"
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/rpc/dataconn/frameconn"
-	"github.com/zrepl/zrepl/util/tcpsock"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/job"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/frameconn"
+	"github.com/zrepl/zrepl/internal/util/tcpsock"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type prometheusJob struct {
diff --git a/daemon/pruner/pruner.go b/internal/daemon/pruner/pruner.go
similarity index 98%
rename from daemon/pruner/pruner.go
rename to internal/daemon/pruner/pruner.go
index e91a346..aac6b6e 100644
--- a/daemon/pruner/pruner.go
+++ b/internal/daemon/pruner/pruner.go
@@ -11,12 +11,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/pruning"
-	"github.com/zrepl/zrepl/replication/logic/pdu"
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/pruning"
+	"github.com/zrepl/zrepl/internal/replication/logic/pdu"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 // The sender in the replication setup.
diff --git a/daemon/pruner/pruner_queue.go b/internal/daemon/pruner/pruner_queue.go
similarity index 100%
rename from daemon/pruner/pruner_queue.go
rename to internal/daemon/pruner/pruner_queue.go
diff --git a/daemon/pruner/state_enumer.go b/internal/daemon/pruner/state_enumer.go
similarity index 100%
rename from daemon/pruner/state_enumer.go
rename to internal/daemon/pruner/state_enumer.go
diff --git a/daemon/snapper/cron.go b/internal/daemon/snapper/cron.go
similarity index 92%
rename from daemon/snapper/cron.go
rename to internal/daemon/snapper/cron.go
index c67a033..db3a5c1 100644
--- a/daemon/snapper/cron.go
+++ b/internal/daemon/snapper/cron.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/hooks"
-	"github.com/zrepl/zrepl/daemon/snapper/snapname"
-	"github.com/zrepl/zrepl/util/suspendresumesafetimer"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/hooks"
+	"github.com/zrepl/zrepl/internal/daemon/snapper/snapname"
+	"github.com/zrepl/zrepl/internal/util/suspendresumesafetimer"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func cronFromConfig(fsf zfs.DatasetFilter, in config.SnapshottingCron) (*Cron, error) {
diff --git a/daemon/snapper/cron_test.go b/internal/daemon/snapper/cron_test.go
similarity index 97%
rename from daemon/snapper/cron_test.go
rename to internal/daemon/snapper/cron_test.go
index c0e830b..97d088f 100644
--- a/daemon/snapper/cron_test.go
+++ b/internal/daemon/snapper/cron_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/zrepl/yaml-config"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
 )
 
 func TestCronLibraryWorks(t *testing.T) {
diff --git a/daemon/snapper/impl.go b/internal/daemon/snapper/impl.go
similarity index 96%
rename from daemon/snapper/impl.go
rename to internal/daemon/snapper/impl.go
index 2b67f63..5282f76 100644
--- a/daemon/snapper/impl.go
+++ b/internal/daemon/snapper/impl.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/zrepl/zrepl/daemon/hooks"
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/daemon/snapper/snapname"
-	"github.com/zrepl/zrepl/util/chainlock"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/daemon/hooks"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/daemon/snapper/snapname"
+	"github.com/zrepl/zrepl/internal/util/chainlock"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type planArgs struct {
diff --git a/daemon/snapper/manual.go b/internal/daemon/snapper/manual.go
similarity index 100%
rename from daemon/snapper/manual.go
rename to internal/daemon/snapper/manual.go
diff --git a/daemon/snapper/periodic.go b/internal/daemon/snapper/periodic.go
similarity index 95%
rename from daemon/snapper/periodic.go
rename to internal/daemon/snapper/periodic.go
index 612c412..a3faa07 100644
--- a/daemon/snapper/periodic.go
+++ b/internal/daemon/snapper/periodic.go
@@ -9,15 +9,15 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
-	"github.com/zrepl/zrepl/daemon/snapper/snapname"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/snapper/snapname"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/hooks"
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/util/envconst"
-	"github.com/zrepl/zrepl/util/suspendresumesafetimer"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/hooks"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/suspendresumesafetimer"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func periodicFromConfig(g *config.Global, fsf zfs.DatasetFilter, in *config.SnapshottingPeriodic) (*Periodic, error) {
diff --git a/daemon/snapper/snapname/snapname.go b/internal/daemon/snapper/snapname/snapname.go
similarity index 92%
rename from daemon/snapper/snapname/snapname.go
rename to internal/daemon/snapper/snapname/snapname.go
index 91b4831..f09bb65 100644
--- a/daemon/snapper/snapname/snapname.go
+++ b/internal/daemon/snapper/snapname/snapname.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/daemon/snapper/snapname/timestamp"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/daemon/snapper/snapname/timestamp"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type Formatter struct {
diff --git a/daemon/snapper/snapname/timestamp/timestamp.go b/internal/daemon/snapper/snapname/timestamp/timestamp.go
similarity index 100%
rename from daemon/snapper/snapname/timestamp/timestamp.go
rename to internal/daemon/snapper/snapname/timestamp/timestamp.go
diff --git a/daemon/snapper/snapname/timestamp/timestamp_test.go b/internal/daemon/snapper/snapname/timestamp/timestamp_test.go
similarity index 100%
rename from daemon/snapper/snapname/timestamp/timestamp_test.go
rename to internal/daemon/snapper/snapname/timestamp/timestamp_test.go
diff --git a/daemon/snapper/snapper.go b/internal/daemon/snapper/snapper.go
similarity index 90%
rename from daemon/snapper/snapper.go
rename to internal/daemon/snapper/snapper.go
index e2bc966..6d7ae65 100644
--- a/daemon/snapper/snapper.go
+++ b/internal/daemon/snapper/snapper.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type Type string
diff --git a/daemon/snapper/snapstate_string.go b/internal/daemon/snapper/snapstate_string.go
similarity index 100%
rename from daemon/snapper/snapstate_string.go
rename to internal/daemon/snapper/snapstate_string.go
diff --git a/daemon/snapper/state_string.go b/internal/daemon/snapper/state_string.go
similarity index 100%
rename from daemon/snapper/state_string.go
rename to internal/daemon/snapper/state_string.go
diff --git a/daemon/snapper/util.go b/internal/daemon/snapper/util.go
similarity index 74%
rename from daemon/snapper/util.go
rename to internal/daemon/snapper/util.go
index 7d02151..cb9c586 100644
--- a/daemon/snapper/util.go
+++ b/internal/daemon/snapper/util.go
@@ -3,8 +3,8 @@ package snapper
 import (
 	"context"
 
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 type Logger = logger.Logger
diff --git a/endpoint/context.go b/internal/endpoint/context.go
similarity index 72%
rename from endpoint/context.go
rename to internal/endpoint/context.go
index 2974cfc..0175cc1 100644
--- a/endpoint/context.go
+++ b/internal/endpoint/context.go
@@ -3,8 +3,8 @@ package endpoint
 import (
 	"context"
 
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 type contextKey int
diff --git a/endpoint/endpoint.go b/internal/endpoint/endpoint.go
similarity index 98%
rename from endpoint/endpoint.go
rename to internal/endpoint/endpoint.go
index 5240443..d8cf736 100644
--- a/endpoint/endpoint.go
+++ b/internal/endpoint/endpoint.go
@@ -12,16 +12,16 @@ import (
 	"github.com/kr/pretty"
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
 
-	"github.com/zrepl/zrepl/replication/logic/pdu"
-	"github.com/zrepl/zrepl/util/bandwidthlimit"
-	"github.com/zrepl/zrepl/util/chainedio"
-	"github.com/zrepl/zrepl/util/chainlock"
-	"github.com/zrepl/zrepl/util/envconst"
-	"github.com/zrepl/zrepl/util/nodefault"
-	"github.com/zrepl/zrepl/zfs"
-	zfsprop "github.com/zrepl/zrepl/zfs/property"
+	"github.com/zrepl/zrepl/internal/replication/logic/pdu"
+	"github.com/zrepl/zrepl/internal/util/bandwidthlimit"
+	"github.com/zrepl/zrepl/internal/util/chainedio"
+	"github.com/zrepl/zrepl/internal/util/chainlock"
+	"github.com/zrepl/zrepl/internal/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
+	"github.com/zrepl/zrepl/internal/zfs"
+	zfsprop "github.com/zrepl/zrepl/internal/zfs/property"
 )
 
 type SenderConfig struct {
diff --git a/endpoint/endpoint_abstractions_cache.go b/internal/endpoint/endpoint_abstractions_cache.go
similarity index 98%
rename from endpoint/endpoint_abstractions_cache.go
rename to internal/endpoint/endpoint_abstractions_cache.go
index 2ba2f3e..ad9ce4d 100644
--- a/endpoint/endpoint_abstractions_cache.go
+++ b/internal/endpoint/endpoint_abstractions_cache.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
-	"github.com/zrepl/zrepl/util/chainlock"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/util/chainlock"
 )
 
 var abstractionsCacheMetrics struct {
diff --git a/endpoint/endpoint_guarantees.go b/internal/endpoint/endpoint_guarantees.go
similarity index 98%
rename from endpoint/endpoint_guarantees.go
rename to internal/endpoint/endpoint_guarantees.go
index 8a125aa..f624eea 100644
--- a/endpoint/endpoint_guarantees.go
+++ b/internal/endpoint/endpoint_guarantees.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/replication/logic/pdu"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/replication/logic/pdu"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type ReplicationGuaranteeOptions struct {
diff --git a/endpoint/endpoint_metrics.go b/internal/endpoint/endpoint_metrics.go
similarity index 100%
rename from endpoint/endpoint_metrics.go
rename to internal/endpoint/endpoint_metrics.go
diff --git a/endpoint/endpoint_zfs_abstraction.go b/internal/endpoint/endpoint_zfs_abstraction.go
similarity index 99%
rename from endpoint/endpoint_zfs_abstraction.go
rename to internal/endpoint/endpoint_zfs_abstraction.go
index 934081c..2df425a 100644
--- a/endpoint/endpoint_zfs_abstraction.go
+++ b/internal/endpoint/endpoint_zfs_abstraction.go
@@ -11,11 +11,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
-	"github.com/zrepl/zrepl/util/envconst"
-	"github.com/zrepl/zrepl/util/nodefault"
-	"github.com/zrepl/zrepl/util/semaphore"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
+	"github.com/zrepl/zrepl/internal/util/semaphore"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type AbstractionType string
diff --git a/endpoint/endpoint_zfs_abstraction_last_received_hold.go b/internal/endpoint/endpoint_zfs_abstraction_last_received_hold.go
similarity index 98%
rename from endpoint/endpoint_zfs_abstraction_last_received_hold.go
rename to internal/endpoint/endpoint_zfs_abstraction_last_received_hold.go
index ca133a4..1daac0c 100644
--- a/endpoint/endpoint_zfs_abstraction_last_received_hold.go
+++ b/internal/endpoint/endpoint_zfs_abstraction_last_received_hold.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 const (
diff --git a/endpoint/endpoint_zfs_abstraction_replication_cursor.go b/internal/endpoint/endpoint_zfs_abstraction_replication_cursor.go
similarity index 99%
rename from endpoint/endpoint_zfs_abstraction_replication_cursor.go
rename to internal/endpoint/endpoint_zfs_abstraction_replication_cursor.go
index aaf027d..7e9d554 100644
--- a/endpoint/endpoint_zfs_abstraction_replication_cursor.go
+++ b/internal/endpoint/endpoint_zfs_abstraction_replication_cursor.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 const replicationCursorBookmarkNamePrefix = "zrepl_CURSOR"
diff --git a/endpoint/endpoint_zfs_abstraction_step_hold.go b/internal/endpoint/endpoint_zfs_abstraction_step_hold.go
similarity index 98%
rename from endpoint/endpoint_zfs_abstraction_step_hold.go
rename to internal/endpoint/endpoint_zfs_abstraction_step_hold.go
index 2a83b78..91c777e 100644
--- a/endpoint/endpoint_zfs_abstraction_step_hold.go
+++ b/internal/endpoint/endpoint_zfs_abstraction_step_hold.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 var stepHoldTagRE = regexp.MustCompile("^zrepl_STEP_J_(.+)")
diff --git a/endpoint/endpoint_zfs_abstraction_test.go b/internal/endpoint/endpoint_zfs_abstraction_test.go
similarity index 99%
rename from endpoint/endpoint_zfs_abstraction_test.go
rename to internal/endpoint/endpoint_zfs_abstraction_test.go
index 20ddc6a..50c0b8e 100644
--- a/endpoint/endpoint_zfs_abstraction_test.go
+++ b/internal/endpoint/endpoint_zfs_abstraction_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/util/nodefault"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
 )
 
 func TestCreateTXGRange(t *testing.T) {
diff --git a/endpoint/endpoint_zfs_helpers_repr.go b/internal/endpoint/endpoint_zfs_helpers_repr.go
similarity index 97%
rename from endpoint/endpoint_zfs_helpers_repr.go
rename to internal/endpoint/endpoint_zfs_helpers_repr.go
index 50dc577..f8932f2 100644
--- a/endpoint/endpoint_zfs_helpers_repr.go
+++ b/internal/endpoint/endpoint_zfs_helpers_repr.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 // returns the short name (no fs# prefix)
diff --git a/endpoint/endpoint_zfs_helpers_repr_test.go b/internal/endpoint/endpoint_zfs_helpers_repr_test.go
similarity index 100%
rename from endpoint/endpoint_zfs_helpers_repr_test.go
rename to internal/endpoint/endpoint_zfs_helpers_repr_test.go
diff --git a/endpoint/endpoint_zfs_helpers_types.go b/internal/endpoint/endpoint_zfs_helpers_types.go
similarity index 98%
rename from endpoint/endpoint_zfs_helpers_types.go
rename to internal/endpoint/endpoint_zfs_helpers_types.go
index c0892b2..ccd64cb 100644
--- a/endpoint/endpoint_zfs_helpers_types.go
+++ b/internal/endpoint/endpoint_zfs_helpers_types.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type bookmarkBasedAbstraction struct {
diff --git a/endpoint/jobid.go b/internal/endpoint/jobid.go
similarity index 97%
rename from endpoint/jobid.go
rename to internal/endpoint/jobid.go
index 0cba6f9..6391c5d 100644
--- a/endpoint/jobid.go
+++ b/internal/endpoint/jobid.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 // JobID instances returned by MakeJobID() guarantee their JobID.String()
diff --git a/endpoint/placeholdercreationencryptionproperty_enumer.go b/internal/endpoint/placeholdercreationencryptionproperty_enumer.go
similarity index 100%
rename from endpoint/placeholdercreationencryptionproperty_enumer.go
rename to internal/endpoint/placeholdercreationencryptionproperty_enumer.go
diff --git a/endpoint/replicationguaranteekind_enumer.go b/internal/endpoint/replicationguaranteekind_enumer.go
similarity index 100%
rename from endpoint/replicationguaranteekind_enumer.go
rename to internal/endpoint/replicationguaranteekind_enumer.go
diff --git a/logger/datastructures.go b/internal/logger/datastructures.go
similarity index 100%
rename from logger/datastructures.go
rename to internal/logger/datastructures.go
diff --git a/logger/logger.go b/internal/logger/logger.go
similarity index 100%
rename from logger/logger.go
rename to internal/logger/logger.go
diff --git a/logger/logger_test.go b/internal/logger/logger_test.go
similarity index 94%
rename from logger/logger_test.go
rename to internal/logger/logger_test.go
index a069244..4415684 100644
--- a/logger/logger_test.go
+++ b/internal/logger/logger_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/kr/pretty"
 
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 type TestOutlet struct {
diff --git a/logger/nulllogger.go b/internal/logger/nulllogger.go
similarity index 100%
rename from logger/nulllogger.go
rename to internal/logger/nulllogger.go
diff --git a/logger/stderrlogger.go b/internal/logger/stderrlogger.go
similarity index 100%
rename from logger/stderrlogger.go
rename to internal/logger/stderrlogger.go
diff --git a/logger/testlogger.go b/internal/logger/testlogger.go
similarity index 100%
rename from logger/testlogger.go
rename to internal/logger/testlogger.go
diff --git a/platformtest/harness/harness.go b/internal/platformtest/harness/harness.go
similarity index 95%
rename from platformtest/harness/harness.go
rename to internal/platformtest/harness/harness.go
index d8cae8e..c89e4d5 100644
--- a/platformtest/harness/harness.go
+++ b/internal/platformtest/harness/harness.go
@@ -13,13 +13,13 @@ import (
 	"github.com/fatih/color"
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/platformtest/tests"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/platformtest/tests"
 )
 
 var bold = color.New(color.Bold)
diff --git a/platformtest/harness/harness_test.go b/internal/platformtest/harness/harness_test.go
similarity index 100%
rename from platformtest/harness/harness_test.go
rename to internal/platformtest/harness/harness_test.go
diff --git a/platformtest/logmockzfs/logzfsenv b/internal/platformtest/logmockzfs/logzfsenv
similarity index 100%
rename from platformtest/logmockzfs/logzfsenv
rename to internal/platformtest/logmockzfs/logzfsenv
diff --git a/platformtest/logmockzfs/zfs b/internal/platformtest/logmockzfs/zfs
similarity index 100%
rename from platformtest/logmockzfs/zfs
rename to internal/platformtest/logmockzfs/zfs
diff --git a/platformtest/platformtest.go b/internal/platformtest/platformtest.go
similarity index 100%
rename from platformtest/platformtest.go
rename to internal/platformtest/platformtest.go
diff --git a/platformtest/platformtest_exec.go b/internal/platformtest/platformtest_exec.go
similarity index 96%
rename from platformtest/platformtest_exec.go
rename to internal/platformtest/platformtest_exec.go
index abc3105..9cc89dc 100644
--- a/platformtest/platformtest_exec.go
+++ b/internal/platformtest/platformtest_exec.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os/exec"
 
-	"github.com/zrepl/zrepl/util/circlog"
+	"github.com/zrepl/zrepl/internal/util/circlog"
 )
 
 type ex struct {
diff --git a/platformtest/platformtest_logging.go b/internal/platformtest/platformtest_logging.go
similarity index 65%
rename from platformtest/platformtest_logging.go
rename to internal/platformtest/platformtest_logging.go
index 468157c..f786c81 100644
--- a/platformtest/platformtest_logging.go
+++ b/internal/platformtest/platformtest_logging.go
@@ -3,8 +3,8 @@ package platformtest
 import (
 	"context"
 
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 type Logger = logger.Logger
diff --git a/platformtest/platformtest_ops.go b/internal/platformtest/platformtest_ops.go
similarity index 100%
rename from platformtest/platformtest_ops.go
rename to internal/platformtest/platformtest_ops.go
diff --git a/platformtest/platformtest_parser_test.go b/internal/platformtest/platformtest_parser_test.go
similarity index 100%
rename from platformtest/platformtest_parser_test.go
rename to internal/platformtest/platformtest_parser_test.go
diff --git a/platformtest/platformtest_zpool.go b/internal/platformtest/platformtest_zpool.go
similarity index 98%
rename from platformtest/platformtest_zpool.go
rename to internal/platformtest/platformtest_zpool.go
index 33ef985..74a0f9f 100644
--- a/platformtest/platformtest_zpool.go
+++ b/internal/platformtest/platformtest_zpool.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 var ZpoolExportTimeout time.Duration = 500 * time.Millisecond
diff --git a/platformtest/tests/batchDestroy.go b/internal/platformtest/tests/batchDestroy.go
similarity index 92%
rename from platformtest/tests/batchDestroy.go
rename to internal/platformtest/tests/batchDestroy.go
index d65ef7d..38dc597 100644
--- a/platformtest/tests/batchDestroy.go
+++ b/internal/platformtest/tests/batchDestroy.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func BatchDestroy(ctx *platformtest.Context) {
diff --git a/platformtest/tests/gen/gen.go b/internal/platformtest/tests/gen/gen.go
similarity index 100%
rename from platformtest/tests/gen/gen.go
rename to internal/platformtest/tests/gen/gen.go
diff --git a/platformtest/tests/generated_cases.go b/internal/platformtest/tests/generated_cases.go
similarity index 100%
rename from platformtest/tests/generated_cases.go
rename to internal/platformtest/tests/generated_cases.go
diff --git a/platformtest/tests/getNonexistent.go b/internal/platformtest/tests/getNonexistent.go
similarity index 93%
rename from platformtest/tests/getNonexistent.go
rename to internal/platformtest/tests/getNonexistent.go
index 0520b65..455a63d 100644
--- a/platformtest/tests/getNonexistent.go
+++ b/internal/platformtest/tests/getNonexistent.go
@@ -3,8 +3,8 @@ package tests
 import (
 	"fmt"
 
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func GetNonexistent(ctx *platformtest.Context) {
diff --git a/platformtest/tests/helpers.go b/internal/platformtest/tests/helpers.go
similarity index 95%
rename from platformtest/tests/helpers.go
rename to internal/platformtest/tests/helpers.go
index 505a5a4..602fd74 100644
--- a/platformtest/tests/helpers.go
+++ b/internal/platformtest/tests/helpers.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/daemon/filters"
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/util/limitio"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/util/limitio"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func sendArgVersion(ctx *platformtest.Context, fs, relName string) zfs.ZFSSendArgVersion {
diff --git a/platformtest/tests/holds.go b/internal/platformtest/tests/holds.go
similarity index 88%
rename from platformtest/tests/holds.go
rename to internal/platformtest/tests/holds.go
index f1541a7..32620b0 100644
--- a/platformtest/tests/holds.go
+++ b/internal/platformtest/tests/holds.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func HoldsWork(ctx *platformtest.Context) {
diff --git a/platformtest/tests/idempotentBookmark.go b/internal/platformtest/tests/idempotentBookmark.go
similarity index 93%
rename from platformtest/tests/idempotentBookmark.go
rename to internal/platformtest/tests/idempotentBookmark.go
index c6b2118..c38a8d3 100644
--- a/platformtest/tests/idempotentBookmark.go
+++ b/internal/platformtest/tests/idempotentBookmark.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func IdempotentBookmark(ctx *platformtest.Context) {
diff --git a/platformtest/tests/idempotentDestroy.go b/internal/platformtest/tests/idempotentDestroy.go
similarity index 94%
rename from platformtest/tests/idempotentDestroy.go
rename to internal/platformtest/tests/idempotentDestroy.go
index 4e5ad20..ae77b92 100644
--- a/platformtest/tests/idempotentDestroy.go
+++ b/internal/platformtest/tests/idempotentDestroy.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func IdempotentDestroy(ctx *platformtest.Context) {
diff --git a/platformtest/tests/idempotentHold.go b/internal/platformtest/tests/idempotentHold.go
similarity index 87%
rename from platformtest/tests/idempotentHold.go
rename to internal/platformtest/tests/idempotentHold.go
index 8b33242..5fdec70 100644
--- a/platformtest/tests/idempotentHold.go
+++ b/internal/platformtest/tests/idempotentHold.go
@@ -3,8 +3,8 @@ package tests
 import (
 	"fmt"
 
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func IdempotentHold(ctx *platformtest.Context) {
diff --git a/platformtest/tests/listFilesystemVersions.go b/internal/platformtest/tests/listFilesystemVersions.go
similarity index 98%
rename from platformtest/tests/listFilesystemVersions.go
rename to internal/platformtest/tests/listFilesystemVersions.go
index 7071b0a..9e6fe9d 100644
--- a/platformtest/tests/listFilesystemVersions.go
+++ b/internal/platformtest/tests/listFilesystemVersions.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func ListFilesystemVersionsTypeFilteringAndPrefix(t *platformtest.Context) {
diff --git a/platformtest/tests/listFilesystems.go b/internal/platformtest/tests/listFilesystems.go
similarity index 90%
rename from platformtest/tests/listFilesystems.go
rename to internal/platformtest/tests/listFilesystems.go
index f7f14d4..83d9a42 100644
--- a/platformtest/tests/listFilesystems.go
+++ b/internal/platformtest/tests/listFilesystems.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func ListFilesystemsNoFilter(t *platformtest.Context) {
diff --git a/platformtest/tests/recvForceIntoEncryptedErr.go b/internal/platformtest/tests/recvForceIntoEncryptedErr.go
similarity index 91%
rename from platformtest/tests/recvForceIntoEncryptedErr.go
rename to internal/platformtest/tests/recvForceIntoEncryptedErr.go
index 53b8a6a..01ab15b 100644
--- a/platformtest/tests/recvForceIntoEncryptedErr.go
+++ b/internal/platformtest/tests/recvForceIntoEncryptedErr.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/util/nodefault"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func ReceiveForceIntoEncryptedErr(ctx *platformtest.Context) {
diff --git a/platformtest/tests/recvRollback.go b/internal/platformtest/tests/recvRollback.go
similarity index 91%
rename from platformtest/tests/recvRollback.go
rename to internal/platformtest/tests/recvRollback.go
index fa6b395..6867d09 100644
--- a/platformtest/tests/recvRollback.go
+++ b/internal/platformtest/tests/recvRollback.go
@@ -6,9 +6,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/util/nodefault"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func ReceiveForceRollbackWorksUnencrypted(ctx *platformtest.Context) {
diff --git a/platformtest/tests/replication.go b/internal/platformtest/tests/replication.go
similarity index 98%
rename from platformtest/tests/replication.go
rename to internal/platformtest/tests/replication.go
index 1bbdd44..82a13f9 100644
--- a/platformtest/tests/replication.go
+++ b/internal/platformtest/tests/replication.go
@@ -13,19 +13,19 @@ import (
 	"github.com/kr/pretty"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/daemon/filters"
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/replication"
-	"github.com/zrepl/zrepl/replication/driver"
-	"github.com/zrepl/zrepl/replication/logic"
-	"github.com/zrepl/zrepl/replication/logic/pdu"
-	"github.com/zrepl/zrepl/replication/report"
-	"github.com/zrepl/zrepl/util/bandwidthlimit"
-	"github.com/zrepl/zrepl/util/limitio"
-	"github.com/zrepl/zrepl/util/nodefault"
-	"github.com/zrepl/zrepl/zfs"
-	zfsprop "github.com/zrepl/zrepl/zfs/property"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/replication"
+	"github.com/zrepl/zrepl/internal/replication/driver"
+	"github.com/zrepl/zrepl/internal/replication/logic"
+	"github.com/zrepl/zrepl/internal/replication/logic/pdu"
+	"github.com/zrepl/zrepl/internal/replication/report"
+	"github.com/zrepl/zrepl/internal/util/bandwidthlimit"
+	"github.com/zrepl/zrepl/internal/util/limitio"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
+	"github.com/zrepl/zrepl/internal/zfs"
+	zfsprop "github.com/zrepl/zrepl/internal/zfs/property"
 )
 
 // mimics the replication invocations of an active-side job
diff --git a/platformtest/tests/replicationCursor.go b/internal/platformtest/tests/replicationCursor.go
similarity index 95%
rename from platformtest/tests/replicationCursor.go
rename to internal/platformtest/tests/replicationCursor.go
index 2eb04af..b2d5ed0 100644
--- a/platformtest/tests/replicationCursor.go
+++ b/internal/platformtest/tests/replicationCursor.go
@@ -6,9 +6,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func CreateReplicationCursor(ctx *platformtest.Context) {
diff --git a/platformtest/tests/resumableRecvAndTokenHandling.go b/internal/platformtest/tests/resumableRecvAndTokenHandling.go
similarity index 92%
rename from platformtest/tests/resumableRecvAndTokenHandling.go
rename to internal/platformtest/tests/resumableRecvAndTokenHandling.go
index f173eda..eafe9d2 100644
--- a/platformtest/tests/resumableRecvAndTokenHandling.go
+++ b/internal/platformtest/tests/resumableRecvAndTokenHandling.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/util/nodefault"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func ResumableRecvAndTokenHandling(ctx *platformtest.Context) {
diff --git a/platformtest/tests/resumeTokenParsing.go b/internal/platformtest/tests/resumeTokenParsing.go
similarity index 97%
rename from platformtest/tests/resumeTokenParsing.go
rename to internal/platformtest/tests/resumeTokenParsing.go
index eeb29c4..0ac9fd2 100644
--- a/platformtest/tests/resumeTokenParsing.go
+++ b/internal/platformtest/tests/resumeTokenParsing.go
@@ -3,8 +3,8 @@ package tests
 import (
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type resumeTokenTest struct {
diff --git a/platformtest/tests/resumeTokensGenerate.bash b/internal/platformtest/tests/resumeTokensGenerate.bash
similarity index 100%
rename from platformtest/tests/resumeTokensGenerate.bash
rename to internal/platformtest/tests/resumeTokensGenerate.bash
diff --git a/platformtest/tests/sendArgsValidation.go b/internal/platformtest/tests/sendArgsValidation.go
similarity index 97%
rename from platformtest/tests/sendArgsValidation.go
rename to internal/platformtest/tests/sendArgsValidation.go
index c233318..c9928d2 100644
--- a/platformtest/tests/sendArgsValidation.go
+++ b/internal/platformtest/tests/sendArgsValidation.go
@@ -7,13 +7,13 @@ import (
 	"github.com/kr/pretty"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/replication/logic"
-	"github.com/zrepl/zrepl/replication/logic/pdu"
-	"github.com/zrepl/zrepl/replication/report"
-	"github.com/zrepl/zrepl/util/nodefault"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/replication/logic"
+	"github.com/zrepl/zrepl/internal/replication/logic/pdu"
+	"github.com/zrepl/zrepl/internal/replication/report"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func SendArgsValidationEncryptedSendOfUnencryptedDatasetForbidden__EncryptionSupported_true(ctx *platformtest.Context) {
diff --git a/platformtest/tests/sendStream.go b/internal/platformtest/tests/sendStream.go
similarity index 97%
rename from platformtest/tests/sendStream.go
rename to internal/platformtest/tests/sendStream.go
index 019d5c8..e279609 100644
--- a/platformtest/tests/sendStream.go
+++ b/internal/platformtest/tests/sendStream.go
@@ -12,9 +12,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sys/unix"
 
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/util/nodefault"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func sendStreamTest(ctx *platformtest.Context) *zfs.SendStream {
diff --git a/platformtest/tests/tests.go b/internal/platformtest/tests/tests.go
similarity index 84%
rename from platformtest/tests/tests.go
rename to internal/platformtest/tests/tests.go
index 9db0326..7c828ac 100644
--- a/platformtest/tests/tests.go
+++ b/internal/platformtest/tests/tests.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"runtime"
 
-	"github.com/zrepl/zrepl/platformtest"
+	"github.com/zrepl/zrepl/internal/platformtest"
 )
 
 type Case func(*platformtest.Context)
diff --git a/platformtest/tests/undestroyableSnapshotParsing.go b/internal/platformtest/tests/undestroyableSnapshotParsing.go
similarity index 91%
rename from platformtest/tests/undestroyableSnapshotParsing.go
rename to internal/platformtest/tests/undestroyableSnapshotParsing.go
index 8b6089e..4cc1385 100644
--- a/platformtest/tests/undestroyableSnapshotParsing.go
+++ b/internal/platformtest/tests/undestroyableSnapshotParsing.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/platformtest"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/platformtest"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func UndestroyableSnapshotParsing(t *platformtest.Context) {
diff --git a/pruning/keep_grid.go b/internal/pruning/keep_grid.go
similarity index 96%
rename from pruning/keep_grid.go
rename to internal/pruning/keep_grid.go
index 92f6515..b57ac8f 100644
--- a/pruning/keep_grid.go
+++ b/internal/pruning/keep_grid.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/pruning/retentiongrid"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/pruning/retentiongrid"
 )
 
 // KeepGrid fits snapshots that match a given regex into a retentiongrid.Grid,
diff --git a/pruning/keep_helpers.go b/internal/pruning/keep_helpers.go
similarity index 100%
rename from pruning/keep_helpers.go
rename to internal/pruning/keep_helpers.go
diff --git a/pruning/keep_helpers_test.go b/internal/pruning/keep_helpers_test.go
similarity index 100%
rename from pruning/keep_helpers_test.go
rename to internal/pruning/keep_helpers_test.go
diff --git a/pruning/keep_last_n.go b/internal/pruning/keep_last_n.go
similarity index 100%
rename from pruning/keep_last_n.go
rename to internal/pruning/keep_last_n.go
diff --git a/pruning/keep_last_n_test.go b/internal/pruning/keep_last_n_test.go
similarity index 100%
rename from pruning/keep_last_n_test.go
rename to internal/pruning/keep_last_n_test.go
diff --git a/pruning/keep_not_replicated.go b/internal/pruning/keep_not_replicated.go
similarity index 100%
rename from pruning/keep_not_replicated.go
rename to internal/pruning/keep_not_replicated.go
diff --git a/pruning/keep_not_replicated_test.go b/internal/pruning/keep_not_replicated_test.go
similarity index 100%
rename from pruning/keep_not_replicated_test.go
rename to internal/pruning/keep_not_replicated_test.go
diff --git a/pruning/keep_regex.go b/internal/pruning/keep_regex.go
similarity index 100%
rename from pruning/keep_regex.go
rename to internal/pruning/keep_regex.go
diff --git a/pruning/keep_regex_test.go b/internal/pruning/keep_regex_test.go
similarity index 100%
rename from pruning/keep_regex_test.go
rename to internal/pruning/keep_regex_test.go
diff --git a/pruning/pruning.go b/internal/pruning/pruning.go
similarity index 97%
rename from pruning/pruning.go
rename to internal/pruning/pruning.go
index 60a4e6d..96e3748 100644
--- a/pruning/pruning.go
+++ b/internal/pruning/pruning.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
 )
 
 type KeepRule interface {
diff --git a/pruning/pruning_test.go b/internal/pruning/pruning_test.go
similarity index 100%
rename from pruning/pruning_test.go
rename to internal/pruning/pruning_test.go
diff --git a/pruning/retentiongrid/retentiongrid.go b/internal/pruning/retentiongrid/retentiongrid.go
similarity index 100%
rename from pruning/retentiongrid/retentiongrid.go
rename to internal/pruning/retentiongrid/retentiongrid.go
diff --git a/pruning/retentiongrid/retentiongrid_test.go b/internal/pruning/retentiongrid/retentiongrid_test.go
similarity index 100%
rename from pruning/retentiongrid/retentiongrid_test.go
rename to internal/pruning/retentiongrid/retentiongrid_test.go
diff --git a/replication/design.md b/internal/replication/design.md
similarity index 100%
rename from replication/design.md
rename to internal/replication/design.md
diff --git a/replication/driver/errorclass_enumer.go b/internal/replication/driver/errorclass_enumer.go
similarity index 100%
rename from replication/driver/errorclass_enumer.go
rename to internal/replication/driver/errorclass_enumer.go
diff --git a/replication/driver/replication_driver.go b/internal/replication/driver/replication_driver.go
similarity index 99%
rename from replication/driver/replication_driver.go
rename to internal/replication/driver/replication_driver.go
index aa8adbd..a40cecc 100644
--- a/replication/driver/replication_driver.go
+++ b/internal/replication/driver/replication_driver.go
@@ -15,11 +15,11 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/zfs"
 
-	"github.com/zrepl/zrepl/replication/report"
-	"github.com/zrepl/zrepl/util/chainlock"
+	"github.com/zrepl/zrepl/internal/replication/report"
+	"github.com/zrepl/zrepl/internal/util/chainlock"
 )
 
 type interval struct {
diff --git a/replication/driver/replication_driver_debug.go b/internal/replication/driver/replication_driver_debug.go
similarity index 100%
rename from replication/driver/replication_driver_debug.go
rename to internal/replication/driver/replication_driver_debug.go
diff --git a/replication/driver/replication_driver_logging.go b/internal/replication/driver/replication_driver_logging.go
similarity index 61%
rename from replication/driver/replication_driver_logging.go
rename to internal/replication/driver/replication_driver_logging.go
index 69a4bb2..5032689 100644
--- a/replication/driver/replication_driver_logging.go
+++ b/internal/replication/driver/replication_driver_logging.go
@@ -3,8 +3,8 @@ package driver
 import (
 	"context"
 
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 func getLog(ctx context.Context) logger.Logger {
diff --git a/replication/driver/replication_driver_test.go b/internal/replication/driver/replication_driver_test.go
similarity index 98%
rename from replication/driver/replication_driver_test.go
rename to internal/replication/driver/replication_driver_test.go
index 3f7f75b..fd080cf 100644
--- a/replication/driver/replication_driver_test.go
+++ b/internal/replication/driver/replication_driver_test.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
 
-	"github.com/zrepl/zrepl/replication/report"
+	"github.com/zrepl/zrepl/internal/replication/report"
 
 	"github.com/stretchr/testify/assert"
 
diff --git a/replication/driver/replication_stepqueue.go b/internal/replication/driver/replication_stepqueue.go
similarity index 97%
rename from replication/driver/replication_stepqueue.go
rename to internal/replication/driver/replication_stepqueue.go
index bc8b066..2fd1e2e 100644
--- a/replication/driver/replication_stepqueue.go
+++ b/internal/replication/driver/replication_stepqueue.go
@@ -5,8 +5,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
-	"github.com/zrepl/zrepl/util/chainlock"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/util/chainlock"
 )
 
 type stepQueueRec struct {
diff --git a/replication/driver/replication_stepqueue_test.go b/internal/replication/driver/replication_stepqueue_test.go
similarity index 98%
rename from replication/driver/replication_stepqueue_test.go
rename to internal/replication/driver/replication_stepqueue_test.go
index d76f544..16a8fae 100644
--- a/replication/driver/replication_stepqueue_test.go
+++ b/internal/replication/driver/replication_stepqueue_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/montanaflynn/stats"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
-	"github.com/zrepl/zrepl/util/zreplcircleci"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/util/zreplcircleci"
 )
 
 func TestPqNotconcurrent(t *testing.T) {
diff --git a/replication/logic/diff/diff.go b/internal/replication/logic/diff/diff.go
similarity index 98%
rename from replication/logic/diff/diff.go
rename to internal/replication/logic/diff/diff.go
index 42ef48c..89ed4b1 100644
--- a/replication/logic/diff/diff.go
+++ b/internal/replication/logic/diff/diff.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 	"strings"
 
-	. "github.com/zrepl/zrepl/replication/logic/pdu"
+	. "github.com/zrepl/zrepl/internal/replication/logic/pdu"
 )
 
 type ConflictNoCommonAncestor struct {
diff --git a/replication/logic/diff/diff_test.go b/internal/replication/logic/diff/diff_test.go
similarity index 98%
rename from replication/logic/diff/diff_test.go
rename to internal/replication/logic/diff/diff_test.go
index d9b1511..aa75384 100644
--- a/replication/logic/diff/diff_test.go
+++ b/internal/replication/logic/diff/diff_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	. "github.com/zrepl/zrepl/replication/logic/pdu"
+	. "github.com/zrepl/zrepl/internal/replication/logic/pdu"
 )
 
 func fsvlist(fsv ...string) (r []*FilesystemVersion) {
diff --git a/replication/logic/initialreplicationautoresolution_enumer.go b/internal/replication/logic/initialreplicationautoresolution_enumer.go
similarity index 100%
rename from replication/logic/initialreplicationautoresolution_enumer.go
rename to internal/replication/logic/initialreplicationautoresolution_enumer.go
diff --git a/replication/logic/pdu/pdu.pb.go b/internal/replication/logic/pdu/pdu.pb.go
similarity index 100%
rename from replication/logic/pdu/pdu.pb.go
rename to internal/replication/logic/pdu/pdu.pb.go
diff --git a/replication/logic/pdu/pdu.proto b/internal/replication/logic/pdu/pdu.proto
similarity index 100%
rename from replication/logic/pdu/pdu.proto
rename to internal/replication/logic/pdu/pdu.proto
diff --git a/replication/logic/pdu/pdu_extras.go b/internal/replication/logic/pdu/pdu_extras.go
similarity index 98%
rename from replication/logic/pdu/pdu_extras.go
rename to internal/replication/logic/pdu/pdu_extras.go
index 8995397..00d9ede 100644
--- a/replication/logic/pdu/pdu_extras.go
+++ b/internal/replication/logic/pdu/pdu_extras.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func (v *FilesystemVersion) GetRelName() string {
diff --git a/replication/logic/pdu/pdu_grpc.pb.go b/internal/replication/logic/pdu/pdu_grpc.pb.go
similarity index 100%
rename from replication/logic/pdu/pdu_grpc.pb.go
rename to internal/replication/logic/pdu/pdu_grpc.pb.go
diff --git a/replication/logic/pdu/pdu_test.go b/internal/replication/logic/pdu/pdu_test.go
similarity index 100%
rename from replication/logic/pdu/pdu_test.go
rename to internal/replication/logic/pdu/pdu_test.go
diff --git a/replication/logic/replication_logic.go b/internal/replication/logic/replication_logic.go
similarity index 97%
rename from replication/logic/replication_logic.go
rename to internal/replication/logic/replication_logic.go
index 41a1e3b..a6609d4 100644
--- a/replication/logic/replication_logic.go
+++ b/internal/replication/logic/replication_logic.go
@@ -10,17 +10,17 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
 
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/replication/driver"
-	. "github.com/zrepl/zrepl/replication/logic/diff"
-	"github.com/zrepl/zrepl/replication/logic/pdu"
-	"github.com/zrepl/zrepl/replication/report"
-	"github.com/zrepl/zrepl/util/bytecounter"
-	"github.com/zrepl/zrepl/util/chainlock"
-	"github.com/zrepl/zrepl/util/semaphore"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/replication/driver"
+	. "github.com/zrepl/zrepl/internal/replication/logic/diff"
+	"github.com/zrepl/zrepl/internal/replication/logic/pdu"
+	"github.com/zrepl/zrepl/internal/replication/report"
+	"github.com/zrepl/zrepl/internal/util/bytecounter"
+	"github.com/zrepl/zrepl/internal/util/chainlock"
+	"github.com/zrepl/zrepl/internal/util/semaphore"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 // Endpoint represents one side of the replication.
diff --git a/replication/logic/replication_logic_context.go b/internal/replication/logic/replication_logic_context.go
similarity index 62%
rename from replication/logic/replication_logic_context.go
rename to internal/replication/logic/replication_logic_context.go
index f03bcd7..d068ff9 100644
--- a/replication/logic/replication_logic_context.go
+++ b/internal/replication/logic/replication_logic_context.go
@@ -3,8 +3,8 @@ package logic
 import (
 	"context"
 
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 func getLogger(ctx context.Context) logger.Logger {
diff --git a/replication/logic/replication_logic_policy.go b/internal/replication/logic/replication_logic_policy.go
similarity index 97%
rename from replication/logic/replication_logic_policy.go
rename to internal/replication/logic/replication_logic_policy.go
index 9042e93..7fcce3f 100644
--- a/replication/logic/replication_logic_policy.go
+++ b/internal/replication/logic/replication_logic_policy.go
@@ -7,8 +7,8 @@ import (
 	"github.com/go-playground/validator"
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/replication/logic/pdu"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/replication/logic/pdu"
 )
 
 //go:generate enumer -type=InitialReplicationAutoResolution -trimprefix=InitialReplicationAutoResolution
diff --git a/replication/replication.go b/internal/replication/replication.go
similarity index 86%
rename from replication/replication.go
rename to internal/replication/replication.go
index 8e1afe2..f66e5e4 100644
--- a/replication/replication.go
+++ b/internal/replication/replication.go
@@ -5,7 +5,7 @@ package replication
 import (
 	"context"
 
-	"github.com/zrepl/zrepl/replication/driver"
+	"github.com/zrepl/zrepl/internal/replication/driver"
 )
 
 func Do(ctx context.Context, driverConfig driver.Config, planner driver.Planner) (driver.ReportFunc, driver.WaitFunc) {
diff --git a/replication/report/replication_report.go b/internal/replication/report/replication_report.go
similarity index 100%
rename from replication/report/replication_report.go
rename to internal/replication/report/replication_report.go
diff --git a/rpc/dataconn/base2bufpool/base2bufpool.go b/internal/rpc/dataconn/base2bufpool/base2bufpool.go
similarity index 100%
rename from rpc/dataconn/base2bufpool/base2bufpool.go
rename to internal/rpc/dataconn/base2bufpool/base2bufpool.go
diff --git a/rpc/dataconn/base2bufpool/base2bufpool_test.go b/internal/rpc/dataconn/base2bufpool/base2bufpool_test.go
similarity index 100%
rename from rpc/dataconn/base2bufpool/base2bufpool_test.go
rename to internal/rpc/dataconn/base2bufpool/base2bufpool_test.go
diff --git a/rpc/dataconn/base2bufpool/nofitbehavior_enumer.go b/internal/rpc/dataconn/base2bufpool/nofitbehavior_enumer.go
similarity index 100%
rename from rpc/dataconn/base2bufpool/nofitbehavior_enumer.go
rename to internal/rpc/dataconn/base2bufpool/nofitbehavior_enumer.go
diff --git a/rpc/dataconn/dataconn_client.go b/internal/rpc/dataconn/dataconn_client.go
similarity index 97%
rename from rpc/dataconn/dataconn_client.go
rename to internal/rpc/dataconn/dataconn_client.go
index 76914db..8bbcaad 100644
--- a/rpc/dataconn/dataconn_client.go
+++ b/internal/rpc/dataconn/dataconn_client.go
@@ -9,9 +9,9 @@ import (
 
 	"google.golang.org/protobuf/proto"
 
-	"github.com/zrepl/zrepl/replication/logic/pdu"
-	"github.com/zrepl/zrepl/rpc/dataconn/stream"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/replication/logic/pdu"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/stream"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 type Client struct {
diff --git a/rpc/dataconn/dataconn_debug.go b/internal/rpc/dataconn/dataconn_debug.go
similarity index 100%
rename from rpc/dataconn/dataconn_debug.go
rename to internal/rpc/dataconn/dataconn_debug.go
diff --git a/rpc/dataconn/dataconn_server.go b/internal/rpc/dataconn/dataconn_server.go
similarity index 97%
rename from rpc/dataconn/dataconn_server.go
rename to internal/rpc/dataconn/dataconn_server.go
index dee14e0..b6bdc3e 100644
--- a/rpc/dataconn/dataconn_server.go
+++ b/internal/rpc/dataconn/dataconn_server.go
@@ -9,10 +9,10 @@ import (
 
 	"google.golang.org/protobuf/proto"
 
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/replication/logic/pdu"
-	"github.com/zrepl/zrepl/rpc/dataconn/stream"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/replication/logic/pdu"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/stream"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 // WireInterceptor has a chance to exchange the context and connection on each client connection.
diff --git a/rpc/dataconn/dataconn_shared.go b/internal/rpc/dataconn/dataconn_shared.go
similarity index 100%
rename from rpc/dataconn/dataconn_shared.go
rename to internal/rpc/dataconn/dataconn_shared.go
diff --git a/rpc/dataconn/dataconn_test.go b/internal/rpc/dataconn/dataconn_test.go
similarity index 100%
rename from rpc/dataconn/dataconn_test.go
rename to internal/rpc/dataconn/dataconn_test.go
diff --git a/rpc/dataconn/frameconn/frameconn.go b/internal/rpc/dataconn/frameconn/frameconn.go
similarity index 99%
rename from rpc/dataconn/frameconn/frameconn.go
rename to internal/rpc/dataconn/frameconn/frameconn.go
index 96ec273..b3db83a 100644
--- a/rpc/dataconn/frameconn/frameconn.go
+++ b/internal/rpc/dataconn/frameconn/frameconn.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/rpc/dataconn/base2bufpool"
-	"github.com/zrepl/zrepl/rpc/dataconn/timeoutconn"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/base2bufpool"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/timeoutconn"
 )
 
 type FrameHeader struct {
diff --git a/rpc/dataconn/frameconn/frameconn_prometheus.go b/internal/rpc/dataconn/frameconn/frameconn_prometheus.go
similarity index 100%
rename from rpc/dataconn/frameconn/frameconn_prometheus.go
rename to internal/rpc/dataconn/frameconn/frameconn_prometheus.go
diff --git a/rpc/dataconn/frameconn/frameconn_shutdown_fsm.go b/internal/rpc/dataconn/frameconn/frameconn_shutdown_fsm.go
similarity index 100%
rename from rpc/dataconn/frameconn/frameconn_shutdown_fsm.go
rename to internal/rpc/dataconn/frameconn/frameconn_shutdown_fsm.go
diff --git a/rpc/dataconn/frameconn/frameconn_test.go b/internal/rpc/dataconn/frameconn/frameconn_test.go
similarity index 100%
rename from rpc/dataconn/frameconn/frameconn_test.go
rename to internal/rpc/dataconn/frameconn/frameconn_test.go
diff --git a/rpc/dataconn/heartbeatconn/heartbeatconn.go b/internal/rpc/dataconn/heartbeatconn/heartbeatconn.go
similarity index 97%
rename from rpc/dataconn/heartbeatconn/heartbeatconn.go
rename to internal/rpc/dataconn/heartbeatconn/heartbeatconn.go
index 1769685..589b054 100644
--- a/rpc/dataconn/heartbeatconn/heartbeatconn.go
+++ b/internal/rpc/dataconn/heartbeatconn/heartbeatconn.go
@@ -6,8 +6,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/zrepl/zrepl/rpc/dataconn/frameconn"
-	"github.com/zrepl/zrepl/rpc/dataconn/timeoutconn"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/frameconn"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/timeoutconn"
 )
 
 type Conn struct {
diff --git a/rpc/dataconn/heartbeatconn/heartbeatconn_debug.go b/internal/rpc/dataconn/heartbeatconn/heartbeatconn_debug.go
similarity index 100%
rename from rpc/dataconn/heartbeatconn/heartbeatconn_debug.go
rename to internal/rpc/dataconn/heartbeatconn/heartbeatconn_debug.go
diff --git a/rpc/dataconn/heartbeatconn/heartbeatconn_test.go b/internal/rpc/dataconn/heartbeatconn/heartbeatconn_test.go
similarity index 88%
rename from rpc/dataconn/heartbeatconn/heartbeatconn_test.go
rename to internal/rpc/dataconn/heartbeatconn/heartbeatconn_test.go
index 897c1b9..2db5e44 100644
--- a/rpc/dataconn/heartbeatconn/heartbeatconn_test.go
+++ b/internal/rpc/dataconn/heartbeatconn/heartbeatconn_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/zrepl/zrepl/rpc/dataconn/frameconn"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/frameconn"
 )
 
 func TestFrameTypes(t *testing.T) {
diff --git a/rpc/dataconn/heartbeatconn/integration_test_variablereceiverate/heartbeatconn_integration_variablereceiverate.go b/internal/rpc/dataconn/heartbeatconn/integration_test_variablereceiverate/heartbeatconn_integration_variablereceiverate.go
similarity index 97%
rename from rpc/dataconn/heartbeatconn/integration_test_variablereceiverate/heartbeatconn_integration_variablereceiverate.go
rename to internal/rpc/dataconn/heartbeatconn/integration_test_variablereceiverate/heartbeatconn_integration_variablereceiverate.go
index d4c633a..4b104ac 100644
--- a/rpc/dataconn/heartbeatconn/integration_test_variablereceiverate/heartbeatconn_integration_variablereceiverate.go
+++ b/internal/rpc/dataconn/heartbeatconn/integration_test_variablereceiverate/heartbeatconn_integration_variablereceiverate.go
@@ -54,9 +54,9 @@ import (
 	"path"
 	"time"
 
-	"github.com/zrepl/zrepl/util/devnoop"
+	"github.com/zrepl/zrepl/internal/util/devnoop"
 
-	"github.com/zrepl/zrepl/rpc/dataconn/heartbeatconn"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/heartbeatconn"
 )
 
 func orDie(err error) {
diff --git a/rpc/dataconn/microbenchmark/microbenchmark.go b/internal/rpc/dataconn/microbenchmark/microbenchmark.go
similarity index 92%
rename from rpc/dataconn/microbenchmark/microbenchmark.go
rename to internal/rpc/dataconn/microbenchmark/microbenchmark.go
index 2300278..593de88 100644
--- a/rpc/dataconn/microbenchmark/microbenchmark.go
+++ b/internal/rpc/dataconn/microbenchmark/microbenchmark.go
@@ -21,12 +21,12 @@ import (
 
 	"github.com/pkg/profile"
 
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/replication/logic/pdu"
-	"github.com/zrepl/zrepl/rpc/dataconn"
-	"github.com/zrepl/zrepl/rpc/dataconn/timeoutconn"
-	"github.com/zrepl/zrepl/transport"
-	"github.com/zrepl/zrepl/util/devnoop"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/replication/logic/pdu"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/timeoutconn"
+	"github.com/zrepl/zrepl/internal/transport"
+	"github.com/zrepl/zrepl/internal/util/devnoop"
 )
 
 func orDie(err error) {
diff --git a/rpc/dataconn/stream/stream.go b/internal/rpc/dataconn/stream/stream.go
similarity index 97%
rename from rpc/dataconn/stream/stream.go
rename to internal/rpc/dataconn/stream/stream.go
index 9f7c6d2..7928ec2 100644
--- a/rpc/dataconn/stream/stream.go
+++ b/internal/rpc/dataconn/stream/stream.go
@@ -11,10 +11,10 @@ import (
 	"sync/atomic"
 	"unicode/utf8"
 
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/rpc/dataconn/base2bufpool"
-	"github.com/zrepl/zrepl/rpc/dataconn/frameconn"
-	"github.com/zrepl/zrepl/rpc/dataconn/heartbeatconn"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/base2bufpool"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/frameconn"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/heartbeatconn"
 )
 
 type Logger = logger.Logger
diff --git a/rpc/dataconn/stream/stream_conn.go b/internal/rpc/dataconn/stream/stream_conn.go
similarity index 98%
rename from rpc/dataconn/stream/stream_conn.go
rename to internal/rpc/dataconn/stream/stream_conn.go
index efed8c9..f5f36b2 100644
--- a/rpc/dataconn/stream/stream_conn.go
+++ b/internal/rpc/dataconn/stream/stream_conn.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/rpc/dataconn/heartbeatconn"
-	"github.com/zrepl/zrepl/rpc/dataconn/timeoutconn"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/heartbeatconn"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/timeoutconn"
 )
 
 type Conn struct {
diff --git a/rpc/dataconn/stream/stream_debug.go b/internal/rpc/dataconn/stream/stream_debug.go
similarity index 100%
rename from rpc/dataconn/stream/stream_debug.go
rename to internal/rpc/dataconn/stream/stream_debug.go
diff --git a/rpc/dataconn/stream/stream_test.go b/internal/rpc/dataconn/stream/stream_test.go
similarity index 94%
rename from rpc/dataconn/stream/stream_test.go
rename to internal/rpc/dataconn/stream/stream_test.go
index 5c4b0ab..f89f557 100644
--- a/rpc/dataconn/stream/stream_test.go
+++ b/internal/rpc/dataconn/stream/stream_test.go
@@ -12,9 +12,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/rpc/dataconn/heartbeatconn"
-	"github.com/zrepl/zrepl/util/socketpair"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/heartbeatconn"
+	"github.com/zrepl/zrepl/internal/util/socketpair"
 )
 
 func TestFrameTypesOk(t *testing.T) {
diff --git a/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/.gitignore b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/.gitignore
similarity index 100%
rename from rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/.gitignore
rename to internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/.gitignore
diff --git a/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/README.md b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/README.md
similarity index 100%
rename from rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/README.md
rename to internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/README.md
diff --git a/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/all.yml b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/all.yml
similarity index 100%
rename from rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/all.yml
rename to internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/all.yml
diff --git a/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/gen_files.sh b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/gen_files.sh
similarity index 100%
rename from rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/gen_files.sh
rename to internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/gen_files.sh
diff --git a/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/internal_prepare_and_run_repeated.yml b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/internal_prepare_and_run_repeated.yml
similarity index 100%
rename from rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/internal_prepare_and_run_repeated.yml
rename to internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/internal_prepare_and_run_repeated.yml
diff --git a/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/internal_run_test_prepared_single.yml b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/internal_run_test_prepared_single.yml
similarity index 100%
rename from rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/internal_run_test_prepared_single.yml
rename to internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/internal_run_test_prepared_single.yml
diff --git a/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/inventory.example b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/inventory.example
similarity index 100%
rename from rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/inventory.example
rename to internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/inventory.example
diff --git a/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/ssh.yml.j2 b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/ssh.yml.j2
similarity index 100%
rename from rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/ssh.yml.j2
rename to internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/ssh.yml.j2
diff --git a/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/tcp.yml.j2 b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/tcp.yml.j2
similarity index 100%
rename from rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/tcp.yml.j2
rename to internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/tcp.yml.j2
diff --git a/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/tls.yml.j2 b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/tls.yml.j2
similarity index 100%
rename from rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/tls.yml.j2
rename to internal/rpc/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/tls.yml.j2
diff --git a/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator.go b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator.go
similarity index 93%
rename from rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator.go
rename to internal/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator.go
index c786dba..4852a87 100644
--- a/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator.go
+++ b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator.go
@@ -11,9 +11,9 @@ import (
 	netssh "github.com/problame/go-netssh"
 	"github.com/zrepl/yaml-config"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/transport"
-	transportconfig "github.com/zrepl/zrepl/transport/fromconfig"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/transport"
+	transportconfig "github.com/zrepl/zrepl/internal/transport/fromconfig"
 )
 
 func noerror(err error) {
diff --git a/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_closewrite.go b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_closewrite.go
similarity index 98%
rename from rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_closewrite.go
rename to internal/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_closewrite.go
index 670486e..f6efe9b 100644
--- a/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_closewrite.go
+++ b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_closewrite.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"log"
 
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 type CloseWriteMode uint
diff --git a/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_deadlines.go b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_deadlines.go
similarity index 98%
rename from rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_deadlines.go
rename to internal/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_deadlines.go
index 397e9d5..90bf35f 100644
--- a/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_deadlines.go
+++ b/internal/rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_deadlines.go
@@ -8,7 +8,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 type DeadlineMode uint
diff --git a/rpc/dataconn/timeoutconn/timeoutconn.go b/internal/rpc/dataconn/timeoutconn/timeoutconn.go
similarity index 100%
rename from rpc/dataconn/timeoutconn/timeoutconn.go
rename to internal/rpc/dataconn/timeoutconn/timeoutconn.go
diff --git a/rpc/dataconn/timeoutconn/timeoutconn_readv_unsupported.go b/internal/rpc/dataconn/timeoutconn/timeoutconn_readv_unsupported.go
similarity index 100%
rename from rpc/dataconn/timeoutconn/timeoutconn_readv_unsupported.go
rename to internal/rpc/dataconn/timeoutconn/timeoutconn_readv_unsupported.go
diff --git a/rpc/dataconn/timeoutconn/timeoutconn_test.go b/internal/rpc/dataconn/timeoutconn/timeoutconn_test.go
similarity index 97%
rename from rpc/dataconn/timeoutconn/timeoutconn_test.go
rename to internal/rpc/dataconn/timeoutconn/timeoutconn_test.go
index 7e9f766..1f2b9b4 100644
--- a/rpc/dataconn/timeoutconn/timeoutconn_test.go
+++ b/internal/rpc/dataconn/timeoutconn/timeoutconn_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/util/socketpair"
-	"github.com/zrepl/zrepl/util/zreplcircleci"
+	"github.com/zrepl/zrepl/internal/util/socketpair"
+	"github.com/zrepl/zrepl/internal/util/zreplcircleci"
 )
 
 func TestReadTimeout(t *testing.T) {
diff --git a/rpc/dataconn/timeoutconn/timoutconn_readv.go b/internal/rpc/dataconn/timeoutconn/timoutconn_readv.go
similarity index 100%
rename from rpc/dataconn/timeoutconn/timoutconn_readv.go
rename to internal/rpc/dataconn/timeoutconn/timoutconn_readv.go
diff --git a/rpc/grpcclientidentity/authlistener_grpc_adaptor.go b/internal/rpc/grpcclientidentity/authlistener_grpc_adaptor.go
similarity index 98%
rename from rpc/grpcclientidentity/authlistener_grpc_adaptor.go
rename to internal/rpc/grpcclientidentity/authlistener_grpc_adaptor.go
index e3589fa..105cdbd 100644
--- a/rpc/grpcclientidentity/authlistener_grpc_adaptor.go
+++ b/internal/rpc/grpcclientidentity/authlistener_grpc_adaptor.go
@@ -21,8 +21,8 @@ import (
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/peer"
 
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 type Logger = logger.Logger
diff --git a/rpc/grpcclientidentity/example/grpcauth.proto b/internal/rpc/grpcclientidentity/example/grpcauth.proto
similarity index 100%
rename from rpc/grpcclientidentity/example/grpcauth.proto
rename to internal/rpc/grpcclientidentity/example/grpcauth.proto
diff --git a/rpc/grpcclientidentity/example/main.go b/internal/rpc/grpcclientidentity/example/main.go
similarity index 89%
rename from rpc/grpcclientidentity/example/main.go
rename to internal/rpc/grpcclientidentity/example/main.go
index 911b0c0..a1e3581 100644
--- a/rpc/grpcclientidentity/example/main.go
+++ b/internal/rpc/grpcclientidentity/example/main.go
@@ -9,11 +9,11 @@ import (
 	"os"
 	"time"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/rpc/grpcclientidentity/example/pdu"
-	"github.com/zrepl/zrepl/rpc/grpcclientidentity/grpchelper"
-	"github.com/zrepl/zrepl/transport/tcp"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/rpc/grpcclientidentity/example/pdu"
+	"github.com/zrepl/zrepl/internal/rpc/grpcclientidentity/grpchelper"
+	"github.com/zrepl/zrepl/internal/transport/tcp"
 )
 
 var args struct {
diff --git a/rpc/grpcclientidentity/example/pdu/grpcauth.pb.go b/internal/rpc/grpcclientidentity/example/pdu/grpcauth.pb.go
similarity index 100%
rename from rpc/grpcclientidentity/example/pdu/grpcauth.pb.go
rename to internal/rpc/grpcclientidentity/example/pdu/grpcauth.pb.go
diff --git a/rpc/grpcclientidentity/example/pdu/grpcauth_grpc.pb.go b/internal/rpc/grpcclientidentity/example/pdu/grpcauth_grpc.pb.go
similarity index 100%
rename from rpc/grpcclientidentity/example/pdu/grpcauth_grpc.pb.go
rename to internal/rpc/grpcclientidentity/example/pdu/grpcauth_grpc.pb.go
diff --git a/rpc/grpcclientidentity/grpchelper/authlistener_grpc_adaptor_wrapper.go b/internal/rpc/grpcclientidentity/grpchelper/authlistener_grpc_adaptor_wrapper.go
similarity index 94%
rename from rpc/grpcclientidentity/grpchelper/authlistener_grpc_adaptor_wrapper.go
rename to internal/rpc/grpcclientidentity/grpchelper/authlistener_grpc_adaptor_wrapper.go
index 382ecc2..066de5f 100644
--- a/rpc/grpcclientidentity/grpchelper/authlistener_grpc_adaptor_wrapper.go
+++ b/internal/rpc/grpcclientidentity/grpchelper/authlistener_grpc_adaptor_wrapper.go
@@ -8,10 +8,10 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/keepalive"
 
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/rpc/grpcclientidentity"
-	"github.com/zrepl/zrepl/rpc/netadaptor"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/rpc/grpcclientidentity"
+	"github.com/zrepl/zrepl/internal/rpc/netadaptor"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 // The following constants are relevant for interoperability.
diff --git a/rpc/netadaptor/authlistener_netlistener_adaptor.go b/internal/rpc/netadaptor/authlistener_netlistener_adaptor.go
similarity index 95%
rename from rpc/netadaptor/authlistener_netlistener_adaptor.go
rename to internal/rpc/netadaptor/authlistener_netlistener_adaptor.go
index 26f35e4..4575c3d 100644
--- a/rpc/netadaptor/authlistener_netlistener_adaptor.go
+++ b/internal/rpc/netadaptor/authlistener_netlistener_adaptor.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 type Logger = logger.Logger
diff --git a/rpc/rpc_client.go b/internal/rpc/rpc_client.go
similarity index 93%
rename from rpc/rpc_client.go
rename to internal/rpc/rpc_client.go
index e60213c..214ccf7 100644
--- a/rpc/rpc_client.go
+++ b/internal/rpc/rpc_client.go
@@ -12,17 +12,17 @@ import (
 
 	"google.golang.org/grpc"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
 
 	"github.com/google/uuid"
 
-	"github.com/zrepl/zrepl/replication/logic"
-	"github.com/zrepl/zrepl/replication/logic/pdu"
-	"github.com/zrepl/zrepl/rpc/dataconn"
-	"github.com/zrepl/zrepl/rpc/grpcclientidentity/grpchelper"
-	"github.com/zrepl/zrepl/rpc/versionhandshake"
-	"github.com/zrepl/zrepl/transport"
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/replication/logic"
+	"github.com/zrepl/zrepl/internal/replication/logic/pdu"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn"
+	"github.com/zrepl/zrepl/internal/rpc/grpcclientidentity/grpchelper"
+	"github.com/zrepl/zrepl/internal/rpc/versionhandshake"
+	"github.com/zrepl/zrepl/internal/transport"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 // Client implements the active side of a replication setup.
diff --git a/rpc/rpc_debug.go b/internal/rpc/rpc_debug.go
similarity index 100%
rename from rpc/rpc_debug.go
rename to internal/rpc/rpc_debug.go
diff --git a/rpc/rpc_doc.go b/internal/rpc/rpc_doc.go
similarity index 100%
rename from rpc/rpc_doc.go
rename to internal/rpc/rpc_doc.go
diff --git a/rpc/rpc_logging.go b/internal/rpc/rpc_logging.go
similarity index 81%
rename from rpc/rpc_logging.go
rename to internal/rpc/rpc_logging.go
index 12d7a69..57bbb62 100644
--- a/rpc/rpc_logging.go
+++ b/internal/rpc/rpc_logging.go
@@ -3,8 +3,8 @@ package rpc
 import (
 	"context"
 
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 type Logger = logger.Logger
diff --git a/rpc/rpc_mux.go b/internal/rpc/rpc_mux.go
similarity index 90%
rename from rpc/rpc_mux.go
rename to internal/rpc/rpc_mux.go
index b3a6f66..3d621ac 100644
--- a/rpc/rpc_mux.go
+++ b/internal/rpc/rpc_mux.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/zrepl/zrepl/rpc/transportmux"
-	"github.com/zrepl/zrepl/transport"
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/rpc/transportmux"
+	"github.com/zrepl/zrepl/internal/transport"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 type demuxedListener struct {
diff --git a/rpc/rpc_server.go b/internal/rpc/rpc_server.go
similarity index 91%
rename from rpc/rpc_server.go
rename to internal/rpc/rpc_server.go
index 7d71cd2..5db2a81 100644
--- a/rpc/rpc_server.go
+++ b/internal/rpc/rpc_server.go
@@ -4,14 +4,14 @@ import (
 	"context"
 	"time"
 
-	"github.com/zrepl/zrepl/endpoint"
-	"github.com/zrepl/zrepl/replication/logic/pdu"
-	"github.com/zrepl/zrepl/rpc/dataconn"
-	"github.com/zrepl/zrepl/rpc/grpcclientidentity"
-	"github.com/zrepl/zrepl/rpc/grpcclientidentity/grpchelper"
-	"github.com/zrepl/zrepl/rpc/versionhandshake"
-	"github.com/zrepl/zrepl/transport"
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/endpoint"
+	"github.com/zrepl/zrepl/internal/replication/logic/pdu"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn"
+	"github.com/zrepl/zrepl/internal/rpc/grpcclientidentity"
+	"github.com/zrepl/zrepl/internal/rpc/grpcclientidentity/grpchelper"
+	"github.com/zrepl/zrepl/internal/rpc/versionhandshake"
+	"github.com/zrepl/zrepl/internal/transport"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 type Handler interface {
diff --git a/rpc/transportmux/transportmux.go b/internal/rpc/transportmux/transportmux.go
similarity index 97%
rename from rpc/transportmux/transportmux.go
rename to internal/rpc/transportmux/transportmux.go
index a35c9a8..a639d85 100644
--- a/rpc/transportmux/transportmux.go
+++ b/internal/rpc/transportmux/transportmux.go
@@ -15,9 +15,9 @@ import (
 	"net"
 	"time"
 
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 type Logger = logger.Logger
diff --git a/rpc/versionhandshake/versionhandshake.go b/internal/rpc/versionhandshake/versionhandshake.go
similarity index 100%
rename from rpc/versionhandshake/versionhandshake.go
rename to internal/rpc/versionhandshake/versionhandshake.go
diff --git a/rpc/versionhandshake/versionhandshake_test.go b/internal/rpc/versionhandshake/versionhandshake_test.go
similarity index 98%
rename from rpc/versionhandshake/versionhandshake_test.go
rename to internal/rpc/versionhandshake/versionhandshake_test.go
index b45b17f..c7bc994 100644
--- a/rpc/versionhandshake/versionhandshake_test.go
+++ b/internal/rpc/versionhandshake/versionhandshake_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/util/socketpair"
+	"github.com/zrepl/zrepl/internal/util/socketpair"
 )
 
 func TestHandshakeMessage_Encode(t *testing.T) {
diff --git a/rpc/versionhandshake/versionhandshake_transport_wrappers.go b/internal/rpc/versionhandshake/versionhandshake_transport_wrappers.go
similarity index 97%
rename from rpc/versionhandshake/versionhandshake_transport_wrappers.go
rename to internal/rpc/versionhandshake/versionhandshake_transport_wrappers.go
index bc176dd..7ea4504 100644
--- a/rpc/versionhandshake/versionhandshake_transport_wrappers.go
+++ b/internal/rpc/versionhandshake/versionhandshake_transport_wrappers.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 type HandshakeConnecter struct {
diff --git a/tlsconf/tlsconf.go b/internal/tlsconf/tlsconf.go
similarity index 100%
rename from tlsconf/tlsconf.go
rename to internal/tlsconf/tlsconf.go
diff --git a/transport/fromconfig/transport_fromconfig.go b/internal/transport/fromconfig/transport_fromconfig.go
similarity index 84%
rename from transport/fromconfig/transport_fromconfig.go
rename to internal/transport/fromconfig/transport_fromconfig.go
index 9ee144f..d83d933 100644
--- a/transport/fromconfig/transport_fromconfig.go
+++ b/internal/transport/fromconfig/transport_fromconfig.go
@@ -7,12 +7,12 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/transport"
-	"github.com/zrepl/zrepl/transport/local"
-	"github.com/zrepl/zrepl/transport/ssh"
-	"github.com/zrepl/zrepl/transport/tcp"
-	"github.com/zrepl/zrepl/transport/tls"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/transport"
+	"github.com/zrepl/zrepl/internal/transport/local"
+	"github.com/zrepl/zrepl/internal/transport/ssh"
+	"github.com/zrepl/zrepl/internal/transport/tcp"
+	"github.com/zrepl/zrepl/internal/transport/tls"
 )
 
 func ListenerFactoryFromConfig(g *config.Global, in config.ServeEnum, parseFlags config.ParseFlags) (transport.AuthenticatedListenerFactory, error) {
diff --git a/transport/local/connect_local.go b/internal/transport/local/connect_local.go
similarity index 92%
rename from transport/local/connect_local.go
rename to internal/transport/local/connect_local.go
index ac82884..e109e95 100644
--- a/transport/local/connect_local.go
+++ b/internal/transport/local/connect_local.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 type LocalConnecter struct {
diff --git a/transport/local/serve_local.go b/internal/transport/local/serve_local.go
similarity index 97%
rename from transport/local/serve_local.go
rename to internal/transport/local/serve_local.go
index 84b3294..bab5b39 100644
--- a/transport/local/serve_local.go
+++ b/internal/transport/local/serve_local.go
@@ -6,9 +6,9 @@ import (
 	"net"
 	"sync"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/transport"
-	"github.com/zrepl/zrepl/util/socketpair"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/transport"
+	"github.com/zrepl/zrepl/internal/util/socketpair"
 )
 
 var localListeners struct {
diff --git a/transport/ssh/connect_ssh.go b/internal/transport/ssh/connect_ssh.go
similarity index 93%
rename from transport/ssh/connect_ssh.go
rename to internal/transport/ssh/connect_ssh.go
index 7aaea43..2f3e44e 100644
--- a/transport/ssh/connect_ssh.go
+++ b/internal/transport/ssh/connect_ssh.go
@@ -8,8 +8,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/problame/go-netssh"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 type SSHStdinserverConnecter struct {
diff --git a/transport/ssh/serve_stdinserver.go b/internal/transport/ssh/serve_stdinserver.go
similarity index 96%
rename from transport/ssh/serve_stdinserver.go
rename to internal/transport/ssh/serve_stdinserver.go
index 1c41c27..b5b9520 100644
--- a/transport/ssh/serve_stdinserver.go
+++ b/internal/transport/ssh/serve_stdinserver.go
@@ -10,9 +10,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/problame/go-netssh"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/nethelpers"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/daemon/nethelpers"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 func MultiStdinserverListenerFactoryFromConfig(g *config.Global, in *config.StdinserverServer) (transport.AuthenticatedListenerFactory, error) {
diff --git a/transport/tcp/connect_tcp.go b/internal/transport/tcp/connect_tcp.go
similarity index 85%
rename from transport/tcp/connect_tcp.go
rename to internal/transport/tcp/connect_tcp.go
index 1176512..8c21479 100644
--- a/transport/tcp/connect_tcp.go
+++ b/internal/transport/tcp/connect_tcp.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"net"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 type TCPConnecter struct {
diff --git a/transport/tcp/serve_tcp.go b/internal/transport/tcp/serve_tcp.go
similarity index 90%
rename from transport/tcp/serve_tcp.go
rename to internal/transport/tcp/serve_tcp.go
index 3764a93..a9c79f2 100644
--- a/transport/tcp/serve_tcp.go
+++ b/internal/transport/tcp/serve_tcp.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/transport"
-	"github.com/zrepl/zrepl/util/tcpsock"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/transport"
+	"github.com/zrepl/zrepl/internal/util/tcpsock"
 )
 
 func TCPListenerFactoryFromConfig(c *config.Global, in *config.TCPServe) (transport.AuthenticatedListenerFactory, error) {
diff --git a/transport/tcp/serve_tcp_ipmap.go b/internal/transport/tcp/serve_tcp_ipmap.go
similarity index 98%
rename from transport/tcp/serve_tcp_ipmap.go
rename to internal/transport/tcp/serve_tcp_ipmap.go
index 32986e2..1912883 100644
--- a/transport/tcp/serve_tcp_ipmap.go
+++ b/internal/transport/tcp/serve_tcp_ipmap.go
@@ -10,7 +10,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 type ipMapEntry struct {
diff --git a/transport/tcp/serve_tcp_ipmap_test.go b/internal/transport/tcp/serve_tcp_ipmap_test.go
similarity index 100%
rename from transport/tcp/serve_tcp_ipmap_test.go
rename to internal/transport/tcp/serve_tcp_ipmap_test.go
diff --git a/transport/tls/connect_tls.go b/internal/transport/tls/connect_tls.go
similarity index 90%
rename from transport/tls/connect_tls.go
rename to internal/transport/tls/connect_tls.go
index abf2e58..4d91629 100644
--- a/transport/tls/connect_tls.go
+++ b/internal/transport/tls/connect_tls.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/tlsconf"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/tlsconf"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 type TLSConnecter struct {
diff --git a/transport/tls/serve_tls.go b/internal/transport/tls/serve_tls.go
similarity index 93%
rename from transport/tls/serve_tls.go
rename to internal/transport/tls/serve_tls.go
index 2e60122..8422ae3 100644
--- a/transport/tls/serve_tls.go
+++ b/internal/transport/tls/serve_tls.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/tlsconf"
-	"github.com/zrepl/zrepl/transport"
-	"github.com/zrepl/zrepl/util/tcpsock"
+	"github.com/zrepl/zrepl/internal/config"
+	"github.com/zrepl/zrepl/internal/tlsconf"
+	"github.com/zrepl/zrepl/internal/transport"
+	"github.com/zrepl/zrepl/internal/util/tcpsock"
 )
 
 type TLSListenerFactory struct{}
diff --git a/transport/tls/tls_wire_adaptor.go b/internal/transport/tls/tls_wire_adaptor.go
similarity index 100%
rename from transport/tls/tls_wire_adaptor.go
rename to internal/transport/tls/tls_wire_adaptor.go
diff --git a/transport/transport.go b/internal/transport/transport.go
similarity index 89%
rename from transport/transport.go
rename to internal/transport/transport.go
index abb28ca..70c21e2 100644
--- a/transport/transport.go
+++ b/internal/transport/transport.go
@@ -9,10 +9,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/rpc/dataconn/timeoutconn"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
+	"github.com/zrepl/zrepl/internal/rpc/dataconn/timeoutconn"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type AuthConn struct {
diff --git a/util/bandwidthlimit/bandwidthlimit.go b/internal/util/bandwidthlimit/bandwidthlimit.go
similarity index 100%
rename from util/bandwidthlimit/bandwidthlimit.go
rename to internal/util/bandwidthlimit/bandwidthlimit.go
diff --git a/util/bandwidthlimit/bandwidthlimit_test.go b/internal/util/bandwidthlimit/bandwidthlimit_test.go
similarity index 100%
rename from util/bandwidthlimit/bandwidthlimit_test.go
rename to internal/util/bandwidthlimit/bandwidthlimit_test.go
diff --git a/util/bytecounter/bytecounter_readcloser.go b/internal/util/bytecounter/bytecounter_readcloser.go
similarity index 100%
rename from util/bytecounter/bytecounter_readcloser.go
rename to internal/util/bytecounter/bytecounter_readcloser.go
diff --git a/util/chainedio/chainedio_readcloser.go b/internal/util/chainedio/chainedio_readcloser.go
similarity index 100%
rename from util/chainedio/chainedio_readcloser.go
rename to internal/util/chainedio/chainedio_readcloser.go
diff --git a/util/chainlock/chainlock.go b/internal/util/chainlock/chainlock.go
similarity index 100%
rename from util/chainlock/chainlock.go
rename to internal/util/chainlock/chainlock.go
diff --git a/util/choices/choices.go b/internal/util/choices/choices.go
similarity index 100%
rename from util/choices/choices.go
rename to internal/util/choices/choices.go
diff --git a/util/choices/choices_test.go b/internal/util/choices/choices_test.go
similarity index 95%
rename from util/choices/choices_test.go
rename to internal/util/choices/choices_test.go
index 20f3382..02b5912 100644
--- a/util/choices/choices_test.go
+++ b/internal/util/choices/choices_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/util/choices"
+	"github.com/zrepl/zrepl/internal/util/choices"
 )
 
 func TestChoices(t *testing.T) {
diff --git a/util/chunking/chunking.go b/internal/util/chunking/chunking.go
similarity index 100%
rename from util/chunking/chunking.go
rename to internal/util/chunking/chunking.go
diff --git a/util/chunking/chunking_test.go b/internal/util/chunking/chunking_test.go
similarity index 100%
rename from util/chunking/chunking_test.go
rename to internal/util/chunking/chunking_test.go
diff --git a/util/circlog/circlog.go b/internal/util/circlog/circlog.go
similarity index 100%
rename from util/circlog/circlog.go
rename to internal/util/circlog/circlog.go
diff --git a/util/circlog/circlog_test.go b/internal/util/circlog/circlog_test.go
similarity index 98%
rename from util/circlog/circlog_test.go
rename to internal/util/circlog/circlog_test.go
index 068f4a6..aab2c99 100644
--- a/util/circlog/circlog_test.go
+++ b/internal/util/circlog/circlog_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/util/circlog"
+	"github.com/zrepl/zrepl/internal/util/circlog"
 )
 
 func TestCircularLog(t *testing.T) {
diff --git a/util/circlog/nextpow2int_test.go b/internal/util/circlog/nextpow2int_test.go
similarity index 100%
rename from util/circlog/nextpow2int_test.go
rename to internal/util/circlog/nextpow2int_test.go
diff --git a/util/connlogger/connlogger.go b/internal/util/connlogger/connlogger.go
similarity index 100%
rename from util/connlogger/connlogger.go
rename to internal/util/connlogger/connlogger.go
diff --git a/util/datasizeunit/datasizeunit.go b/internal/util/datasizeunit/datasizeunit.go
similarity index 100%
rename from util/datasizeunit/datasizeunit.go
rename to internal/util/datasizeunit/datasizeunit.go
diff --git a/util/datasizeunit/datasizeunit_test.go b/internal/util/datasizeunit/datasizeunit_test.go
similarity index 100%
rename from util/datasizeunit/datasizeunit_test.go
rename to internal/util/datasizeunit/datasizeunit_test.go
diff --git a/util/devnoop/devnoop.go b/internal/util/devnoop/devnoop.go
similarity index 100%
rename from util/devnoop/devnoop.go
rename to internal/util/devnoop/devnoop.go
diff --git a/util/envconst/envconst.go b/internal/util/envconst/envconst.go
similarity index 100%
rename from util/envconst/envconst.go
rename to internal/util/envconst/envconst.go
diff --git a/util/envconst/envconst_test.go b/internal/util/envconst/envconst_test.go
similarity index 95%
rename from util/envconst/envconst_test.go
rename to internal/util/envconst/envconst_test.go
index 52c7867..654e9ea 100644
--- a/util/envconst/envconst_test.go
+++ b/internal/util/envconst/envconst_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 type ExampleVarType struct{ string }
diff --git a/util/errorarray/errorarray.go b/internal/util/errorarray/errorarray.go
similarity index 100%
rename from util/errorarray/errorarray.go
rename to internal/util/errorarray/errorarray.go
diff --git a/util/iocommand/iocommand.go b/internal/util/iocommand/iocommand.go
similarity index 98%
rename from util/iocommand/iocommand.go
rename to internal/util/iocommand/iocommand.go
index fa9887e..2d46439 100644
--- a/util/iocommand/iocommand.go
+++ b/internal/util/iocommand/iocommand.go
@@ -10,7 +10,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 // An IOCommand exposes a forked process's std(in|out|err) through the io.ReadWriteCloser interface.
diff --git a/util/limitio/limitio.go b/internal/util/limitio/limitio.go
similarity index 100%
rename from util/limitio/limitio.go
rename to internal/util/limitio/limitio.go
diff --git a/util/limitio/limitio_readcloser_test.go b/internal/util/limitio/limitio_readcloser_test.go
similarity index 100%
rename from util/limitio/limitio_readcloser_test.go
rename to internal/util/limitio/limitio_readcloser_test.go
diff --git a/util/nodefault/nodefault.go b/internal/util/nodefault/nodefault.go
similarity index 100%
rename from util/nodefault/nodefault.go
rename to internal/util/nodefault/nodefault.go
diff --git a/util/nodefault/nodefault_bool.go b/internal/util/nodefault/nodefault_bool.go
similarity index 100%
rename from util/nodefault/nodefault_bool.go
rename to internal/util/nodefault/nodefault_bool.go
diff --git a/util/optionaldeadline/optionaldeadline.go b/internal/util/optionaldeadline/optionaldeadline.go
similarity index 100%
rename from util/optionaldeadline/optionaldeadline.go
rename to internal/util/optionaldeadline/optionaldeadline.go
diff --git a/util/optionaldeadline/optionaldeadline_test.go b/internal/util/optionaldeadline/optionaldeadline_test.go
similarity index 96%
rename from util/optionaldeadline/optionaldeadline_test.go
rename to internal/util/optionaldeadline/optionaldeadline_test.go
index 40dfaa2..50fe4cf 100644
--- a/util/optionaldeadline/optionaldeadline_test.go
+++ b/internal/util/optionaldeadline/optionaldeadline_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/util/chainlock"
-	"github.com/zrepl/zrepl/util/zreplcircleci"
+	"github.com/zrepl/zrepl/internal/util/chainlock"
+	"github.com/zrepl/zrepl/internal/util/zreplcircleci"
 )
 
 func TestContextWithOptionalDeadline(t *testing.T) {
diff --git a/util/semaphore/semaphore.go b/internal/util/semaphore/semaphore.go
similarity index 92%
rename from util/semaphore/semaphore.go
rename to internal/util/semaphore/semaphore.go
index 287a283..d6f5c3b 100644
--- a/util/semaphore/semaphore.go
+++ b/internal/util/semaphore/semaphore.go
@@ -5,7 +5,7 @@ import (
 
 	wsemaphore "golang.org/x/sync/semaphore"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
 )
 
 type S struct {
diff --git a/util/semaphore/semaphore_test.go b/internal/util/semaphore/semaphore_test.go
similarity index 95%
rename from util/semaphore/semaphore_test.go
rename to internal/util/semaphore/semaphore_test.go
index 7c3f9c6..2f23a51 100644
--- a/util/semaphore/semaphore_test.go
+++ b/internal/util/semaphore/semaphore_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
 )
 
 func TestSemaphore(t *testing.T) {
diff --git a/util/socketpair/socketpair.go b/internal/util/socketpair/socketpair.go
similarity index 100%
rename from util/socketpair/socketpair.go
rename to internal/util/socketpair/socketpair.go
diff --git a/util/socketpair/socketpair_test.go b/internal/util/socketpair/socketpair_test.go
similarity index 100%
rename from util/socketpair/socketpair_test.go
rename to internal/util/socketpair/socketpair_test.go
diff --git a/util/suspendresumesafetimer/suspendresumesafetimer.go b/internal/util/suspendresumesafetimer/suspendresumesafetimer.go
similarity index 98%
rename from util/suspendresumesafetimer/suspendresumesafetimer.go
rename to internal/util/suspendresumesafetimer/suspendresumesafetimer.go
index ad26678..273c091 100644
--- a/util/suspendresumesafetimer/suspendresumesafetimer.go
+++ b/internal/util/suspendresumesafetimer/suspendresumesafetimer.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 // The returned error is guaranteed to be the ctx.Err()
diff --git a/util/tcpsock/tcpsock.go b/internal/util/tcpsock/tcpsock.go
similarity index 100%
rename from util/tcpsock/tcpsock.go
rename to internal/util/tcpsock/tcpsock.go
diff --git a/util/tcpsock/tcpsock_freebind_freebsd.go b/internal/util/tcpsock/tcpsock_freebind_freebsd.go
similarity index 100%
rename from util/tcpsock/tcpsock_freebind_freebsd.go
rename to internal/util/tcpsock/tcpsock_freebind_freebsd.go
diff --git a/util/tcpsock/tcpsock_freebind_linux.go b/internal/util/tcpsock/tcpsock_freebind_linux.go
similarity index 100%
rename from util/tcpsock/tcpsock_freebind_linux.go
rename to internal/util/tcpsock/tcpsock_freebind_linux.go
diff --git a/util/tcpsock/tcpsock_freebind_unsupported.go b/internal/util/tcpsock/tcpsock_freebind_unsupported.go
similarity index 100%
rename from util/tcpsock/tcpsock_freebind_unsupported.go
rename to internal/util/tcpsock/tcpsock_freebind_unsupported.go
diff --git a/util/zreplcircleci/zreplcircleci.go b/internal/util/zreplcircleci/zreplcircleci.go
similarity index 100%
rename from util/zreplcircleci/zreplcircleci.go
rename to internal/util/zreplcircleci/zreplcircleci.go
diff --git a/version/version.go b/internal/version/version.go
similarity index 100%
rename from version/version.go
rename to internal/version/version.go
diff --git a/zfs/datasetpath_visitor.go b/internal/zfs/datasetpath_visitor.go
similarity index 100%
rename from zfs/datasetpath_visitor.go
rename to internal/zfs/datasetpath_visitor.go
diff --git a/zfs/datasetpath_visitor_test.go b/internal/zfs/datasetpath_visitor_test.go
similarity index 100%
rename from zfs/datasetpath_visitor_test.go
rename to internal/zfs/datasetpath_visitor_test.go
diff --git a/zfs/encryption.go b/internal/zfs/encryption.go
similarity index 95%
rename from zfs/encryption.go
rename to internal/zfs/encryption.go
index 5e4228e..adbfb20 100644
--- a/zfs/encryption.go
+++ b/internal/zfs/encryption.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/util/envconst"
-	"github.com/zrepl/zrepl/zfs/zfscmd"
+	"github.com/zrepl/zrepl/internal/util/envconst"
+	"github.com/zrepl/zrepl/internal/zfs/zfscmd"
 )
 
 var encryptionCLISupport struct {
diff --git a/zfs/filesystemplaceholdercreateencryptionvalue_enumer.go b/internal/zfs/filesystemplaceholdercreateencryptionvalue_enumer.go
similarity index 100%
rename from zfs/filesystemplaceholdercreateencryptionvalue_enumer.go
rename to internal/zfs/filesystemplaceholdercreateencryptionvalue_enumer.go
diff --git a/zfs/holds.go b/internal/zfs/holds.go
similarity index 97%
rename from zfs/holds.go
rename to internal/zfs/holds.go
index af17f11..9d74266 100644
--- a/zfs/holds.go
+++ b/internal/zfs/holds.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/util/envconst"
-	"github.com/zrepl/zrepl/zfs/zfscmd"
+	"github.com/zrepl/zrepl/internal/util/envconst"
+	"github.com/zrepl/zrepl/internal/zfs/zfscmd"
 )
 
 // no need for feature tests, holds have been around forever
diff --git a/zfs/mapping.go b/internal/zfs/mapping.go
similarity index 98%
rename from zfs/mapping.go
rename to internal/zfs/mapping.go
index 6be5632..bf8ca04 100644
--- a/zfs/mapping.go
+++ b/internal/zfs/mapping.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/zrepl/zrepl/zfs/zfscmd"
+	"github.com/zrepl/zrepl/internal/zfs/zfscmd"
 )
 
 type DatasetFilter interface {
diff --git a/zfs/namecheck.go b/internal/zfs/namecheck.go
similarity index 100%
rename from zfs/namecheck.go
rename to internal/zfs/namecheck.go
diff --git a/zfs/namecheck_test.go b/internal/zfs/namecheck_test.go
similarity index 100%
rename from zfs/namecheck_test.go
rename to internal/zfs/namecheck_test.go
diff --git a/zfs/placeholder.go b/internal/zfs/placeholder.go
similarity index 99%
rename from zfs/placeholder.go
rename to internal/zfs/placeholder.go
index 73cc46f..97614c9 100644
--- a/zfs/placeholder.go
+++ b/internal/zfs/placeholder.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/zfs/zfscmd"
+	"github.com/zrepl/zrepl/internal/zfs/zfscmd"
 )
 
 const (
diff --git a/zfs/prometheus.go b/internal/zfs/prometheus.go
similarity index 100%
rename from zfs/prometheus.go
rename to internal/zfs/prometheus.go
diff --git a/zfs/property/property.go b/internal/zfs/property/property.go
similarity index 100%
rename from zfs/property/property.go
rename to internal/zfs/property/property.go
diff --git a/zfs/propertysource_enumer.go b/internal/zfs/propertysource_enumer.go
similarity index 100%
rename from zfs/propertysource_enumer.go
rename to internal/zfs/propertysource_enumer.go
diff --git a/zfs/resume_token.go b/internal/zfs/resume_token.go
similarity index 98%
rename from zfs/resume_token.go
rename to internal/zfs/resume_token.go
index cf33c98..f90e9c5 100644
--- a/zfs/resume_token.go
+++ b/internal/zfs/resume_token.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/util/envconst"
-	"github.com/zrepl/zrepl/zfs/zfscmd"
+	"github.com/zrepl/zrepl/internal/util/envconst"
+	"github.com/zrepl/zrepl/internal/zfs/zfscmd"
 )
 
 // NOTE: Update ZFSSendARgs.Validate when changing fields (potentially SECURITY SENSITIVE)
diff --git a/zfs/test_helpers/exec_mapping_good.sh b/internal/zfs/test_helpers/exec_mapping_good.sh
similarity index 100%
rename from zfs/test_helpers/exec_mapping_good.sh
rename to internal/zfs/test_helpers/exec_mapping_good.sh
diff --git a/zfs/test_helpers/zfs_failer.sh b/internal/zfs/test_helpers/zfs_failer.sh
similarity index 100%
rename from zfs/test_helpers/zfs_failer.sh
rename to internal/zfs/test_helpers/zfs_failer.sh
diff --git a/zfs/versions.go b/internal/zfs/versions.go
similarity index 100%
rename from zfs/versions.go
rename to internal/zfs/versions.go
diff --git a/zfs/versions_destroy.go b/internal/zfs/versions_destroy.go
similarity index 98%
rename from zfs/versions_destroy.go
rename to internal/zfs/versions_destroy.go
index d65689d..cb22a35 100644
--- a/zfs/versions_destroy.go
+++ b/internal/zfs/versions_destroy.go
@@ -10,8 +10,8 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/zrepl/zrepl/util/envconst"
-	"github.com/zrepl/zrepl/zfs/zfscmd"
+	"github.com/zrepl/zrepl/internal/util/envconst"
+	"github.com/zrepl/zrepl/internal/zfs/zfscmd"
 )
 
 func ZFSDestroyFilesystemVersion(ctx context.Context, filesystem *DatasetPath, version *FilesystemVersion) (err error) {
diff --git a/zfs/versions_destroy_test.go b/internal/zfs/versions_destroy_test.go
similarity index 99%
rename from zfs/versions_destroy_test.go
rename to internal/zfs/versions_destroy_test.go
index df73e99..053eaf9 100644
--- a/zfs/versions_destroy_test.go
+++ b/internal/zfs/versions_destroy_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/zrepl/zrepl/util/chainlock"
+	"github.com/zrepl/zrepl/internal/util/chainlock"
 )
 
 type mockBatchDestroy struct {
diff --git a/zfs/zfs.go b/internal/zfs/zfs.go
similarity index 99%
rename from zfs/zfs.go
rename to internal/zfs/zfs.go
index a8bf86d..c38ad17 100644
--- a/zfs/zfs.go
+++ b/internal/zfs/zfs.go
@@ -19,11 +19,11 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/util/circlog"
-	"github.com/zrepl/zrepl/util/envconst"
-	"github.com/zrepl/zrepl/util/nodefault"
-	zfsprop "github.com/zrepl/zrepl/zfs/property"
-	"github.com/zrepl/zrepl/zfs/zfscmd"
+	"github.com/zrepl/zrepl/internal/util/circlog"
+	"github.com/zrepl/zrepl/internal/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
+	zfsprop "github.com/zrepl/zrepl/internal/zfs/property"
+	"github.com/zrepl/zrepl/internal/zfs/zfscmd"
 )
 
 type DatasetPath struct {
diff --git a/zfs/zfs_debug.go b/internal/zfs/zfs_debug.go
similarity index 100%
rename from zfs/zfs_debug.go
rename to internal/zfs/zfs_debug.go
diff --git a/zfs/zfs_pipe.go b/internal/zfs/zfs_pipe.go
similarity index 100%
rename from zfs/zfs_pipe.go
rename to internal/zfs/zfs_pipe.go
diff --git a/zfs/zfs_pipe_linux.go b/internal/zfs/zfs_pipe_linux.go
similarity index 95%
rename from zfs/zfs_pipe_linux.go
rename to internal/zfs/zfs_pipe_linux.go
index e52d5e1..1142440 100644
--- a/zfs/zfs_pipe_linux.go
+++ b/internal/zfs/zfs_pipe_linux.go
@@ -9,7 +9,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 func getPipeCapacityHint(envvar string) int {
diff --git a/zfs/zfs_test.go b/internal/zfs/zfs_test.go
similarity index 99%
rename from zfs/zfs_test.go
rename to internal/zfs/zfs_test.go
index c4fe562..2d0cc93 100644
--- a/zfs/zfs_test.go
+++ b/internal/zfs/zfs_test.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/zrepl/zrepl/util/nodefault"
-	zfsprop "github.com/zrepl/zrepl/zfs/property"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
+	zfsprop "github.com/zrepl/zrepl/internal/zfs/property"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/zfs/zfscmd/zfscmd-logging-scraper/README.md b/internal/zfs/zfscmd/zfscmd-logging-scraper/README.md
similarity index 100%
rename from zfs/zfscmd/zfscmd-logging-scraper/README.md
rename to internal/zfs/zfscmd/zfscmd-logging-scraper/README.md
diff --git a/zfs/zfscmd/zfscmd-logging-scraper/analysis.ipynb b/internal/zfs/zfscmd/zfscmd-logging-scraper/analysis.ipynb
similarity index 100%
rename from zfs/zfscmd/zfscmd-logging-scraper/analysis.ipynb
rename to internal/zfs/zfscmd/zfscmd-logging-scraper/analysis.ipynb
diff --git a/zfs/zfscmd/zfscmd-logging-scraper/scrape_graylog_csv.bash b/internal/zfs/zfscmd/zfscmd-logging-scraper/scrape_graylog_csv.bash
similarity index 100%
rename from zfs/zfscmd/zfscmd-logging-scraper/scrape_graylog_csv.bash
rename to internal/zfs/zfscmd/zfscmd-logging-scraper/scrape_graylog_csv.bash
diff --git a/zfs/zfscmd/zfscmd-logging-scraper/zfscmd_logging_scraper.go b/internal/zfs/zfscmd/zfscmd-logging-scraper/zfscmd_logging_scraper.go
similarity index 98%
rename from zfs/zfscmd/zfscmd-logging-scraper/zfscmd_logging_scraper.go
rename to internal/zfs/zfscmd/zfscmd-logging-scraper/zfscmd_logging_scraper.go
index afb053a..4642f92 100644
--- a/zfs/zfscmd/zfscmd-logging-scraper/zfscmd_logging_scraper.go
+++ b/internal/zfs/zfscmd/zfscmd-logging-scraper/zfscmd_logging_scraper.go
@@ -13,7 +13,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/daemon/logging"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
 )
 
 type RuntimeLine struct {
diff --git a/zfs/zfscmd/zfscmd-logging-scraper/zfscmd_logging_scrapter_test.go b/internal/zfs/zfscmd/zfscmd-logging-scraper/zfscmd_logging_scrapter_test.go
similarity index 98%
rename from zfs/zfscmd/zfscmd-logging-scraper/zfscmd_logging_scrapter_test.go
rename to internal/zfs/zfscmd/zfscmd-logging-scraper/zfscmd_logging_scrapter_test.go
index 11e459c..2d43b38 100644
--- a/zfs/zfscmd/zfscmd-logging-scraper/zfscmd_logging_scrapter_test.go
+++ b/internal/zfs/zfscmd/zfscmd-logging-scraper/zfscmd_logging_scrapter_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/daemon/logging"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
 )
 
 func TestParseHumanFormatter(t *testing.T) {
diff --git a/zfs/zfscmd/zfscmd.go b/internal/zfs/zfscmd/zfscmd.go
similarity index 97%
rename from zfs/zfscmd/zfscmd.go
rename to internal/zfs/zfscmd/zfscmd.go
index 094f310..106907e 100644
--- a/zfs/zfscmd/zfscmd.go
+++ b/internal/zfs/zfscmd/zfscmd.go
@@ -14,8 +14,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
-	"github.com/zrepl/zrepl/util/circlog"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/util/circlog"
 )
 
 type Cmd struct {
diff --git a/zfs/zfscmd/zfscmd_context.go b/internal/zfs/zfscmd/zfscmd_context.go
similarity index 87%
rename from zfs/zfscmd/zfscmd_context.go
rename to internal/zfs/zfscmd/zfscmd_context.go
index 9238d5d..8895864 100644
--- a/zfs/zfscmd/zfscmd_context.go
+++ b/internal/zfs/zfscmd/zfscmd_context.go
@@ -3,8 +3,8 @@ package zfscmd
 import (
 	"context"
 
-	"github.com/zrepl/zrepl/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 type contextKey int
diff --git a/zfs/zfscmd/zfscmd_logging.go b/internal/zfs/zfscmd/zfscmd_logging.go
similarity index 100%
rename from zfs/zfscmd/zfscmd_logging.go
rename to internal/zfs/zfscmd/zfscmd_logging.go
diff --git a/zfs/zfscmd/zfscmd_platform_test.bash b/internal/zfs/zfscmd/zfscmd_platform_test.bash
similarity index 100%
rename from zfs/zfscmd/zfscmd_platform_test.bash
rename to internal/zfs/zfscmd/zfscmd_platform_test.bash
diff --git a/zfs/zfscmd/zfscmd_platform_test.go b/internal/zfs/zfscmd/zfscmd_platform_test.go
similarity index 98%
rename from zfs/zfscmd/zfscmd_platform_test.go
rename to internal/zfs/zfscmd/zfscmd_platform_test.go
index 1a33ba5..67ce3ac 100644
--- a/zfs/zfscmd/zfscmd_platform_test.go
+++ b/internal/zfs/zfscmd/zfscmd_platform_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/util/circlog"
+	"github.com/zrepl/zrepl/internal/util/circlog"
 )
 
 const testBin = "./zfscmd_platform_test.bash"
diff --git a/zfs/zfscmd/zfscmd_prometheus.go b/internal/zfs/zfscmd/zfscmd_prometheus.go
similarity index 100%
rename from zfs/zfscmd/zfscmd_prometheus.go
rename to internal/zfs/zfscmd/zfscmd_prometheus.go
diff --git a/zfs/zfscmd/zfscmd_report.go b/internal/zfs/zfscmd/zfscmd_report.go
similarity index 100%
rename from zfs/zfscmd/zfscmd_report.go
rename to internal/zfs/zfscmd/zfscmd_report.go
diff --git a/main.go b/main.go
index 7e239ab..74c8df6 100644
--- a/main.go
+++ b/main.go
@@ -2,10 +2,10 @@
 package main
 
 import (
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/client"
-	"github.com/zrepl/zrepl/client/status"
-	"github.com/zrepl/zrepl/daemon"
+	"github.com/zrepl/zrepl/internal/cli"
+	"github.com/zrepl/zrepl/internal/client"
+	"github.com/zrepl/zrepl/internal/client/status"
+	"github.com/zrepl/zrepl/internal/daemon"
 )
 
 func init() {
diff --git a/packaging/deb/debian/rules b/packaging/deb/debian/rules
index 5d65a67..c05e491 100755
--- a/packaging/deb/debian/rules
+++ b/packaging/deb/debian/rules
@@ -34,7 +34,7 @@ override_dh_auto_install:
 	dh_install artifacts/docs/html usr/share/doc/zrepl/docs/
 
 	# install examples
-	dh_install config/samples/* usr/share/doc/zrepl/examples
+	dh_install internal/config/samples/* usr/share/doc/zrepl/examples
 
 	# install default config
 	mkdir -p debian/tmp/etc/zrepl
diff --git a/packaging/rpm/zrepl.spec b/packaging/rpm/zrepl.spec
index 2769305..f712a2d 100644
--- a/packaging/rpm/zrepl.spec
+++ b/packaging/rpm/zrepl.spec
@@ -49,7 +49,7 @@ install -Dm 0644 artifacts/bash_completion              %{buildroot}%{_datadir}/
 install -Dm 0644 artifacts/rpmbuild/zrepl.yml           %{buildroot}%{_sysconfdir}/zrepl/zrepl.yml
 install -d                                              %{buildroot}%{_datadir}/doc/zrepl
 cp -a   artifacts/docs/html                             %{buildroot}%{_datadir}/doc/zrepl/html
-cp -a   config/samples                                  %{buildroot}%{_datadir}/doc/zrepl/examples
+cp -a   internal/config/samples                         %{buildroot}%{_datadir}/doc/zrepl/examples
 
 %post
 %systemd_post zrepl.service