diff --git a/src/main/resources/assets/refinedstorage/advancements/binding.json b/src/main/resources/assets/refinedstorage/advancements/binding.json
deleted file mode 100644
index aec4f3c57..000000000
--- a/src/main/resources/assets/refinedstorage/advancements/binding.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "display": {
-    "icon": {
-      "item": "refinedstorage:processor_binding"
-    },
-    "title": {
-      "translate": "advancements.refinedstorage:binding"
-    },
-    "description": {
-      "translate": "advancements.refinedstorage:binding.description"
-    }
-  },
-  "parent": "refinedstorage:root",
-  "criteria": {
-    "cutting_tool_in_inventory": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "refinedstorage:processor_binding"
-          }
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/advancements/covering.json b/src/main/resources/assets/refinedstorage/advancements/covering.json
deleted file mode 100644
index 8d1c3796d..000000000
--- a/src/main/resources/assets/refinedstorage/advancements/covering.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "display": {
-    "icon": {
-      "item": "refinedstorage:cover",
-      "nbt": "{Item:{id:\"minecraft:stonebrick\",Count:1b,Damage:0s}}"
-    },
-    "title": {
-      "translate": "advancements.refinedstorage:covering"
-    },
-    "description": {
-      "translate": "advancements.refinedstorage:covering.description"
-    }
-  },
-  "parent": "refinedstorage:connecting",
-  "criteria": {
-    "cover_in_inventory": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "refinedstorage:cover"
-          }
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/advancements/hollow_covering.json b/src/main/resources/assets/refinedstorage/advancements/hollow_covering.json
deleted file mode 100644
index de2ab001c..000000000
--- a/src/main/resources/assets/refinedstorage/advancements/hollow_covering.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "display": {
-    "icon": {
-      "item": "refinedstorage:hollow_cover",
-      "nbt": "{Item:{id:\"minecraft:stonebrick\",Count:1b,Damage:0s}}"
-    },
-    "title": {
-      "translate": "advancements.refinedstorage:hollow_covering"
-    },
-    "description": {
-      "translate": "advancements.refinedstorage:hollow_covering.description"
-    }
-  },
-  "parent": "refinedstorage:covering",
-  "criteria": {
-    "hollow_cover_in_inventory": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "refinedstorage:hollow_cover"
-          }
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/advancements/more_than_just_storage.json b/src/main/resources/assets/refinedstorage/advancements/more_than_just_storage.json
deleted file mode 100644
index 28ab1816c..000000000
--- a/src/main/resources/assets/refinedstorage/advancements/more_than_just_storage.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "display": {
-    "icon": {
-      "item": "refinedstorage:reader"
-    },
-    "title": {
-      "translate": "advancements.refinedstorage:more_than_just_storage"
-    },
-    "description": {
-      "translate": "advancements.refinedstorage:more_than_just_storage.description"
-    }
-  },
-  "parent": "refinedstorage:binding",
-  "criteria": {
-    "reader_writer_in_inventory": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "refinedstorage:reader"
-          },
-          {
-            "item": "refinedstorage:writer"
-          }
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.json b/src/main/resources/assets/refinedstorage/lang/en_us.json
index b8a6cfa21..5d9241784 100644
--- a/src/main/resources/assets/refinedstorage/lang/en_us.json
+++ b/src/main/resources/assets/refinedstorage/lang/en_us.json
@@ -276,73 +276,65 @@
   "commands.refinedstorage.createdisk.error.notADisk": "The given disk item is not a disk.",
   "commands.refinedstorage.createdisk.error.diskNotFound": "Disk %s was not found.",
   "commands.refinedstorage.createdisk.success": "Successfully gave disk %s to %s.",
