Re-arrange struct

z2m.go

@@ -25,17 +25,17 @@ type (
 
 // JSON structures for the z2m device from /bridge/devices
 type Z2MDevice struct {
-	Definition struct {
-		Vendor  string   `json:"vendor"`
-		Model   string   `json:"model"`
-		Exposes []Expose `json:"exposes"`
-	} `json:"definition"`
+	Gateway      *Gateway
 	Type         string `json:"type"`
 	IeeeAddress  string `json:"ieee_address"`
 	SwBuildID    string `json:"software_build_id"`
 	FriendlyName string `json:"friendly_name"`
-	XAALDevices  []XAALDeviceInterface
-	Gateway      *Gateway
+	Definition   struct {
+		Vendor  string   `json:"vendor"`
+		Model   string   `json:"model"`
+		Exposes []Expose `json:"exposes"`
+	} `json:"definition"`
+	XAALDevices []XAALDeviceInterface
 }
 
 type Expose struct {