diff --git a/api.swagger.json b/api.swagger.json
index dc9826f..d11f0a5 100644
--- a/api.swagger.json
+++ b/api.swagger.json
@@ -292,7 +292,24 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/nodeAccountsServiceUpdateBody"
+              "type": "object",
+              "properties": {
+                "title": {
+                  "type": "string"
+                },
+                "enabled": {
+                  "type": "boolean"
+                },
+                "defaultNamespace": {
+                  "type": "string"
+                },
+                "access": {
+                  "$ref": "#/definitions/accessAccess"
+                },
+                "config": {
+                  "type": "object"
+                }
+              }
             }
           }
         ],
@@ -447,7 +464,12 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/AccountsServiceSetCredentialsBody"
+              "type": "object",
+              "properties": {
+                "credentials": {
+                  "$ref": "#/definitions/accountsCredentials"
+                }
+              }
             }
           }
         ],
@@ -609,7 +631,12 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/nodeAccountsServiceMoveBody"
+              "type": "object",
+              "properties": {
+                "namespace": {
+                  "type": "string"
+                }
+              }
             }
           }
         ],
@@ -647,7 +674,24 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/nodeAccountsServiceToggleBody"
+              "type": "object",
+              "properties": {
+                "title": {
+                  "type": "string"
+                },
+                "enabled": {
+                  "type": "boolean"
+                },
+                "defaultNamespace": {
+                  "type": "string"
+                },
+                "access": {
+                  "$ref": "#/definitions/accessAccess"
+                },
+                "config": {
+                  "type": "object"
+                }
+              }
             }
           }
         ],
@@ -1306,7 +1350,40 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/nodeDevicesServiceUpdateBody"
+              "type": "object",
+              "properties": {
+                "title": {
+                  "type": "string"
+                },
+                "enabled": {
+                  "type": "boolean"
+                },
+                "certificate": {
+                  "$ref": "#/definitions/devicesCertificate"
+                },
+                "tags": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "basicEnabled": {
+                  "type": "boolean"
+                },
+                "token": {
+                  "type": "string"
+                },
+                "access": {
+                  "$ref": "#/definitions/accessAccess"
+                },
+                "config": {
+                  "type": "object"
+                },
+                "lastUpdated": {
+                  "type": "string",
+                  "format": "date-time"
+                }
+              }
             }
           }
         ],
@@ -1344,7 +1421,40 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/DevicesServicePatchConfigBody"
+              "type": "object",
+              "properties": {
+                "title": {
+                  "type": "string"
+                },
+                "enabled": {
+                  "type": "boolean"
+                },
+                "certificate": {
+                  "$ref": "#/definitions/devicesCertificate"
+                },
+                "tags": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "basicEnabled": {
+                  "type": "boolean"
+                },
+                "token": {
+                  "type": "string"
+                },
+                "access": {
+                  "$ref": "#/definitions/accessAccess"
+                },
+                "config": {
+                  "type": "object"
+                },
+                "lastUpdated": {
+                  "type": "string",
+                  "format": "date-time"
+                }
+              }
             }
           }
         ],
@@ -1512,7 +1622,12 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/nodeDevicesServiceMoveBody"
+              "type": "object",
+              "properties": {
+                "namespace": {
+                  "type": "string"
+                }
+              }
             }
           }
         ],
@@ -1550,7 +1665,40 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/nodeDevicesServiceToggleBody"
+              "type": "object",
+              "properties": {
+                "title": {
+                  "type": "string"
+                },
+                "enabled": {
+                  "type": "boolean"
+                },
+                "certificate": {
+                  "$ref": "#/definitions/devicesCertificate"
+                },
+                "tags": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "basicEnabled": {
+                  "type": "boolean"
+                },
+                "token": {
+                  "type": "string"
+                },
+                "access": {
+                  "$ref": "#/definitions/accessAccess"
+                },
+                "config": {
+                  "type": "object"
+                },
+                "lastUpdated": {
+                  "type": "string",
+                  "format": "date-time"
+                }
+              }
             }
           }
         ],