-  "advancements.refinedstorage:controlling.description": "Craft a Controller",
-  "advancements.refinedstorage:connecting": "Connecting",
-  "advancements.refinedstorage:connecting.description": "You can place all the devices next to each other to connect them up, or, use Cable",
-  "advancements.refinedstorage:conditional_connecting": "Conditional connecting",
-  "advancements.refinedstorage:conditional_connecting.description": "Craft a Relay to control if a network signal can pass with redstone",
-  "advancements.refinedstorage:drives": "Drives",
-  "advancements.refinedstorage:drives.description": "Craft a Disk Drive to be able to store your disks",
-  "advancements.refinedstorage:manipulating_disks": "Manipulating disks",
-  "advancements.refinedstorage:manipulating_disks.description": "Use a Disk Manipulator to easily modify contents of disks",
-  "advancements.refinedstorage:storing_items": "Storing items",
-  "advancements.refinedstorage:storing_items.description": "Craft a Storage Disk and put it in your Disk Drive",
-  "advancements.refinedstorage:viewing_items": "Viewing items",
-  "advancements.refinedstorage:viewing_items.description": "Craft a Grid to interact with your item storage",
-  "advancements.refinedstorage:portable_storage": "Portable storage",
-  "advancements.refinedstorage:portable_storage.description": "Craft a Portable Grid to access items and fluids in disks without being in a network",
-  "advancements.refinedstorage:upgrading_your_grid": "Upgrading your Grid",
-  "advancements.refinedstorage:upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities in your Grid",
-  "advancements.refinedstorage:storing_fluids": "Storing fluids",
-  "advancements.refinedstorage:storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive",
-  "advancements.refinedstorage:viewing_fluids": "Viewing fluids",
-  "advancements.refinedstorage:viewing_fluids.description": "Craft a Fluid Grid to interact with your fluid storage",
-  "advancements.refinedstorage:better_than_a_barrel": "Better than a barrel",
-  "advancements.refinedstorage:better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract items of a network",
-  "advancements.refinedstorage:autocrafting": "Autocrafting",
-  "advancements.refinedstorage:autocrafting.description": "Craft a Crafter",
-  "advancements.refinedstorage:pattern_creation": "Pattern creation",
-  "advancements.refinedstorage:pattern_creation.description": "Create patterns with a Pattern Grid and a Pattern",
-  "advancements.refinedstorage:monitoring": "Monitoring",
-  "advancements.refinedstorage:monitoring.description": "Check the status of your crafting tasks with a Crafting Monitor",
-  "advancements.refinedstorage:managing_patterns": "Managing patterns",
-  "advancements.refinedstorage:managing_patterns.description": "Craft a Crafter Manager to manage your patterns in a better way",
-  "advancements.refinedstorage:importing": "Importing",
-  "advancements.refinedstorage:importing.description": "Get items or fluids into the storage network with an Importer",
-  "advancements.refinedstorage:destruction": "Destruction",
-  "advancements.refinedstorage:destruction.description": "Get blocks or fluids into the storage network with a Destructor",
-  "advancements.refinedstorage:exporting": "Exporting",
-  "advancements.refinedstorage:exporting.description": "Get items or fluids out of the storage network with an Exporter",
-  "advancements.refinedstorage:construction": "Construction",
-  "advancements.refinedstorage:construction.description": "Get blocks or fluids out of the storage network with a Constructor",
-  "advancements.refinedstorage:security": "Security",
-  "advancements.refinedstorage:security.description": "Secure your network with a Security Manager and a Security Card",
-  "advancements.refinedstorage:wireless": "Wireless",
-  "advancements.refinedstorage:wireless.description": "Transmit a network signal with a Wireless Transmitter",
-  "advancements.refinedstorage:wireless_items": "Wireless items",
-  "advancements.refinedstorage:wireless_items.description": "Interact with your item storage wirelessly with a Wireless Grid",
-  "advancements.refinedstorage:wireless_fluids": "Wireless fluids",
-  "advancements.refinedstorage:wireless_fluids.description": "Interact with your fluid storage wirelessly with a Wireless Fluid Grid",
-  "advancements.refinedstorage:wireless_monitoring": "Wireless monitoring",
-  "advancements.refinedstorage:wireless_monitoring.description": "Check the status of your crafting tasks wirelessly with a Wireless Crafting Monitor",
-  "advancements.refinedstorage:no_cables_required": "No cables required",
-  "advancements.refinedstorage:no_cables_required.description": "Add extra components to your network without using cables by using a Network Transmitter, Network Receiver and Network Card",
-  "advancements.refinedstorage:upgrading": "Upgrading",
-  "advancements.refinedstorage:upgrading.description": "Craft an Upgrade to improve various devices",
-  "advancements.refinedstorage:crafting_on_demand": "Crafting on demand",
-  "advancements.refinedstorage:crafting_on_demand.description": "Use a Crafting Upgrade in a Interface, Exporter or Constructor to craft items and blocks on demand",
-  "advancements.refinedstorage:more_than_just_storage": "More than just storage",
-  "advancements.refinedstorage:more_than_just_storage.description": "Transfer items, fluids, energy and redstone from a Reader to a Writer",
-  "advancements.refinedstorage:detecting": "Detecting",
-  "advancements.refinedstorage:detecting.description": "Detect items or fluids in the network with the Detector",
-  "advancements.refinedstorage:interface_to_the_world": "Interface to the world",
-  "advancements.refinedstorage:interface_to_the_world.description": "Export and import items at the same time with an Interface",
-  "advancements.refinedstorage:storing_externally": "Storing externally",
-  "advancements.refinedstorage:storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest",
-  "advancements.refinedstorage:covering": "Covering",
-  "advancements.refinedstorage:covering.description": "Craft a Cover to hide cables",
-  "advancements.refinedstorage:hollow_covering": "Hollow covering",
-  "advancements.refinedstorage:hollow_covering.description": "Craft a Hollow Cover to hide cables, but still let cable through",
-  "advancements.refinedstorage:binding": "Binding",
-  "advancements.refinedstorage:binding.description": "Craft Processor Binding to craft the various processors"
+  "advancements.refinedstorage.controlling.description": "Craft a Controller",
+  "advancements.refinedstorage.connecting": "Connecting",
+  "advancements.refinedstorage.connecting.description": "You can place all the devices next to each other to connect them up, or, use Cable",
+  "advancements.refinedstorage.conditional_connecting": "Conditional connecting",
+  "advancements.refinedstorage.conditional_connecting.description": "Craft a Relay to control if a network signal can pass with redstone",
+  "advancements.refinedstorage.drives": "Drives",
+  "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your disks",
+  "advancements.refinedstorage.manipulating_disks": "Manipulating disks",
+  "advancements.refinedstorage.manipulating_disks.description": "Use a Disk Manipulator to easily modify contents of disks",
+  "advancements.refinedstorage.storing_items": "Storing items",
+  "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive",
+  "advancements.refinedstorage.viewing_items": "Viewing items",
+  "advancements.refinedstorage.viewing_items.description": "Craft a Grid to interact with your item storage",
+  "advancements.refinedstorage.portable_storage": "Portable storage",
+  "advancements.refinedstorage.portable_storage.description": "Craft a Portable Grid to access items and fluids in disks without being in a network",
+  "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid",
+  "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities in your Grid",
+  "advancements.refinedstorage.storing_fluids": "Storing fluids",
+  "advancements.refinedstorage.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive",
+  "advancements.refinedstorage.viewing_fluids": "Viewing fluids",
+  "advancements.refinedstorage.viewing_fluids.description": "Craft a Fluid Grid to interact with your fluid storage",
+  "advancements.refinedstorage.better_than_a_barrel": "Better than a barrel",
+  "advancements.refinedstorage.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract items of a network",
+  "advancements.refinedstorage.autocrafting": "Autocrafting",
+  "advancements.refinedstorage.autocrafting.description": "Craft a Crafter",
+  "advancements.refinedstorage.pattern_creation": "Pattern creation",
+  "advancements.refinedstorage.pattern_creation.description": "Create patterns with a Pattern Grid and a Pattern",
+  "advancements.refinedstorage.monitoring": "Monitoring",
+  "advancements.refinedstorage.monitoring.description": "Check the status of your crafting tasks with a Crafting Monitor",
+  "advancements.refinedstorage.managing_patterns": "Managing patterns",
+  "advancements.refinedstorage.managing_patterns.description": "Craft a Crafter Manager to manage your patterns in a better way",
+  "advancements.refinedstorage.importing": "Importing",
+  "advancements.refinedstorage.importing.description": "Get items or fluids into the storage network with an Importer",
+  "advancements.refinedstorage.destruction": "Destruction",
+  "advancements.refinedstorage.destruction.description": "Get blocks or fluids into the storage network with a Destructor",
+  "advancements.refinedstorage.exporting": "Exporting",
+  "advancements.refinedstorage.exporting.description": "Get items or fluids out of the storage network with an Exporter",
+  "advancements.refinedstorage.construction": "Construction",
+  "advancements.refinedstorage.construction.description": "Get blocks or fluids out of the storage network with a Constructor",
+  "advancements.refinedstorage.security": "Security",
+  "advancements.refinedstorage.security.description": "Secure your network with a Security Manager and a Security Card",
+  "advancements.refinedstorage.wireless": "Wireless",
+  "advancements.refinedstorage.wireless.description": "Transmit a network signal with a Wireless Transmitter",
+  "advancements.refinedstorage.wireless_items": "Wireless items",
+  "advancements.refinedstorage.wireless_items.description": "Interact with your item storage wirelessly with a Wireless Grid",
+  "advancements.refinedstorage.wireless_fluids": "Wireless fluids",
+  "advancements.refinedstorage.wireless_fluids.description": "Interact with your fluid storage wirelessly with a Wireless Fluid Grid",
+  "advancements.refinedstorage.wireless_monitoring": "Wireless monitoring",
+  "advancements.refinedstorage.wireless_monitoring.description": "Check the status of your crafting tasks wirelessly with a Wireless Crafting Monitor",
+  "advancements.refinedstorage.no_cables_required": "No cables required",
+  "advancements.refinedstorage.no_cables_required.description": "Add extra components to your network without using cables by using a Network Transmitter, Network Receiver and Network Card",
+  "advancements.refinedstorage.upgrading": "Upgrading",
+  "advancements.refinedstorage.upgrading.description": "Craft an Upgrade to improve various devices",
+  "advancements.refinedstorage.crafting_on_demand": "Crafting on demand",
+  "advancements.refinedstorage.crafting_on_demand.description": "Use a Crafting Upgrade in a Interface, Exporter or Constructor to craft items and blocks on demand",
+  "advancements.refinedstorage.detecting": "Detecting",
+  "advancements.refinedstorage.detecting.description": "Detect items or fluids in the network with the Detector",
+  "advancements.refinedstorage.interface_to_the_world": "Interface to the world",
+  "advancements.refinedstorage.interface_to_the_world.description": "Export and import items at the same time with an Interface",
+  "advancements.refinedstorage.storing_externally": "Storing externally",
+  "advancements.refinedstorage.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest"
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/advancements/autocrafting.json b/src/main/resources/data/refinedstorage/advancements/autocrafting.json
similarity index 69%
rename from src/main/resources/assets/refinedstorage/advancements/autocrafting.json
rename to src/main/resources/data/refinedstorage/advancements/autocrafting.json
index 13a261315..f5d55d2b4 100644
--- a/src/main/resources/assets/refinedstorage/advancements/autocrafting.json
+++ b/src/main/resources/data/refinedstorage/advancements/autocrafting.json
@@ -4,13 +4,13 @@
       "item": "refinedstorage:crafter"
     },
     "title": {
-      "translate": "advancements.refinedstorage:autocrafting"
+      "translate": "advancements.refinedstorage.autocrafting"
     },
     "description": {
-      "translate": "advancements.refinedstorage:autocrafting.description"
+      "translate": "advancements.refinedstorage.autocrafting.description"
     }
   },
