diff --git a/source/behavior/entities/1.10.0/events.json b/source/behavior/entities/1.10.0/events.json
index abc755e3..dbbd19f2 100644
--- a/source/behavior/entities/1.10.0/events.json
+++ b/source/behavior/entities/1.10.0/events.json
@@ -49,13 +49,13 @@
             "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" },
-              "filters": { "$ref": "./filters.json" }
+              "filters": { "$ref": "./../filters/filters.json" }
             }
           },
           "description": "A series of filters and components to be added",
           "title": "Sequences"
         },
-        "filters": { "$ref": "./filters.json" },
+        "filters": { "$ref": "./../filters/filters.json" },
         "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       }
     }
diff --git a/source/behavior/entities/1.10.0/types/entity_types.json b/source/behavior/entities/1.10.0/types/entity_types.json
index 12be5ee3..0b096557 100644
--- a/source/behavior/entities/1.10.0/types/entity_types.json
+++ b/source/behavior/entities/1.10.0/types/entity_types.json
@@ -8,7 +8,7 @@
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "filters": { "type": "object", "$ref": "../filters.json" },
+        "filters": { "type": "object", "$ref": "../../filters/filters.json" },
         "max_dist": {
           "type": "number",
           "description": "Maximum distance this mob can be away to be a valid choice",
diff --git a/source/behavior/entities/1.10.0/types/event.json b/source/behavior/entities/1.10.0/types/event.json
index 1d503014..cdb86325 100644
--- a/source/behavior/entities/1.10.0/types/event.json
+++ b/source/behavior/entities/1.10.0/types/event.json
@@ -3,7 +3,7 @@
   "title": "Event",
   "description": "Minecraft behavior event 1.10.0",
   "oneOf": [
-    { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire" },
+    { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire", "title": "Event" },
     {
       "type": "object",
       "properties": {
diff --git a/source/behavior/entities/1.10.0/types/trigger.json b/source/behavior/entities/1.10.0/types/trigger.json
index e0fdbc7f..653cfad0 100644
--- a/source/behavior/entities/1.10.0/types/trigger.json
+++ b/source/behavior/entities/1.10.0/types/trigger.json
@@ -6,7 +6,11 @@
   "minProperties": 1,
   "properties": {
     "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
-    "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "Filters" },
+    "filters": {
+      "$ref": "../../filters/filters.json",
+      "description": "The filters to check to determine if the event should be fired",
+      "title": "Filters"
+    },
     "target": { "$ref": "../../1.8.0/filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
   },
   "additionalProperties": false
diff --git a/source/behavior/entities/1.11.0/events.json b/source/behavior/entities/1.11.0/events.json
index 14b4f281..081f66f0 100644
--- a/source/behavior/entities/1.11.0/events.json
+++ b/source/behavior/entities/1.11.0/events.json
@@ -50,13 +50,13 @@
             "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" },
-              "filters": { "$ref": "./filters.json" }
+              "filters": { "$ref": "./../filters/filters.json" }
             }
           },
           "description": "A series of filters and components to be added",
           "title": "Sequences"
         },
-        "filters": { "$ref": "./filters.json" },
+        "filters": { "$ref": "./../filters/filters.json" },
         "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       }
     }
diff --git a/source/behavior/entities/1.12.0/events.json b/source/behavior/entities/1.12.0/events.json
index 3f0fb177..0b3f36a7 100644
--- a/source/behavior/entities/1.12.0/events.json
+++ b/source/behavior/entities/1.12.0/events.json
@@ -49,13 +49,13 @@
             "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" },
-              "filters": { "$ref": "./filters.json" }
+              "filters": { "$ref": "./../filters/filters.json" }
             }
           },
           "description": "A series of filters and components to be added",
           "title": "Sequences"
         },
-        "filters": { "$ref": "./filters.json" },
+        "filters": { "$ref": "./../filters/filters.json" },
         "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       }
     }
diff --git a/source/behavior/entities/1.12.0/types/entity_types.json b/source/behavior/entities/1.12.0/types/entity_types.json
index 76c65722..f9f35dea 100644
--- a/source/behavior/entities/1.12.0/types/entity_types.json
+++ b/source/behavior/entities/1.12.0/types/entity_types.json
@@ -7,7 +7,7 @@
     "title": "Entity Type",
     "type": "object",
     "properties": {
-      "filters": { "type": "object", "$ref": "../filters.json" },
+      "filters": { "type": "object", "$ref": "../../filters/filters.json" },
       "max_dist": {
         "type": "number",
         "description": "Maximum distance this mob can be away to be a valid choice",
diff --git a/source/behavior/entities/1.12.0/types/trigger.json b/source/behavior/entities/1.12.0/types/trigger.json
index cc66955a..6f5c5ae7 100644
--- a/source/behavior/entities/1.12.0/types/trigger.json
+++ b/source/behavior/entities/1.12.0/types/trigger.json
@@ -6,7 +6,11 @@
   "minProperties": 1,
   "properties": {
     "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
-    "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "Filters" },
+    "filters": {
+      "$ref": "../../filters/filters.json",
+      "description": "The filters to check to determine if the event should be fired",
+      "title": "Filters"
+    },
     "target": { "$ref": "../../1.8.0/filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
   },
   "additionalProperties": false
diff --git a/source/behavior/entities/1.13.0/components/minecraft.breedable.json b/source/behavior/entities/1.13.0/components/minecraft.breedable.json
index 2e43a0ea..033c4b15 100644
--- a/source/behavior/entities/1.13.0/components/minecraft.breedable.json
+++ b/source/behavior/entities/1.13.0/components/minecraft.breedable.json
@@ -94,7 +94,11 @@
       "maximum": 1.0,
       "title": "Extra Baby Chance"
     },
-    "love_filters": { "$ref": "../filters.json", "description": "The filters to run when attempting to fall in love.", "title": "Love Filters" },
+    "love_filters": {
+      "$ref": "../../filters/filters.json",
+      "description": "The filters to run when attempting to fall in love.",
+      "title": "Love Filters"
+    },
     "mutation_factor": {
       "type": "object",
       "description": "Determines how likely the babies are to NOT inherit one of their parent's variances. Values are between 0.0 and 1.0, with a higher number meaning more likely to mutate.",
diff --git a/source/behavior/entities/1.13.0/components/minecraft.damage_sensor.json b/source/behavior/entities/1.13.0/components/minecraft.damage_sensor.json
index 45e52255..7e2f69d0 100644
--- a/source/behavior/entities/1.13.0/components/minecraft.damage_sensor.json
+++ b/source/behavior/entities/1.13.0/components/minecraft.damage_sensor.json
@@ -32,7 +32,7 @@
           "description": "Specifies filters for entity definitions and events.",
           "title": "On Damage",
           "properties": {
-            "filters": { "$ref": "../filters.json" },
+            "filters": { "$ref": "../../filters/filters.json" },
             "event": { "type": "string", "pattern": "^.*$", "description": "TODO description: event", "title": "Event" },
             "target": { "$ref": "../filters/types/base_subject.json", "description": "TODO description: target", "title": "Target" }
           },
diff --git a/source/behavior/entities/1.13.0/events.json b/source/behavior/entities/1.13.0/events.json
index 99cf21ef..e3daed11 100644
--- a/source/behavior/entities/1.13.0/events.json
+++ b/source/behavior/entities/1.13.0/events.json
@@ -49,13 +49,13 @@
             "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" },
-              "filters": { "$ref": "./filters.json" }
+              "filters": { "$ref": "./../filters/filters.json" }
             }
           },
           "description": "A series of filters and components to be added",
           "title": "Sequences"
         },
