diff --git a/init.lua b/init.lua
index c27d69d..4bf9db5 100644
--- a/init.lua
+++ b/init.lua
@@ -53,6 +53,14 @@ minetest.register_node("denseores:large_copper_ore", {	--copper
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("denseores:large_tin_ore", {	--tin
+	description = "Large Tin Ore",
+	tiles ={"default_stone.png^large_tin_ore.png"},
+	groups = {cracky=3},
+	drop = 'default:tin_lump 2',
+	sounds = default.node_sound_stone_defaults(),
+})
+
 minetest.register_node("denseores:large_gold_ore", {	--gold
 	description = "Large Gold Ore",
 	tiles ={"default_stone.png^large_gold_ore.png"},
@@ -83,7 +91,7 @@ minetest.register_node("denseores:large_diamond_ore", {	--diamond
 minetest.register_ore({
     ore_type       = "scatter",
     ore            = "denseores:large_coal_ore",
-    wherein        = "default:stone",
+    wherein        = "default:stone_with_coal",
     clust_scarcity = 14,
     clust_num_ores = 2,
     clust_size     = 2,
@@ -94,7 +102,7 @@ minetest.register_ore({
 minetest.register_ore({
     ore_type       = "scatter",
     ore            = "denseores:large_iron_ore",
-    wherein        = "default:stone",
+    wherein        = "default:stone_with_iron",
     clust_scarcity = 14,
     clust_num_ores = 2,
     clust_size     = 2,
@@ -105,7 +113,7 @@ minetest.register_ore({
 minetest.register_ore({
 	ore_type       = "scatter",
 	ore            = "denseores:large_copper_ore",
-	wherein        = "default:stone",
+	wherein        = "default:stone_with_copper",
 	clust_scarcity = 14,
 	clust_num_ores = 2,
 	clust_size     = 2,
@@ -113,10 +121,21 @@ minetest.register_ore({
 	height_max     = 2,
 })
 
+minetest.register_ore({
+    ore_type       = "scatter",
+    ore            = "denseores:large_tin_ore",
+    wherein        = "default:stone_with_tin",
+    clust_scarcity = 12,
+    clust_num_ores = 2,
+    clust_size     = 2,
+    height_min     = -31000,
+    height_max     = 64,
+})
+
 minetest.register_ore({
 	ore_type       = "scatter",
 	ore            = "denseores:large_gold_ore",
-	wherein        = "default:stone",
+	wherein        = "default:stone_with_gold",
 	clust_scarcity = 14,
 	clust_num_ores = 2,
 	clust_size     = 2,
@@ -127,7 +146,7 @@ minetest.register_ore({
 minetest.register_ore({
 	ore_type       = "scatter",
 	ore            = "denseores:large_mese_ore",
-	wherein        = "default:stone",
+	wherein        = "default:stone_with_mese",
 	clust_scarcity = 14,
 	clust_num_ores = 2,
 	clust_size     = 2,
@@ -138,7 +157,7 @@ minetest.register_ore({
 minetest.register_ore({
 	ore_type       = "scatter",
 	ore            = "denseores:large_diamond_ore",
-	wherein        = "default:stone",
+	wherein        = "default:stone_with_diamond",
 	clust_scarcity = 14,
 	clust_num_ores = 2,
 	clust_size     = 2,
@@ -174,6 +193,14 @@ minetest.register_craft( {
 	}
 })
 
+minetest.register_craft( {
+	type = "shapeless",
+	output = "moreores:tin_lump 2", --tin
+	recipe = {
+		"denseores:large_tin_ore",
+	}
+})
+
 minetest.register_craft( {
 	type = "shapeless",
 	output = "default:gold_lump 2", --gold
diff --git a/mo.lua b/mo.lua
index 784876d..e60895c 100644
--- a/mo.lua
+++ b/mo.lua
@@ -31,14 +31,6 @@ minetest.register_node("denseores:large_mithril_ore", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
-minetest.register_node("denseores:large_tin_ore", {
-	description = "Heavy Tin Ore",
-	tiles ={"default_stone.png^large_tin_ore.png"},
-	groups = {cracky=3},
-	drop = 'moreores:tin_lump 2',
-	sounds = default.node_sound_stone_defaults(),
-})
-
 minetest.register_node("denseores:large_silver_ore", {
 	description = "Heavy Silver Ore",
 	tiles ={"default_stone.png^large_silver_ore.png"},
@@ -62,17 +54,6 @@ minetest.register_ore({
     height_max     = 64,
 })
 
-minetest.register_ore({
-    ore_type       = "scatter",
-    ore            = "denseores:large_tin_ore",
-    wherein        = "moreores:mineral_tin",
-    clust_scarcity = 12,
-    clust_num_ores = 2,
-    clust_size     = 2,
-    height_min     = -31000,
-    height_max     = 64,
-})
-
 minetest.register_ore({
     ore_type       = "scatter",
     ore            = "denseores:large_silver_ore",
@@ -96,14 +77,6 @@ minetest.register_craft( {
 	}
 })
 
-minetest.register_craft( {
-	type = "shapeless",
-	output = "moreores:tin_lump 2", --tin
-	recipe = {
-		"denseores:large_tin_ore",
-	}
-})
-
 minetest.register_craft( {
 	type = "shapeless",
 	output = "moreores:silver_lump 2", --silver