diff --git a/Makefile b/Makefile
index a1cdedba..59155924 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ VERSION       ?= $(shell git describe --tags --always --dirty)
 GOPKGS         = $(shell go list ./... | grep -v /vendor/)
 BUILD_FLAGS   ?=
 LDFLAGS       ?= -X github.com/grepplabs/kafka-proxy/config.Version=$(VERSION) -w -s
-TAG           ?= "v0.0.8"
+TAG           ?= "v0.1.0"
 GOARCH        ?= amd64
 GOOS          ?= linux
 
@@ -46,11 +46,11 @@ release: clean
 protoc.local-auth:
 	protoc -I plugin/local-auth/proto/ plugin/local-auth/proto/auth.proto --go_out=plugins=grpc:plugin/local-auth/proto/
 
-protoc.gateway-client:
-	protoc -I plugin/gateway-client/proto/ plugin/gateway-client/proto/token-provider.proto --go_out=plugins=grpc:plugin/gateway-client/proto/
+protoc.token-provider:
+	protoc -I plugin/token-provider/proto/ plugin/token-provider/proto/token-provider.proto --go_out=plugins=grpc:plugin/token-provider/proto/
 
-protoc.gateway-server:
-	protoc -I plugin/gateway-server/proto/ plugin/gateway-server/proto/token-info.proto --go_out=plugins=grpc:plugin/gateway-server/proto/
+protoc.token-info:
+	protoc -I plugin/token-info/proto/ plugin/token-info/proto/token-info.proto --go_out=plugins=grpc:plugin/token-info/proto/
 
 plugin.auth-user:
 	CGO_ENABLED=0 go build -o build/auth-user $(BUILD_FLAGS) -ldflags "$(LDFLAGS)" cmd/plugin-auth-user/main.go
diff --git a/cmd/kafka-proxy/server.go b/cmd/kafka-proxy/server.go
index 3bb08233..795b1354 100644
--- a/cmd/kafka-proxy/server.go
+++ b/cmd/kafka-proxy/server.go
@@ -21,8 +21,8 @@ import (
 
 	"errors"
 	"github.com/grepplabs/kafka-proxy/pkg/apis"
-	gatewayclient "github.com/grepplabs/kafka-proxy/plugin/gateway-client/shared"
-	gatewayserver "github.com/grepplabs/kafka-proxy/plugin/gateway-server/shared"
+	gatewayclient "github.com/grepplabs/kafka-proxy/plugin/token-provider/shared"
+	gatewayserver "github.com/grepplabs/kafka-proxy/plugin/token-info/shared"
 	localauth "github.com/grepplabs/kafka-proxy/plugin/local-auth/shared"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
diff --git a/cmd/plugin-googleid-info/main.go b/cmd/plugin-googleid-info/main.go
index 1282ec01..d57b2fa3 100644
--- a/cmd/plugin-googleid-info/main.go
+++ b/cmd/plugin-googleid-info/main.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/grepplabs/kafka-proxy/pkg/libs/googleid-info"
-	"github.com/grepplabs/kafka-proxy/plugin/gateway-server/shared"
+	"github.com/grepplabs/kafka-proxy/plugin/token-info/shared"
 	"github.com/hashicorp/go-plugin"
 	"github.com/sirupsen/logrus"
 	"os"
diff --git a/cmd/plugin-googleid-provider/main.go b/cmd/plugin-googleid-provider/main.go
index c92a33cc..32941de6 100644
--- a/cmd/plugin-googleid-provider/main.go
+++ b/cmd/plugin-googleid-provider/main.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/grepplabs/kafka-proxy/pkg/libs/googleid-provider"
-	"github.com/grepplabs/kafka-proxy/plugin/gateway-client/shared"
+	"github.com/grepplabs/kafka-proxy/plugin/token-provider/shared"
 	"github.com/hashicorp/go-plugin"
 	"github.com/sirupsen/logrus"
 	"os"
diff --git a/pkg/apis/gateway.go b/pkg/apis/token.go
similarity index 100%
rename from pkg/apis/gateway.go
rename to pkg/apis/token.go
diff --git a/plugin/gateway-server/proto/token-info.pb.go b/plugin/token-info/proto/token-info.pb.go
similarity index 100%
rename from plugin/gateway-server/proto/token-info.pb.go
rename to plugin/token-info/proto/token-info.pb.go
diff --git a/plugin/gateway-server/proto/token-info.proto b/plugin/token-info/proto/token-info.proto
similarity index 100%
rename from plugin/gateway-server/proto/token-info.proto
rename to plugin/token-info/proto/token-info.proto
diff --git a/plugin/gateway-server/shared/grpc.go b/plugin/token-info/shared/grpc.go
similarity index 94%
rename from plugin/gateway-server/shared/grpc.go
rename to plugin/token-info/shared/grpc.go
index 449b716e..98368b3f 100644
--- a/plugin/gateway-server/shared/grpc.go
+++ b/plugin/token-info/shared/grpc.go
@@ -2,7 +2,7 @@ package shared
 
 import (
 	"github.com/grepplabs/kafka-proxy/pkg/apis"
-	"github.com/grepplabs/kafka-proxy/plugin/gateway-server/proto"
+	"github.com/grepplabs/kafka-proxy/plugin/token-info/proto"
 	"github.com/hashicorp/go-plugin"
 	"golang.org/x/net/context"
 )
diff --git a/plugin/gateway-server/shared/interface.go b/plugin/token-info/shared/interface.go
similarity index 95%
rename from plugin/gateway-server/shared/interface.go
rename to plugin/token-info/shared/interface.go
index f0cb5681..0e09abfe 100644
--- a/plugin/gateway-server/shared/interface.go
+++ b/plugin/token-info/shared/interface.go
@@ -6,7 +6,7 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/grepplabs/kafka-proxy/pkg/apis"
-	"github.com/grepplabs/kafka-proxy/plugin/gateway-server/proto"
+	"github.com/grepplabs/kafka-proxy/plugin/token-info/proto"
 	"github.com/hashicorp/go-plugin"
 	"net/rpc"
 )
