diff --git a/exercises/grains/canonical-data.json b/exercises/grains/canonical-data.json
index 3e3ba67392..d1bb10a081 100644
--- a/exercises/grains/canonical-data.json
+++ b/exercises/grains/canonical-data.json
@@ -1,66 +1,81 @@
 {
-  "#": [
+  "exercise": "grains",
+  "version": "1.0.0",
+  "comments": [
     "The final tests of square test error conditions",
     "The expection for these tests is -1, indicating an error",
     "In these cases you should expect an error as is idiomatic for your language"
   ],
-  "square": {
-    "description": "returns the number of grains on the square",
-    "cases": [
-      {
-        "description": "1",
-        "input": 1,
-        "expected": 1
-      },
-      {
-        "description": "2",
-        "input": 2,
-        "expected": 2
-      },
-      {
-        "description": "3",
-        "input": 3,
-        "expected": 4
-      },
-      {
-        "description": "4",
-        "input": 4,
-        "expected": 8
-      },
-      {
-        "description": "16",
-        "input": 16,
-        "expected": 32768
-      },
-      {
-        "description": "32",
-        "input": 32,
-        "expected": 2147483648
-      },
-      {
-        "description": "64",
-        "input": 64,
-        "expected": 9223372036854775808
-      },
-      {
-        "description": "square 0 raises an exception",
-        "input": 0,
-        "expected": -1
-      },
-      {
-        "description": "negative square raises an exception",
-        "input": -1,
-        "expected": -1
-      },
-      {
-        "description": "square greater than 64 raises an exception",
-        "input": 65,
-        "expected": -1
-      }
-    ]
-  },
-  "total": {
-    "description": "returns the total number of grains on the board",
-    "expected": 18446744073709551615
-  }
+  "cases": [
+    {
+      "description": "returns the number of grains on the square",
+      "cases": [
+        {
+          "description": "1",
+          "property": "square",
+          "input": 1,
+          "expected": 1
+        },
+        {
+          "description": "2",
+          "property": "square",
+          "input": 2,
+          "expected": 2
+        },
+        {
+          "description": "3",
+          "property": "square",
+          "input": 3,
+          "expected": 4
+        },
+        {
+          "description": "4",
+          "property": "square",
+          "input": 4,
+          "expected": 8
+        },
+        {
+          "description": "16",
+          "property": "square",
+          "input": 16,
+          "expected": 32768
+        },
+        {
+          "description": "32",
+          "property": "square",
+          "input": 32,
+          "expected": 2147483648
+        },
+        {
+          "description": "64",
+          "property": "square",
+          "input": 64,
+          "expected": 9223372036854775808
+        },
+        {
+          "description": "square 0 raises an exception",
+          "property": "square",
+          "input": 0,
+          "expected": -1
+        },
+        {
+          "description": "negative square raises an exception",
+          "property": "square",
+          "input": -1,
+          "expected": -1
+        },
+        {
+          "description": "square greater than 64 raises an exception",
+          "property": "square",
+          "input": 65,
+          "expected": -1
+        }
+      ]
+    },
+    {
+      "description": "returns the total number of grains on the board",
+      "property": "total",
+      "expected": 18446744073709551615
+    }
+  ]
 }