diff --git a/commonLibs/livoxProto1/device.h b/commonLibs/livoxProto1/device.h
index 8bba636..382cf08 100644
--- a/commonLibs/livoxProto1/device.h
+++ b/commonLibs/livoxProto1/device.h
@@ -79,17 +79,6 @@ public:
 		uint16_t dataPort, uint16_t cmdPort, uint16_t imuPort);
 	~Device();
 
-public:
-	comms::DiscoveredDevice discoveredDevice;
-
-	// Configuration
-	std::shared_ptr<smo::ComponentThread> componentThread;
-	int handshakeTimeoutMs, retryDelayMs;
-	std::string smoIp;
-	std::string detectedSmoListeningIp;
-	uint8_t smoSubnetNbits;
-	uint16_t dataPort, cmdPort, imuPort;
-
 private:
 	// Heartbeat mechanism
 	void startHeartbeat();
@@ -149,6 +138,17 @@ public:
 		uint8_t returnMode, smo::Callback<setReturnModeReqCbFn> callback);
 	void getReturnModeReq(smo::Callback<getReturnModeReqCbFn> callback);
 
+public:
+	comms::DiscoveredDevice discoveredDevice;
+
+	// Configuration
+	std::shared_ptr<smo::ComponentThread> componentThread;
+	int handshakeTimeoutMs, retryDelayMs;
+	std::string smoIp;
+	std::string detectedSmoListeningIp;
+	uint8_t smoSubnetNbits;
+	uint16_t dataPort, cmdPort, imuPort;
+
 	// Heartbeat state
 	std::unique_ptr<boost::asio::deadline_timer> heartbeatTimer;
 	std::atomic<bool> heartbeatActive;