-  "parent": "refinedstorage:binding",
+  "parent": "refinedstorage:root",
   "criteria": {
     "crafter_in_inventory": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/assets/refinedstorage/advancements/better_than_a_barrel.json b/src/main/resources/data/refinedstorage/advancements/better_than_a_barrel.json
similarity index 71%
rename from src/main/resources/assets/refinedstorage/advancements/better_than_a_barrel.json
rename to src/main/resources/data/refinedstorage/advancements/better_than_a_barrel.json
index 42b88858e..fd49aaff3 100644
--- a/src/main/resources/assets/refinedstorage/advancements/better_than_a_barrel.json
+++ b/src/main/resources/data/refinedstorage/advancements/better_than_a_barrel.json
@@ -4,13 +4,13 @@
       "item": "refinedstorage:storage_monitor"
     },
     "title": {
-      "translate": "advancements.refinedstorage:better_than_a_barrel"
+      "translate": "advancements.refinedstorage.better_than_a_barrel"
     },
     "description": {
-      "translate": "advancements.refinedstorage:better_than_a_barrel.description"
+      "translate": "advancements.refinedstorage.better_than_a_barrel.description"
     }
   },
-  "parent": "refinedstorage:binding",
+  "parent": "refinedstorage:root",
   "criteria": {
     "storage_monitor_in_inventory": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/assets/refinedstorage/advancements/conditional_connecting.json b/src/main/resources/data/refinedstorage/advancements/conditional_connecting.json
similarity index 76%
rename from src/main/resources/assets/refinedstorage/advancements/conditional_connecting.json
rename to src/main/resources/data/refinedstorage/advancements/conditional_connecting.json
index ed7266258..860b60292 100644
--- a/src/main/resources/assets/refinedstorage/advancements/conditional_connecting.json
+++ b/src/main/resources/data/refinedstorage/advancements/conditional_connecting.json
@@ -4,10 +4,10 @@
       "item": "refinedstorage:relay"
     },
     "title": {
-      "translate": "advancements.refinedstorage:conditional_connecting"
+      "translate": "advancements.refinedstorage.conditional_connecting"
     },
     "description": {
-      "translate": "advancements.refinedstorage:conditional_connecting.description"
+      "translate": "advancements.refinedstorage.conditional_connecting.description"
     }
   },
   "parent": "refinedstorage:connecting",