-        "filters": { "$ref": "./filters.json" },
+        "filters": { "$ref": "./../filters/filters.json" },
         "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       }
     }
diff --git a/source/behavior/entities/1.13.0/types/entity_types.json b/source/behavior/entities/1.13.0/types/entity_types.json
index 948fd871..baa3bb49 100644
--- a/source/behavior/entities/1.13.0/types/entity_types.json
+++ b/source/behavior/entities/1.13.0/types/entity_types.json
@@ -7,7 +7,7 @@
     "title": "Entity Type",
     "type": "object",
     "properties": {
-      "filters": { "type": "object", "$ref": "../filters.json" },
+      "filters": { "type": "object", "$ref": "../../filters/filters.json" },
       "max_dist": {
         "type": "number",
         "description": "Maximum distance this mob can be away to be a valid choice",
diff --git a/source/behavior/entities/1.13.0/types/trigger.json b/source/behavior/entities/1.13.0/types/trigger.json
index 69e6fc52..dd03a49a 100644
--- a/source/behavior/entities/1.13.0/types/trigger.json
+++ b/source/behavior/entities/1.13.0/types/trigger.json
@@ -6,7 +6,11 @@
   "minProperties": 1,
   "properties": {
     "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
-    "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "Filters" },
+    "filters": {
+      "$ref": "../../filters/filters.json",
+      "description": "The filters to check to determine if the event should be fired",
+      "title": "Filters"
+    },
     "target": { "$ref": "../filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
   },
   "additionalProperties": false
diff --git a/source/behavior/entities/1.14.0/events.json b/source/behavior/entities/1.14.0/events.json
index 0e858535..53b3f368 100644
--- a/source/behavior/entities/1.14.0/events.json
+++ b/source/behavior/entities/1.14.0/events.json
@@ -49,13 +49,13 @@
             "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" },
-              "filters": { "$ref": "./filters.json" }
+              "filters": { "$ref": "./../filters/filters.json" }
             }
           },
           "description": "A series of filters and components to be added",
           "title": "Sequences"
         },
-        "filters": { "$ref": "./filters.json" },
+        "filters": { "$ref": "./../filters/filters.json" },
         "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       }
     }
diff --git a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.drink_potion.json b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.drink_potion.json
index 2def647c..51be8f38 100644
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.drink_potion.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.drink_potion.json
@@ -27,7 +27,7 @@
           },
           "filters": {
             "description": "The filters to use when determining if this potion can be selected.",
-            "$ref": "../filters.json",
+            "$ref": "../../filters/filters.json",
             "title": "Filters"
           }
         },
diff --git a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.go_home.json b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.go_home.json
index 58a46746..da0ae0f6 100644
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.go_home.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.go_home.json
@@ -18,7 +18,7 @@
           "title": "Target",
           "enum": ["baby", "block", "damager", "other", "parent", "player", "self", "target"]
         },
-        "filters": { "$ref": "../filters.json" }
+        "filters": { "$ref": "../../filters/filters.json" }
       }
     }
   },
diff --git a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.knockback_roar.json b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.knockback_roar.json
index 6c7db752..df8a79a8 100644
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.knockback_roar.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.knockback_roar.json
@@ -24,8 +24,8 @@
     "knockback_range": { "type": "integer", "default": 4, "description": "The radius (in blocks) of the knockback effect.", "title": "TODO Title" },
     "knockback_strength": { "type": "integer", "default": 4, "description": "The strength of the knockback.", "title": "TODO Title" },
     "Trigger": { "$ref": "../types/trigger.json", "description": "On_roar_end", "title": "TODO Title" },
