diff --git a/configurations/R1000 Chassis.json b/configurations/R1000 Chassis.json
index 777ad47..74f8189 100644
--- a/configurations/R1000 Chassis.json
+++ b/configurations/R1000 Chassis.json
@@ -1,30 +1,6 @@
 {
     "Exposes": [
         {
-            "Name": "Pwm 1",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 2",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 3",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 4",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 5",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 6",
-            "Type": "Pwm"
-        },
-        {
             "BindConnector": "1U System Fan connector 1",
             "Index": 0,
             "Name": "Fan 1a",
@@ -265,6 +241,59 @@
             "Type": "AspeedFan"
         },
         {
+            "C1": 92.16,
+            "C2": 107.52,
+            "MaxCFM": 17.5,
+            "Name": "System Airflow",
+            "TachMaxPercent": 100,
+            "TachMinPercent": 20,
+            "Tachs": [
+                "Fan 1a",
+                "Fan 1b",
+                "Fan 2a",
+                "Fan 2b",
+                "Fan 3a",
+                "Fan 3b",
+                "Fan 4a",
+                "Fan 4b",
+                "Fan 5a",
+                "Fan 5b",
+                "Fan 6a",
+                "Fan 6b"
+            ],
+            "Type": "CFMSensor"
+        },
+        {
+            "AlphaF": 4.352,
+            "AlphaS": 0.512,
+            "Name": "Exit Air Temp",
+            "PowerFactorMax": 10,
+            "PowerFactorMin": 4,
+            "QMax": 88,
+            "QMin": 15,
+            "Type": "ExitAirTempSensor"
+        },
+        {
+            "Controllers": [
+                ".*"
+            ],
+            "Name": "Acoustic",
+            "Type": "FanProfile"
+        },
+        {
+            "Controllers": [
+                "Front Panel LCC",
+                "CPU\\d"
+            ],
+            "Name": "Performance",
+            "Type": "FanProfile"
+        },
+        {
+            "AllowedFailures": 1,
+            "Name": "FanRedundancy",
+            "Type": "FanRedundancy"
+        },
+        {
             "Class": "fan",
             "FFGainCoefficient": 1.0,
             "FFOffCoefficient": 0.0,
@@ -427,6 +456,68 @@
             ]
         },
         {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -1.0,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "Exit Air Temp"
+            ],
+            "Name": "Exit Air Temp",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 70.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Left",
+                "Right"
+            ]
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 30,
+            "Name": "Left",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 30,
+            "Name": "Right",
+            "Type": "Pid.Zone"
+        },
+        {
+            "Name": "Pwm 1",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 2",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 3",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 4",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 5",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 6",
+            "Type": "Pwm"
+        },
+        {
             "Class": "Ceiling",
             "Inputs": [
                 "Front Panel Temp"
@@ -469,107 +560,16 @@
                 "Left",
                 "Right"
             ]
-        },
-        {
-            "FailSafePercent": 100,
-            "MinThermalOutput": 30,
-            "Name": "Left",
-            "Type": "Pid.Zone"
-        },
-        {
-            "FailSafePercent": 100,
-            "MinThermalOutput": 30,
-            "Name": "Right",
-            "Type": "Pid.Zone"
-        },
-        {
-            "AllowedFailures": 1,
-            "Name": "FanRedundancy",
-            "Type": "FanRedundancy"
-        },
-        {
-            "AlphaF": 4.352,
-            "AlphaS": 0.512,
-            "Name": "Exit Air Temp",
-            "PowerFactorMax": 10,
-            "PowerFactorMin": 4,
-            "QMax": 88,
-            "QMin": 15,
-            "Type": "ExitAirTempSensor"
-        },
-        {
-            "Class": "temp",
-            "FFGainCoefficient": 0.0,
-            "FFOffCoefficient": 0.0,
-            "ICoefficient": -1.0,
-            "ILimitMax": 100,
-            "ILimitMin": 30,
-            "Inputs": [
-                "Exit Air Temp"
-            ],
-            "Name": "Exit Air Temp",
-            "NegativeHysteresis": 5.0,
-            "OutLimitMax": 100,
-            "OutLimitMin": 30,
-            "Outputs": [],
-            "PCoefficient": -0.15,
-            "PositiveHysteresis": 0.0,
-            "SetPoint": 70.0,
-            "SlewNeg": -1,
-            "SlewPos": 0.0,
-            "Type": "Pid",
-            "Zones": [
-                "Left",
-                "Right"
-            ]
-        },
-        {
-            "C1": 92.16,
-            "C2": 107.52,
-            "MaxCFM": 17.5,
-            "Name": "System Airflow",
-            "TachMaxPercent": 100,
-            "TachMinPercent": 20,
-            "Tachs": [
-                "Fan 1a",
-                "Fan 1b",
-                "Fan 2a",
-                "Fan 2b",
-                "Fan 3a",
-                "Fan 3b",
-                "Fan 4a",
-                "Fan 4b",
-                "Fan 5a",
-                "Fan 5b",
-                "Fan 6a",
-                "Fan 6b"
-            ],
-            "Type": "CFMSensor"
-        },
-        {
-            "Controllers": [
-                ".*"
-            ],
-            "Name": "Acoustic",
-            "Type": "FanProfile"
-        },
-        {
-            "Controllers": [
-                "Front Panel LCC",
-                "CPU\\d"
-            ],
-            "Name": "Performance",
-            "Type": "FanProfile"
         }
     ],
     "Name": "R1000 Chassis",
-    "Type": "Chassis",
     "Probe": [
         "FOUND('WFP Baseboard')",
         "AND",
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d'})",
         "MATCH_ONE"
     ],
+    "Type": "Chassis",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "Intel Corporation",
         "Model": "R1000",