Use subdirectory rather than file prefix

data/presets/presets.json

@@ -90,9 +90,6 @@
                 "mere"
             ]
         },
-        "form": [
-            "water"
-        ],
         "icon": ""
     },
     {
@@ -113,9 +110,6 @@
                 "mere"
             ]
         },
-        "form": [
-            "water"
-        ],
         "icon": ""
     },
     {
@@ -130,9 +124,6 @@
             },
             "terms": []
         },
-        "form": [
-            "water"
-        ],
         "icon": ""
     },
     {

data/presets/presets/order.json

@@ -43,10 +43,10 @@
     "highway/footway",
     "highway/cycleway",
     "leisure/pitch",
-    "leisure/pitch_baseball",
-    "leisure/pitch_soccer",
-    "leisure/pitch_tennis",
-    "leisure/pitch_basketball",
+    "leisure/pitch/baseball",
+    "leisure/pitch/soccer",
+    "leisure/pitch/tennis",
+    "leisure/pitch/basketball",
     "building/*",
     "highway/bus_stop",
     "highway/turning_circle"