diff --git a/raft/constants.go b/raft/constants.go
index f53a7ed0ef..8528b04415 100644
--- a/raft/constants.go
+++ b/raft/constants.go
@@ -1,6 +1,6 @@
 package raft
 
-import "github.com/ethereum/go-ethereum/raft/etcd"
+import etcd "github.com/ethereum/go-ethereum/raft/etcd/raft"
 
 const (
 	//protocolName           = "raft"
diff --git a/raft/etcd/log.go b/raft/etcd/raft/log.go
similarity index 100%
rename from raft/etcd/log.go
rename to raft/etcd/raft/log.go
diff --git a/raft/etcd/log_unstable.go b/raft/etcd/raft/log_unstable.go
similarity index 100%
rename from raft/etcd/log_unstable.go
rename to raft/etcd/raft/log_unstable.go
diff --git a/raft/etcd/logger.go b/raft/etcd/raft/logger.go
similarity index 100%
rename from raft/etcd/logger.go
rename to raft/etcd/raft/logger.go
diff --git a/raft/etcd/node.go b/raft/etcd/raft/node.go
similarity index 100%
rename from raft/etcd/node.go
rename to raft/etcd/raft/node.go
diff --git a/raft/etcd/progress.go b/raft/etcd/raft/progress.go
similarity index 100%
rename from raft/etcd/progress.go
rename to raft/etcd/raft/progress.go
diff --git a/raft/etcd/raft.go b/raft/etcd/raft/raft.go
similarity index 100%
rename from raft/etcd/raft.go
rename to raft/etcd/raft/raft.go
diff --git a/raft/etcd/rawnode.go b/raft/etcd/raft/rawnode.go
similarity index 100%
rename from raft/etcd/rawnode.go
rename to raft/etcd/raft/rawnode.go
diff --git a/raft/etcd/read_only.go b/raft/etcd/raft/read_only.go
similarity index 100%
rename from raft/etcd/read_only.go
rename to raft/etcd/raft/read_only.go
diff --git a/raft/etcd/status.go b/raft/etcd/raft/status.go
similarity index 100%
rename from raft/etcd/status.go
rename to raft/etcd/raft/status.go
diff --git a/raft/etcd/storage.go b/raft/etcd/raft/storage.go
similarity index 100%
rename from raft/etcd/storage.go
rename to raft/etcd/raft/storage.go
diff --git a/raft/etcd/util.go b/raft/etcd/raft/util.go
similarity index 100%
rename from raft/etcd/util.go
rename to raft/etcd/raft/util.go
diff --git a/raft/handler.go b/raft/handler.go
index 0a37e24df2..4439f15bc1 100644
--- a/raft/handler.go
+++ b/raft/handler.go
@@ -22,7 +22,7 @@ import (
 	"github.com/coreos/etcd/snap"
 	"github.com/coreos/etcd/wal"
 	mapset "github.com/deckarep/golang-set"
-	"github.com/ethereum/go-ethereum/raft/etcd"
+	etcd "github.com/ethereum/go-ethereum/raft/etcd/raft"
 	"github.com/syndtr/goleveldb/leveldb"
 
 	"github.com/ethereum/go-ethereum/core"