Modify interfaces to match upstream

A dump of witherspoons inventory was done and many
inconsistancies were noticed, try to match as best as
possible. Also autoformat json.

Dump of data can be seen here: https://pastebin.com/NiC7kSMS

Change-Id: I1a99b426d84fdcd9231d1fbda0ed85ad748779f3
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/configurations/Intel Front Panel.json b/configurations/Intel Front Panel.json
index a5a86fa..5cafc90 100644
--- a/configurations/Intel Front Panel.json
+++ b/configurations/Intel Front Panel.json
@@ -39,14 +39,16 @@
             "type": "TMP75"
         }
     ],
-    "manufacturer": "$BOARD_MANUFACTURER",
-    "model": "$BOARD_PRODUCT_NAME",
     "name": "Intel Front Panel",
-    "part_number": "$BOARD_PART_NUMBER",
-    "serial_number": "$BOARD_SERIAL_NUMBER",
     "probe": [
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'FFPANEL'})",
         "OR",
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F2USTOPANEL'})"
-    ]
+    ],
+    "xyz.openbmc_project.Inventory.Decorator.Asset": {
+        "Manufacturer": "$BOARD_MANUFACTURER",
+        "Model": "$BOARD_PRODUCT_NAME",
+        "PartNumber": "$BOARD_PART_NUMBER",
+        "SerialNumber": "$BOARD_SERIAL_NUMBER"
+    }
 }
\ No newline at end of file