diff --git a/src/main/resources/assets/refinedstorage/advancements/connecting.json b/src/main/resources/data/refinedstorage/advancements/connecting.json
similarity index 69%
rename from src/main/resources/assets/refinedstorage/advancements/connecting.json
rename to src/main/resources/data/refinedstorage/advancements/connecting.json
index 2f5f3bd1e..2f3dc0e04 100644
--- a/src/main/resources/assets/refinedstorage/advancements/connecting.json
+++ b/src/main/resources/data/refinedstorage/advancements/connecting.json
@@ -4,13 +4,13 @@
       "item": "refinedstorage:cable"
     },
     "title": {
-      "translate": "advancements.refinedstorage:connecting"
+      "translate": "advancements.refinedstorage.connecting"
     },
     "description": {
-      "translate": "advancements.refinedstorage:connecting.description"
+      "translate": "advancements.refinedstorage.connecting.description"
     }
   },
-  "parent": "refinedstorage:binding",
+  "parent": "refinedstorage:root",
   "criteria": {
     "cable_in_inventory": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/assets/refinedstorage/advancements/construction.json b/src/main/resources/data/refinedstorage/advancements/construction.json
similarity index 77%
rename from src/main/resources/assets/refinedstorage/advancements/construction.json
rename to src/main/resources/data/refinedstorage/advancements/construction.json
index 2494ad7c0..b4b5c93c7 100644
--- a/src/main/resources/assets/refinedstorage/advancements/construction.json
+++ b/src/main/resources/data/refinedstorage/advancements/construction.json
@@ -4,10 +4,10 @@
       "item": "refinedstorage:constructor"
     },
     "title": {
-      "translate": "advancements.refinedstorage:construction"
+      "translate": "advancements.refinedstorage.construction"
     },
     "description": {
-      "translate": "advancements.refinedstorage:construction.description"
+      "translate": "advancements.refinedstorage.construction.description"
     }
   },
   "parent": "refinedstorage:exporting",
diff --git a/src/main/resources/assets/refinedstorage/advancements/crafting_on_demand.json b/src/main/resources/data/refinedstorage/advancements/crafting_on_demand.json
similarity index 57%
rename from src/main/resources/assets/refinedstorage/advancements/crafting_on_demand.json
rename to src/main/resources/data/refinedstorage/advancements/crafting_on_demand.json
index de1b6823c..be5ae96ce 100644
--- a/src/main/resources/assets/refinedstorage/advancements/crafting_on_demand.json
+++ b/src/main/resources/data/refinedstorage/advancements/crafting_on_demand.json
@@ -1,14 +1,13 @@
 {
   "display": {
     "icon": {
-      "item": "refinedstorage:upgrade",
-      "data": 3
+      "item": "refinedstorage:crafting_upgrade"
     },
     "title": {
-      "translate": "advancements.refinedstorage:crafting_on_demand"
+      "translate": "advancements.refinedstorage.crafting_on_demand"
     },
     "description": {
-      "translate": "advancements.refinedstorage:crafting_on_demand.description"
+      "translate": "advancements.refinedstorage.crafting_on_demand.description"
     }
   },
   "parent": "refinedstorage:pattern_creation",
@@ -18,8 +17,7 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:upgrade",
-            "data": 3
+            "item": "refinedstorage:crafting_upgrade"
           }
         ]
       }
diff --git a/src/main/resources/assets/refinedstorage/advancements/destruction.json b/src/main/resources/data/refinedstorage/advancements/destruction.json
similarity index 77%
rename from src/main/resources/assets/refinedstorage/advancements/destruction.json
rename to src/main/resources/data/refinedstorage/advancements/destruction.json
index c1142cc15..19af6e61b 100644
--- a/src/main/resources/assets/refinedstorage/advancements/destruction.json
+++ b/src/main/resources/data/refinedstorage/advancements/destruction.json
@@ -4,10 +4,10 @@
       "item": "refinedstorage:destructor"
     },
     "title": {
-      "translate": "advancements.refinedstorage:destruction"
+      "translate": "advancements.refinedstorage.destruction"
     },
     "description": {
-      "translate": "advancements.refinedstorage:destruction.description"
+      "translate": "advancements.refinedstorage.destruction.description"
     }
   },
   "parent": "refinedstorage:importing",
diff --git a/src/main/resources/assets/refinedstorage/advancements/detecting.json b/src/main/resources/data/refinedstorage/advancements/detecting.json
similarity index 69%
rename from src/main/resources/assets/refinedstorage/advancements/detecting.json
rename to src/main/resources/data/refinedstorage/advancements/detecting.json
index a97074677..6c8dd5985 100644
--- a/src/main/resources/assets/refinedstorage/advancements/detecting.json
+++ b/src/main/resources/data/refinedstorage/advancements/detecting.json
@@ -4,13 +4,13 @@
       "item": "refinedstorage:detector"
     },
     "title": {
-      "translate": "advancements.refinedstorage:detecting"
+      "translate": "advancements.refinedstorage.detecting"
     },
     "description": {
-      "translate": "advancements.refinedstorage:detecting.description"
+      "translate": "advancements.refinedstorage.detecting.description"
     }
   },
-  "parent": "refinedstorage:binding",
+  "parent": "refinedstorage:root",
   "criteria": {
     "detector_in_inventory": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/assets/refinedstorage/advancements/drives.json b/src/main/resources/data/refinedstorage/advancements/drives.json
similarity index 70%
rename from src/main/resources/assets/refinedstorage/advancements/drives.json
rename to src/main/resources/data/refinedstorage/advancements/drives.json
index c4781be81..88c8e39fd 100644
--- a/src/main/resources/assets/refinedstorage/advancements/drives.json
+++ b/src/main/resources/data/refinedstorage/advancements/drives.json
@@ -4,13 +4,13 @@
       "item": "refinedstorage:disk_drive"
     },
     "title": {
-      "translate": "advancements.refinedstorage:drives"
+      "translate": "advancements.refinedstorage.drives"
     },
     "description": {
-      "translate": "advancements.refinedstorage:drives.description"
+      "translate": "advancements.refinedstorage.drives.description"
     }
   },
