diff --git a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_badlands.json b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_badlands.json
similarity index 80%
rename from src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_badlands.json
rename to src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_badlands.json
index 2a6daef861..3292e64243 100644
--- a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_badlands.json
+++ b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_badlands.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_badlands",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",
diff --git a/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_bamboo.json b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_bamboo.json
new file mode 100644
index 0000000000..96525e9750
--- /dev/null
+++ b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_bamboo.json
@@ -0,0 +1,13 @@
+{
+  "target_structure": "repurposed_structures:village_bamboo",
+  "pieces_spawn_counts": [
+    {
+      "nbt_piece_name": "vampirism:village/totem",
+      "never_spawn_more_than_this_many": 1
+    },
+    {
+      "nbt_piece_name": "vampirism:village/bamboo/houses/hunter_trainer",
+      "never_spawn_more_than_this_many": 1
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_birch.json b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_birch.json
similarity index 81%
rename from src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_birch.json
rename to src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_birch.json
index 2a6daef861..fb50e9d3eb 100644
--- a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_birch.json
+++ b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_birch.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_birch",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",
diff --git a/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_cherry.json b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_cherry.json
new file mode 100644
index 0000000000..1866e379a6
--- /dev/null
+++ b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_cherry.json
@@ -0,0 +1,13 @@
+{
+  "target_structure": "repurposed_structures:village_cherry",
+  "pieces_spawn_counts": [
+    {
+      "nbt_piece_name": "vampirism:village/totem",
+      "never_spawn_more_than_this_many": 1
+    },
+    {
+      "nbt_piece_name": "vampirism:village/cherry/houses/hunter_trainer",
+      "never_spawn_more_than_this_many": 1
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_crimson.json b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_crimson.json
similarity index 81%
rename from src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_crimson.json
rename to src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_crimson.json
index 8af2ec1e34..eec9942be8 100644
--- a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_crimson.json
+++ b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_crimson.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_crimson",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",
diff --git a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_dark_forest.json b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_dark_forest.json
similarity index 80%
rename from src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_dark_forest.json
rename to src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_dark_forest.json
index 44bd163399..2fb6363314 100644
--- a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_dark_forest.json
+++ b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_dark_forest.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_dark_forest",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",
diff --git a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_giant_taiga.json b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_giant_taiga.json
similarity index 80%
rename from src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_giant_taiga.json
rename to src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_giant_taiga.json
index 7c49e5f4db..8a6ef22893 100644
--- a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_giant_taiga.json
+++ b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_giant_taiga.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_giant_taiga",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",
diff --git a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_jungle.json b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_jungle.json
similarity index 81%
rename from src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_jungle.json
rename to src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_jungle.json
index 32c402f832..83c33be868 100644
--- a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_jungle.json
+++ b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_jungle.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_jungle",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",
diff --git a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_mountains.json b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_mountains.json
similarity index 80%
rename from src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_mountains.json
rename to src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_mountains.json
index 25bb66a781..3a3e04f481 100644
--- a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_mountains.json
+++ b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_mountains.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_mountains",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",
diff --git a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_oak.json b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_oak.json
similarity index 81%
rename from src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_oak.json
rename to src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_oak.json
index 49a27d58f8..8fa9abed2b 100644
--- a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_oak.json
+++ b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_oak.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_oak",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",
diff --git a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_swamp.json b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_swamp.json
similarity index 81%
rename from src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_swamp.json
rename to src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_swamp.json
index 44df82b8e3..e391f6a0a7 100644
--- a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_swamp.json
+++ b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_swamp.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_swamp",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",
diff --git a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_warped.json b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_warped.json
similarity index 81%
rename from src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_warped.json
rename to src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_warped.json
index e71f73e2db..e559448cdc 100644
--- a/src/main/resources/data/repurposed_structures/rs_pieces_spawn_counts_additions/village_warped.json
+++ b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_warped.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_warped",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",
diff --git a/src/main/resources/data/repurposed_structures/pool_additions/villages/badlands/houses.json b/src/main/resources/data/vampirism/rs_pool_additions/villages/badlands/houses.json
similarity index 89%
rename from src/main/resources/data/repurposed_structures/pool_additions/villages/badlands/houses.json
rename to src/main/resources/data/vampirism/rs_pool_additions/villages/badlands/houses.json
index 1da262ba8d..3ea702b8ec 100644
--- a/src/main/resources/data/repurposed_structures/pool_additions/villages/badlands/houses.json
+++ b/src/main/resources/data/vampirism/rs_pool_additions/villages/badlands/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/badlands/houses",
+  "target_pool": "repurposed_structures:villages/badlands/houses",
   "fallback": "repurposed_structures:villages/badlands/terminators",
   "elements": [
     {
diff --git a/src/main/resources/data/vampirism/rs_pool_additions/villages/bamboo/houses.json b/src/main/resources/data/vampirism/rs_pool_additions/villages/bamboo/houses.json
new file mode 100644
index 0000000000..e0000ff2c9
--- /dev/null
+++ b/src/main/resources/data/vampirism/rs_pool_additions/villages/bamboo/houses.json
@@ -0,0 +1,24 @@
+{
+  "target_pool": "repurposed_structures:villages/bamboo/houses",
+  "fallback": "repurposed_structures:villages/bamboo/terminators",
+  "elements": [
+    {
+      "weight": 400,
+      "element": {
+        "location": "vampirism:village/bamboo/houses/hunter_trainer",
+        "processors": "minecraft:empty",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 20,
+      "element": {
+        "location": "vampirism:village/totem",
+        "processors": "minecraft:empty",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    }
+  ]
+}
diff --git a/src/main/resources/data/repurposed_structures/pool_additions/villages/birch/houses.json b/src/main/resources/data/vampirism/rs_pool_additions/villages/birch/houses.json
similarity index 90%
rename from src/main/resources/data/repurposed_structures/pool_additions/villages/birch/houses.json
rename to src/main/resources/data/vampirism/rs_pool_additions/villages/birch/houses.json
index 83fef227a1..99291b7f28 100644
--- a/src/main/resources/data/repurposed_structures/pool_additions/villages/birch/houses.json
+++ b/src/main/resources/data/vampirism/rs_pool_additions/villages/birch/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/birch/houses",
+  "target_pool": "repurposed_structures:villages/birch/houses",
   "fallback": "repurposed_structures:villages/birch/terminators",
   "elements": [
     {
diff --git a/src/main/resources/data/vampirism/rs_pool_additions/villages/cherry/houses.json b/src/main/resources/data/vampirism/rs_pool_additions/villages/cherry/houses.json
new file mode 100644
index 0000000000..4f39ba0022
--- /dev/null
+++ b/src/main/resources/data/vampirism/rs_pool_additions/villages/cherry/houses.json
@@ -0,0 +1,24 @@
+{
+  "target_pool": "repurposed_structures:villages/cherry/houses",
+  "fallback": "repurposed_structures:villages/cherry/terminators",
+  "elements": [
+    {
+      "weight": 400,
+      "element": {
+        "location": "vampirism:village/cherry/houses/hunter_trainer",
+        "processors": "minecraft:empty",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 20,
+      "element": {
+        "location": "vampirism:village/totem",
+        "processors": "minecraft:empty",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    }
+  ]
+}
diff --git a/src/main/resources/data/repurposed_structures/pool_additions/villages/crimson/houses.json b/src/main/resources/data/vampirism/rs_pool_additions/villages/crimson/houses.json
similarity index 84%
rename from src/main/resources/data/repurposed_structures/pool_additions/villages/crimson/houses.json
rename to src/main/resources/data/vampirism/rs_pool_additions/villages/crimson/houses.json
index 739a746fd3..5ba6350ec7 100644
--- a/src/main/resources/data/repurposed_structures/pool_additions/villages/crimson/houses.json
+++ b/src/main/resources/data/vampirism/rs_pool_additions/villages/crimson/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/crimson/houses",
+  "target_pool": "repurposed_structures:villages/crimson/houses",
   "fallback": "repurposed_structures:villages/crimson/terminators",
   "elements": [
     {
diff --git a/src/main/resources/data/repurposed_structures/pool_additions/villages/dark_forest/houses.json b/src/main/resources/data/vampirism/rs_pool_additions/villages/dark_forest/houses.json
similarity index 89%
rename from src/main/resources/data/repurposed_structures/pool_additions/villages/dark_forest/houses.json
rename to src/main/resources/data/vampirism/rs_pool_additions/villages/dark_forest/houses.json
index e582c32538..18bbf9ee83 100644
--- a/src/main/resources/data/repurposed_structures/pool_additions/villages/dark_forest/houses.json
+++ b/src/main/resources/data/vampirism/rs_pool_additions/villages/dark_forest/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/dark_forest/houses",
+  "target_pool": "repurposed_structures:villages/dark_forest/houses",
   "fallback": "repurposed_structures:villages/dark_forest/terminators",
   "elements": [
     {
diff --git a/src/main/resources/data/repurposed_structures/pool_additions/villages/giant_taiga/houses.json b/src/main/resources/data/vampirism/rs_pool_additions/villages/giant_taiga/houses.json
similarity index 89%
rename from src/main/resources/data/repurposed_structures/pool_additions/villages/giant_taiga/houses.json
rename to src/main/resources/data/vampirism/rs_pool_additions/villages/giant_taiga/houses.json
index f24cc4e130..4fa2aba6f7 100644
--- a/src/main/resources/data/repurposed_structures/pool_additions/villages/giant_taiga/houses.json
+++ b/src/main/resources/data/vampirism/rs_pool_additions/villages/giant_taiga/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/giant_taiga/houses",
+  "target_pool": "repurposed_structures:villages/giant_taiga/houses",
   "fallback": "repurposed_structures:villages/giant_taiga/terminators",
   "elements": [
     {
diff --git a/src/main/resources/data/repurposed_structures/pool_additions/villages/jungle/houses.json b/src/main/resources/data/vampirism/rs_pool_additions/villages/jungle/houses.json
similarity index 89%
rename from src/main/resources/data/repurposed_structures/pool_additions/villages/jungle/houses.json
rename to src/main/resources/data/vampirism/rs_pool_additions/villages/jungle/houses.json
index 3a7745bfec..e2000ffaf8 100644
--- a/src/main/resources/data/repurposed_structures/pool_additions/villages/jungle/houses.json
+++ b/src/main/resources/data/vampirism/rs_pool_additions/villages/jungle/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/jungle/houses",
+  "target_pool": "repurposed_structures:villages/jungle/houses",
   "fallback": "repurposed_structures:villages/jungle/terminators",
   "elements": [
     {
diff --git a/src/main/resources/data/repurposed_structures/pool_additions/villages/mountains/houses.json b/src/main/resources/data/vampirism/rs_pool_additions/villages/mountains/houses.json
similarity index 89%
rename from src/main/resources/data/repurposed_structures/pool_additions/villages/mountains/houses.json
rename to src/main/resources/data/vampirism/rs_pool_additions/villages/mountains/houses.json
index aa76f61039..58fb83143a 100644
--- a/src/main/resources/data/repurposed_structures/pool_additions/villages/mountains/houses.json
+++ b/src/main/resources/data/vampirism/rs_pool_additions/villages/mountains/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/mountains/houses",
+  "target_pool": "repurposed_structures:villages/mountains/houses",
   "fallback": "repurposed_structures:villages/mountains/terminators",
   "elements": [
     {
diff --git a/src/main/resources/data/repurposed_structures/pool_additions/villages/oak/houses.json b/src/main/resources/data/vampirism/rs_pool_additions/villages/oak/houses.json
similarity index 90%
rename from src/main/resources/data/repurposed_structures/pool_additions/villages/oak/houses.json
rename to src/main/resources/data/vampirism/rs_pool_additions/villages/oak/houses.json
index 885d7eed6e..d13cb92075 100644
--- a/src/main/resources/data/repurposed_structures/pool_additions/villages/oak/houses.json
+++ b/src/main/resources/data/vampirism/rs_pool_additions/villages/oak/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/oak/houses",
+  "target_pool": "repurposed_structures:villages/oak/houses",
   "fallback": "repurposed_structures:villages/oak/terminators",
   "elements": [
     {
diff --git a/src/main/resources/data/repurposed_structures/pool_additions/villages/swamp/houses.json b/src/main/resources/data/vampirism/rs_pool_additions/villages/swamp/houses.json
similarity index 90%
rename from src/main/resources/data/repurposed_structures/pool_additions/villages/swamp/houses.json
rename to src/main/resources/data/vampirism/rs_pool_additions/villages/swamp/houses.json
index 5ea3c2d8f5..57d39b5c29 100644
--- a/src/main/resources/data/repurposed_structures/pool_additions/villages/swamp/houses.json
+++ b/src/main/resources/data/vampirism/rs_pool_additions/villages/swamp/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/swamp/houses",
+  "target_pool": "repurposed_structures:villages/swamp/houses",
   "fallback": "repurposed_structures:villages/swamp/terminators",
   "elements": [
     {
diff --git a/src/main/resources/data/repurposed_structures/pool_additions/villages/warped/houses.json b/src/main/resources/data/vampirism/rs_pool_additions/villages/warped/houses.json
similarity index 84%
rename from src/main/resources/data/repurposed_structures/pool_additions/villages/warped/houses.json
rename to src/main/resources/data/vampirism/rs_pool_additions/villages/warped/houses.json
index 4884e24e72..6a80b7fdce 100644
--- a/src/main/resources/data/repurposed_structures/pool_additions/villages/warped/houses.json
+++ b/src/main/resources/data/vampirism/rs_pool_additions/villages/warped/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/warped/houses",
+  "target_pool": "repurposed_structures:villages/warped/houses",
   "fallback": "repurposed_structures:villages/warped/terminators",
   "elements": [
     {
diff --git a/src/main/resources/data/vampirism/structure/village/bamboo/houses/hunter_trainer.nbt b/src/main/resources/data/vampirism/structure/village/bamboo/houses/hunter_trainer.nbt
new file mode 100644
index 0000000000..a16f4e2150
Binary files /dev/null and b/src/main/resources/data/vampirism/structure/village/bamboo/houses/hunter_trainer.nbt differ
diff --git a/src/main/resources/data/vampirism/structure/village/cherry/houses/hunter_trainer.nbt b/src/main/resources/data/vampirism/structure/village/cherry/houses/hunter_trainer.nbt
new file mode 100644
index 0000000000..564506aad9
Binary files /dev/null and b/src/main/resources/data/vampirism/structure/village/cherry/houses/hunter_trainer.nbt differ
diff --git a/src/main/resources/data/vampirism/structure/village/mountains/houses/hunter_trainer.nbt b/src/main/resources/data/vampirism/structure/village/mountains/houses/hunter_trainer.nbt
index 9765e87b2a..65c4932124 100644
Binary files a/src/main/resources/data/vampirism/structure/village/mountains/houses/hunter_trainer.nbt and b/src/main/resources/data/vampirism/structure/village/mountains/houses/hunter_trainer.nbt differ