diff --git a/internal/decoders/chunk.go b/internal/decoders/chunk.go
index 7b56d85..46df2e3 100644
--- a/internal/decoders/chunk.go
+++ b/internal/decoders/chunk.go
@@ -12,8 +12,8 @@ type ChunkHeader struct {
 }
 
 type Chunk struct {
-	Header    ChunkHeader
 	ChunkData []byte
+	Header    ChunkHeader
 }
 
 func DecodeChunk(bytes []byte) (Chunk, error) {
diff --git a/internal/decoders/data_packet_chunk.go b/internal/decoders/data_packet_chunk.go
index 9d30fc7..c0ed02f 100644
--- a/internal/decoders/data_packet_chunk.go
+++ b/internal/decoders/data_packet_chunk.go
@@ -11,8 +11,8 @@ type DataPacketChunkData struct {
 }
 
 type DataPacketChunk struct {
-	Chunk Chunk
 	Data  DataPacketChunkData
+	Chunk Chunk
 }
 
 func DecodeDataPacketChunk(bytes []byte) (DataPacketChunk, error) {
diff --git a/internal/decoders/data_tracker_chunk.go b/internal/decoders/data_tracker_chunk.go
index 3b042bb..a4f95a0 100644
--- a/internal/decoders/data_tracker_chunk.go
+++ b/internal/decoders/data_tracker_chunk.go
@@ -16,8 +16,8 @@ type DataTrackerChunkData struct {
 }
 
 type DataTrackerChunk struct {
-	Chunk Chunk
 	Data  DataTrackerChunkData
+	Chunk Chunk
 }
 
 func DecodeDataTrackerChunk(bytes []byte) (DataTrackerChunk, error) {
diff --git a/internal/decoders/info_packet_chunk.go b/internal/decoders/info_packet_chunk.go
index 67bb352..1aa6362 100644
--- a/internal/decoders/info_packet_chunk.go
+++ b/internal/decoders/info_packet_chunk.go
@@ -12,8 +12,8 @@ type InfoPacketChunkData struct {
 }
 
 type InfoPacketChunk struct {
-	Chunk Chunk
 	Data  InfoPacketChunkData
+	Chunk Chunk
 }
 
 func DecodeInfoPacketChunk(bytes []byte) (InfoPacketChunk, error) {
diff --git a/internal/decoders/info_system_name_chunk.go b/internal/decoders/info_system_name_chunk.go
index 15577d8..da9d664 100644
--- a/internal/decoders/info_system_name_chunk.go
+++ b/internal/decoders/info_system_name_chunk.go
@@ -5,8 +5,8 @@ type InfoSystemNameChunkData struct {
 }
 
 type InfoSystemNameChunk struct {
-	Chunk Chunk
 	Data  InfoSystemNameChunkData
+	Chunk Chunk
 }
 
 func DecodeInfoSystemNameChunk(bytes []byte) (InfoSystemNameChunk, error) {
diff --git a/internal/decoders/info_tracker_chunk.go b/internal/decoders/info_tracker_chunk.go
index f1f18fb..982e19d 100644
--- a/internal/decoders/info_tracker_chunk.go
+++ b/internal/decoders/info_tracker_chunk.go
@@ -10,8 +10,8 @@ type InfoTrackerChunkData struct {
 }
 
 type InfoTrackerChunk struct {
-	Chunk Chunk
 	Data  InfoTrackerChunkData
+	Chunk Chunk
 }
 
 func DecodeInfoTrackerChunk(bytes []byte) (InfoTrackerChunk, error) {
diff --git a/internal/decoders/info_tracker_name_chunk.go b/internal/decoders/info_tracker_name_chunk.go
index 7f55743..2b4d0e9 100644
--- a/internal/decoders/info_tracker_name_chunk.go
+++ b/internal/decoders/info_tracker_name_chunk.go
@@ -5,8 +5,8 @@ type InfoTrackerNameChunkData struct {
 }
 
 type InfoTrackerNameChunk struct {
-	Chunk Chunk
 	Data  InfoTrackerNameChunkData
+	Chunk Chunk
 }
 
 func DecodeInfoTrackerNameChunk(bytes []byte) (InfoTrackerNameChunk, error) {
diff --git a/tracker.go b/tracker.go
index 433ba86..8df9c79 100644
--- a/tracker.go
+++ b/tracker.go
@@ -12,8 +12,6 @@ type XYZData struct {
 }
 
 type Tracker struct {
-	Id        uint16
-	Name      string
 	Pos       *XYZData
 	Speed     *XYZData
 	Ori       *XYZData
@@ -21,6 +19,8 @@ type Tracker struct {
 	Accel     *XYZData
 	TrgtPos   *XYZData
 	Timestamp *uint64
+	Name      string
+	Id        uint16
 }
 
 func (t *Tracker) SetPos(x float32, y float32, z float32) {