-  "parent": "refinedstorage:binding",
+  "parent": "refinedstorage:root",
   "criteria": {
     "disk_drive_in_inventory": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/assets/refinedstorage/advancements/exporting.json b/src/main/resources/data/refinedstorage/advancements/exporting.json
similarity index 69%
rename from src/main/resources/assets/refinedstorage/advancements/exporting.json
rename to src/main/resources/data/refinedstorage/advancements/exporting.json
index 1b6f49645..ba573fdcf 100644
--- a/src/main/resources/assets/refinedstorage/advancements/exporting.json
+++ b/src/main/resources/data/refinedstorage/advancements/exporting.json
@@ -4,13 +4,13 @@
       "item": "refinedstorage:exporter"
     },
     "title": {
-      "translate": "advancements.refinedstorage:exporting"
+      "translate": "advancements.refinedstorage.exporting"
     },
     "description": {
-      "translate": "advancements.refinedstorage:exporting.description"
+      "translate": "advancements.refinedstorage.exporting.description"
     }
   },
-  "parent": "refinedstorage:binding",
+  "parent": "refinedstorage:root",
   "criteria": {
     "exporter_in_inventory": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/assets/refinedstorage/advancements/importing.json b/src/main/resources/data/refinedstorage/advancements/importing.json
similarity index 69%
rename from src/main/resources/assets/refinedstorage/advancements/importing.json
rename to src/main/resources/data/refinedstorage/advancements/importing.json
index 797f30b24..2d8959897 100644
--- a/src/main/resources/assets/refinedstorage/advancements/importing.json
+++ b/src/main/resources/data/refinedstorage/advancements/importing.json
@@ -4,13 +4,13 @@
       "item": "refinedstorage:importer"
     },
     "title": {
-      "translate": "advancements.refinedstorage:importing"
+      "translate": "advancements.refinedstorage.importing"
     },
     "description": {
-      "translate": "advancements.refinedstorage:importing.description"
+      "translate": "advancements.refinedstorage.importing.description"
     }
   },
-  "parent": "refinedstorage:binding",
+  "parent": "refinedstorage:root",
   "criteria": {
     "importer_in_inventory": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/assets/refinedstorage/advancements/interface_to_the_world.json b/src/main/resources/data/refinedstorage/advancements/interface_to_the_world.json
similarity index 70%
rename from src/main/resources/assets/refinedstorage/advancements/interface_to_the_world.json
rename to src/main/resources/data/refinedstorage/advancements/interface_to_the_world.json
index d6bcee111..13e157ae9 100644
--- a/src/main/resources/assets/refinedstorage/advancements/interface_to_the_world.json
+++ b/src/main/resources/data/refinedstorage/advancements/interface_to_the_world.json
@@ -4,13 +4,13 @@
       "item": "refinedstorage:interface"
     },
     "title": {
-      "translate": "advancements.refinedstorage:interface_to_the_world"
+      "translate": "advancements.refinedstorage.interface_to_the_world"
     },
     "description": {
-      "translate": "advancements.refinedstorage:interface_to_the_world.description"
+      "translate": "advancements.refinedstorage.interface_to_the_world.description"
     }
   },
-  "parent": "refinedstorage:binding",
+  "parent": "refinedstorage:root",
   "criteria": {
     "interface_in_inventory": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/assets/refinedstorage/advancements/managing_patterns.json b/src/main/resources/data/refinedstorage/advancements/managing_patterns.json
similarity index 77%
rename from src/main/resources/assets/refinedstorage/advancements/managing_patterns.json
rename to src/main/resources/data/refinedstorage/advancements/managing_patterns.json
index 303a77489..751af5fd4 100644
--- a/src/main/resources/assets/refinedstorage/advancements/managing_patterns.json
+++ b/src/main/resources/data/refinedstorage/advancements/managing_patterns.json
@@ -4,10 +4,10 @@
       "item": "refinedstorage:crafter_manager"
     },
     "title": {
-      "translate": "advancements.refinedstorage:managing_patterns"
+      "translate": "advancements.refinedstorage.managing_patterns"
     },
     "description": {
-      "translate": "advancements.refinedstorage:managing_patterns.description"
+      "translate": "advancements.refinedstorage.managing_patterns.description"
     }
   },
   "parent": "refinedstorage:autocrafting",
diff --git a/src/main/resources/assets/refinedstorage/advancements/manipulating_disks.json b/src/main/resources/data/refinedstorage/advancements/manipulating_disks.json
similarity index 77%
rename from src/main/resources/assets/refinedstorage/advancements/manipulating_disks.json
rename to src/main/resources/data/refinedstorage/advancements/manipulating_disks.json
index f317bbbb1..7cdb282ca 100644
--- a/src/main/resources/assets/refinedstorage/advancements/manipulating_disks.json
+++ b/src/main/resources/data/refinedstorage/advancements/manipulating_disks.json
@@ -4,10 +4,10 @@
       "item": "refinedstorage:disk_manipulator"
     },
     "title": {
-      "translate": "advancements.refinedstorage:manipulating_disks"
+      "translate": "advancements.refinedstorage.manipulating_disks"
     },
     "description": {
-      "translate": "advancements.refinedstorage:manipulating_disks.description"
+      "translate": "advancements.refinedstorage.manipulating_disks.description"
     }
   },
   "parent": "refinedstorage:drives",
diff --git a/src/main/resources/assets/refinedstorage/advancements/monitoring.json b/src/main/resources/data/refinedstorage/advancements/monitoring.json
similarity index 78%
rename from src/main/resources/assets/refinedstorage/advancements/monitoring.json
rename to src/main/resources/data/refinedstorage/advancements/monitoring.json
index 1ffb854f0..616687676 100644
--- a/src/main/resources/assets/refinedstorage/advancements/monitoring.json
+++ b/src/main/resources/data/refinedstorage/advancements/monitoring.json
@@ -4,10 +4,10 @@
       "item": "refinedstorage:crafting_monitor"
     },
     "title": {
-      "translate": "advancements.refinedstorage:monitoring"
+      "translate": "advancements.refinedstorage.monitoring"
     },
     "description": {
-      "translate": "advancements.refinedstorage:monitoring.description"
+      "translate": "advancements.refinedstorage.monitoring.description"
     }
   },
   "parent": "refinedstorage:autocrafting",
