diff --git a/server/server-handler.go b/server/server-handler.go
index 2d16a0c..b411440 100644
--- a/server/server-handler.go
+++ b/server/server-handler.go
@@ -3,7 +3,7 @@ package server
 import (
 	ccf "git.loafle.net/commons/cors-go/fasthttp"
 	cs "git.loafle.net/commons/server-go"
-	oge "git.loafle.net/overflow/gateway/external"
+	oe "git.loafle.net/overflow/external-go"
 	ogrs "git.loafle.net/overflow/gateway_rest/server"
 	"git.loafle.net/overflow/member_gateway_rest/config"
 	"github.com/valyala/fasthttp"
@@ -24,7 +24,7 @@ func (sh *ServerHandlers) Init(serverCtx cs.ServerCtx) error {
 	if err := sh.ServerHandlers.Init(serverCtx); nil != err {
 		return err
 	}
-	oge.InitPackage(sh.Config.External)
+	oe.InitPackage(sh.Config.External)
 
 	sh.corsHandler = ccf.AllowAll()
 
@@ -36,19 +36,19 @@ func (sh *ServerHandlers) OnStart(serverCtx cs.ServerCtx) error {
 		return err
 	}
 
-	oge.StartPackage(sh.Config.External)
+	oe.StartPackage(sh.Config.External)
 
 	return nil
 }
 
 func (sh *ServerHandlers) OnStop(serverCtx cs.ServerCtx) {
-	oge.StopPackage(sh.Config.External)
+	oe.StopPackage(sh.Config.External)
 
 	sh.ServerHandlers.OnStop(serverCtx)
 }
 
 func (sh *ServerHandlers) Destroy(serverCtx cs.ServerCtx) {
-	oge.DestroyPackage(sh.Config.External)
+	oe.DestroyPackage(sh.Config.External)
 
 	sh.ServerHandlers.Destroy(serverCtx)
 }
diff --git a/service/member-service.go b/service/MemberService.go
similarity index 96%
rename from service/member-service.go
rename to service/MemberService.go
index 2228980..f7fab59 100644
--- a/service/member-service.go
+++ b/service/MemberService.go
@@ -8,17 +8,19 @@ import (
 	"reflect"
 	"time"
 
+	"strings"
+
 	cda "git.loafle.net/commons/di-go/annotation"
 	cdr "git.loafle.net/commons/di-go/registry"
 	"git.loafle.net/commons/logging-go"
 	"git.loafle.net/commons/server-go"
-	_ "git.loafle.net/overflow/commons-go/core/annotation"
 	ccm "git.loafle.net/overflow/commons-go/config/member"
-	"git.loafle.net/overflow/gateway/external/grpc"
+	"git.loafle.net/overflow/external-go/grpc"
+	"github.com/dgrijalva/jwt-go"
 	"github.com/valyala/fasthttp"
 
-	"github.com/dgrijalva/jwt-go"
-	"strings"
+	// For annotation
+	_ "git.loafle.net/overflow/commons-go/core/annotation"
 )
 
 var MemberServiceType = reflect.TypeOf((*MemberService)(nil))
@@ -37,7 +39,7 @@ type MemberService struct {
 	_SigninByCookie cda.MethodAnnotation `annotation:"@overflow:RequestMapping(method='POST', entry='/account/signin_cookie', params='[authToken]')"`
 	_Signup         cda.MethodAnnotation `annotation:"@overflow:RequestMapping(method='POST', entry='/account/signup', params='[member, password]')"`
 	_ConfirmEmail   cda.MethodAnnotation `annotation:"@overflow:RequestMapping(method='GET', entry='/account/confirm_email', params='[token]')"`
-	_SendEmailPw 	cda.MethodAnnotation `annotation:"@overflow:RequestMapping(method='POST', entry='/account/send_email_pw', params='[signinID]')"`
+	_SendEmailPw    cda.MethodAnnotation `annotation:"@overflow:RequestMapping(method='POST', entry='/account/send_email_pw', params='[signinID]')"`
 	_ConfirmResetPw cda.MethodAnnotation `annotation:"@overflow:RequestMapping(method='GET', entry='/account/confirm_reset_pw', params='[token]')"`
 
 	_ResetPassword cda.MethodAnnotation `annotation:"@overflow:RequestMapping(method='POST', entry='/account/reset_password', params='[token, pw, confirmPw]')"`
@@ -210,5 +212,3 @@ func (ms *MemberService) ResetPassword(servletCtx server.ServletCtx, ctx *fastht
 
 	return nil
 }
-
-