diff --git a/source/behavior/entities/1.17.0/entities.json b/source/behavior/entities/1.17.0/entities.json
deleted file mode 100644
index 89c183ba..00000000
--- a/source/behavior/entities/1.17.0/entities.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "$id": "blockception.minecraft.behavior.entity.1.17.0",
-  "type": "object",
-  "title": "Entity Behavior 1.17.0",
-  "description": "The minecraft entity behavior specification",
-  "required": ["format_version", "minecraft:entity"],
-  "additionalProperties": false,
-  "properties": {
-    "format_version": {
-      "title": "1.17.0 Format Version",
-      "description": "A version that tells minecraft what type of data format can be expected when reading this file.",
-      "type": "string",
-      "const": "1.17.0"
-    },
-    "minecraft:entity": { "$ref": "./minecraft.entity.json" }
-  }
-}
diff --git a/source/behavior/entities/1.17.0/events.json b/source/behavior/entities/1.17.0/events.json
deleted file mode 100644
index c3eb5b51..00000000
--- a/source/behavior/entities/1.17.0/events.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "$id": "blockception.minecraft.behavior.entities.events.1.17.0",
-  "type": "object",
-  "title": "Events 1.17.0",
-  "description": "Events for entities 1.17.0",
-  "additionalProperties": { "$ref": "#/definitions/event_base" },
-  "definitions": {
-    "addremove": {
-      "additionalProperties": false,
-      "title": "Add Or Remove",
-      "description": "The components groups to add or remove",
-      "type": "object",
-      "properties": {
-        "component_groups": {
-          "title": "Component Groups",
-          "description": "The components groups to add or remove",
-          "type": "array",
-          "items": { "type": "string", "description": "A reference to a component group", "title": "Component Groups" }
-        }
-      }
-    },
-    "event_base": {
-      "additionalProperties": false,
-      "type": "object",
-      "properties": {
-        "filters": { "$ref": "./../filters/filters.json" },
-        "trigger": { "type": "string", "description": "Triggers additional events", "$comment": "UNDOCUMENTED", "title": "Trigger" },
-        "add": { "$ref": "#/definitions/addremove", "description": "What gets added when the event gets triggered", "title": "Add" },
-        "remove": { "$ref": "#/definitions/addremove", "description": "What gets removed when the event gets triggered", "title": "Remove" },
-        "randomize": {
-          "type": "array",
-          "description": "Randomly selects one of the following items based upon their weight and the total weights",
-          "title": "Randomize",
-          "items": {
-            "required": ["weight"],
-            "description": "Randomly selects one of the following items based upon their weight and the total weights",
-            "title": "Randomize",
-            "properties": {
-              "add": { "$ref": "#/definitions/addremove", "description": "What gets added when the event gets triggered", "title": "Add" },
-              "remove": { "$ref": "#/definitions/addremove", "description": "What gets removed when the event gets triggered", "title": "Remove" },
-              "trigger": { "type": "string", "description": "Triggers additional events", "$comment": "UNDOCUMENTED", "title": "Trigger" },
-              "weight": {
-                "type": "number",
-                "description": "The weight on how likely this section is to trigger",
-                "$comment": "UNDOCUMENTED",
-                "title": "Weight"
-              }
-            }
-          }
-        },
-        "sequence": {
-          "type": "array",
-          "description": "A series of filters and components to be added",
-          "title": "Sequences",
-          "items": {
-            "description": "Filters and components to be added",
-            "title": "Sequence",
-            "type": "object",
-            "properties": {
-              "add": { "$ref": "#/definitions/addremove", "description": "What gets added when the event gets triggered", "title": "Add" },
-              "remove": { "$ref": "#/definitions/addremove", "description": "What gets removed when the event gets triggered", "title": "Remove" },
-              "trigger": { "type": "string", "description": "Triggers additional events", "$comment": "UNDOCUMENTED", "title": "Trigger" },
-              "filters": { "$ref": "./../filters/filters.json" }
-            }
-          }
-        }
-      }
-    }
-  },
-  "properties": {
-    "minecraft:entity_transformed": {
-      "description": "Event called on an entity that transforms into another entity.",
-      "$ref": "#/definitions/event_base",
-      "title": "Entity Transformed"
-    },
-    "minecraft:entity_born": {
-      "description": "Event called on an entity that is spawned through two entities breeding.",
-      "$ref": "#/definitions/event_base",
-      "title": "Entity Born"
-    },
-    "minecraft:entity_spawned": {
-      "description": "Event called on an entity that is placed in the level.",
-      "$ref": "#/definitions/event_base",
-      "title": "Entity Spawned"
-    },
-    "minecraft:on_prime": {
-      "description": "Event called on an entity whose fuse is lit and is ready to explode.",
-      "$ref": "#/definitions/event_base",
-      "title": "On Prime"
-    }
-  }
-}
diff --git a/source/behavior/entities/1.17.0/minecraft.entity.json b/source/behavior/entities/1.17.0/minecraft.entity.json
deleted file mode 100644
index dd705e53..00000000
--- a/source/behavior/entities/1.17.0/minecraft.entity.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "$id": "blockception.minecraft.behavior.entities.minecraft:entity.1.17.0",
-  "title": "Entity 1.17.0",
-  "required": ["description"],
-  "dependencies": { "component_groups": ["events"] },
-  "additionalProperties": false,
-  "type": "object",
-  "properties": {
-    "description": {
-      "required": ["identifier"],
-      "title": "Description",
-      "description": "The description of the this entity",
-      "properties": {
-        "animations": {
-          "title": "Animations",
-          "description": "Sets the mapping of internal animation / animation controllers references to actual animations. This is a JSON Object of name/animation pairs",
-          "type": "object",
-          "additionalProperties": {
-            "title": "Animation (controller)",
-            "description": "The name of the animation controller / animation",
-            "type": "string"
-          }
-        },
-        "identifier": {
-          "$ref": "../../../general/entity/identifier.json",
-          "description": "Sets the identifier for this entity's description.",
-          "title": "Identifier"
-        },
-        "is_spawnable": {
-          "type": "boolean",
-          "title": "Is Spawnable",
-          "description": "Sets whether or not this entity has a spawn egg in the creative ui."
-        },
-        "is_summonable": {
-          "type": "boolean",
-          "title": "Is Summonable Property",
-          "description": "Sets whether or not we can summon this entity using commands such as /summon."
-        },
-        "is_experimental": {
-          "type": "boolean",
-          "title": "Is Experimental",
-          "description": "Sets whether or not this entity is experimental. Experimental entities are only enabled when the experimental toggle is enabled."
-        },
-        "runtime_identifier": {
-          "type": "string",
-          "title": "Runtime Identifier",
-          "description": "Sets the name for the Vanilla Minecraft identifier this entity will use to build itself from."
-        },
-        "scripts": {
-          "type": "object",
-          "title": "Scripts",
-          "description": "Sets the mapping of internal animation controller references to actual animation controller. This is a JSON Array of name/animation-controller pairs",
-          "properties": {
-            "animate": {
-              "type": "array",
-              "title": "Animate",
-              "description": "Tells minecraft to run which animation / animation controllers and under what conditions",
-              "items": {
-                "oneOf": [
-                  { "type": "string", "title": "Animation", "description": "The name of an animation controller referenced in animations" },
-                  {
-                    "type": "object",
-                    "title": "Conditional Animation",
-                    "description": "A conditional statement to run the animation under a specified condition",
-                    "$comment": "UNDOCUMENTED",
-                    "additionalProperties": { "type": "string", "title": "Animation" }
-                  }
-                ]
-              }
-            }
-          }
-        }
-      }
-    },
-    "component_groups": {
-      "title": "Component Groups",
-      "description": "Each group when add / remove the default components",
-      "uniqueItems": true,
-      "type": "object",
-      "additionalProperties": {
-        "$ref": "../1.16.0/components.json",
-        "uniqueItems": true,
-        "description": "The components that are added as the foundation of the entity",
-        "title": "Component"
-      }
-    },
-    "components": {
-      "$ref": "../1.16.0/components.json",
-      "uniqueItems": true,
-      "description": "The components that are added as the foundation of the entity",
-      "title": "Component"
-    },
-    "events": {
-      "$ref": "./events.json",
-      "uniqueItems": true,
-      "description": "The events that the entity can run, these add or remove components_groups",
-      "title": "Events"
-    }
-  }
-}
diff --git a/source/behavior/entities/1.8.0/components.json b/source/behavior/entities/1.8.0/components.json
index 24f7c136..ace5d958 100644
--- a/source/behavior/entities/1.8.0/components.json
+++ b/source/behavior/entities/1.8.0/components.json
@@ -31,13 +31,13 @@
     "minecraft:color2": { "$ref": "./components/minecraft.color2.json" },
     "minecraft:combat_regeneration": { "$ref": "./components/minecraft.combat_regeneration.json" },
     "minecraft:drying_out_timer": { "$ref": "./components/minecraft.drying_out_timer.json" },