diff --git a/src/main/resources/assets/refinedstorage/advancements/no_cables_required.json b/src/main/resources/data/refinedstorage/advancements/no_cables_required.json
similarity index 83%
rename from src/main/resources/assets/refinedstorage/advancements/no_cables_required.json
rename to src/main/resources/data/refinedstorage/advancements/no_cables_required.json
index db74058cf..80b186a01 100644
--- a/src/main/resources/assets/refinedstorage/advancements/no_cables_required.json
+++ b/src/main/resources/data/refinedstorage/advancements/no_cables_required.json
@@ -4,10 +4,10 @@
       "item": "refinedstorage:network_transmitter"
     },
     "title": {
-      "translate": "advancements.refinedstorage:no_cables_required"
+      "translate": "advancements.refinedstorage.no_cables_required"
     },
     "description": {
-      "translate": "advancements.refinedstorage:no_cables_required.description"
+      "translate": "advancements.refinedstorage.no_cables_required.description"
     }
   },
   "parent": "refinedstorage:wireless",
diff --git a/src/main/resources/assets/refinedstorage/advancements/pattern_creation.json b/src/main/resources/data/refinedstorage/advancements/pattern_creation.json
similarity index 70%
rename from src/main/resources/assets/refinedstorage/advancements/pattern_creation.json
rename to src/main/resources/data/refinedstorage/advancements/pattern_creation.json
index e2988ed29..a0fdaf05e 100644
--- a/src/main/resources/assets/refinedstorage/advancements/pattern_creation.json
+++ b/src/main/resources/data/refinedstorage/advancements/pattern_creation.json
@@ -4,10 +4,10 @@
       "item": "refinedstorage:pattern"
     },
     "title": {
-      "translate": "advancements.refinedstorage:pattern_creation"
+      "translate": "advancements.refinedstorage.pattern_creation"
     },
     "description": {
-      "translate": "advancements.refinedstorage:pattern_creation.description"
+      "translate": "advancements.refinedstorage.pattern_creation.description"
     }
   },
   "parent": "refinedstorage:autocrafting",
@@ -20,8 +20,7 @@
             "item": "refinedstorage:pattern"
           },
           {
-            "item": "refinedstorage:grid",
-            "data": 2
+            "item": "refinedstorage:pattern_grid"
           }
         ]
       }
diff --git a/src/main/resources/assets/refinedstorage/advancements/portable_storage.json b/src/main/resources/data/refinedstorage/advancements/portable_storage.json
similarity index 67%
rename from src/main/resources/assets/refinedstorage/advancements/portable_storage.json
rename to src/main/resources/data/refinedstorage/advancements/portable_storage.json
index 9839e7587..435f1d6e2 100644
--- a/src/main/resources/assets/refinedstorage/advancements/portable_storage.json
+++ b/src/main/resources/data/refinedstorage/advancements/portable_storage.json
@@ -1,14 +1,13 @@
 {
   "display": {
     "icon": {
-      "item": "refinedstorage:portable_grid",
-      "data": 1
+      "item": "refinedstorage:portable_grid"
     },
     "title": {
-      "translate": "advancements.refinedstorage:portable_storage"
+      "translate": "advancements.refinedstorage.portable_storage"
     },
     "description": {
-      "translate": "advancements.refinedstorage:portable_storage.description"
+      "translate": "advancements.refinedstorage.portable_storage.description"
     }
   },
   "parent": "refinedstorage:viewing_items",
diff --git a/src/main/resources/assets/refinedstorage/advancements/root.json b/src/main/resources/data/refinedstorage/advancements/root.json
similarity index 71%
rename from src/main/resources/assets/refinedstorage/advancements/root.json
rename to src/main/resources/data/refinedstorage/advancements/root.json
index fc3f1e77e..93e596cec 100644
--- a/src/main/resources/assets/refinedstorage/advancements/root.json
+++ b/src/main/resources/data/refinedstorage/advancements/root.json
@@ -1,18 +1,15 @@
 {
   "display": {
     "icon": {
-      "item": "refinedstorage:controller",
-      "data": 1
+      "item": "refinedstorage:creative_controller"
     },
     "title": {
       "translate": "itemGroup.refinedstorage"
     },
     "description": {
-      "translate": "advancements.refinedstorage:controlling.description"
+      "translate": "advancements.refinedstorage.controlling.description"
     },
-    "background": "refinedstorage:textures/gui/advancements.png",
-    "show_toast": false,
-    "announce_to_chat": false
+    "background": "refinedstorage:textures/gui/advancements.png"
   },
   "criteria": {
     "controller_in_inventory": {
diff --git a/src/main/resources/assets/refinedstorage/advancements/security.json b/src/main/resources/data/refinedstorage/advancements/security.json
similarity index 74%
rename from src/main/resources/assets/refinedstorage/advancements/security.json
rename to src/main/resources/data/refinedstorage/advancements/security.json
index 0dfe00cad..ca5d32bca 100644
--- a/src/main/resources/assets/refinedstorage/advancements/security.json
+++ b/src/main/resources/data/refinedstorage/advancements/security.json
@@ -4,13 +4,13 @@
       "item": "refinedstorage:security_manager"
     },
     "title": {
-      "translate": "advancements.refinedstorage:security"
+      "translate": "advancements.refinedstorage.security"
     },
     "description": {
-      "translate": "advancements.refinedstorage:security.description"
+      "translate": "advancements.refinedstorage.security.description"
     }
   },
-  "parent": "refinedstorage:binding",
+  "parent": "refinedstorage:root",
   "criteria": {
     "security_manager_in_inventory": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/assets/refinedstorage/advancements/storing_externally.json b/src/main/resources/data/refinedstorage/advancements/storing_externally.json
similarity index 71%
rename from src/main/resources/assets/refinedstorage/advancements/storing_externally.json
rename to src/main/resources/data/refinedstorage/advancements/storing_externally.json
index 82e9200b8..05012875b 100644
--- a/src/main/resources/assets/refinedstorage/advancements/storing_externally.json
+++ b/src/main/resources/data/refinedstorage/advancements/storing_externally.json
@@ -4,13 +4,13 @@
       "item": "refinedstorage:external_storage"
     },
     "title": {
-      "translate": "advancements.refinedstorage:storing_externally"
+      "translate": "advancements.refinedstorage.storing_externally"
     },
     "description": {
-      "translate": "advancements.refinedstorage:storing_externally.description"
+      "translate": "advancements.refinedstorage.storing_externally.description"
     }
   },
-  "parent": "refinedstorage:binding",
+  "parent": "refinedstorage:root",
   "criteria": {
     "external_storage_in_inventory": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/assets/refinedstorage/advancements/storing_fluids.json b/src/main/resources/data/refinedstorage/advancements/storing_fluids.json
similarity index 57%
rename from src/main/resources/assets/refinedstorage/advancements/storing_fluids.json
rename to src/main/resources/data/refinedstorage/advancements/storing_fluids.json
index 7ffb960dd..5a5b068a4 100644
--- a/src/main/resources/assets/refinedstorage/advancements/storing_fluids.json
+++ b/src/main/resources/data/refinedstorage/advancements/storing_fluids.json
@@ -1,14 +1,13 @@
 {
   "display": {
     "icon": {
-      "item": "refinedstorage:fluid_storage_disk",
-      "data": 0
+      "item": "refinedstorage:64k_fluid_storage_disk"
     },
     "title": {
-      "translate": "advancements.refinedstorage:storing_fluids"
+      "translate": "advancements.refinedstorage.storing_fluids"
     },
     "description": {
-      "translate": "advancements.refinedstorage:storing_fluids.description"
+      "translate": "advancements.refinedstorage.storing_fluids.description"
     }
   },
   "parent": "refinedstorage:drives",
@@ -18,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:fluid_storage_disk"
+            "item": "refinedstorage:64k_fluid_storage_disk"
           }
         ]
       }