diff --git a/plugin/gateway-server/shared/rpc.go b/plugin/token-info/shared/rpc.go
similarity index 100%
rename from plugin/gateway-server/shared/rpc.go
rename to plugin/token-info/shared/rpc.go
diff --git a/plugin/gateway-client/proto/token-provider.pb.go b/plugin/token-provider/proto/token-provider.pb.go
similarity index 100%
rename from plugin/gateway-client/proto/token-provider.pb.go
rename to plugin/token-provider/proto/token-provider.pb.go
diff --git a/plugin/gateway-client/proto/token-provider.proto b/plugin/token-provider/proto/token-provider.proto
similarity index 100%
rename from plugin/gateway-client/proto/token-provider.proto
rename to plugin/token-provider/proto/token-provider.proto
diff --git a/plugin/gateway-client/shared/grpc.go b/plugin/token-provider/shared/grpc.go
similarity index 94%
rename from plugin/gateway-client/shared/grpc.go
rename to plugin/token-provider/shared/grpc.go
index 45e5be74..188d3573 100644
--- a/plugin/gateway-client/shared/grpc.go
+++ b/plugin/token-provider/shared/grpc.go
@@ -2,7 +2,7 @@ package shared
 
 import (
 	"github.com/grepplabs/kafka-proxy/pkg/apis"
-	"github.com/grepplabs/kafka-proxy/plugin/gateway-client/proto"
+	"github.com/grepplabs/kafka-proxy/plugin/token-provider/proto"
 	"github.com/hashicorp/go-plugin"
 	"golang.org/x/net/context"
 )
diff --git a/plugin/gateway-client/shared/interface.go b/plugin/token-provider/shared/interface.go
similarity index 95%
rename from plugin/gateway-client/shared/interface.go
rename to plugin/token-provider/shared/interface.go
index 1b21a796..4154a2b2 100644
--- a/plugin/gateway-client/shared/interface.go
+++ b/plugin/token-provider/shared/interface.go
@@ -6,7 +6,7 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/grepplabs/kafka-proxy/pkg/apis"
-	"github.com/grepplabs/kafka-proxy/plugin/gateway-client/proto"
+	"github.com/grepplabs/kafka-proxy/plugin/token-provider/proto"
 	"github.com/hashicorp/go-plugin"
 	"net/rpc"
 )
diff --git a/plugin/gateway-client/shared/rpc.go b/plugin/token-provider/shared/rpc.go
similarity index 100%
rename from plugin/gateway-client/shared/rpc.go
rename to plugin/token-provider/shared/rpc.go