diff --git a/profile.go b/profile/profile.go
similarity index 61%
rename from profile.go
rename to profile/profile.go
index ade037f..5a597bb 100644
--- a/profile.go
+++ b/profile/profile.go
@@ -4,14 +4,15 @@ package profile
 import (
 	"log"
 
-	"golang.org/x/net/context"
 	"github.com/ensep/grpc101/proto/profile"
+	"golang.org/x/net/context"
 )
 
 type Server struct {
+	profile.UnimplementedProfileServer
 }
 
 func (s *Server) Create(ctx context.Context, req *profile.CreateRequest) (*profile.CreateResponse, error) {
-	log.Printf("Receive message body from client: %s", req.Body)
-	return &Message{Body: "Profile Created!"}, nil
+	log.Printf("Receive message body from client: %s", req.Name)
+	return &profile.CreateResponse{Message: "Profile Created!"}, nil
 }
diff --git a/server.go b/server.go
index 7db0efd..490f788 100644
--- a/server.go
+++ b/server.go
@@ -3,10 +3,11 @@ package main
 
 import (
 	"fmt"
+	"github.com/ensep/grpc101/profile"
+	pb "github.com/ensep/grpc101/proto/profile"
 	"log"
 	"net"
 
-	"github.com/ensep/grpc101/proto/profile"
 	"google.golang.org/grpc"
 )
 
@@ -23,7 +24,7 @@ func main() {
 
 	grpcServer := grpc.NewServer()
 
-	profile.RegisterProfileServiceServer(grpcServer, &s)
+	pb.RegisterProfileServer(grpcServer, &s)
 
 	if err := grpcServer.Serve(lis); err != nil {
 		log.Fatalf("failed to serve: %s", err)