@@ -1588,7 +1736,40 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/DevicesServiceToggleBasicBody"
+              "type": "object",
+              "properties": {
+                "title": {
+                  "type": "string"
+                },
+                "enabled": {
+                  "type": "boolean"
+                },
+                "certificate": {
+                  "$ref": "#/definitions/devicesCertificate"
+                },
+                "tags": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "basicEnabled": {
+                  "type": "boolean"
+                },
+                "token": {
+                  "type": "string"
+                },
+                "access": {
+                  "$ref": "#/definitions/accessAccess"
+                },
+                "config": {
+                  "type": "object"
+                },
+                "lastUpdated": {
+                  "type": "string",
+                  "format": "date-time"
+                }
+              }
             }
           }
         ],
@@ -1783,7 +1964,15 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/nodeNamespacesServiceJoinBody"
+              "type": "object",
+              "properties": {
+                "account": {
+                  "type": "string"
+                },
+                "access": {
+                  "$ref": "#/definitions/accessLevel"
+                }
+              }
             }
           }
         ],
@@ -1991,7 +2180,21 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/nodeNamespacesServiceUpdateBody"
+              "type": "object",
+              "properties": {
+                "title": {
+                  "type": "string"
+                },
+                "access": {
+                  "$ref": "#/definitions/accessAccess"
+                },
+                "plugin": {
+                  "$ref": "#/definitions/nodenamespacesPlugin"
+                },
+                "config": {
+                  "type": "object"
+                }
+              }
             }
           }
         ],
@@ -2621,7 +2824,46 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/pluginsPluginsServiceUpdateBody"
+              "type": "object",
+              "properties": {
+                "logo": {
+                  "type": "string",
+                  "title": "Plugin logo url in format supported by \u003cimg\u003e tag"
+                },
+                "title": {
+                  "type": "string"
+                },
+                "description": {
+                  "type": "string",
+                  "title": "(optionally Markdown) long description Marketplace like"
+                },
+                "public": {
+                  "type": "boolean",
+                  "title": "see Namespace field"
+                },
+                "namespace": {
+                  "type": "string",
+                  "title": "Required to get not-public Plugin"
+                },
+                "access": {
+                  "$ref": "#/definitions/accessAccess"
+                },
+                "kind": {
+                  "$ref": "#/definitions/pluginsPluginKind"
+                },
+                "vars": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "embeddedConf": {
+                  "$ref": "#/definitions/pluginsEmbededPluginConf"
+                },
+                "deviceConf": {
+                  "$ref": "#/definitions/pluginsDevicePluginConf"
+                }
+              }
             }
           }
         ],
@@ -2764,86 +3006,6 @@
     }
   },
   "definitions": {
-    "AccountsServiceSetCredentialsBody": {
-      "type": "object",
-      "properties": {
-        "credentials": {
-          "$ref": "#/definitions/accountsCredentials"
-        }
-      }
-    },
-    "DevicesServicePatchConfigBody": {
-      "type": "object",
-      "properties": {
-        "title": {
-          "type": "string"
-        },
-        "enabled": {
-          "type": "boolean"
-        },
-        "certificate": {
-          "$ref": "#/definitions/devicesCertificate"
-        },
-        "tags": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "basicEnabled": {
-          "type": "boolean"
-        },
-        "token": {
-          "type": "string"
-        },
-        "access": {
-          "$ref": "#/definitions/accessAccess"
-        },
-        "config": {
-          "type": "object"
-        },
-        "lastUpdated": {
-          "type": "string",
-          "format": "date-time"
-        }
-      }
-    },
-    "DevicesServiceToggleBasicBody": {
-      "type": "object",
-      "properties": {
-        "title": {
-          "type": "string"
-        },
-        "enabled": {
-          "type": "boolean"
-        },
-        "certificate": {
-          "$ref": "#/definitions/devicesCertificate"
-        },
-        "tags": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "basicEnabled": {
-          "type": "boolean"
-        },
-        "token": {
-          "type": "string"
-        },
-        "access": {
-          "$ref": "#/definitions/accessAccess"
-        },
-        "config": {
-          "type": "object"
-        },
-        "lastUpdated": {
-          "type": "string",
-          "format": "date-time"
-        }
-      }
-    },
     "accessAccess": {
       "type": "object",
       "properties": {
@@ -3069,12 +3231,14 @@
         "ACCOUNT_CREATE",
         "ACCOUNT_UPDATE",
         "ACCOUNT_DELETE",
+        "ACCOUNT_MOVE",
         "NAMESPACE_CREATE",
         "NAMESPACE_UPDATE",
         "NAMESPACE_DELETE",
         "DEVICE_CREATE",
         "DEVICE_UPDATE",
-        "DEVICE_DELETE"
+        "DEVICE_DELETE",
+        "DEVICE_MOVE"
       ],
       "default": "NONE"
     },
@@ -3184,137 +3348,9 @@
         }
       }
     },