diff --git a/src/main/resources/assets/refinedstorage/advancements/storing_items.json b/src/main/resources/data/refinedstorage/advancements/storing_items.json
similarity index 58%
rename from src/main/resources/assets/refinedstorage/advancements/storing_items.json
rename to src/main/resources/data/refinedstorage/advancements/storing_items.json
index aac6ffb91..b6585f872 100644
--- a/src/main/resources/assets/refinedstorage/advancements/storing_items.json
+++ b/src/main/resources/data/refinedstorage/advancements/storing_items.json
@@ -1,14 +1,13 @@
 {
   "display": {
     "icon": {
-      "item": "refinedstorage:storage_disk",
-      "data": 0
+      "item": "refinedstorage:1k_storage_disk"
     },
     "title": {
-      "translate": "advancements.refinedstorage:storing_items"
+      "translate": "advancements.refinedstorage.storing_items"
     },
     "description": {
-      "translate": "advancements.refinedstorage:storing_items.description"
+      "translate": "advancements.refinedstorage.storing_items.description"
     }
   },
   "parent": "refinedstorage:drives",
@@ -18,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:storage_disk"
+            "item": "refinedstorage:1k_storage_disk"
           }
         ]
       }
diff --git a/src/main/resources/assets/refinedstorage/advancements/upgrading.json b/src/main/resources/data/refinedstorage/advancements/upgrading.json
similarity index 60%
rename from src/main/resources/assets/refinedstorage/advancements/upgrading.json
rename to src/main/resources/data/refinedstorage/advancements/upgrading.json
index 58a6b7daf..c22b75bba 100644
--- a/src/main/resources/assets/refinedstorage/advancements/upgrading.json
+++ b/src/main/resources/data/refinedstorage/advancements/upgrading.json
@@ -1,17 +1,16 @@
 {
   "display": {
     "icon": {
-      "item": "refinedstorage:upgrade",
-      "data": 0
+      "item": "refinedstorage:upgrade"
     },
     "title": {
-      "translate": "advancements.refinedstorage:upgrading"
+      "translate": "advancements.refinedstorage.upgrading"
     },
     "description": {
-      "translate": "advancements.refinedstorage:upgrading.description"
+      "translate": "advancements.refinedstorage.upgrading.description"
     }
   },
-  "parent": "refinedstorage:binding",
+  "parent": "refinedstorage:root",
   "criteria": {
     "upgrade_in_inventory": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/assets/refinedstorage/advancements/upgrading_your_grid.json b/src/main/resources/data/refinedstorage/advancements/upgrading_your_grid.json
similarity index 58%
rename from src/main/resources/assets/refinedstorage/advancements/upgrading_your_grid.json
rename to src/main/resources/data/refinedstorage/advancements/upgrading_your_grid.json
index a3777beac..4bf57fb26 100644
--- a/src/main/resources/assets/refinedstorage/advancements/upgrading_your_grid.json
+++ b/src/main/resources/data/refinedstorage/advancements/upgrading_your_grid.json
@@ -1,14 +1,13 @@
 {
   "display": {
     "icon": {
-      "item": "refinedstorage:grid",
-      "data": 1
+      "item": "refinedstorage:crafting_grid"
     },
     "title": {
-      "translate": "advancements.refinedstorage:upgrading_your_grid"
+      "translate": "advancements.refinedstorage.upgrading_your_grid"
     },
     "description": {
-      "translate": "advancements.refinedstorage:upgrading_your_grid.description"
+      "translate": "advancements.refinedstorage.upgrading_your_grid.description"
     }
   },
   "parent": "refinedstorage:viewing_items",
@@ -18,8 +17,7 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:grid",
-            "data": 1
+            "item": "refinedstorage:crafting_grid"
           }
         ]
       }
diff --git a/src/main/resources/assets/refinedstorage/advancements/viewing_fluids.json b/src/main/resources/data/refinedstorage/advancements/viewing_fluids.json
similarity index 58%
rename from src/main/resources/assets/refinedstorage/advancements/viewing_fluids.json
rename to src/main/resources/data/refinedstorage/advancements/viewing_fluids.json
index ed6277767..7aaf1e319 100644
--- a/src/main/resources/assets/refinedstorage/advancements/viewing_fluids.json
+++ b/src/main/resources/data/refinedstorage/advancements/viewing_fluids.json
@@ -1,14 +1,13 @@
 {
   "display": {
     "icon": {
-      "item": "refinedstorage:grid",
-      "data": 3
+      "item": "refinedstorage:fluid_grid"
     },
     "title": {
-      "translate": "advancements.refinedstorage:viewing_fluids"
+      "translate": "advancements.refinedstorage.viewing_fluids"
     },
     "description": {
-      "translate": "advancements.refinedstorage:viewing_fluids.description"
+      "translate": "advancements.refinedstorage.viewing_fluids.description"
     }
   },
   "parent": "refinedstorage:storing_fluids",
@@ -18,8 +17,7 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:grid",
-            "data": 3
+            "item": "refinedstorage:fluid_grid"
           }
         ]
       }