-    "knockback_filters": { "$ref": "../filters.json", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
-    "damage_filters": { "$ref": "../filters.json", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+    "knockback_filters": { "$ref": "../../filters/filters.json", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+    "damage_filters": { "$ref": "../../filters/filters.json", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
     "on_roar_end": { "$ref": "../types/event.json", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.nap.json b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.nap.json
index 1378d01a..9a97fa18 100644
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.nap.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.nap.json
@@ -31,7 +31,7 @@
       "description": "The block distance in y that will be checked for mobs that this mob detects",
       "title": "Mob Detect Height"
     },
-    "can_nap_filters": { "$ref": "../filters.json", "description": "UNDOCUMENTATED", "title": "Can Nap Filters" },
-    "wake_mob_exceptions": { "$ref": "../filters.json", "description": "UNDOCUMENTATED", "title": "Wake Mob Exceptions" }
+    "can_nap_filters": { "$ref": "../../filters/filters.json", "description": "UNDOCUMENTATED", "title": "Can Nap Filters" },
+    "wake_mob_exceptions": { "$ref": "../../filters/filters.json", "description": "UNDOCUMENTATED", "title": "Wake Mob Exceptions" }
   }
 }
diff --git a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.nearest_attackable_target.json b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.nearest_attackable_target.json
index 8e32ce4a..a6574a69 100644
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.nearest_attackable_target.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.nearest_attackable_target.json
@@ -10,7 +10,7 @@
       "type": "object",
       "description": "A entity type",
       "properties": {
-        "filters": { "$ref": "../filters.json", "description": "Conditions that make this target a valid type.", "title": "Filters" },
+        "filters": { "$ref": "../../filters/filters.json", "description": "Conditions that make this target a valid type.", "title": "Filters" },
         "max_dist": {
           "type": "number",
           "default": 16,
diff --git a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.send_event.json b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.send_event.json
index dc6093e6..225d1d6c 100644
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.send_event.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.send_event.json
@@ -37,7 +37,7 @@
           "max_activation_range": { "type": "number", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
           "cooldown_time": { "type": "number", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
           "cast_duration": { "type": "number", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
-          "filters": { "$ref": "../filters.json" },
+          "filters": { "$ref": "../../filters/filters.json" },
           "particle_color": { "type": "string", "format": "color-hex", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
           "weight": { "type": "integer", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
           "start_sound_event": { "type": "string", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
diff --git a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.stalk_and_pounce_on_target.json b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.stalk_and_pounce_on_target.json
index f7af4b79..3bad2b54 100644
--- a/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.stalk_and_pounce_on_target.json
+++ b/source/behavior/entities/1.16.0/behaviors/minecraft.behavior.stalk_and_pounce_on_target.json
@@ -57,6 +57,6 @@
       "title": "Stuck Time"
     },
     "leap_dist": { "type": "number", "description": "UNDOCUMENTATED", "title": "Leap Dist" },
-    "stuck_blocks": { "$ref": "../filters.json", "description": "UNDOCUMENTATED", "title": "Stuck Block" }
+    "stuck_blocks": { "$ref": "../../filters/filters.json", "description": "UNDOCUMENTATED", "title": "Stuck Block" }
   }
 }
diff --git a/source/behavior/entities/1.16.0/components/minecraft.angry.json b/source/behavior/entities/1.16.0/components/minecraft.angry.json
index e518b90c..06dde54b 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.angry.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.angry.json
@@ -13,12 +13,12 @@
       "title": "Broadcast Anger"
     },
     "broadcast_filters": {
-      "$ref": "../filters.json",
+      "$ref": "../../filters/filters.json",
       "description": "Conditions that make this entry in the list valid",
       "title": "Broadcast Filters"
     },
     "filters": {
-      "$ref": "../filters.json",
+      "$ref": "../../filters/filters.json",
       "description": "Filter out mob types that it should not attack while angry (other Piglins)",
       "title": "Filters"
     },
diff --git a/source/behavior/entities/1.16.0/components/minecraft.area_attack.json b/source/behavior/entities/1.16.0/components/minecraft.area_attack.json
index 1ce4c877..bca08540 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.area_attack.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.area_attack.json
@@ -17,7 +17,7 @@
       "description": "How close a hostile entity must be to have the damage applied.",
       "title": "Damage Range"
     },
-    "entity_filter": { "$ref": "../filters.json", "description": "Entity_filter", "title": "Filter" },
+    "entity_filter": { "$ref": "../../filters/filters.json", "description": "Entity_filter", "title": "Filter" },
     "cause": { "type": "string", "description": "TODO", "title": "Cause", "$ref": "../../../../general/entity/damage_source.json" }
   }
 }
diff --git a/source/behavior/entities/1.16.0/components/minecraft.breedable.json b/source/behavior/entities/1.16.0/components/minecraft.breedable.json
index a9585bec..cbd4c50c 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.breedable.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.breedable.json
@@ -118,7 +118,11 @@
       "maximum": 1.0,
       "title": "Extra Baby Chance"
     },
-    "love_filters": { "$ref": "../filters.json", "description": "The filters to run when attempting to fall in love.", "title": "Love Filters" },
+    "love_filters": {
+      "$ref": "../../filters/filters.json",
+      "description": "The filters to run when attempting to fall in love.",
+      "title": "Love Filters"
+    },
     "mutation_factor": {
       "type": "object",
       "description": "Determines how likely the babies are to NOT inherit one of their parent's variances. Values are between 0.0 and 1.0, with a higher number meaning more likely to mutate.",
diff --git a/source/behavior/entities/1.16.0/components/minecraft.celebrate_hunt.json b/source/behavior/entities/1.16.0/components/minecraft.celebrate_hunt.json
index a5cc32b9..48b45302 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.celebrate_hunt.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.celebrate_hunt.json
@@ -12,7 +12,7 @@
       "title": "Broadcast"
     },
     "celebration_targets": {
-      "$ref": "../filters.json",
+      "$ref": "../../filters/filters.json",
       "description": "The list of conditions that target of hunt must satisfy to initiate celebration.",
       "title": "Celeberation Targets"
     },
diff --git a/source/behavior/entities/1.16.0/components/minecraft.damage_sensor.json b/source/behavior/entities/1.16.0/components/minecraft.damage_sensor.json
index 0c081b24..d11d3835 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.damage_sensor.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.damage_sensor.json
@@ -32,7 +32,7 @@
           "description": "Specifies filters for entity definitions and events.",
           "title": "On Damage",
           "properties": {
-            "filters": { "$ref": "../filters.json" },
+            "filters": { "$ref": "../../filters/filters.json" },
             "event": { "type": "string", "pattern": "^.*$", "description": "TODO description: event", "title": "Event" },
             "target": { "$ref": "../filters/types/base_subject.json", "description": "TODO description: target", "title": "Target" }
           },
diff --git a/source/behavior/entities/1.16.0/components/minecraft.despawn.json b/source/behavior/entities/1.16.0/components/minecraft.despawn.json
index 58f91aab..34e1442a 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.despawn.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.despawn.json
@@ -44,7 +44,7 @@
       "title": "Despawn From Simulation Edge"
     },
     "filters": {
-      "$ref": "../filters.json",
+      "$ref": "../../filters/filters.json",
       "description": "The list of conditions that must be satisfied before the Actor is despawned. If a filter is defined then standard despawn rules are ignored.",
       "title": "Filters"
     },
diff --git a/source/behavior/entities/1.16.0/components/minecraft.entity_sensor.json b/source/behavior/entities/1.16.0/components/minecraft.entity_sensor.json
index fdf33e35..369ea0a4 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.entity_sensor.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.entity_sensor.json
@@ -35,7 +35,7 @@
       "description": "The maximum distance another entity can be from this and have the filters checked against it.",
       "title": "Sensor Range"
     },
