diff --git a/modpack.txt b/modpack.txt
new file mode 100644
index 0000000..e69de29
diff --git a/LICENSE b/potions/LICENSE
similarity index 100%
rename from LICENSE
rename to potions/LICENSE
diff --git a/README.md b/potions/README.md
similarity index 100%
rename from README.md
rename to potions/README.md
diff --git a/arrows.lua b/potions/arrows.lua
similarity index 96%
rename from arrows.lua
rename to potions/arrows.lua
index 5ef3a14..3d57851 100644
--- a/arrows.lua
+++ b/potions/arrows.lua
@@ -1,82 +1,82 @@
-potions.register_arrow = function(potion_name, name, hname, potion_use_funct, desc, img)
-	minetest.register_craftitem(potion_name.."_arrow", {
-		description = "Potion Arrow ("..desc..")",
-		inventory_image = img.."^throwing_arrow.png",
-		groups = {not_in_creative_inventory=1},
-	})
-	
---	minetest.register_node(":throwing:arrow_box", {
---		drawtype = "nodebox",
---		node_box = {
---			type = "fixed",
---			fixed = {
---				-- Shaft
---				{-6.5/17, -1.5/17, -1.5/17, 6.5/17, 1.5/17, 1.5/17},
---				--Spitze
---				{-4.5/17, 2.5/17, 2.5/17, -3.5/17, -2.5/17, -2.5/17},
---				{-8.5/17, 0.5/17, 0.5/17, -6.5/17, -0.5/17, -0.5/17},
---				--Federn
---				{6.5/17, 1.5/17, 1.5/17, 7.5/17, 2.5/17, 2.5/17},
---				{7.5/17, -2.5/17, 2.5/17, 6.5/17, -1.5/17, 1.5/17},
---				{7.5/17, 2.5/17, -2.5/17, 6.5/17, 1.5/17, -1.5/17},
---				{6.5/17, -1.5/17, -1.5/17, 7.5/17, -2.5/17, -2.5/17},
---				
---				{7.5/17, 2.5/17, 2.5/17, 8.5/17, 3.5/17, 3.5/17},
---				{8.5/17, -3.5/17, 3.5/17, 7.5/17, -2.5/17, 2.5/17},
---				{8.5/17, 3.5/17, -3.5/17, 7.5/17, 2.5/17, -2.5/17},
---				{7.5/17, -2.5/17, -2.5/17, 8.5/17, -3.5/17, -3.5/17},
---			}
---		},
---		tiles = {"throwing_arrow.png", "throwing_arrow.png", "throwing_arrow_back.png", "throwing_arrow_front.png", "throwing_arrow_2.png", "throwing_arrow.png"},
---		groups = {not_in_creative_inventory=1},
---	})
-	
-	local THROWING_ARROW_ENTITY={
-		physical = false,
-		timer=0,
-		visual = "wielditem",
-		visual_size = {x=0.1, y=0.1},
-		textures = {"throwing:arrow_box"},
-		lastpos={},
-		collisionbox = {0,0,0,0,0,0},
-	}
-	
-	THROWING_ARROW_ENTITY.on_step = function(self, dtime)
-		self.timer=self.timer+dtime
-		local pos = self.object:getpos()
-		local node = minetest.env:get_node(pos)
-	
-		if self.timer>0.2 then
-			local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
-			for k, obj in pairs(objs) do
-				if obj:get_luaentity() ~= nil then
-					if obj:get_luaentity().name ~= potion_name.."_arrow_entity" and obj:get_luaentity().name ~= "__builtin:item" then
-						self.object:remove()
-					end
-				else
-					local damage = 3
-					potion_use_funct({take_item = function()end}, obj)
-					self.object:remove()
-				end
-			end
-		end
-	
-		if self.lastpos.x~=nil then
-			if node.name ~= "air" then
-				self.object:remove()
-			end
-		end
-		self.lastpos={x=pos.x, y=pos.y, z=pos.z}
-	end
-	
-	minetest.register_entity(potion_name.."_arrow_entity", THROWING_ARROW_ENTITY)
-	
-	minetest.register_craft({
-		output = potion_name.."_arrow",
-		recipe = {
-			{'throwing:arrow', potion_name},
-		}
-	})
-	
-	arrows[#arrows+1] = {potion_name.."_arrow", potion_name.."_arrow_entity"}
-end
+potions.register_arrow = function(potion_name, name, hname, potion_use_funct, desc, img)
+	minetest.register_craftitem(potion_name.."_arrow", {
+		description = "Potion Arrow ("..desc..")",
+		inventory_image = img.."^throwing_arrow.png",
+		groups = {not_in_creative_inventory=1},
+	})
+	
+--	minetest.register_node(":throwing:arrow_box", {
+--		drawtype = "nodebox",
+--		node_box = {
+--			type = "fixed",
+--			fixed = {
+--				-- Shaft
+--				{-6.5/17, -1.5/17, -1.5/17, 6.5/17, 1.5/17, 1.5/17},
+--				--Spitze
+--				{-4.5/17, 2.5/17, 2.5/17, -3.5/17, -2.5/17, -2.5/17},
+--				{-8.5/17, 0.5/17, 0.5/17, -6.5/17, -0.5/17, -0.5/17},
+--				--Federn
+--				{6.5/17, 1.5/17, 1.5/17, 7.5/17, 2.5/17, 2.5/17},
+--				{7.5/17, -2.5/17, 2.5/17, 6.5/17, -1.5/17, 1.5/17},
+--				{7.5/17, 2.5/17, -2.5/17, 6.5/17, 1.5/17, -1.5/17},
+--				{6.5/17, -1.5/17, -1.5/17, 7.5/17, -2.5/17, -2.5/17},
+--				
+--				{7.5/17, 2.5/17, 2.5/17, 8.5/17, 3.5/17, 3.5/17},
+--				{8.5/17, -3.5/17, 3.5/17, 7.5/17, -2.5/17, 2.5/17},
+--				{8.5/17, 3.5/17, -3.5/17, 7.5/17, 2.5/17, -2.5/17},
+--				{7.5/17, -2.5/17, -2.5/17, 8.5/17, -3.5/17, -3.5/17},
+--			}
+--		},
+--		tiles = {"throwing_arrow.png", "throwing_arrow.png", "throwing_arrow_back.png", "throwing_arrow_front.png", "throwing_arrow_2.png", "throwing_arrow.png"},
+--		groups = {not_in_creative_inventory=1},
+--	})
+	
+	local THROWING_ARROW_ENTITY={
+		physical = false,
+		timer=0,
+		visual = "wielditem",
+		visual_size = {x=0.1, y=0.1},
+		textures = {"throwing:arrow_box"},
+		lastpos={},
+		collisionbox = {0,0,0,0,0,0},
+	}
+	
+	THROWING_ARROW_ENTITY.on_step = function(self, dtime)
+		self.timer=self.timer+dtime
+		local pos = self.object:getpos()
+		local node = minetest.env:get_node(pos)
+	
+		if self.timer>0.2 then
+			local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
+			for k, obj in pairs(objs) do
+				if obj:get_luaentity() ~= nil then
+					if obj:get_luaentity().name ~= potion_name.."_arrow_entity" and obj:get_luaentity().name ~= "__builtin:item" then
+						self.object:remove()
+					end
+				else
+					local damage = 3
+					potion_use_funct({take_item = function()end}, obj)
+					self.object:remove()
+				end
+			end
+		end
+	
+		if self.lastpos.x~=nil then
+			if node.name ~= "air" then
+				self.object:remove()
+			end
+		end
+		self.lastpos={x=pos.x, y=pos.y, z=pos.z}
+	end
+	
+	minetest.register_entity(potion_name.."_arrow_entity", THROWING_ARROW_ENTITY)
+	
+	minetest.register_craft({
+		output = potion_name.."_arrow",
+		recipe = {
+			{'throwing:arrow', potion_name},
+		}
+	})
+	
+	arrows[#arrows+1] = {potion_name.."_arrow", potion_name.."_arrow_entity"}
+end
diff --git a/depends.txt b/potions/depends.txt
similarity index 100%
rename from depends.txt
rename to potions/depends.txt
diff --git a/init.lua b/potions/init.lua
similarity index 94%
rename from init.lua
rename to potions/init.lua
index 9f59a43..312e435 100644
--- a/init.lua
+++ b/potions/init.lua
@@ -1,512 +1,532 @@
-potions = {
-	players = {},
-	effects = {
-		phys_override = function(sname, name, fname, time, sdata, flags)
-			local def = {
-				on_use = function(itemstack, user, pointed_thing)
-					potions.grant(time, user:get_player_name(), fname.."_"..flags.type..sdata.type, name, flags)
-					itemstack:take_item()
-					return itemstack
-				end,
-				potions = {
-					speed = 0,
-					jump = 0,
-					gravity = 0,
-					tnt = 0,
-					air = 0,
-				},
-			}
-			return def
-		end,
-		fixhp = function(sname, name, fname, time, sdata, flags)
-			local def = {
-				on_use = function(itemstack, user, pointed_thing)
-					for i=0, (sdata.time or 0) do
-						minetest.after(i, function()
-							local hp = user:get_hp()
-							if flags.inv==true then
-								hp = hp - (sdata.hp or 3)
-							else
-								hp = hp + (sdata.hp or 3)
-							end
-							hp = math.min(20, hp)
-							hp = math.max(0, hp)
-							user:set_hp(hp)
-						end)
-					end
-					itemstack:take_item()
-					return itemstack
-				end,
-			}
-			def.mobs = {
-				on_near = def.on_use,
-			}
-			return def
-		end,
-		air = function(sname, name, fname, time, sdata, flags)
-			local def = {
-				on_use = function(itemstack, user, pointed_thing)
-					for i=0, (sdata.time or 0) do
-						minetest.after(i, function()
-							local br = user:get_breath()
-							if flags.inv==true then
-								br = br - (sdata.br or 3)
-							else
-								br = br + (sdata.br or 3)
-							end
-							br = math.min(11, br)
-							br = math.max(0, br)
-							user:set_breath(br)
-						end)
-					end
-					itemstack:take_item()
-					return itemstack
-				end,
-			}
-			return def
-		end,
-		blowup = function(sname, name, fname, time, sdata, flags)
-			local def = {
-				on_use = function(itemstack, user, pointed_thing)
-					potions.grant(time, user:get_player_name(), fname.."_"..flags.type..sdata.type, name, flags)
-					itemstack:take_item()
-					return itemstack
-				end,
-				potions = {
-					speed = 0,
-					jump = 0,
-					gravity = 0,
-					tnt = 0,
-				},
-			}
-			def.mobs = {
-				on_near = function(itemstack, user, pointed_thing)
-					local str = user:get_luaentity().potions.exploding
-					if flags.inv==true then
-						str = math.max(0, str - sdata.power)
-					else
-						str = math.min(str + sdata.power, 250)
-					end
-					user:get_luaentity().potions.exploding = str
-					itemstack:take_item()
-					return itemstack
-				end,
-			}
-			return def
-		end,
-	},
-	grant = function(time, playername, potion_name, type, flags)
-		local rootdef = minetest.registered_items[potion_name]
-		if rootdef == nil then
-			return
-		end
-		if rootdef.potions == nil then
-			return
-		end
-		local def = {}
-		for name, val in pairs(rootdef.potions) do
-			def[name] = val
-		end
-		if flags.inv==true then
-			def.gravity = 0 - def.gravity
-			def.speed = 0 - def.speed
-			def.jump = 0 - def.jump
-			def.tnt = 0 - def.tnt
-		end
-		potions.addPrefs(playername, def.speed, def.jump, def.gravity, def.tnt)
-		potions.refresh(playername)
-		minetest.chat_send_player(playername, "You are under the effects of the "..type.." potion.")
-		minetest.after(time, function()
-			potions.addPrefs(playername, 0-def.speed, 0-def.jump, 0-def.gravity, 0-def.tnt)
-			potions.refresh(playername)
-			minetest.chat_send_player(playername, "The effects of the "..type.." potion have worn off.")
-		end)
-	end,
-	addPrefs = function(playername, speed, jump, gravity, tnt)
-		local prefs = potions.players[playername]
-		prefs.speed = prefs.speed + speed
-		prefs.jump = prefs.jump + jump
-		prefs.gravity = prefs.gravity + gravity
-		prefs.tnt = prefs.tnt + tnt
-	end,
-	refresh = function(playername)
-		if minetest.get_player_by_name(playername)~=nil then
-			local prefs = potions.players[playername]
-			minetest.get_player_by_name(playername):set_physics_override(prefs.speed, prefs.jump, prefs.gravity)
-		end
-	end,
-	register_potion = function(sname, name, fname, time, def)
-		local tps = {"add", "sub"}
-		for t=1, #tps do
-			for i=1, #def.types do
-				local sdata = def.types[i]
-				local item_def = {
-					description = name.." Potion (type: "..tps[t]..sdata.type..")",
-					inventory_image = "potions_bottle.png^potions_"..(def.texture or sname)..".png^potions_"..tps[t]..sdata.type..".png",
-					drawtype = "plantlike",
-					paramtype = "light",
-					walkable = false,
-					groups = {dig_immediate=3,attached_node=1},
-					--sounds = default.node_sound_glass_defaults(),
-				}
-				item_def.tiles = {item_def.inventory_image}
-				local flags = {
-					inv = false,
-					type = tps[t],
-				}
-				if t == 2 then
-					flags.inv = true
-				end
-				for name, val in pairs(potions.effects[def.effect](sname, name, fname, time, sdata, flags)) do
-					item_def[name] = val
-				end
-				for name, val in pairs(sdata.set) do
-					item_def[name] = val
-				end
-				for name, val in pairs(sdata.effects) do
-					item_def.potions[name] = val
-				end
-				minetest.register_node(fname.."_"..tps[t]..sdata.type, item_def)
-				--potions.register_liquid(i..tps[t]..sname, name.." ("..tps[t].." "..i..")", item_def.on_use)
-				if minetest.get_modpath("throwing")~=nil then
-					potions.register_arrow(fname.."_"..tps[t]..sdata.type, i..tps[t]..sname, name.." ("..tps[t].." "..i..")", item_def.on_use,
-							item_def.description, item_def.inventory_image)
-				end
-			end
-		end
-	end,
-	register_liquid = function(name, hname, funct)
-		minetest.register_node("potions:"..name.."_flowing", {
-			description = "Potion ("..hname..") (flowing)",
-			inventory_image = minetest.inventorycube("oil_oil.png"),
-			drawtype = "flowingliquid",
-			tile_images = {"oil_oil.png"},
-			paramtype = "light",
-			walkable = false,
-			pointable = false,
-			diggable = false,
-			buildable_to = true,
-			liquidtype = "flowing",
-			liquid_alternative_flowing = "oil:oil_flowing",
-			liquid_alternative_source = "oil:oil_source",
-			liquid_viscosity = OIL_VISC,
-			post_effect_color = {a=40, r=0, g=0, b=0},
-			special_materials = {
-				{image="oil_oil.png", backface_culling=false},
-				{image="oil_oil.png", backface_culling=true},
-			},
-			potionWalk = funct,
-		})
-		
-		minetest.register_node("potions:"..name.."_source", {
-			description = "Potion ("..hname..")",
-			inventory_image = minetest.inventorycube("oil_oil.png"),
-			drawtype = "liquid",
-			tile_images = {"oil_oil.png"},
-			paramtype = "light",
-			walkable = false,
-			pointable = false,
-			diggable = false,
-			buildable_to = true,
-			liquidtype = "source",
-			liquid_alternative_flowing = "oil:oil_flowing",
-			liquid_alternative_source = "oil:oil_source",
-			liquid_viscosity = OIL_VISC,
-			post_effect_color = {a=40, r=0, g=0, b=0},
-			special_materials = {
-				{image="oil_oil.png", backface_culling=false},
-			},
-			potionWalk = funct,
-		})
-		
---		bucket.register_liquid(
---			"potions:"..name.."_source",
---			"potions:"..name.."_flowing",
---			"potions:bucket_"..name,
---			"oil_oil_bucket.png",
---			"Bucket of potion ("..hname..")"
---		)
-	end,
-}
-
-dofile(minetest.get_modpath("potions").."/arrows.lua")
-
-potions.register_potion("speed", "Speed", "potions:speed", 300, {
-	effect = "phys_override",
-	types = {
-		{
-			type = 1,
-			set = {},
-			effects = {
-				speed = 1,
-			},
-		},
-		{
-			type = 2,
-			set = {},
-			effects = {
-				speed = 2,
-			},
-		},
-		{
-			type = 3,
-			set = {},
-			effects = {
-				speed = 3,
-			},
-		},
-	}
-})
-potions.register_potion("antigrav", "Anti-Gravity", "potions:antigravity", 300, {
-	effect = "phys_override",
-	types = {
-		{
-			type = 1,
-			set = {},
-			effects = {
-				gravity = -0.1,
-			},
-		},
-		{
-			type = 2,
-			set = {},
-			effects = {
-				gravity = -0.2,
-			},
-		},
-		{
-			type = 3,
-			set = {},
-			effects = {
-				gravity = -0.3,
-			},
-		},
-	}
-})
-
-potions.register_potion("jump", "Jumping", "potions:jumping", 300, {
-	effect = "phys_override",
-	types = {
-		{
-			type = 1,
-			set = {},
-			effects = {
-				jump = 0.5,
-			},
-		},
-		{
-			type = 2,
-			set = {},
-			effects = {
-				jump = 1,
-			},
-		},
-		{
-			type = 3,
-			set = {},
-			effects = {
-				jump = 1.5,
-			},
-		},
-	}
-})
-
-potions.register_potion("health", "Health", "potions:health", 300, {
-	effect = "fixhp",
-	types = {
-		{
-			type = 1,
-			hp = 20,
-			set = {},
-			effects = {
-			},
-		},
-		{
-			type = 2,
-			hp = 40,
-			set = {},
-			effects = {
-			},
-		},
-		{
-			type = 3,
-			hp = 60,
-			set = {},
-			effects = {
-			},
-		},
-	}
-})
-
-potions.register_potion("ouhealth", "One Use Health", "potions:ouhealth", 300, {
-	effect = "fixhp",
-	texture = "health",
-	types = {
-		{
-			type = 1,
-			time = 60,
-			set = {},
-			effects = {
-			},
-		},
-		{
-			type = 2,
-			time = 120,
-			set = {},
-			effects = {
-			},
-		},
-		{
-			type = 3,
-			time = 180,
-			set = {},
-			effects = {
-			},
-		},
-	}
-})
-
-potions.register_potion("ouair", "One Use Air", "potions:ouair", 300, {
-	effect = "air",
-	texture = "air",
-	types = {
-		{
-			type = 1,
-			br = 2,
-			set = {},
-			effects = {
-			},
-		},
-		{
-			type = 2,
-			br = 5,
-			set = {},
-			effects = {
-			},
-		},
-		{
-			type = 3,
-			br = 10,
-			set = {},
-			effects = {
-			},
-		},
-	}
-})
-
-potions.register_potion("air", "Air", "potions:air", 300, {
-	effect = "air",
-	types = {
-		{
-			type = 1,
-			time = 60,
-			set = {},
-			effects = {
-			},
-		},
-		{
-			type = 2,
-			time = 120,
-			set = {},
-			effects = {
-			},
-		},
-		{
-			type = 3,
-			time = 180,
-			set = {},
-			effects = {
-			},
-		},
-	}
-})
-
---potions.register_potion("tnt", "Liquid Tnt", "potions:tnt", 300, {
---	effect = "blowup",
---	types = {
---		{
---			type = 1,
---			power = 5,
---			set = {},
---			effects = {
---				tnt = 5,
---			},
---		},
---	}
---})
-
---minetest.register_craftitem("potions:jump_add1", {
---	description = "Jumping Potion",
---	--inventory_image = "morefoods_chocolate.png",
---	on_use = function(itemstack, user, pointed_thing)
---		potions.grant(300, user:get_player_name(), "potions:jump_add1", "Jumping")
---		itemstack:take_item()
---		return itemstack
---	end,
---	potions = {
---		speed = 0,
---		jump = 0.5,
---		gravity = 0,
---	},
---})
-
---minetest.register_craftitem("potions:antigravity_add1", {
---	description = "Anti-Gravity Potion",
---	--inventory_image = "morefoods_chocolate.png",
---	on_use = function(itemstack, user, pointed_thing)
---		potions.grant(300, user:get_player_name(), "potions:antigravity_add1", "Anti-Gravity")
---		itemstack:take_item()
---		return itemstack
---	end,
---	potions = {
---		speed = 0,
---		jump = 0,
---		gravity = -0.1,
---	},
---})
-
---minetest.register_craftitem("potions:speed_add1", {
---	description = "Speed Potion",
---	--inventory_image = "morefoods_chocolate.png",
---	on_use = function(itemstack, user, pointed_thing)
---		potions.grant(300, user:get_player_name(), "potions:speed_add1", "Speed")
---		itemstack:take_item()
---		return itemstack
---	end,
---	potions = {
---		speed = 3,
---		jump = 0,
---		gravity = 0,
---	},
---})
-
-minetest.register_on_joinplayer(function(player)
-	potions.players[player:get_player_name()] = {
-		speed = 1,
-		jump = 1,
-		gravity = 1,
-		tnt = 0,
-		air = 0,
-	}
-end)
-
---local timer = 0
---minetest.register_globalstep(function(dtime)
---	timer = timer + dtime;
---	if timer >= 1 then
---		for _,player in ipairs(minetest.get_connected_players()) do
-----			local pos = player:getpos()
-----			local def = minetest.registered_nodes[minetest.get_node(pos).name]
-----			if def.potionWalk~=nil then
-----				def.potionWalk(nil, player, nil)
-----			end
-----			
-----			if potions.players[player:get_player_name()].tnt > 0 and math.random(potions.players[player:get_player_name()].tnt)==0 then
-----				
-----			end
---		end
---		timer = 0
---	end
---end)
-
---dofile(minetest.get_modpath("potions").."/table.lua")
\ No newline at end of file
+potions = {
+	players = {},
+	effects = {
+		phys_override = function(sname, name, fname, time, sdata, flags)
+			local def = {
+				on_use = function(itemstack, user, pointed_thing)
+					potions.grant(time, user:get_player_name(), fname.."_"..flags.type..sdata.type, name, flags)
+					itemstack:take_item()
+					return itemstack
+				end,
+				potions = {
+					speed = 0,
+					jump = 0,
+					gravity = 0,
+					tnt = 0,
+					air = 0,
+				},
+			}
+			return def
+		end,
+		fixhp = function(sname, name, fname, time, sdata, flags)
+			local def = {
+				on_use = function(itemstack, user, pointed_thing)
+					for i=0, (sdata.time or 0) do
+						minetest.after(i, function()
+							local hp = user:get_hp()
+							if flags.inv==true then
+								hp = hp - (sdata.hp or 3)
+							else
+								hp = hp + (sdata.hp or 3)
+							end
+							hp = math.min(20, hp)
+							hp = math.max(0, hp)
+							user:set_hp(hp)
+						end)
+					end
+					itemstack:take_item()
+					return itemstack
+				end,
+			}
+			def.mobs = {
+				on_near = def.on_use,
+			}
+			return def
+		end,
+		air = function(sname, name, fname, time, sdata, flags)
+			local def = {
+				on_use = function(itemstack, user, pointed_thing)
+					local potions_e = potions.players[user:get_player_name()]
+					potions_e.air = potions_e.air + (sdata.time or 0)
+					for i=0, (sdata.time or 0) do
+						minetest.after(i, function()
+							local br = user:get_breath()
+							if flags.inv==true then
+								br = br - (sdata.br or 3)
+							else
+								br = br + (sdata.br or 3)
+							end
+							br = math.min(11, br)
+							br = math.max(0, br)
+							user:set_breath(br)
+							
+							if i==(sdata.time or 0) then
+								potions_e.air = potions_e.air - (sdata.time or 0)
+							end
+						end)
+					end
+					itemstack:take_item()
+					return itemstack
+				end,
+			}
+			return def
+		end,
+		blowup = function(sname, name, fname, time, sdata, flags)
+			local def = {
+				on_use = function(itemstack, user, pointed_thing)
+					potions.grant(time, user:get_player_name(), fname.."_"..flags.type..sdata.type, name, flags)
+					itemstack:take_item()
+					return itemstack
+				end,
+				potions = {
+					speed = 0,
+					jump = 0,
+					gravity = 0,
+					tnt = 0,
+				},
+			}
+			def.mobs = {
+				on_near = function(itemstack, user, pointed_thing)
+					local str = user:get_luaentity().potions.exploding
+					if flags.inv==true then
+						str = math.max(0, str - sdata.power)
+					else
+						str = math.min(str + sdata.power, 250)
+					end
+					user:get_luaentity().potions.exploding = str
+					itemstack:take_item()
+					return itemstack
+				end,
+			}
+			return def
+		end,
+	},
+	grant = function(time, playername, potion_name, type, flags)
+		local rootdef = minetest.registered_items[potion_name]
+		if rootdef == nil then
+			return
+		end
+		if rootdef.potions == nil then
+			return
+		end
+		local def = {}
+		for name, val in pairs(rootdef.potions) do
+			def[name] = val
+		end
+		if flags.inv==true then
+			def.gravity = 0 - def.gravity
+			def.speed = 0 - def.speed
+			def.jump = 0 - def.jump
+			def.tnt = 0 - def.tnt
+		end
+		potions.addPrefs(playername, def.speed, def.jump, def.gravity, def.tnt)
+		potions.refresh(playername)
+		minetest.chat_send_player(playername, "You are under the effects of the "..type.." potion.")
+		minetest.after(time, function()
+			potions.addPrefs(playername, 0-def.speed, 0-def.jump, 0-def.gravity, 0-def.tnt)
+			potions.refresh(playername)
+			minetest.chat_send_player(playername, "The effects of the "..type.." potion have worn off.")
+		end)
+	end,
+	addPrefs = function(playername, speed, jump, gravity, tnt)
+		local prefs = potions.players[playername]
+		prefs.speed = prefs.speed + speed
+		prefs.jump = prefs.jump + jump
+		prefs.gravity = prefs.gravity + gravity
+		prefs.tnt = prefs.tnt + tnt
+	end,
+	refresh = function(playername)
+		if minetest.get_player_by_name(playername)~=nil then
+			local prefs = potions.players[playername]
+			minetest.get_player_by_name(playername):set_physics_override(prefs.speed, prefs.jump, prefs.gravity)
+		end
+	end,
+	register_potion = function(sname, name, fname, time, def)
+		local tps = {"add", "sub"}
+		for t=1, #tps do
+			for i=1, #def.types do
+				local sdata = def.types[i]
+				local item_def = {
+					description = name.." Potion (type: "..tps[t]..sdata.type..")",
+					inventory_image = "potions_bottle.png^potions_"..(def.texture or sname)..".png^potions_"..tps[t]..sdata.type..".png",
+					drawtype = "plantlike",
+					paramtype = "light",
+					walkable = false,
+					groups = {dig_immediate=3,attached_node=1},
+					--sounds = default.node_sound_glass_defaults(),
+				}
+				item_def.tiles = {item_def.inventory_image}
+				local flags = {
+					inv = false,
+					type = tps[t],
+				}
+				if t == 2 then
+					flags.inv = true
+				end
+				for name, val in pairs(potions.effects[def.effect](sname, name, fname, time, sdata, flags)) do
+					item_def[name] = val
+				end
+				for name, val in pairs(sdata.set) do
+					item_def[name] = val
+				end
+				for name, val in pairs(sdata.effects) do
+					item_def.potions[name] = val
+				end
+				minetest.register_node(fname.."_"..tps[t]..sdata.type, item_def)
+				--potions.register_liquid(i..tps[t]..sname, name.." ("..tps[t].." "..i..")", item_def.on_use)
+				if minetest.get_modpath("throwing")~=nil then
+					potions.register_arrow(fname.."_"..tps[t]..sdata.type, i..tps[t]..sname, name.." ("..tps[t].." "..i..")", item_def.on_use,
+							item_def.description, item_def.inventory_image)
+				end
+			end
+		end
+	end,
+	register_liquid = function(name, hname, funct)
+		minetest.register_node("potions:"..name.."_flowing", {
+			description = "Potion ("..hname..") (flowing)",
+			inventory_image = minetest.inventorycube("oil_oil.png"),
+			drawtype = "flowingliquid",
+			tile_images = {"oil_oil.png"},
+			paramtype = "light",
+			walkable = false,
+			pointable = false,
+			diggable = false,
+			buildable_to = true,
+			liquidtype = "flowing",
+			liquid_alternative_flowing = "oil:oil_flowing",
+			liquid_alternative_source = "oil:oil_source",
+			liquid_viscosity = OIL_VISC,
+			post_effect_color = {a=40, r=0, g=0, b=0},
+			special_materials = {
+				{image="oil_oil.png", backface_culling=false},
+				{image="oil_oil.png", backface_culling=true},
+			},
+			potionWalk = funct,
+		})
+		
+		minetest.register_node("potions:"..name.."_source", {
+			description = "Potion ("..hname..")",
+			inventory_image = minetest.inventorycube("oil_oil.png"),
+			drawtype = "liquid",
+			tile_images = {"oil_oil.png"},
+			paramtype = "light",
+			walkable = false,
+			pointable = false,
+			diggable = false,
+			buildable_to = true,
+			liquidtype = "source",
+			liquid_alternative_flowing = "oil:oil_flowing",
+			liquid_alternative_source = "oil:oil_source",
+			liquid_viscosity = OIL_VISC,
+			post_effect_color = {a=40, r=0, g=0, b=0},
+			special_materials = {
+				{image="oil_oil.png", backface_culling=false},
+			},
+			potionWalk = funct,
+		})
+		
+--		bucket.register_liquid(
+--			"potions:"..name.."_source",
+--			"potions:"..name.."_flowing",
+--			"potions:bucket_"..name,
+--			"oil_oil_bucket.png",
+--			"Bucket of potion ("..hname..")"
+--		)
+	end,
+}
+
+dofile(minetest.get_modpath("potions").."/arrows.lua")
+
+potions.register_potion("speed", "Speed", "potions:speed", 300, {
+	effect = "phys_override",
+	types = {
+		{
+			type = 1,
+			set = {},
+			effects = {
+				speed = 1,
+			},
+		},
+		{
+			type = 2,
+			set = {},
+			effects = {
+				speed = 2,
+			},
+		},
+		{
+			type = 3,
+			set = {},
+			effects = {
+				speed = 3,
+			},
+		},
+	}
+})
+potions.register_potion("antigrav", "Anti-Gravity", "potions:antigravity", 300, {
+	effect = "phys_override",
+	types = {
+		{
+			type = 1,
+			set = {},
+			effects = {
+				gravity = -0.1,
+			},
+		},
+		{
+			type = 2,
+			set = {},
+			effects = {
+				gravity = -0.2,
+			},
+		},
+		{
+			type = 3,
+			set = {},
+			effects = {
+				gravity = -0.3,
+			},
+		},
+	}
+})
+
+potions.register_potion("jump", "Jumping", "potions:jumping", 300, {
+	effect = "phys_override",
+	types = {
+		{
+			type = 1,
+			set = {},
+			effects = {
+				jump = 0.5,
+			},
+		},
+		{
+			type = 2,
+			set = {},
+			effects = {
+				jump = 1,
+			},
+		},
+		{
+			type = 3,
+			set = {},
+			effects = {
+				jump = 1.5,
+			},
+		},
+	}
+})
+
+potions.register_potion("health", "Health", "potions:health", 300, {
+	effect = "fixhp",
+	types = {
+		{
+			type = 1,
+			hp = 20,
+			set = {},
+			effects = {
+			},
+		},
+		{
+			type = 2,
+			hp = 40,
+			set = {},
+			effects = {
+			},
+		},
+		{
+			type = 3,
+			hp = 60,
+			set = {},
+			effects = {
+			},
+		},
+	}
+})
+
+potions.register_potion("ouhealth", "One Use Health", "potions:ouhealth", 300, {
+	effect = "fixhp",
+	texture = "health",
+	types = {
+		{
+			type = 1,
+			time = 60,
+			set = {},
+			effects = {
+			},
+		},
+		{
+			type = 2,
+			time = 120,
+			set = {},
+			effects = {
+			},
+		},
+		{
+			type = 3,
+			time = 180,
+			set = {},
+			effects = {
+			},
+		},
+	}
+})
+
+potions.register_potion("ouair", "One Use Air", "potions:ouair", 300, {
+	effect = "air",
+	texture = "air",
+	types = {
+		{
+			type = 1,
+			br = 2,
+			set = {},
+			effects = {
+			},
+		},
+		{
+			type = 2,
+			br = 5,
+			set = {},
+			effects = {
+			},
+		},
+		{
+			type = 3,
+			br = 10,
+			set = {},
+			effects = {
+			},
+		},
+	}
+})
+
+potions.register_potion("air", "Air", "potions:air", 300, {
+	effect = "air",
+	types = {
+		{
+			type = 1,
+			time = 60,
+			set = {},
+			effects = {
+			},
+		},
+		{
+			type = 2,
+			time = 120,
+			set = {},
+			effects = {
+			},
+		},
+		{
+			type = 3,
+			time = 180,
+			set = {},
+			effects = {
+			},
+		},
+	}
+})
+
+--potions.register_potion("tnt", "Liquid Tnt", "potions:tnt", 300, {
+--	effect = "blowup",
+--	types = {
+--		{
+--			type = 1,
+--			power = 5,
+--			set = {},
+--			effects = {
+--				tnt = 5,
+--			},
+--		},
+--	}
+--})
+
+--minetest.register_craftitem("potions:jump_add1", {
+--	description = "Jumping Potion",
+--	--inventory_image = "morefoods_chocolate.png",
+--	on_use = function(itemstack, user, pointed_thing)
+--		potions.grant(300, user:get_player_name(), "potions:jump_add1", "Jumping")
+--		itemstack:take_item()
+--		return itemstack
+--	end,
+--	potions = {
+--		speed = 0,
+--		jump = 0.5,
+--		gravity = 0,
+--	},
+--})
+
+--minetest.register_craftitem("potions:antigravity_add1", {
+--	description = "Anti-Gravity Potion",
+--	--inventory_image = "morefoods_chocolate.png",
+--	on_use = function(itemstack, user, pointed_thing)
+--		potions.grant(300, user:get_player_name(), "potions:antigravity_add1", "Anti-Gravity")
+--		itemstack:take_item()
+--		return itemstack
+--	end,
+--	potions = {
+--		speed = 0,
+--		jump = 0,
+--		gravity = -0.1,
+--	},
+--})
+
+--minetest.register_craftitem("potions:speed_add1", {
+--	description = "Speed Potion",
+--	--inventory_image = "morefoods_chocolate.png",
+--	on_use = function(itemstack, user, pointed_thing)
+--		potions.grant(300, user:get_player_name(), "potions:speed_add1", "Speed")
+--		itemstack:take_item()
+--		return itemstack
+--	end,
+--	potions = {
+--		speed = 3,
+--		jump = 0,
+--		gravity = 0,
+--	},
+--})
+
+minetest.register_on_joinplayer(function(player)
+	potions.players[player:get_player_name()] = {
+		speed = 1,
+		jump = 1,
+		gravity = 1,
+		tnt = 0,
+		air = 0,
+	}
+end)
+
+--local timer = 0
+--minetest.register_globalstep(function(dtime)
+--	timer = timer + dtime;
+--	if timer >= 1 then
+--		for _,player in ipairs(minetest.get_connected_players()) do
+----			local pos = player:getpos()
+----			local def = minetest.registered_nodes[minetest.get_node(pos).name]
+----			if def.potionWalk~=nil then
+----				def.potionWalk(nil, player, nil)
+----			end
+----			
+----			if potions.players[player:get_player_name()].tnt > 0 and math.random(potions.players[player:get_player_name()].tnt)==0 then
+----				
+----			end
+--		end
+--		timer = 0
+--	end
+--end)
+
+--dofile(minetest.get_modpath("potions").."/table.lua")
+
+minetest.register_chatcommand("effect", {
+	params = "none",
+	description = "get effect info",
+	func = function(name, param)
+		minetest.chat_send_player(name, "effects:")
+		local potions_e = potions.players[name]
+		if potions_e~=nil then
+			for potion_name, val in pairs(potions_e) do
+				minetest.chat_send_player(name, potion_name .. "=" .. val)
+			end
+		end
+	end,
+})
\ No newline at end of file
diff --git a/table.lua b/potions/table.lua
similarity index 96%
rename from table.lua
rename to potions/table.lua
index e9f60be..b4706d0 100644
--- a/table.lua
+++ b/potions/table.lua
@@ -1,16 +1,16 @@
-minetest.register_node("potions:table", {
-	description = "Potion Table",
-	tiles = {"potions_table.png"},
-	groups = {dig_immediate=2},
-	on_construct = function(pos)
-		local meta = minetest.get_meta(pos)
-		local inv = meta:get_inventory()
-		inv:set_size("main", 4)
-		meta:set_string("formspec", ""
-					.."size[6,6]"
-					.."list[context;main;1,2;4,1;]"
-					.."label[2,4;type: ${type} points: ${points}]")
-		meta:set_string("type", "")
-		meta:set_int("points", 0)
-	end,
+minetest.register_node("potions:table", {
+	description = "Potion Table",
+	tiles = {"potions_table.png"},
+	groups = {dig_immediate=2},
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		inv:set_size("main", 4)
+		meta:set_string("formspec", ""
+					.."size[6,6]"
+					.."list[context;main;1,2;4,1;]"
+					.."label[2,4;type: ${type} points: ${points}]")
+		meta:set_string("type", "")
+		meta:set_int("points", 0)
+	end,
 })
\ No newline at end of file
diff --git a/textures/potions_add1.png b/potions/textures/potions_add1.png
similarity index 100%
rename from textures/potions_add1.png
rename to potions/textures/potions_add1.png
diff --git a/textures/potions_add2.png b/potions/textures/potions_add2.png
similarity index 100%
rename from textures/potions_add2.png
rename to potions/textures/potions_add2.png
diff --git a/textures/potions_add3.png b/potions/textures/potions_add3.png
similarity index 100%
rename from textures/potions_add3.png
rename to potions/textures/potions_add3.png
diff --git a/textures/potions_air.png b/potions/textures/potions_air.png
similarity index 100%
rename from textures/potions_air.png
rename to potions/textures/potions_air.png
diff --git a/textures/potions_antigrav.png b/potions/textures/potions_antigrav.png
similarity index 100%
rename from textures/potions_antigrav.png
rename to potions/textures/potions_antigrav.png
diff --git a/textures/potions_bottle.png b/potions/textures/potions_bottle.png
similarity index 100%
rename from textures/potions_bottle.png
rename to potions/textures/potions_bottle.png
diff --git a/textures/potions_health.png b/potions/textures/potions_health.png
similarity index 100%
rename from textures/potions_health.png
rename to potions/textures/potions_health.png
diff --git a/textures/potions_jump.png b/potions/textures/potions_jump.png
similarity index 100%
rename from textures/potions_jump.png
rename to potions/textures/potions_jump.png
diff --git a/textures/potions_speed.png b/potions/textures/potions_speed.png
similarity index 100%
rename from textures/potions_speed.png
rename to potions/textures/potions_speed.png
diff --git a/textures/potions_sub1.png b/potions/textures/potions_sub1.png
similarity index 100%
rename from textures/potions_sub1.png
rename to potions/textures/potions_sub1.png
diff --git a/textures/potions_sub2.png b/potions/textures/potions_sub2.png
similarity index 100%
rename from textures/potions_sub2.png
rename to potions/textures/potions_sub2.png
diff --git a/textures/potions_sub3.png b/potions/textures/potions_sub3.png
similarity index 100%
rename from textures/potions_sub3.png
rename to potions/textures/potions_sub3.png