diff --git a/src/main/resources/assets/techreborn/blockstates/industrial_grinder.json b/src/main/resources/assets/techreborn/blockstates/industrial_grinder.json
new file mode 100644
index 000000000..06b2d3c2b
--- /dev/null
+++ b/src/main/resources/assets/techreborn/blockstates/industrial_grinder.json
@@ -0,0 +1,12 @@
+{
+    "variants": {
+        "facing=north,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_grinder" },
+        "facing=south,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_grinder", "y": 180 },
+        "facing=west,active=false":  { "model": "techreborn:block/machines/tier2_machines/industrial_grinder", "y": 270 },
+        "facing=east,active=false":  { "model": "techreborn:block/machines/tier2_machines/industrial_grinder", "y": 90 },
+        "facing=north,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_grinder_on" },
+        "facing=south,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_grinder_on", "y": 180 },
+        "facing=west,active=true":  { "model": "techreborn:block/machines/tier2_machines/industrial_grinder_on", "y": 270 },
+        "facing=east,active=true":  { "model": "techreborn:block/machines/tier2_machines/industrial_grinder_on", "y": 90 }
+    }
+}
diff --git a/src/main/resources/assets/techreborn/blockstates/industrial_sawmill.json b/src/main/resources/assets/techreborn/blockstates/industrial_sawmill.json
new file mode 100644
index 000000000..07284eff3
--- /dev/null
+++ b/src/main/resources/assets/techreborn/blockstates/industrial_sawmill.json
@@ -0,0 +1,12 @@
+{
+    "variants": {
+        "facing=north,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_sawmill" },
+        "facing=south,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_sawmill", "y": 180 },
+        "facing=west,active=false":  { "model": "techreborn:block/machines/tier2_machines/industrial_sawmill", "y": 270 },
+        "facing=east,active=false":  { "model": "techreborn:block/machines/tier2_machines/industrial_sawmill", "y": 90 },
+        "facing=north,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_sawmill_on" },
+        "facing=south,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_sawmill_on", "y": 180 },
+        "facing=west,active=true":  { "model": "techreborn:block/machines/tier2_machines/industrial_sawmill_on", "y": 270 },
+        "facing=east,active=true":  { "model": "techreborn:block/machines/tier2_machines/industrial_sawmill_on", "y": 90 }
+    }
+}
diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_grinder.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_grinder.json
deleted file mode 100644
index 7d1bc9c80..000000000
--- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_grinder.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "forge_marker": 1,
-  "defaults": {
-    "transform": "forge:default-block",
-    "model": "orientable",
-    "textures": {
-      "particle": "techreborn:blocks/machines/tier2_machines/industrial_grinder_front_off",
-      "down": "techreborn:blocks/machines/tier2_machines/machine_bottom",
-      "west": "techreborn:blocks/machines/tier2_machines/machine_west",
-      "east": "techreborn:blocks/machines/tier2_machines/machine_east",
-      "south": "techreborn:blocks/machines/tier2_machines/machine_back"
-    }
-  },
-  "variants": {
-    "inventory": {
-      "transform": "forge:default-block",
-      "model": "orientable",
-      "textures": {
-        "top": "techreborn:blocks/machines/tier2_machines/industrial_grinder_top_off",
-        "front": "techreborn:blocks/machines/tier2_machines/industrial_grinder_front_off"
-      }
-    },
-    "facing": {
-      "north": {
-      },
-      "east": {
-        "y": 90
-      },
-      "south": {
-        "y": 180
-      },
-      "west": {
-        "y": 270
-      }
-    },
-    "active": {
-      "true": {
-        "textures": {
-          "top": "techreborn:blocks/machines/tier2_machines/industrial_grinder_top_on",
-          "front": "techreborn:blocks/machines/tier2_machines/industrial_grinder_front_on"
-        }
-      },
-      "false": {
-        "textures": {
-          "top": "techreborn:blocks/machines/tier2_machines/industrial_grinder_top_off",
-          "front": "techreborn:blocks/machines/tier2_machines/industrial_grinder_front_off"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_sawmill.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_sawmill.json
deleted file mode 100644
index d3feee82b..000000000
--- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_sawmill.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "forge_marker": 1,
-  "defaults": {
-    "transform": "forge:default-block",
-    "model": "orientable",
-    "textures": {
-      "particle": "techreborn:blocks/machines/tier2_machines/industrial_sawmill_front_off",
-      "top": "techreborn:blocks/machines/tier2_machines/machine_top",
-      "down": "techreborn:blocks/machines/tier2_machines/machine_bottom",
-      "west": "techreborn:blocks/machines/tier2_machines/machine_west",
-      "east": "techreborn:blocks/machines/tier2_machines/machine_east",
-      "south": "techreborn:blocks/machines/tier2_machines/machine_back"
-    }
-  },
-  "variants": {
-    "inventory": {
-      "transform": "forge:default-block",
-      "model": "orientable",
-      "textures": {
-        "front": "techreborn:blocks/machines/tier2_machines/industrial_sawmill_front_off"
-      }
-    },
-    "facing": {
-      "north": {
-      },
-      "east": {
-        "y": 90
-      },
-      "south": {
-        "y": 180
-      },
-      "west": {
-        "y": 270
-      }
-    },
-    "active": {
-      "true": {
-        "textures": {
-          "front": "techreborn:blocks/machines/tier2_machines/industrial_sawmill_front_on"
-        }
-      },
-      "false": {
-        "textures": {
-          "front": "techreborn:blocks/machines/tier2_machines/industrial_sawmill_front_off"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/vacuum_freezer.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/vacuum_freezer.json
deleted file mode 100644
index 45be8aaea..000000000
--- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/vacuum_freezer.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "forge_marker": 1,
-  "defaults": {
-    "transform": "forge:default-block",
-    "model": "orientable",
-    "textures": {
-      "particle": "techreborn:blocks/machines/tier2_machines/vacuum_freezer_front_off",
-      "down": "techreborn:blocks/machines/tier1_machines/machine_bottom",
-      "side": "techreborn:blocks/machines/tier1_machines/machine_side"
-    }
-  },
-  "variants": {
-    "inventory": {
-      "transform": "forge:default-block",
-      "model": "orientable",
-      "textures": {
-        "top": "techreborn:blocks/machines/tier2_machines/vacuum_freezer_top_off",
-        "front": "techreborn:blocks/machines/tier2_machines/vacuum_freezer_front_off"
-      }
-    },
-    "facing": {
-      "north": {
-      },
-      "east": {
-        "y": 90
-      },
-      "south": {
-        "y": 180
-      },
-      "west": {
-        "y": 270
-      }
-    },
-    "active": {
-      "true": {
-        "textures": {
-          "top": "techreborn:blocks/machines/tier2_machines/vacuum_freezer_top_on",
-          "front": "techreborn:blocks/machines/tier2_machines/vacuum_freezer_front_on"
-        }
-      },
-      "false": {
-        "textures": {
-          "top": "techreborn:blocks/machines/tier2_machines/vacuum_freezer_top_off",
-          "front": "techreborn:blocks/machines/tier2_machines/vacuum_freezer_front_off"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/techreborn/blockstates/vacuum_freezer.json b/src/main/resources/assets/techreborn/blockstates/vacuum_freezer.json
new file mode 100644
index 000000000..0e3199ea3
--- /dev/null
+++ b/src/main/resources/assets/techreborn/blockstates/vacuum_freezer.json
@@ -0,0 +1,12 @@
+{
+    "variants": {
+        "facing=north,active=false": { "model": "techreborn:block/machines/tier2_machines/vacuum_freezer" },
+        "facing=south,active=false": { "model": "techreborn:block/machines/tier2_machines/vacuum_freezer", "y": 180 },
+        "facing=west,active=false":  { "model": "techreborn:block/machines/tier2_machines/vacuum_freezer", "y": 270 },
+        "facing=east,active=false":  { "model": "techreborn:block/machines/tier2_machines/vacuum_freezer", "y": 90 },
+        "facing=north,active=true": { "model": "techreborn:block/machines/tier2_machines/vacuum_freezer_on" },
+        "facing=south,active=true": { "model": "techreborn:block/machines/tier2_machines/vacuum_freezer_on", "y": 180 },
+        "facing=west,active=true":  { "model": "techreborn:block/machines/tier2_machines/vacuum_freezer_on", "y": 270 },
+        "facing=east,active=true":  { "model": "techreborn:block/machines/tier2_machines/vacuum_freezer_on", "y": 90 }
+    }
+}
diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_grinder.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_grinder.json
new file mode 100644
index 000000000..86d0266a2
--- /dev/null
+++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_grinder.json
@@ -0,0 +1,11 @@
+{
+	"parent": "minecraft:block/orientable",
+	"textures": {
+		"up": "techreborn:block/machines/tier2_machines/industrial_grinder_top_off",
+		"down": "techreborn:block/machines/tier2_machines/machine_bottom",
+		"west": "techreborn:block/machines/tier2_machines/machine_west",
+		"east": "techreborn:block/machines/tier2_machines/machine_east",
+		"south": "techreborn:block/machines/tier2_machines/machine_back",
+		"front": "techreborn:block/machines/tier2_machines/industrial_grinder_front_off"
+	}
+}
diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_grinder_on.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_grinder_on.json
new file mode 100644
index 000000000..87e1add00
--- /dev/null
+++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_grinder_on.json
@@ -0,0 +1,11 @@
+{
+	"parent": "minecraft:block/orientable",
+	"textures": {
+		"up": "techreborn:block/machines/tier2_machines/industrial_grinder_top_on",
+		"down": "techreborn:block/machines/tier2_machines/machine_bottom",
+		"west": "techreborn:block/machines/tier2_machines/machine_west",
+		"east": "techreborn:block/machines/tier2_machines/machine_east",
+		"south": "techreborn:block/machines/tier2_machines/machine_back",
+		"front": "techreborn:block/machines/tier2_machines/industrial_grinder_front_on"
+	}
+}
diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_sawmill.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_sawmill.json
new file mode 100644
index 000000000..d55c3a8fa
--- /dev/null
+++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_sawmill.json
@@ -0,0 +1,11 @@
+{
+	"parent": "minecraft:block/orientable",
+	"textures": {
+		"up": "techreborn:block/machines/tier2_machines/machine_top",
+		"down": "techreborn:block/machines/tier2_machines/machine_bottom",
+		"west": "techreborn:block/machines/tier2_machines/machine_west",
+		"east": "techreborn:block/machines/tier2_machines/machine_east",
+		"south": "techreborn:block/machines/tier2_machines/machine_back",
+		"front": "techreborn:block/machines/tier2_machines/industrial_sawmill_front_off"
+	}
+}
diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_sawmill_on.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_sawmill_on.json
new file mode 100644
index 000000000..0df09b7f6
--- /dev/null
+++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_sawmill_on.json
@@ -0,0 +1,11 @@
+{
+	"parent": "minecraft:block/orientable",
+	"textures": {
+		"up": "techreborn:block/machines/tier2_machines/machine_top",
+		"down": "techreborn:block/machines/tier2_machines/machine_bottom",
+		"west": "techreborn:block/machines/tier2_machines/machine_west",
+		"east": "techreborn:block/machines/tier2_machines/machine_east",
+		"south": "techreborn:block/machines/tier2_machines/machine_back",
+		"front": "techreborn:block/machines/tier2_machines/industrial_sawmill_front_on"
+	}
+}
diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/vacuum_freezer.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/vacuum_freezer.json
new file mode 100644
index 000000000..6d07b5755
--- /dev/null
+++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/vacuum_freezer.json
@@ -0,0 +1,11 @@
+{
+	"parent": "minecraft:block/orientable",
+	"textures": {
+		"up": "techreborn:block/machines/tier2_machines/vacuum_freezer_top_off",
+		"down": "techreborn:block/machines/tier2_machines/machine_bottom",
+		"west": "techreborn:block/machines/tier2_machines/machine_west",
+		"east": "techreborn:block/machines/tier2_machines/machine_east",
+		"south": "techreborn:block/machines/tier2_machines/machine_back",
+		"front": "techreborn:block/machines/tier2_machines/vacuum_freezer_front_off"
+	}
+}
diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/vacuum_freezer_on.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/vacuum_freezer_on.json
new file mode 100644
index 000000000..2e7e950f2
--- /dev/null
+++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/vacuum_freezer_on.json
@@ -0,0 +1,11 @@
+{
+	"parent": "minecraft:block/orientable",
+	"textures": {
+		"up": "techreborn:block/machines/tier2_machines/vacuum_freezer_top_on",
+		"down": "techreborn:block/machines/tier2_machines/machine_bottom",
+		"west": "techreborn:block/machines/tier2_machines/machine_west",
+		"east": "techreborn:block/machines/tier2_machines/machine_east",
+		"south": "techreborn:block/machines/tier2_machines/machine_back",
+		"front": "techreborn:block/machines/tier2_machines/vacuum_freezer_front_on"
+	}
+}
diff --git a/src/main/resources/assets/techreborn/models/item/industrial_grinder.json b/src/main/resources/assets/techreborn/models/item/industrial_grinder.json
new file mode 100644
index 000000000..60841829b
--- /dev/null
+++ b/src/main/resources/assets/techreborn/models/item/industrial_grinder.json
@@ -0,0 +1,3 @@
+{
+	"parent": "techreborn:block/machines/tier2_machines/industrial_grinder"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/techreborn/models/item/industrial_sawmill.json b/src/main/resources/assets/techreborn/models/item/industrial_sawmill.json
new file mode 100644
index 000000000..45cf34a51
--- /dev/null
+++ b/src/main/resources/assets/techreborn/models/item/industrial_sawmill.json
@@ -0,0 +1,3 @@
+{
+	"parent": "techreborn:block/machines/tier2_machines/industrial_sawmill"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/techreborn/models/item/vacuum_freezer.json b/src/main/resources/assets/techreborn/models/item/vacuum_freezer.json
new file mode 100644
index 000000000..4144f22c1
--- /dev/null
+++ b/src/main/resources/assets/techreborn/models/item/vacuum_freezer.json
@@ -0,0 +1,3 @@
+{
+	"parent": "techreborn:block/machines/tier2_machines/vacuum_freezer"
+}
\ No newline at end of file