diff --git a/data/presets.yaml b/data/presets.yaml
index 8c270ec2a..5f767b231 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3388,34 +3388,6 @@ en:
         name: Entrance/Exit
         # 'terms: entrance,exit,door'
         terms: '<translate with synonyms or related terms for ''Entrance/Exit'', separated by commas>'
-      footway/conveying/moving-walkway:
-        # 'highway=footway, conveying=*'
-        name: Moving Walkway
-        # 'terms: moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor'
-        terms: '<translate with synonyms or related terms for ''Moving Walkway'', separated by commas>'
-      footway/crossing:
-        # 'highway=footway, footway=crossing'
-        name: Street Crossing
-        terms: '<translate with synonyms or related terms for ''Street Crossing'', separated by commas>'
-      footway/crossing-raised:
-        # 'highway=footway, footway=crossing, traffic_calming=table'
-        name: Raised Street Crossing
-        # 'terms: flat top,hump,speed,slow'
-        terms: '<translate with synonyms or related terms for ''Raised Street Crossing'', separated by commas>'
-      footway/crosswalk:
-        # 'highway=footway, footway=crossing, crossing=zebra'
-        name: Pedestrian Crosswalk
-        # 'terms: zebra crossing'
-        terms: '<translate with synonyms or related terms for ''Pedestrian Crosswalk'', separated by commas>'
-      footway/crosswalk-raised:
-        # 'highway=footway, footway=crossing, crossing=zebra, traffic_calming=table'
-        name: Raised Pedestrian Crosswalk
-        # 'terms: zebra crossing,flat top,hump,speed,slow'
-        terms: '<translate with synonyms or related terms for ''Raised Pedestrian Crosswalk'', separated by commas>'
-      footway/sidewalk:
-        # 'highway=footway, footway=sidewalk'
-        name: Sidewalk
-        terms: '<translate with synonyms or related terms for ''Sidewalk'', separated by commas>'
       ford:
         # ford=yes
         name: Ford
@@ -3596,6 +3568,34 @@ en:
         name: Foot Path
         # 'terms: hike,hiking,trackway,trail,walk'
         terms: '<translate with synonyms or related terms for ''Foot Path'', separated by commas>'
+      highway/footway/conveying/moving-walkway:
+        # 'highway=footway, conveying=*'
+        name: Moving Walkway
+        # 'terms: moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor'
+        terms: '<translate with synonyms or related terms for ''Moving Walkway'', separated by commas>'
+      highway/footway/crossing:
+        # 'highway=footway, footway=crossing'
+        name: Street Crossing
+        terms: '<translate with synonyms or related terms for ''Street Crossing'', separated by commas>'
+      highway/footway/crossing-raised:
+        # 'highway=footway, footway=crossing, traffic_calming=table'
+        name: Raised Street Crossing
+        # 'terms: flat top,hump,speed,slow'
+        terms: '<translate with synonyms or related terms for ''Raised Street Crossing'', separated by commas>'
+      highway/footway/crosswalk:
+        # 'highway=footway, footway=crossing, crossing=zebra'
+        name: Pedestrian Crosswalk
+        # 'terms: zebra crossing'
+        terms: '<translate with synonyms or related terms for ''Pedestrian Crosswalk'', separated by commas>'
+      highway/footway/crosswalk-raised:
+        # 'highway=footway, footway=crossing, crossing=zebra, traffic_calming=table'
+        name: Raised Pedestrian Crosswalk
+        # 'terms: zebra crossing,flat top,hump,speed,slow'
+        terms: '<translate with synonyms or related terms for ''Raised Pedestrian Crosswalk'', separated by commas>'
+      highway/footway/sidewalk:
+        # 'highway=footway, footway=sidewalk'
+        name: Sidewalk
+        terms: '<translate with synonyms or related terms for ''Sidewalk'', separated by commas>'
       highway/give_way:
         # highway=give_way
         name: Yield Sign