-    "event_filters": { "$ref": "../filters.json" },
+    "event_filters": { "$ref": "../../filters/filters.json" },
     "event": { "title": "Event", "description": "event", "type": "string" }
   }
 }
diff --git a/source/behavior/entities/1.16.0/components/minecraft.group_size.json b/source/behavior/entities/1.16.0/components/minecraft.group_size.json
index 11bbd429..b6caccff 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.group_size.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.group_size.json
@@ -6,7 +6,7 @@
   "additionalProperties": false,
   "properties": {
     "filters": {
-      "$ref": "../filters.json",
+      "$ref": "../../filters/filters.json",
       "description": "The list of conditions that must be satisfied for other entities to be counted towards group size.",
       "title": "Filters"
     },
diff --git a/source/behavior/entities/1.16.0/components/minecraft.hurt_on_condition.json b/source/behavior/entities/1.16.0/components/minecraft.hurt_on_condition.json
index a8703459..f899dbaf 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.hurt_on_condition.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.hurt_on_condition.json
@@ -15,7 +15,7 @@
         "description": "TODO",
         "additionalProperties": false,
         "properties": {
-          "filters": { "$ref": "../filters.json" },
+          "filters": { "$ref": "../../filters/filters.json" },
           "cause": { "type": "string", "title": "Cause", "description": "Damage cause", "$ref": "../../../../general/entity/damage_source.json" },
           "damage_per_tick": { "type": "integer", "title": "Damage Per Tick", "description": "TODO" }
         }
diff --git a/source/behavior/entities/1.16.0/components/minecraft.lookat.json b/source/behavior/entities/1.16.0/components/minecraft.lookat.json
index 37747ddc..e88fa674 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.lookat.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.lookat.json
@@ -12,7 +12,7 @@
       "description": "If true, invulnerable entities (e.g. Players in creative mode) are considered valid targets.",
       "title": "Allow Invulnerable"
     },
-    "filters": { "$ref": "../filters.json", "description": "Defines the entities that can trigger this component", "title": "TODO Title" },
+    "filters": { "$ref": "../../filters/filters.json", "description": "Defines the entities that can trigger this component", "title": "TODO Title" },
     "look_cooldown": {
       "$ref": "../types/range_number_type.json",
       "default": [0.0, 0.0],
diff --git a/source/behavior/entities/1.16.0/components/minecraft.mob_effect.json b/source/behavior/entities/1.16.0/components/minecraft.mob_effect.json
index 7982ec09..df62447a 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.mob_effect.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.mob_effect.json
@@ -18,6 +18,6 @@
       "description": "The mob effect that is applied to entities that enter this entities effect range.",
       "title": "Mob Effect"
     },
-    "entity_filter": { "$ref": "../filters.json", "title": "Entity Filter", "description": "TODO" }
+    "entity_filter": { "$ref": "../../filters/filters.json", "title": "Entity Filter", "description": "TODO" }
   }
 }
diff --git a/source/behavior/entities/1.16.0/components/minecraft.scheduler.json b/source/behavior/entities/1.16.0/components/minecraft.scheduler.json
index 665321c0..4fb9a8ef 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.scheduler.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.scheduler.json
@@ -17,7 +17,7 @@
         "type": "object",
         "description": "UNDOCUMENTATED",
         "title": "UNDOCUMENTATED",
-        "properties": { "filters": { "$ref": "../filters.json" }, "event": { "$ref": "../types/event.json" } }
+        "properties": { "filters": { "$ref": "../../filters/filters.json" }, "event": { "$ref": "../types/event.json" } }
       }
     }
   }
