diff --git a/README.md b/README.md
index b18131fb..d77aad25 100644
--- a/README.md
+++ b/README.md
@@ -140,7 +140,7 @@ There are multiple PSO quest formats out there; newserv supports all of them. It
 1. *This is the default format. You can convert these to uncompressed format by running `newserv decompress-prs FILENAME.bin FILENAME.bind` (and similarly for .dat -> .datd)*
 2. *Similar to (1), to compress an uncompressed quest file: `newserv compress-prs FILENAME.bind FILENAME.bin` (and likewise for .datd -> .dat)*
 3. *Use the decode action to convert these quests to .bin/.dat format before putting them into the server's quests directory. If you know the encryption seed (serial number), pass it in as a hex string with the `--seed=` option. If you don't know the encryption seed, newserv will find it for you, which will likely take a long time.*
-4. *Episode 3 online quests don't go in the system/quests directory; they instead go in the system/ep3/maps-free or system/ep3/maps-quest directories. If you want an Episode 3 quest to be available for both online play and for downloading, the file must exist in both system/quests and in one of the map directories in system/ep3.*
+4. *Episode 3 online quests don't go in the system/quests directory; they instead go in the system/ep3/maps directory. If you want an Episode 3 quest to be available for both online play and for downloading, the file must exist in both system/quests and in system/ep3/maps (symbolic links are acceptable).*
 
 Episode 3 download quests consist only of a .bin file - there is no corresponding .dat file. Episode 3 download quest files may be named with the .mnm extension instead of .bin, since the format is the same as the standard map files (in system/ep3/). These files can be encoded in any of the formats described above, except .qst.
 
@@ -181,7 +181,7 @@ Episode 3 state and game data is stored in the system/ep3 directory. The files i
 * card-text.mnr: Compressed card text archive. Generally only used for debugging.
 * card-text.mnrd: Decompressed card text archive; same format as TextCardE.bin. Generally only used for debugging.
 * com-decks.json: COM decks used in tournaments. The default decks in this file come from logs from Sega's servers, so the file doesn't include every COM deck Sega ever made - the rest are probably lost to time.
-* maps-free/ and maps-quest/: Online free battle and quest maps (.mnm/.bin/.mnmd/.bind files). Free battle and quest files have exactly the same format; the only difference between the files in these directories is which section of the menu they will appear in on the client. newserv comes with all the original online and offline maps, including Story Mode quests. If you don't want the offline maps and quests to be playable online, delete the .bind files in both maps directories.
+* maps/: Online free battle and quest maps (.mnm/.bin/.mnmd/.bind files). newserv comes with all the original online and offline maps, including Story Mode quests. If you don't want the offline maps and quests to be playable online, delete the .bind files system/ep3/maps.
 * tournament-state.json: State of all active tournaments. This file is automatically written when any tournament changes state for any reason (e.g. a tournament is created/started/deleted or a match is resolved).
 
 There is no public editor for Episode 3 maps and quests, but the format is described fairly thoroughly in src/Episode3/DataIndexes.hh (see the MapDefinition structure). You'll need to use `newserv decompress-prs ...` to decompress .bin or .mnm files before editing them, but you don't need to compress the files again to use them - just put the .bind or .mnmd file in the maps directory and newserv will make it available.
