diff --git a/core/main.go b/core/main.go
index b491036f6..962b9a62b 100644
--- a/core/main.go
+++ b/core/main.go
@@ -7,9 +7,9 @@ import (
 	"github.com/mesg-foundation/core/config"
 	"github.com/mesg-foundation/core/container"
 	"github.com/mesg-foundation/core/database"
-	"github.com/mesg-foundation/core/interface/grpc"
 	"github.com/mesg-foundation/core/logger"
 	"github.com/mesg-foundation/core/sdk"
+	"github.com/mesg-foundation/core/server/grpc"
 	"github.com/mesg-foundation/core/service/manager/dockermanager"
 	"github.com/mesg-foundation/core/version"
 	"github.com/mesg-foundation/core/x/xerrors"
diff --git a/interface/grpc/core/core.go b/server/grpc/core/core.go
similarity index 100%
rename from interface/grpc/core/core.go
rename to server/grpc/core/core.go
diff --git a/interface/grpc/core/core_test.go b/server/grpc/core/core_test.go
similarity index 100%
rename from interface/grpc/core/core_test.go
rename to server/grpc/core/core_test.go
diff --git a/interface/grpc/core/deploy.go b/server/grpc/core/deploy.go
similarity index 100%
rename from interface/grpc/core/deploy.go
rename to server/grpc/core/deploy.go
diff --git a/interface/grpc/core/deploy_integration_test.go b/server/grpc/core/deploy_integration_test.go
similarity index 100%
rename from interface/grpc/core/deploy_integration_test.go
rename to server/grpc/core/deploy_integration_test.go
diff --git a/interface/grpc/core/deploy_test.go b/server/grpc/core/deploy_test.go
similarity index 100%
rename from interface/grpc/core/deploy_test.go
rename to server/grpc/core/deploy_test.go
diff --git a/interface/grpc/core/logs.go b/server/grpc/core/logs.go
similarity index 100%
rename from interface/grpc/core/logs.go
rename to server/grpc/core/logs.go
diff --git a/interface/grpc/core/proto.go b/server/grpc/core/proto.go
similarity index 100%
rename from interface/grpc/core/proto.go
rename to server/grpc/core/proto.go
diff --git a/interface/grpc/core/test_test.go b/server/grpc/core/test_test.go
similarity index 100%
rename from interface/grpc/core/test_test.go
rename to server/grpc/core/test_test.go
diff --git a/interface/grpc/server.go b/server/grpc/server.go
similarity index 96%
rename from interface/grpc/server.go
rename to server/grpc/server.go
index 9a0c84017..483451f58 100644
--- a/interface/grpc/server.go
+++ b/server/grpc/server.go
@@ -7,11 +7,11 @@ import (
 
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus"
-	"github.com/mesg-foundation/core/interface/grpc/core"
-	"github.com/mesg-foundation/core/interface/grpc/service"
 	"github.com/mesg-foundation/core/protobuf/coreapi"
 	"github.com/mesg-foundation/core/protobuf/serviceapi"
 	"github.com/mesg-foundation/core/sdk"
+	"github.com/mesg-foundation/core/server/grpc/core"
+	"github.com/mesg-foundation/core/server/grpc/service"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/keepalive"
diff --git a/interface/grpc/server_test.go b/server/grpc/server_test.go
similarity index 100%
rename from interface/grpc/server_test.go
rename to server/grpc/server_test.go
diff --git a/interface/grpc/service/service.go b/server/grpc/service/service.go
similarity index 100%
rename from interface/grpc/service/service.go
rename to server/grpc/service/service.go
diff --git a/interface/grpc/service/service_test.go b/server/grpc/service/service_test.go
similarity index 100%
rename from interface/grpc/service/service_test.go
rename to server/grpc/service/service_test.go
diff --git a/interface/grpc/service/test_test.go b/server/grpc/service/test_test.go
similarity index 100%
rename from interface/grpc/service/test_test.go
rename to server/grpc/service/test_test.go