diff --git a/source/behavior/entities/1.16.0/components/minecraft.spawn_entity.json b/source/behavior/entities/1.16.0/components/minecraft.spawn_entity.json
index c1412b7a..83fc3208 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.spawn_entity.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.spawn_entity.json
@@ -11,7 +11,10 @@
       "type": "object",
       "title": "Entity Spawn",
       "properties": {
-        "filters": { "description": "If present, the specified entity will only spawn if the filter evaluates to true", "$ref": "../filters.json" },
+        "filters": {
+          "description": "If present, the specified entity will only spawn if the filter evaluates to true",
+          "$ref": "../../filters/filters.json"
+        },
         "max_wait_time": {
           "type": "integer",
           "default": 600,
diff --git a/source/behavior/entities/1.16.0/components/minecraft.trail.json b/source/behavior/entities/1.16.0/components/minecraft.trail.json
index 7504e360..33e281bd 100644
--- a/source/behavior/entities/1.16.0/components/minecraft.trail.json
+++ b/source/behavior/entities/1.16.0/components/minecraft.trail.json
@@ -13,7 +13,7 @@
       "title": "Block Type"
     },
     "spawn_filter": {
-      "$ref": "../filters.json",
+      "$ref": "../../filters/filters.json",
       "description": "One or more conditions that must be met in order to cause the chosen block type to spawn.",
       "title": "Spawn Filter"
     },
diff --git a/source/behavior/entities/1.16.0/events.json b/source/behavior/entities/1.16.0/events.json
index 765260db..8fa3ee72 100644
--- a/source/behavior/entities/1.16.0/events.json
+++ b/source/behavior/entities/1.16.0/events.json
@@ -37,7 +37,7 @@
       "type": "object",
       "properties": {
         "add": { "title": "Add", "$ref": "#/definitions/addremove", "description": "The components groups to be added to this entity" },
-        "filters": { "$ref": "./filters.json" },
+        "filters": { "$ref": "./../filters/filters.json" },
         "randomize": { "type": "array", "$ref": "#/definitions/randomize" },
         "remove": {
           "title": "Remove",
diff --git a/source/behavior/entities/1.16.0/types/entity_types.json b/source/behavior/entities/1.16.0/types/entity_types.json
index 56286347..7f6b7571 100644
--- a/source/behavior/entities/1.16.0/types/entity_types.json
+++ b/source/behavior/entities/1.16.0/types/entity_types.json
@@ -7,7 +7,7 @@
     "title": "Entity Type",
     "type": "object",
     "properties": {
-      "filters": { "type": "object", "$ref": "../filters.json" },
+      "filters": { "type": "object", "$ref": "../../filters/filters.json" },
       "max_dist": {
         "type": "number",
         "description": "Maximum distance this mob can be away to be a valid choice",
diff --git a/source/behavior/entities/1.16.0/types/trigger.json b/source/behavior/entities/1.16.0/types/trigger.json
index ec5c8b75..49db5458 100644
--- a/source/behavior/entities/1.16.0/types/trigger.json
+++ b/source/behavior/entities/1.16.0/types/trigger.json
@@ -5,7 +5,11 @@
   "description": "Trigger to fire for 1.16.0",
   "properties": {
     "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
-    "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "TODO Title" },
+    "filters": {
+      "$ref": "../../filters/filters.json",
+      "description": "The filters to check to determine if the event should be fired",
+      "title": "TODO Title"
+    },
     "target": { "$ref": "../filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
   },
   "additionalProperties": false
diff --git a/source/behavior/entities/1.16.100/events.json b/source/behavior/entities/1.16.100/events.json
index ecac4edb..95d47098 100644
--- a/source/behavior/entities/1.16.100/events.json
+++ b/source/behavior/entities/1.16.100/events.json
@@ -37,7 +37,7 @@
       "type": "object",
       "properties": {
         "add": { "title": "Add", "$ref": "#/definitions/addremove", "description": "The components groups to be added to this entity" },
-        "filters": { "$ref": "./filters.json" },
+        "filters": { "$ref": "./../filters/filters.json" },
         "randomize": { "type": "array", "$ref": "#/definitions/randomize" },
         "remove": {
           "title": "Remove",
diff --git a/source/behavior/entities/1.16.100/types/entity_types.json b/source/behavior/entities/1.16.100/types/entity_types.json
index bcd61e77..d8bcb66f 100644
--- a/source/behavior/entities/1.16.100/types/entity_types.json
+++ b/source/behavior/entities/1.16.100/types/entity_types.json
@@ -7,7 +7,7 @@
     "title": "Entity Type",
     "type": "object",
     "properties": {
-      "filters": { "type": "object", "$ref": "../filters.json" },
+      "filters": { "type": "object", "$ref": "../../filters/filters.json" },
       "max_dist": {
         "type": "number",
         "description": "Maximum distance this mob can be away to be a valid choice",
diff --git a/source/behavior/entities/1.16.100/types/trigger.json b/source/behavior/entities/1.16.100/types/trigger.json
index 172dc33f..1acc1756 100644
--- a/source/behavior/entities/1.16.100/types/trigger.json
+++ b/source/behavior/entities/1.16.100/types/trigger.json
@@ -5,7 +5,11 @@
   "description": "Trigger to fire for 1.16.100",
   "properties": {
     "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
-    "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "TODO Title" },
+    "filters": {
+      "$ref": "../../filters/filters.json",
+      "description": "The filters to check to determine if the event should be fired",
+      "title": "TODO Title"
+    },
     "target": { "$ref": "../filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
   },
   "additionalProperties": false
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json
index 28d59e12..e04c7adf 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json
@@ -27,7 +27,7 @@
           },
           "filters": {
             "description": "The filters to use when determining if this potion can be selected.",
-            "$ref": "../filters.json",
+            "$ref": "../../filters/filters.json",
             "title": "Filters"
           }
         },
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.look_at_entity.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.look_at_entity.json
index a840dbc4..fc28a89b 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.look_at_entity.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.look_at_entity.json
@@ -39,7 +39,7 @@
     },
     "filters": {
       "description": "Filter to determine the conditions for this mob to look at the entity",
-      "$ref": "../filters.json",
+      "$ref": "../../filters/filters.json",
       "title": "Filters"
     }
   }
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.summon_entity.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.summon_entity.json
index 60ef52d0..0dea4e91 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.summon_entity.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.summon_entity.json
@@ -21,7 +21,7 @@
             "default": true,
             "description": "If true, the mob will do the casting animations and render spell particles"
           },
-          "filters": { "$ref": "../filters.json" },
+          "filters": { "$ref": "../../filters/filters.json" },
           "max_activation_range": {
             "type": "number",
             "default": -1,
diff --git a/source/behavior/entities/1.8.0/components/minecraft.angry.json b/source/behavior/entities/1.8.0/components/minecraft.angry.json
index f3f740a5..e88ae455 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.angry.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.angry.json
@@ -13,7 +13,7 @@
       "title": "Broadcast Anger"
     },
     "broadcast_filters": {
-      "$ref": "../filters.json",
+      "$ref": "../../filters/filters.json",
       "description": "Conditions that make this entry in the list valid",
       "title": "Broadcast Filters"
     },
diff --git a/source/behavior/entities/1.8.0/components/minecraft.area_attack.json b/source/behavior/entities/1.8.0/components/minecraft.area_attack.json
index 14d2d13d..d374f5e4 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.area_attack.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.area_attack.json
@@ -17,7 +17,7 @@
       "description": "How close a hostile entity must be to have the damage applied.",
       "title": "Damage Range"
     },
-    "entity_filter": { "$ref": "../filters.json", "description": "Entity_filter", "title": "Filter" },
+    "entity_filter": { "$ref": "../../filters/filters.json", "description": "Entity_filter", "title": "Filter" },
     "cause": { "type": "string", "description": "TODO", "title": "Cause", "$ref": "../../../../general/entity/damage_source.json" }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.breedable.json b/source/behavior/entities/1.8.0/components/minecraft.breedable.json
index 9819a2bf..6efb61e3 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.breedable.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.breedable.json
@@ -117,7 +117,11 @@
       "default": true,
       "title": "Inherit Tamed"
     },
-    "love_filters": { "$ref": "../filters.json", "description": "The filters to run when attempting to fall in love.", "title": "Love Filters" },
+    "love_filters": {
+      "$ref": "../../filters/filters.json",
+      "description": "The filters to run when attempting to fall in love.",
+      "title": "Love Filters"
+    },
     "mutation_factor": {
       "type": "object",
       "description": "Determines how likely the babies are to NOT inherit one of their parent's variances. Values are between 0.0 and 1.0, with a higher number meaning more likely to mutate.",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.celebrate_hunt.json b/source/behavior/entities/1.8.0/components/minecraft.celebrate_hunt.json
index 21841605..d2bfc85d 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.celebrate_hunt.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.celebrate_hunt.json
@@ -12,7 +12,7 @@
       "title": "Broadcast"
     },
     "celeberation_targets": {
-      "$ref": "../filters.json",
+      "$ref": "../../filters/filters.json",
       "description": "The list of conditions that target of hunt must satisfy to initiate celebration.",
       "title": "Celeberation Targets"
     },
diff --git a/source/behavior/entities/1.8.0/components/minecraft.conditional_bandwidth_optimization.json b/source/behavior/entities/1.8.0/components/minecraft.conditional_bandwidth_optimization.json
index f2d194ed..67499393 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.conditional_bandwidth_optimization.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.conditional_bandwidth_optimization.json
@@ -33,7 +33,7 @@
             "title": "Conditional Values",
             "description": "Conditions that must be met for these optimization values to be used.",
             "type": "array",
-            "items": { "$ref": "../filters.json" }
+            "items": { "$ref": "../../filters/filters.json" }
           }
         }
       }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.damage_sensor.json b/source/behavior/entities/1.8.0/components/minecraft.damage_sensor.json
index b58c6a53..fe5e0901 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.damage_sensor.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.damage_sensor.json
@@ -26,7 +26,7 @@
           "additionalProperties": false,
           "type": "object",
           "properties": {
-            "filters": { "$ref": "../filters.json" },
+            "filters": { "$ref": "../../filters/filters.json" },
             "event": { "type": "string", "pattern": "^.*$", "description": "TODO description: event", "title": "Event" },
             "target": { "$ref": "../filters/types/base_subject.json", "description": "TODO description: target", "title": "Target" }
           },
diff --git a/source/behavior/entities/1.8.0/components/minecraft.despawn.json b/source/behavior/entities/1.8.0/components/minecraft.despawn.json
index 88c5551a..46075095 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.despawn.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.despawn.json
@@ -7,7 +7,7 @@
   "required": [],
   "properties": {
     "filters": {
-      "$ref": "../filters.json",
+      "$ref": "../../filters/filters.json",
       "description": "The list of conditions that must be satisfied before the Actor is despawned",
       "title": "Filters"
     },
diff --git a/source/behavior/entities/1.8.0/components/minecraft.entity_sensor.json b/source/behavior/entities/1.8.0/components/minecraft.entity_sensor.json
index f11ead65..f168486d 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.entity_sensor.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.entity_sensor.json
@@ -35,7 +35,7 @@
       "description": "The maximum distance another entity can be from this and have the filters checked against it.",
       "title": "Sensor Range"
     },
-    "event_filters": { "$ref": "../filters.json" },
+    "event_filters": { "$ref": "../../filters/filters.json" },
     "event": { "title": "Event", "description": "event", "type": "string" }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.environment_sensor.json b/source/behavior/entities/1.8.0/components/minecraft.environment_sensor.json
index 762ea932..7c856c77 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.environment_sensor.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.environment_sensor.json
@@ -10,7 +10,7 @@
       "description": "TODO description: on environement",
       "title": "On Environement",
       "properties": {
-        "filters": { "$ref": "../filters.json", "description": "The filters to evualate for this environment sensor", "title": "Filters" },
+        "filters": { "$ref": "../../filters/filters.json", "description": "The filters to evualate for this environment sensor", "title": "Filters" },
         "event": { "type": "string", "pattern": "^.+$", "description": "The event to trigger if the filters are true", "title": "Event" },
         "target": { "description": "The target of the event", "$ref": "../filters/types/base_subject.json" }
       }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.group_size.json b/source/behavior/entities/1.8.0/components/minecraft.group_size.json
index 503d6bbf..b27fef90 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.group_size.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.group_size.json
@@ -6,7 +6,7 @@
   "additionalProperties": false,
   "properties": {
     "filters": {
-      "$ref": "../filters.json",
+      "$ref": "../../filters/filters.json",
       "description": "The list of conditions that must be satisfied for other entities to be counted towards group size.",
       "title": "Filters"
     },
diff --git a/source/behavior/entities/1.8.0/components/minecraft.healable.json b/source/behavior/entities/1.8.0/components/minecraft.healable.json
index 5df63ebc..1cd2dba4 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.healable.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.healable.json
@@ -6,7 +6,11 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "filters": { "$ref": "../filters.json", "description": "The filter group that defines the conditions for this trigger", "title": "Filters" },
+    "filters": {
+      "$ref": "../../filters/filters.json",
+      "description": "The filter group that defines the conditions for this trigger",
+      "title": "Filters"
+    },
     "force_use": {
       "type": "boolean",
       "default": false,
@@ -20,7 +24,7 @@
         "type": "object",
         "properties": {
           "filters": {
-            "$ref": "../filters.json",
+            "$ref": "../../filters/filters.json",
             "description": "The filter group that defines the conditions for using this item to heal the entity"
           },
           "heal_amount": { "type": "integer", "default": 1, "description": "The amount of health this entity gains when fed this item" },
diff --git a/source/behavior/entities/1.8.0/components/minecraft.hurt_on_condition.json b/source/behavior/entities/1.8.0/components/minecraft.hurt_on_condition.json
index 1fed0edb..92faa7b2 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.hurt_on_condition.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.hurt_on_condition.json
@@ -15,7 +15,7 @@
         "description": "TODO",
         "additionalProperties": false,
         "properties": {
-          "filters": { "$ref": "../filters.json" },
+          "filters": { "$ref": "../../filters/filters.json" },
           "cause": { "type": "string", "title": "Cause", "description": "Damage cause", "$ref": "../../../../general/entity/damage_source.json" },
           "damage_per_tick": { "type": "integer", "title": "Damage Per Tick", "description": "TODO" }
         }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.lookat.json b/source/behavior/entities/1.8.0/components/minecraft.lookat.json
index d30a3cbc..16cd58cb 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.lookat.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.lookat.json
@@ -6,7 +6,7 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "filters": { "$ref": "../filters.json", "description": "Defines the entities that can trigger this component", "title": "TODO Title" },
+    "filters": { "$ref": "../../filters/filters.json", "description": "Defines the entities that can trigger this component", "title": "TODO Title" },
     "look_cooldown": {
       "$ref": "../types/range_number_type.json",
       "default": [0.0, 0.0],
diff --git a/source/behavior/entities/1.8.0/components/minecraft.mob_effect.json b/source/behavior/entities/1.8.0/components/minecraft.mob_effect.json
index b169e64a..0e9fcbbc 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.mob_effect.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.mob_effect.json
@@ -18,6 +18,6 @@
       "description": "The mob effect that is applied to entities that enter this entities effect range.",
       "title": "Mob Effect"
     },
-    "entity_filter": { "$ref": "../filters.json", "title": "Entity Filter", "description": "TODO" }
+    "entity_filter": { "$ref": "../../filters/filters.json", "title": "Entity Filter", "description": "TODO" }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.on_death.json b/source/behavior/entities/1.8.0/components/minecraft.on_death.json
index b439891f..d2aa5b3c 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.on_death.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.on_death.json
@@ -7,7 +7,7 @@
   "required": [],
   "properties": {
     "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "filters": { "$ref": "../../filters/filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
     "target": {
       "type": "string",
       "$ref": "../filters/types/base_subject.json",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.on_friendly_anger.json b/source/behavior/entities/1.8.0/components/minecraft.on_friendly_anger.json
index 66074a0f..75126766 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.on_friendly_anger.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.on_friendly_anger.json
@@ -7,7 +7,7 @@
   "required": [],
   "properties": {
     "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "filters": { "$ref": "../../filters/filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
     "target": {
       "type": "string",
       "$ref": "../filters/types/base_subject.json",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.on_hurt.json b/source/behavior/entities/1.8.0/components/minecraft.on_hurt.json
index 5dc65a22..6d2f4e4a 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.on_hurt.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.on_hurt.json
@@ -7,7 +7,7 @@
   "required": [],
   "properties": {
     "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "filters": { "$ref": "../../filters/filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
     "target": {
       "type": "string",
       "$ref": "../filters/types/base_subject.json",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.on_hurt_by_player.json b/source/behavior/entities/1.8.0/components/minecraft.on_hurt_by_player.json
index c534284a..5a708283 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.on_hurt_by_player.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.on_hurt_by_player.json
@@ -7,7 +7,7 @@
   "required": [],
   "properties": {
     "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "filters": { "$ref": "../../filters/filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
     "target": {
       "type": "string",
       "$ref": "../filters/types/base_subject.json",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.on_ignite.json b/source/behavior/entities/1.8.0/components/minecraft.on_ignite.json
index 65619a8e..d733cc49 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.on_ignite.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.on_ignite.json
@@ -7,7 +7,7 @@
   "required": [],
   "properties": {
     "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "filters": { "$ref": "../../filters/filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
     "target": {
       "type": "string",
       "$ref": "../filters/types/base_subject.json",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.on_start_landing.json b/source/behavior/entities/1.8.0/components/minecraft.on_start_landing.json
index 532a7f77..a9287168 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.on_start_landing.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.on_start_landing.json
@@ -7,7 +7,7 @@
   "required": [],
   "properties": {
     "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "filters": { "$ref": "../../filters/filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
     "target": {
       "type": "string",
       "$ref": "../filters/types/base_subject.json",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.on_start_takeoff.json b/source/behavior/entities/1.8.0/components/minecraft.on_start_takeoff.json
index 5996296e..52b83bd3 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.on_start_takeoff.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.on_start_takeoff.json
@@ -7,7 +7,7 @@
   "required": [],
   "properties": {
     "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "filters": { "$ref": "../../filters/filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
     "target": {
       "type": "string",
       "$ref": "../filters/types/base_subject.json",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.on_target_acquired.json b/source/behavior/entities/1.8.0/components/minecraft.on_target_acquired.json
index ae6c2cb2..ac8a5d56 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.on_target_acquired.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.on_target_acquired.json
@@ -7,7 +7,7 @@
   "required": [],
   "properties": {
     "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "filters": { "$ref": "../../filters/filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
     "target": {
       "type": "string",
       "$ref": "../filters/types/base_subject.json",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.on_target_escape.json b/source/behavior/entities/1.8.0/components/minecraft.on_target_escape.json
index 550aecb9..37efce51 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.on_target_escape.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.on_target_escape.json
@@ -7,7 +7,7 @@
   "required": [],
   "properties": {
     "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "filters": { "$ref": "../../filters/filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
     "target": {
       "type": "string",
       "$ref": "../filters/types/base_subject.json",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.on_wake_with_owner.json b/source/behavior/entities/1.8.0/components/minecraft.on_wake_with_owner.json
index 1f12c748..3d77082b 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.on_wake_with_owner.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.on_wake_with_owner.json
@@ -7,7 +7,7 @@
   "required": [],
   "properties": {
     "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "filters": { "$ref": "../../filters/filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
     "target": {
       "type": "string",
       "$ref": "../filters/types/base_subject.json",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.projectile.json b/source/behavior/entities/1.8.0/components/minecraft.projectile.json
index 89322260..e8e807ec 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.projectile.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.projectile.json
@@ -15,7 +15,11 @@
       "title": "TODO Title"
     },
     "destroyOnHurt": { "type": "boolean", "default": false, "description": "If true, this entity will be destroyed when hit", "title": "TODO Title" },
-    "filter": { "$ref": "../filters.json", "description": "Entity Definitions defined here can't be hurt by the projectile", "title": "TODO Title" },
+    "filter": {
+      "$ref": "../../filters/filters.json",
+      "description": "Entity Definitions defined here can't be hurt by the projectile",
+      "title": "TODO Title"
+    },
     "fireAffectedByGriefing": {
       "type": "boolean",
       "default": false,
diff --git a/source/behavior/entities/1.8.0/components/minecraft.spawn_entity.json b/source/behavior/entities/1.8.0/components/minecraft.spawn_entity.json
index 86f83e67..a856ca2f 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.spawn_entity.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.spawn_entity.json
@@ -51,7 +51,7 @@
     },
     "filters": {
       "description": "If present, the specified entity will only spawn if the filter evaluates to true",
-      "$ref": "../filters.json",
+      "$ref": "../../filters/filters.json",
       "title": "TODO Title"
     },
     "single_use": {
diff --git a/source/behavior/entities/1.8.0/components/minecraft.trail.json b/source/behavior/entities/1.8.0/components/minecraft.trail.json
index bd88eda4..7e087001 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.trail.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.trail.json
@@ -13,7 +13,7 @@
       "title": "Block Type"
     },
     "spawn_filter": {
-      "$ref": "../filters.json",
+      "$ref": "../../filters/filters.json",
       "description": "One or more conditions that must be met in order to cause the chosen block type to spawn.",
       "title": "Spawn Filter"
     },
diff --git a/source/behavior/entities/1.8.0/events.json b/source/behavior/entities/1.8.0/events.json
index 80ab2d22..a84926cb 100644
--- a/source/behavior/entities/1.8.0/events.json
+++ b/source/behavior/entities/1.8.0/events.json
@@ -49,13 +49,13 @@
             "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" },
-              "filters": { "$ref": "./filters.json" }
+              "filters": { "$ref": "./../filters/filters.json" }
             }
           },
           "description": "A series of filters and components to be added",
           "title": "Sequences"
         },
-        "filters": { "$ref": "./filters.json" },
+        "filters": { "$ref": "./../filters/filters.json" },
         "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       }
     }
diff --git a/source/behavior/entities/1.8.0/types/entity_types.json b/source/behavior/entities/1.8.0/types/entity_types.json
index 1dfd629f..f720fbbf 100644
--- a/source/behavior/entities/1.8.0/types/entity_types.json
+++ b/source/behavior/entities/1.8.0/types/entity_types.json
@@ -7,7 +7,7 @@
       "title": "Entity Type",
       "type": "object",
       "properties": {
-        "filters": { "type": "object", "$ref": "../filters.json" },
+        "filters": { "type": "object", "$ref": "../../filters/filters.json" },
         "max_dist": {
           "type": "number",
           "description": "Maximum distance this mob can be away to be a valid choice",
diff --git a/source/behavior/entities/1.8.0/types/trigger.json b/source/behavior/entities/1.8.0/types/trigger.json
index a515a531..1c375eae 100644
--- a/source/behavior/entities/1.8.0/types/trigger.json
+++ b/source/behavior/entities/1.8.0/types/trigger.json
@@ -6,7 +6,11 @@
   "minProperties": 1,
   "properties": {
     "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
-    "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "TODO Title" },
+    "filters": {
+      "$ref": "../../filters/filters.json",
+      "description": "The filters to check to determine if the event should be fired",
+      "title": "TODO Title"
+    },
     "target": { "$ref": "../filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
   },
   "additionalProperties": false