-    "minecraft:conditional_bandwidth_optimization": { "$ref": "../1.8.0/components/minecraft.conditional_bandwidth_optimization.json" },
+    "minecraft:conditional_bandwidth_optimization": { "$ref": "./components/minecraft.conditional_bandwidth_optimization.json" },
     "minecraft:custom_hit_test": { "$ref": "./components/minecraft.custom_hit_test.json" },
-    "minecraft:damage_over_time": { "$ref": "../1.8.0/components/minecraft.damage_over_time.json" },
+    "minecraft:damage_over_time": { "$ref": "./components/minecraft.damage_over_time.json" },
     "minecraft:damage_sensor": { "$ref": "./components/minecraft.damage_sensor.json" },
-    "minecraft:default_look_angle": { "$ref": "../1.8.0/components/minecraft.default_look_angle.json" },
+    "minecraft:default_look_angle": { "$ref": "./components/minecraft.default_look_angle.json" },
     "minecraft:despawn": { "$ref": "./components/minecraft.despawn.json" },
-    "minecraft:dweller": { "$ref": "../1.8.0/components/minecraft.dweller.json" },
+    "minecraft:dweller": { "$ref": "./components/minecraft.dweller.json" },
     "minecraft:economy_trade_table": { "$ref": "./components/minecraft.economy_trade_table.json" },
     "minecraft:environment_sensor": { "$ref": "./components/minecraft.environment_sensor.json" },
     "minecraft:equipment": { "$ref": "./components/minecraft.equipment.json" },