-    "nodeAccountsServiceMoveBody": {
-      "type": "object",
-      "properties": {
-        "namespace": {
-          "type": "string"
-        }
-      }
-    },
-    "nodeAccountsServiceToggleBody": {
-      "type": "object",
-      "properties": {
-        "title": {
-          "type": "string"
-        },
-        "enabled": {
-          "type": "boolean"
-        },
-        "defaultNamespace": {
-          "type": "string"
-        },
-        "access": {
-          "$ref": "#/definitions/accessAccess"
-        },
-        "config": {
-          "type": "object"
-        }
-      }
-    },
-    "nodeAccountsServiceUpdateBody": {
-      "type": "object",
-      "properties": {
-        "title": {
-          "type": "string"
-        },
-        "enabled": {
-          "type": "boolean"
-        },
-        "defaultNamespace": {
-          "type": "string"
-        },
-        "access": {
-          "$ref": "#/definitions/accessAccess"
-        },
-        "config": {
-          "type": "object"
-        }
-      }
-    },
     "nodeDeleteResponse": {
       "type": "object"
     },
-    "nodeDevicesServiceMoveBody": {
-      "type": "object",
-      "properties": {
-        "namespace": {
-          "type": "string"
-        }
-      }
-    },
-    "nodeDevicesServiceToggleBody": {
-      "type": "object",
-      "properties": {
-        "title": {
-          "type": "string"
-        },
-        "enabled": {
-          "type": "boolean"
-        },
-        "certificate": {
-          "$ref": "#/definitions/devicesCertificate"
-        },
-        "tags": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "basicEnabled": {
-          "type": "boolean"
-        },
-        "token": {
-          "type": "string"
-        },
-        "access": {
-          "$ref": "#/definitions/accessAccess"
-        },
-        "config": {
-          "type": "object"
-        },
-        "lastUpdated": {
-          "type": "string",
-          "format": "date-time"
-        }
-      }
-    },
-    "nodeDevicesServiceUpdateBody": {
-      "type": "object",
-      "properties": {
-        "title": {
-          "type": "string"
-        },
-        "enabled": {
-          "type": "boolean"
-        },
-        "certificate": {
-          "$ref": "#/definitions/devicesCertificate"
-        },
-        "tags": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "basicEnabled": {
-          "type": "boolean"
-        },
-        "token": {
-          "type": "string"
-        },
-        "access": {
-          "$ref": "#/definitions/accessAccess"
-        },
-        "config": {
-          "type": "object"
-        },
-        "lastUpdated": {
-          "type": "string",
-          "format": "date-time"
-        }
-      }
-    },
     "nodeDevicesTokenRequest": {
       "type": "object",
       "properties": {
@@ -3376,34 +3412,6 @@
         }
       }
     },
-    "nodeNamespacesServiceJoinBody": {
-      "type": "object",
-      "properties": {
-        "account": {
-          "type": "string"
-        },
-        "access": {
-          "$ref": "#/definitions/accessLevel"
-        }
-      }
-    },
-    "nodeNamespacesServiceUpdateBody": {
-      "type": "object",
-      "properties": {
-        "title": {
-          "type": "string"
-        },
-        "access": {
-          "$ref": "#/definitions/accessAccess"
-        },
-        "plugin": {
-          "$ref": "#/definitions/nodenamespacesPlugin"
-        },
-        "config": {
-          "type": "object"
-        }
-      }
-    },
     "nodeSetCredentialsResponse": {
       "type": "object"
     },
@@ -3544,48 +3552,6 @@
         }
       }
     },