diff --git a/src/Episode3/DataIndexes.cc b/src/Episode3/DataIndexes.cc
index 37591ab7..ffbc3fce 100644
--- a/src/Episode3/DataIndexes.cc
+++ b/src/Episode3/DataIndexes.cc
@@ -2201,49 +2201,42 @@ string CardIndex::normalize_card_name(const string& name) {
 }
 
 MapIndex::MapIndex(const string& directory) {
-  auto add_maps_from_dir = [&](const string& dir, bool is_quest) -> void {
-    for (const auto& filename : list_directory(dir)) {
-      try {
-        shared_ptr<MapEntry> entry;
+  for (const auto& filename : list_directory(directory)) {
+    try {
+      shared_ptr<MapEntry> entry;
 
-        if (ends_with(filename, ".mnmd") || ends_with(filename, ".bind")) {
-          entry.reset(new MapEntry(load_object_file<MapDefinition>(dir + "/" + filename), is_quest));
-        } else if (ends_with(filename, ".mnm") || ends_with(filename, ".bin")) {
-          entry.reset(new MapEntry(load_file(dir + "/" + filename), is_quest));
-        } else if (ends_with(filename, ".gci")) {
-          entry.reset(new MapEntry(Quest::decode_gci_file(dir + "/" + filename), is_quest));
-        } else if (ends_with(filename, ".dlq")) {
-          entry.reset(new MapEntry(Quest::decode_dlq_file(dir + "/" + filename), is_quest));
-        }
-
-        if (entry.get()) {
-          if (!this->maps.emplace(entry->map.map_number, entry).second) {
-            throw runtime_error("duplicate map number");
-          }
-          this->maps_by_name.emplace(entry->map.name, entry);
-          string name = entry->map.name;
-          static_game_data_log.info("Indexed Episode 3 %s %s (%08" PRIX32 "; %s)",
-              is_quest ? "online quest" : "free battle map",
-              filename.c_str(), entry->map.map_number.load(), name.c_str());
-        }
-
-      } catch (const exception& e) {
-        static_game_data_log.warning("Failed to index Episode 3 map %s: %s",
-            filename.c_str(), e.what());
+      if (ends_with(filename, ".mnmd") || ends_with(filename, ".bind")) {
+        entry.reset(new MapEntry(load_object_file<MapDefinition>(directory + "/" + filename)));
+      } else if (ends_with(filename, ".mnm") || ends_with(filename, ".bin")) {
+        entry.reset(new MapEntry(load_file(directory + "/" + filename)));
+      } else if (ends_with(filename, ".gci")) {
+        entry.reset(new MapEntry(Quest::decode_gci_file(directory + "/" + filename)));
+      } else if (ends_with(filename, ".dlq")) {
+        entry.reset(new MapEntry(Quest::decode_dlq_file(directory + "/" + filename)));
       }
+
+      if (entry.get()) {
+        if (!this->maps.emplace(entry->map.map_number, entry).second) {
+          throw runtime_error("duplicate map number");
+        }
+        this->maps_by_name.emplace(entry->map.name, entry);
+        string name = entry->map.name;
+        static_game_data_log.info("Indexed Episode 3 %s %s (%08" PRIX32 "; %s)",
+            entry->map.is_quest() ? "online quest" : "free battle map",
+            filename.c_str(), entry->map.map_number.load(), name.c_str());
+      }
+
+    } catch (const exception& e) {
+      static_game_data_log.warning("Failed to index Episode 3 map %s: %s",
+          filename.c_str(), e.what());
     }
-  };
-  add_maps_from_dir(directory + "/maps-free", false);
-  add_maps_from_dir(directory + "/maps-quest", true);
+  }
 }
 
-MapIndex::MapEntry::MapEntry(const MapDefinition& map, bool is_quest)
-    : map(map),
-      is_quest(is_quest) {}
+MapIndex::MapEntry::MapEntry(const MapDefinition& map) : map(map) {}
 
-MapIndex::MapEntry::MapEntry(const string& compressed, bool is_quest)
-    : is_quest(is_quest),
-      compressed_data(compressed) {
+MapIndex::MapEntry::MapEntry(const string& compressed)
+    : compressed_data(compressed) {
   string decompressed = prs_decompress(this->compressed_data);
   if (decompressed.size() != sizeof(MapDefinition)) {
     throw runtime_error(string_printf(
@@ -2316,8 +2309,7 @@ const string& MapIndex::get_compressed_list(size_t num_players) const {
       e.description_offset = strings_w.size();
       strings_w.write(map.description.data(), map.description.len());
       strings_w.put_u8(0);
-
-      e.map_category = map_it.second->is_quest ? 0x00 : 0xFF;
+      e.map_category = map_it.second->map.map_category;
 
       entries_w.put(e);
       num_maps++;
diff --git a/src/Episode3/DataIndexes.hh b/src/Episode3/DataIndexes.hh
index 0c97266f..44663418 100644
--- a/src/Episode3/DataIndexes.hh
+++ b/src/Episode3/DataIndexes.hh
@@ -1265,6 +1265,10 @@ struct MapDefinition { // .mnmd format; also the format of (decompressed) quests
   /* 5A10 */ parray<EntryState, 4> entry_states;
   /* 5A18 */
 
+  inline bool is_quest() const {
+    return (this->map_category <= 2);
+  }
+
   std::string str(const CardIndex* card_index = nullptr) const;
 } __attribute__((packed));
 
@@ -1362,10 +1366,9 @@ public:
   class MapEntry {
   public:
     MapDefinition map;
-    bool is_quest;
 
-    MapEntry(const MapDefinition& map, bool is_quest);
-    MapEntry(const std::string& compressed_data, bool is_quest);
+    explicit MapEntry(const MapDefinition& map);
+    explicit MapEntry(const std::string& compressed_data);
 
     const std::string& compressed(bool is_trial) const;
 
diff --git a/src/ServerState.cc b/src/ServerState.cc
index 1cf3e1c7..bcafe4e9 100644
--- a/src/ServerState.cc
+++ b/src/ServerState.cc
@@ -886,7 +886,7 @@ void ServerState::load_item_tables() {
 
 void ServerState::load_ep3_data() {
   config_log.info("Collecting Episode 3 maps");
-  this->ep3_map_index.reset(new Episode3::MapIndex("system/ep3"));
+  this->ep3_map_index.reset(new Episode3::MapIndex("system/ep3/maps"));
   config_log.info("Loading Episode 3 card definitions");
   this->ep3_card_index.reset(new Episode3::CardIndex("system/ep3/card-definitions.mnr", "system/ep3/card-definitions.mnrd", "system/ep3/card-text.mnr", "system/ep3/card-text.mnrd"));
   config_log.info("Loading Episode 3 trial card definitions");
diff --git a/system/ep3/maps-quest/e700-gc3.mnmd b/system/ep3/maps-quest/e700-gc3.mnmd
deleted file mode 120000
index 2f118324..00000000
--- a/system/ep3/maps-quest/e700-gc3.mnmd
+++ /dev/null
@@ -1 +0,0 @@
-../../quests/e700-gc3.mnmd
\ No newline at end of file
diff --git a/system/ep3/maps/e765-gc3.mnmd b/system/ep3/maps/e765-gc3.mnmd
new file mode 120000
index 00000000..283cee88
--- /dev/null
+++ b/system/ep3/maps/e765-gc3.mnmd
@@ -0,0 +1 @@
+../../quests/e765-gc3.mnmd
\ No newline at end of file
diff --git a/system/ep3/maps-quest/e901-gc3.mnm b/system/ep3/maps/e901-gc3.mnm
similarity index 100%
rename from system/ep3/maps-quest/e901-gc3.mnm
rename to system/ep3/maps/e901-gc3.mnm
diff --git a/system/ep3/maps-quest/e903-gc3.mnm b/system/ep3/maps/e903-gc3.mnm
similarity index 100%
rename from system/ep3/maps-quest/e903-gc3.mnm
rename to system/ep3/maps/e903-gc3.mnm
diff --git a/system/ep3/maps-quest/e904-gc3.mnm b/system/ep3/maps/e904-gc3.mnm
similarity index 100%
rename from system/ep3/maps-quest/e904-gc3.mnm
rename to system/ep3/maps/e904-gc3.mnm
diff --git a/system/ep3/maps-quest/e905-gc3.mnm b/system/ep3/maps/e905-gc3.mnm
similarity index 100%
rename from system/ep3/maps-quest/e905-gc3.mnm
rename to system/ep3/maps/e905-gc3.mnm
diff --git a/system/ep3/maps-quest/e906-gc3.mnm b/system/ep3/maps/e906-gc3.mnm
similarity index 100%
rename from system/ep3/maps-quest/e906-gc3.mnm
rename to system/ep3/maps/e906-gc3.mnm
diff --git a/system/ep3/maps-quest/e907-gc3.mnm b/system/ep3/maps/e907-gc3.mnm
similarity index 100%
rename from system/ep3/maps-quest/e907-gc3.mnm
rename to system/ep3/maps/e907-gc3.mnm
diff --git a/system/ep3/maps-quest/e908-gc3.mnm b/system/ep3/maps/e908-gc3.mnm
similarity index 100%
rename from system/ep3/maps-quest/e908-gc3.mnm
rename to system/ep3/maps/e908-gc3.mnm
diff --git a/system/ep3/maps-quest/m000011p_e.bind b/system/ep3/maps/m000011p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000011p_e.bind
rename to system/ep3/maps/m000011p_e.bind
index 6807802b..60fef576 100755
Binary files a/system/ep3/maps-quest/m000011p_e.bind and b/system/ep3/maps/m000011p_e.bind differ
diff --git a/system/ep3/maps-quest/m000021p_e.bind b/system/ep3/maps/m000021p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000021p_e.bind
rename to system/ep3/maps/m000021p_e.bind
index 9d57f7dc..9c14158c 100755
Binary files a/system/ep3/maps-quest/m000021p_e.bind and b/system/ep3/maps/m000021p_e.bind differ
diff --git a/system/ep3/maps-quest/m000031p_e.bind b/system/ep3/maps/m000031p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000031p_e.bind
rename to system/ep3/maps/m000031p_e.bind
index 52317662..7db06f4a 100755
Binary files a/system/ep3/maps-quest/m000031p_e.bind and b/system/ep3/maps/m000031p_e.bind differ
diff --git a/system/ep3/maps-quest/m000032p_e.bind b/system/ep3/maps/m000032p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000032p_e.bind
rename to system/ep3/maps/m000032p_e.bind
index e39ec7fe..5eeb5f76 100755
Binary files a/system/ep3/maps-quest/m000032p_e.bind and b/system/ep3/maps/m000032p_e.bind differ
diff --git a/system/ep3/maps-quest/m000041p_e.bind b/system/ep3/maps/m000041p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000041p_e.bind
rename to system/ep3/maps/m000041p_e.bind
index 2dec0b51..67386aff 100755
Binary files a/system/ep3/maps-quest/m000041p_e.bind and b/system/ep3/maps/m000041p_e.bind differ
diff --git a/system/ep3/maps-quest/m000042p_e.bind b/system/ep3/maps/m000042p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000042p_e.bind
rename to system/ep3/maps/m000042p_e.bind
index bd793e92..2b53aa37 100755
Binary files a/system/ep3/maps-quest/m000042p_e.bind and b/system/ep3/maps/m000042p_e.bind differ
diff --git a/system/ep3/maps-quest/m000043p_e.bind b/system/ep3/maps/m000043p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000043p_e.bind
rename to system/ep3/maps/m000043p_e.bind
index e01fd4cf..d5d9431b 100755
Binary files a/system/ep3/maps-quest/m000043p_e.bind and b/system/ep3/maps/m000043p_e.bind differ
diff --git a/system/ep3/maps-quest/m000051p_e.bind b/system/ep3/maps/m000051p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000051p_e.bind
rename to system/ep3/maps/m000051p_e.bind
index 026d9ef9..e07e07ae 100755
Binary files a/system/ep3/maps-quest/m000051p_e.bind and b/system/ep3/maps/m000051p_e.bind differ
diff --git a/system/ep3/maps-quest/m000052p_e.bind b/system/ep3/maps/m000052p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000052p_e.bind
rename to system/ep3/maps/m000052p_e.bind
index ff78dfbf..789e84d4 100755
Binary files a/system/ep3/maps-quest/m000052p_e.bind and b/system/ep3/maps/m000052p_e.bind differ
diff --git a/system/ep3/maps-quest/m000053p_e.bind b/system/ep3/maps/m000053p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000053p_e.bind
rename to system/ep3/maps/m000053p_e.bind
index c8a722cc..bc6eef53 100755
Binary files a/system/ep3/maps-quest/m000053p_e.bind and b/system/ep3/maps/m000053p_e.bind differ
diff --git a/system/ep3/maps-quest/m000061p_e.bind b/system/ep3/maps/m000061p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000061p_e.bind
rename to system/ep3/maps/m000061p_e.bind
index 5d32c4d3..d7c244a1 100755
Binary files a/system/ep3/maps-quest/m000061p_e.bind and b/system/ep3/maps/m000061p_e.bind differ
diff --git a/system/ep3/maps-quest/m000062p_e.bind b/system/ep3/maps/m000062p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000062p_e.bind
rename to system/ep3/maps/m000062p_e.bind
index a47848c7..16b8a414 100755
Binary files a/system/ep3/maps-quest/m000062p_e.bind and b/system/ep3/maps/m000062p_e.bind differ
diff --git a/system/ep3/maps-quest/m000063p_e.bind b/system/ep3/maps/m000063p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000063p_e.bind
rename to system/ep3/maps/m000063p_e.bind
index da9fe099..fe152741 100755
Binary files a/system/ep3/maps-quest/m000063p_e.bind and b/system/ep3/maps/m000063p_e.bind differ
diff --git a/system/ep3/maps-quest/m000071p_e.bind b/system/ep3/maps/m000071p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000071p_e.bind
rename to system/ep3/maps/m000071p_e.bind
index 9ca40938..a7edcfa2 100755
Binary files a/system/ep3/maps-quest/m000071p_e.bind and b/system/ep3/maps/m000071p_e.bind differ
diff --git a/system/ep3/maps-quest/m000072p_e.bind b/system/ep3/maps/m000072p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000072p_e.bind
rename to system/ep3/maps/m000072p_e.bind
index d74ceb66..24eeeb6a 100755
Binary files a/system/ep3/maps-quest/m000072p_e.bind and b/system/ep3/maps/m000072p_e.bind differ
diff --git a/system/ep3/maps-quest/m000073p_e.bind b/system/ep3/maps/m000073p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000073p_e.bind
rename to system/ep3/maps/m000073p_e.bind
index b22ebe76..5ffd93af 100755
Binary files a/system/ep3/maps-quest/m000073p_e.bind and b/system/ep3/maps/m000073p_e.bind differ
diff --git a/system/ep3/maps-quest/m000081p_e.bind b/system/ep3/maps/m000081p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000081p_e.bind
rename to system/ep3/maps/m000081p_e.bind
index 115f3b0e..21f2b634 100755
Binary files a/system/ep3/maps-quest/m000081p_e.bind and b/system/ep3/maps/m000081p_e.bind differ
diff --git a/system/ep3/maps-quest/m000082p_e.bind b/system/ep3/maps/m000082p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000082p_e.bind
rename to system/ep3/maps/m000082p_e.bind
index 8e285617..808e1dcb 100755
Binary files a/system/ep3/maps-quest/m000082p_e.bind and b/system/ep3/maps/m000082p_e.bind differ
diff --git a/system/ep3/maps-quest/m000083p_e.bind b/system/ep3/maps/m000083p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000083p_e.bind
rename to system/ep3/maps/m000083p_e.bind
index 7b6a2b1f..4f70bd42 100755
Binary files a/system/ep3/maps-quest/m000083p_e.bind and b/system/ep3/maps/m000083p_e.bind differ
diff --git a/system/ep3/maps-quest/m000091p_e.bind b/system/ep3/maps/m000091p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000091p_e.bind
rename to system/ep3/maps/m000091p_e.bind
index 62274e66..3824116f 100755
Binary files a/system/ep3/maps-quest/m000091p_e.bind and b/system/ep3/maps/m000091p_e.bind differ
diff --git a/system/ep3/maps-quest/m000092p_e.bind b/system/ep3/maps/m000092p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000092p_e.bind
rename to system/ep3/maps/m000092p_e.bind
index d6572826..90c438b2 100755
Binary files a/system/ep3/maps-quest/m000092p_e.bind and b/system/ep3/maps/m000092p_e.bind differ
diff --git a/system/ep3/maps-quest/m000093p_e.bind b/system/ep3/maps/m000093p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000093p_e.bind
rename to system/ep3/maps/m000093p_e.bind
index 59a0aaf0..7d01c0ef 100755
Binary files a/system/ep3/maps-quest/m000093p_e.bind and b/system/ep3/maps/m000093p_e.bind differ
diff --git a/system/ep3/maps-quest/m000101p_e.bind b/system/ep3/maps/m000101p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000101p_e.bind
rename to system/ep3/maps/m000101p_e.bind
index 52986621..bc1131d4 100755
Binary files a/system/ep3/maps-quest/m000101p_e.bind and b/system/ep3/maps/m000101p_e.bind differ
diff --git a/system/ep3/maps-quest/m000102p_e.bind b/system/ep3/maps/m000102p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000102p_e.bind
rename to system/ep3/maps/m000102p_e.bind
index 80bd1129..bd135f62 100755
Binary files a/system/ep3/maps-quest/m000102p_e.bind and b/system/ep3/maps/m000102p_e.bind differ
diff --git a/system/ep3/maps-quest/m000103p_e.bind b/system/ep3/maps/m000103p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000103p_e.bind
rename to system/ep3/maps/m000103p_e.bind
index de87a280..e501d05f 100755
Binary files a/system/ep3/maps-quest/m000103p_e.bind and b/system/ep3/maps/m000103p_e.bind differ
diff --git a/system/ep3/maps-quest/m000111p_e.bind b/system/ep3/maps/m000111p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000111p_e.bind
rename to system/ep3/maps/m000111p_e.bind
index 3de78b88..d61864cd 100755
Binary files a/system/ep3/maps-quest/m000111p_e.bind and b/system/ep3/maps/m000111p_e.bind differ
diff --git a/system/ep3/maps-quest/m000112p_e.bind b/system/ep3/maps/m000112p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000112p_e.bind
rename to system/ep3/maps/m000112p_e.bind
index 0f23d861..56cac0f2 100755
Binary files a/system/ep3/maps-quest/m000112p_e.bind and b/system/ep3/maps/m000112p_e.bind differ
diff --git a/system/ep3/maps-quest/m000113p_e.bind b/system/ep3/maps/m000113p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000113p_e.bind
rename to system/ep3/maps/m000113p_e.bind
index b78f3e80..d0820a95 100755
Binary files a/system/ep3/maps-quest/m000113p_e.bind and b/system/ep3/maps/m000113p_e.bind differ
diff --git a/system/ep3/maps-quest/m000121p_e.bind b/system/ep3/maps/m000121p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000121p_e.bind
rename to system/ep3/maps/m000121p_e.bind
index d20ad5ba..eaa2529a 100755
Binary files a/system/ep3/maps-quest/m000121p_e.bind and b/system/ep3/maps/m000121p_e.bind differ
diff --git a/system/ep3/maps-quest/m000122p_e.bind b/system/ep3/maps/m000122p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000122p_e.bind
rename to system/ep3/maps/m000122p_e.bind
index 99d51afc..868a5ca9 100755
Binary files a/system/ep3/maps-quest/m000122p_e.bind and b/system/ep3/maps/m000122p_e.bind differ
diff --git a/system/ep3/maps-quest/m000123p_e.bind b/system/ep3/maps/m000123p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000123p_e.bind
rename to system/ep3/maps/m000123p_e.bind
index b4a1a248..562feac0 100755
Binary files a/system/ep3/maps-quest/m000123p_e.bind and b/system/ep3/maps/m000123p_e.bind differ
diff --git a/system/ep3/maps-quest/m000131p_e.bind b/system/ep3/maps/m000131p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000131p_e.bind
rename to system/ep3/maps/m000131p_e.bind
index 660c8390..a51af631 100755
Binary files a/system/ep3/maps-quest/m000131p_e.bind and b/system/ep3/maps/m000131p_e.bind differ
diff --git a/system/ep3/maps-quest/m000141p_e.bind b/system/ep3/maps/m000141p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000141p_e.bind
rename to system/ep3/maps/m000141p_e.bind
index 4a7a2573..8878801e 100755
Binary files a/system/ep3/maps-quest/m000141p_e.bind and b/system/ep3/maps/m000141p_e.bind differ
diff --git a/system/ep3/maps-quest/m000142p_e.bind b/system/ep3/maps/m000142p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000142p_e.bind
rename to system/ep3/maps/m000142p_e.bind
index 94d42ec8..0c43df8d 100755
Binary files a/system/ep3/maps-quest/m000142p_e.bind and b/system/ep3/maps/m000142p_e.bind differ
diff --git a/system/ep3/maps-quest/m000143p_e.bind b/system/ep3/maps/m000143p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000143p_e.bind
rename to system/ep3/maps/m000143p_e.bind
index 60b4f37b..9597be2b 100755
Binary files a/system/ep3/maps-quest/m000143p_e.bind and b/system/ep3/maps/m000143p_e.bind differ
diff --git a/system/ep3/maps-quest/m000151p_e.bind b/system/ep3/maps/m000151p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000151p_e.bind
rename to system/ep3/maps/m000151p_e.bind
index 01feda3b..a21fe45c 100755
Binary files a/system/ep3/maps-quest/m000151p_e.bind and b/system/ep3/maps/m000151p_e.bind differ
diff --git a/system/ep3/maps-quest/m000152p_e.bind b/system/ep3/maps/m000152p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000152p_e.bind
rename to system/ep3/maps/m000152p_e.bind
index 6e7887be..bc28c1f4 100755
Binary files a/system/ep3/maps-quest/m000152p_e.bind and b/system/ep3/maps/m000152p_e.bind differ
diff --git a/system/ep3/maps-quest/m000153p_e.bind b/system/ep3/maps/m000153p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000153p_e.bind
rename to system/ep3/maps/m000153p_e.bind
index 5072c06b..080cfc4b 100755
Binary files a/system/ep3/maps-quest/m000153p_e.bind and b/system/ep3/maps/m000153p_e.bind differ
diff --git a/system/ep3/maps-quest/m000161p_e.bind b/system/ep3/maps/m000161p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000161p_e.bind
rename to system/ep3/maps/m000161p_e.bind
index 6587f6b2..0bba4353 100755
Binary files a/system/ep3/maps-quest/m000161p_e.bind and b/system/ep3/maps/m000161p_e.bind differ
diff --git a/system/ep3/maps-quest/m000162p_e.bind b/system/ep3/maps/m000162p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000162p_e.bind
rename to system/ep3/maps/m000162p_e.bind
index c05b00b3..5a3820c1 100755
Binary files a/system/ep3/maps-quest/m000162p_e.bind and b/system/ep3/maps/m000162p_e.bind differ
diff --git a/system/ep3/maps-quest/m000163p_e.bind b/system/ep3/maps/m000163p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000163p_e.bind
rename to system/ep3/maps/m000163p_e.bind
index 1dadba1f..35862592 100755
Binary files a/system/ep3/maps-quest/m000163p_e.bind and b/system/ep3/maps/m000163p_e.bind differ
diff --git a/system/ep3/maps-quest/m000171p_e.bind b/system/ep3/maps/m000171p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000171p_e.bind
rename to system/ep3/maps/m000171p_e.bind
index f8c70847..6aeda3bb 100755
Binary files a/system/ep3/maps-quest/m000171p_e.bind and b/system/ep3/maps/m000171p_e.bind differ
diff --git a/system/ep3/maps-quest/m000172p_e.bind b/system/ep3/maps/m000172p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000172p_e.bind
rename to system/ep3/maps/m000172p_e.bind
index a09f8663..878b6dcc 100755
Binary files a/system/ep3/maps-quest/m000172p_e.bind and b/system/ep3/maps/m000172p_e.bind differ
diff --git a/system/ep3/maps-quest/m000173p_e.bind b/system/ep3/maps/m000173p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000173p_e.bind
rename to system/ep3/maps/m000173p_e.bind
index 7cc4b6b3..b8128c42 100755
Binary files a/system/ep3/maps-quest/m000173p_e.bind and b/system/ep3/maps/m000173p_e.bind differ
diff --git a/system/ep3/maps-quest/m000181p_e.bind b/system/ep3/maps/m000181p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000181p_e.bind
rename to system/ep3/maps/m000181p_e.bind
index 13b62b10..baab3daa 100755
Binary files a/system/ep3/maps-quest/m000181p_e.bind and b/system/ep3/maps/m000181p_e.bind differ
diff --git a/system/ep3/maps-quest/m000182p_e.bind b/system/ep3/maps/m000182p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000182p_e.bind
rename to system/ep3/maps/m000182p_e.bind
index 8ee4adb7..0829f219 100755
Binary files a/system/ep3/maps-quest/m000182p_e.bind and b/system/ep3/maps/m000182p_e.bind differ
diff --git a/system/ep3/maps-quest/m000183p_e.bind b/system/ep3/maps/m000183p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000183p_e.bind
rename to system/ep3/maps/m000183p_e.bind
index 3916aa84..4d4c8025 100755
Binary files a/system/ep3/maps-quest/m000183p_e.bind and b/system/ep3/maps/m000183p_e.bind differ
diff --git a/system/ep3/maps-quest/m000191p_e.bind b/system/ep3/maps/m000191p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000191p_e.bind
rename to system/ep3/maps/m000191p_e.bind
index 6eda7006..c3df9080 100755
Binary files a/system/ep3/maps-quest/m000191p_e.bind and b/system/ep3/maps/m000191p_e.bind differ
diff --git a/system/ep3/maps-quest/m000192p_e.bind b/system/ep3/maps/m000192p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000192p_e.bind
rename to system/ep3/maps/m000192p_e.bind
index 6d8f1c18..7a0b698d 100755
Binary files a/system/ep3/maps-quest/m000192p_e.bind and b/system/ep3/maps/m000192p_e.bind differ
diff --git a/system/ep3/maps-quest/m000193p_e.bind b/system/ep3/maps/m000193p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000193p_e.bind
rename to system/ep3/maps/m000193p_e.bind
index a935bcc7..ef3f1dce 100755
Binary files a/system/ep3/maps-quest/m000193p_e.bind and b/system/ep3/maps/m000193p_e.bind differ
diff --git a/system/ep3/maps-quest/m000201p_e.bind b/system/ep3/maps/m000201p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000201p_e.bind
rename to system/ep3/maps/m000201p_e.bind
index a086c34d..dc3f8ef5 100755
Binary files a/system/ep3/maps-quest/m000201p_e.bind and b/system/ep3/maps/m000201p_e.bind differ
diff --git a/system/ep3/maps-quest/m000202p_e.bind b/system/ep3/maps/m000202p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000202p_e.bind
rename to system/ep3/maps/m000202p_e.bind
index b43b7213..0957356f 100755
Binary files a/system/ep3/maps-quest/m000202p_e.bind and b/system/ep3/maps/m000202p_e.bind differ
diff --git a/system/ep3/maps-quest/m000203p_e.bind b/system/ep3/maps/m000203p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000203p_e.bind
rename to system/ep3/maps/m000203p_e.bind
index 830a5799..ca3ee02a 100755
Binary files a/system/ep3/maps-quest/m000203p_e.bind and b/system/ep3/maps/m000203p_e.bind differ
diff --git a/system/ep3/maps-quest/m000204p_e.bind b/system/ep3/maps/m000204p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000204p_e.bind
rename to system/ep3/maps/m000204p_e.bind
index 8f64437c..66966d1e 100755
Binary files a/system/ep3/maps-quest/m000204p_e.bind and b/system/ep3/maps/m000204p_e.bind differ
diff --git a/system/ep3/maps-quest/m000211p_e.bind b/system/ep3/maps/m000211p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000211p_e.bind
rename to system/ep3/maps/m000211p_e.bind
index d14ba18f..f96d0d1f 100755
Binary files a/system/ep3/maps-quest/m000211p_e.bind and b/system/ep3/maps/m000211p_e.bind differ
diff --git a/system/ep3/maps-quest/m000221p_e.bind b/system/ep3/maps/m000221p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000221p_e.bind
rename to system/ep3/maps/m000221p_e.bind
index db7f3dd1..0bb3b4f9 100755
Binary files a/system/ep3/maps-quest/m000221p_e.bind and b/system/ep3/maps/m000221p_e.bind differ
diff --git a/system/ep3/maps-quest/m000222p_e.bind b/system/ep3/maps/m000222p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000222p_e.bind
rename to system/ep3/maps/m000222p_e.bind
index 6a413505..82275d2c 100755
Binary files a/system/ep3/maps-quest/m000222p_e.bind and b/system/ep3/maps/m000222p_e.bind differ
diff --git a/system/ep3/maps-quest/m000223p_e.bind b/system/ep3/maps/m000223p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000223p_e.bind
rename to system/ep3/maps/m000223p_e.bind
index 3e4aa910..f61f9ae6 100755
Binary files a/system/ep3/maps-quest/m000223p_e.bind and b/system/ep3/maps/m000223p_e.bind differ
diff --git a/system/ep3/maps-quest/m000261p_e.bind b/system/ep3/maps/m000261p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000261p_e.bind
rename to system/ep3/maps/m000261p_e.bind
index 668c4b36..28b01bcc 100755
Binary files a/system/ep3/maps-quest/m000261p_e.bind and b/system/ep3/maps/m000261p_e.bind differ
diff --git a/system/ep3/maps-quest/m000271p_e.bind b/system/ep3/maps/m000271p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000271p_e.bind
rename to system/ep3/maps/m000271p_e.bind
index 4ae3637e..d8a49456 100755
Binary files a/system/ep3/maps-quest/m000271p_e.bind and b/system/ep3/maps/m000271p_e.bind differ
diff --git a/system/ep3/maps-quest/m000281p_e.bind b/system/ep3/maps/m000281p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000281p_e.bind
rename to system/ep3/maps/m000281p_e.bind
index ea6d27fb..870b57bd 100755
Binary files a/system/ep3/maps-quest/m000281p_e.bind and b/system/ep3/maps/m000281p_e.bind differ
diff --git a/system/ep3/maps-quest/m000282p_e.bind b/system/ep3/maps/m000282p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000282p_e.bind
rename to system/ep3/maps/m000282p_e.bind
index 14f74743..6f51b4ec 100755
Binary files a/system/ep3/maps-quest/m000282p_e.bind and b/system/ep3/maps/m000282p_e.bind differ
diff --git a/system/ep3/maps-quest/m000291p_e.bind b/system/ep3/maps/m000291p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000291p_e.bind
rename to system/ep3/maps/m000291p_e.bind
index 382f00b3..6a748406 100755
Binary files a/system/ep3/maps-quest/m000291p_e.bind and b/system/ep3/maps/m000291p_e.bind differ
diff --git a/system/ep3/maps-quest/m000292p_e.bind b/system/ep3/maps/m000292p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000292p_e.bind
rename to system/ep3/maps/m000292p_e.bind
index 75f5870a..420c10f6 100755
Binary files a/system/ep3/maps-quest/m000292p_e.bind and b/system/ep3/maps/m000292p_e.bind differ
diff --git a/system/ep3/maps-quest/m000293p_e.bind b/system/ep3/maps/m000293p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000293p_e.bind
rename to system/ep3/maps/m000293p_e.bind
index 52b4d209..9f92a7f4 100755
Binary files a/system/ep3/maps-quest/m000293p_e.bind and b/system/ep3/maps/m000293p_e.bind differ
diff --git a/system/ep3/maps-quest/m000301p_e.bind b/system/ep3/maps/m000301p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000301p_e.bind
rename to system/ep3/maps/m000301p_e.bind
index dfe4a720..82958c7f 100755
Binary files a/system/ep3/maps-quest/m000301p_e.bind and b/system/ep3/maps/m000301p_e.bind differ
diff --git a/system/ep3/maps-quest/m000302p_e.bind b/system/ep3/maps/m000302p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000302p_e.bind
rename to system/ep3/maps/m000302p_e.bind
index f2955bdf..8d343098 100755
Binary files a/system/ep3/maps-quest/m000302p_e.bind and b/system/ep3/maps/m000302p_e.bind differ
diff --git a/system/ep3/maps-quest/m000303p_e.bind b/system/ep3/maps/m000303p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000303p_e.bind
rename to system/ep3/maps/m000303p_e.bind
index ba23e29e..ae49bf5e 100755
Binary files a/system/ep3/maps-quest/m000303p_e.bind and b/system/ep3/maps/m000303p_e.bind differ
diff --git a/system/ep3/maps-quest/m000311p_e.bind b/system/ep3/maps/m000311p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000311p_e.bind
rename to system/ep3/maps/m000311p_e.bind
index 59fc884a..def181ef 100755
Binary files a/system/ep3/maps-quest/m000311p_e.bind and b/system/ep3/maps/m000311p_e.bind differ
diff --git a/system/ep3/maps-quest/m000312p_e.bind b/system/ep3/maps/m000312p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000312p_e.bind
rename to system/ep3/maps/m000312p_e.bind
index 06e3aae3..667ffcd5 100755
Binary files a/system/ep3/maps-quest/m000312p_e.bind and b/system/ep3/maps/m000312p_e.bind differ
diff --git a/system/ep3/maps-quest/m000313p_e.bind b/system/ep3/maps/m000313p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000313p_e.bind
rename to system/ep3/maps/m000313p_e.bind
index 9148397a..785aeb3b 100755
Binary files a/system/ep3/maps-quest/m000313p_e.bind and b/system/ep3/maps/m000313p_e.bind differ
diff --git a/system/ep3/maps-quest/m000321p_e.bind b/system/ep3/maps/m000321p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000321p_e.bind
rename to system/ep3/maps/m000321p_e.bind
index 061f0e66..8b637c20 100755
Binary files a/system/ep3/maps-quest/m000321p_e.bind and b/system/ep3/maps/m000321p_e.bind differ
diff --git a/system/ep3/maps-quest/m000322p_e.bind b/system/ep3/maps/m000322p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000322p_e.bind
rename to system/ep3/maps/m000322p_e.bind
index af6bfa00..7c45075d 100755
Binary files a/system/ep3/maps-quest/m000322p_e.bind and b/system/ep3/maps/m000322p_e.bind differ
diff --git a/system/ep3/maps-quest/m000323p_e.bind b/system/ep3/maps/m000323p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000323p_e.bind
rename to system/ep3/maps/m000323p_e.bind
index 4d2e31c7..cccaed9d 100755
Binary files a/system/ep3/maps-quest/m000323p_e.bind and b/system/ep3/maps/m000323p_e.bind differ
diff --git a/system/ep3/maps-quest/m000331p_e.bind b/system/ep3/maps/m000331p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000331p_e.bind
rename to system/ep3/maps/m000331p_e.bind
index 4c402d45..e0314be1 100755
Binary files a/system/ep3/maps-quest/m000331p_e.bind and b/system/ep3/maps/m000331p_e.bind differ
diff --git a/system/ep3/maps-quest/m000332p_e.bind b/system/ep3/maps/m000332p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000332p_e.bind
rename to system/ep3/maps/m000332p_e.bind
index 38e49850..81f32df7 100755
Binary files a/system/ep3/maps-quest/m000332p_e.bind and b/system/ep3/maps/m000332p_e.bind differ
diff --git a/system/ep3/maps-quest/m000333p_e.bind b/system/ep3/maps/m000333p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000333p_e.bind
rename to system/ep3/maps/m000333p_e.bind
index 8ea9225f..bf320e01 100755
Binary files a/system/ep3/maps-quest/m000333p_e.bind and b/system/ep3/maps/m000333p_e.bind differ
diff --git a/system/ep3/maps-quest/m000341p_e.bind b/system/ep3/maps/m000341p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000341p_e.bind
rename to system/ep3/maps/m000341p_e.bind
index ef039829..fb2f118c 100755
Binary files a/system/ep3/maps-quest/m000341p_e.bind and b/system/ep3/maps/m000341p_e.bind differ
diff --git a/system/ep3/maps-quest/m000342p_e.bind b/system/ep3/maps/m000342p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000342p_e.bind
rename to system/ep3/maps/m000342p_e.bind
index 6a967365..e0aef6a6 100755
Binary files a/system/ep3/maps-quest/m000342p_e.bind and b/system/ep3/maps/m000342p_e.bind differ
diff --git a/system/ep3/maps-quest/m000343p_e.bind b/system/ep3/maps/m000343p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000343p_e.bind
rename to system/ep3/maps/m000343p_e.bind
index 4d2c1944..3421272f 100755
Binary files a/system/ep3/maps-quest/m000343p_e.bind and b/system/ep3/maps/m000343p_e.bind differ
diff --git a/system/ep3/maps-quest/m000351p_e.bind b/system/ep3/maps/m000351p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000351p_e.bind
rename to system/ep3/maps/m000351p_e.bind
index f7460bdc..1fbbad83 100755
Binary files a/system/ep3/maps-quest/m000351p_e.bind and b/system/ep3/maps/m000351p_e.bind differ
diff --git a/system/ep3/maps-quest/m000352p_e.bind b/system/ep3/maps/m000352p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000352p_e.bind
rename to system/ep3/maps/m000352p_e.bind
index a4c142c7..3fc0e551 100755
Binary files a/system/ep3/maps-quest/m000352p_e.bind and b/system/ep3/maps/m000352p_e.bind differ
diff --git a/system/ep3/maps-quest/m000353p_e.bind b/system/ep3/maps/m000353p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000353p_e.bind
rename to system/ep3/maps/m000353p_e.bind
index bf5d5e22..0683321f 100755
Binary files a/system/ep3/maps-quest/m000353p_e.bind and b/system/ep3/maps/m000353p_e.bind differ
diff --git a/system/ep3/maps-quest/m000361p_e.bind b/system/ep3/maps/m000361p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000361p_e.bind
rename to system/ep3/maps/m000361p_e.bind
index 30cffbaf..e6cbb493 100755
Binary files a/system/ep3/maps-quest/m000361p_e.bind and b/system/ep3/maps/m000361p_e.bind differ
diff --git a/system/ep3/maps-quest/m000362p_e.bind b/system/ep3/maps/m000362p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000362p_e.bind
rename to system/ep3/maps/m000362p_e.bind
index 42ba76aa..7346d057 100755
Binary files a/system/ep3/maps-quest/m000362p_e.bind and b/system/ep3/maps/m000362p_e.bind differ
diff --git a/system/ep3/maps-quest/m000363p_e.bind b/system/ep3/maps/m000363p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000363p_e.bind
rename to system/ep3/maps/m000363p_e.bind
index 4091f0c0..3c1939bd 100755
Binary files a/system/ep3/maps-quest/m000363p_e.bind and b/system/ep3/maps/m000363p_e.bind differ
diff --git a/system/ep3/maps-quest/m000371p_e.bind b/system/ep3/maps/m000371p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000371p_e.bind
rename to system/ep3/maps/m000371p_e.bind
index 8f86c8ae..15826890 100755
Binary files a/system/ep3/maps-quest/m000371p_e.bind and b/system/ep3/maps/m000371p_e.bind differ
diff --git a/system/ep3/maps-quest/m000372p_e.bind b/system/ep3/maps/m000372p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000372p_e.bind
rename to system/ep3/maps/m000372p_e.bind
index 38d16b8e..690c91ad 100755
Binary files a/system/ep3/maps-quest/m000372p_e.bind and b/system/ep3/maps/m000372p_e.bind differ
diff --git a/system/ep3/maps-quest/m000373p_e.bind b/system/ep3/maps/m000373p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000373p_e.bind
rename to system/ep3/maps/m000373p_e.bind
index 6a37843e..b00d2c63 100755
Binary files a/system/ep3/maps-quest/m000373p_e.bind and b/system/ep3/maps/m000373p_e.bind differ
diff --git a/system/ep3/maps-quest/m000381p_e.bind b/system/ep3/maps/m000381p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000381p_e.bind
rename to system/ep3/maps/m000381p_e.bind
index 0278257d..612346b8 100755
Binary files a/system/ep3/maps-quest/m000381p_e.bind and b/system/ep3/maps/m000381p_e.bind differ
diff --git a/system/ep3/maps-quest/m000391p_e.bind b/system/ep3/maps/m000391p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000391p_e.bind
rename to system/ep3/maps/m000391p_e.bind
index 65bf8c88..99003f9d 100755
Binary files a/system/ep3/maps-quest/m000391p_e.bind and b/system/ep3/maps/m000391p_e.bind differ
diff --git a/system/ep3/maps-quest/m000392p_e.bind b/system/ep3/maps/m000392p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000392p_e.bind
rename to system/ep3/maps/m000392p_e.bind
index 04b8d506..1978cf24 100755
Binary files a/system/ep3/maps-quest/m000392p_e.bind and b/system/ep3/maps/m000392p_e.bind differ
diff --git a/system/ep3/maps-quest/m000393p_e.bind b/system/ep3/maps/m000393p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000393p_e.bind
rename to system/ep3/maps/m000393p_e.bind
index 9febc9d7..63b258c1 100755
Binary files a/system/ep3/maps-quest/m000393p_e.bind and b/system/ep3/maps/m000393p_e.bind differ
diff --git a/system/ep3/maps-quest/m000401p_e.bind b/system/ep3/maps/m000401p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000401p_e.bind
rename to system/ep3/maps/m000401p_e.bind
index 6c997044..abb79f82 100755
Binary files a/system/ep3/maps-quest/m000401p_e.bind and b/system/ep3/maps/m000401p_e.bind differ
diff --git a/system/ep3/maps-quest/m000402p_e.bind b/system/ep3/maps/m000402p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000402p_e.bind
rename to system/ep3/maps/m000402p_e.bind
index a359209d..f8d569a7 100755
Binary files a/system/ep3/maps-quest/m000402p_e.bind and b/system/ep3/maps/m000402p_e.bind differ
diff --git a/system/ep3/maps-quest/m000403p_e.bind b/system/ep3/maps/m000403p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000403p_e.bind
rename to system/ep3/maps/m000403p_e.bind
index 65b568b3..ef343c4a 100755
Binary files a/system/ep3/maps-quest/m000403p_e.bind and b/system/ep3/maps/m000403p_e.bind differ
diff --git a/system/ep3/maps-quest/m000411p_e.bind b/system/ep3/maps/m000411p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000411p_e.bind
rename to system/ep3/maps/m000411p_e.bind
index 140d39ef..5edbf981 100755
Binary files a/system/ep3/maps-quest/m000411p_e.bind and b/system/ep3/maps/m000411p_e.bind differ
diff --git a/system/ep3/maps-quest/m000412p_e.bind b/system/ep3/maps/m000412p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000412p_e.bind
rename to system/ep3/maps/m000412p_e.bind
index 089703b8..68114973 100755
Binary files a/system/ep3/maps-quest/m000412p_e.bind and b/system/ep3/maps/m000412p_e.bind differ
diff --git a/system/ep3/maps-quest/m000413p_e.bind b/system/ep3/maps/m000413p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000413p_e.bind
rename to system/ep3/maps/m000413p_e.bind
index e5e49352..fcd9e312 100755
Binary files a/system/ep3/maps-quest/m000413p_e.bind and b/system/ep3/maps/m000413p_e.bind differ
diff --git a/system/ep3/maps-quest/m000421p_e.bind b/system/ep3/maps/m000421p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000421p_e.bind
rename to system/ep3/maps/m000421p_e.bind
index aaa7cabb..0244f19d 100755
Binary files a/system/ep3/maps-quest/m000421p_e.bind and b/system/ep3/maps/m000421p_e.bind differ
diff --git a/system/ep3/maps-quest/m000422p_e.bind b/system/ep3/maps/m000422p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000422p_e.bind
rename to system/ep3/maps/m000422p_e.bind
index 129999d0..1567d61e 100755
Binary files a/system/ep3/maps-quest/m000422p_e.bind and b/system/ep3/maps/m000422p_e.bind differ
diff --git a/system/ep3/maps-quest/m000423p_e.bind b/system/ep3/maps/m000423p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000423p_e.bind
rename to system/ep3/maps/m000423p_e.bind
index cce47712..0f744d11 100755
Binary files a/system/ep3/maps-quest/m000423p_e.bind and b/system/ep3/maps/m000423p_e.bind differ
diff --git a/system/ep3/maps-quest/m000431p_e.bind b/system/ep3/maps/m000431p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000431p_e.bind
rename to system/ep3/maps/m000431p_e.bind
index 5e1b7819..cc266e10 100755
Binary files a/system/ep3/maps-quest/m000431p_e.bind and b/system/ep3/maps/m000431p_e.bind differ
diff --git a/system/ep3/maps-quest/m000432p_e.bind b/system/ep3/maps/m000432p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000432p_e.bind
rename to system/ep3/maps/m000432p_e.bind
index f9ee8f68..fbef53c3 100755
Binary files a/system/ep3/maps-quest/m000432p_e.bind and b/system/ep3/maps/m000432p_e.bind differ
diff --git a/system/ep3/maps-quest/m000433p_e.bind b/system/ep3/maps/m000433p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000433p_e.bind
rename to system/ep3/maps/m000433p_e.bind
index 61d58b6b..897004a9 100755
Binary files a/system/ep3/maps-quest/m000433p_e.bind and b/system/ep3/maps/m000433p_e.bind differ
diff --git a/system/ep3/maps-quest/m000441p_e.bind b/system/ep3/maps/m000441p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000441p_e.bind
rename to system/ep3/maps/m000441p_e.bind
index 723e145d..24f49cad 100755
Binary files a/system/ep3/maps-quest/m000441p_e.bind and b/system/ep3/maps/m000441p_e.bind differ
diff --git a/system/ep3/maps-quest/m000442p_e.bind b/system/ep3/maps/m000442p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000442p_e.bind
rename to system/ep3/maps/m000442p_e.bind
index c95c13ea..5d4f58b8 100755
Binary files a/system/ep3/maps-quest/m000442p_e.bind and b/system/ep3/maps/m000442p_e.bind differ
diff --git a/system/ep3/maps-quest/m000443p_e.bind b/system/ep3/maps/m000443p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000443p_e.bind
rename to system/ep3/maps/m000443p_e.bind
index e9a8ed85..890d1a13 100755
Binary files a/system/ep3/maps-quest/m000443p_e.bind and b/system/ep3/maps/m000443p_e.bind differ
diff --git a/system/ep3/maps-quest/m000451p_e.bind b/system/ep3/maps/m000451p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000451p_e.bind
rename to system/ep3/maps/m000451p_e.bind
index 5e8072b8..817b9dd2 100755
Binary files a/system/ep3/maps-quest/m000451p_e.bind and b/system/ep3/maps/m000451p_e.bind differ
diff --git a/system/ep3/maps-quest/m000452p_e.bind b/system/ep3/maps/m000452p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000452p_e.bind
rename to system/ep3/maps/m000452p_e.bind
index 37e5b5be..e651d630 100755
Binary files a/system/ep3/maps-quest/m000452p_e.bind and b/system/ep3/maps/m000452p_e.bind differ
diff --git a/system/ep3/maps-quest/m000453p_e.bind b/system/ep3/maps/m000453p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000453p_e.bind
rename to system/ep3/maps/m000453p_e.bind
index 9fbe3d9c..30d4a736 100755
Binary files a/system/ep3/maps-quest/m000453p_e.bind and b/system/ep3/maps/m000453p_e.bind differ
diff --git a/system/ep3/maps-quest/m000461p_e.bind b/system/ep3/maps/m000461p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000461p_e.bind
rename to system/ep3/maps/m000461p_e.bind
index 7f7cdd40..19107b59 100755
Binary files a/system/ep3/maps-quest/m000461p_e.bind and b/system/ep3/maps/m000461p_e.bind differ
diff --git a/system/ep3/maps-quest/m000471p_e.bind b/system/ep3/maps/m000471p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000471p_e.bind
rename to system/ep3/maps/m000471p_e.bind
index 257fa15c..207e63fe 100755
Binary files a/system/ep3/maps-quest/m000471p_e.bind and b/system/ep3/maps/m000471p_e.bind differ
diff --git a/system/ep3/maps-quest/m000472p_e.bind b/system/ep3/maps/m000472p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000472p_e.bind
rename to system/ep3/maps/m000472p_e.bind
index cb2f16f7..d1ac321a 100755
Binary files a/system/ep3/maps-quest/m000472p_e.bind and b/system/ep3/maps/m000472p_e.bind differ
diff --git a/system/ep3/maps-quest/m000473p_e.bind b/system/ep3/maps/m000473p_e.bind
similarity index 99%
rename from system/ep3/maps-quest/m000473p_e.bind
rename to system/ep3/maps/m000473p_e.bind
index cc4da05b..2d9ba700 100755
Binary files a/system/ep3/maps-quest/m000473p_e.bind and b/system/ep3/maps/m000473p_e.bind differ
diff --git a/system/ep3/maps-free/m000501p_e.bind b/system/ep3/maps/m000501p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000501p_e.bind
rename to system/ep3/maps/m000501p_e.bind
diff --git a/system/ep3/maps-free/m000502p_e.bind b/system/ep3/maps/m000502p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000502p_e.bind
rename to system/ep3/maps/m000502p_e.bind
diff --git a/system/ep3/maps-free/m000503p_e.bind b/system/ep3/maps/m000503p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000503p_e.bind
rename to system/ep3/maps/m000503p_e.bind
diff --git a/system/ep3/maps-free/m000504p_e.bind b/system/ep3/maps/m000504p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000504p_e.bind
rename to system/ep3/maps/m000504p_e.bind
diff --git a/system/ep3/maps-free/m000505p_e.bind b/system/ep3/maps/m000505p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000505p_e.bind
rename to system/ep3/maps/m000505p_e.bind
diff --git a/system/ep3/maps-free/m000506p_e.bind b/system/ep3/maps/m000506p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000506p_e.bind
rename to system/ep3/maps/m000506p_e.bind
diff --git a/system/ep3/maps-free/m000507p_e.bind b/system/ep3/maps/m000507p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000507p_e.bind
rename to system/ep3/maps/m000507p_e.bind
diff --git a/system/ep3/maps-free/m000508p_e.bind b/system/ep3/maps/m000508p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000508p_e.bind
rename to system/ep3/maps/m000508p_e.bind
diff --git a/system/ep3/maps-free/m000509p_e.bind b/system/ep3/maps/m000509p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000509p_e.bind
rename to system/ep3/maps/m000509p_e.bind
diff --git a/system/ep3/maps-free/m000510p_e.bind b/system/ep3/maps/m000510p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000510p_e.bind
rename to system/ep3/maps/m000510p_e.bind
diff --git a/system/ep3/maps-free/m000511p_e.bind b/system/ep3/maps/m000511p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000511p_e.bind
rename to system/ep3/maps/m000511p_e.bind
diff --git a/system/ep3/maps-free/m000512p_e.bind b/system/ep3/maps/m000512p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000512p_e.bind
rename to system/ep3/maps/m000512p_e.bind
diff --git a/system/ep3/maps-free/m000513p_e.bind b/system/ep3/maps/m000513p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000513p_e.bind
rename to system/ep3/maps/m000513p_e.bind
diff --git a/system/ep3/maps-free/m000514p_e.bind b/system/ep3/maps/m000514p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000514p_e.bind
rename to system/ep3/maps/m000514p_e.bind
diff --git a/system/ep3/maps-free/m000515p_e.bind b/system/ep3/maps/m000515p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000515p_e.bind
rename to system/ep3/maps/m000515p_e.bind
diff --git a/system/ep3/maps-free/m000516p_e.bind b/system/ep3/maps/m000516p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000516p_e.bind
rename to system/ep3/maps/m000516p_e.bind
diff --git a/system/ep3/maps-free/m000517p_e.bind b/system/ep3/maps/m000517p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000517p_e.bind
rename to system/ep3/maps/m000517p_e.bind
diff --git a/system/ep3/maps-free/m000518p_e.bind b/system/ep3/maps/m000518p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000518p_e.bind
rename to system/ep3/maps/m000518p_e.bind
diff --git a/system/ep3/maps-free/m000519p_e.bind b/system/ep3/maps/m000519p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000519p_e.bind
rename to system/ep3/maps/m000519p_e.bind
diff --git a/system/ep3/maps-free/m000521p_e.bind b/system/ep3/maps/m000521p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000521p_e.bind
rename to system/ep3/maps/m000521p_e.bind
diff --git a/system/ep3/maps-free/m000522p_e.bind b/system/ep3/maps/m000522p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000522p_e.bind
rename to system/ep3/maps/m000522p_e.bind
diff --git a/system/ep3/maps-free/m000523p_e.bind b/system/ep3/maps/m000523p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000523p_e.bind
rename to system/ep3/maps/m000523p_e.bind
diff --git a/system/ep3/maps-free/m000524p_e.bind b/system/ep3/maps/m000524p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000524p_e.bind
rename to system/ep3/maps/m000524p_e.bind
diff --git a/system/ep3/maps-free/m000525p_e.bind b/system/ep3/maps/m000525p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000525p_e.bind
rename to system/ep3/maps/m000525p_e.bind
diff --git a/system/ep3/maps-free/m000526p_e.bind b/system/ep3/maps/m000526p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000526p_e.bind
rename to system/ep3/maps/m000526p_e.bind
diff --git a/system/ep3/maps-free/m000527p_e.bind b/system/ep3/maps/m000527p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000527p_e.bind
rename to system/ep3/maps/m000527p_e.bind
diff --git a/system/ep3/maps-free/m000528p_e.bind b/system/ep3/maps/m000528p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000528p_e.bind
rename to system/ep3/maps/m000528p_e.bind
diff --git a/system/ep3/maps-free/m000529p_e.bind b/system/ep3/maps/m000529p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000529p_e.bind
rename to system/ep3/maps/m000529p_e.bind
diff --git a/system/ep3/maps-free/m000530p_e.bind b/system/ep3/maps/m000530p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000530p_e.bind
rename to system/ep3/maps/m000530p_e.bind
diff --git a/system/ep3/maps-free/m000531p_e.bind b/system/ep3/maps/m000531p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000531p_e.bind
rename to system/ep3/maps/m000531p_e.bind
diff --git a/system/ep3/maps-free/m000532p_e.bind b/system/ep3/maps/m000532p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000532p_e.bind
rename to system/ep3/maps/m000532p_e.bind
diff --git a/system/ep3/maps-free/m000533p_e.bind b/system/ep3/maps/m000533p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000533p_e.bind
rename to system/ep3/maps/m000533p_e.bind
diff --git a/system/ep3/maps-free/m000534p_e.bind b/system/ep3/maps/m000534p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000534p_e.bind
rename to system/ep3/maps/m000534p_e.bind
diff --git a/system/ep3/maps-free/m000535p_e.bind b/system/ep3/maps/m000535p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000535p_e.bind
rename to system/ep3/maps/m000535p_e.bind
diff --git a/system/ep3/maps-free/m000536p_e.bind b/system/ep3/maps/m000536p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000536p_e.bind
rename to system/ep3/maps/m000536p_e.bind
diff --git a/system/ep3/maps-free/m000537p_e.bind b/system/ep3/maps/m000537p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000537p_e.bind
rename to system/ep3/maps/m000537p_e.bind
diff --git a/system/ep3/maps-free/m000538p_e.bind b/system/ep3/maps/m000538p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000538p_e.bind
rename to system/ep3/maps/m000538p_e.bind
diff --git a/system/ep3/maps-free/m000539p_e.bind b/system/ep3/maps/m000539p_e.bind
similarity index 100%
rename from system/ep3/maps-free/m000539p_e.bind
rename to system/ep3/maps/m000539p_e.bind
diff --git a/system/ep3/maps-quest/m000550p_e.bind b/system/ep3/maps/m000550p_e.bind
similarity index 100%
rename from system/ep3/maps-quest/m000550p_e.bind
rename to system/ep3/maps/m000550p_e.bind
diff --git a/system/ep3/maps-quest/m000551p_e.bind b/system/ep3/maps/m000551p_e.bind
similarity index 100%
rename from system/ep3/maps-quest/m000551p_e.bind
rename to system/ep3/maps/m000551p_e.bind
diff --git a/system/ep3/maps-quest/m000552p_e.bind b/system/ep3/maps/m000552p_e.bind
similarity index 100%
rename from system/ep3/maps-quest/m000552p_e.bind
rename to system/ep3/maps/m000552p_e.bind
diff --git a/system/ep3/maps-free/map00000230.mnmd b/system/ep3/maps/map00000230.mnmd
similarity index 100%
rename from system/ep3/maps-free/map00000230.mnmd
rename to system/ep3/maps/map00000230.mnmd
diff --git a/system/ep3/maps-free/map00000244.mnmd b/system/ep3/maps/map00000244.mnmd
similarity index 100%
rename from system/ep3/maps-free/map00000244.mnmd
rename to system/ep3/maps/map00000244.mnmd
diff --git a/system/ep3/maps-free/map00000258.mnmd b/system/ep3/maps/map00000258.mnmd
similarity index 100%
rename from system/ep3/maps-free/map00000258.mnmd
rename to system/ep3/maps/map00000258.mnmd
diff --git a/system/ep3/maps-free/map0000026C.mnmd b/system/ep3/maps/map0000026C.mnmd
similarity index 100%
rename from system/ep3/maps-free/map0000026C.mnmd
rename to system/ep3/maps/map0000026C.mnmd
diff --git a/system/ep3/maps-free/map00000280.mnmd b/system/ep3/maps/map00000280.mnmd
similarity index 100%
rename from system/ep3/maps-free/map00000280.mnmd
rename to system/ep3/maps/map00000280.mnmd
diff --git a/system/ep3/maps-free/map00000294.mnmd b/system/ep3/maps/map00000294.mnmd
similarity index 100%
rename from system/ep3/maps-free/map00000294.mnmd
rename to system/ep3/maps/map00000294.mnmd
diff --git a/system/ep3/maps-free/map000002A8.mnmd b/system/ep3/maps/map000002A8.mnmd
similarity index 100%
rename from system/ep3/maps-free/map000002A8.mnmd
rename to system/ep3/maps/map000002A8.mnmd
diff --git a/system/ep3/maps-free/map000002BC.mnmd b/system/ep3/maps/map000002BC.mnmd
similarity index 100%
rename from system/ep3/maps-free/map000002BC.mnmd
rename to system/ep3/maps/map000002BC.mnmd
diff --git a/system/ep3/maps-free/map000002BD.mnmd b/system/ep3/maps/map000002BD.mnmd
similarity index 100%
rename from system/ep3/maps-free/map000002BD.mnmd
rename to system/ep3/maps/map000002BD.mnmd
diff --git a/system/ep3/maps-free/map000002E4.mnmd b/system/ep3/maps/map000002E4.mnmd
similarity index 100%
rename from system/ep3/maps-free/map000002E4.mnmd
rename to system/ep3/maps/map000002E4.mnmd
diff --git a/system/ep3/maps-free/map000002F8.mnmd b/system/ep3/maps/map000002F8.mnmd
similarity index 100%
rename from system/ep3/maps-free/map000002F8.mnmd
rename to system/ep3/maps/map000002F8.mnmd
diff --git a/system/ep3/maps-free/map000002F9.mnmd b/system/ep3/maps/map000002F9.mnmd
similarity index 100%
rename from system/ep3/maps-free/map000002F9.mnmd
rename to system/ep3/maps/map000002F9.mnmd
diff --git a/system/ep3/maps-free/map00000320.mnmd b/system/ep3/maps/map00000320.mnmd
similarity index 100%
rename from system/ep3/maps-free/map00000320.mnmd
rename to system/ep3/maps/map00000320.mnmd
diff --git a/system/ep3/maps-free/map00000334.mnmd b/system/ep3/maps/map00000334.mnmd
similarity index 100%
rename from system/ep3/maps-free/map00000334.mnmd
rename to system/ep3/maps/map00000334.mnmd
diff --git a/system/quests/e700-gc3.mnmd b/system/quests/e765-gc3.mnmd
similarity index 99%
rename from system/quests/e700-gc3.mnmd
rename to system/quests/e765-gc3.mnmd
index 766889c9..709e3257 100755
Binary files a/system/quests/e700-gc3.mnmd and b/system/quests/e765-gc3.mnmd differ