diff --git a/custom.lua b/custom.lua
deleted file mode 100644
index 349a97a..0000000
--- a/custom.lua
+++ /dev/null
@@ -1,46 +0,0 @@
--- This mod does not exist, what are you talking about? :D
-
-minetest.register_tool("xenozapper:zapper", {
-	description = "Xeno-Zapper",
-	inventory_image = "zapper.png",
-	wield_image = "zapper.png^[transformR90",
-	range = 3,
-	tool_capabilities = {
-		full_punch_interval = 0.01,
-		max_drop_level=1,
-		damage_groups = {fleshy=2},
-	}
-})
-
-minetest.register_craft({
-	output = "xenozapper:zapper",
-	recipe = {
-		{"mk_items:iron_rod", "", "mk_items:iron_rod"},
-		{"mk_items:iron_plate", "mk_items:power_supply", "mk_items:iron_plate"},
-		{"", "mk_items:iron_frame", ""}
-	}
-})
-
-
-
-minetest.register_tool("xenozapper:basher", {
-	description = "Xeno-Basher",
-	inventory_image = "basher_inventory.png",
-	wield_image = "basher.png",
-	wield_scale = {x=2,y=2,z=1},
-	range = 5,
-	tool_capabilities = {
-		full_punch_interval = 0.1,
-		max_drop_level=1,
-		damage_groups = {fleshy=5},
-	}
-})
-
-minetest.register_craft({
-	output = "xenozapper:basher",
-	recipe = {
-		{"mk_items:steel_rod", "", "mk_items:steel_rod"},
-		{"mk_items:framed_iron_plate", "mk_items:motor", "mk_items:framed_iron_plate"},
-		{"", "xenozapper:zapper", ""}
-	}
-})
\ No newline at end of file
diff --git a/default.lua b/default.lua
deleted file mode 100644
index 0d6c9d4..0000000
--- a/default.lua
+++ /dev/null
@@ -1,44 +0,0 @@
-minetest.register_tool("xenozapper:zapper", {
-	description = "Xeno-Zapper",
-	inventory_image = "zapper.png",
-	wield_image = "zapper.png^[transformR90",
-	range = 3,
-	tool_capabilities = {
-		full_punch_interval = 0.01,
-		max_drop_level=1,
-		damage_groups = {fleshy=2},
-	}
-})
-
-minetest.register_craft({
-	output = "xenozapper:zapper",
-	recipe = {
-		{"default:steel_ingot", "", "default:steel_ingot"},
-		{"", "default:copper_ingot", ""},
-		{"", "default:steelblock", ""}
-	}
-})
-
-
-
-minetest.register_tool("xenozapper:basher", {
-	description = "Xeno-Basher",
-	inventory_image = "basher_inventory.png",
-	wield_image = "basher.png",
-	wield_scale = {x=2,y=2,z=1},
-	range = 5,
-	tool_capabilities = {
-		full_punch_interval = 0.1,
-		max_drop_level=1,
-		damage_groups = {fleshy=5},
-	}
-})
-
-minetest.register_craft({
-	output = "xenozapper:basher",
-	recipe = {
-		{"default:steel_ingot", "", "default:steel_ingot"},
-		{"default:mese_crystal_fragment", "default:copperblock", "default:mese_crystal_fragment"},
-		{"", "xenozapper:zapper", ""}
-	}
-})
diff --git a/init.lua b/init.lua
index e1eeb9a..0803e69 100644
--- a/init.lua
+++ b/init.lua
@@ -1,5 +1,71 @@
+
+-- Register
+
+minetest.register_tool("xenozapper:zapper", {
+	description = "Xeno-Zapper",
+	inventory_image = "zapper.png",
+	wield_image = "zapper.png^[transformR90",
+	range = 3,
+	tool_capabilities = {
+		full_punch_interval = 0.01,
+		max_drop_level=1,
+		damage_groups = {fleshy=2},
+	}
+})
+
+minetest.register_tool("xenozapper:basher", {
+	description = "Xeno-Basher",
+	inventory_image = "basher_inventory.png",
+	wield_image = "basher.png",
+	wield_scale = {x=2,y=2,z=1},
+	range = 5,
+	tool_capabilities = {
+		full_punch_interval = 0.1,
+		max_drop_level=1,
+		damage_groups = {fleshy=5},
+	}
+})
+
+
+-- Crafts
+
+-- This mod does not exist, what are you talking about? :D
 if minetest.get_modpath("mk_items") then
-	dofile(minetest.get_modpath("xenozapper").."/custom.lua")
+	minetest.register_craft({
+		output = "xenozapper:zapper",
+		recipe = {
+			{"mk_items:iron_rod", "", "mk_items:iron_rod"},
+			{"mk_items:iron_plate", "mk_items:power_supply", "mk_items:iron_plate"},
+			{"", "mk_items:iron_frame", ""}
+		}
+	})
+	
+	minetest.register_craft({
+		output = "xenozapper:basher",
+		recipe = {
+			{"mk_items:steel_rod", "", "mk_items:steel_rod"},
+			{"mk_items:framed_iron_plate", "mk_items:motor", "mk_items:framed_iron_plate"},
+			{"", "xenozapper:zapper", ""}
+		}
+	})
 else
-	dofile(minetest.get_modpath("xenozapper").."/default.lua")
-end
\ No newline at end of file
+	minetest.register_craft({
+		output = "xenozapper:zapper",
+		recipe = {
+			{"default:steel_ingot", "", "default:steel_ingot"},
+			{"", "default:copper_ingot", ""},
+			{"", "default:steelblock", ""}
+		}
+	})
+	
+	minetest.register_craft({
+		output = "xenozapper:basher",
+		recipe = {
+			{"default:steel_ingot", "", "default:steel_ingot"},
+			{"default:mese_crystal_fragment", "default:copperblock", "default:mese_crystal_fragment"},
+			{"", "xenozapper:zapper", ""}
+		}
+	})
+end
+
+
diff --git a/mod.conf b/mod.conf
new file mode 100644
index 0000000..7e34f84
--- /dev/null
+++ b/mod.conf
@@ -0,0 +1,3 @@
+name = xenozapper
+depends = default
+optional_depends = mk_items