@@ -156,26 +156,26 @@
     "minecraft:walk_animation_speed": { "$ref": "./components/minecraft.walk_animation_speed.json" },
     "minecraft:wants_jockey": { "$ref": "./components/minecraft.wants_jockey.json" },
     "minecraft:water_movement": { "$ref": "./components/minecraft.water_movement.json" },
-    "minecraft:admire_item": { "$ref": "../1.8.0/components/minecraft.admire_item.json" },
-    "minecraft:area_attack": { "$ref": "../1.8.0/components/minecraft.area_attack.json" },
-    "minecraft:attack_cooldown": { "$ref": "../1.8.0/components/minecraft.attack_cooldown.json" },
-    "minecraft:barter": { "$ref": "../1.8.0/components/minecraft.barter.json" },
-    "minecraft:block_sensor": { "$ref": "../1.8.0/components/minecraft.block_sensor.json" },
-    "minecraft:buoyant": { "$ref": "../1.8.0/components/minecraft.buoyant.json" },
-    "minecraft:celebrate_hunt": { "$ref": "../1.8.0/components/minecraft.celebrate_hunt.json" },
-    "minecraft:entity_sensor": { "$ref": "../1.8.0/components/minecraft.entity_sensor.json" },
-    "minecraft:equip_item": { "$ref": "../1.8.0/components/minecraft.equip_item.json" },
-    "minecraft:experience_reward": { "$ref": "../1.8.0/components/minecraft.experience_reward.json" },
-    "minecraft:group_size": { "$ref": "../1.8.0/components/minecraft.group_size.json" },
-    "minecraft:grows_crop": { "$ref": "../1.8.0/components/minecraft.grows_crop.json" },
-    "minecraft:home": { "$ref": "../1.8.0/components/minecraft.home.json" },
-    "minecraft:instant_despawn": { "$ref": "../1.8.0/components/minecraft.instant_despawn.json" },
-    "minecraft:mob_effect": { "$ref": "../1.8.0/components/minecraft.mob_effect.json" },
-    "minecraft:movement.hover": { "$ref": "../1.8.0/components/minecraft.movement.hover.json" },
-    "minecraft:navigation.hover": { "$ref": "../1.8.0/components/minecraft.navigation.hover.json" },
-    "minecraft:npc": { "$ref": "../1.8.0/components/minecraft.npc.json" },
-    "minecraft:strength": { "$ref": "../1.8.0/components/minecraft.strength.json" },
-    "minecraft:trail": { "$ref": "../1.8.0/components/minecraft.trail.json" },
+    "minecraft:admire_item": { "$ref": "./components/minecraft.admire_item.json" },
+    "minecraft:area_attack": { "$ref": "./components/minecraft.area_attack.json" },
+    "minecraft:attack_cooldown": { "$ref": "./components/minecraft.attack_cooldown.json" },
+    "minecraft:barter": { "$ref": "./components/minecraft.barter.json" },
+    "minecraft:block_sensor": { "$ref": "./components/minecraft.block_sensor.json" },
+    "minecraft:buoyant": { "$ref": "./components/minecraft.buoyant.json" },
+    "minecraft:celebrate_hunt": { "$ref": "./components/minecraft.celebrate_hunt.json" },
+    "minecraft:entity_sensor": { "$ref": "./components/minecraft.entity_sensor.json" },
+    "minecraft:equip_item": { "$ref": "./components/minecraft.equip_item.json" },
+    "minecraft:experience_reward": { "$ref": "./components/minecraft.experience_reward.json" },
+    "minecraft:group_size": { "$ref": "./components/minecraft.group_size.json" },
+    "minecraft:grows_crop": { "$ref": "./components/minecraft.grows_crop.json" },
+    "minecraft:home": { "$ref": "./components/minecraft.home.json" },
+    "minecraft:instant_despawn": { "$ref": "./components/minecraft.instant_despawn.json" },
+    "minecraft:mob_effect": { "$ref": "./components/minecraft.mob_effect.json" },
+    "minecraft:movement.hover": { "$ref": "./components/minecraft.movement.hover.json" },
+    "minecraft:navigation.hover": { "$ref": "./components/minecraft.navigation.hover.json" },
+    "minecraft:npc": { "$ref": "./components/minecraft.npc.json" },
+    "minecraft:strength": { "$ref": "./components/minecraft.strength.json" },
+    "minecraft:trail": { "$ref": "./components/minecraft.trail.json" },
     "minecraft:hide": { "$ref": "../1.16.0/components/minecraft.hide.json" },
     "minecraft:horse.jump_strength": { "$ref": "../1.16.0/components/minecraft.horse.jump_strength.json" },
     "minecraft:trade_resupply": { "$ref": "../1.16.0/components/minecraft.trade_resupply.json" },