diff --git a/data/presets/categories.json b/data/presets/categories.json
index 60653e374..7a3c8bce9 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -100,8 +100,8 @@
       "geometry": "line",
       "name": "Path Features",
       "members": [
-        "footway/crosswalk",
-        "footway/sidewalk",
+        "highway/footway/crosswalk",
+        "highway/footway/sidewalk",
         "highway/steps",
         "highway/path",
         "highway/footway",
diff --git a/data/presets/categories/path.json b/data/presets/categories/path.json
index 53756b194..3bc83a9a1 100644
--- a/data/presets/categories/path.json
+++ b/data/presets/categories/path.json
@@ -3,8 +3,8 @@
     "geometry": "line",
     "name": "Path Features",
     "members": [
-        "footway/crosswalk",
-        "footway/sidewalk",
+        "highway/footway/crosswalk",
+        "highway/footway/sidewalk",
         "highway/steps",
         "highway/path",
         "highway/footway",
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 500c02e46..b041c56ae 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -335,12 +335,6 @@
     "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"},
     "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
     "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "access_simple", "address"], "name": "Entrance/Exit"},
-    "footway/conveying/moving-walkway": {"icon": "iD-highway-footway", "fields": ["name", "conveying", "access_simple", "lit", "width"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"},
-    "footway/crossing-raised": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Raised Street Crossing"},
-    "footway/crossing": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "terms": [], "name": "Street Crossing"},
-    "footway/crosswalk-raised": {"icon": "iD-highway-footway", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "flat top", "hump", "speed", "slow"], "name": "Raised Pedestrian Crosswalk"},
-    "footway/crosswalk": {"icon": "iD-highway-footway", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing"], "name": "Pedestrian Crosswalk"},
-    "footway/sidewalk": {"icon": "iD-highway-footway", "fields": ["surface", "lit", "width", "structure", "access"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "sidewalk"}, "reference": {"key": "footway", "value": "sidewalk"}, "terms": [], "name": "Sidewalk"},
     "ford": {"geometry": ["vertex"], "tags": {"ford": "yes"}, "name": "Ford"},
     "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker", "natural": "sand"}, "terms": ["hazard", "bunker"], "reference": {"key": "golf", "value": "bunker"}, "name": "Sand Trap"},
     "golf/fairway": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "fairway", "landuse": "grass"}, "reference": {"key": "golf", "value": "fairway"}, "name": "Fairway"},
