diff --git a/Cargo.lock b/Cargo.lock
index 08935c7..c6e1df1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1001,7 +1001,7 @@ checksum = "739e9d7726dc32173fed2d69d17eef3c54682169e4e20ff1d0a45dcd37063cef"
 [[package]]
 name = "libpso"
 version = "0.1.0"
-source = "git+http://git.sharnoth.com/jake/libpso#0bd4396bd11534169bd5a6a5b357c90b0f550991"
+source = "git+http://git.sharnoth.com/jake/libpso#892d2ed220369f0ff7b7530fa734e722c2b21c2c"
 dependencies = [
  "chrono",
  "psopacket",
@@ -1401,7 +1401,7 @@ dependencies = [
 [[package]]
 name = "psopacket"
 version = "1.0.0"
-source = "git+http://git.sharnoth.com/jake/libpso#0bd4396bd11534169bd5a6a5b357c90b0f550991"
+source = "git+http://git.sharnoth.com/jake/libpso#892d2ed220369f0ff7b7530fa734e722c2b21c2c"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/data/quests.toml b/data/quests.toml
deleted file mode 100644
index d1d3298..0000000
--- a/data/quests.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-[Extermination]
-list_order = 1
-description = "I am a description"
-
-[[Extermination.quests]]
-bin = "q058-ret-bb.bin"
-dat = "q058-ret-bb.dat"
-
-[[Extermination.quests]]
-bin = "q059-ret-bb.bin"
-dat = "q059-ret-bb.dat"
-
-
-[Retrieval]
-list_order = 2
-description = "find some shit"
-
-[[Retrieval.quests]]
-bin = "q101-ext-bb.bin"
-dat = "q101-ext-bb.dat"
-
-[[Retrieval.quests]]
-bin = "q102-ext-bb.bin"
-dat = "q102-ext-bb.dat"
-#drop_table = "q102-drops"
-
-[[Retrieval.quests]]
-bin = "q233-ext-bb.bin"
-dat = "q233-ext-bb.dat"
-#drop_table = "q102-drops"
-
-[[Retrieval.quests]]
-bin = "q236-ext-bb.bin"
-dat = "q236-ext-bb.dat"
-#drop_table = "q102-drops"
-
-[[Retrieval.quests]]
-bin = "q118-vr-bb.bin"
-dat = "q118-vr-bb.dat"
diff --git a/data/quests/b001-bb.bin b/data/quests/bb/ep1/battle/b001-bb.bin
similarity index 100%
rename from data/quests/b001-bb.bin
rename to data/quests/bb/ep1/battle/b001-bb.bin
diff --git a/data/quests/b001-bb.dat b/data/quests/bb/ep1/battle/b001-bb.dat
similarity index 100%
rename from data/quests/b001-bb.dat
rename to data/quests/bb/ep1/battle/b001-bb.dat
diff --git a/data/quests/b002-bb.bin b/data/quests/bb/ep1/battle/b002-bb.bin
similarity index 100%
rename from data/quests/b002-bb.bin
rename to data/quests/bb/ep1/battle/b002-bb.bin
diff --git a/data/quests/b002-bb.dat b/data/quests/bb/ep1/battle/b002-bb.dat
similarity index 100%
rename from data/quests/b002-bb.dat
rename to data/quests/bb/ep1/battle/b002-bb.dat
diff --git a/data/quests/b003-bb.bin b/data/quests/bb/ep1/battle/b003-bb.bin
similarity index 100%
rename from data/quests/b003-bb.bin
rename to data/quests/bb/ep1/battle/b003-bb.bin
diff --git a/data/quests/b003-bb.dat b/data/quests/bb/ep1/battle/b003-bb.dat
similarity index 100%
rename from data/quests/b003-bb.dat
rename to data/quests/bb/ep1/battle/b003-bb.dat
diff --git a/data/quests/b004-bb.bin b/data/quests/bb/ep1/battle/b004-bb.bin
similarity index 100%
rename from data/quests/b004-bb.bin
rename to data/quests/bb/ep1/battle/b004-bb.bin
diff --git a/data/quests/b004-bb.dat b/data/quests/bb/ep1/battle/b004-bb.dat
similarity index 100%
rename from data/quests/b004-bb.dat
rename to data/quests/bb/ep1/battle/b004-bb.dat
diff --git a/data/quests/b005-bb.bin b/data/quests/bb/ep1/battle/b005-bb.bin
similarity index 100%
rename from data/quests/b005-bb.bin
rename to data/quests/bb/ep1/battle/b005-bb.bin
diff --git a/data/quests/b005-bb.dat b/data/quests/bb/ep1/battle/b005-bb.dat
similarity index 100%
rename from data/quests/b005-bb.dat
rename to data/quests/bb/ep1/battle/b005-bb.dat
diff --git a/data/quests/b006-bb.bin b/data/quests/bb/ep1/battle/b006-bb.bin
similarity index 100%
rename from data/quests/b006-bb.bin
rename to data/quests/bb/ep1/battle/b006-bb.bin
diff --git a/data/quests/b006-bb.dat b/data/quests/bb/ep1/battle/b006-bb.dat
similarity index 100%
rename from data/quests/b006-bb.dat
rename to data/quests/bb/ep1/battle/b006-bb.dat
diff --git a/data/quests/b007-bb.bin b/data/quests/bb/ep1/battle/b007-bb.bin
similarity index 100%
rename from data/quests/b007-bb.bin
rename to data/quests/bb/ep1/battle/b007-bb.bin
diff --git a/data/quests/b007-bb.dat b/data/quests/bb/ep1/battle/b007-bb.dat
similarity index 100%
rename from data/quests/b007-bb.dat
rename to data/quests/bb/ep1/battle/b007-bb.dat
diff --git a/data/quests/b008-bb.bin b/data/quests/bb/ep1/battle/b008-bb.bin
similarity index 100%
rename from data/quests/b008-bb.bin
rename to data/quests/bb/ep1/battle/b008-bb.bin
diff --git a/data/quests/b008-bb.dat b/data/quests/bb/ep1/battle/b008-bb.dat
similarity index 100%
rename from data/quests/b008-bb.dat
rename to data/quests/bb/ep1/battle/b008-bb.dat
diff --git a/data/quests/bb/ep1/battle/quests.toml b/data/quests/bb/ep1/battle/quests.toml
new file mode 100644
index 0000000..f62a1a3
--- /dev/null
+++ b/data/quests/bb/ep1/battle/quests.toml
@@ -0,0 +1,36 @@
+[Battle]
+list_order = 1
+description = "Challenge your skill against other hunters!"
+
+[[Battle.quests]]
+bin = "b001-bb.bin"
+dat = "b001-bb.dat"
+
+[[Battle.quests]]
+bin = "b002-bb.bin"
+dat = "b002-bb.dat"
+
+[[Battle.quests]]
+bin = "b003-bb.bin"
+dat = "b003-bb.dat"
+
+[[Battle.quests]]
+bin = "b004-bb.bin"
+dat = "b004-bb.dat"
+
+[[Battle.quests]]
+bin = "b005-bb.bin"
+dat = "b005-bb.dat"
+
+[[Battle.quests]]
+bin = "b006-bb.bin"
+dat = "b006-bb.dat"
+
+[[Battle.quests]]
+bin = "b007-bb.bin"
+dat = "b007-bb.dat"
+
+[[Battle.quests]]
+bin = "b008-bb.bin"
+dat = "b008-bb.dat"
+
diff --git a/data/quests/c101-bb.bin b/data/quests/bb/ep1/challenge/c101-bb.bin
similarity index 100%
rename from data/quests/c101-bb.bin
rename to data/quests/bb/ep1/challenge/c101-bb.bin
diff --git a/data/quests/c101-bb.dat b/data/quests/bb/ep1/challenge/c101-bb.dat
similarity index 100%
rename from data/quests/c101-bb.dat
rename to data/quests/bb/ep1/challenge/c101-bb.dat
diff --git a/data/quests/c102-bb.bin b/data/quests/bb/ep1/challenge/c102-bb.bin
similarity index 100%
rename from data/quests/c102-bb.bin
rename to data/quests/bb/ep1/challenge/c102-bb.bin
diff --git a/data/quests/c102-bb.dat b/data/quests/bb/ep1/challenge/c102-bb.dat
similarity index 100%
rename from data/quests/c102-bb.dat
rename to data/quests/bb/ep1/challenge/c102-bb.dat
diff --git a/data/quests/c103-bb.bin b/data/quests/bb/ep1/challenge/c103-bb.bin
similarity index 100%
rename from data/quests/c103-bb.bin
rename to data/quests/bb/ep1/challenge/c103-bb.bin
diff --git a/data/quests/c103-bb.dat b/data/quests/bb/ep1/challenge/c103-bb.dat
similarity index 100%
rename from data/quests/c103-bb.dat
rename to data/quests/bb/ep1/challenge/c103-bb.dat
diff --git a/data/quests/c104-bb.bin b/data/quests/bb/ep1/challenge/c104-bb.bin
similarity index 100%
rename from data/quests/c104-bb.bin
rename to data/quests/bb/ep1/challenge/c104-bb.bin
diff --git a/data/quests/c104-bb.dat b/data/quests/bb/ep1/challenge/c104-bb.dat
similarity index 100%
rename from data/quests/c104-bb.dat
rename to data/quests/bb/ep1/challenge/c104-bb.dat
diff --git a/data/quests/c105-bb.bin b/data/quests/bb/ep1/challenge/c105-bb.bin
similarity index 100%
rename from data/quests/c105-bb.bin
rename to data/quests/bb/ep1/challenge/c105-bb.bin
diff --git a/data/quests/c105-bb.dat b/data/quests/bb/ep1/challenge/c105-bb.dat
similarity index 100%
rename from data/quests/c105-bb.dat
rename to data/quests/bb/ep1/challenge/c105-bb.dat
diff --git a/data/quests/c106-bb.bin b/data/quests/bb/ep1/challenge/c106-bb.bin
similarity index 100%
rename from data/quests/c106-bb.bin
rename to data/quests/bb/ep1/challenge/c106-bb.bin
diff --git a/data/quests/c106-bb.dat b/data/quests/bb/ep1/challenge/c106-bb.dat
similarity index 100%
rename from data/quests/c106-bb.dat
rename to data/quests/bb/ep1/challenge/c106-bb.dat
diff --git a/data/quests/c107-bb.bin b/data/quests/bb/ep1/challenge/c107-bb.bin
similarity index 100%
rename from data/quests/c107-bb.bin
rename to data/quests/bb/ep1/challenge/c107-bb.bin
diff --git a/data/quests/c107-bb.dat b/data/quests/bb/ep1/challenge/c107-bb.dat
similarity index 100%
rename from data/quests/c107-bb.dat
rename to data/quests/bb/ep1/challenge/c107-bb.dat
diff --git a/data/quests/c108-bb.bin b/data/quests/bb/ep1/challenge/c108-bb.bin
similarity index 100%
rename from data/quests/c108-bb.bin
rename to data/quests/bb/ep1/challenge/c108-bb.bin
diff --git a/data/quests/c108-bb.dat b/data/quests/bb/ep1/challenge/c108-bb.dat
similarity index 100%
rename from data/quests/c108-bb.dat
rename to data/quests/bb/ep1/challenge/c108-bb.dat
diff --git a/data/quests/c109-bb.bin b/data/quests/bb/ep1/challenge/c109-bb.bin
similarity index 100%
rename from data/quests/c109-bb.bin
rename to data/quests/bb/ep1/challenge/c109-bb.bin
diff --git a/data/quests/c109-bb.dat b/data/quests/bb/ep1/challenge/c109-bb.dat
similarity index 100%
rename from data/quests/c109-bb.dat
rename to data/quests/bb/ep1/challenge/c109-bb.dat
diff --git a/data/quests/bb/ep1/challenge/quests.toml b/data/quests/bb/ep1/challenge/quests.toml
new file mode 100644
index 0000000..d2a5719
--- /dev/null
+++ b/data/quests/bb/ep1/challenge/quests.toml
@@ -0,0 +1,40 @@
+[Challenge]
+list_order = 1
+description = "Pioneer 2's advanced training course."
+
+[[Challenge.quests]]
+bin = "c101-bb.bin"
+dat = "c101-bb.dat"
+
+[[Challenge.quests]]
+bin = "c102-bb.bin"
+dat = "c102-bb.dat"
+
+[[Challenge.quests]]
+bin = "c103-bb.bin"
+dat = "c103-bb.dat"
+
+[[Challenge.quests]]
+bin = "c104-bb.bin"
+dat = "c104-bb.dat"
+
+[[Challenge.quests]]
+bin = "c105-bb.bin"
+dat = "c105-bb.dat"
+
+[[Challenge.quests]]
+bin = "c106-bb.bin"
+dat = "c106-bb.dat"
+
+[[Challenge.quests]]
+bin = "c107-bb.bin"
+dat = "c107-bb.dat"
+
+[[Challenge.quests]]
+bin = "c108-bb.bin"
+dat = "c108-bb.dat"
+
+[[Challenge.quests]]
+bin = "c109-bb.bin"
+dat = "c109-bb.dat"
+
diff --git a/data/quests/q401-gov-bb.bin b/data/quests/bb/ep1/government/q401-gov-bb.bin
similarity index 100%
rename from data/quests/q401-gov-bb.bin
rename to data/quests/bb/ep1/government/q401-gov-bb.bin
diff --git a/data/quests/q401-gov-bb.dat b/data/quests/bb/ep1/government/q401-gov-bb.dat
similarity index 100%
rename from data/quests/q401-gov-bb.dat
rename to data/quests/bb/ep1/government/q401-gov-bb.dat
diff --git a/data/quests/q402-gov-bb.bin b/data/quests/bb/ep1/government/q402-gov-bb.bin
similarity index 100%
rename from data/quests/q402-gov-bb.bin
rename to data/quests/bb/ep1/government/q402-gov-bb.bin
diff --git a/data/quests/q402-gov-bb.dat b/data/quests/bb/ep1/government/q402-gov-bb.dat
similarity index 100%
rename from data/quests/q402-gov-bb.dat
rename to data/quests/bb/ep1/government/q402-gov-bb.dat
diff --git a/data/quests/q403-gov-bb.bin b/data/quests/bb/ep1/government/q403-gov-bb.bin
similarity index 100%
rename from data/quests/q403-gov-bb.bin
rename to data/quests/bb/ep1/government/q403-gov-bb.bin
diff --git a/data/quests/q403-gov-bb.dat b/data/quests/bb/ep1/government/q403-gov-bb.dat
similarity index 100%
rename from data/quests/q403-gov-bb.dat
rename to data/quests/bb/ep1/government/q403-gov-bb.dat
diff --git a/data/quests/q404-gov-bb.bin b/data/quests/bb/ep1/government/q404-gov-bb.bin
similarity index 100%
rename from data/quests/q404-gov-bb.bin
rename to data/quests/bb/ep1/government/q404-gov-bb.bin
diff --git a/data/quests/q404-gov-bb.dat b/data/quests/bb/ep1/government/q404-gov-bb.dat
similarity index 100%
rename from data/quests/q404-gov-bb.dat
rename to data/quests/bb/ep1/government/q404-gov-bb.dat
diff --git a/data/quests/q405-gov-bb.bin b/data/quests/bb/ep1/government/q405-gov-bb.bin
similarity index 100%
rename from data/quests/q405-gov-bb.bin
rename to data/quests/bb/ep1/government/q405-gov-bb.bin
diff --git a/data/quests/q405-gov-bb.dat b/data/quests/bb/ep1/government/q405-gov-bb.dat
similarity index 100%
rename from data/quests/q405-gov-bb.dat
rename to data/quests/bb/ep1/government/q405-gov-bb.dat
diff --git a/data/quests/q406-gov-bb.bin b/data/quests/bb/ep1/government/q406-gov-bb.bin
similarity index 100%
rename from data/quests/q406-gov-bb.bin
rename to data/quests/bb/ep1/government/q406-gov-bb.bin
diff --git a/data/quests/q406-gov-bb.dat b/data/quests/bb/ep1/government/q406-gov-bb.dat
similarity index 100%
rename from data/quests/q406-gov-bb.dat
rename to data/quests/bb/ep1/government/q406-gov-bb.dat
diff --git a/data/quests/q407-gov-bb.bin b/data/quests/bb/ep1/government/q407-gov-bb.bin
similarity index 100%
rename from data/quests/q407-gov-bb.bin
rename to data/quests/bb/ep1/government/q407-gov-bb.bin
diff --git a/data/quests/q407-gov-bb.dat b/data/quests/bb/ep1/government/q407-gov-bb.dat
similarity index 100%
rename from data/quests/q407-gov-bb.dat
rename to data/quests/bb/ep1/government/q407-gov-bb.dat
diff --git a/data/quests/q408-gov-bb.bin b/data/quests/bb/ep1/government/q408-gov-bb.bin
similarity index 100%
rename from data/quests/q408-gov-bb.bin
rename to data/quests/bb/ep1/government/q408-gov-bb.bin
diff --git a/data/quests/q408-gov-bb.dat b/data/quests/bb/ep1/government/q408-gov-bb.dat
similarity index 100%
rename from data/quests/q408-gov-bb.dat
rename to data/quests/bb/ep1/government/q408-gov-bb.dat
diff --git a/data/quests/q409-gov-bb.bin b/data/quests/bb/ep1/government/q409-gov-bb.bin
similarity index 100%
rename from data/quests/q409-gov-bb.bin
rename to data/quests/bb/ep1/government/q409-gov-bb.bin
diff --git a/data/quests/q409-gov-bb.dat b/data/quests/bb/ep1/government/q409-gov-bb.dat
similarity index 100%
rename from data/quests/q409-gov-bb.dat
rename to data/quests/bb/ep1/government/q409-gov-bb.dat
diff --git a/data/quests/q410-gov-bb.bin b/data/quests/bb/ep1/government/q410-gov-bb.bin
similarity index 100%
rename from data/quests/q410-gov-bb.bin
rename to data/quests/bb/ep1/government/q410-gov-bb.bin
diff --git a/data/quests/q410-gov-bb.dat b/data/quests/bb/ep1/government/q410-gov-bb.dat
similarity index 100%
rename from data/quests/q410-gov-bb.dat
rename to data/quests/bb/ep1/government/q410-gov-bb.dat
diff --git a/data/quests/q411-gov-bb.bin b/data/quests/bb/ep1/government/q411-gov-bb.bin
similarity index 100%
rename from data/quests/q411-gov-bb.bin
rename to data/quests/bb/ep1/government/q411-gov-bb.bin
diff --git a/data/quests/q411-gov-bb.dat b/data/quests/bb/ep1/government/q411-gov-bb.dat
similarity index 100%
rename from data/quests/q411-gov-bb.dat
rename to data/quests/bb/ep1/government/q411-gov-bb.dat
diff --git a/data/quests/q412-gov-bb.bin b/data/quests/bb/ep1/government/q412-gov-bb.bin
similarity index 100%
rename from data/quests/q412-gov-bb.bin
rename to data/quests/bb/ep1/government/q412-gov-bb.bin
diff --git a/data/quests/q412-gov-bb.dat b/data/quests/bb/ep1/government/q412-gov-bb.dat
similarity index 100%
rename from data/quests/q412-gov-bb.dat
rename to data/quests/bb/ep1/government/q412-gov-bb.dat
diff --git a/data/quests/q413-gov-bb.bin b/data/quests/bb/ep1/government/q413-gov-bb.bin
similarity index 100%
rename from data/quests/q413-gov-bb.bin
rename to data/quests/bb/ep1/government/q413-gov-bb.bin
diff --git a/data/quests/q413-gov-bb.dat b/data/quests/bb/ep1/government/q413-gov-bb.dat
similarity index 100%
rename from data/quests/q413-gov-bb.dat
rename to data/quests/bb/ep1/government/q413-gov-bb.dat
diff --git a/data/quests/q414-gov-bb.bin b/data/quests/bb/ep1/government/q414-gov-bb.bin
similarity index 100%
rename from data/quests/q414-gov-bb.bin
rename to data/quests/bb/ep1/government/q414-gov-bb.bin
diff --git a/data/quests/q414-gov-bb.dat b/data/quests/bb/ep1/government/q414-gov-bb.dat
similarity index 100%
rename from data/quests/q414-gov-bb.dat
rename to data/quests/bb/ep1/government/q414-gov-bb.dat
diff --git a/data/quests/q415-gov-bb.bin b/data/quests/bb/ep1/government/q415-gov-bb.bin
similarity index 100%
rename from data/quests/q415-gov-bb.bin
rename to data/quests/bb/ep1/government/q415-gov-bb.bin
diff --git a/data/quests/q415-gov-bb.dat b/data/quests/bb/ep1/government/q415-gov-bb.dat
similarity index 100%
rename from data/quests/q415-gov-bb.dat
rename to data/quests/bb/ep1/government/q415-gov-bb.dat
diff --git a/data/quests/bb/ep1/government/quests.toml b/data/quests/bb/ep1/government/quests.toml
new file mode 100644
index 0000000..beb8210
--- /dev/null
+++ b/data/quests/bb/ep1/government/quests.toml
@@ -0,0 +1,64 @@
+[Government]
+list_order = 1
+description = "What lies below on Ragol?"
+
+[[Government.quests]]
+bin = "q401-gov-bb.bin"
+dat = "q401-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q402-gov-bb.bin"
+dat = "q402-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q403-gov-bb.bin"
+dat = "q403-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q404-gov-bb.bin"
+dat = "q404-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q405-gov-bb.bin"
+dat = "q405-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q406-gov-bb.bin"
+dat = "q406-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q407-gov-bb.bin"
+dat = "q407-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q408-gov-bb.bin"
+dat = "q408-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q409-gov-bb.bin"
+dat = "q409-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q410-gov-bb.bin"
+dat = "q410-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q411-gov-bb.bin"
+dat = "q411-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q412-gov-bb.bin"
+dat = "q412-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q413-gov-bb.bin"
+dat = "q413-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q414-gov-bb.bin"
+dat = "q414-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q415-gov-bb.bin"
+dat = "q415-gov-bb.dat"
+
diff --git a/data/quests/q058-ret-bb.bin b/data/quests/bb/ep1/multi/q058-ret-bb.bin
similarity index 100%
rename from data/quests/q058-ret-bb.bin
rename to data/quests/bb/ep1/multi/q058-ret-bb.bin
diff --git a/data/quests/q058-ret-bb.dat b/data/quests/bb/ep1/multi/q058-ret-bb.dat
similarity index 100%
rename from data/quests/q058-ret-bb.dat
rename to data/quests/bb/ep1/multi/q058-ret-bb.dat
diff --git a/data/quests/q058-ret-d1.bin b/data/quests/bb/ep1/multi/q058-ret-d1.bin
similarity index 100%
rename from data/quests/q058-ret-d1.bin
rename to data/quests/bb/ep1/multi/q058-ret-d1.bin
diff --git a/data/quests/q058-ret-d1.dat b/data/quests/bb/ep1/multi/q058-ret-d1.dat
similarity index 100%
rename from data/quests/q058-ret-d1.dat
rename to data/quests/bb/ep1/multi/q058-ret-d1.dat
diff --git a/data/quests/q059-ret-bb.bin b/data/quests/bb/ep1/multi/q059-ret-bb.bin
similarity index 100%
rename from data/quests/q059-ret-bb.bin
rename to data/quests/bb/ep1/multi/q059-ret-bb.bin
diff --git a/data/quests/q059-ret-bb.dat b/data/quests/bb/ep1/multi/q059-ret-bb.dat
similarity index 100%
rename from data/quests/q059-ret-bb.dat
rename to data/quests/bb/ep1/multi/q059-ret-bb.dat
diff --git a/data/quests/q059-ret-d1.bin b/data/quests/bb/ep1/multi/q059-ret-d1.bin
similarity index 100%
rename from data/quests/q059-ret-d1.bin
rename to data/quests/bb/ep1/multi/q059-ret-d1.bin
diff --git a/data/quests/q059-ret-d1.dat b/data/quests/bb/ep1/multi/q059-ret-d1.dat
similarity index 100%
rename from data/quests/q059-ret-d1.dat
rename to data/quests/bb/ep1/multi/q059-ret-d1.dat
diff --git a/data/quests/q060-ret-bb.bin b/data/quests/bb/ep1/multi/q060-ret-bb.bin
similarity index 100%
rename from data/quests/q060-ret-bb.bin
rename to data/quests/bb/ep1/multi/q060-ret-bb.bin
diff --git a/data/quests/q060-ret-bb.dat b/data/quests/bb/ep1/multi/q060-ret-bb.dat
similarity index 100%
rename from data/quests/q060-ret-bb.dat
rename to data/quests/bb/ep1/multi/q060-ret-bb.dat
diff --git a/data/quests/q060-ret-d1.bin b/data/quests/bb/ep1/multi/q060-ret-d1.bin
similarity index 100%
rename from data/quests/q060-ret-d1.bin
rename to data/quests/bb/ep1/multi/q060-ret-d1.bin
diff --git a/data/quests/q060-ret-d1.dat b/data/quests/bb/ep1/multi/q060-ret-d1.dat
similarity index 100%
rename from data/quests/q060-ret-d1.dat
rename to data/quests/bb/ep1/multi/q060-ret-d1.dat
diff --git a/data/quests/q101-ext-bb.bin b/data/quests/bb/ep1/multi/q101-ext-bb.bin
similarity index 100%
rename from data/quests/q101-ext-bb.bin
rename to data/quests/bb/ep1/multi/q101-ext-bb.bin
diff --git a/data/quests/q101-ext-bb.dat b/data/quests/bb/ep1/multi/q101-ext-bb.dat
similarity index 100%
rename from data/quests/q101-ext-bb.dat
rename to data/quests/bb/ep1/multi/q101-ext-bb.dat
diff --git a/data/quests/q101-ext-d1.bin b/data/quests/bb/ep1/multi/q101-ext-d1.bin
similarity index 100%
rename from data/quests/q101-ext-d1.bin
rename to data/quests/bb/ep1/multi/q101-ext-d1.bin
diff --git a/data/quests/q101-ext-d1.dat b/data/quests/bb/ep1/multi/q101-ext-d1.dat
similarity index 100%
rename from data/quests/q101-ext-d1.dat
rename to data/quests/bb/ep1/multi/q101-ext-d1.dat
diff --git a/data/quests/q102-ext-bb.bin b/data/quests/bb/ep1/multi/q102-ext-bb.bin
similarity index 100%
rename from data/quests/q102-ext-bb.bin
rename to data/quests/bb/ep1/multi/q102-ext-bb.bin
diff --git a/data/quests/q102-ext-bb.dat b/data/quests/bb/ep1/multi/q102-ext-bb.dat
similarity index 100%
rename from data/quests/q102-ext-bb.dat
rename to data/quests/bb/ep1/multi/q102-ext-bb.dat
diff --git a/data/quests/q102-ext-d1.bin b/data/quests/bb/ep1/multi/q102-ext-d1.bin
similarity index 100%
rename from data/quests/q102-ext-d1.bin
rename to data/quests/bb/ep1/multi/q102-ext-d1.bin
diff --git a/data/quests/q102-ext-d1.dat b/data/quests/bb/ep1/multi/q102-ext-d1.dat
similarity index 100%
rename from data/quests/q102-ext-d1.dat
rename to data/quests/bb/ep1/multi/q102-ext-d1.dat
diff --git a/data/quests/q103-ext-bb.bin b/data/quests/bb/ep1/multi/q103-ext-bb.bin
similarity index 100%
rename from data/quests/q103-ext-bb.bin
rename to data/quests/bb/ep1/multi/q103-ext-bb.bin
diff --git a/data/quests/q103-ext-bb.dat b/data/quests/bb/ep1/multi/q103-ext-bb.dat
similarity index 100%
rename from data/quests/q103-ext-bb.dat
rename to data/quests/bb/ep1/multi/q103-ext-bb.dat
diff --git a/data/quests/q103-ext-d1.bin b/data/quests/bb/ep1/multi/q103-ext-d1.bin
similarity index 100%
rename from data/quests/q103-ext-d1.bin
rename to data/quests/bb/ep1/multi/q103-ext-d1.bin
diff --git a/data/quests/q103-ext-d1.dat b/data/quests/bb/ep1/multi/q103-ext-d1.dat
similarity index 100%
rename from data/quests/q103-ext-d1.dat
rename to data/quests/bb/ep1/multi/q103-ext-d1.dat
diff --git a/data/quests/q104-ext-bb.bin b/data/quests/bb/ep1/multi/q104-ext-bb.bin
similarity index 100%
rename from data/quests/q104-ext-bb.bin
rename to data/quests/bb/ep1/multi/q104-ext-bb.bin
diff --git a/data/quests/q104-ext-bb.dat b/data/quests/bb/ep1/multi/q104-ext-bb.dat
similarity index 100%
rename from data/quests/q104-ext-bb.dat
rename to data/quests/bb/ep1/multi/q104-ext-bb.dat
diff --git a/data/quests/q104-ext-d1.bin b/data/quests/bb/ep1/multi/q104-ext-d1.bin
similarity index 100%
rename from data/quests/q104-ext-d1.bin
rename to data/quests/bb/ep1/multi/q104-ext-d1.bin
diff --git a/data/quests/q104-ext-d1.dat b/data/quests/bb/ep1/multi/q104-ext-d1.dat
similarity index 100%
rename from data/quests/q104-ext-d1.dat
rename to data/quests/bb/ep1/multi/q104-ext-d1.dat
diff --git a/data/quests/q108-ext-bb.bin b/data/quests/bb/ep1/multi/q108-ext-bb.bin
similarity index 100%
rename from data/quests/q108-ext-bb.bin
rename to data/quests/bb/ep1/multi/q108-ext-bb.bin
diff --git a/data/quests/q108-ext-bb.dat b/data/quests/bb/ep1/multi/q108-ext-bb.dat
similarity index 100%
rename from data/quests/q108-ext-bb.dat
rename to data/quests/bb/ep1/multi/q108-ext-bb.dat
diff --git a/data/quests/q108-ext-d1.bin b/data/quests/bb/ep1/multi/q108-ext-d1.bin
similarity index 100%
rename from data/quests/q108-ext-d1.bin
rename to data/quests/bb/ep1/multi/q108-ext-d1.bin
diff --git a/data/quests/q108-ext-d1.dat b/data/quests/bb/ep1/multi/q108-ext-d1.dat
similarity index 100%
rename from data/quests/q108-ext-d1.dat
rename to data/quests/bb/ep1/multi/q108-ext-d1.dat
diff --git a/data/quests/q109-ext-bb.bin b/data/quests/bb/ep1/multi/q109-ext-bb.bin
similarity index 100%
rename from data/quests/q109-ext-bb.bin
rename to data/quests/bb/ep1/multi/q109-ext-bb.bin
diff --git a/data/quests/q109-ext-bb.dat b/data/quests/bb/ep1/multi/q109-ext-bb.dat
similarity index 100%
rename from data/quests/q109-ext-bb.dat
rename to data/quests/bb/ep1/multi/q109-ext-bb.dat
diff --git a/data/quests/q109-ext-d1.bin b/data/quests/bb/ep1/multi/q109-ext-d1.bin
similarity index 100%
rename from data/quests/q109-ext-d1.bin
rename to data/quests/bb/ep1/multi/q109-ext-d1.bin
diff --git a/data/quests/q109-ext-d1.dat b/data/quests/bb/ep1/multi/q109-ext-d1.dat
similarity index 100%
rename from data/quests/q109-ext-d1.dat
rename to data/quests/bb/ep1/multi/q109-ext-d1.dat
diff --git a/data/quests/q110-ext-bb.bin b/data/quests/bb/ep1/multi/q110-ext-bb.bin
similarity index 100%
rename from data/quests/q110-ext-bb.bin
rename to data/quests/bb/ep1/multi/q110-ext-bb.bin
diff --git a/data/quests/q110-ext-bb.dat b/data/quests/bb/ep1/multi/q110-ext-bb.dat
similarity index 100%
rename from data/quests/q110-ext-bb.dat
rename to data/quests/bb/ep1/multi/q110-ext-bb.dat
diff --git a/data/quests/q110-ext-d1.bin b/data/quests/bb/ep1/multi/q110-ext-d1.bin
similarity index 100%
rename from data/quests/q110-ext-d1.bin
rename to data/quests/bb/ep1/multi/q110-ext-d1.bin
diff --git a/data/quests/q110-ext-d1.dat b/data/quests/bb/ep1/multi/q110-ext-d1.dat
similarity index 100%
rename from data/quests/q110-ext-d1.dat
rename to data/quests/bb/ep1/multi/q110-ext-d1.dat
diff --git a/data/quests/q111-ext-bb.bin b/data/quests/bb/ep1/multi/q111-ext-bb.bin
similarity index 100%
rename from data/quests/q111-ext-bb.bin
rename to data/quests/bb/ep1/multi/q111-ext-bb.bin
diff --git a/data/quests/q111-ext-bb.dat b/data/quests/bb/ep1/multi/q111-ext-bb.dat
similarity index 100%
rename from data/quests/q111-ext-bb.dat
rename to data/quests/bb/ep1/multi/q111-ext-bb.dat
diff --git a/data/quests/q111-ext-d1.bin b/data/quests/bb/ep1/multi/q111-ext-d1.bin
similarity index 100%
rename from data/quests/q111-ext-d1.bin
rename to data/quests/bb/ep1/multi/q111-ext-d1.bin
diff --git a/data/quests/q111-ext-d1.dat b/data/quests/bb/ep1/multi/q111-ext-d1.dat
similarity index 100%
rename from data/quests/q111-ext-d1.dat
rename to data/quests/bb/ep1/multi/q111-ext-d1.dat
diff --git a/data/quests/q117-ext-bb.bin b/data/quests/bb/ep1/multi/q117-ext-bb.bin
similarity index 100%
rename from data/quests/q117-ext-bb.bin
rename to data/quests/bb/ep1/multi/q117-ext-bb.bin
diff --git a/data/quests/q117-ext-bb.dat b/data/quests/bb/ep1/multi/q117-ext-bb.dat
similarity index 100%
rename from data/quests/q117-ext-bb.dat
rename to data/quests/bb/ep1/multi/q117-ext-bb.dat
diff --git a/data/quests/q118-vr-bb.bin b/data/quests/bb/ep1/multi/q118-vr-bb.bin
similarity index 100%
rename from data/quests/q118-vr-bb.bin
rename to data/quests/bb/ep1/multi/q118-vr-bb.bin
diff --git a/data/quests/q118-vr-bb.dat b/data/quests/bb/ep1/multi/q118-vr-bb.dat
similarity index 100%
rename from data/quests/q118-vr-bb.dat
rename to data/quests/bb/ep1/multi/q118-vr-bb.dat
diff --git a/data/quests/q124-evt-bb.bin b/data/quests/bb/ep1/multi/q124-evt-bb.bin
similarity index 100%
rename from data/quests/q124-evt-bb.bin
rename to data/quests/bb/ep1/multi/q124-evt-bb.bin
diff --git a/data/quests/q124-evt-bb.dat b/data/quests/bb/ep1/multi/q124-evt-bb.dat
similarity index 100%
rename from data/quests/q124-evt-bb.dat
rename to data/quests/bb/ep1/multi/q124-evt-bb.dat
diff --git a/data/quests/q137-evt-bb.bin b/data/quests/bb/ep1/multi/q137-evt-bb.bin
similarity index 100%
rename from data/quests/q137-evt-bb.bin
rename to data/quests/bb/ep1/multi/q137-evt-bb.bin
diff --git a/data/quests/q137-evt-bb.dat b/data/quests/bb/ep1/multi/q137-evt-bb.dat
similarity index 100%
rename from data/quests/q137-evt-bb.dat
rename to data/quests/bb/ep1/multi/q137-evt-bb.dat
diff --git a/data/quests/q138-evt-bb.bin b/data/quests/bb/ep1/multi/q138-evt-bb.bin
similarity index 100%
rename from data/quests/q138-evt-bb.bin
rename to data/quests/bb/ep1/multi/q138-evt-bb.bin
diff --git a/data/quests/q138-evt-bb.dat b/data/quests/bb/ep1/multi/q138-evt-bb.dat
similarity index 100%
rename from data/quests/q138-evt-bb.dat
rename to data/quests/bb/ep1/multi/q138-evt-bb.dat
diff --git a/data/quests/q141-vr-bb.bin b/data/quests/bb/ep1/multi/q141-vr-bb.bin
similarity index 100%
rename from data/quests/q141-vr-bb.bin
rename to data/quests/bb/ep1/multi/q141-vr-bb.bin
diff --git a/data/quests/q141-vr-bb.dat b/data/quests/bb/ep1/multi/q141-vr-bb.dat
similarity index 100%
rename from data/quests/q141-vr-bb.dat
rename to data/quests/bb/ep1/multi/q141-vr-bb.dat
diff --git a/data/quests/q142-vr-bb.bin b/data/quests/bb/ep1/multi/q142-vr-bb.bin
similarity index 100%
rename from data/quests/q142-vr-bb.bin
rename to data/quests/bb/ep1/multi/q142-vr-bb.bin
diff --git a/data/quests/q142-vr-bb.dat b/data/quests/bb/ep1/multi/q142-vr-bb.dat
similarity index 100%
rename from data/quests/q142-vr-bb.dat
rename to data/quests/bb/ep1/multi/q142-vr-bb.dat
diff --git a/data/quests/bb/ep1/multi/quests.toml b/data/quests/bb/ep1/multi/quests.toml
new file mode 100644
index 0000000..061ee38
--- /dev/null
+++ b/data/quests/bb/ep1/multi/quests.toml
@@ -0,0 +1,135 @@
+[Retrieval]
+list_order = 1
+description = "Retrieval quests"
+
+[[Retrieval.quests]]
+bin = "q058-ret-bb.bin"
+dat = "q058-ret-bb.dat"
+
+[[Retrieval.quests]]
+bin = "q058-ret-d1.bin"
+dat = "q058-ret-d1.dat"
+
+[[Retrieval.quests]]
+bin = "q059-ret-bb.bin"
+dat = "q059-ret-bb.dat"
+
+[[Retrieval.quests]]
+bin = "q059-ret-d1.bin"
+dat = "q059-ret-d1.dat"
+
+[[Retrieval.quests]]
+bin = "q060-ret-bb.bin"
+dat = "q060-ret-bb.dat"
+
+[[Retrieval.quests]]
+bin = "q060-ret-d1.bin"
+dat = "q060-ret-d1.dat"
+
+
+[Extermination]
+list_order = 2
+description = "Exterminate the enemies!"
+
+[[Extermination.quests]]
+bin = "q101-ext-bb.bin"
+dat = "q101-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q101-ext-d1.bin"
+dat = "q101-ext-d1.dat"
+
+[[Extermination.quests]]
+bin = "q102-ext-bb.bin"
+dat = "q102-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q102-ext-d1.bin"
+dat = "q102-ext-d1.dat"
+
+[[Extermination.quests]]
+bin = "q103-ext-bb.bin"
+dat = "q103-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q103-ext-d1.bin"
+dat = "q103-ext-d1.dat"
+
+[[Extermination.quests]]
+bin = "q104-ext-bb.bin"
+dat = "q104-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q104-ext-d1.bin"
+dat = "q104-ext-d1.dat"
+
+[[Extermination.quests]]
+bin = "q108-ext-bb.bin"
+dat = "q108-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q108-ext-d1.bin"
+dat = "q108-ext-d1.dat"
+
+[[Extermination.quests]]
+bin = "q109-ext-bb.bin"
+dat = "q109-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q109-ext-d1.bin"
+dat = "q109-ext-d1.dat"
+
+[[Extermination.quests]]
+bin = "q110-ext-bb.bin"
+dat = "q110-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q110-ext-d1.bin"
+dat = "q110-ext-d1.dat"
+
+[[Extermination.quests]]
+bin = "q111-ext-bb.bin"
+dat = "q111-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q111-ext-d1.bin"
+dat = "q111-ext-d1.dat"
+
+[[Extermination.quests]]
+bin = "q117-ext-bb.bin"
+dat = "q117-ext-bb.dat"
+
+
+[VR]
+list_order = 3
+description = "VR training missions"
+
+[[VR.quests]]
+bin = "q118-vr-bb.bin"
+dat = "q118-vr-bb.dat"
+
+[[VR.quests]]
+bin = "q141-vr-bb.bin"
+dat = "q141-vr-bb.dat"
+
+[[VR.quests]]
+bin = "q142-vr-bb.bin"
+dat = "q142-vr-bb.dat"
+
+
+[Event]
+list_order = 4
+description = "Event missions!"
+
+[[Event.quests]]
+bin = "q124-evt-bb.bin"
+dat = "q124-evt-bb.dat"
+
+[[Event.quests]]
+bin = "q137-evt-bb.bin"
+dat = "q137-evt-bb.dat"
+
+[[Event.quests]]
+bin = "q138-evt-bb.bin"
+dat = "q138-evt-bb.dat"
+
diff --git a/data/quests/q001-1p-bb.bin b/data/quests/bb/ep1/single/q001-1p-bb.bin
similarity index 100%
rename from data/quests/q001-1p-bb.bin
rename to data/quests/bb/ep1/single/q001-1p-bb.bin
diff --git a/data/quests/q001-1p-bb.dat b/data/quests/bb/ep1/single/q001-1p-bb.dat
similarity index 100%
rename from data/quests/q001-1p-bb.dat
rename to data/quests/bb/ep1/single/q001-1p-bb.dat
diff --git a/data/quests/q002-1p-bb.bin b/data/quests/bb/ep1/single/q002-1p-bb.bin
similarity index 100%
rename from data/quests/q002-1p-bb.bin
rename to data/quests/bb/ep1/single/q002-1p-bb.bin
diff --git a/data/quests/q002-1p-bb.dat b/data/quests/bb/ep1/single/q002-1p-bb.dat
similarity index 100%
rename from data/quests/q002-1p-bb.dat
rename to data/quests/bb/ep1/single/q002-1p-bb.dat
diff --git a/data/quests/q003-1p-bb.bin b/data/quests/bb/ep1/single/q003-1p-bb.bin
similarity index 100%
rename from data/quests/q003-1p-bb.bin
rename to data/quests/bb/ep1/single/q003-1p-bb.bin
diff --git a/data/quests/q003-1p-bb.dat b/data/quests/bb/ep1/single/q003-1p-bb.dat
similarity index 100%
rename from data/quests/q003-1p-bb.dat
rename to data/quests/bb/ep1/single/q003-1p-bb.dat
diff --git a/data/quests/q004-1p-bb.bin b/data/quests/bb/ep1/single/q004-1p-bb.bin
similarity index 100%
rename from data/quests/q004-1p-bb.bin
rename to data/quests/bb/ep1/single/q004-1p-bb.bin
diff --git a/data/quests/q004-1p-bb.dat b/data/quests/bb/ep1/single/q004-1p-bb.dat
similarity index 100%
rename from data/quests/q004-1p-bb.dat
rename to data/quests/bb/ep1/single/q004-1p-bb.dat
diff --git a/data/quests/q005-1p-bb.bin b/data/quests/bb/ep1/single/q005-1p-bb.bin
similarity index 100%
rename from data/quests/q005-1p-bb.bin
rename to data/quests/bb/ep1/single/q005-1p-bb.bin
diff --git a/data/quests/q005-1p-bb.dat b/data/quests/bb/ep1/single/q005-1p-bb.dat
similarity index 100%
rename from data/quests/q005-1p-bb.dat
rename to data/quests/bb/ep1/single/q005-1p-bb.dat
diff --git a/data/quests/q006-1p-bb.bin b/data/quests/bb/ep1/single/q006-1p-bb.bin
similarity index 100%
rename from data/quests/q006-1p-bb.bin
rename to data/quests/bb/ep1/single/q006-1p-bb.bin
diff --git a/data/quests/q006-1p-bb.dat b/data/quests/bb/ep1/single/q006-1p-bb.dat
similarity index 100%
rename from data/quests/q006-1p-bb.dat
rename to data/quests/bb/ep1/single/q006-1p-bb.dat
diff --git a/data/quests/q007-1p-bb.bin b/data/quests/bb/ep1/single/q007-1p-bb.bin
similarity index 100%
rename from data/quests/q007-1p-bb.bin
rename to data/quests/bb/ep1/single/q007-1p-bb.bin
diff --git a/data/quests/q007-1p-bb.dat b/data/quests/bb/ep1/single/q007-1p-bb.dat
similarity index 100%
rename from data/quests/q007-1p-bb.dat
rename to data/quests/bb/ep1/single/q007-1p-bb.dat
diff --git a/data/quests/q008-1p-bb.bin b/data/quests/bb/ep1/single/q008-1p-bb.bin
similarity index 100%
rename from data/quests/q008-1p-bb.bin
rename to data/quests/bb/ep1/single/q008-1p-bb.bin
diff --git a/data/quests/q008-1p-bb.dat b/data/quests/bb/ep1/single/q008-1p-bb.dat
similarity index 100%
rename from data/quests/q008-1p-bb.dat
rename to data/quests/bb/ep1/single/q008-1p-bb.dat
diff --git a/data/quests/q009-1p-bb.bin b/data/quests/bb/ep1/single/q009-1p-bb.bin
similarity index 100%
rename from data/quests/q009-1p-bb.bin
rename to data/quests/bb/ep1/single/q009-1p-bb.bin
diff --git a/data/quests/q009-1p-bb.dat b/data/quests/bb/ep1/single/q009-1p-bb.dat
similarity index 100%
rename from data/quests/q009-1p-bb.dat
rename to data/quests/bb/ep1/single/q009-1p-bb.dat
diff --git a/data/quests/q010-1p-bb.bin b/data/quests/bb/ep1/single/q010-1p-bb.bin
similarity index 100%
rename from data/quests/q010-1p-bb.bin
rename to data/quests/bb/ep1/single/q010-1p-bb.bin
diff --git a/data/quests/q010-1p-bb.dat b/data/quests/bb/ep1/single/q010-1p-bb.dat
similarity index 100%
rename from data/quests/q010-1p-bb.dat
rename to data/quests/bb/ep1/single/q010-1p-bb.dat
diff --git a/data/quests/q011-1p-bb.bin b/data/quests/bb/ep1/single/q011-1p-bb.bin
similarity index 100%
rename from data/quests/q011-1p-bb.bin
rename to data/quests/bb/ep1/single/q011-1p-bb.bin
diff --git a/data/quests/q011-1p-bb.dat b/data/quests/bb/ep1/single/q011-1p-bb.dat
similarity index 100%
rename from data/quests/q011-1p-bb.dat
rename to data/quests/bb/ep1/single/q011-1p-bb.dat
diff --git a/data/quests/q012-1p-bb.bin b/data/quests/bb/ep1/single/q012-1p-bb.bin
similarity index 100%
rename from data/quests/q012-1p-bb.bin
rename to data/quests/bb/ep1/single/q012-1p-bb.bin
diff --git a/data/quests/q012-1p-bb.dat b/data/quests/bb/ep1/single/q012-1p-bb.dat
similarity index 100%
rename from data/quests/q012-1p-bb.dat
rename to data/quests/bb/ep1/single/q012-1p-bb.dat
diff --git a/data/quests/q013-1p-bb.bin b/data/quests/bb/ep1/single/q013-1p-bb.bin
similarity index 100%
rename from data/quests/q013-1p-bb.bin
rename to data/quests/bb/ep1/single/q013-1p-bb.bin
diff --git a/data/quests/q013-1p-bb.dat b/data/quests/bb/ep1/single/q013-1p-bb.dat
similarity index 100%
rename from data/quests/q013-1p-bb.dat
rename to data/quests/bb/ep1/single/q013-1p-bb.dat
diff --git a/data/quests/q014-1p-bb.bin b/data/quests/bb/ep1/single/q014-1p-bb.bin
similarity index 100%
rename from data/quests/q014-1p-bb.bin
rename to data/quests/bb/ep1/single/q014-1p-bb.bin
diff --git a/data/quests/q014-1p-bb.dat b/data/quests/bb/ep1/single/q014-1p-bb.dat
similarity index 100%
rename from data/quests/q014-1p-bb.dat
rename to data/quests/bb/ep1/single/q014-1p-bb.dat
diff --git a/data/quests/q015-1p-bb.bin b/data/quests/bb/ep1/single/q015-1p-bb.bin
similarity index 100%
rename from data/quests/q015-1p-bb.bin
rename to data/quests/bb/ep1/single/q015-1p-bb.bin
diff --git a/data/quests/q015-1p-bb.dat b/data/quests/bb/ep1/single/q015-1p-bb.dat
similarity index 100%
rename from data/quests/q015-1p-bb.dat
rename to data/quests/bb/ep1/single/q015-1p-bb.dat
diff --git a/data/quests/q016-1p-bb.bin b/data/quests/bb/ep1/single/q016-1p-bb.bin
similarity index 100%
rename from data/quests/q016-1p-bb.bin
rename to data/quests/bb/ep1/single/q016-1p-bb.bin
diff --git a/data/quests/q016-1p-bb.dat b/data/quests/bb/ep1/single/q016-1p-bb.dat
similarity index 100%
rename from data/quests/q016-1p-bb.dat
rename to data/quests/bb/ep1/single/q016-1p-bb.dat
diff --git a/data/quests/q017-1p-bb.bin b/data/quests/bb/ep1/single/q017-1p-bb.bin
similarity index 100%
rename from data/quests/q017-1p-bb.bin
rename to data/quests/bb/ep1/single/q017-1p-bb.bin
diff --git a/data/quests/q017-1p-bb.dat b/data/quests/bb/ep1/single/q017-1p-bb.dat
similarity index 100%
rename from data/quests/q017-1p-bb.dat
rename to data/quests/bb/ep1/single/q017-1p-bb.dat
diff --git a/data/quests/q018-1p-bb.bin b/data/quests/bb/ep1/single/q018-1p-bb.bin
similarity index 100%
rename from data/quests/q018-1p-bb.bin
rename to data/quests/bb/ep1/single/q018-1p-bb.bin
diff --git a/data/quests/q018-1p-bb.dat b/data/quests/bb/ep1/single/q018-1p-bb.dat
similarity index 100%
rename from data/quests/q018-1p-bb.dat
rename to data/quests/bb/ep1/single/q018-1p-bb.dat
diff --git a/data/quests/q019-1p-bb.bin b/data/quests/bb/ep1/single/q019-1p-bb.bin
similarity index 100%
rename from data/quests/q019-1p-bb.bin
rename to data/quests/bb/ep1/single/q019-1p-bb.bin
diff --git a/data/quests/q019-1p-bb.dat b/data/quests/bb/ep1/single/q019-1p-bb.dat
similarity index 100%
rename from data/quests/q019-1p-bb.dat
rename to data/quests/bb/ep1/single/q019-1p-bb.dat
diff --git a/data/quests/q020-1p-bb.bin b/data/quests/bb/ep1/single/q020-1p-bb.bin
similarity index 100%
rename from data/quests/q020-1p-bb.bin
rename to data/quests/bb/ep1/single/q020-1p-bb.bin
diff --git a/data/quests/q020-1p-bb.dat b/data/quests/bb/ep1/single/q020-1p-bb.dat
similarity index 100%
rename from data/quests/q020-1p-bb.dat
rename to data/quests/bb/ep1/single/q020-1p-bb.dat
diff --git a/data/quests/q021-1p-bb.bin b/data/quests/bb/ep1/single/q021-1p-bb.bin
similarity index 100%
rename from data/quests/q021-1p-bb.bin
rename to data/quests/bb/ep1/single/q021-1p-bb.bin
diff --git a/data/quests/q021-1p-bb.dat b/data/quests/bb/ep1/single/q021-1p-bb.dat
similarity index 100%
rename from data/quests/q021-1p-bb.dat
rename to data/quests/bb/ep1/single/q021-1p-bb.dat
diff --git a/data/quests/q022-1p-bb.bin b/data/quests/bb/ep1/single/q022-1p-bb.bin
similarity index 100%
rename from data/quests/q022-1p-bb.bin
rename to data/quests/bb/ep1/single/q022-1p-bb.bin
diff --git a/data/quests/q022-1p-bb.dat b/data/quests/bb/ep1/single/q022-1p-bb.dat
similarity index 100%
rename from data/quests/q022-1p-bb.dat
rename to data/quests/bb/ep1/single/q022-1p-bb.dat
diff --git a/data/quests/q023-1p-bb.bin b/data/quests/bb/ep1/single/q023-1p-bb.bin
similarity index 100%
rename from data/quests/q023-1p-bb.bin
rename to data/quests/bb/ep1/single/q023-1p-bb.bin
diff --git a/data/quests/q023-1p-bb.dat b/data/quests/bb/ep1/single/q023-1p-bb.dat
similarity index 100%
rename from data/quests/q023-1p-bb.dat
rename to data/quests/bb/ep1/single/q023-1p-bb.dat
diff --git a/data/quests/q024-1p-bb.bin b/data/quests/bb/ep1/single/q024-1p-bb.bin
similarity index 100%
rename from data/quests/q024-1p-bb.bin
rename to data/quests/bb/ep1/single/q024-1p-bb.bin
diff --git a/data/quests/q024-1p-bb.dat b/data/quests/bb/ep1/single/q024-1p-bb.dat
similarity index 100%
rename from data/quests/q024-1p-bb.dat
rename to data/quests/bb/ep1/single/q024-1p-bb.dat
diff --git a/data/quests/q025-1p-bb.bin b/data/quests/bb/ep1/single/q025-1p-bb.bin
similarity index 100%
rename from data/quests/q025-1p-bb.bin
rename to data/quests/bb/ep1/single/q025-1p-bb.bin
diff --git a/data/quests/q025-1p-bb.dat b/data/quests/bb/ep1/single/q025-1p-bb.dat
similarity index 100%
rename from data/quests/q025-1p-bb.dat
rename to data/quests/bb/ep1/single/q025-1p-bb.dat
diff --git a/data/quests/q026-1p-bb.bin b/data/quests/bb/ep1/single/q026-1p-bb.bin
similarity index 100%
rename from data/quests/q026-1p-bb.bin
rename to data/quests/bb/ep1/single/q026-1p-bb.bin
diff --git a/data/quests/q026-1p-bb.dat b/data/quests/bb/ep1/single/q026-1p-bb.dat
similarity index 100%
rename from data/quests/q026-1p-bb.dat
rename to data/quests/bb/ep1/single/q026-1p-bb.dat
diff --git a/data/quests/bb/ep1/single/quests.toml b/data/quests/bb/ep1/single/quests.toml
new file mode 100644
index 0000000..3daa6a1
--- /dev/null
+++ b/data/quests/bb/ep1/single/quests.toml
@@ -0,0 +1,108 @@
+[Story]
+list_order = 1
+description = "Story quests"
+
+[[Story.quests]]
+bin = "q001-1p-bb.bin"
+dat = "q001-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q002-1p-bb.bin"
+dat = "q002-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q003-1p-bb.bin"
+dat = "q003-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q004-1p-bb.bin"
+dat = "q004-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q005-1p-bb.bin"
+dat = "q005-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q006-1p-bb.bin"
+dat = "q006-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q007-1p-bb.bin"
+dat = "q007-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q008-1p-bb.bin"
+dat = "q008-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q009-1p-bb.bin"
+dat = "q009-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q010-1p-bb.bin"
+dat = "q010-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q011-1p-bb.bin"
+dat = "q011-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q012-1p-bb.bin"
+dat = "q012-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q013-1p-bb.bin"
+dat = "q013-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q014-1p-bb.bin"
+dat = "q014-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q015-1p-bb.bin"
+dat = "q015-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q016-1p-bb.bin"
+dat = "q016-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q017-1p-bb.bin"
+dat = "q017-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q018-1p-bb.bin"
+dat = "q018-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q019-1p-bb.bin"
+dat = "q019-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q020-1p-bb.bin"
+dat = "q020-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q021-1p-bb.bin"
+dat = "q021-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q022-1p-bb.bin"
+dat = "q022-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q023-1p-bb.bin"
+dat = "q023-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q024-1p-bb.bin"
+dat = "q024-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q025-1p-bb.bin"
+dat = "q025-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q026-1p-bb.bin"
+dat = "q026-1p-bb.dat"
+
diff --git a/data/quests/bb/ep2/battle/b001-bb.bin b/data/quests/bb/ep2/battle/b001-bb.bin
new file mode 100755
index 0000000..4fd7b26
Binary files /dev/null and b/data/quests/bb/ep2/battle/b001-bb.bin differ
diff --git a/data/quests/b001-dc.dat b/data/quests/bb/ep2/battle/b001-bb.dat
similarity index 100%
rename from data/quests/b001-dc.dat
rename to data/quests/bb/ep2/battle/b001-bb.dat
diff --git a/data/quests/bb/ep2/battle/b002-bb.bin b/data/quests/bb/ep2/battle/b002-bb.bin
new file mode 100755
index 0000000..eddead3
Binary files /dev/null and b/data/quests/bb/ep2/battle/b002-bb.bin differ
diff --git a/data/quests/b002-gc.dat b/data/quests/bb/ep2/battle/b002-bb.dat
similarity index 100%
rename from data/quests/b002-gc.dat
rename to data/quests/bb/ep2/battle/b002-bb.dat
diff --git a/data/quests/bb/ep2/battle/b003-bb.bin b/data/quests/bb/ep2/battle/b003-bb.bin
new file mode 100755
index 0000000..aff67c7
Binary files /dev/null and b/data/quests/bb/ep2/battle/b003-bb.bin differ
diff --git a/data/quests/b003-dc.dat b/data/quests/bb/ep2/battle/b003-bb.dat
similarity index 100%
rename from data/quests/b003-dc.dat
rename to data/quests/bb/ep2/battle/b003-bb.dat
diff --git a/data/quests/bb/ep2/battle/b004-bb.bin b/data/quests/bb/ep2/battle/b004-bb.bin
new file mode 100755
index 0000000..794361d
Binary files /dev/null and b/data/quests/bb/ep2/battle/b004-bb.bin differ
diff --git a/data/quests/b004-dc.dat b/data/quests/bb/ep2/battle/b004-bb.dat
similarity index 100%
rename from data/quests/b004-dc.dat
rename to data/quests/bb/ep2/battle/b004-bb.dat
diff --git a/data/quests/bb/ep2/battle/b005-bb.bin b/data/quests/bb/ep2/battle/b005-bb.bin
new file mode 100755
index 0000000..04c8635
Binary files /dev/null and b/data/quests/bb/ep2/battle/b005-bb.bin differ
diff --git a/data/quests/b005-dc.dat b/data/quests/bb/ep2/battle/b005-bb.dat
similarity index 100%
rename from data/quests/b005-dc.dat
rename to data/quests/bb/ep2/battle/b005-bb.dat
diff --git a/data/quests/bb/ep2/battle/b006-bb.bin b/data/quests/bb/ep2/battle/b006-bb.bin
new file mode 100755
index 0000000..3f05c27
Binary files /dev/null and b/data/quests/bb/ep2/battle/b006-bb.bin differ
diff --git a/data/quests/b006-dc.dat b/data/quests/bb/ep2/battle/b006-bb.dat
similarity index 100%
rename from data/quests/b006-dc.dat
rename to data/quests/bb/ep2/battle/b006-bb.dat
diff --git a/data/quests/bb/ep2/battle/b007-bb.bin b/data/quests/bb/ep2/battle/b007-bb.bin
new file mode 100755
index 0000000..608ab8e
Binary files /dev/null and b/data/quests/bb/ep2/battle/b007-bb.bin differ
diff --git a/data/quests/b007-dc.dat b/data/quests/bb/ep2/battle/b007-bb.dat
similarity index 100%
rename from data/quests/b007-dc.dat
rename to data/quests/bb/ep2/battle/b007-bb.dat
diff --git a/data/quests/bb/ep2/battle/b008-bb.bin b/data/quests/bb/ep2/battle/b008-bb.bin
new file mode 100755
index 0000000..88b0f1c
Binary files /dev/null and b/data/quests/bb/ep2/battle/b008-bb.bin differ
diff --git a/data/quests/b008-dc.dat b/data/quests/bb/ep2/battle/b008-bb.dat
similarity index 100%
rename from data/quests/b008-dc.dat
rename to data/quests/bb/ep2/battle/b008-bb.dat
diff --git a/data/quests/bb/ep2/battle/quests.toml b/data/quests/bb/ep2/battle/quests.toml
new file mode 100644
index 0000000..f62a1a3
--- /dev/null
+++ b/data/quests/bb/ep2/battle/quests.toml
@@ -0,0 +1,36 @@
+[Battle]
+list_order = 1
+description = "Challenge your skill against other hunters!"
+
+[[Battle.quests]]
+bin = "b001-bb.bin"
+dat = "b001-bb.dat"
+
+[[Battle.quests]]
+bin = "b002-bb.bin"
+dat = "b002-bb.dat"
+
+[[Battle.quests]]
+bin = "b003-bb.bin"
+dat = "b003-bb.dat"
+
+[[Battle.quests]]
+bin = "b004-bb.bin"
+dat = "b004-bb.dat"
+
+[[Battle.quests]]
+bin = "b005-bb.bin"
+dat = "b005-bb.dat"
+
+[[Battle.quests]]
+bin = "b006-bb.bin"
+dat = "b006-bb.dat"
+
+[[Battle.quests]]
+bin = "b007-bb.bin"
+dat = "b007-bb.dat"
+
+[[Battle.quests]]
+bin = "b008-bb.bin"
+dat = "b008-bb.dat"
+
diff --git a/data/quests/c201-bb.bin b/data/quests/bb/ep2/challenge/c201-bb.bin
similarity index 100%
rename from data/quests/c201-bb.bin
rename to data/quests/bb/ep2/challenge/c201-bb.bin
diff --git a/data/quests/c201-bb.dat b/data/quests/bb/ep2/challenge/c201-bb.dat
similarity index 100%
rename from data/quests/c201-bb.dat
rename to data/quests/bb/ep2/challenge/c201-bb.dat
diff --git a/data/quests/c202-bb.bin b/data/quests/bb/ep2/challenge/c202-bb.bin
similarity index 100%
rename from data/quests/c202-bb.bin
rename to data/quests/bb/ep2/challenge/c202-bb.bin
diff --git a/data/quests/c202-bb.dat b/data/quests/bb/ep2/challenge/c202-bb.dat
similarity index 100%
rename from data/quests/c202-bb.dat
rename to data/quests/bb/ep2/challenge/c202-bb.dat
diff --git a/data/quests/c203-bb.bin b/data/quests/bb/ep2/challenge/c203-bb.bin
similarity index 100%
rename from data/quests/c203-bb.bin
rename to data/quests/bb/ep2/challenge/c203-bb.bin
diff --git a/data/quests/c203-bb.dat b/data/quests/bb/ep2/challenge/c203-bb.dat
similarity index 100%
rename from data/quests/c203-bb.dat
rename to data/quests/bb/ep2/challenge/c203-bb.dat
diff --git a/data/quests/c204-bb.bin b/data/quests/bb/ep2/challenge/c204-bb.bin
similarity index 100%
rename from data/quests/c204-bb.bin
rename to data/quests/bb/ep2/challenge/c204-bb.bin
diff --git a/data/quests/c204-bb.dat b/data/quests/bb/ep2/challenge/c204-bb.dat
similarity index 100%
rename from data/quests/c204-bb.dat
rename to data/quests/bb/ep2/challenge/c204-bb.dat
diff --git a/data/quests/c205-bb.bin b/data/quests/bb/ep2/challenge/c205-bb.bin
similarity index 100%
rename from data/quests/c205-bb.bin
rename to data/quests/bb/ep2/challenge/c205-bb.bin
diff --git a/data/quests/c205-bb.dat b/data/quests/bb/ep2/challenge/c205-bb.dat
similarity index 100%
rename from data/quests/c205-bb.dat
rename to data/quests/bb/ep2/challenge/c205-bb.dat
diff --git a/data/quests/bb/ep2/challenge/quests.toml b/data/quests/bb/ep2/challenge/quests.toml
new file mode 100644
index 0000000..2ef9cef
--- /dev/null
+++ b/data/quests/bb/ep2/challenge/quests.toml
@@ -0,0 +1,24 @@
+[Challenge]
+list_order = 1
+description = "Pioneer 2's advanced training course."
+
+[[Challenge.quests]]
+bin = "c201-bb.bin"
+dat = "c201-bb.dat"
+
+[[Challenge.quests]]
+bin = "c202-bb.bin"
+dat = "c202-bb.dat"
+
+[[Challenge.quests]]
+bin = "c203-bb.bin"
+dat = "c203-bb.dat"
+
+[[Challenge.quests]]
+bin = "c204-bb.bin"
+dat = "c204-bb.dat"
+
+[[Challenge.quests]]
+bin = "c205-bb.bin"
+dat = "c205-bb.dat"
+
diff --git a/data/quests/q451-gov-bb.bin b/data/quests/bb/ep2/government/q451-gov-bb.bin
similarity index 100%
rename from data/quests/q451-gov-bb.bin
rename to data/quests/bb/ep2/government/q451-gov-bb.bin
diff --git a/data/quests/q451-gov-bb.dat b/data/quests/bb/ep2/government/q451-gov-bb.dat
similarity index 100%
rename from data/quests/q451-gov-bb.dat
rename to data/quests/bb/ep2/government/q451-gov-bb.dat
diff --git a/data/quests/q452-gov-bb.bin b/data/quests/bb/ep2/government/q452-gov-bb.bin
similarity index 100%
rename from data/quests/q452-gov-bb.bin
rename to data/quests/bb/ep2/government/q452-gov-bb.bin
diff --git a/data/quests/q452-gov-bb.dat b/data/quests/bb/ep2/government/q452-gov-bb.dat
similarity index 100%
rename from data/quests/q452-gov-bb.dat
rename to data/quests/bb/ep2/government/q452-gov-bb.dat
diff --git a/data/quests/q453-gov-bb.bin b/data/quests/bb/ep2/government/q453-gov-bb.bin
similarity index 100%
rename from data/quests/q453-gov-bb.bin
rename to data/quests/bb/ep2/government/q453-gov-bb.bin
diff --git a/data/quests/q453-gov-bb.dat b/data/quests/bb/ep2/government/q453-gov-bb.dat
similarity index 100%
rename from data/quests/q453-gov-bb.dat
rename to data/quests/bb/ep2/government/q453-gov-bb.dat
diff --git a/data/quests/q454-gov-bb.bin b/data/quests/bb/ep2/government/q454-gov-bb.bin
similarity index 100%
rename from data/quests/q454-gov-bb.bin
rename to data/quests/bb/ep2/government/q454-gov-bb.bin
diff --git a/data/quests/q454-gov-bb.dat b/data/quests/bb/ep2/government/q454-gov-bb.dat
similarity index 100%
rename from data/quests/q454-gov-bb.dat
rename to data/quests/bb/ep2/government/q454-gov-bb.dat
diff --git a/data/quests/q455-gov-bb.bin b/data/quests/bb/ep2/government/q455-gov-bb.bin
similarity index 100%
rename from data/quests/q455-gov-bb.bin
rename to data/quests/bb/ep2/government/q455-gov-bb.bin
diff --git a/data/quests/q455-gov-bb.dat b/data/quests/bb/ep2/government/q455-gov-bb.dat
similarity index 100%
rename from data/quests/q455-gov-bb.dat
rename to data/quests/bb/ep2/government/q455-gov-bb.dat
diff --git a/data/quests/q456-gov-bb.bin b/data/quests/bb/ep2/government/q456-gov-bb.bin
similarity index 100%
rename from data/quests/q456-gov-bb.bin
rename to data/quests/bb/ep2/government/q456-gov-bb.bin
diff --git a/data/quests/q456-gov-bb.dat b/data/quests/bb/ep2/government/q456-gov-bb.dat
similarity index 100%
rename from data/quests/q456-gov-bb.dat
rename to data/quests/bb/ep2/government/q456-gov-bb.dat
diff --git a/data/quests/q457-gov-bb.bin b/data/quests/bb/ep2/government/q457-gov-bb.bin
similarity index 100%
rename from data/quests/q457-gov-bb.bin
rename to data/quests/bb/ep2/government/q457-gov-bb.bin
diff --git a/data/quests/q457-gov-bb.dat b/data/quests/bb/ep2/government/q457-gov-bb.dat
similarity index 100%
rename from data/quests/q457-gov-bb.dat
rename to data/quests/bb/ep2/government/q457-gov-bb.dat
diff --git a/data/quests/q458-gov-bb.bin b/data/quests/bb/ep2/government/q458-gov-bb.bin
similarity index 100%
rename from data/quests/q458-gov-bb.bin
rename to data/quests/bb/ep2/government/q458-gov-bb.bin
diff --git a/data/quests/q458-gov-bb.dat b/data/quests/bb/ep2/government/q458-gov-bb.dat
similarity index 100%
rename from data/quests/q458-gov-bb.dat
rename to data/quests/bb/ep2/government/q458-gov-bb.dat
diff --git a/data/quests/q459-gov-bb.bin b/data/quests/bb/ep2/government/q459-gov-bb.bin
similarity index 100%
rename from data/quests/q459-gov-bb.bin
rename to data/quests/bb/ep2/government/q459-gov-bb.bin
diff --git a/data/quests/q459-gov-bb.dat b/data/quests/bb/ep2/government/q459-gov-bb.dat
similarity index 100%
rename from data/quests/q459-gov-bb.dat
rename to data/quests/bb/ep2/government/q459-gov-bb.dat
diff --git a/data/quests/q460-gov-bb.bin b/data/quests/bb/ep2/government/q460-gov-bb.bin
similarity index 100%
rename from data/quests/q460-gov-bb.bin
rename to data/quests/bb/ep2/government/q460-gov-bb.bin
diff --git a/data/quests/q460-gov-bb.dat b/data/quests/bb/ep2/government/q460-gov-bb.dat
similarity index 100%
rename from data/quests/q460-gov-bb.dat
rename to data/quests/bb/ep2/government/q460-gov-bb.dat
diff --git a/data/quests/q461-gov-bb.bin b/data/quests/bb/ep2/government/q461-gov-bb.bin
similarity index 100%
rename from data/quests/q461-gov-bb.bin
rename to data/quests/bb/ep2/government/q461-gov-bb.bin
diff --git a/data/quests/q461-gov-bb.dat b/data/quests/bb/ep2/government/q461-gov-bb.dat
similarity index 100%
rename from data/quests/q461-gov-bb.dat
rename to data/quests/bb/ep2/government/q461-gov-bb.dat
diff --git a/data/quests/q462-gov-bb.bin b/data/quests/bb/ep2/government/q462-gov-bb.bin
similarity index 100%
rename from data/quests/q462-gov-bb.bin
rename to data/quests/bb/ep2/government/q462-gov-bb.bin
diff --git a/data/quests/q462-gov-bb.dat b/data/quests/bb/ep2/government/q462-gov-bb.dat
similarity index 100%
rename from data/quests/q462-gov-bb.dat
rename to data/quests/bb/ep2/government/q462-gov-bb.dat
diff --git a/data/quests/q463-gov-bb.bin b/data/quests/bb/ep2/government/q463-gov-bb.bin
similarity index 100%
rename from data/quests/q463-gov-bb.bin
rename to data/quests/bb/ep2/government/q463-gov-bb.bin
diff --git a/data/quests/q463-gov-bb.dat b/data/quests/bb/ep2/government/q463-gov-bb.dat
similarity index 100%
rename from data/quests/q463-gov-bb.dat
rename to data/quests/bb/ep2/government/q463-gov-bb.dat
diff --git a/data/quests/q464-gov-bb.bin b/data/quests/bb/ep2/government/q464-gov-bb.bin
similarity index 100%
rename from data/quests/q464-gov-bb.bin
rename to data/quests/bb/ep2/government/q464-gov-bb.bin
diff --git a/data/quests/q464-gov-bb.dat b/data/quests/bb/ep2/government/q464-gov-bb.dat
similarity index 100%
rename from data/quests/q464-gov-bb.dat
rename to data/quests/bb/ep2/government/q464-gov-bb.dat
diff --git a/data/quests/q465-gov-bb.bin b/data/quests/bb/ep2/government/q465-gov-bb.bin
similarity index 100%
rename from data/quests/q465-gov-bb.bin
rename to data/quests/bb/ep2/government/q465-gov-bb.bin
diff --git a/data/quests/q465-gov-bb.dat b/data/quests/bb/ep2/government/q465-gov-bb.dat
similarity index 100%
rename from data/quests/q465-gov-bb.dat
rename to data/quests/bb/ep2/government/q465-gov-bb.dat
diff --git a/data/quests/q466-gov-bb.bin b/data/quests/bb/ep2/government/q466-gov-bb.bin
similarity index 100%
rename from data/quests/q466-gov-bb.bin
rename to data/quests/bb/ep2/government/q466-gov-bb.bin
diff --git a/data/quests/q466-gov-bb.dat b/data/quests/bb/ep2/government/q466-gov-bb.dat
similarity index 100%
rename from data/quests/q466-gov-bb.dat
rename to data/quests/bb/ep2/government/q466-gov-bb.dat
diff --git a/data/quests/q467-gov-bb.bin b/data/quests/bb/ep2/government/q467-gov-bb.bin
similarity index 100%
rename from data/quests/q467-gov-bb.bin
rename to data/quests/bb/ep2/government/q467-gov-bb.bin
diff --git a/data/quests/q467-gov-bb.dat b/data/quests/bb/ep2/government/q467-gov-bb.dat
similarity index 100%
rename from data/quests/q467-gov-bb.dat
rename to data/quests/bb/ep2/government/q467-gov-bb.dat
diff --git a/data/quests/q468-gov-bb.bin b/data/quests/bb/ep2/government/q468-gov-bb.bin
similarity index 100%
rename from data/quests/q468-gov-bb.bin
rename to data/quests/bb/ep2/government/q468-gov-bb.bin
diff --git a/data/quests/q468-gov-bb.dat b/data/quests/bb/ep2/government/q468-gov-bb.dat
similarity index 100%
rename from data/quests/q468-gov-bb.dat
rename to data/quests/bb/ep2/government/q468-gov-bb.dat
diff --git a/data/quests/bb/ep2/government/quests.toml b/data/quests/bb/ep2/government/quests.toml
new file mode 100644
index 0000000..1ec3b06
--- /dev/null
+++ b/data/quests/bb/ep2/government/quests.toml
@@ -0,0 +1,76 @@
+[Government]
+list_order = 1
+description = "What lies below on Ragol?"
+
+[[Government.quests]]
+bin = "q451-gov-bb.bin"
+dat = "q451-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q452-gov-bb.bin"
+dat = "q452-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q453-gov-bb.bin"
+dat = "q453-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q454-gov-bb.bin"
+dat = "q454-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q455-gov-bb.bin"
+dat = "q455-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q456-gov-bb.bin"
+dat = "q456-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q457-gov-bb.bin"
+dat = "q457-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q458-gov-bb.bin"
+dat = "q458-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q459-gov-bb.bin"
+dat = "q459-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q460-gov-bb.bin"
+dat = "q460-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q461-gov-bb.bin"
+dat = "q461-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q462-gov-bb.bin"
+dat = "q462-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q463-gov-bb.bin"
+dat = "q463-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q464-gov-bb.bin"
+dat = "q464-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q465-gov-bb.bin"
+dat = "q465-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q466-gov-bb.bin"
+dat = "q466-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q467-gov-bb.bin"
+dat = "q467-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q468-gov-bb.bin"
+dat = "q468-gov-bb.dat"
+
diff --git a/data/quests/q201-evt-bb.bin b/data/quests/bb/ep2/multi/q201-evt-bb.bin
similarity index 100%
rename from data/quests/q201-evt-bb.bin
rename to data/quests/bb/ep2/multi/q201-evt-bb.bin
diff --git a/data/quests/q201-evt-bb.dat b/data/quests/bb/ep2/multi/q201-evt-bb.dat
similarity index 100%
rename from data/quests/q201-evt-bb.dat
rename to data/quests/bb/ep2/multi/q201-evt-bb.dat
diff --git a/data/quests/q203-vr-bb.bin b/data/quests/bb/ep2/multi/q203-vr-bb.bin
similarity index 100%
rename from data/quests/q203-vr-bb.bin
rename to data/quests/bb/ep2/multi/q203-vr-bb.bin
diff --git a/data/quests/q203-vr-bb.dat b/data/quests/bb/ep2/multi/q203-vr-bb.dat
similarity index 100%
rename from data/quests/q203-vr-bb.dat
rename to data/quests/bb/ep2/multi/q203-vr-bb.dat
diff --git a/data/quests/q219-shp-bb.bin b/data/quests/bb/ep2/multi/q219-shp-bb.bin
similarity index 100%
rename from data/quests/q219-shp-bb.bin
rename to data/quests/bb/ep2/multi/q219-shp-bb.bin
diff --git a/data/quests/q219-shp-bb.dat b/data/quests/bb/ep2/multi/q219-shp-bb.dat
similarity index 100%
rename from data/quests/q219-shp-bb.dat
rename to data/quests/bb/ep2/multi/q219-shp-bb.dat
diff --git a/data/quests/q223-twr-bb.bin b/data/quests/bb/ep2/multi/q223-twr-bb.bin
similarity index 100%
rename from data/quests/q223-twr-bb.bin
rename to data/quests/bb/ep2/multi/q223-twr-bb.bin
diff --git a/data/quests/q223-twr-bb.dat b/data/quests/bb/ep2/multi/q223-twr-bb.dat
similarity index 100%
rename from data/quests/q223-twr-bb.dat
rename to data/quests/bb/ep2/multi/q223-twr-bb.dat
diff --git a/data/quests/q224-twr-bb.bin b/data/quests/bb/ep2/multi/q224-twr-bb.bin
similarity index 100%
rename from data/quests/q224-twr-bb.bin
rename to data/quests/bb/ep2/multi/q224-twr-bb.bin
diff --git a/data/quests/q224-twr-bb.dat b/data/quests/bb/ep2/multi/q224-twr-bb.dat
similarity index 100%
rename from data/quests/q224-twr-bb.dat
rename to data/quests/bb/ep2/multi/q224-twr-bb.dat
diff --git a/data/quests/q233-ext-bb.bin b/data/quests/bb/ep2/multi/q233-ext-bb.bin
similarity index 100%
rename from data/quests/q233-ext-bb.bin
rename to data/quests/bb/ep2/multi/q233-ext-bb.bin
diff --git a/data/quests/q233-ext-bb.dat b/data/quests/bb/ep2/multi/q233-ext-bb.dat
similarity index 100%
rename from data/quests/q233-ext-bb.dat
rename to data/quests/bb/ep2/multi/q233-ext-bb.dat
diff --git a/data/quests/q234-ext-bb.bin b/data/quests/bb/ep2/multi/q234-ext-bb.bin
similarity index 100%
rename from data/quests/q234-ext-bb.bin
rename to data/quests/bb/ep2/multi/q234-ext-bb.bin
diff --git a/data/quests/q234-ext-bb.dat b/data/quests/bb/ep2/multi/q234-ext-bb.dat
similarity index 100%
rename from data/quests/q234-ext-bb.dat
rename to data/quests/bb/ep2/multi/q234-ext-bb.dat
diff --git a/data/quests/q235-ext-bb.bin b/data/quests/bb/ep2/multi/q235-ext-bb.bin
similarity index 100%
rename from data/quests/q235-ext-bb.bin
rename to data/quests/bb/ep2/multi/q235-ext-bb.bin
diff --git a/data/quests/q235-ext-bb.dat b/data/quests/bb/ep2/multi/q235-ext-bb.dat
similarity index 100%
rename from data/quests/q235-ext-bb.dat
rename to data/quests/bb/ep2/multi/q235-ext-bb.dat
diff --git a/data/quests/q236-ext-bb.bin b/data/quests/bb/ep2/multi/q236-ext-bb.bin
similarity index 100%
rename from data/quests/q236-ext-bb.bin
rename to data/quests/bb/ep2/multi/q236-ext-bb.bin
diff --git a/data/quests/q236-ext-bb.dat b/data/quests/bb/ep2/multi/q236-ext-bb.dat
similarity index 100%
rename from data/quests/q236-ext-bb.dat
rename to data/quests/bb/ep2/multi/q236-ext-bb.dat
diff --git a/data/quests/bb/ep2/multi/quests.toml b/data/quests/bb/ep2/multi/quests.toml
new file mode 100644
index 0000000..10d58ab
--- /dev/null
+++ b/data/quests/bb/ep2/multi/quests.toml
@@ -0,0 +1,60 @@
+[Extermination]
+list_order = 1
+description = "Exterminate the enemies!"
+
+[[Extermination.quests]]
+bin = "q233-ext-bb.bin"
+dat = "q233-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q234-ext-bb.bin"
+dat = "q234-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q235-ext-bb.bin"
+dat = "q235-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q236-ext-bb.bin"
+dat = "q236-ext-bb.dat"
+
+
+[VR]
+list_order = 2
+description = "VR training missions"
+
+[[VR.quests]]
+bin = "q203-vr-bb.bin"
+dat = "q203-vr-bb.dat"
+
+
+[Event]
+list_order = 3
+description = "Event missions!"
+
+[[Event.quests]]
+bin = "q201-evt-bb.bin"
+dat = "q201-evt-bb.dat"
+
+
+[Shop]
+list_order = 4
+description = "Time to do some shopping!"
+
+[[Shop.quests]]
+bin = "q219-shp-bb.bin"
+dat = "q219-shp-bb.dat"
+
+
+[Tower]
+list_order = 5
+description = "Investigate Gal Da Val's towers."
+
+[[Tower.quests]]
+bin = "q223-twr-bb.bin"
+dat = "q223-twr-bb.dat"
+
+[[Tower.quests]]
+bin = "q224-twr-bb.bin"
+dat = "q224-twr-bb.dat"
+
diff --git a/data/quests/q027-1p-bb.bin b/data/quests/bb/ep2/single/q027-1p-bb.bin
similarity index 100%
rename from data/quests/q027-1p-bb.bin
rename to data/quests/bb/ep2/single/q027-1p-bb.bin
diff --git a/data/quests/q027-1p-bb.dat b/data/quests/bb/ep2/single/q027-1p-bb.dat
similarity index 100%
rename from data/quests/q027-1p-bb.dat
rename to data/quests/bb/ep2/single/q027-1p-bb.dat
diff --git a/data/quests/bb/ep2/single/quests.toml b/data/quests/bb/ep2/single/quests.toml
new file mode 100644
index 0000000..c83e694
--- /dev/null
+++ b/data/quests/bb/ep2/single/quests.toml
@@ -0,0 +1,8 @@
+[Story]
+list_order = 1
+description = "Story quests"
+
+[[Story.quests]]
+bin = "q027-1p-bb.bin"
+dat = "q027-1p-bb.dat"
+
diff --git a/data/quests/bb/ep4/battle/b001-bb.bin b/data/quests/bb/ep4/battle/b001-bb.bin
new file mode 100755
index 0000000..4fd7b26
Binary files /dev/null and b/data/quests/bb/ep4/battle/b001-bb.bin differ
diff --git a/data/quests/b001-gc.dat b/data/quests/bb/ep4/battle/b001-bb.dat
similarity index 100%
rename from data/quests/b001-gc.dat
rename to data/quests/bb/ep4/battle/b001-bb.dat
diff --git a/data/quests/bb/ep4/battle/b002-bb.bin b/data/quests/bb/ep4/battle/b002-bb.bin
new file mode 100755
index 0000000..eddead3
Binary files /dev/null and b/data/quests/bb/ep4/battle/b002-bb.bin differ
diff --git a/data/quests/bb/ep4/battle/b002-bb.dat b/data/quests/bb/ep4/battle/b002-bb.dat
new file mode 100755
index 0000000..8e9a7dc
Binary files /dev/null and b/data/quests/bb/ep4/battle/b002-bb.dat differ
diff --git a/data/quests/bb/ep4/battle/b003-bb.bin b/data/quests/bb/ep4/battle/b003-bb.bin
new file mode 100755
index 0000000..aff67c7
Binary files /dev/null and b/data/quests/bb/ep4/battle/b003-bb.bin differ
diff --git a/data/quests/b003-gc.dat b/data/quests/bb/ep4/battle/b003-bb.dat
similarity index 100%
rename from data/quests/b003-gc.dat
rename to data/quests/bb/ep4/battle/b003-bb.dat
diff --git a/data/quests/bb/ep4/battle/b004-bb.bin b/data/quests/bb/ep4/battle/b004-bb.bin
new file mode 100755
index 0000000..794361d
Binary files /dev/null and b/data/quests/bb/ep4/battle/b004-bb.bin differ
diff --git a/data/quests/b004-gc.dat b/data/quests/bb/ep4/battle/b004-bb.dat
similarity index 100%
rename from data/quests/b004-gc.dat
rename to data/quests/bb/ep4/battle/b004-bb.dat
diff --git a/data/quests/bb/ep4/battle/b005-bb.bin b/data/quests/bb/ep4/battle/b005-bb.bin
new file mode 100755
index 0000000..04c8635
Binary files /dev/null and b/data/quests/bb/ep4/battle/b005-bb.bin differ
diff --git a/data/quests/b005-gc.dat b/data/quests/bb/ep4/battle/b005-bb.dat
similarity index 100%
rename from data/quests/b005-gc.dat
rename to data/quests/bb/ep4/battle/b005-bb.dat
diff --git a/data/quests/bb/ep4/battle/b006-bb.bin b/data/quests/bb/ep4/battle/b006-bb.bin
new file mode 100755
index 0000000..3f05c27
Binary files /dev/null and b/data/quests/bb/ep4/battle/b006-bb.bin differ
diff --git a/data/quests/b006-gc.dat b/data/quests/bb/ep4/battle/b006-bb.dat
similarity index 100%
rename from data/quests/b006-gc.dat
rename to data/quests/bb/ep4/battle/b006-bb.dat
diff --git a/data/quests/bb/ep4/battle/b007-bb.bin b/data/quests/bb/ep4/battle/b007-bb.bin
new file mode 100755
index 0000000..608ab8e
Binary files /dev/null and b/data/quests/bb/ep4/battle/b007-bb.bin differ
diff --git a/data/quests/b007-gc.dat b/data/quests/bb/ep4/battle/b007-bb.dat
similarity index 100%
rename from data/quests/b007-gc.dat
rename to data/quests/bb/ep4/battle/b007-bb.dat
diff --git a/data/quests/bb/ep4/battle/b008-bb.bin b/data/quests/bb/ep4/battle/b008-bb.bin
new file mode 100755
index 0000000..88b0f1c
Binary files /dev/null and b/data/quests/bb/ep4/battle/b008-bb.bin differ
diff --git a/data/quests/b008-gc.dat b/data/quests/bb/ep4/battle/b008-bb.dat
similarity index 100%
rename from data/quests/b008-gc.dat
rename to data/quests/bb/ep4/battle/b008-bb.dat
diff --git a/data/quests/bb/ep4/battle/quests.toml b/data/quests/bb/ep4/battle/quests.toml
new file mode 100644
index 0000000..f62a1a3
--- /dev/null
+++ b/data/quests/bb/ep4/battle/quests.toml
@@ -0,0 +1,36 @@
+[Battle]
+list_order = 1
+description = "Challenge your skill against other hunters!"
+
+[[Battle.quests]]
+bin = "b001-bb.bin"
+dat = "b001-bb.dat"
+
+[[Battle.quests]]
+bin = "b002-bb.bin"
+dat = "b002-bb.dat"
+
+[[Battle.quests]]
+bin = "b003-bb.bin"
+dat = "b003-bb.dat"
+
+[[Battle.quests]]
+bin = "b004-bb.bin"
+dat = "b004-bb.dat"
+
+[[Battle.quests]]
+bin = "b005-bb.bin"
+dat = "b005-bb.dat"
+
+[[Battle.quests]]
+bin = "b006-bb.bin"
+dat = "b006-bb.dat"
+
+[[Battle.quests]]
+bin = "b007-bb.bin"
+dat = "b007-bb.dat"
+
+[[Battle.quests]]
+bin = "b008-bb.bin"
+dat = "b008-bb.dat"
+
diff --git a/data/quests/bb/ep4/challenge/quests.toml b/data/quests/bb/ep4/challenge/quests.toml
new file mode 100644
index 0000000..d88fea3
--- /dev/null
+++ b/data/quests/bb/ep4/challenge/quests.toml
@@ -0,0 +1,5 @@
+[Challenge]
+list_order = 1
+description = "Pioneer 2's advanced training course."
+
+# TODO: ep4 challenge mode quests
diff --git a/data/quests/q701-gov-bb.bin b/data/quests/bb/ep4/government/q701-gov-bb.bin
similarity index 100%
rename from data/quests/q701-gov-bb.bin
rename to data/quests/bb/ep4/government/q701-gov-bb.bin
diff --git a/data/quests/q701-gov-bb.dat b/data/quests/bb/ep4/government/q701-gov-bb.dat
similarity index 100%
rename from data/quests/q701-gov-bb.dat
rename to data/quests/bb/ep4/government/q701-gov-bb.dat
diff --git a/data/quests/q702-gov-bb.bin b/data/quests/bb/ep4/government/q702-gov-bb.bin
similarity index 100%
rename from data/quests/q702-gov-bb.bin
rename to data/quests/bb/ep4/government/q702-gov-bb.bin
diff --git a/data/quests/q702-gov-bb.dat b/data/quests/bb/ep4/government/q702-gov-bb.dat
similarity index 100%
rename from data/quests/q702-gov-bb.dat
rename to data/quests/bb/ep4/government/q702-gov-bb.dat
diff --git a/data/quests/q703-gov-bb.bin b/data/quests/bb/ep4/government/q703-gov-bb.bin
similarity index 100%
rename from data/quests/q703-gov-bb.bin
rename to data/quests/bb/ep4/government/q703-gov-bb.bin
diff --git a/data/quests/q703-gov-bb.dat b/data/quests/bb/ep4/government/q703-gov-bb.dat
similarity index 100%
rename from data/quests/q703-gov-bb.dat
rename to data/quests/bb/ep4/government/q703-gov-bb.dat
diff --git a/data/quests/q704-gov-bb.bin b/data/quests/bb/ep4/government/q704-gov-bb.bin
similarity index 100%
rename from data/quests/q704-gov-bb.bin
rename to data/quests/bb/ep4/government/q704-gov-bb.bin
diff --git a/data/quests/q704-gov-bb.dat b/data/quests/bb/ep4/government/q704-gov-bb.dat
similarity index 100%
rename from data/quests/q704-gov-bb.dat
rename to data/quests/bb/ep4/government/q704-gov-bb.dat
diff --git a/data/quests/q705-gov-bb.bin b/data/quests/bb/ep4/government/q705-gov-bb.bin
similarity index 100%
rename from data/quests/q705-gov-bb.bin
rename to data/quests/bb/ep4/government/q705-gov-bb.bin
diff --git a/data/quests/q705-gov-bb.dat b/data/quests/bb/ep4/government/q705-gov-bb.dat
similarity index 100%
rename from data/quests/q705-gov-bb.dat
rename to data/quests/bb/ep4/government/q705-gov-bb.dat
diff --git a/data/quests/q706-gov-bb.bin b/data/quests/bb/ep4/government/q706-gov-bb.bin
similarity index 100%
rename from data/quests/q706-gov-bb.bin
rename to data/quests/bb/ep4/government/q706-gov-bb.bin
diff --git a/data/quests/q706-gov-bb.dat b/data/quests/bb/ep4/government/q706-gov-bb.dat
similarity index 100%
rename from data/quests/q706-gov-bb.dat
rename to data/quests/bb/ep4/government/q706-gov-bb.dat
diff --git a/data/quests/q707-gov-bb.bin b/data/quests/bb/ep4/government/q707-gov-bb.bin
similarity index 100%
rename from data/quests/q707-gov-bb.bin
rename to data/quests/bb/ep4/government/q707-gov-bb.bin
diff --git a/data/quests/q707-gov-bb.dat b/data/quests/bb/ep4/government/q707-gov-bb.dat
similarity index 100%
rename from data/quests/q707-gov-bb.dat
rename to data/quests/bb/ep4/government/q707-gov-bb.dat
diff --git a/data/quests/q708-gov-bb.bin b/data/quests/bb/ep4/government/q708-gov-bb.bin
similarity index 100%
rename from data/quests/q708-gov-bb.bin
rename to data/quests/bb/ep4/government/q708-gov-bb.bin
diff --git a/data/quests/q708-gov-bb.dat b/data/quests/bb/ep4/government/q708-gov-bb.dat
similarity index 100%
rename from data/quests/q708-gov-bb.dat
rename to data/quests/bb/ep4/government/q708-gov-bb.dat
diff --git a/data/quests/q709-gov-bb.bin b/data/quests/bb/ep4/government/q709-gov-bb.bin
similarity index 100%
rename from data/quests/q709-gov-bb.bin
rename to data/quests/bb/ep4/government/q709-gov-bb.bin
diff --git a/data/quests/q709-gov-bb.dat b/data/quests/bb/ep4/government/q709-gov-bb.dat
similarity index 100%
rename from data/quests/q709-gov-bb.dat
rename to data/quests/bb/ep4/government/q709-gov-bb.dat
diff --git a/data/quests/bb/ep4/government/quests.toml b/data/quests/bb/ep4/government/quests.toml
new file mode 100644
index 0000000..35548d2
--- /dev/null
+++ b/data/quests/bb/ep4/government/quests.toml
@@ -0,0 +1,32 @@
+[Government]
+list_order = 1
+description = "What lies below on Ragol?"
+
+[[Government.quests]]
+bin = "q701-gov-bb.bin"
+dat = "q701-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q702-gov-bb.bin"
+dat = "q702-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q703-gov-bb.bin"
+dat = "q703-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q704-gov-bb.bin"
+dat = "q704-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q705-gov-bb.bin"
+dat = "q705-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q706-gov-bb.bin"
+dat = "q706-gov-bb.dat"
+
+[[Government.quests]]
+bin = "q707-gov-bb.bin"
+dat = "q707-gov-bb.dat"
+
diff --git a/data/quests/q811-ext-bb.bin b/data/quests/bb/ep4/multi/q811-ext-bb.bin
similarity index 100%
rename from data/quests/q811-ext-bb.bin
rename to data/quests/bb/ep4/multi/q811-ext-bb.bin
diff --git a/data/quests/q811-ext-bb.dat b/data/quests/bb/ep4/multi/q811-ext-bb.dat
similarity index 100%
rename from data/quests/q811-ext-bb.dat
rename to data/quests/bb/ep4/multi/q811-ext-bb.dat
diff --git a/data/quests/q812-ext-bb.bin b/data/quests/bb/ep4/multi/q812-ext-bb.bin
similarity index 100%
rename from data/quests/q812-ext-bb.bin
rename to data/quests/bb/ep4/multi/q812-ext-bb.bin
diff --git a/data/quests/q812-ext-bb.dat b/data/quests/bb/ep4/multi/q812-ext-bb.dat
similarity index 100%
rename from data/quests/q812-ext-bb.dat
rename to data/quests/bb/ep4/multi/q812-ext-bb.dat
diff --git a/data/quests/q813-ext-bb.bin b/data/quests/bb/ep4/multi/q813-ext-bb.bin
similarity index 100%
rename from data/quests/q813-ext-bb.bin
rename to data/quests/bb/ep4/multi/q813-ext-bb.bin
diff --git a/data/quests/q813-ext-bb.dat b/data/quests/bb/ep4/multi/q813-ext-bb.dat
similarity index 100%
rename from data/quests/q813-ext-bb.dat
rename to data/quests/bb/ep4/multi/q813-ext-bb.dat
diff --git a/data/quests/q814-ext-bb.bin b/data/quests/bb/ep4/multi/q814-ext-bb.bin
similarity index 100%
rename from data/quests/q814-ext-bb.bin
rename to data/quests/bb/ep4/multi/q814-ext-bb.bin
diff --git a/data/quests/q814-ext-bb.dat b/data/quests/bb/ep4/multi/q814-ext-bb.dat
similarity index 100%
rename from data/quests/q814-ext-bb.dat
rename to data/quests/bb/ep4/multi/q814-ext-bb.dat
diff --git a/data/quests/q815-ext-bb.bin b/data/quests/bb/ep4/multi/q815-ext-bb.bin
similarity index 100%
rename from data/quests/q815-ext-bb.bin
rename to data/quests/bb/ep4/multi/q815-ext-bb.bin
diff --git a/data/quests/q815-ext-bb.dat b/data/quests/bb/ep4/multi/q815-ext-bb.dat
similarity index 100%
rename from data/quests/q815-ext-bb.dat
rename to data/quests/bb/ep4/multi/q815-ext-bb.dat
diff --git a/data/quests/bb/ep4/multi/quests.toml b/data/quests/bb/ep4/multi/quests.toml
new file mode 100644
index 0000000..de147be
--- /dev/null
+++ b/data/quests/bb/ep4/multi/quests.toml
@@ -0,0 +1,24 @@
+[Extermination]
+list_order = 1
+description = "Exterminate the enemies!"
+
+[[Extermination.quests]]
+bin = "q811-ext-bb.bin"
+dat = "q811-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q812-ext-bb.bin"
+dat = "q812-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q813-ext-bb.bin"
+dat = "q813-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q814-ext-bb.bin"
+dat = "q814-ext-bb.dat"
+
+[[Extermination.quests]]
+bin = "q815-ext-bb.bin"
+dat = "q815-ext-bb.dat"
+
diff --git a/data/quests/q031-1p-bb.bin b/data/quests/bb/ep4/single/q031-1p-bb.bin
similarity index 100%
rename from data/quests/q031-1p-bb.bin
rename to data/quests/bb/ep4/single/q031-1p-bb.bin
diff --git a/data/quests/q031-1p-bb.dat b/data/quests/bb/ep4/single/q031-1p-bb.dat
similarity index 100%
rename from data/quests/q031-1p-bb.dat
rename to data/quests/bb/ep4/single/q031-1p-bb.dat
diff --git a/data/quests/q033-1p-bb.bin b/data/quests/bb/ep4/single/q033-1p-bb.bin
similarity index 100%
rename from data/quests/q033-1p-bb.bin
rename to data/quests/bb/ep4/single/q033-1p-bb.bin
diff --git a/data/quests/q033-1p-bb.dat b/data/quests/bb/ep4/single/q033-1p-bb.dat
similarity index 100%
rename from data/quests/q033-1p-bb.dat
rename to data/quests/bb/ep4/single/q033-1p-bb.dat
diff --git a/data/quests/bb/ep4/single/quests.toml b/data/quests/bb/ep4/single/quests.toml
new file mode 100644
index 0000000..6914c1e
--- /dev/null
+++ b/data/quests/bb/ep4/single/quests.toml
@@ -0,0 +1,12 @@
+[Story]
+list_order = 1
+description = "Story quests"
+
+[[Story.quests]]
+bin = "q031-1p-bb.bin"
+dat = "q031-1p-bb.dat"
+
+[[Story.quests]]
+bin = "q033-1p-bb.bin"
+dat = "q033-1p-bb.dat"
+
diff --git a/data/quests/bb/makedirs.sh b/data/quests/bb/makedirs.sh
new file mode 100644
index 0000000..d6f6e43
--- /dev/null
+++ b/data/quests/bb/makedirs.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+episodes=( ep1 ep2 ep4 )
+modes=( single multi battle challenge government )
+
+for episode in ${episodes[@]}
+do
+	for mode in ${modes[@]}
+	do
+		mkdir -p ${episode}/${mode}
+	done
+done
diff --git a/data/quests/b001-dc.bin b/data/quests/dc/b001-dc.bin
similarity index 100%
rename from data/quests/b001-dc.bin
rename to data/quests/dc/b001-dc.bin
diff --git a/data/quests/dc/b001-dc.dat b/data/quests/dc/b001-dc.dat
new file mode 100755
index 0000000..673a262
Binary files /dev/null and b/data/quests/dc/b001-dc.dat differ
diff --git a/data/quests/b002-dc.bin b/data/quests/dc/b002-dc.bin
similarity index 100%
rename from data/quests/b002-dc.bin
rename to data/quests/dc/b002-dc.bin
diff --git a/data/quests/b002-dc.dat b/data/quests/dc/b002-dc.dat
similarity index 100%
rename from data/quests/b002-dc.dat
rename to data/quests/dc/b002-dc.dat
diff --git a/data/quests/b003-dc.bin b/data/quests/dc/b003-dc.bin
similarity index 100%
rename from data/quests/b003-dc.bin
rename to data/quests/dc/b003-dc.bin
diff --git a/data/quests/dc/b003-dc.dat b/data/quests/dc/b003-dc.dat
new file mode 100755
index 0000000..a6bd3c6
Binary files /dev/null and b/data/quests/dc/b003-dc.dat differ
diff --git a/data/quests/b004-dc.bin b/data/quests/dc/b004-dc.bin
similarity index 100%
rename from data/quests/b004-dc.bin
rename to data/quests/dc/b004-dc.bin
diff --git a/data/quests/b004-pc.dat b/data/quests/dc/b004-dc.dat
similarity index 100%
rename from data/quests/b004-pc.dat
rename to data/quests/dc/b004-dc.dat
diff --git a/data/quests/b005-dc.bin b/data/quests/dc/b005-dc.bin
similarity index 100%
rename from data/quests/b005-dc.bin
rename to data/quests/dc/b005-dc.bin
diff --git a/data/quests/b005-pc.dat b/data/quests/dc/b005-dc.dat
similarity index 100%
rename from data/quests/b005-pc.dat
rename to data/quests/dc/b005-dc.dat
diff --git a/data/quests/b006-dc.bin b/data/quests/dc/b006-dc.bin
similarity index 100%
rename from data/quests/b006-dc.bin
rename to data/quests/dc/b006-dc.bin
diff --git a/data/quests/b006-pc.dat b/data/quests/dc/b006-dc.dat
similarity index 100%
rename from data/quests/b006-pc.dat
rename to data/quests/dc/b006-dc.dat
diff --git a/data/quests/b007-dc.bin b/data/quests/dc/b007-dc.bin
similarity index 100%
rename from data/quests/b007-dc.bin
rename to data/quests/dc/b007-dc.bin
diff --git a/data/quests/b007-pc.dat b/data/quests/dc/b007-dc.dat
similarity index 100%
rename from data/quests/b007-pc.dat
rename to data/quests/dc/b007-dc.dat
diff --git a/data/quests/b008-dc.bin b/data/quests/dc/b008-dc.bin
similarity index 100%
rename from data/quests/b008-dc.bin
rename to data/quests/dc/b008-dc.bin
diff --git a/data/quests/b008-pc.dat b/data/quests/dc/b008-dc.dat
similarity index 100%
rename from data/quests/b008-pc.dat
rename to data/quests/dc/b008-dc.dat
diff --git a/data/quests/c101-dc.bin b/data/quests/dc/c101-dc.bin
similarity index 100%
rename from data/quests/c101-dc.bin
rename to data/quests/dc/c101-dc.bin
diff --git a/data/quests/c101-dc.dat b/data/quests/dc/c101-dc.dat
similarity index 100%
rename from data/quests/c101-dc.dat
rename to data/quests/dc/c101-dc.dat
diff --git a/data/quests/c102-dc.bin b/data/quests/dc/c102-dc.bin
similarity index 100%
rename from data/quests/c102-dc.bin
rename to data/quests/dc/c102-dc.bin
diff --git a/data/quests/c102-dc.dat b/data/quests/dc/c102-dc.dat
similarity index 100%
rename from data/quests/c102-dc.dat
rename to data/quests/dc/c102-dc.dat
diff --git a/data/quests/c103-dc.bin b/data/quests/dc/c103-dc.bin
similarity index 100%
rename from data/quests/c103-dc.bin
rename to data/quests/dc/c103-dc.bin
diff --git a/data/quests/c103-dc.dat b/data/quests/dc/c103-dc.dat
similarity index 100%
rename from data/quests/c103-dc.dat
rename to data/quests/dc/c103-dc.dat
diff --git a/data/quests/c104-dc.bin b/data/quests/dc/c104-dc.bin
similarity index 100%
rename from data/quests/c104-dc.bin
rename to data/quests/dc/c104-dc.bin
diff --git a/data/quests/c104-dc.dat b/data/quests/dc/c104-dc.dat
similarity index 100%
rename from data/quests/c104-dc.dat
rename to data/quests/dc/c104-dc.dat
diff --git a/data/quests/c105-dc.bin b/data/quests/dc/c105-dc.bin
similarity index 100%
rename from data/quests/c105-dc.bin
rename to data/quests/dc/c105-dc.bin
diff --git a/data/quests/c105-dc.dat b/data/quests/dc/c105-dc.dat
similarity index 100%
rename from data/quests/c105-dc.dat
rename to data/quests/dc/c105-dc.dat
diff --git a/data/quests/c106-dc.bin b/data/quests/dc/c106-dc.bin
similarity index 100%
rename from data/quests/c106-dc.bin
rename to data/quests/dc/c106-dc.bin
diff --git a/data/quests/c106-dc.dat b/data/quests/dc/c106-dc.dat
similarity index 100%
rename from data/quests/c106-dc.dat
rename to data/quests/dc/c106-dc.dat
diff --git a/data/quests/c107-dc.bin b/data/quests/dc/c107-dc.bin
similarity index 100%
rename from data/quests/c107-dc.bin
rename to data/quests/dc/c107-dc.bin
diff --git a/data/quests/c107-dc.dat b/data/quests/dc/c107-dc.dat
similarity index 100%
rename from data/quests/c107-dc.dat
rename to data/quests/dc/c107-dc.dat
diff --git a/data/quests/c108-dc.bin b/data/quests/dc/c108-dc.bin
similarity index 100%
rename from data/quests/c108-dc.bin
rename to data/quests/dc/c108-dc.bin
diff --git a/data/quests/c108-dc.dat b/data/quests/dc/c108-dc.dat
similarity index 100%
rename from data/quests/c108-dc.dat
rename to data/quests/dc/c108-dc.dat
diff --git a/data/quests/c109-dc.bin b/data/quests/dc/c109-dc.bin
similarity index 100%
rename from data/quests/c109-dc.bin
rename to data/quests/dc/c109-dc.bin
diff --git a/data/quests/c109-dc.dat b/data/quests/dc/c109-dc.dat
similarity index 100%
rename from data/quests/c109-dc.dat
rename to data/quests/dc/c109-dc.dat
diff --git a/data/quests/q058-ret-dc.bin b/data/quests/dc/q058-ret-dc.bin
similarity index 100%
rename from data/quests/q058-ret-dc.bin
rename to data/quests/dc/q058-ret-dc.bin
diff --git a/data/quests/q058-ret-dc.dat b/data/quests/dc/q058-ret-dc.dat
similarity index 100%
rename from data/quests/q058-ret-dc.dat
rename to data/quests/dc/q058-ret-dc.dat
diff --git a/data/quests/q059-ret-dc.bin b/data/quests/dc/q059-ret-dc.bin
similarity index 100%
rename from data/quests/q059-ret-dc.bin
rename to data/quests/dc/q059-ret-dc.bin
diff --git a/data/quests/q059-ret-dc.dat b/data/quests/dc/q059-ret-dc.dat
similarity index 100%
rename from data/quests/q059-ret-dc.dat
rename to data/quests/dc/q059-ret-dc.dat
diff --git a/data/quests/q060-ret-dc.bin b/data/quests/dc/q060-ret-dc.bin
similarity index 100%
rename from data/quests/q060-ret-dc.bin
rename to data/quests/dc/q060-ret-dc.bin
diff --git a/data/quests/q060-ret-dc.dat b/data/quests/dc/q060-ret-dc.dat
similarity index 100%
rename from data/quests/q060-ret-dc.dat
rename to data/quests/dc/q060-ret-dc.dat
diff --git a/data/quests/q068-ret-dc.bin b/data/quests/dc/q068-ret-dc.bin
similarity index 100%
rename from data/quests/q068-ret-dc.bin
rename to data/quests/dc/q068-ret-dc.bin
diff --git a/data/quests/q068-ret-dc.dat b/data/quests/dc/q068-ret-dc.dat
similarity index 100%
rename from data/quests/q068-ret-dc.dat
rename to data/quests/dc/q068-ret-dc.dat
diff --git a/data/quests/q080-vr-dc.bin b/data/quests/dc/q080-vr-dc.bin
similarity index 100%
rename from data/quests/q080-vr-dc.bin
rename to data/quests/dc/q080-vr-dc.bin
diff --git a/data/quests/q080-vr-dc.dat b/data/quests/dc/q080-vr-dc.dat
similarity index 100%
rename from data/quests/q080-vr-dc.dat
rename to data/quests/dc/q080-vr-dc.dat
diff --git a/data/quests/q101-ext-dc.bin b/data/quests/dc/q101-ext-dc.bin
similarity index 100%
rename from data/quests/q101-ext-dc.bin
rename to data/quests/dc/q101-ext-dc.bin
diff --git a/data/quests/q101-ext-dc.dat b/data/quests/dc/q101-ext-dc.dat
similarity index 100%
rename from data/quests/q101-ext-dc.dat
rename to data/quests/dc/q101-ext-dc.dat
diff --git a/data/quests/q102-ext-dc.bin b/data/quests/dc/q102-ext-dc.bin
similarity index 100%
rename from data/quests/q102-ext-dc.bin
rename to data/quests/dc/q102-ext-dc.bin
diff --git a/data/quests/q102-ext-dc.dat b/data/quests/dc/q102-ext-dc.dat
similarity index 100%
rename from data/quests/q102-ext-dc.dat
rename to data/quests/dc/q102-ext-dc.dat
diff --git a/data/quests/q104-ext-dc.bin b/data/quests/dc/q104-ext-dc.bin
similarity index 100%
rename from data/quests/q104-ext-dc.bin
rename to data/quests/dc/q104-ext-dc.bin
diff --git a/data/quests/q104-ext-dc.dat b/data/quests/dc/q104-ext-dc.dat
similarity index 100%
rename from data/quests/q104-ext-dc.dat
rename to data/quests/dc/q104-ext-dc.dat
diff --git a/data/quests/q108-ext-dc.bin b/data/quests/dc/q108-ext-dc.bin
similarity index 100%
rename from data/quests/q108-ext-dc.bin
rename to data/quests/dc/q108-ext-dc.bin
diff --git a/data/quests/q108-ext-dc.dat b/data/quests/dc/q108-ext-dc.dat
similarity index 100%
rename from data/quests/q108-ext-dc.dat
rename to data/quests/dc/q108-ext-dc.dat
diff --git a/data/quests/q109-ext-dc.bin b/data/quests/dc/q109-ext-dc.bin
similarity index 100%
rename from data/quests/q109-ext-dc.bin
rename to data/quests/dc/q109-ext-dc.bin
diff --git a/data/quests/q109-ext-dc.dat b/data/quests/dc/q109-ext-dc.dat
similarity index 100%
rename from data/quests/q109-ext-dc.dat
rename to data/quests/dc/q109-ext-dc.dat
diff --git a/data/quests/q110-ext-dc.bin b/data/quests/dc/q110-ext-dc.bin
similarity index 100%
rename from data/quests/q110-ext-dc.bin
rename to data/quests/dc/q110-ext-dc.bin
diff --git a/data/quests/q110-ext-dc.dat b/data/quests/dc/q110-ext-dc.dat
similarity index 100%
rename from data/quests/q110-ext-dc.dat
rename to data/quests/dc/q110-ext-dc.dat
diff --git a/data/quests/q111-ext-dc.bin b/data/quests/dc/q111-ext-dc.bin
similarity index 100%
rename from data/quests/q111-ext-dc.bin
rename to data/quests/dc/q111-ext-dc.bin
diff --git a/data/quests/q111-ext-dc.dat b/data/quests/dc/q111-ext-dc.dat
similarity index 100%
rename from data/quests/q111-ext-dc.dat
rename to data/quests/dc/q111-ext-dc.dat
diff --git a/data/quests/q117-ext-dc.bin b/data/quests/dc/q117-ext-dc.bin
similarity index 100%
rename from data/quests/q117-ext-dc.bin
rename to data/quests/dc/q117-ext-dc.bin
diff --git a/data/quests/q117-ext-dc.dat b/data/quests/dc/q117-ext-dc.dat
similarity index 100%
rename from data/quests/q117-ext-dc.dat
rename to data/quests/dc/q117-ext-dc.dat
diff --git a/data/quests/q118-vr-dc.bin b/data/quests/dc/q118-vr-dc.bin
similarity index 100%
rename from data/quests/q118-vr-dc.bin
rename to data/quests/dc/q118-vr-dc.bin
diff --git a/data/quests/q118-vr-dc.dat b/data/quests/dc/q118-vr-dc.dat
similarity index 100%
rename from data/quests/q118-vr-dc.dat
rename to data/quests/dc/q118-vr-dc.dat
diff --git a/data/quests/q137-evt-dc.bin b/data/quests/dc/q137-evt-dc.bin
similarity index 100%
rename from data/quests/q137-evt-dc.bin
rename to data/quests/dc/q137-evt-dc.bin
diff --git a/data/quests/q137-evt-dc.dat b/data/quests/dc/q137-evt-dc.dat
similarity index 100%
rename from data/quests/q137-evt-dc.dat
rename to data/quests/dc/q137-evt-dc.dat
diff --git a/data/quests/q138-evt-dc.bin b/data/quests/dc/q138-evt-dc.bin
similarity index 100%
rename from data/quests/q138-evt-dc.bin
rename to data/quests/dc/q138-evt-dc.bin
diff --git a/data/quests/q138-evt-dc.dat b/data/quests/dc/q138-evt-dc.dat
similarity index 100%
rename from data/quests/q138-evt-dc.dat
rename to data/quests/dc/q138-evt-dc.dat
diff --git a/data/quests/b001-gc.bin b/data/quests/gc/b001-gc.bin
similarity index 100%
rename from data/quests/b001-gc.bin
rename to data/quests/gc/b001-gc.bin
diff --git a/data/quests/gc/b001-gc.dat b/data/quests/gc/b001-gc.dat
new file mode 100755
index 0000000..673a262
Binary files /dev/null and b/data/quests/gc/b001-gc.dat differ
diff --git a/data/quests/b002-gc.bin b/data/quests/gc/b002-gc.bin
similarity index 100%
rename from data/quests/b002-gc.bin
rename to data/quests/gc/b002-gc.bin
diff --git a/data/quests/gc/b002-gc.dat b/data/quests/gc/b002-gc.dat
new file mode 100755
index 0000000..8e9a7dc
Binary files /dev/null and b/data/quests/gc/b002-gc.dat differ
diff --git a/data/quests/b003-gc.bin b/data/quests/gc/b003-gc.bin
similarity index 100%
rename from data/quests/b003-gc.bin
rename to data/quests/gc/b003-gc.bin
diff --git a/data/quests/gc/b003-gc.dat b/data/quests/gc/b003-gc.dat
new file mode 100755
index 0000000..a6bd3c6
Binary files /dev/null and b/data/quests/gc/b003-gc.dat differ
diff --git a/data/quests/b004-gc.bin b/data/quests/gc/b004-gc.bin
similarity index 100%
rename from data/quests/b004-gc.bin
rename to data/quests/gc/b004-gc.bin
diff --git a/data/quests/gc/b004-gc.dat b/data/quests/gc/b004-gc.dat
new file mode 100755
index 0000000..e838ab7
Binary files /dev/null and b/data/quests/gc/b004-gc.dat differ
diff --git a/data/quests/b005-gc.bin b/data/quests/gc/b005-gc.bin
similarity index 100%
rename from data/quests/b005-gc.bin
rename to data/quests/gc/b005-gc.bin
diff --git a/data/quests/gc/b005-gc.dat b/data/quests/gc/b005-gc.dat
new file mode 100755
index 0000000..9be76bc
Binary files /dev/null and b/data/quests/gc/b005-gc.dat differ
diff --git a/data/quests/b006-gc.bin b/data/quests/gc/b006-gc.bin
similarity index 100%
rename from data/quests/b006-gc.bin
rename to data/quests/gc/b006-gc.bin
diff --git a/data/quests/gc/b006-gc.dat b/data/quests/gc/b006-gc.dat
new file mode 100755
index 0000000..a9c6bb0
Binary files /dev/null and b/data/quests/gc/b006-gc.dat differ
diff --git a/data/quests/b007-gc.bin b/data/quests/gc/b007-gc.bin
similarity index 100%
rename from data/quests/b007-gc.bin
rename to data/quests/gc/b007-gc.bin
diff --git a/data/quests/gc/b007-gc.dat b/data/quests/gc/b007-gc.dat
new file mode 100755
index 0000000..0e78972
Binary files /dev/null and b/data/quests/gc/b007-gc.dat differ
diff --git a/data/quests/b008-gc.bin b/data/quests/gc/b008-gc.bin
similarity index 100%
rename from data/quests/b008-gc.bin
rename to data/quests/gc/b008-gc.bin
diff --git a/data/quests/gc/b008-gc.dat b/data/quests/gc/b008-gc.dat
new file mode 100755
index 0000000..4a55919
Binary files /dev/null and b/data/quests/gc/b008-gc.dat differ
diff --git a/data/quests/c101-gc.bin b/data/quests/gc/c101-gc.bin
similarity index 100%
rename from data/quests/c101-gc.bin
rename to data/quests/gc/c101-gc.bin
diff --git a/data/quests/c101-gc.dat b/data/quests/gc/c101-gc.dat
similarity index 100%
rename from data/quests/c101-gc.dat
rename to data/quests/gc/c101-gc.dat
diff --git a/data/quests/c102-gc.bin b/data/quests/gc/c102-gc.bin
similarity index 100%
rename from data/quests/c102-gc.bin
rename to data/quests/gc/c102-gc.bin
diff --git a/data/quests/c102-gc.dat b/data/quests/gc/c102-gc.dat
similarity index 100%
rename from data/quests/c102-gc.dat
rename to data/quests/gc/c102-gc.dat
diff --git a/data/quests/c103-gc.bin b/data/quests/gc/c103-gc.bin
similarity index 100%
rename from data/quests/c103-gc.bin
rename to data/quests/gc/c103-gc.bin
diff --git a/data/quests/c103-gc.dat b/data/quests/gc/c103-gc.dat
similarity index 100%
rename from data/quests/c103-gc.dat
rename to data/quests/gc/c103-gc.dat
diff --git a/data/quests/c104-gc.bin b/data/quests/gc/c104-gc.bin
similarity index 100%
rename from data/quests/c104-gc.bin
rename to data/quests/gc/c104-gc.bin
diff --git a/data/quests/c104-gc.dat b/data/quests/gc/c104-gc.dat
similarity index 100%
rename from data/quests/c104-gc.dat
rename to data/quests/gc/c104-gc.dat
diff --git a/data/quests/c105-gc.bin b/data/quests/gc/c105-gc.bin
similarity index 100%
rename from data/quests/c105-gc.bin
rename to data/quests/gc/c105-gc.bin
diff --git a/data/quests/c105-gc.dat b/data/quests/gc/c105-gc.dat
similarity index 100%
rename from data/quests/c105-gc.dat
rename to data/quests/gc/c105-gc.dat
diff --git a/data/quests/c106-gc.bin b/data/quests/gc/c106-gc.bin
similarity index 100%
rename from data/quests/c106-gc.bin
rename to data/quests/gc/c106-gc.bin
diff --git a/data/quests/c106-gc.dat b/data/quests/gc/c106-gc.dat
similarity index 100%
rename from data/quests/c106-gc.dat
rename to data/quests/gc/c106-gc.dat
diff --git a/data/quests/c107-gc.bin b/data/quests/gc/c107-gc.bin
similarity index 100%
rename from data/quests/c107-gc.bin
rename to data/quests/gc/c107-gc.bin
diff --git a/data/quests/c107-gc.dat b/data/quests/gc/c107-gc.dat
similarity index 100%
rename from data/quests/c107-gc.dat
rename to data/quests/gc/c107-gc.dat
diff --git a/data/quests/c108-gc.bin b/data/quests/gc/c108-gc.bin
similarity index 100%
rename from data/quests/c108-gc.bin
rename to data/quests/gc/c108-gc.bin
diff --git a/data/quests/c108-gc.dat b/data/quests/gc/c108-gc.dat
similarity index 100%
rename from data/quests/c108-gc.dat
rename to data/quests/gc/c108-gc.dat
diff --git a/data/quests/c109-gc.bin b/data/quests/gc/c109-gc.bin
similarity index 100%
rename from data/quests/c109-gc.bin
rename to data/quests/gc/c109-gc.bin
diff --git a/data/quests/c109-gc.dat b/data/quests/gc/c109-gc.dat
similarity index 100%
rename from data/quests/c109-gc.dat
rename to data/quests/gc/c109-gc.dat
diff --git a/data/quests/c201-gc.bin b/data/quests/gc/c201-gc.bin
similarity index 100%
rename from data/quests/c201-gc.bin
rename to data/quests/gc/c201-gc.bin
diff --git a/data/quests/c201-gc.dat b/data/quests/gc/c201-gc.dat
similarity index 100%
rename from data/quests/c201-gc.dat
rename to data/quests/gc/c201-gc.dat
diff --git a/data/quests/c202-gc.bin b/data/quests/gc/c202-gc.bin
similarity index 100%
rename from data/quests/c202-gc.bin
rename to data/quests/gc/c202-gc.bin
diff --git a/data/quests/c202-gc.dat b/data/quests/gc/c202-gc.dat
similarity index 100%
rename from data/quests/c202-gc.dat
rename to data/quests/gc/c202-gc.dat
diff --git a/data/quests/c203-gc.bin b/data/quests/gc/c203-gc.bin
similarity index 100%
rename from data/quests/c203-gc.bin
rename to data/quests/gc/c203-gc.bin
diff --git a/data/quests/c203-gc.dat b/data/quests/gc/c203-gc.dat
similarity index 100%
rename from data/quests/c203-gc.dat
rename to data/quests/gc/c203-gc.dat
diff --git a/data/quests/c204-gc.bin b/data/quests/gc/c204-gc.bin
similarity index 100%
rename from data/quests/c204-gc.bin
rename to data/quests/gc/c204-gc.bin
diff --git a/data/quests/c204-gc.dat b/data/quests/gc/c204-gc.dat
similarity index 100%
rename from data/quests/c204-gc.dat
rename to data/quests/gc/c204-gc.dat
diff --git a/data/quests/c205-gc.bin b/data/quests/gc/c205-gc.bin
similarity index 100%
rename from data/quests/c205-gc.bin
rename to data/quests/gc/c205-gc.bin
diff --git a/data/quests/c205-gc.dat b/data/quests/gc/c205-gc.dat
similarity index 100%
rename from data/quests/c205-gc.dat
rename to data/quests/gc/c205-gc.dat
diff --git a/data/quests/e301-gc3.bin b/data/quests/gc/e301-gc3.bin
similarity index 100%
rename from data/quests/e301-gc3.bin
rename to data/quests/gc/e301-gc3.bin
diff --git a/data/quests/e302-gc3.bin b/data/quests/gc/e302-gc3.bin
similarity index 100%
rename from data/quests/e302-gc3.bin
rename to data/quests/gc/e302-gc3.bin
diff --git a/data/quests/e303-gc3.bin b/data/quests/gc/e303-gc3.bin
similarity index 100%
rename from data/quests/e303-gc3.bin
rename to data/quests/gc/e303-gc3.bin
diff --git a/data/quests/q000-dl-gc.bin b/data/quests/gc/q000-dl-gc.bin
similarity index 100%
rename from data/quests/q000-dl-gc.bin
rename to data/quests/gc/q000-dl-gc.bin
diff --git a/data/quests/q000-dl-gc.dat b/data/quests/gc/q000-dl-gc.dat
similarity index 100%
rename from data/quests/q000-dl-gc.dat
rename to data/quests/gc/q000-dl-gc.dat
diff --git a/data/quests/q026-1p-gc.bin b/data/quests/gc/q026-1p-gc.bin
similarity index 100%
rename from data/quests/q026-1p-gc.bin
rename to data/quests/gc/q026-1p-gc.bin
diff --git a/data/quests/q026-1p-gc.dat b/data/quests/gc/q026-1p-gc.dat
similarity index 100%
rename from data/quests/q026-1p-gc.dat
rename to data/quests/gc/q026-1p-gc.dat
diff --git a/data/quests/q058-ret-gc.bin b/data/quests/gc/q058-ret-gc.bin
similarity index 100%
rename from data/quests/q058-ret-gc.bin
rename to data/quests/gc/q058-ret-gc.bin
diff --git a/data/quests/q058-ret-gc.dat b/data/quests/gc/q058-ret-gc.dat
similarity index 100%
rename from data/quests/q058-ret-gc.dat
rename to data/quests/gc/q058-ret-gc.dat
diff --git a/data/quests/q059-ret-gc.bin b/data/quests/gc/q059-ret-gc.bin
similarity index 100%
rename from data/quests/q059-ret-gc.bin
rename to data/quests/gc/q059-ret-gc.bin
diff --git a/data/quests/q059-ret-gc.dat b/data/quests/gc/q059-ret-gc.dat
similarity index 100%
rename from data/quests/q059-ret-gc.dat
rename to data/quests/gc/q059-ret-gc.dat
diff --git a/data/quests/q060-ret-gc.bin b/data/quests/gc/q060-ret-gc.bin
similarity index 100%
rename from data/quests/q060-ret-gc.bin
rename to data/quests/gc/q060-ret-gc.bin
diff --git a/data/quests/q060-ret-gc.dat b/data/quests/gc/q060-ret-gc.dat
similarity index 100%
rename from data/quests/q060-ret-gc.dat
rename to data/quests/gc/q060-ret-gc.dat
diff --git a/data/quests/q073-evt-gc.bin b/data/quests/gc/q073-evt-gc.bin
similarity index 100%
rename from data/quests/q073-evt-gc.bin
rename to data/quests/gc/q073-evt-gc.bin
diff --git a/data/quests/q073-evt-gc.dat b/data/quests/gc/q073-evt-gc.dat
similarity index 100%
rename from data/quests/q073-evt-gc.dat
rename to data/quests/gc/q073-evt-gc.dat
diff --git a/data/quests/q095-evt-gc.bin b/data/quests/gc/q095-evt-gc.bin
similarity index 100%
rename from data/quests/q095-evt-gc.bin
rename to data/quests/gc/q095-evt-gc.bin
diff --git a/data/quests/q095-evt-gc.dat b/data/quests/gc/q095-evt-gc.dat
similarity index 100%
rename from data/quests/q095-evt-gc.dat
rename to data/quests/gc/q095-evt-gc.dat
diff --git a/data/quests/q096-evt-gc.bin b/data/quests/gc/q096-evt-gc.bin
similarity index 100%
rename from data/quests/q096-evt-gc.bin
rename to data/quests/gc/q096-evt-gc.bin
diff --git a/data/quests/q096-evt-gc.dat b/data/quests/gc/q096-evt-gc.dat
similarity index 100%
rename from data/quests/q096-evt-gc.dat
rename to data/quests/gc/q096-evt-gc.dat
diff --git a/data/quests/q101-ext-gc.bin b/data/quests/gc/q101-ext-gc.bin
similarity index 100%
rename from data/quests/q101-ext-gc.bin
rename to data/quests/gc/q101-ext-gc.bin
diff --git a/data/quests/q101-ext-gc.dat b/data/quests/gc/q101-ext-gc.dat
similarity index 100%
rename from data/quests/q101-ext-gc.dat
rename to data/quests/gc/q101-ext-gc.dat
diff --git a/data/quests/q103-ext-gc.bin b/data/quests/gc/q103-ext-gc.bin
similarity index 100%
rename from data/quests/q103-ext-gc.bin
rename to data/quests/gc/q103-ext-gc.bin
diff --git a/data/quests/q103-ext-gc.dat b/data/quests/gc/q103-ext-gc.dat
similarity index 100%
rename from data/quests/q103-ext-gc.dat
rename to data/quests/gc/q103-ext-gc.dat
diff --git a/data/quests/q104-ext-gc.bin b/data/quests/gc/q104-ext-gc.bin
similarity index 100%
rename from data/quests/q104-ext-gc.bin
rename to data/quests/gc/q104-ext-gc.bin
diff --git a/data/quests/q104-ext-gc.dat b/data/quests/gc/q104-ext-gc.dat
similarity index 100%
rename from data/quests/q104-ext-gc.dat
rename to data/quests/gc/q104-ext-gc.dat
diff --git a/data/quests/q108-ext-gc.bin b/data/quests/gc/q108-ext-gc.bin
similarity index 100%
rename from data/quests/q108-ext-gc.bin
rename to data/quests/gc/q108-ext-gc.bin
diff --git a/data/quests/q108-ext-gc.dat b/data/quests/gc/q108-ext-gc.dat
similarity index 100%
rename from data/quests/q108-ext-gc.dat
rename to data/quests/gc/q108-ext-gc.dat
diff --git a/data/quests/q109-ext-gc.bin b/data/quests/gc/q109-ext-gc.bin
similarity index 100%
rename from data/quests/q109-ext-gc.bin
rename to data/quests/gc/q109-ext-gc.bin
diff --git a/data/quests/q109-ext-gc.dat b/data/quests/gc/q109-ext-gc.dat
similarity index 100%
rename from data/quests/q109-ext-gc.dat
rename to data/quests/gc/q109-ext-gc.dat
diff --git a/data/quests/q110-ext-gc.bin b/data/quests/gc/q110-ext-gc.bin
similarity index 100%
rename from data/quests/q110-ext-gc.bin
rename to data/quests/gc/q110-ext-gc.bin
diff --git a/data/quests/q110-ext-gc.dat b/data/quests/gc/q110-ext-gc.dat
similarity index 100%
rename from data/quests/q110-ext-gc.dat
rename to data/quests/gc/q110-ext-gc.dat
diff --git a/data/quests/q111-ext-gc.bin b/data/quests/gc/q111-ext-gc.bin
similarity index 100%
rename from data/quests/q111-ext-gc.bin
rename to data/quests/gc/q111-ext-gc.bin
diff --git a/data/quests/q111-ext-gc.dat b/data/quests/gc/q111-ext-gc.dat
similarity index 100%
rename from data/quests/q111-ext-gc.dat
rename to data/quests/gc/q111-ext-gc.dat
diff --git a/data/quests/q117-ext-gc.bin b/data/quests/gc/q117-ext-gc.bin
similarity index 100%
rename from data/quests/q117-ext-gc.bin
rename to data/quests/gc/q117-ext-gc.bin
diff --git a/data/quests/q117-ext-gc.dat b/data/quests/gc/q117-ext-gc.dat
similarity index 100%
rename from data/quests/q117-ext-gc.dat
rename to data/quests/gc/q117-ext-gc.dat
diff --git a/data/quests/q118-vr-gc.bin b/data/quests/gc/q118-vr-gc.bin
similarity index 100%
rename from data/quests/q118-vr-gc.bin
rename to data/quests/gc/q118-vr-gc.bin
diff --git a/data/quests/q118-vr-gc.dat b/data/quests/gc/q118-vr-gc.dat
similarity index 100%
rename from data/quests/q118-vr-gc.dat
rename to data/quests/gc/q118-vr-gc.dat
diff --git a/data/quests/q123-ext-gc.bin b/data/quests/gc/q123-ext-gc.bin
similarity index 100%
rename from data/quests/q123-ext-gc.bin
rename to data/quests/gc/q123-ext-gc.bin
diff --git a/data/quests/q123-ext-gc.dat b/data/quests/gc/q123-ext-gc.dat
similarity index 100%
rename from data/quests/q123-ext-gc.dat
rename to data/quests/gc/q123-ext-gc.dat
diff --git a/data/quests/q137-evt-gc.bin b/data/quests/gc/q137-evt-gc.bin
similarity index 100%
rename from data/quests/q137-evt-gc.bin
rename to data/quests/gc/q137-evt-gc.bin
diff --git a/data/quests/q137-evt-gc.dat b/data/quests/gc/q137-evt-gc.dat
similarity index 100%
rename from data/quests/q137-evt-gc.dat
rename to data/quests/gc/q137-evt-gc.dat
diff --git a/data/quests/q138-evt-gc.bin b/data/quests/gc/q138-evt-gc.bin
similarity index 100%
rename from data/quests/q138-evt-gc.bin
rename to data/quests/gc/q138-evt-gc.bin
diff --git a/data/quests/q138-evt-gc.dat b/data/quests/gc/q138-evt-gc.dat
similarity index 100%
rename from data/quests/q138-evt-gc.dat
rename to data/quests/gc/q138-evt-gc.dat
diff --git a/data/quests/q141-vr-gc.bin b/data/quests/gc/q141-vr-gc.bin
similarity index 100%
rename from data/quests/q141-vr-gc.bin
rename to data/quests/gc/q141-vr-gc.bin
diff --git a/data/quests/q141-vr-gc.dat b/data/quests/gc/q141-vr-gc.dat
similarity index 100%
rename from data/quests/q141-vr-gc.dat
rename to data/quests/gc/q141-vr-gc.dat
diff --git a/data/quests/q201-evt-gc.bin b/data/quests/gc/q201-evt-gc.bin
similarity index 100%
rename from data/quests/q201-evt-gc.bin
rename to data/quests/gc/q201-evt-gc.bin
diff --git a/data/quests/q201-evt-gc.dat b/data/quests/gc/q201-evt-gc.dat
similarity index 100%
rename from data/quests/q201-evt-gc.dat
rename to data/quests/gc/q201-evt-gc.dat
diff --git a/data/quests/q202-shp-gc.bin b/data/quests/gc/q202-shp-gc.bin
similarity index 100%
rename from data/quests/q202-shp-gc.bin
rename to data/quests/gc/q202-shp-gc.bin
diff --git a/data/quests/q202-shp-gc.dat b/data/quests/gc/q202-shp-gc.dat
similarity index 100%
rename from data/quests/q202-shp-gc.dat
rename to data/quests/gc/q202-shp-gc.dat
diff --git a/data/quests/q203-vr-gc.bin b/data/quests/gc/q203-vr-gc.bin
similarity index 100%
rename from data/quests/q203-vr-gc.bin
rename to data/quests/gc/q203-vr-gc.bin
diff --git a/data/quests/q203-vr-gc.dat b/data/quests/gc/q203-vr-gc.dat
similarity index 100%
rename from data/quests/q203-vr-gc.dat
rename to data/quests/gc/q203-vr-gc.dat
diff --git a/data/quests/q204-shp-gc.bin b/data/quests/gc/q204-shp-gc.bin
similarity index 100%
rename from data/quests/q204-shp-gc.bin
rename to data/quests/gc/q204-shp-gc.bin
diff --git a/data/quests/q204-shp-gc.dat b/data/quests/gc/q204-shp-gc.dat
similarity index 100%
rename from data/quests/q204-shp-gc.dat
rename to data/quests/gc/q204-shp-gc.dat
diff --git a/data/quests/q213-evt-gc.bin b/data/quests/gc/q213-evt-gc.bin
similarity index 100%
rename from data/quests/q213-evt-gc.bin
rename to data/quests/gc/q213-evt-gc.bin
diff --git a/data/quests/q213-evt-gc.dat b/data/quests/gc/q213-evt-gc.dat
similarity index 100%
rename from data/quests/q213-evt-gc.dat
rename to data/quests/gc/q213-evt-gc.dat
diff --git a/data/quests/q220-evt-gc.bin b/data/quests/gc/q220-evt-gc.bin
similarity index 100%
rename from data/quests/q220-evt-gc.bin
rename to data/quests/gc/q220-evt-gc.bin
diff --git a/data/quests/q220-evt-gc.dat b/data/quests/gc/q220-evt-gc.dat
similarity index 100%
rename from data/quests/q220-evt-gc.dat
rename to data/quests/gc/q220-evt-gc.dat
diff --git a/data/quests/q222-vr-gc.bin b/data/quests/gc/q222-vr-gc.bin
similarity index 100%
rename from data/quests/q222-vr-gc.bin
rename to data/quests/gc/q222-vr-gc.bin
diff --git a/data/quests/q222-vr-gc.dat b/data/quests/gc/q222-vr-gc.dat
similarity index 100%
rename from data/quests/q222-vr-gc.dat
rename to data/quests/gc/q222-vr-gc.dat
diff --git a/data/quests/q223-twr-gc.bin b/data/quests/gc/q223-twr-gc.bin
similarity index 100%
rename from data/quests/q223-twr-gc.bin
rename to data/quests/gc/q223-twr-gc.bin
diff --git a/data/quests/q223-twr-gc.dat b/data/quests/gc/q223-twr-gc.dat
similarity index 100%
rename from data/quests/q223-twr-gc.dat
rename to data/quests/gc/q223-twr-gc.dat
diff --git a/data/quests/q224-twr-gc.bin b/data/quests/gc/q224-twr-gc.bin
similarity index 100%
rename from data/quests/q224-twr-gc.bin
rename to data/quests/gc/q224-twr-gc.bin
diff --git a/data/quests/q224-twr-gc.dat b/data/quests/gc/q224-twr-gc.dat
similarity index 100%
rename from data/quests/q224-twr-gc.dat
rename to data/quests/gc/q224-twr-gc.dat
diff --git a/data/quests/q230-vr-gc.bin b/data/quests/gc/q230-vr-gc.bin
similarity index 100%
rename from data/quests/q230-vr-gc.bin
rename to data/quests/gc/q230-vr-gc.bin
diff --git a/data/quests/q230-vr-gc.dat b/data/quests/gc/q230-vr-gc.dat
similarity index 100%
rename from data/quests/q230-vr-gc.dat
rename to data/quests/gc/q230-vr-gc.dat
diff --git a/data/quests/q231-vr-gc.bin b/data/quests/gc/q231-vr-gc.bin
similarity index 100%
rename from data/quests/q231-vr-gc.bin
rename to data/quests/gc/q231-vr-gc.bin
diff --git a/data/quests/q231-vr-gc.dat b/data/quests/gc/q231-vr-gc.dat
similarity index 100%
rename from data/quests/q231-vr-gc.dat
rename to data/quests/gc/q231-vr-gc.dat
diff --git a/data/quests/q232-evt-gc.bin b/data/quests/gc/q232-evt-gc.bin
similarity index 100%
rename from data/quests/q232-evt-gc.bin
rename to data/quests/gc/q232-evt-gc.bin
diff --git a/data/quests/q232-evt-gc.dat b/data/quests/gc/q232-evt-gc.dat
similarity index 100%
rename from data/quests/q232-evt-gc.dat
rename to data/quests/gc/q232-evt-gc.dat
diff --git a/data/quests/q233-ext-gc.bin b/data/quests/gc/q233-ext-gc.bin
similarity index 100%
rename from data/quests/q233-ext-gc.bin
rename to data/quests/gc/q233-ext-gc.bin
diff --git a/data/quests/q233-ext-gc.dat b/data/quests/gc/q233-ext-gc.dat
similarity index 100%
rename from data/quests/q233-ext-gc.dat
rename to data/quests/gc/q233-ext-gc.dat
diff --git a/data/quests/q234-ext-gc.bin b/data/quests/gc/q234-ext-gc.bin
similarity index 100%
rename from data/quests/q234-ext-gc.bin
rename to data/quests/gc/q234-ext-gc.bin
diff --git a/data/quests/q234-ext-gc.dat b/data/quests/gc/q234-ext-gc.dat
similarity index 100%
rename from data/quests/q234-ext-gc.dat
rename to data/quests/gc/q234-ext-gc.dat
diff --git a/data/quests/q235-ext-gc.bin b/data/quests/gc/q235-ext-gc.bin
similarity index 100%
rename from data/quests/q235-ext-gc.bin
rename to data/quests/gc/q235-ext-gc.bin
diff --git a/data/quests/q235-ext-gc.dat b/data/quests/gc/q235-ext-gc.dat
similarity index 100%
rename from data/quests/q235-ext-gc.dat
rename to data/quests/gc/q235-ext-gc.dat
diff --git a/data/quests/q236-ext-gc.bin b/data/quests/gc/q236-ext-gc.bin
similarity index 100%
rename from data/quests/q236-ext-gc.bin
rename to data/quests/gc/q236-ext-gc.bin
diff --git a/data/quests/q236-ext-gc.dat b/data/quests/gc/q236-ext-gc.dat
similarity index 100%
rename from data/quests/q236-ext-gc.dat
rename to data/quests/gc/q236-ext-gc.dat
diff --git a/data/quests/q237-vr-gc.bin b/data/quests/gc/q237-vr-gc.bin
similarity index 100%
rename from data/quests/q237-vr-gc.bin
rename to data/quests/gc/q237-vr-gc.bin
diff --git a/data/quests/q237-vr-gc.dat b/data/quests/gc/q237-vr-gc.dat
similarity index 100%
rename from data/quests/q237-vr-gc.dat
rename to data/quests/gc/q237-vr-gc.dat
diff --git a/data/quests/q238-vr-gc.bin b/data/quests/gc/q238-vr-gc.bin
similarity index 100%
rename from data/quests/q238-vr-gc.bin
rename to data/quests/gc/q238-vr-gc.bin
diff --git a/data/quests/q238-vr-gc.dat b/data/quests/gc/q238-vr-gc.dat
similarity index 100%
rename from data/quests/q238-vr-gc.dat
rename to data/quests/gc/q238-vr-gc.dat
diff --git a/data/quests/q239-evt-gc.bin b/data/quests/gc/q239-evt-gc.bin
similarity index 100%
rename from data/quests/q239-evt-gc.bin
rename to data/quests/gc/q239-evt-gc.bin
diff --git a/data/quests/q239-evt-gc.dat b/data/quests/gc/q239-evt-gc.dat
similarity index 100%
rename from data/quests/q239-evt-gc.dat
rename to data/quests/gc/q239-evt-gc.dat
diff --git a/data/quests/q335-evt-gc.bin b/data/quests/gc/q335-evt-gc.bin
similarity index 100%
rename from data/quests/q335-evt-gc.bin
rename to data/quests/gc/q335-evt-gc.bin
diff --git a/data/quests/q335-evt-gc.dat b/data/quests/gc/q335-evt-gc.dat
similarity index 100%
rename from data/quests/q335-evt-gc.dat
rename to data/quests/gc/q335-evt-gc.dat
diff --git a/data/quests/q496-evt-gc.bin b/data/quests/gc/q496-evt-gc.bin
similarity index 100%
rename from data/quests/q496-evt-gc.bin
rename to data/quests/gc/q496-evt-gc.bin
diff --git a/data/quests/q496-evt-gc.dat b/data/quests/gc/q496-evt-gc.dat
similarity index 100%
rename from data/quests/q496-evt-gc.dat
rename to data/quests/gc/q496-evt-gc.dat
diff --git a/data/quests/q999-shp-gc.bin b/data/quests/gc/q999-shp-gc.bin
similarity index 100%
rename from data/quests/q999-shp-gc.bin
rename to data/quests/gc/q999-shp-gc.bin
diff --git a/data/quests/q999-shp-gc.dat b/data/quests/gc/q999-shp-gc.dat
similarity index 100%
rename from data/quests/q999-shp-gc.dat
rename to data/quests/gc/q999-shp-gc.dat
diff --git a/data/quests/b001-pc.bin b/data/quests/pc/b001-pc.bin
similarity index 100%
rename from data/quests/b001-pc.bin
rename to data/quests/pc/b001-pc.bin
diff --git a/data/quests/b001-pc.dat b/data/quests/pc/b001-pc.dat
similarity index 100%
rename from data/quests/b001-pc.dat
rename to data/quests/pc/b001-pc.dat
diff --git a/data/quests/b002-pc.bin b/data/quests/pc/b002-pc.bin
similarity index 100%
rename from data/quests/b002-pc.bin
rename to data/quests/pc/b002-pc.bin
diff --git a/data/quests/b002-pc.dat b/data/quests/pc/b002-pc.dat
similarity index 100%
rename from data/quests/b002-pc.dat
rename to data/quests/pc/b002-pc.dat
diff --git a/data/quests/b003-pc.bin b/data/quests/pc/b003-pc.bin
similarity index 100%
rename from data/quests/b003-pc.bin
rename to data/quests/pc/b003-pc.bin
diff --git a/data/quests/b003-pc.dat b/data/quests/pc/b003-pc.dat
similarity index 100%
rename from data/quests/b003-pc.dat
rename to data/quests/pc/b003-pc.dat
diff --git a/data/quests/b004-pc.bin b/data/quests/pc/b004-pc.bin
similarity index 100%
rename from data/quests/b004-pc.bin
rename to data/quests/pc/b004-pc.bin
diff --git a/data/quests/pc/b004-pc.dat b/data/quests/pc/b004-pc.dat
new file mode 100755
index 0000000..e838ab7
Binary files /dev/null and b/data/quests/pc/b004-pc.dat differ
diff --git a/data/quests/b005-pc.bin b/data/quests/pc/b005-pc.bin
similarity index 100%
rename from data/quests/b005-pc.bin
rename to data/quests/pc/b005-pc.bin
diff --git a/data/quests/pc/b005-pc.dat b/data/quests/pc/b005-pc.dat
new file mode 100755
index 0000000..9be76bc
Binary files /dev/null and b/data/quests/pc/b005-pc.dat differ
diff --git a/data/quests/b006-pc.bin b/data/quests/pc/b006-pc.bin
similarity index 100%
rename from data/quests/b006-pc.bin
rename to data/quests/pc/b006-pc.bin
diff --git a/data/quests/pc/b006-pc.dat b/data/quests/pc/b006-pc.dat
new file mode 100755
index 0000000..a9c6bb0
Binary files /dev/null and b/data/quests/pc/b006-pc.dat differ
diff --git a/data/quests/b007-pc.bin b/data/quests/pc/b007-pc.bin
similarity index 100%
rename from data/quests/b007-pc.bin
rename to data/quests/pc/b007-pc.bin
diff --git a/data/quests/pc/b007-pc.dat b/data/quests/pc/b007-pc.dat
new file mode 100755
index 0000000..0e78972
Binary files /dev/null and b/data/quests/pc/b007-pc.dat differ
diff --git a/data/quests/b008-pc.bin b/data/quests/pc/b008-pc.bin
similarity index 100%
rename from data/quests/b008-pc.bin
rename to data/quests/pc/b008-pc.bin
diff --git a/data/quests/pc/b008-pc.dat b/data/quests/pc/b008-pc.dat
new file mode 100755
index 0000000..4a55919
Binary files /dev/null and b/data/quests/pc/b008-pc.dat differ
diff --git a/data/quests/c101-pc.bin b/data/quests/pc/c101-pc.bin
similarity index 100%
rename from data/quests/c101-pc.bin
rename to data/quests/pc/c101-pc.bin
diff --git a/data/quests/c101-pc.dat b/data/quests/pc/c101-pc.dat
similarity index 100%
rename from data/quests/c101-pc.dat
rename to data/quests/pc/c101-pc.dat
diff --git a/data/quests/c102-pc.bin b/data/quests/pc/c102-pc.bin
similarity index 100%
rename from data/quests/c102-pc.bin
rename to data/quests/pc/c102-pc.bin
diff --git a/data/quests/c102-pc.dat b/data/quests/pc/c102-pc.dat
similarity index 100%
rename from data/quests/c102-pc.dat
rename to data/quests/pc/c102-pc.dat
diff --git a/data/quests/c103-pc.bin b/data/quests/pc/c103-pc.bin
similarity index 100%
rename from data/quests/c103-pc.bin
rename to data/quests/pc/c103-pc.bin
diff --git a/data/quests/c103-pc.dat b/data/quests/pc/c103-pc.dat
similarity index 100%
rename from data/quests/c103-pc.dat
rename to data/quests/pc/c103-pc.dat
diff --git a/data/quests/c104-pc.bin b/data/quests/pc/c104-pc.bin
similarity index 100%
rename from data/quests/c104-pc.bin
rename to data/quests/pc/c104-pc.bin
diff --git a/data/quests/c104-pc.dat b/data/quests/pc/c104-pc.dat
similarity index 100%
rename from data/quests/c104-pc.dat
rename to data/quests/pc/c104-pc.dat
diff --git a/data/quests/c105-pc.bin b/data/quests/pc/c105-pc.bin
similarity index 100%
rename from data/quests/c105-pc.bin
rename to data/quests/pc/c105-pc.bin
diff --git a/data/quests/c105-pc.dat b/data/quests/pc/c105-pc.dat
similarity index 100%
rename from data/quests/c105-pc.dat
rename to data/quests/pc/c105-pc.dat
diff --git a/data/quests/c106-pc.bin b/data/quests/pc/c106-pc.bin
similarity index 100%
rename from data/quests/c106-pc.bin
rename to data/quests/pc/c106-pc.bin
diff --git a/data/quests/c106-pc.dat b/data/quests/pc/c106-pc.dat
similarity index 100%
rename from data/quests/c106-pc.dat
rename to data/quests/pc/c106-pc.dat
diff --git a/data/quests/c107-pc.bin b/data/quests/pc/c107-pc.bin
similarity index 100%
rename from data/quests/c107-pc.bin
rename to data/quests/pc/c107-pc.bin
diff --git a/data/quests/c107-pc.dat b/data/quests/pc/c107-pc.dat
similarity index 100%
rename from data/quests/c107-pc.dat
rename to data/quests/pc/c107-pc.dat
diff --git a/data/quests/c108-pc.bin b/data/quests/pc/c108-pc.bin
similarity index 100%
rename from data/quests/c108-pc.bin
rename to data/quests/pc/c108-pc.bin
diff --git a/data/quests/c108-pc.dat b/data/quests/pc/c108-pc.dat
similarity index 100%
rename from data/quests/c108-pc.dat
rename to data/quests/pc/c108-pc.dat
diff --git a/data/quests/c109-pc.bin b/data/quests/pc/c109-pc.bin
similarity index 100%
rename from data/quests/c109-pc.bin
rename to data/quests/pc/c109-pc.bin
diff --git a/data/quests/c109-pc.dat b/data/quests/pc/c109-pc.dat
similarity index 100%
rename from data/quests/c109-pc.dat
rename to data/quests/pc/c109-pc.dat
diff --git a/data/quests/q058-ret-pc.bin b/data/quests/pc/q058-ret-pc.bin
similarity index 100%
rename from data/quests/q058-ret-pc.bin
rename to data/quests/pc/q058-ret-pc.bin
diff --git a/data/quests/q058-ret-pc.dat b/data/quests/pc/q058-ret-pc.dat
similarity index 100%
rename from data/quests/q058-ret-pc.dat
rename to data/quests/pc/q058-ret-pc.dat
diff --git a/data/quests/q059-ret-pc.bin b/data/quests/pc/q059-ret-pc.bin
similarity index 100%
rename from data/quests/q059-ret-pc.bin
rename to data/quests/pc/q059-ret-pc.bin
diff --git a/data/quests/q059-ret-pc.dat b/data/quests/pc/q059-ret-pc.dat
similarity index 100%
rename from data/quests/q059-ret-pc.dat
rename to data/quests/pc/q059-ret-pc.dat
diff --git a/data/quests/q060-ret-pc.bin b/data/quests/pc/q060-ret-pc.bin
similarity index 100%
rename from data/quests/q060-ret-pc.bin
rename to data/quests/pc/q060-ret-pc.bin
diff --git a/data/quests/q060-ret-pc.dat b/data/quests/pc/q060-ret-pc.dat
similarity index 100%
rename from data/quests/q060-ret-pc.dat
rename to data/quests/pc/q060-ret-pc.dat
diff --git a/data/quests/q068-ret-pc.bin b/data/quests/pc/q068-ret-pc.bin
similarity index 100%
rename from data/quests/q068-ret-pc.bin
rename to data/quests/pc/q068-ret-pc.bin
diff --git a/data/quests/q068-ret-pc.dat b/data/quests/pc/q068-ret-pc.dat
similarity index 100%
rename from data/quests/q068-ret-pc.dat
rename to data/quests/pc/q068-ret-pc.dat
diff --git a/data/quests/q073-evt-pc.bin b/data/quests/pc/q073-evt-pc.bin
similarity index 100%
rename from data/quests/q073-evt-pc.bin
rename to data/quests/pc/q073-evt-pc.bin
diff --git a/data/quests/q073-evt-pc.dat b/data/quests/pc/q073-evt-pc.dat
similarity index 100%
rename from data/quests/q073-evt-pc.dat
rename to data/quests/pc/q073-evt-pc.dat
diff --git a/data/quests/q095-evt-pc.bin b/data/quests/pc/q095-evt-pc.bin
similarity index 100%
rename from data/quests/q095-evt-pc.bin
rename to data/quests/pc/q095-evt-pc.bin
diff --git a/data/quests/q095-evt-pc.dat b/data/quests/pc/q095-evt-pc.dat
similarity index 100%
rename from data/quests/q095-evt-pc.dat
rename to data/quests/pc/q095-evt-pc.dat
diff --git a/data/quests/q096-evt-pc.bin b/data/quests/pc/q096-evt-pc.bin
similarity index 100%
rename from data/quests/q096-evt-pc.bin
rename to data/quests/pc/q096-evt-pc.bin
diff --git a/data/quests/q096-evt-pc.dat b/data/quests/pc/q096-evt-pc.dat
similarity index 100%
rename from data/quests/q096-evt-pc.dat
rename to data/quests/pc/q096-evt-pc.dat
diff --git a/data/quests/q101-ext-pc.bin b/data/quests/pc/q101-ext-pc.bin
similarity index 100%
rename from data/quests/q101-ext-pc.bin
rename to data/quests/pc/q101-ext-pc.bin
diff --git a/data/quests/q101-ext-pc.dat b/data/quests/pc/q101-ext-pc.dat
similarity index 100%
rename from data/quests/q101-ext-pc.dat
rename to data/quests/pc/q101-ext-pc.dat
diff --git a/data/quests/q102-ext-pc.bin b/data/quests/pc/q102-ext-pc.bin
similarity index 100%
rename from data/quests/q102-ext-pc.bin
rename to data/quests/pc/q102-ext-pc.bin
diff --git a/data/quests/q102-ext-pc.dat b/data/quests/pc/q102-ext-pc.dat
similarity index 100%
rename from data/quests/q102-ext-pc.dat
rename to data/quests/pc/q102-ext-pc.dat
diff --git a/data/quests/q103-ext-pc.bin b/data/quests/pc/q103-ext-pc.bin
similarity index 100%
rename from data/quests/q103-ext-pc.bin
rename to data/quests/pc/q103-ext-pc.bin
diff --git a/data/quests/q103-ext-pc.dat b/data/quests/pc/q103-ext-pc.dat
similarity index 100%
rename from data/quests/q103-ext-pc.dat
rename to data/quests/pc/q103-ext-pc.dat
diff --git a/data/quests/q104-ext-pc.bin b/data/quests/pc/q104-ext-pc.bin
similarity index 100%
rename from data/quests/q104-ext-pc.bin
rename to data/quests/pc/q104-ext-pc.bin
diff --git a/data/quests/q104-ext-pc.dat b/data/quests/pc/q104-ext-pc.dat
similarity index 100%
rename from data/quests/q104-ext-pc.dat
rename to data/quests/pc/q104-ext-pc.dat
diff --git a/data/quests/q108-ext-pc.bin b/data/quests/pc/q108-ext-pc.bin
similarity index 100%
rename from data/quests/q108-ext-pc.bin
rename to data/quests/pc/q108-ext-pc.bin
diff --git a/data/quests/q108-ext-pc.dat b/data/quests/pc/q108-ext-pc.dat
similarity index 100%
rename from data/quests/q108-ext-pc.dat
rename to data/quests/pc/q108-ext-pc.dat
diff --git a/data/quests/q109-ext-pc.bin b/data/quests/pc/q109-ext-pc.bin
similarity index 100%
rename from data/quests/q109-ext-pc.bin
rename to data/quests/pc/q109-ext-pc.bin
diff --git a/data/quests/q109-ext-pc.dat b/data/quests/pc/q109-ext-pc.dat
similarity index 100%
rename from data/quests/q109-ext-pc.dat
rename to data/quests/pc/q109-ext-pc.dat
diff --git a/data/quests/q110-ext-pc.bin b/data/quests/pc/q110-ext-pc.bin
similarity index 100%
rename from data/quests/q110-ext-pc.bin
rename to data/quests/pc/q110-ext-pc.bin
diff --git a/data/quests/q110-ext-pc.dat b/data/quests/pc/q110-ext-pc.dat
similarity index 100%
rename from data/quests/q110-ext-pc.dat
rename to data/quests/pc/q110-ext-pc.dat
diff --git a/data/quests/q111-ext-pc.bin b/data/quests/pc/q111-ext-pc.bin
similarity index 100%
rename from data/quests/q111-ext-pc.bin
rename to data/quests/pc/q111-ext-pc.bin
diff --git a/data/quests/q111-ext-pc.dat b/data/quests/pc/q111-ext-pc.dat
similarity index 100%
rename from data/quests/q111-ext-pc.dat
rename to data/quests/pc/q111-ext-pc.dat
diff --git a/data/quests/q117-ext-pc.bin b/data/quests/pc/q117-ext-pc.bin
similarity index 100%
rename from data/quests/q117-ext-pc.bin
rename to data/quests/pc/q117-ext-pc.bin
diff --git a/data/quests/q117-ext-pc.dat b/data/quests/pc/q117-ext-pc.dat
similarity index 100%
rename from data/quests/q117-ext-pc.dat
rename to data/quests/pc/q117-ext-pc.dat
diff --git a/data/quests/q118-vr-pc.bin b/data/quests/pc/q118-vr-pc.bin
similarity index 100%
rename from data/quests/q118-vr-pc.bin
rename to data/quests/pc/q118-vr-pc.bin
diff --git a/data/quests/q118-vr-pc.dat b/data/quests/pc/q118-vr-pc.dat
similarity index 100%
rename from data/quests/q118-vr-pc.dat
rename to data/quests/pc/q118-vr-pc.dat
diff --git a/data/quests/q137-evt-pc.bin b/data/quests/pc/q137-evt-pc.bin
similarity index 100%
rename from data/quests/q137-evt-pc.bin
rename to data/quests/pc/q137-evt-pc.bin
diff --git a/data/quests/q137-evt-pc.dat b/data/quests/pc/q137-evt-pc.dat
similarity index 100%
rename from data/quests/q137-evt-pc.dat
rename to data/quests/pc/q137-evt-pc.dat
diff --git a/data/quests/q138-evt-pc.bin b/data/quests/pc/q138-evt-pc.bin
similarity index 100%
rename from data/quests/q138-evt-pc.bin
rename to data/quests/pc/q138-evt-pc.bin
diff --git a/data/quests/q138-evt-pc.dat b/data/quests/pc/q138-evt-pc.dat
similarity index 100%
rename from data/quests/q138-evt-pc.dat
rename to data/quests/pc/q138-evt-pc.dat
diff --git a/data/quests/q140-evt-pc.bin b/data/quests/pc/q140-evt-pc.bin
similarity index 100%
rename from data/quests/q140-evt-pc.bin
rename to data/quests/pc/q140-evt-pc.bin
diff --git a/data/quests/q140-evt-pc.dat b/data/quests/pc/q140-evt-pc.dat
similarity index 100%
rename from data/quests/q140-evt-pc.dat
rename to data/quests/pc/q140-evt-pc.dat
diff --git a/src/ship/packet/handler/quest.rs b/src/ship/packet/handler/quest.rs
index 550df18..c1c3f9f 100644
--- a/src/ship/packet/handler/quest.rs
+++ b/src/ship/packet/handler/quest.rs
@@ -2,7 +2,6 @@ use std::io::{Cursor, Read, Seek, SeekFrom};
 use libpso::packet::ship::*;
 use crate::common::serverstate::ClientId;
 use crate::ship::ship::{SendShipPacket, ShipError, Clients, Rooms};
-use crate::ship::quests::QuestList;
 use crate::ship::location::{ClientLocation, ClientLocationError};
 use crate::ship::packet::builder::quest;
 use libpso::util::array_to_utf8;
@@ -37,24 +36,39 @@ fn parse_filename(filename_bytes: &[u8; 16]) -> Result<(u16, u16, QuestFileType)
 }
 
 
-pub fn send_quest_category_list(id: ClientId, quests: &QuestList) -> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, ShipError> {
-    let qcl = quest::quest_category_list(quests);
+pub fn send_quest_category_list(id: ClientId, rql: &RequestQuestList, client_location: &ClientLocation, rooms: &mut Rooms) -> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, ShipError> {
+    let room_id = client_location.get_room(id).map_err(|err| -> ClientLocationError { err.into() })?;
+    let room = rooms.get_mut(room_id.0)
+        .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?.as_mut()
+        .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?;
+    let qcl = quest::quest_category_list(&room.quests[rql.flag.clamp(0, (room.quests.len() - 1) as u32) as usize]);
+    room.set_quest_group(rql.flag as usize);
     Ok(Box::new(vec![(id, SendShipPacket::QuestCategoryList(qcl))].into_iter()))
 }
 
-pub fn select_quest_category(id: ClientId, menuselect: &MenuSelect, quests: &QuestList) -> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, ShipError> {
-    let (_, category_quests) = quests.iter()
+pub fn select_quest_category(id: ClientId, menuselect: &MenuSelect, client_location: &ClientLocation, rooms: &mut Rooms) -> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, ShipError> {
+    let room_id = client_location.get_room(id).map_err(|err| -> ClientLocationError { err.into() })?;
+    let room = rooms.get_mut(room_id.0)
+        .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?.as_mut()
+        .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?;
+    let (_, category_quests) = room.quests[room.quest_group.value()].iter()
         .nth(menuselect.item as usize)
         .ok_or(ShipError::InvalidQuestCategory(menuselect.item))?;
 
     let ql = quest::quest_list(menuselect.item, category_quests);
-    
+    for q in ql.quests.clone() {
+        println!("name: {:?} quest_id: {}", q.name, q.quest_id);
+    }
     Ok(Box::new(vec![(id, SendShipPacket::QuestOptionList(ql))].into_iter()))
 }
 
 
-pub fn quest_detail(id: ClientId, questdetailrequest: &QuestDetailRequest, quests: &QuestList) -> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, ShipError> {
-    let (_, category_quests) = quests.iter()
+pub fn quest_detail(id: ClientId, questdetailrequest: &QuestDetailRequest, client_location: &ClientLocation, rooms: &mut Rooms) -> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, ShipError> {
+    let room_id = client_location.get_room(id).map_err(|err| -> ClientLocationError { err.into() })?;
+    let room = rooms.get_mut(room_id.0)
+        .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?.as_mut()
+        .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?;
+    let (_, category_quests) = room.quests[room.quest_group.value()].iter()
         .nth(questdetailrequest.category as usize)
         .ok_or(ShipError::InvalidQuestCategory(questdetailrequest.category as u32))?;
 
@@ -68,9 +82,13 @@ pub fn quest_detail(id: ClientId, questdetailrequest: &QuestDetailRequest, quest
     Ok(Box::new(vec![(id, SendShipPacket::QuestDetail(qd))].into_iter()))
 }
 
-pub fn player_chose_quest(id: ClientId, questmenuselect: &QuestMenuSelect, quests: &QuestList, clients: &mut Clients, client_location: &ClientLocation, rooms: &mut Rooms)
+pub fn player_chose_quest(id: ClientId, questmenuselect: &QuestMenuSelect, clients: &mut Clients, client_location: &ClientLocation, rooms: &mut Rooms)
                   -> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, ShipError> {
-    let (_, category_quests) = quests.iter()
+    let room_id = client_location.get_room(id).map_err(|err| -> ClientLocationError { err.into() })?;
+    let room = rooms.get_mut(room_id.0)
+        .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?.as_mut()
+        .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?;                
+    let (_, category_quests) = room.quests[room.quest_group.value()].iter()
         .nth(questmenuselect.category as usize)
         .ok_or(ShipError::InvalidQuestCategory(questmenuselect.category as u32))?;
 
@@ -79,10 +97,6 @@ pub fn player_chose_quest(id: ClientId, questmenuselect: &QuestMenuSelect, quest
             q.id == questmenuselect.quest as u16
         }).ok_or(ShipError::InvalidQuest(questmenuselect.quest as u32))?;
 
-    let room_id = client_location.get_room(id).map_err(|err| -> ClientLocationError { err.into() })?;
-    let room = rooms.get_mut(room_id.0)
-        .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?.as_mut()
-        .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?;
     room.maps.set_quest_data(quest.enemies.clone(), quest.objects.clone(), &room.rare_monster_table);
     room.map_areas = quest.map_areas.clone();
 
@@ -100,9 +114,14 @@ pub fn player_chose_quest(id: ClientId, questmenuselect: &QuestMenuSelect, quest
     })))
 }
 
-pub fn quest_file_request(id: ClientId, quest_file_request: &QuestFileRequest, quests: &QuestList) -> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, ShipError> {
+pub fn quest_file_request(id: ClientId, quest_file_request: &QuestFileRequest, client_location: &ClientLocation, rooms: &mut Rooms) -> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, ShipError> {
+    let room_id = client_location.get_room(id).map_err(|err| -> ClientLocationError { err.into() })?;
+    let room = rooms.get_mut(room_id.0)
+        .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?.as_mut()
+        .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?;
+
     let (category_id, quest_id, datatype) = parse_filename(&quest_file_request.filename)?;
-    let (_, category_quests) = quests.iter()
+    let (_, category_quests) = room.quests[room.quest_group.value()].iter()
         .nth(category_id as usize)
         .ok_or(ShipError::InvalidQuestCategory(category_id as u32))?;
 
@@ -124,9 +143,14 @@ pub fn quest_file_request(id: ClientId, quest_file_request: &QuestFileRequest, q
     Ok(Box::new(vec![(id, SendShipPacket::QuestChunk(qc))].into_iter()))
 }
 
-pub fn quest_chunk_ack(id: ClientId, quest_chunk_ack: &QuestChunkAck, quests: &QuestList) -> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, ShipError> {
+pub fn quest_chunk_ack(id: ClientId, quest_chunk_ack: &QuestChunkAck, client_location: &ClientLocation, rooms: &mut Rooms) -> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, ShipError> {
+    let room_id = client_location.get_room(id).map_err(|err| -> ClientLocationError { err.into() })?;
+    let room = rooms.get_mut(room_id.0)
+        .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?.as_mut()
+        .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?;
+
     let (category_id, quest_id, datatype) = parse_filename(&quest_chunk_ack.filename)?;
-    let (_, category_quests) = quests.iter()
+    let (_, category_quests) = room.quests[room.quest_group.value()].iter()
         .nth(category_id as usize)
         .ok_or(ShipError::InvalidQuestCategory(category_id as u32))?;
 
diff --git a/src/ship/quests.rs b/src/ship/quests.rs
index 3b430ba..b326890 100644
--- a/src/ship/quests.rs
+++ b/src/ship/quests.rs
@@ -208,13 +208,12 @@ impl Quest {
 // QuestCollection
 pub type QuestList = BTreeMap<QuestCategory, Vec<Quest>>;
 
-pub fn load_quest(bin_path: PathBuf, dat_path: PathBuf) -> Option<Quest> {
-    let dat_file = File::open(PathBuf::from("data/quests/").join(dat_path.clone()))
+pub fn load_quest(bin_path: PathBuf, dat_path: PathBuf, quest_path: PathBuf) -> Option<Quest> {
+    let dat_file = File::open(quest_path.join(dat_path.clone()))
         .map_err(|err| {
             warn!("could not load quest file {:?}: {:?}", dat_path, err)
         }).ok()?;
-    //let bin_file = File::open(format!("data/quests/{}", bin_path))
-    let bin_file = File::open(PathBuf::from("data/quests/").join(bin_path.clone()))
+    let bin_file = File::open(quest_path.join(bin_path.clone()))
         .map_err(|err| {
             warn!("could not load quest file {:?}: {:?}", bin_path, err)
         }).ok()?;
@@ -233,11 +232,11 @@ pub fn load_quest(bin_path: PathBuf, dat_path: PathBuf) -> Option<Quest> {
 }
 
 
-pub fn load_quests(quest_path: PathBuf) -> Result<QuestList, QuestLoadError> {
-    let mut f = File::open(quest_path).map_err(|_| QuestLoadError::CouldNotLoadConfigFile)?;
+pub fn load_quests(quest_path: &mut PathBuf) -> Result<QuestList, QuestLoadError> {
+    let mut f = File::open(quest_path.clone()).map_err(|_| QuestLoadError::CouldNotLoadConfigFile)?;
     let mut s = String::new();
     f.read_to_string(&mut s)?;
-
+    quest_path.pop(); // remove quests.toml from the path
     let mut used_quest_ids = BTreeSet::new();
     let ql: BTreeMap<String, QuestListCategory> = toml::from_str(s.as_str()).map_err(|_| QuestLoadError::CouldNotLoadConfigFile)?;
 
@@ -245,7 +244,7 @@ pub fn load_quests(quest_path: PathBuf) -> Result<QuestList, QuestLoadError> {
         let quests = category_details.quests
             .into_iter()
             .filter_map(|quest| {
-                load_quest(quest.bin.into(), quest.dat.into())
+                load_quest(quest.bin.into(), quest.dat.into(), quest_path.to_path_buf())
                     .and_then(|quest | {
                         if used_quest_ids.contains(&quest.id) {
                             warn!("quest id already exists: {}", quest.id);
@@ -278,7 +277,7 @@ mod test {
     // one of the other maps to be a second tower
     #[test]
     fn test_quest_with_remapped_floors() {
-        let pw4 = load_quest("q236-ext-bb.bin".into(), "q236-ext-bb.dat".into()).unwrap();
+        let pw4 = load_quest("q236-ext-bb.bin".into(), "q236-ext-bb.dat".into(), "data/quests/bb/ep2/multi".into()).unwrap();
         let enemies_not_in_tower = pw4.enemies.iter()
             .filter(|enemy| {
                 enemy.is_some()
diff --git a/src/ship/room.rs b/src/ship/room.rs
index bd142b7..0ed4421 100644
--- a/src/ship/room.rs
+++ b/src/ship/room.rs
@@ -10,6 +10,9 @@ use crate::entity::character::SectionID;
 use crate::ship::monster::{load_monster_stats_table, MonsterType, MonsterStats};
 use crate::ship::map::area::MapAreaLookup;
 use crate::ship::map::enemy::RareMonsterAppearTable;
+use crate::ship::quests;
+use std::path::PathBuf;
+
 
 #[derive(Debug, Error)]
 #[error("")]
@@ -18,6 +21,7 @@ pub enum RoomCreationError {
     InvalidEpisode(u8),
     InvalidDifficulty(u8),
     CouldNotLoadMonsterStats(RoomMode),
+    CouldNotLoadQuests,
 }
 
 #[derive(Debug, Copy, Clone, derive_more::Display)]
@@ -97,19 +101,23 @@ impl From<Difficulty> for u8 {
     }
 }
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Copy, Clone, derive_more::Display)]
 pub enum RoomMode {
+    #[display(fmt="single")]
     Single {
         episode: Episode,
         difficulty: Difficulty,
     },
+    #[display(fmt="multi")]
     Multi {
         episode: Episode,
         difficulty: Difficulty,
     },
+    #[display(fmt="challenge")]
     Challenge {
         episode: Episode,
     },
+    #[display(fmt="battle")]
     Battle {
         episode: Episode,
         difficulty: Difficulty,
@@ -157,7 +165,29 @@ impl RoomMode {
         }
     }
 }
+pub enum QuestCategoryType {
+    Standard,
+    Government,
+}
 
+impl From<usize> for QuestCategoryType {
+    fn from(f: usize) -> QuestCategoryType {
+        match f {
+            0 => QuestCategoryType::Standard,
+            1 => QuestCategoryType::Government,
+            _ => QuestCategoryType::Standard, // TODO: panic?
+        }
+    }
+}
+
+impl QuestCategoryType {
+    pub fn value(&self) -> usize {
+        match self {
+             QuestCategoryType::Standard => 0,
+             QuestCategoryType::Government => 1,
+        }
+    }
+}
 
 pub struct RoomState {
     pub mode: RoomMode,
@@ -171,6 +201,8 @@ pub struct RoomState {
     pub monster_stats: Box<HashMap<MonsterType, MonsterStats>>,
     pub map_areas: MapAreaLookup,
     pub rare_monster_table: Box<RareMonsterAppearTable>,
+    pub quest_group: QuestCategoryType,
+    pub quests: Vec<quests::QuestList>,
     // items on ground
     // enemy info
 }
@@ -206,6 +238,10 @@ impl RoomState {
         difficulty + 0x22
     }
 
+    pub fn set_quest_group(&mut self, group: usize) {
+        self.quest_group = QuestCategoryType::from(group);
+    }
+
     pub fn from_create_room(create_room: &libpso::packet::ship::CreateRoom, section_id: SectionID) -> Result<RoomState, RoomCreationError> {
         if [create_room.battle, create_room.challenge, create_room.single_player].iter().sum::<u8>() > 1 {
             return Err(RoomCreationError::InvalidMode)
@@ -237,6 +273,35 @@ impl RoomState {
 
         let rare_monster_table = RareMonsterAppearTable::new(room_mode.episode());
 
+        // push the usual set of quests for the selected mode
+        let mut qpath = PathBuf::from("data/quests/bb");
+        qpath.push(room_mode.episode().to_string());
+        qpath.push(room_mode.to_string());
+        qpath.push("quests.toml");
+        let mut room_quests = Vec::new();
+        let quest_list = match quests::load_quests(&mut qpath) {
+            Ok(qlist) => qlist,
+            Err(_) => return Err(RoomCreationError::CouldNotLoadQuests),
+        };
+
+        room_quests.push(quest_list);
+
+        // if multiplayer also push the government quests
+        if let RoomMode::Multi {..} = room_mode {
+            qpath = PathBuf::from("data/quests/bb/");
+            qpath.push(room_mode.episode().to_string());
+            qpath.push("government/quests.toml");
+
+            let quest_list = match quests::load_quests(&mut qpath) {
+                Ok(qlist) => qlist,
+                Err(_) => return Err(RoomCreationError::CouldNotLoadQuests),
+            };
+
+            room_quests.push(quest_list);
+        }
+
+
+
         Ok(RoomState {
             monster_stats: Box::new(load_monster_stats_table(&room_mode).map_err(|_| RoomCreationError::CouldNotLoadMonsterStats(room_mode))?),
             mode: room_mode,
@@ -249,6 +314,8 @@ impl RoomState {
             drop_table: Box::new(DropTable::new(room_mode.episode(), room_mode.difficulty(), section_id)),
             bursting: false,
             map_areas: MapAreaLookup::new(&room_mode.episode()),
+            quest_group: QuestCategoryType::Standard,
+            quests: room_quests,
         })
     }
 }
diff --git a/src/ship/ship.rs b/src/ship/ship.rs
index d784677..ae0fd08 100644
--- a/src/ship/ship.rs
+++ b/src/ship/ship.rs
@@ -29,7 +29,6 @@ use crate::ship::location::{ClientLocation, RoomLobby, MAX_ROOMS, ClientLocation
 
 use crate::ship::items;
 use crate::ship::room;
-use crate::ship::quests;
 use crate::ship::map::{MapsError, MapAreaError, MapArea};
 use crate::ship::packet::handler;
 use crate::ship::shops::{WeaponShop, ToolShop, ArmorShop, WeaponShopItem, ToolShopItem, ArmorShopItem};
@@ -401,7 +400,6 @@ impl<EG: EntityGateway> ShipServerStateBuilder<EG> {
             level_table: CharacterLevelTable::default(),
             name: self.name.unwrap_or_else(|| "NAMENOTSET".into()),
             item_manager: items::ItemManager::default(),
-            quests: quests::load_quests("data/quests.toml".into()).unwrap(),
             ip: self.ip.unwrap_or_else(|| Ipv4Addr::new(127,0,0,1)),
             port: self.port.unwrap_or(SHIP_PORT),
             shops: Box::new(ItemShops::default()),
@@ -446,7 +444,6 @@ pub struct ShipServerState<EG: EntityGateway> {
     level_table: CharacterLevelTable,
     name: String,
     item_manager: items::ItemManager,
-    quests: quests::QuestList,
     shops: Box<ItemShops>,
     pub blocks: Blocks,
 
@@ -607,8 +604,9 @@ impl<EG: EntityGateway> ServerState for ShipServerState<EG> {
                          .await?.into_iter().map(move |pkt| (id, pkt)))
             },
             RecvShipPacket::QuestDetailRequest(questdetailrequest) => {
+                let block = self.blocks.with_client(id, &self.clients)?;
                 match questdetailrequest.menu {
-                    QUEST_SELECT_MENU_ID => handler::quest::quest_detail(id, questdetailrequest, &self.quests)?,
+                    QUEST_SELECT_MENU_ID => handler::quest::quest_detail(id, questdetailrequest, &block.client_location, &mut block.rooms)?,
                     _ => unreachable!(),
                 }
             },
@@ -626,13 +624,13 @@ impl<EG: EntityGateway> ServerState for ShipServerState<EG> {
                         Box::new(leave_lobby.chain(select_block))
                     }
                     ROOM_MENU_ID => handler::room::join_room(id, menuselect, &mut block.client_location, &mut self.clients, &mut self.item_manager, &self.level_table, &mut block.rooms)?,
-                    QUEST_CATEGORY_MENU_ID => handler::quest::select_quest_category(id, menuselect, &self.quests)?,
+                    QUEST_CATEGORY_MENU_ID => handler::quest::select_quest_category(id, menuselect, &block.client_location, &mut block.rooms)?,
                     _ => unreachable!(),
                 }
             },
             RecvShipPacket::QuestMenuSelect(questmenuselect) => {
                 let block = self.blocks.with_client(id, &self.clients)?;
-                handler::quest::player_chose_quest(id, questmenuselect, &self.quests, &mut self.clients, &block.client_location, &mut block.rooms)?
+                handler::quest::player_chose_quest(id, questmenuselect, &mut self.clients, &block.client_location, &mut block.rooms)?
             },
             RecvShipPacket::MenuDetail(_menudetail) => {
                 //unreachable!();
@@ -709,14 +707,17 @@ impl<EG: EntityGateway> ServerState for ShipServerState<EG> {
                 let block = self.blocks.with_client(id, &self.clients)?;
                 Box::new(handler::lobby::change_lobby(id, pkt.lobby, &mut block.client_location, &self.clients, &mut self.item_manager, &self.level_table, &mut block.rooms, &mut self.entity_gateway).await?.into_iter())
             },
-            RecvShipPacket::RequestQuestList(_) => {
-                handler::quest::send_quest_category_list(id, &self.quests)?
+            RecvShipPacket::RequestQuestList(rql) => {
+                let block = self.blocks.with_client(id, &self.clients)?;
+                handler::quest::send_quest_category_list(id, rql, &block.client_location, &mut block.rooms)?
             },
             RecvShipPacket::QuestFileRequest(quest_file_request) => {
-                handler::quest::quest_file_request(id, quest_file_request, &self.quests)?
+                let block = self.blocks.with_client(id, &self.clients)?;
+                handler::quest::quest_file_request(id, quest_file_request, &block.client_location, &mut block.rooms)?
             },
             RecvShipPacket::QuestChunkAck(quest_chunk_ack) => {
-                handler::quest::quest_chunk_ack(id, quest_chunk_ack, &self.quests)?
+                let block = self.blocks.with_client(id, &self.clients)?;
+                handler::quest::quest_chunk_ack(id, quest_chunk_ack, &block.client_location, &mut block.rooms)?
             },
             RecvShipPacket::DoneLoadingQuest(_) => {
                 let block = self.blocks.with_client(id, &self.clients)?;
diff --git a/tests/test_rooms.rs b/tests/test_rooms.rs
index 70dbdf4..a03fdd6 100644
--- a/tests/test_rooms.rs
+++ b/tests/test_rooms.rs
@@ -114,4 +114,46 @@ async fn test_load_rare_monster_default_appear_rates() {
     for (_monster, rate) in rates.clone().appear_rate {
         assert_eq!(rate, 0.001953125f32); // 1/512 = 0.001953125
     }
+}
+
+#[async_std::test]
+async fn test_set_valid_quest_group() {
+    let mut entity_gateway = InMemoryGateway::default();
+    let (_user1, _char1) = new_user_character(&mut entity_gateway, "a1", "a").await;
+    let mut ship = Box::new(ShipServerState::builder()
+        .gateway(entity_gateway.clone())
+        .build());
+    log_in_char(&mut ship, ClientId(1), "a1", "a").await;
+    join_lobby(&mut ship, ClientId(1)).await;
+    create_room(&mut ship, ClientId(1), "room", "").await;
+
+    let packets = ship.handle(ClientId(1), &RecvShipPacket::RequestQuestList(RequestQuestList{flag: 0})).await.unwrap().collect::<Vec<_>>();
+    match &packets[0].1 {
+        SendShipPacket::QuestCategoryList(quest_cat) => {
+            assert!(String::from_utf16_lossy(&quest_cat.quest_categories[0].name).starts_with("Retrieval"));
+        },
+        _ => panic!("Wrong quest category"),
+    }
+}
+
+#[async_std::test]
+async fn test_set_invalid_quest_group() {
+    let mut entity_gateway = InMemoryGateway::default();
+    let (_user1, _char1) = new_user_character(&mut entity_gateway, "a1", "a").await;
+    let mut ship = Box::new(ShipServerState::builder()
+        .gateway(entity_gateway.clone())
+        .build());
+    log_in_char(&mut ship, ClientId(1), "a1", "a").await;
+    join_lobby(&mut ship, ClientId(1)).await;
+    create_room(&mut ship, ClientId(1), "room", "").await;
+
+    let packets = ship.handle(ClientId(1), &RecvShipPacket::RequestQuestList(RequestQuestList{flag: 100})).await.unwrap().collect::<Vec<_>>();
+    match &packets[0].1 {
+        SendShipPacket::QuestCategoryList(quest_cat) => {
+            // flag > quest category length should take the highest value allowed for quest category which is 1 in multimode (for govt quests) and 0 in other modes.
+            // assuming we create an ep1 room in multimode, we should load the government quests in this test case
+            assert!(String::from_utf16_lossy(&quest_cat.quest_categories[0].name).starts_with("Government")); 
+        },
+        _ => panic!("Wrong quest category"),
+    }
 }
\ No newline at end of file