diff --git a/src/main/resources/assets/refinedstorage/advancements/viewing_items.json b/src/main/resources/data/refinedstorage/advancements/viewing_items.json
similarity index 57%
rename from src/main/resources/assets/refinedstorage/advancements/viewing_items.json
rename to src/main/resources/data/refinedstorage/advancements/viewing_items.json
index 8db5857b6..87afd7110 100644
--- a/src/main/resources/assets/refinedstorage/advancements/viewing_items.json
+++ b/src/main/resources/data/refinedstorage/advancements/viewing_items.json
@@ -1,14 +1,13 @@
 {
   "display": {
     "icon": {
-      "item": "refinedstorage:grid",
-      "data": 0
+      "item": "refinedstorage:grid"
     },
     "title": {
-      "translate": "advancements.refinedstorage:viewing_items"
+      "translate": "advancements.refinedstorage.viewing_items"
     },
     "description": {
-      "translate": "advancements.refinedstorage:viewing_items.description"
+      "translate": "advancements.refinedstorage.viewing_items.description"
     }
   },
   "parent": "refinedstorage:storing_items",
@@ -18,8 +17,7 @@
       "conditions": {
         "items": [
           {
-            "item": "refinedstorage:grid",
-            "data": 0
+            "item": "refinedstorage:grid"
           }
         ]
       }
diff --git a/src/main/resources/assets/refinedstorage/advancements/wireless.json b/src/main/resources/data/refinedstorage/advancements/wireless.json
similarity index 71%
rename from src/main/resources/assets/refinedstorage/advancements/wireless.json
rename to src/main/resources/data/refinedstorage/advancements/wireless.json
index 1d4d215ae..394947e14 100644
--- a/src/main/resources/assets/refinedstorage/advancements/wireless.json
+++ b/src/main/resources/data/refinedstorage/advancements/wireless.json
@@ -4,13 +4,13 @@
       "item": "refinedstorage:wireless_transmitter"
     },
     "title": {
-      "translate": "advancements.refinedstorage:wireless"
+      "translate": "advancements.refinedstorage.wireless"
     },
     "description": {
-      "translate": "advancements.refinedstorage:wireless.description"
+      "translate": "advancements.refinedstorage.wireless.description"
     }
   },
-  "parent": "refinedstorage:binding",
+  "parent": "refinedstorage:root",
   "criteria": {
     "wireless_transmitter_in_inventory": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/assets/refinedstorage/advancements/wireless_fluids.json b/src/main/resources/data/refinedstorage/advancements/wireless_fluids.json
similarity index 67%
rename from src/main/resources/assets/refinedstorage/advancements/wireless_fluids.json
rename to src/main/resources/data/refinedstorage/advancements/wireless_fluids.json
index 3e97f9557..9c8b7f661 100644
--- a/src/main/resources/assets/refinedstorage/advancements/wireless_fluids.json
+++ b/src/main/resources/data/refinedstorage/advancements/wireless_fluids.json
@@ -1,14 +1,13 @@
 {
   "display": {
     "icon": {
-      "item": "refinedstorage:wireless_fluid_grid",
-      "data": 1
+      "item": "refinedstorage:wireless_fluid_grid"
     },
     "title": {
-      "translate": "advancements.refinedstorage:wireless_fluids"
+      "translate": "advancements.refinedstorage.wireless_fluids"
     },
     "description": {
-      "translate": "advancements.refinedstorage:wireless_fluids.description"
+      "translate": "advancements.refinedstorage.wireless_fluids.description"
     }
   },
   "parent": "refinedstorage:wireless",
diff --git a/src/main/resources/assets/refinedstorage/advancements/wireless_items.json b/src/main/resources/data/refinedstorage/advancements/wireless_items.json
similarity index 67%
rename from src/main/resources/assets/refinedstorage/advancements/wireless_items.json
rename to src/main/resources/data/refinedstorage/advancements/wireless_items.json
index e0db21b93..e88cfc57e 100644
--- a/src/main/resources/assets/refinedstorage/advancements/wireless_items.json
+++ b/src/main/resources/data/refinedstorage/advancements/wireless_items.json
@@ -1,14 +1,13 @@
 {
   "display": {
     "icon": {
-      "item": "refinedstorage:wireless_grid",
-      "data": 1
+      "item": "refinedstorage:wireless_grid"
     },
     "title": {
-      "translate": "advancements.refinedstorage:wireless_items"
+      "translate": "advancements.refinedstorage.wireless_items"
     },
     "description": {
-      "translate": "advancements.refinedstorage:wireless_items.description"
+      "translate": "advancements.refinedstorage.wireless_items.description"
     }
   },
   "parent": "refinedstorage:wireless",
diff --git a/src/main/resources/assets/refinedstorage/advancements/wireless_monitoring.json b/src/main/resources/data/refinedstorage/advancements/wireless_monitoring.json
similarity index 67%
rename from src/main/resources/assets/refinedstorage/advancements/wireless_monitoring.json
rename to src/main/resources/data/refinedstorage/advancements/wireless_monitoring.json
index a15878129..67f4820f4 100644
--- a/src/main/resources/assets/refinedstorage/advancements/wireless_monitoring.json
+++ b/src/main/resources/data/refinedstorage/advancements/wireless_monitoring.json
@@ -1,14 +1,13 @@
 {
   "display": {
     "icon": {
-      "item": "refinedstorage:wireless_crafting_monitor",
-      "data": 1
+      "item": "refinedstorage:wireless_crafting_monitor"
     },
     "title": {
-      "translate": "advancements.refinedstorage:wireless_monitoring"
+      "translate": "advancements.refinedstorage.wireless_monitoring"
     },
     "description": {
-      "translate": "advancements.refinedstorage:wireless_monitoring.description"
+      "translate": "advancements.refinedstorage.wireless_monitoring.description"
     }
   },
   "parent": "refinedstorage:wireless",