diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md
index 1f09b1b7143..24dfabf41d5 100644
--- a/CHANGELOG-3.4.md
+++ b/CHANGELOG-3.4.md
@@ -22,8 +22,10 @@
   - Remove recursive symlinks in `cmd` directory.
   - Now `go get/install/build` on `etcd` packages (e.g. `clientv3`, `tools/benchmark`) enforce builds with etcd `vendor` directory.
 - Reorganize [internal packages](https://github.com/coreos/etcd/issues/9220).
-  - Rename `"github.com/coreos/etcd/snap"` to [`"github.com/coreos/etcd/internal/raftsnap"`](https://github.com/coreos/etcd/pull/9211).
-  - Rename `"github.com/coreos/etcd/discovery"` to [`"github.com/coreos/etcd/internal/discovery"`](https://github.com/coreos/etcd/pull/9233).
+  - Move `"github.com/coreos/etcd/alarm"` to [`"github.com/coreos/etcd/internal/alarm"`](https://github.com/coreos/etcd/pull/9234).
+  - Move `"github.com/coreos/etcd/compactor"` to [`"github.com/coreos/etcd/internal/compactor"`](https://github.com/coreos/etcd/pull/9234).
+  - Move `"github.com/coreos/etcd/discovery"` to [`"github.com/coreos/etcd/internal/discovery"`](https://github.com/coreos/etcd/pull/9233).
+  - Move `"github.com/coreos/etcd/snap"` to [`"github.com/coreos/etcd/internal/raftsnap"`](https://github.com/coreos/etcd/pull/9211).
 
 ### Added(API)
 
diff --git a/etcdserver/server.go b/etcdserver/server.go
index 4bf6eded8e1..981e688eef5 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -29,15 +29,15 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/coreos/etcd/alarm"
 	"github.com/coreos/etcd/auth"
-	"github.com/coreos/etcd/compactor"
 	"github.com/coreos/etcd/discovery"
 	"github.com/coreos/etcd/etcdserver/api"
 	"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/etcdserver/membership"
 	"github.com/coreos/etcd/etcdserver/stats"
+	"github.com/coreos/etcd/internal/alarm"
+	"github.com/coreos/etcd/internal/compactor"
 	"github.com/coreos/etcd/internal/raftsnap"
 	"github.com/coreos/etcd/lease"
 	"github.com/coreos/etcd/lease/leasehttp"
diff --git a/alarm/alarms.go b/internal/alarm/alarms.go
similarity index 100%
rename from alarm/alarms.go
rename to internal/alarm/alarms.go
diff --git a/compactor/compactor.go b/internal/compactor/compactor.go
similarity index 100%
rename from compactor/compactor.go
rename to internal/compactor/compactor.go
diff --git a/compactor/compactor_test.go b/internal/compactor/compactor_test.go
similarity index 100%
rename from compactor/compactor_test.go
rename to internal/compactor/compactor_test.go
diff --git a/compactor/doc.go b/internal/compactor/doc.go
similarity index 100%
rename from compactor/doc.go
rename to internal/compactor/doc.go
diff --git a/compactor/periodic.go b/internal/compactor/periodic.go
similarity index 100%
rename from compactor/periodic.go
rename to internal/compactor/periodic.go
diff --git a/compactor/periodic_test.go b/internal/compactor/periodic_test.go
similarity index 100%
rename from compactor/periodic_test.go
rename to internal/compactor/periodic_test.go
diff --git a/compactor/revision.go b/internal/compactor/revision.go
similarity index 100%
rename from compactor/revision.go
rename to internal/compactor/revision.go
diff --git a/compactor/revision_test.go b/internal/compactor/revision_test.go
similarity index 100%
rename from compactor/revision_test.go
rename to internal/compactor/revision_test.go