diff --git a/proto/server_car/Direction.proto b/proto/server_car/Direction.proto
new file mode 100644
index 00000000000..ca614a16ea6
--- /dev/null
+++ b/proto/server_car/Direction.proto
@@ -0,0 +1,21 @@
+syntax = "proto3";
+package carkot;
+
+option java_package = "proto.car";
+option java_outer_classname = "Direction";
+
+message DirectionRequest {
+    enum Command {
+        stop = 0;
+        forward = 1;
+        backward = 2;
+        left = 3;
+        right = 4;
+    }
+    Command command = 1;
+}
+
+message DirectionResponse {
+    int32 code = 1;
+    string errorMsg = 2;
+}
diff --git a/proto/server_car/connect.proto b/proto/server_car/connect.proto
index 4922fccca9e..49df5b9aaa9 100644
--- a/proto/server_car/connect.proto
+++ b/proto/server_car/connect.proto
@@ -1,9 +1,8 @@
 syntax = "proto3";
 package carkot;
-import "error.proto";
 
 option java_package = "proto.car";
-option java_outer_classname = "ConnectP";
+option java_outer_classname = "Connect";
 
 message ConnectionRequest {
     string ip = 1;
@@ -11,8 +10,8 @@ message ConnectionRequest {
 }
 
 message ConnectionResponse {
-    oneof response {
-        Error error = 2;
-        int32 uid = 1;
-    }
+    int32 uid = 1;
+    int32 code = 2;
+    string errorMsg = 3;
+    
 }
diff --git a/proto/server_car/error.proto b/proto/server_car/error.proto
deleted file mode 100644
index 6e4e1a4f6f4..00000000000
--- a/proto/server_car/error.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-package carkot;
-
-option java_package = "proto.car";
-option java_outer_classname = "ErrorP";
-
-message Error {
-    string errorMessage = 1;
-    int32 errorCode = 2;
-}
diff --git a/proto/server_car/location.proto b/proto/server_car/location.proto
index d5fb710d109..da00af9f7bc 100644
--- a/proto/server_car/location.proto
+++ b/proto/server_car/location.proto
@@ -1,15 +1,15 @@
 syntax = "proto3";
 package carkot;
-import "error.proto";
 
 option java_package = "proto.car";
-option java_outer_classname = "LocationP";
+option java_outer_classname = "Location";
+
+message LocationResponse {
+
+    LocationResponse locationResponse = 1;
+    int32 code = 2;
+    string errorMsg = 3;
 
-message Location {
-    oneof response {
-        Error error = 2;
-        LocationResponse locationResponse = 1;
-    }
     message LocationResponse {
         double x = 1;
         double y = 2;
diff --git a/proto/server_car/route.proto b/proto/server_car/route.proto
index 50ac625c415..864845be2f0 100644
--- a/proto/server_car/route.proto
+++ b/proto/server_car/route.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 package carkot;
 
 option java_package = "proto.car";
-option java_outer_classname = "RouteP";
+option java_outer_classname = "Route";
 
-message Route {
-   repeated WayPoint way_points = 1; 
+message RouteRequest {
+    repeated WayPoint way_points = 1; 
 
     message WayPoint {
         double distance = 2;
@@ -13,13 +13,7 @@ message Route {
     }
 }
 
-message Direction {
-    enum Command {
-        stop = 0;
-        forward = 1;
-        backward = 2;
-        left = 3;
-        right = 4;
-    }
-    Command command = 1;
+message RouteResponse {
+    int32 code = 1;
+    string errorMsg = 2;
 }
diff --git a/proto/server_car/routeDone.proto b/proto/server_car/routeDone.proto
index d10194ec2ea..5fe75d274f2 100644
--- a/proto/server_car/routeDone.proto
+++ b/proto/server_car/routeDone.proto
@@ -2,8 +2,9 @@ syntax = "proto3";
 package carkot;
 
 option java_package = "proto.car";
-option java_outer_classname = "RouteDoneP";
+option java_outer_classname = "RouteDone";
 
-message RouteDone {
-    int32 uid = 1;
+message RouteDoneResponse {
+    int32 code = 1;
+    string errorMsg = 2;
 }