-    "pluginsPluginsServiceUpdateBody": {
-      "type": "object",
-      "properties": {
-        "logo": {
-          "type": "string",
-          "title": "Plugin logo url in format supported by \u003cimg\u003e tag"
-        },
-        "title": {
-          "type": "string"
-        },
-        "description": {
-          "type": "string",
-          "title": "(optionally Markdown) long description Marketplace like"
-        },
-        "public": {
-          "type": "boolean",
-          "title": "see Namespace field"
-        },
-        "namespace": {
-          "type": "string",
-          "title": "Required to get not-public Plugin"
-        },
-        "access": {
-          "$ref": "#/definitions/accessAccess"
-        },
-        "kind": {
-          "$ref": "#/definitions/pluginsPluginKind"
-        },
-        "vars": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "embeddedConf": {
-          "$ref": "#/definitions/pluginsEmbededPluginConf"
-        },
-        "deviceConf": {
-          "$ref": "#/definitions/pluginsDevicePluginConf"
-        }
-      }
-    },
     "protobufAny": {
       "type": "object",
       "properties": {
diff --git a/build/es/eventbus/eventbus_pb.d.ts b/build/es/eventbus/eventbus_pb.d.ts
index 605cf40..20d0ed0 100644
--- a/build/es/eventbus/eventbus_pb.d.ts
+++ b/build/es/eventbus/eventbus_pb.d.ts
@@ -34,34 +34,44 @@ export declare enum EventKind {
   ACCOUNT_DELETE = 3,
 
   /**
-   * @generated from enum value: NAMESPACE_CREATE = 4;
+   * @generated from enum value: ACCOUNT_MOVE = 4;
    */
-  NAMESPACE_CREATE = 4,
+  ACCOUNT_MOVE = 4,
 
   /**
-   * @generated from enum value: NAMESPACE_UPDATE = 5;
+   * @generated from enum value: NAMESPACE_CREATE = 5;
    */
-  NAMESPACE_UPDATE = 5,
+  NAMESPACE_CREATE = 5,
 
   /**
-   * @generated from enum value: NAMESPACE_DELETE = 6;
+   * @generated from enum value: NAMESPACE_UPDATE = 6;
    */
-  NAMESPACE_DELETE = 6,
+  NAMESPACE_UPDATE = 6,
 
   /**
-   * @generated from enum value: DEVICE_CREATE = 7;
+   * @generated from enum value: NAMESPACE_DELETE = 7;
    */
-  DEVICE_CREATE = 7,
+  NAMESPACE_DELETE = 7,
 
   /**
-   * @generated from enum value: DEVICE_UPDATE = 8;
+   * @generated from enum value: DEVICE_CREATE = 8;
    */
-  DEVICE_UPDATE = 8,
+  DEVICE_CREATE = 8,
 
   /**
-   * @generated from enum value: DEVICE_DELETE = 9;
+   * @generated from enum value: DEVICE_UPDATE = 9;
    */
-  DEVICE_DELETE = 9,
+  DEVICE_UPDATE = 9,
+
+  /**
+   * @generated from enum value: DEVICE_DELETE = 10;
+   */
+  DEVICE_DELETE = 10,
+
+  /**
+   * @generated from enum value: DEVICE_MOVE = 11;
+   */
+  DEVICE_MOVE = 11,
 }
 
 /**
diff --git a/build/es/eventbus/eventbus_pb.js b/build/es/eventbus/eventbus_pb.js
index fffbe60..f4d8cfa 100644
--- a/build/es/eventbus/eventbus_pb.js
+++ b/build/es/eventbus/eventbus_pb.js
@@ -18,12 +18,14 @@ export const EventKind = proto3.makeEnum(
     {no: 1, name: "ACCOUNT_CREATE"},
     {no: 2, name: "ACCOUNT_UPDATE"},
     {no: 3, name: "ACCOUNT_DELETE"},
-    {no: 4, name: "NAMESPACE_CREATE"},
-    {no: 5, name: "NAMESPACE_UPDATE"},
-    {no: 6, name: "NAMESPACE_DELETE"},
-    {no: 7, name: "DEVICE_CREATE"},
-    {no: 8, name: "DEVICE_UPDATE"},
-    {no: 9, name: "DEVICE_DELETE"},
+    {no: 4, name: "ACCOUNT_MOVE"},
+    {no: 5, name: "NAMESPACE_CREATE"},
+    {no: 6, name: "NAMESPACE_UPDATE"},
+    {no: 7, name: "NAMESPACE_DELETE"},
+    {no: 8, name: "DEVICE_CREATE"},
+    {no: 9, name: "DEVICE_UPDATE"},
+    {no: 10, name: "DEVICE_DELETE"},
+    {no: 11, name: "DEVICE_MOVE"},
   ],
 );
 
diff --git a/eventbus/eventbus.pb.go b/eventbus/eventbus.pb.go
index ec74bca..22b1833 100644
--- a/eventbus/eventbus.pb.go
+++ b/eventbus/eventbus.pb.go
@@ -33,39 +33,45 @@ const (
 	EventKind_ACCOUNT_CREATE   EventKind = 1
 	EventKind_ACCOUNT_UPDATE   EventKind = 2
 	EventKind_ACCOUNT_DELETE   EventKind = 3
-	EventKind_NAMESPACE_CREATE EventKind = 4
-	EventKind_NAMESPACE_UPDATE EventKind = 5
-	EventKind_NAMESPACE_DELETE EventKind = 6
-	EventKind_DEVICE_CREATE    EventKind = 7
-	EventKind_DEVICE_UPDATE    EventKind = 8
-	EventKind_DEVICE_DELETE    EventKind = 9
+	EventKind_ACCOUNT_MOVE     EventKind = 4
+	EventKind_NAMESPACE_CREATE EventKind = 5
+	EventKind_NAMESPACE_UPDATE EventKind = 6
+	EventKind_NAMESPACE_DELETE EventKind = 7
+	EventKind_DEVICE_CREATE    EventKind = 8
+	EventKind_DEVICE_UPDATE    EventKind = 9
+	EventKind_DEVICE_DELETE    EventKind = 10
+	EventKind_DEVICE_MOVE      EventKind = 11
 )
 
 // Enum value maps for EventKind.
 var (
 	EventKind_name = map[int32]string{
-		0: "NONE",
-		1: "ACCOUNT_CREATE",
-		2: "ACCOUNT_UPDATE",
-		3: "ACCOUNT_DELETE",
-		4: "NAMESPACE_CREATE",
-		5: "NAMESPACE_UPDATE",
-		6: "NAMESPACE_DELETE",
-		7: "DEVICE_CREATE",
-		8: "DEVICE_UPDATE",
-		9: "DEVICE_DELETE",
+		0:  "NONE",
+		1:  "ACCOUNT_CREATE",
+		2:  "ACCOUNT_UPDATE",
+		3:  "ACCOUNT_DELETE",
+		4:  "ACCOUNT_MOVE",
+		5:  "NAMESPACE_CREATE",
+		6:  "NAMESPACE_UPDATE",
+		7:  "NAMESPACE_DELETE",
+		8:  "DEVICE_CREATE",
+		9:  "DEVICE_UPDATE",
+		10: "DEVICE_DELETE",
+		11: "DEVICE_MOVE",
 	}
 	EventKind_value = map[string]int32{
 		"NONE":             0,
 		"ACCOUNT_CREATE":   1,
 		"ACCOUNT_UPDATE":   2,
 		"ACCOUNT_DELETE":   3,
-		"NAMESPACE_CREATE": 4,
-		"NAMESPACE_UPDATE": 5,
-		"NAMESPACE_DELETE": 6,
-		"DEVICE_CREATE":    7,
-		"DEVICE_UPDATE":    8,
-		"DEVICE_DELETE":    9,
+		"ACCOUNT_MOVE":     4,
+		"NAMESPACE_CREATE": 5,
+		"NAMESPACE_UPDATE": 6,
+		"NAMESPACE_DELETE": 7,
+		"DEVICE_CREATE":    8,
+		"DEVICE_UPDATE":    9,
+		"DEVICE_DELETE":    10,
+		"DEVICE_MOVE":      11,
 	}
 )
 
@@ -243,38 +249,40 @@ var file_eventbus_eventbus_proto_rawDesc = []byte{
 	0x65, 0x12, 0x2b, 0x0a, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
 	0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x42, 0x08,
-	0x0a, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2a, 0xcc, 0x01, 0x0a, 0x09, 0x45, 0x76, 0x65,
+	0x0a, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2a, 0xef, 0x01, 0x0a, 0x09, 0x45, 0x76, 0x65,
 	0x6e, 0x74, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00,
 	0x12, 0x12, 0x0a, 0x0e, 0x41, 0x43, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x5f, 0x43, 0x52, 0x45, 0x41,
 	0x54, 0x45, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x41, 0x43, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x5f,
 	0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x10, 0x02, 0x12, 0x12, 0x0a, 0x0e, 0x41, 0x43, 0x43, 0x4f,
-	0x55, 0x4e, 0x54, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x03, 0x12, 0x14, 0x0a, 0x10,
-	0x4e, 0x41, 0x4d, 0x45, 0x53, 0x50, 0x41, 0x43, 0x45, 0x5f, 0x43, 0x52, 0x45, 0x41, 0x54, 0x45,
-	0x10, 0x04, 0x12, 0x14, 0x0a, 0x10, 0x4e, 0x41, 0x4d, 0x45, 0x53, 0x50, 0x41, 0x43, 0x45, 0x5f,
-	0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x10, 0x05, 0x12, 0x14, 0x0a, 0x10, 0x4e, 0x41, 0x4d, 0x45,
-	0x53, 0x50, 0x41, 0x43, 0x45, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x06, 0x12, 0x11,
-	0x0a, 0x0d, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x43, 0x52, 0x45, 0x41, 0x54, 0x45, 0x10,
-	0x07, 0x12, 0x11, 0x0a, 0x0d, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x55, 0x50, 0x44, 0x41,
-	0x54, 0x45, 0x10, 0x08, 0x12, 0x11, 0x0a, 0x0d, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x44,
-	0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x09, 0x32, 0x59, 0x0a, 0x0d, 0x45, 0x76, 0x65, 0x6e, 0x74,
-	0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x48, 0x0a, 0x09, 0x53, 0x75, 0x62, 0x73,
-	0x63, 0x72, 0x69, 0x62, 0x65, 0x12, 0x1d, 0x2e, 0x69, 0x6e, 0x66, 0x69, 0x6e, 0x69, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x1a, 0x1a, 0x2e, 0x69, 0x6e, 0x66, 0x69, 0x6e, 0x69, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x62, 0x75, 0x73, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74,
-	0x30, 0x01, 0x42, 0xbb, 0x01, 0x0a, 0x17, 0x63, 0x6f, 0x6d, 0x2e, 0x69, 0x6e, 0x66, 0x69, 0x6e,
-	0x69, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x62, 0x75, 0x73, 0x42, 0x0d,
-	0x45, 0x76, 0x65, 0x6e, 0x74, 0x62, 0x75, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x24, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x69, 0x6e, 0x66, 0x69,
-	0x6e, 0x69, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x76, 0x65,
-	0x6e, 0x74, 0x62, 0x75, 0x73, 0xa2, 0x02, 0x03, 0x49, 0x45, 0x58, 0xaa, 0x02, 0x13, 0x49, 0x6e,
-	0x66, 0x69, 0x6e, 0x69, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x62, 0x75,
-	0x73, 0xca, 0x02, 0x13, 0x49, 0x6e, 0x66, 0x69, 0x6e, 0x69, 0x6d, 0x65, 0x73, 0x68, 0x5c, 0x45,
-	0x76, 0x65, 0x6e, 0x74, 0x62, 0x75, 0x73, 0xe2, 0x02, 0x1f, 0x49, 0x6e, 0x66, 0x69, 0x6e, 0x69,
-	0x6d, 0x65, 0x73, 0x68, 0x5c, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x62, 0x75, 0x73, 0x5c, 0x47, 0x50,
-	0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x49, 0x6e, 0x66, 0x69,
-	0x6e, 0x69, 0x6d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x62, 0x75, 0x73,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x55, 0x4e, 0x54, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x03, 0x12, 0x10, 0x0a, 0x0c,
+	0x41, 0x43, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x5f, 0x4d, 0x4f, 0x56, 0x45, 0x10, 0x04, 0x12, 0x14,
+	0x0a, 0x10, 0x4e, 0x41, 0x4d, 0x45, 0x53, 0x50, 0x41, 0x43, 0x45, 0x5f, 0x43, 0x52, 0x45, 0x41,
+	0x54, 0x45, 0x10, 0x05, 0x12, 0x14, 0x0a, 0x10, 0x4e, 0x41, 0x4d, 0x45, 0x53, 0x50, 0x41, 0x43,
+	0x45, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x10, 0x06, 0x12, 0x14, 0x0a, 0x10, 0x4e, 0x41,
+	0x4d, 0x45, 0x53, 0x50, 0x41, 0x43, 0x45, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x07,
+	0x12, 0x11, 0x0a, 0x0d, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x43, 0x52, 0x45, 0x41, 0x54,
+	0x45, 0x10, 0x08, 0x12, 0x11, 0x0a, 0x0d, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x55, 0x50,
+	0x44, 0x41, 0x54, 0x45, 0x10, 0x09, 0x12, 0x11, 0x0a, 0x0d, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45,
+	0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x0a, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x45, 0x56,
+	0x49, 0x43, 0x45, 0x5f, 0x4d, 0x4f, 0x56, 0x45, 0x10, 0x0b, 0x32, 0x59, 0x0a, 0x0d, 0x45, 0x76,
+	0x65, 0x6e, 0x74, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x48, 0x0a, 0x09, 0x53,
+	0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x12, 0x1d, 0x2e, 0x69, 0x6e, 0x66, 0x69, 0x6e,
+	0x69, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
+	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x1a, 0x2e, 0x69, 0x6e, 0x66, 0x69, 0x6e, 0x69,
+	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x62, 0x75, 0x73, 0x2e, 0x45, 0x76,
+	0x65, 0x6e, 0x74, 0x30, 0x01, 0x42, 0xbb, 0x01, 0x0a, 0x17, 0x63, 0x6f, 0x6d, 0x2e, 0x69, 0x6e,
+	0x66, 0x69, 0x6e, 0x69, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x62, 0x75,
+	0x73, 0x42, 0x0d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x62, 0x75, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x50, 0x01, 0x5a, 0x24, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x69,
+	0x6e, 0x66, 0x69, 0x6e, 0x69, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
+	0x65, 0x76, 0x65, 0x6e, 0x74, 0x62, 0x75, 0x73, 0xa2, 0x02, 0x03, 0x49, 0x45, 0x58, 0xaa, 0x02,
+	0x13, 0x49, 0x6e, 0x66, 0x69, 0x6e, 0x69, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x45, 0x76, 0x65, 0x6e,
+	0x74, 0x62, 0x75, 0x73, 0xca, 0x02, 0x13, 0x49, 0x6e, 0x66, 0x69, 0x6e, 0x69, 0x6d, 0x65, 0x73,
+	0x68, 0x5c, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x62, 0x75, 0x73, 0xe2, 0x02, 0x1f, 0x49, 0x6e, 0x66,
+	0x69, 0x6e, 0x69, 0x6d, 0x65, 0x73, 0x68, 0x5c, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x62, 0x75, 0x73,
+	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x49,
+	0x6e, 0x66, 0x69, 0x6e, 0x69, 0x6d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x45, 0x76, 0x65, 0x6e, 0x74,
+	0x62, 0x75, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/eventbus/eventbus.proto b/eventbus/eventbus.proto
index c7f0cba..6cbdaa4 100644
--- a/eventbus/eventbus.proto
+++ b/eventbus/eventbus.proto
@@ -14,12 +14,14 @@ enum EventKind{
   ACCOUNT_CREATE = 1;
   ACCOUNT_UPDATE = 2;
   ACCOUNT_DELETE = 3;
-  NAMESPACE_CREATE = 4;
-  NAMESPACE_UPDATE = 5;
-  NAMESPACE_DELETE = 6;
-  DEVICE_CREATE = 7;
-  DEVICE_UPDATE = 8;
-  DEVICE_DELETE = 9;
+  ACCOUNT_MOVE = 4;
+  NAMESPACE_CREATE = 5;
+  NAMESPACE_UPDATE = 6;
+  NAMESPACE_DELETE = 7;
+  DEVICE_CREATE = 8;
+  DEVICE_UPDATE = 9;
+  DEVICE_DELETE = 10;
+  DEVICE_MOVE = 11;
 }
 
 message Event {