@@ -379,6 +373,12 @@
     "highway/cycleway": {"icon": "iD-highway-cycleway", "fields": ["name", "oneway", "surface", "lit", "width", "structure", "access"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bike"], "name": "Cycle Path"},
     "highway/elevator": {"icon": "temaki-elevator", "fields": ["access_simple", "opening_hours", "maxweight", "ref"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"},
     "highway/footway": {"icon": "iD-highway-footway", "fields": ["name", "surface", "lit", "width", "structure", "access"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "name": "Foot Path"},
+    "highway/footway/conveying/moving-walkway": {"icon": "iD-highway-footway", "fields": ["name", "conveying", "access_simple", "lit", "width"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"},
+    "highway/footway/crossing-raised": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Raised Street Crossing"},
+    "highway/footway/crossing": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "terms": [], "name": "Street Crossing"},
+    "highway/footway/crosswalk-raised": {"icon": "iD-highway-footway", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "flat top", "hump", "speed", "slow"], "name": "Raised Pedestrian Crosswalk"},
+    "highway/footway/crosswalk": {"icon": "iD-highway-footway", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing"], "name": "Pedestrian Crosswalk"},
+    "highway/footway/sidewalk": {"icon": "iD-highway-footway", "fields": ["surface", "lit", "width", "structure", "access"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "sidewalk"}, "reference": {"key": "footway", "value": "sidewalk"}, "terms": [], "name": "Sidewalk"},
     "highway/give_way": {"icon": "temaki-yield", "fields": ["direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "give_way"}, "terms": ["give way", "yield", "sign"], "name": "Yield Sign"},
     "highway/living_street": {"icon": "iD-highway-living-street", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "access", "cycleway"], "geometry": ["line"], "tags": {"highway": "living_street"}, "name": "Living Street"},
     "highway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["distance", "direction_vertex"], "tags": {"highway": "milestone"}, "terms": ["milestone", "marker"], "name": "Highway Milestone"},
diff --git a/data/presets/presets/footway/conveying/moving-walkway.json b/data/presets/presets/highway/footway/conveying.json
similarity index 100%
rename from data/presets/presets/footway/conveying/moving-walkway.json
rename to data/presets/presets/highway/footway/conveying.json
diff --git a/data/presets/presets/footway/crossing-raised.json b/data/presets/presets/highway/footway/crossing-raised.json
similarity index 100%
rename from data/presets/presets/footway/crossing-raised.json
rename to data/presets/presets/highway/footway/crossing-raised.json
diff --git a/data/presets/presets/footway/crossing.json b/data/presets/presets/highway/footway/crossing.json
similarity index 100%
rename from data/presets/presets/footway/crossing.json
rename to data/presets/presets/highway/footway/crossing.json
diff --git a/data/presets/presets/footway/crosswalk-raised.json b/data/presets/presets/highway/footway/crosswalk-raised.json
similarity index 100%
rename from data/presets/presets/footway/crosswalk-raised.json
rename to data/presets/presets/highway/footway/crosswalk-raised.json
diff --git a/data/presets/presets/footway/crosswalk.json b/data/presets/presets/highway/footway/crosswalk.json
similarity index 100%
rename from data/presets/presets/footway/crosswalk.json
rename to data/presets/presets/highway/footway/crosswalk.json
diff --git a/data/presets/presets/footway/sidewalk.json b/data/presets/presets/highway/footway/sidewalk.json
similarity index 100%
rename from data/presets/presets/footway/sidewalk.json
rename to data/presets/presets/highway/footway/sidewalk.json
diff --git a/data/presets/presets/highway/steps/conveying/escalator.json b/data/presets/presets/highway/steps/conveying.json
similarity index 100%
rename from data/presets/presets/highway/steps/conveying/escalator.json
rename to data/presets/presets/highway/steps/conveying.json
diff --git a/data/taginfo.json b/data/taginfo.json
index b7b7adf34..9713915ed 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2290,38 +2290,6 @@
       "object_types": ["node"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/entrance-alt1-15.svg?sanitize=true"
     },
-    {
-      "key": "conveying",
-      "description": "Moving Walkway, Escalator",
-      "object_types": ["way"],
-      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"
-    },
-    {
-      "key": "traffic_calming",
-      "value": "table",
-      "description": "Raised Street Crossing, Raised Pedestrian Crosswalk, Speed Table",
-      "object_types": ["way"]
-    },
-    {
-      "key": "footway",
-      "value": "crossing",
-      "description": "Street Crossing",
-      "object_types": ["way"]
-    },
-    {
-      "key": "crossing",
-      "value": "zebra",
-      "description": "Pedestrian Crosswalk",
-      "object_types": ["way"],
-      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"
-    },
-    {
-      "key": "footway",
-      "value": "sidewalk",
-      "description": "Sidewalk",
-      "object_types": ["way"],
-      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"
-    },
     {
       "key": "ford",
       "value": "yes",
@@ -2516,12 +2484,25 @@
       "object_types": ["way"],
       "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"
     },
+    {
+      "key": "traffic_calming",
+      "value": "table",
+      "description": "Raised Street Crossing, Raised Pedestrian Crosswalk, Speed Table",
+      "object_types": ["node"]
+    },
     {
       "key": "highway",
       "value": "crossing",
       "description": "Street Crossing",
       "object_types": ["node"]
     },
+    {
+      "key": "crossing",
+      "value": "zebra",
+      "description": "Pedestrian Crosswalk",
+      "object_types": ["node"],
+      "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"
+    },
     {
       "key": "highway",
       "value": "cycleway",
@@ -2543,6 +2524,25 @@
       "object_types": ["way"],
       "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"
     },
+    {
+      "key": "conveying",
+      "description": "Moving Walkway, Escalator",
+      "object_types": ["way"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"
+    },
+    {
+      "key": "footway",
+      "value": "crossing",
+      "description": "Street Crossing",
+      "object_types": ["way"]
+    },
+    {
+      "key": "footway",
+      "value": "sidewalk",
+      "description": "Sidewalk",
+      "object_types": ["way"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"
+    },
     {
       "key": "highway",
       "value": "give_way",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 29fa63e46..79538ab8a 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4410,30 +4410,6 @@
                     "name": "Entrance/Exit",
                     "terms": "entrance,exit,door"
                 },
-                "footway/conveying/moving-walkway": {
-                    "name": "Moving Walkway",
-                    "terms": "moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor"
-                },
-                "footway/crossing-raised": {
-                    "name": "Raised Street Crossing",
-                    "terms": "flat top,hump,speed,slow"
-                },
-                "footway/crossing": {
-                    "name": "Street Crossing",
-                    "terms": ""
-                },
-                "footway/crosswalk-raised": {
-                    "name": "Raised Pedestrian Crosswalk",
-                    "terms": "zebra crossing,flat top,hump,speed,slow"
-                },
-                "footway/crosswalk": {
-                    "name": "Pedestrian Crosswalk",
-                    "terms": "zebra crossing"
-                },
-                "footway/sidewalk": {
-                    "name": "Sidewalk",
-                    "terms": ""
-                },
                 "ford": {
                     "name": "Ford",
                     "terms": ""
@@ -4586,6 +4562,30 @@
                     "name": "Foot Path",
                     "terms": "hike,hiking,trackway,trail,walk"
                 },
+                "highway/footway/conveying/moving-walkway": {
+                    "name": "Moving Walkway",
+                    "terms": "moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor"
+                },
+                "highway/footway/crossing-raised": {
+                    "name": "Raised Street Crossing",
+                    "terms": "flat top,hump,speed,slow"
+                },
+                "highway/footway/crossing": {
+                    "name": "Street Crossing",
+                    "terms": ""
+                },
+                "highway/footway/crosswalk-raised": {
+                    "name": "Raised Pedestrian Crosswalk",
+                    "terms": "zebra crossing,flat top,hump,speed,slow"
+                },
+                "highway/footway/crosswalk": {
+                    "name": "Pedestrian Crosswalk",
+                    "terms": "zebra crossing"
+                },
+                "highway/footway/sidewalk": {
+                    "name": "Sidewalk",
+                    "terms": ""
+                },
                 "highway/give_way": {
                     "name": "Yield Sign",
                     "terms": "give way,yield,sign"