diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go
index 71a265c1d..db77a1f5a 100644
--- a/etcdmain/etcd.go
+++ b/etcdmain/etcd.go
@@ -34,7 +34,7 @@ import (
 
 	"github.com/coreos/etcd/discovery"
 	"github.com/coreos/etcd/etcdserver"
-	"github.com/coreos/etcd/etcdserver/etcdhttp"
+	"github.com/coreos/etcd/etcdserver/api/v2http"
 	"github.com/coreos/etcd/pkg/cors"
 	"github.com/coreos/etcd/pkg/fileutil"
 	pkgioutil "github.com/coreos/etcd/pkg/ioutil"
@@ -363,10 +363,10 @@ func startEtcd(cfg *config) (<-chan struct{}, error) {
 		plog.Infof("cors = %s", cfg.corsInfo)
 	}
 	ch := http.Handler(&cors.CORSHandler{
-		Handler: etcdhttp.NewClientHandler(s, srvcfg.ReqTimeout()),
+		Handler: v2http.NewClientHandler(s, srvcfg.ReqTimeout()),
 		Info:    cfg.corsInfo,
 	})
-	ph := etcdhttp.NewPeerHandler(s)
+	ph := v2http.NewPeerHandler(s)
 
 	// Start the peer server in a goroutine
 	for _, l := range plns {
diff --git a/etcdserver/etcdhttp/capability.go b/etcdserver/api/v2http/capability.go
similarity index 97%
rename from etcdserver/etcdhttp/capability.go
rename to etcdserver/api/v2http/capability.go
index cc99cf718..73361ef20 100644
--- a/etcdserver/etcdhttp/capability.go
+++ b/etcdserver/api/v2http/capability.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package etcdhttp
+package v2http
 
 import (
 	"fmt"
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/coreos/etcd/etcdserver"
-	"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
+	"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
 	"github.com/coreos/go-semver/semver"
 )
 
diff --git a/etcdserver/etcdhttp/client.go b/etcdserver/api/v2http/client.go
similarity index 99%
rename from etcdserver/etcdhttp/client.go
rename to etcdserver/api/v2http/client.go
index b3828abbd..ecda539de 100644
--- a/etcdserver/etcdhttp/client.go
+++ b/etcdserver/api/v2http/client.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package etcdhttp
+package v2http
 
 import (
 	"encoding/json"
@@ -30,8 +30,8 @@ import (
 
 	etcdErr "github.com/coreos/etcd/error"
 	"github.com/coreos/etcd/etcdserver"
+	"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
 	"github.com/coreos/etcd/etcdserver/auth"
-	"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
 	"github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/etcdserver/stats"
 	"github.com/coreos/etcd/pkg/types"
diff --git a/etcdserver/etcdhttp/client_auth.go b/etcdserver/api/v2http/client_auth.go
similarity index 99%
rename from etcdserver/etcdhttp/client_auth.go
rename to etcdserver/api/v2http/client_auth.go
index c5678ad00..21e557c43 100644
--- a/etcdserver/etcdhttp/client_auth.go
+++ b/etcdserver/api/v2http/client_auth.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package etcdhttp
+package v2http
 
 import (
 	"encoding/json"
@@ -21,8 +21,8 @@ import (
 	"strings"
 
 	"github.com/coreos/etcd/etcdserver"
+	"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
 	"github.com/coreos/etcd/etcdserver/auth"
-	"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
 )
 
 type authHandler struct {
diff --git a/etcdserver/etcdhttp/client_auth_test.go b/etcdserver/api/v2http/client_auth_test.go
similarity index 99%
rename from etcdserver/etcdhttp/client_auth_test.go
rename to etcdserver/api/v2http/client_auth_test.go
index 4bf190e08..ec88c5d01 100644
--- a/etcdserver/etcdhttp/client_auth_test.go
+++ b/etcdserver/api/v2http/client_auth_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package etcdhttp
+package v2http
 
 import (
 	"errors"
diff --git a/etcdserver/etcdhttp/client_test.go b/etcdserver/api/v2http/client_test.go
similarity index 99%
rename from etcdserver/etcdhttp/client_test.go
rename to etcdserver/api/v2http/client_test.go
index 29cc6c764..bc5b933f2 100644
--- a/etcdserver/etcdhttp/client_test.go
+++ b/etcdserver/api/v2http/client_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package etcdhttp
+package v2http
 
 import (
 	"bytes"
@@ -30,7 +30,7 @@ import (
 
 	etcdErr "github.com/coreos/etcd/error"
 	"github.com/coreos/etcd/etcdserver"
-	"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
+	"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
 	"github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/pkg/testutil"
 	"github.com/coreos/etcd/pkg/types"
diff --git a/etcdserver/etcdhttp/doc.go b/etcdserver/api/v2http/doc.go
similarity index 87%
rename from etcdserver/etcdhttp/doc.go
rename to etcdserver/api/v2http/doc.go
index 84883aaf1..3b306ef07 100644
--- a/etcdserver/etcdhttp/doc.go
+++ b/etcdserver/api/v2http/doc.go
@@ -12,5 +12,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package etcdhttp provides etcd client and server implementations.
-package etcdhttp
+// Package v2http provides etcd client and server implementations.
+package v2http
diff --git a/etcdserver/etcdhttp/http.go b/etcdserver/api/v2http/http.go
similarity index 92%
rename from etcdserver/etcdhttp/http.go
rename to etcdserver/api/v2http/http.go
index ea22bdfa1..1fd388391 100644
--- a/etcdserver/etcdhttp/http.go
+++ b/etcdserver/api/v2http/http.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package etcdhttp
+package v2http
 
 import (
 	"errors"
@@ -23,8 +23,8 @@ import (
 
 	etcdErr "github.com/coreos/etcd/error"
 	"github.com/coreos/etcd/etcdserver"
+	"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
 	"github.com/coreos/etcd/etcdserver/auth"
-	"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
 	"github.com/coreos/etcd/pkg/logutil"
 	"github.com/coreos/pkg/capnslog"
 )
@@ -35,9 +35,9 @@ const (
 )
 
 var (
-	plog      = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdhttp")
+	plog      = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver/api", "v2http")
 	mlog      = logutil.NewMergeLogger(plog)
-	errClosed = errors.New("etcdhttp: client closed connection")
+	errClosed = errors.New("v2http: client closed connection")
 )
 
 // writeError logs and writes the given Error to the ResponseWriter
diff --git a/etcdserver/etcdhttp/http_test.go b/etcdserver/api/v2http/http_test.go
similarity index 99%
rename from etcdserver/etcdhttp/http_test.go
rename to etcdserver/api/v2http/http_test.go
index f68f62d1a..21715e6a0 100644
--- a/etcdserver/etcdhttp/http_test.go
+++ b/etcdserver/api/v2http/http_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package etcdhttp
+package v2http
 
 import (
 	"errors"
diff --git a/etcdserver/etcdhttp/httptypes/errors.go b/etcdserver/api/v2http/httptypes/errors.go
similarity index 97%
rename from etcdserver/etcdhttp/httptypes/errors.go
rename to etcdserver/api/v2http/httptypes/errors.go
index 870c148f3..396dc59a3 100644
--- a/etcdserver/etcdhttp/httptypes/errors.go
+++ b/etcdserver/api/v2http/httptypes/errors.go
@@ -22,7 +22,7 @@ import (
 )
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver/etcdhttp", "httptypes")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver/api/v2http", "httptypes")
 )
 
 type HTTPError struct {
diff --git a/etcdserver/etcdhttp/httptypes/errors_test.go b/etcdserver/api/v2http/httptypes/errors_test.go
similarity index 100%
rename from etcdserver/etcdhttp/httptypes/errors_test.go
rename to etcdserver/api/v2http/httptypes/errors_test.go
diff --git a/etcdserver/etcdhttp/httptypes/member.go b/etcdserver/api/v2http/httptypes/member.go
similarity index 100%
rename from etcdserver/etcdhttp/httptypes/member.go
rename to etcdserver/api/v2http/httptypes/member.go
diff --git a/etcdserver/etcdhttp/httptypes/member_test.go b/etcdserver/api/v2http/httptypes/member_test.go
similarity index 100%
rename from etcdserver/etcdhttp/httptypes/member_test.go
rename to etcdserver/api/v2http/httptypes/member_test.go
diff --git a/etcdserver/etcdhttp/metrics.go b/etcdserver/api/v2http/metrics.go
similarity index 97%
rename from etcdserver/etcdhttp/metrics.go
rename to etcdserver/api/v2http/metrics.go
index 8e55500bd..c6b4a5378 100644
--- a/etcdserver/etcdhttp/metrics.go
+++ b/etcdserver/api/v2http/metrics.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package etcdhttp
+package v2http
 
 import (
 	"strconv"
@@ -22,7 +22,7 @@ import (
 
 	etcdErr "github.com/coreos/etcd/error"
 	"github.com/coreos/etcd/etcdserver"
-	"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
+	"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
 	"github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/prometheus/client_golang/prometheus"
 )
diff --git a/etcdserver/etcdhttp/peer.go b/etcdserver/api/v2http/peer.go
similarity index 99%
rename from etcdserver/etcdhttp/peer.go
rename to etcdserver/api/v2http/peer.go
index f142f7089..6fd0708e6 100644
--- a/etcdserver/etcdhttp/peer.go
+++ b/etcdserver/api/v2http/peer.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package etcdhttp
+package v2http
 
 import (
 	"encoding/json"
diff --git a/etcdserver/etcdhttp/peer_test.go b/etcdserver/api/v2http/peer_test.go
similarity index 99%
rename from etcdserver/etcdhttp/peer_test.go
rename to etcdserver/api/v2http/peer_test.go
index 0352caabd..874f283ba 100644
--- a/etcdserver/etcdhttp/peer_test.go
+++ b/etcdserver/api/v2http/peer_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package etcdhttp
+package v2http
 
 import (
 	"encoding/json"
diff --git a/etcdserver/server.go b/etcdserver/server.go
index 4339f1cd3..c0e7cdcac 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -31,7 +31,7 @@ import (
 	"github.com/coreos/etcd/auth"
 	"github.com/coreos/etcd/compactor"
 	"github.com/coreos/etcd/discovery"
-	"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
+	"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/etcdserver/stats"
 	"github.com/coreos/etcd/lease"
diff --git a/integration/cluster.go b/integration/cluster.go
index bbf394375..4798aeb70 100644
--- a/integration/cluster.go
+++ b/integration/cluster.go
@@ -37,8 +37,8 @@ import (
 	"github.com/coreos/etcd/client"
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/etcdserver"
+	"github.com/coreos/etcd/etcdserver/api/v2http"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc"
-	"github.com/coreos/etcd/etcdserver/etcdhttp"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/pkg/testutil"
 	"github.com/coreos/etcd/pkg/transport"
@@ -546,7 +546,7 @@ func (m *member) Launch() error {
 	m.s.SyncTicker = time.Tick(500 * time.Millisecond)
 	m.s.Start()
 
-	m.raftHandler = &testutil.PauseableHandler{Next: etcdhttp.NewPeerHandler(m.s)}
+	m.raftHandler = &testutil.PauseableHandler{Next: v2http.NewPeerHandler(m.s)}
 
 	for _, ln := range m.PeerListeners {
 		hs := &httptest.Server{
@@ -567,7 +567,7 @@ func (m *member) Launch() error {
 	for _, ln := range m.ClientListeners {
 		hs := &httptest.Server{
 			Listener: ln,
-			Config:   &http.Server{Handler: etcdhttp.NewClientHandler(m.s, m.ServerConfig.ReqTimeout())},
+			Config:   &http.Server{Handler: v2http.NewClientHandler(m.s, m.ServerConfig.ReqTimeout())},
 		}
 		if m.ClientTLSInfo == nil {
 			hs.Start()
diff --git a/proxy/reverse.go b/proxy/reverse.go
index aa3ef2f0a..93b8fe602 100644
--- a/proxy/reverse.go
+++ b/proxy/reverse.go
@@ -28,7 +28,7 @@ import (
 
 	"time"
 
-	"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
+	"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
 	"github.com/coreos/etcd/pkg/httputil"
 	"github.com/coreos/pkg/capnslog"
 )
diff --git a/test b/test
index 63cd7a8a7..ba9f87f4a 100755
--- a/test
+++ b/test
@@ -18,7 +18,7 @@ source ./build
 
 # Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt.
 PKGS=`ls pkg/*/*go  | cut -f1,2 -d/ | sort | uniq`
-TESTABLE_AND_FORMATTABLE="client clientv3 discovery error etcdctl/ctlv2 etcdctl/ctlv3 etcdmain etcdserver etcdserver/auth etcdserver/etcdhttp etcdserver/etcdhttp/httptypes $PKGS proxy raft snap storage storage/backend store version wal"
+TESTABLE_AND_FORMATTABLE="client clientv3 discovery error etcdctl/ctlv2 etcdctl/ctlv3 etcdmain etcdserver etcdserver/auth etcdserver/api/v2http etcdserver/api/v2http/httptypes $PKGS proxy raft snap storage storage/backend store version wal"
 # TODO: add it to race testing when the issue is resolved
 # https://github.com/golang/go/issues/9946
 NO_RACE_TESTABLE="rafthttp"