diff --git a/source/behavior/entities/1.8.0/entities.json b/source/behavior/entities/1.8.0/entities.json
index 31bed9bf..ffe2d891 100644
--- a/source/behavior/entities/1.8.0/entities.json
+++ b/source/behavior/entities/1.8.0/entities.json
@@ -1,16 +1,16 @@
 {
-  "$id": "blockception.minecraft.behavior.entity.1.8.0",
+  "$id": "blockception.minecraft.behavior.entity.1.17.0",
   "type": "object",
-  "additionalProperties": false,
-  "title": "Entity Behavior 1.8.0",
+  "title": "Entity Behavior 1.17.0",
   "description": "The minecraft entity behavior specification",
   "required": ["format_version", "minecraft:entity"],
+  "additionalProperties": false,
   "properties": {
     "format_version": {
-      "title": "Format Version",
+      "title": "1.17.0 Format Version",
+      "description": "A version that tells minecraft what type of data format can be expected when reading this file.",
       "type": "string",
-      "const": "1.8.0",
-      "description": "A version that tells minecraft what type of data format can be expected when reading this file."
+      "const": "1.17.0"
     },
     "minecraft:entity": { "$ref": "./minecraft.entity.json" }
   }
diff --git a/source/behavior/entities/1.8.0/events.json b/source/behavior/entities/1.8.0/events.json
index 0d13a55d..67688b86 100644
--- a/source/behavior/entities/1.8.0/events.json
+++ b/source/behavior/entities/1.8.0/events.json
@@ -1,8 +1,9 @@
 {
-  "$id": "blockception.minecraft.behavior.entities.events1.8.0",
+  "$id": "blockception.minecraft.behavior.entities.events.1.17.0",
   "type": "object",
-  "title": "Events 1.8.0",
-  "description": "The events in minecraft",
+  "title": "Events 1.17.0",
+  "description": "Events for entities 1.17.0",
+  "additionalProperties": { "$ref": "#/definitions/event_base" },
   "definitions": {
     "addremove": {
       "additionalProperties": false,
@@ -87,6 +88,5 @@
       "$ref": "#/definitions/event_base",
       "title": "On Prime"
     }
-  },
-  "additionalProperties": { "$ref": "#/definitions/event_base" }
+  }
 }
diff --git a/source/behavior/entities/1.8.0/minecraft.entity.json b/source/behavior/entities/1.8.0/minecraft.entity.json
index 96928a74..9ee76f55 100644
--- a/source/behavior/entities/1.8.0/minecraft.entity.json
+++ b/source/behavior/entities/1.8.0/minecraft.entity.json
@@ -1,6 +1,6 @@
 {
-  "$id": "blockception.minecraft.behavior.entities.minecraft:entity.1.8.0",
-  "title": "Entity 1.8.0",
+  "$id": "blockception.minecraft.behavior.entities.minecraft:entity.1.17.0",
+  "title": "Entity 1.17.0",
   "required": ["description"],
   "dependencies": { "component_groups": ["events"] },
   "additionalProperties": false,
@@ -78,14 +78,14 @@
       "uniqueItems": true,
       "type": "object",
       "additionalProperties": {
-        "$ref": "./components.json",
+        "$ref": "../1.16.0/components.json",
         "uniqueItems": true,
         "description": "The components that are added as the foundation of the entity",
         "title": "Component"
       }
     },
     "components": {
-      "$ref": "./components.json",
+      "$ref": "../1.16.0/components.json",
       "uniqueItems": true,
       "description": "The components that are added as the foundation of the entity",
       "title": "Component"