diff --git a/src/entity.h b/src/entity.h
index 621026c9..376a36fb 100644
--- a/src/entity.h
+++ b/src/entity.h
@@ -104,6 +104,20 @@ struct entity {
     struct entity_handle first;
     struct entity_handle last;
 
+    /* ====================================================================== */
+    /* Position */
+
+    /* Access with xform getters/setters */
+    struct xform local_xform;           /* Transform in relation to parent entity (or the world if entity has no parent) */
+    struct xform cached_global_xform;   /* Calculated from entity tree */
+    b32 cached_global_xform_dirty;
+
+    /* ====================================================================== */
+    /* Activation */
+
+    /* If 0, the entity will auto activate at start of next tick if not already active. */
+    u64 activation_tick;
+
     /* ====================================================================== */
     /* Layer */
 
@@ -137,20 +151,6 @@ struct entity {
     /* ENTITY_PROP_MOUSE_JOINT */
     struct phys_mouse_joint mouse_joint_data;
 
-    /* ====================================================================== */
-    /* Activation */
-
-    /* If 0, the entity will auto activate at start of next tick if not already active. */
-    u64 activation_tick;
-
-    /* ====================================================================== */
-    /* Position */
-
-    /* Access with xform getters/setters */
-    struct xform local_xform;           /* Transform in relation to parent entity (or the world if entity has no parent) */
-    struct xform cached_global_xform;   /* Calculated from entity tree */
-    b32 cached_global_xform_dirty;
-
     /* ====================================================================== */
     /* Control */
 
@@ -277,6 +277,7 @@ struct entity {
     struct mixer_track_handle sound_handle;
 
     /* ====================================================================== */
+    /* Camera */
 
     /* ENTITY_PROP_CAMERA */
     struct entity_handle camera_follow;