diff --git a/src/main/resources/data/overdrive_that_matters/structures/frigate/back/frigate_back_a.nbt b/src/main/resources/data/overdrive_that_matters/structures/frigate/back/frigate_back_a.nbt
new file mode 100644
index 000000000..42ce92091
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structures/frigate/back/frigate_back_a.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_back_a.nbt b/src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_back_a.nbt
deleted file mode 100644
index 10456c12d..000000000
Binary files a/src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_back_a.nbt and /dev/null differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_front_a.nbt b/src/main/resources/data/overdrive_that_matters/structures/frigate/front/frigate_front_a.nbt
similarity index 51%
rename from src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_front_a.nbt
rename to src/main/resources/data/overdrive_that_matters/structures/frigate/front/frigate_front_a.nbt
index a476448df..df58fe6bf 100644
Binary files a/src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_front_a.nbt and b/src/main/resources/data/overdrive_that_matters/structures/frigate/front/frigate_front_a.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_front_b.nbt b/src/main/resources/data/overdrive_that_matters/structures/frigate/front/frigate_front_b.nbt
similarity index 75%
rename from src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_front_b.nbt
rename to src/main/resources/data/overdrive_that_matters/structures/frigate/front/frigate_front_b.nbt
index 6c7d9935e..c6f2179fb 100644
Binary files a/src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_front_b.nbt and b/src/main/resources/data/overdrive_that_matters/structures/frigate/front/frigate_front_b.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure/frigate.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure/frigate.json
index abb65bcde..f02af2e14 100644
--- a/src/main/resources/data/overdrive_that_matters/worldgen/structure/frigate.json
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure/frigate.json
@@ -20,13 +20,13 @@
           "type": "minecraft:pillager",
           "weight": 1,
           "minCount": 1,
-          "maxCount": 2
+          "maxCount": 1
         }
       ]
     }
   },
   "start_jigsaw_name": "overdrive_that_matters:frigate_anchor",
-  "start_pool": "overdrive_that_matters:frigate",
+  "start_pool": "overdrive_that_matters:frigate/frigate_front",
   "step": "surface_structures",
   "terrain_adaption": "beard_box",
   "use_expansion_hack": false
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/field_research_pod.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/field_research_pod.json
index 6b4bcae06..add9e64e6 100644
--- a/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/field_research_pod.json
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/field_research_pod.json
@@ -11,8 +11,8 @@
   ],
   "placement": {
 	  "type": "minecraft:random_spread",
-	  "spacing": 16,
-	  "separation": 4,
+	  "spacing": 120,
+	  "separation": 1,
 	  "salt": 10387312
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/frigate.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/frigate.json
index 53be838e6..0802c96f9 100644
--- a/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/frigate.json
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/frigate.json
@@ -3,7 +3,7 @@
     "type": "minecraft:random_spread",
     "salt": 20072342,
     "separation": 8,
-    "spacing": 24
+    "spacing":256
   },
   "structures": [
     {
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate.json
deleted file mode 100644
index 36aa822c2..000000000
--- a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "overdrive_that_matters:frigate",
-  "fallback": "minecraft:empty",
-  "elements": [
-    {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:frigate/frigate_front_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:frigate/frigate_front_b",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:frigate/frigate_back_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_back .json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_back .json
new file mode 100644
index 000000000..c17af4e3a
--- /dev/null
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_back .json	
@@ -0,0 +1,15 @@
+{
+  "name": "overdrive_that_matters:frigate_back",
+  "fallback": "minecraft:empty",
+  "elements": [
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/back/frigate_back_a",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_front.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_front.json
new file mode 100644
index 000000000..dc77ce522
--- /dev/null
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_front.json
@@ -0,0 +1,24 @@
+{
+  "name": "overdrive_that_matters:frigate_front",
+  "fallback": "minecraft:empty",
+  "elements": [
+    {
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/front/frigate_front_a",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/front/frigate_front_b",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    }
+  ]
+}
\ No newline at end of file