diff --git a/.gitignore b/.gitignore
index a2fb451..75ff29d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 tags
 *.vim
 debug.txt
+mods/ctf_map/maps/*/
 
 ## Files related to minetest development cycle
 *.patch
diff --git a/mods/ctf_map/maps/01_two_hills.conf b/mods/ctf_map/maps/01_two_hills.conf
index 7452767..c9f7ab0 100644
--- a/mods/ctf_map/maps/01_two_hills.conf
+++ b/mods/ctf_map/maps/01_two_hills.conf
@@ -1,8 +1,8 @@
 name = Two Hills and Two Lakes
 author = rubenwardy
 rotation = z
-h = 140
 r = 115
+h = 140
 team.1 = red
 team.1.color = red
 team.1.pos = 7,27,93
diff --git a/mods/ctf_map/maps/02_bridge.conf b/mods/ctf_map/maps/02_bridge.conf
index d157682..38e8558 100644
--- a/mods/ctf_map/maps/02_bridge.conf
+++ b/mods/ctf_map/maps/02_bridge.conf
@@ -5,7 +5,7 @@ r = 115
 h = 140
 team.1 = red
 team.1.color = red
-team.1.pos = -57,-20,94
+team.1.pos = -57,-20,93
 team.2 = blue
 team.2.color = blue
 team.2.pos = -74,-16,-70
diff --git a/mods/ctf_map/maps/03_caverns.conf b/mods/ctf_map/maps/03_caverns.conf
deleted file mode 100644
index ecb4279..0000000
--- a/mods/ctf_map/maps/03_caverns.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-name = Caverns
-author = rubenwardy
-rotation = z
-r = 115
-h = 230
-initial_stuff = default:pick_steel,default:sword_wood,default:torch 20
-team.1 = red
-team.1.color = red
-team.1.pos = -20,-2,65
-team.1.chests1 = -63,-4,26
-team.1.chests2 = -6,20,73
-team.2 = blue
-team.2.color = blue
-team.2.pos = -48,0,-83
-team.2.chests1 = -72,-4,-97
-team.2.chests2 = 7,15,-33
diff --git a/mods/ctf_map/maps/03_caverns.mts b/mods/ctf_map/maps/03_caverns.mts
deleted file mode 100644
index e0efb07..0000000
Binary files a/mods/ctf_map/maps/03_caverns.mts and /dev/null differ
diff --git a/mods/ctf_map/schem_map.lua b/mods/ctf_map/schem_map.lua
index b5b9dbb..556acab 100644
--- a/mods/ctf_map/schem_map.lua
+++ b/mods/ctf_map/schem_map.lua
@@ -10,9 +10,17 @@ ctf_map.map  = nil
 
 do
 	local files_hash = {}
-	local files = minetest.get_dir_list(mapdir, false)
-	for i=1, #files do
-		files_hash[files[i]:split(".")[1]] = true
+
+	local dirs = minetest.get_dir_list(mapdir, true)
+	table.insert(dirs, ".")
+	for _, dir in pairs(dirs) do
+		local files = minetest.get_dir_list(mapdir .. dir, false)
+		-- if dir ~= "" then
+		-- 	dir = dir .. "/"
+		-- end
+		for i=1, #files do
+			files_hash[dir .. "/" .. files[i]:split(".")[1]] = true
+		end
 	end
 
 	ctf_map.available_maps = {}
diff --git a/mods/ctf_pvp_engine b/mods/ctf_pvp_engine
index 2601a44..e2a59ce 160000
--- a/mods/ctf_pvp_engine
+++ b/mods/ctf_pvp_engine
@@ -1 +1 @@
-Subproject commit 2601a44b0e65415a20ac495dc1beefd03db5831b
+Subproject commit e2a59cef6eba80464af5414d89c4e1c6fbfd597c