diff --git a/proj/xc12/BoE.xcodeproj/project.pbxproj b/proj/xc12/BoE.xcodeproj/project.pbxproj
index 87924e92..e664c596 100755
--- a/proj/xc12/BoE.xcodeproj/project.pbxproj
+++ b/proj/xc12/BoE.xcodeproj/project.pbxproj
@@ -2229,6 +2229,7 @@
 				HEADER_SEARCH_PATHS = (
 					/opt/local/include,
 					"$(PROJECT_DIR)/../../src/fileio/gzstream",
+					"$(PROJECT_DIR)/../../src/fileio/xml-parser",
 				);
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
@@ -2254,6 +2255,8 @@
 					"$(OTHER_LDFLAGS_QUOTED_FOR_PROJECT_1)",
 				);
 				STRIP_INSTALLED_PRODUCT = NO;
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../../src";
+				USE_HEADERMAP = NO;
 				WARNING_CFLAGS = (
 					"-Wfloat-equal",
 					"-Wno-long-long",
@@ -2325,6 +2328,7 @@
 				HEADER_SEARCH_PATHS = (
 					/opt/local/include,
 					"$(PROJECT_DIR)/../../src/fileio/gzstream",
+					"$(PROJECT_DIR)/../../src/fileio/xml-parser",
 				);
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
@@ -2348,6 +2352,8 @@
 					"-lboost_filesystem",
 					"$(OTHER_LDFLAGS_QUOTED_FOR_PROJECT_1)",
 				);
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../../src";
+				USE_HEADERMAP = NO;
 				WARNING_CFLAGS = (
 					"-Wfloat-equal",
 					"-Wno-long-long",
diff --git a/proj/xc4/BoE.xcodeproj/project.pbxproj b/proj/xc4/BoE.xcodeproj/project.pbxproj
index c15da78d..6c148047 100755
--- a/proj/xc4/BoE.xcodeproj/project.pbxproj
+++ b/proj/xc4/BoE.xcodeproj/project.pbxproj
@@ -2193,6 +2193,7 @@
 					"$(OTHER_LDFLAGS_QUOTED_FOR_PROJECT_1)",
 				);
 				STRIP_INSTALLED_PRODUCT = NO;
+				USER_HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/../../src\"";
 				WARNING_CFLAGS = (
 					"-Wfloat-equal",
 					"-Wno-long-long",
@@ -2254,6 +2255,7 @@
 					"-lboost_filesystem",
 					"$(OTHER_LDFLAGS_QUOTED_FOR_PROJECT_1)",
 				);
+				USER_HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/../../src\"";
 				WARNING_CFLAGS = (
 					"-Wfloat-equal",
 					"-Wno-long-long",
diff --git a/src/dialogxml/dialogs/3choice.cpp b/src/dialogxml/dialogs/3choice.cpp
index 65c602db..c6a568fc 100644
--- a/src/dialogxml/dialogs/3choice.cpp
+++ b/src/dialogxml/dialogs/3choice.cpp
@@ -12,8 +12,8 @@
 #include <functional>
 
 #include "mathutil.hpp"
-#include "message.hpp"
-#include "pict.hpp"
+#include "dialogxml/widgets/message.hpp"
+#include "dialogxml/widgets/pict.hpp"
 
 cThreeChoice::cThreeChoice
   (std::vector<std::string>& strings, cBasicButtonType button, pic_num_t pic, ePicType t, cDialog* parent)
diff --git a/src/dialogxml/dialogs/3choice.hpp b/src/dialogxml/dialogs/3choice.hpp
index 75d2e4fc..c03ff05f 100644
--- a/src/dialogxml/dialogs/3choice.hpp
+++ b/src/dialogxml/dialogs/3choice.hpp
@@ -14,10 +14,10 @@
 #include <array>
 #include <boost/optional.hpp>
 
-#include "keycodes.hpp"
-#include "choicedlog.hpp"
-#include "button.hpp"
-#include "pictypes.hpp"
+#include "dialogxml/keycodes.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "dialogxml/widgets/pictypes.hpp"
 
 /// Basic button type template
 struct bbtt {
diff --git a/src/dialogxml/dialogs/choicedlog.cpp b/src/dialogxml/dialogs/choicedlog.cpp
index 623ec7de..f8f200fc 100644
--- a/src/dialogxml/dialogs/choicedlog.cpp
+++ b/src/dialogxml/dialogs/choicedlog.cpp
@@ -9,7 +9,7 @@
 #include "choicedlog.hpp"
 
 #include <functional>
-#include "control.hpp"
+#include "dialogxml/widgets/control.hpp"
 
 cChoiceDlog::cChoiceDlog(std::string file, std::vector<std::string> buttons, cDialog* p) : dlg(file, p) {
 	using namespace std::placeholders;
diff --git a/src/dialogxml/dialogs/dialog.cpp b/src/dialogxml/dialogs/dialog.cpp
index aa115d5f..dc324518 100644
--- a/src/dialogxml/dialogs/dialog.cpp
+++ b/src/dialogxml/dialogs/dialog.cpp
@@ -9,21 +9,21 @@
 #include <cmath>
 #include <stdexcept>
 #include "dialog.hpp"
-#include "tiling.hpp" // for bg
+#include "gfx/tiling.hpp" // for bg
 #include "sounds.hpp"
-#include "pict.hpp"
-#include "button.hpp"
-#include "field.hpp"
-#include "ledgroup.hpp"
-#include "message.hpp"
-#include "scrollbar.hpp"
-#include "scrollpane.hpp"
-#include "stack.hpp"
-#include "winutil.hpp"
+#include "dialogxml/widgets/pict.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "dialogxml/widgets/field.hpp"
+#include "dialogxml/widgets/ledgroup.hpp"
+#include "dialogxml/widgets/message.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
+#include "dialogxml/widgets/scrollpane.hpp"
+#include "dialogxml/widgets/stack.hpp"
+#include "tools/winutil.hpp"
 #include "mathutil.hpp"
-#include "cursors.hpp"
-#include "prefs.hpp"
-#include "framerate_limiter.hpp"
+#include "tools/cursors.hpp"
+#include "tools/prefs.hpp"
+#include "tools/framerate_limiter.hpp"
 
 using namespace std;
 using namespace ticpp;
diff --git a/src/dialogxml/dialogs/dialog.hpp b/src/dialogxml/dialogs/dialog.hpp
index d789433f..8badb6a6 100644
--- a/src/dialogxml/dialogs/dialog.hpp
+++ b/src/dialogxml/dialogs/dialog.hpp
@@ -21,8 +21,8 @@
 #include <functional>
 
 #include "ticpp.h"
-#include "keycodes.hpp"
-#include "dlogevt.hpp"
+#include "dialogxml/keycodes.hpp"
+#include "dialogxml/dialogs/dlogevt.hpp"
 #include "location.hpp"
 #include <boost/any.hpp>
 
diff --git a/src/dialogxml/dialogs/dlogevt.hpp b/src/dialogxml/dialogs/dlogevt.hpp
index dc56f22f..f378762e 100644
--- a/src/dialogxml/dialogs/dlogevt.hpp
+++ b/src/dialogxml/dialogs/dlogevt.hpp
@@ -12,7 +12,7 @@
 #include <functional>
 #include <string>
 #include <type_traits>
-#include "keycodes.hpp"
+#include "dialogxml/keycodes.hpp"
 
 /// Represents an event that can occur in a dialog.
 enum eDlogEvt {
diff --git a/src/dialogxml/dialogs/pictchoice.cpp b/src/dialogxml/dialogs/pictchoice.cpp
index 7d94d57a..00998336 100644
--- a/src/dialogxml/dialogs/pictchoice.cpp
+++ b/src/dialogxml/dialogs/pictchoice.cpp
@@ -10,7 +10,7 @@
 
 #include <sstream>
 #include <boost/lexical_cast.hpp>
-#include "pict.hpp"
+#include "dialogxml/widgets/pict.hpp"
 
 cPictChoice::cPictChoice(const std::vector<pic_num_t>& pics,ePicType t,cDialog* parent) : cPictChoice(pics.begin(), pics.end(), t, parent) {}
 
diff --git a/src/dialogxml/dialogs/pictchoice.hpp b/src/dialogxml/dialogs/pictchoice.hpp
index 8c0a0566..81b3ef19 100644
--- a/src/dialogxml/dialogs/pictchoice.hpp
+++ b/src/dialogxml/dialogs/pictchoice.hpp
@@ -14,8 +14,8 @@
 #include <utility>
 
 #include "dialog.hpp"
-#include "ledgroup.hpp"
-#include "pictypes.hpp"
+#include "dialogxml/widgets/ledgroup.hpp"
+#include "dialogxml/widgets/pictypes.hpp"
 
 /// A dialog that presents a list of icons with LEDs and allows you to choose one.
 /// The list may span several pages.
diff --git a/src/dialogxml/dialogs/strchoice.hpp b/src/dialogxml/dialogs/strchoice.hpp
index cd9102f2..53bcab64 100644
--- a/src/dialogxml/dialogs/strchoice.hpp
+++ b/src/dialogxml/dialogs/strchoice.hpp
@@ -13,7 +13,7 @@
 #include <vector>
 #include <functional>
 #include "dialog.hpp"
-#include "ledgroup.hpp"
+#include "dialogxml/widgets/ledgroup.hpp"
 
 /// A dialog that presents a list of strings with LEDs and allows you to choose one.
 /// The list may span several pages.
diff --git a/src/dialogxml/dialogs/strdlog.cpp b/src/dialogxml/dialogs/strdlog.cpp
index 2d70ab90..db0f8fb5 100644
--- a/src/dialogxml/dialogs/strdlog.cpp
+++ b/src/dialogxml/dialogs/strdlog.cpp
@@ -9,8 +9,8 @@
 #include "strdlog.hpp"
 
 #include <sstream>
-#include "winutil.hpp"
-#include "pict.hpp"
+#include "tools/winutil.hpp"
+#include "dialogxml/widgets/pict.hpp"
 
 std::string cStrDlog::getFileName(short n_strs, ePicType type, bool hasTitle){
 	std::ostringstream sout;
diff --git a/src/dialogxml/dialogs/strdlog.hpp b/src/dialogxml/dialogs/strdlog.hpp
index 60ae94d2..413033cc 100644
--- a/src/dialogxml/dialogs/strdlog.hpp
+++ b/src/dialogxml/dialogs/strdlog.hpp
@@ -11,9 +11,9 @@
 
 #include <string>
 #include <functional>
-#include "pictypes.hpp"
+#include "dialogxml/widgets/pictypes.hpp"
 #include "sounds.hpp" // for snd_num_t
-#include "dialog.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
 
 /// The signature of a record handler for cStrDlog.
 typedef std::function<void(cDialog&)> record_callback_t;
diff --git a/src/dialogxml/widgets/basicbtns.cpp b/src/dialogxml/widgets/basicbtns.cpp
index bfb03417..46a6d11d 100644
--- a/src/dialogxml/widgets/basicbtns.cpp
+++ b/src/dialogxml/widgets/basicbtns.cpp
@@ -7,7 +7,7 @@
  */
 
 #define BTNS_DEFINED
-#include "3choice.hpp"
+#include "dialogxml/dialogs/3choice.hpp"
 
 /// @file
 /// Preset button specifications for cThreeChoice
@@ -85,4 +85,4 @@ bbtt basic_buttons[71] = {
 	{BTN_REG, "Create", {false,0,mod_none}},
 	{BTN_REG, "Choose", {false,0,mod_none}},
 	{BTN_LG, "Go Back", {false,0,mod_none}},
-};
\ No newline at end of file
+};
diff --git a/src/dialogxml/widgets/button.cpp b/src/dialogxml/widgets/button.cpp
index 6fa57429..07f99a98 100644
--- a/src/dialogxml/widgets/button.cpp
+++ b/src/dialogxml/widgets/button.cpp
@@ -9,11 +9,11 @@
 
 #include "button.hpp"
 
-#include "dialog.hpp"
-#include "render_image.hpp"
-#include "render_text.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/render_text.hpp"
 
-#include "res_image.hpp"
+#include "fileio/resmgr/res_image.hpp"
 
 extern sf::Texture bg_gworld;
 
diff --git a/src/dialogxml/widgets/container.cpp b/src/dialogxml/widgets/container.cpp
index d261a1c5..975d98ce 100644
--- a/src/dialogxml/widgets/container.cpp
+++ b/src/dialogxml/widgets/container.cpp
@@ -7,13 +7,13 @@
  */
 
 #include "container.hpp"
-#include "dialog.hpp"
-#include "button.hpp"
-#include "field.hpp"
-#include "ledgroup.hpp"
-#include "message.hpp"
-#include "pict.hpp"
-#include "scrollbar.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "dialogxml/widgets/field.hpp"
+#include "dialogxml/widgets/ledgroup.hpp"
+#include "dialogxml/widgets/message.hpp"
+#include "dialogxml/widgets/pict.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
 
 bool cContainer::parseChildControl(ticpp::Element& elem, std::map<std::string,cControl*>& controls, std::string& id) {
 	std::string tag = elem.Value();
diff --git a/src/dialogxml/widgets/control.cpp b/src/dialogxml/widgets/control.cpp
index bf2e1ed3..8fb1dde6 100644
--- a/src/dialogxml/widgets/control.cpp
+++ b/src/dialogxml/widgets/control.cpp
@@ -8,16 +8,16 @@
 
 #include "control.hpp"
 #include <sstream>
-#include "dialog.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
 #include "sounds.hpp"
 #include "button.hpp"
 #include "led.hpp"
-#include "render_shapes.hpp"
-#include "render_text.hpp"
-#include "res_image.hpp"
+#include "gfx/render_shapes.hpp"
+#include "gfx/render_text.hpp"
+#include "fileio/resmgr/res_image.hpp"
 #include "mathutil.hpp"
-#include "prefs.hpp"
-#include "cursors.hpp"
+#include "tools/prefs.hpp"
+#include "tools/cursors.hpp"
 
 void cControl::setText(std::string l){
 	lbl = l;
diff --git a/src/dialogxml/widgets/control.hpp b/src/dialogxml/widgets/control.hpp
index 2c7c957a..74d3c0ca 100644
--- a/src/dialogxml/widgets/control.hpp
+++ b/src/dialogxml/widgets/control.hpp
@@ -20,7 +20,7 @@
 #include <set>
 #include <map>
 #include <boost/any.hpp>
-#include "dlogevt.hpp"
+#include "dialogxml/dialogs/dlogevt.hpp"
 
 #include "location.hpp"
 
diff --git a/src/dialogxml/widgets/field.cpp b/src/dialogxml/widgets/field.cpp
index 4e3ee3fc..f6144063 100644
--- a/src/dialogxml/widgets/field.cpp
+++ b/src/dialogxml/widgets/field.cpp
@@ -11,11 +11,11 @@
 #include <map>
 #include <numeric>
 #include <boost/lexical_cast.hpp>
-#include "dialog.hpp"
-#include "strdlog.hpp"
-#include "render_shapes.hpp"
-#include "winutil.hpp"
-#include "cursors.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "gfx/render_shapes.hpp"
+#include "tools/winutil.hpp"
+#include "tools/cursors.hpp"
 
 bool cTextField::callHandler(event_fcn<EVT_DEFOCUS>::type onFocus, cDialog& me, std::string id) {
 	if(field_type != FLD_TEXT) {
diff --git a/src/dialogxml/widgets/field.hpp b/src/dialogxml/widgets/field.hpp
index 517f5e1c..01194a0b 100644
--- a/src/dialogxml/widgets/field.hpp
+++ b/src/dialogxml/widgets/field.hpp
@@ -14,8 +14,8 @@
 
 #include <string>
 #include "control.hpp"
-#include "render_text.hpp"
-#include "undo.hpp"
+#include "gfx/render_text.hpp"
+#include "tools/undo.hpp"
 
 /// The field's expected input type.
 enum eFldType {
diff --git a/src/dialogxml/widgets/led.cpp b/src/dialogxml/widgets/led.cpp
index d4f9e755..6fe0546b 100644
--- a/src/dialogxml/widgets/led.cpp
+++ b/src/dialogxml/widgets/led.cpp
@@ -9,10 +9,10 @@
 
 #include "led.hpp"
 
-#include "dialog.hpp"
-#include "render_image.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "gfx/render_image.hpp"
 
-#include "res_image.hpp"
+#include "fileio/resmgr/res_image.hpp"
 
 rectangle cLed::ledRects[3][2];
 
diff --git a/src/dialogxml/widgets/led.hpp b/src/dialogxml/widgets/led.hpp
index 76cbdd59..738a41f3 100644
--- a/src/dialogxml/widgets/led.hpp
+++ b/src/dialogxml/widgets/led.hpp
@@ -10,7 +10,7 @@
 #define BOE_DIALOG_LED_HPP
 
 #include "button.hpp"
-#include "render_text.hpp"
+#include "gfx/render_text.hpp"
 
 /// Represents the state of an LED button.
 /// Generally, led_red is used to indicate a selected button.
diff --git a/src/dialogxml/widgets/ledgroup.cpp b/src/dialogxml/widgets/ledgroup.cpp
index 63925ab4..02579686 100644
--- a/src/dialogxml/widgets/ledgroup.cpp
+++ b/src/dialogxml/widgets/ledgroup.cpp
@@ -11,7 +11,7 @@
 
 #include "ledgroup.hpp"
 
-#include "dialog.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
 
 cLedGroup::cLedGroup(cDialog& parent) :
 	cContainer(CTRL_GROUP,parent),
diff --git a/src/dialogxml/widgets/message.cpp b/src/dialogxml/widgets/message.cpp
index f151c3e1..a427ba7e 100644
--- a/src/dialogxml/widgets/message.cpp
+++ b/src/dialogxml/widgets/message.cpp
@@ -8,7 +8,7 @@
 
 #include "message.hpp"
 #include "mathutil.hpp"
-#include "dialog.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
 #include <numeric>
 
 extern sf::Texture bg_gworld;
diff --git a/src/dialogxml/widgets/message.hpp b/src/dialogxml/widgets/message.hpp
index b5da8ec7..297e4843 100644
--- a/src/dialogxml/widgets/message.hpp
+++ b/src/dialogxml/widgets/message.hpp
@@ -17,7 +17,7 @@
 #include <string>
 #include <boost/optional.hpp>
 #include "control.hpp"
-#include "render_text.hpp"
+#include "gfx/render_text.hpp"
 
 /// A simple static text message.
 /// This class can also create a frame for grouping controls or a clickable area.
diff --git a/src/dialogxml/widgets/pict.cpp b/src/dialogxml/widgets/pict.cpp
index 1477fe10..6353eaaa 100644
--- a/src/dialogxml/widgets/pict.cpp
+++ b/src/dialogxml/widgets/pict.cpp
@@ -11,14 +11,14 @@
 #include <map>
 #include <stdexcept>
 
-#include "gfxsheets.hpp"
-#include "render_shapes.hpp"
-#include "render_image.hpp"
-#include "render_text.hpp"
-#include "tiling.hpp"
+#include "gfx/gfxsheets.hpp"
+#include "gfx/render_shapes.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/render_text.hpp"
+#include "gfx/tiling.hpp"
 #include "location.hpp"
-#include "dialog.hpp"
-#include "res_image.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "fileio/resmgr/res_image.hpp"
 
 extern sf::Texture bg_gworld;
 extern cCustomGraphics spec_scen_g;
diff --git a/src/dialogxml/widgets/scrollbar.cpp b/src/dialogxml/widgets/scrollbar.cpp
index 60043d9b..f5c60b13 100644
--- a/src/dialogxml/widgets/scrollbar.cpp
+++ b/src/dialogxml/widgets/scrollbar.cpp
@@ -7,12 +7,12 @@
 //
 
 #include "scrollbar.hpp"
-#include "dialog.hpp"
-#include "res_image.hpp"
-#include "render_image.hpp"
-#include "render_shapes.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/render_shapes.hpp"
 #include "mathutil.hpp"
-#include "cursors.hpp"
+#include "tools/cursors.hpp"
 
 std::string cScrollbar::scroll_textures[NUM_STYLES] = {
 	"dlogscrollwh",
diff --git a/src/dialogxml/widgets/scrollbar.hpp b/src/dialogxml/widgets/scrollbar.hpp
index 5faf682b..7a45c3d7 100644
--- a/src/dialogxml/widgets/scrollbar.hpp
+++ b/src/dialogxml/widgets/scrollbar.hpp
@@ -13,8 +13,8 @@
 /// Scrollbar-related classes and types.
 
 #include "control.hpp"
-#include "event_listener.hpp"
-#include "drawable.hpp"
+#include "tools/event_listener.hpp"
+#include "tools/drawable.hpp"
 
 /// Specifies the style of a scrollbar.
 enum eScrollStyle {
diff --git a/src/dialogxml/widgets/scrollpane.cpp b/src/dialogxml/widgets/scrollpane.cpp
index 4ce403fa..e3fe50a2 100644
--- a/src/dialogxml/widgets/scrollpane.cpp
+++ b/src/dialogxml/widgets/scrollpane.cpp
@@ -10,10 +10,10 @@
 #include "message.hpp"
 #include "field.hpp"
 #include "button.hpp"
-#include "dialog.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
 #include "pict.hpp"
 #include "stack.hpp"
-#include "render_shapes.hpp"
+#include "gfx/render_shapes.hpp"
 #include <climits>
 
 cScrollPane::cScrollPane(cDialog& parent) : cContainer(CTRL_PANE, parent), scroll(parent) {
diff --git a/src/dialogxml/widgets/stack.cpp b/src/dialogxml/widgets/stack.cpp
index 51054ec2..c9f21368 100644
--- a/src/dialogxml/widgets/stack.cpp
+++ b/src/dialogxml/widgets/stack.cpp
@@ -9,7 +9,7 @@
 #include "stack.hpp"
 #include "field.hpp"
 #include "button.hpp"
-#include "dialog.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
 #include "message.hpp"
 #include "pict.hpp"
 #include "scrollbar.hpp"
diff --git a/src/fileio/estreams.cpp b/src/fileio/estreams.cpp
index a9d6b1b4..eeb5384b 100644
--- a/src/fileio/estreams.cpp
+++ b/src/fileio/estreams.cpp
@@ -16,21 +16,21 @@
 #include <boost/ptr_container/ptr_set.hpp>
 
 #include "spell.hpp"
-#include "item_abilities.hpp"
-#include "item_variety.hpp"
+#include "scenario/item_abilities.hpp"
+#include "scenario/item_variety.hpp"
 #include "damage.hpp"
 #include "race.hpp"
 #include "location.hpp"
 #include "fields.hpp"
-#include "quest.hpp"
-#include "shop.hpp"
-#include "terrain_abilities.hpp"
+#include "scenario/quest.hpp"
+#include "scenario/shop.hpp"
+#include "scenario/terrain_abilities.hpp"
 
-#include "monster.hpp"
-#include "party.hpp"
-#include "town.hpp"
-#include "talking.hpp"
-#include "scenario.hpp"
+#include "scenario/monster.hpp"
+#include "universe/party.hpp"
+#include "scenario/town.hpp"
+#include "scenario/talking.hpp"
+#include "scenario/scenario.hpp"
 
 const char* oboeVersionString() {
 	static std::shared_ptr<char> version;
diff --git a/src/fileio/fileio.cpp b/src/fileio/fileio.cpp
index 0083c5d5..695da029 100644
--- a/src/fileio/fileio.cpp
+++ b/src/fileio/fileio.cpp
@@ -14,11 +14,11 @@
 #include <cstdlib>
 #include <boost/filesystem/operations.hpp>
 
-#include "res_image.hpp"
-#include "res_cursor.hpp"
-#include "res_font.hpp"
-#include "res_strings.hpp"
-#include "res_sound.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "fileio/resmgr/res_cursor.hpp"
+#include "fileio/resmgr/res_font.hpp"
+#include "fileio/resmgr/res_strings.hpp"
+#include "fileio/resmgr/res_sound.hpp"
 
 bool mac_is_intel;
 fs::path progDir, tempDir, scenDir;
diff --git a/src/fileio/fileio_party.cpp b/src/fileio/fileio_party.cpp
index d5b9712a..ab0512a8 100644
--- a/src/fileio/fileio_party.cpp
+++ b/src/fileio/fileio_party.cpp
@@ -11,14 +11,14 @@
 #include <fstream>
 #include <boost/filesystem/operations.hpp>
 
-#include "strdlog.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
 #include "gzstream.h"
 
-#include "universe.hpp"
-#include "gfxsheets.hpp"
+#include "universe/universe.hpp"
+#include "gfx/gfxsheets.hpp"
 
 #include "porting.hpp"
-#include "tarball.hpp"
+#include "fileio/tarball.hpp"
 
 extern bool mac_is_intel;
 extern fs::path progDir, tempDir;
diff --git a/src/fileio/fileio_scen.cpp b/src/fileio/fileio_scen.cpp
index 6eafe397..3aa12c71 100644
--- a/src/fileio/fileio_scen.cpp
+++ b/src/fileio/fileio_scen.cpp
@@ -12,20 +12,20 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "strdlog.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
 
-#include "scenario.hpp"
-#include "town.hpp"
+#include "scenario/scenario.hpp"
+#include "scenario/town.hpp"
 #include "map_parse.hpp"
 #include "special_parse.hpp"
-#include "gfxsheets.hpp"
+#include "gfx/gfxsheets.hpp"
 #include "mathutil.hpp"
 #include "gzstream.h"
 #include "tarball.hpp"
 
 #include "porting.hpp"
-#include "res_image.hpp"
-#include "res_sound.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "fileio/resmgr/res_sound.hpp"
 
 // Because the full template definition needs to be visible in this file
 // Also, for some reason, it's not found in the include paths, so use a relative path
diff --git a/src/fileio/resmgr/res_cursor.hpp b/src/fileio/resmgr/res_cursor.hpp
index 865d0443..c3d18839 100644
--- a/src/fileio/resmgr/res_cursor.hpp
+++ b/src/fileio/resmgr/res_cursor.hpp
@@ -10,7 +10,7 @@
 #define BOE_RES_CURSOR_HPP
 
 #include "resmgr.hpp"
-#include "cursors.hpp"
+#include "tools/cursors.hpp"
 
 using CursorRsrc = ResMgr::cPointer<Cursor>;
 
diff --git a/src/fileio/special_parse.hpp b/src/fileio/special_parse.hpp
index 7354ba44..f0c690fb 100644
--- a/src/fileio/special_parse.hpp
+++ b/src/fileio/special_parse.hpp
@@ -9,7 +9,7 @@
 #ifndef BoE_special_parse_hpp
 #define BoE_special_parse_hpp
 
-#include "special.hpp"
+#include "scenario/special.hpp"
 #include <boost/spirit/include/classic.hpp>
 
 enum eParseError {
diff --git a/src/game/boe.actions.cpp b/src/game/boe.actions.cpp
index e2c98884..dc035189 100644
--- a/src/game/boe.actions.cpp
+++ b/src/game/boe.actions.cpp
@@ -4,7 +4,7 @@
 
 #include "boe.global.hpp"
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "boe.actions.hpp"
 #include "boe.graphutil.hpp"
 #include "boe.graphics.hpp"
@@ -25,18 +25,18 @@
 #include "boe.main.hpp"
 #include "boe.ui.hpp"
 #include "mathutil.hpp"
-#include "fileio.hpp"
-#include "choicedlog.hpp"
-#include "dialog.hpp"
-#include "scrollbar.hpp"
+#include "fileio/fileio.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
 #include "boe.menus.hpp"
-#include "winutil.hpp"
-#include "cursors.hpp"
+#include "tools/winutil.hpp"
+#include "tools/cursors.hpp"
 #include "spell.hpp"
-#include "shop.hpp"
-#include "prefs.hpp"
-#include "render_shapes.hpp"
-#include "enum_map.hpp"
+#include "scenario/shop.hpp"
+#include "tools/prefs.hpp"
+#include "gfx/render_shapes.hpp"
+#include "tools/enum_map.hpp"
 
 rectangle item_screen_button_rects[9] = {
 	{125,10,141,28},{125,40,141,58},{125,68,141,86},{125,98,141,116},{125,126,141,144},{125,156,141,174},
diff --git a/src/game/boe.appleevents.mm b/src/game/boe.appleevents.mm
index eadceb10..cc2e487e 100644
--- a/src/game/boe.appleevents.mm
+++ b/src/game/boe.appleevents.mm
@@ -6,14 +6,14 @@
 //
 //
 
-#include "universe.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
+#include "universe/universe.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
 #include <Cocoa/Cocoa.h>
 #include <memory>
 #include <algorithm>
 #include <iostream>
-#include "fileio.hpp"
+#include "fileio/fileio.hpp"
 #include "boe.global.hpp"
-#include "choicedlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
 
 extern void finish_load_party();
 extern void end_startup();
diff --git a/src/game/boe.combat.cpp b/src/game/boe.combat.cpp
index 98ac528b..a6afd572 100644
--- a/src/game/boe.combat.cpp
+++ b/src/game/boe.combat.cpp
@@ -3,7 +3,7 @@
 
 #include "boe.global.hpp"
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "boe.monster.hpp"
 #include "boe.graphics.hpp"
 #include "boe.locutils.hpp"
@@ -20,10 +20,10 @@
 #include "boe.main.hpp"
 #include "boe.ui.hpp"
 #include "mathutil.hpp"
-#include "choicedlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
 #include "boe.menus.hpp"
 #include "spell.hpp"
-#include "prefs.hpp"
+#include "tools/prefs.hpp"
 #include "utility.hpp"
 
 extern eGameMode overall_mode;
diff --git a/src/game/boe.combat.hpp b/src/game/boe.combat.hpp
index 6479b5ca..baf78e6c 100644
--- a/src/game/boe.combat.hpp
+++ b/src/game/boe.combat.hpp
@@ -3,8 +3,8 @@
 #define BOE_GAME_COMBAT_H
 
 #include "location.hpp"
-#include "monster.hpp"
-#include "outdoors.hpp"
+#include "scenario/monster.hpp"
+#include "scenario/outdoors.hpp"
 #include "boe.global.hpp"
 #include "spell.hpp"
 
diff --git a/src/game/boe.dlgutil.cpp b/src/game/boe.dlgutil.cpp
index 6b201960..f2349b5b 100644
--- a/src/game/boe.dlgutil.cpp
+++ b/src/game/boe.dlgutil.cpp
@@ -3,7 +3,7 @@
 
 #include "boe.global.hpp"
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 
 #include "boe.dlgutil.hpp"
 #include "boe.text.hpp"
@@ -23,21 +23,21 @@
 #include "boe.infodlg.hpp"
 #include "utility.hpp"
 #include "mathutil.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
-#include "winutil.hpp"
-#include "fileio.hpp"
-#include "res_strings.hpp"
-#include "scrollbar.hpp"
-#include "button.hpp"
-#include "ledgroup.hpp"
-#include "pict.hpp"
-#include "stack.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "tools/winutil.hpp"
+#include "fileio/fileio.hpp"
+#include "fileio/resmgr/res_strings.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "dialogxml/widgets/ledgroup.hpp"
+#include "dialogxml/widgets/pict.hpp"
+#include "dialogxml/widgets/stack.hpp"
 #include <boost/lexical_cast.hpp>
-#include "prefs.hpp"
-#include "shop.hpp"
-#include "cursors.hpp"
-#include "enum_map.hpp"
+#include "tools/prefs.hpp"
+#include "scenario/shop.hpp"
+#include "tools/cursors.hpp"
+#include "tools/enum_map.hpp"
 
 extern eItemWinMode stat_window;
 extern eGameMode overall_mode;
diff --git a/src/game/boe.dlgutil.hpp b/src/game/boe.dlgutil.hpp
index 79f02427..f0140f91 100644
--- a/src/game/boe.dlgutil.hpp
+++ b/src/game/boe.dlgutil.hpp
@@ -2,8 +2,8 @@
 #ifndef BOE_GAME_DLGUTIL_H
 
 #include <string>
-#include "dialog.hpp"
-#include "shop.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "scenario/shop.hpp"
 
 void start_shop_mode(short which,short cost_adj,std::string store_name);
 void end_shop_mode();
diff --git a/src/game/boe.fileio.cpp b/src/game/boe.fileio.cpp
index 7705064c..afe8a38a 100644
--- a/src/game/boe.fileio.cpp
+++ b/src/game/boe.fileio.cpp
@@ -3,7 +3,7 @@
 #include <fstream>
 
 #include "boe.global.hpp"
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "boe.fileio.hpp"
 #include "boe.text.hpp"
 #include "boe.town.hpp"
@@ -16,9 +16,9 @@
 #include "boe.graphutil.hpp"
 #include "sounds.hpp"
 #include "mathutil.hpp"
-#include "strdlog.hpp"
-#include "fileio.hpp"
-#include "cursors.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "fileio/fileio.hpp"
+#include "tools/cursors.hpp"
 #include <boost/filesystem.hpp>
 
 #define	DONE_BUTTON_ITEM	1
diff --git a/src/game/boe.graphics.cpp b/src/game/boe.graphics.cpp
index 92a33d92..dd02c83e 100644
--- a/src/game/boe.graphics.cpp
+++ b/src/game/boe.graphics.cpp
@@ -8,22 +8,22 @@
 
 #include "boe.global.hpp"
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "boe.graphics.hpp"
 #include "boe.newgraph.hpp"
 #include "boe.graphutil.hpp"
 #include "boe.monster.hpp"
 #include "boe.locutils.hpp"
 #include "boe.text.hpp"
-#include "render_image.hpp"
-#include "render_shapes.hpp"
-#include "render_text.hpp"
-#include "tiling.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/render_shapes.hpp"
+#include "gfx/render_text.hpp"
+#include "gfx/tiling.hpp"
 #include "sounds.hpp"
 #include "mathutil.hpp"
-#include "button.hpp"
-#include "enum_map.hpp"
-#include "drawable_manager.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "tools/enum_map.hpp"
+#include "tools/drawable_manager.hpp"
 
 #include "boe.party.hpp"
 #include "boe.town.hpp"
@@ -32,14 +32,14 @@
 #include "boe.infodlg.hpp"
 #include "boe.ui.hpp"
 
-#include "scrollbar.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
 
-#include "res_image.hpp"
+#include "fileio/resmgr/res_image.hpp"
 #include "boe.menus.hpp"
-#include "winutil.hpp"
-#include "prefs.hpp"
+#include "tools/winutil.hpp"
+#include "tools/prefs.hpp"
 #ifndef MSBUILD_GITREV
-#include "gitrev.hpp"
+#include "tools/gitrev.hpp"
 #endif
 
 extern sf::RenderWindow mainPtr;
diff --git a/src/game/boe.graphutil.cpp b/src/game/boe.graphutil.cpp
index ee733088..a9f35474 100644
--- a/src/game/boe.graphutil.cpp
+++ b/src/game/boe.graphutil.cpp
@@ -6,7 +6,7 @@
 
 #include "boe.global.hpp"
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "boe.graphutil.hpp"
 #include "boe.text.hpp"
 #include "boe.locutils.hpp"
@@ -15,11 +15,11 @@
 #include "boe.monster.hpp"
 #include "boe.specials.hpp"
 #include "sounds.hpp"
-#include "render_image.hpp"
-#include "render_shapes.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/render_shapes.hpp"
 #include "mathutil.hpp"
-#include "strdlog.hpp"
-#include "res_image.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "fileio/resmgr/res_image.hpp"
 
 extern sf::RenderWindow mainPtr;
 extern rectangle	windRect;
diff --git a/src/game/boe.graphutil.hpp b/src/game/boe.graphutil.hpp
index 7a79f3dc..e0ae08ae 100644
--- a/src/game/boe.graphutil.hpp
+++ b/src/game/boe.graphutil.hpp
@@ -2,9 +2,9 @@
 #ifndef BOE_GAME_GRAPHUTIL_H
 #define BOE_GAME_GRAPHUTIL_H
 
-#include "pict.hpp"
+#include "dialogxml/widgets/pict.hpp"
 #include "location.hpp"
-#include "gfxsheets.hpp"
+#include "gfx/gfxsheets.hpp"
 
 void draw_one_terrain_spot (short i,short j,short terrain_to_draw);
 void draw_monsters();
diff --git a/src/game/boe.infodlg.cpp b/src/game/boe.infodlg.cpp
index ba79a8d4..e548d67f 100644
--- a/src/game/boe.infodlg.cpp
+++ b/src/game/boe.infodlg.cpp
@@ -4,7 +4,7 @@
 
 #include "boe.global.hpp"
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 
 #include "boe.graphics.hpp"
 #include "boe.newgraph.hpp"
@@ -19,14 +19,14 @@
 #include "boe.fileio.hpp"
 #include "boe.main.hpp"
 #include "mathutil.hpp"
-#include "strdlog.hpp"
-#include "button.hpp"
-#include "fileio.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "fileio/fileio.hpp"
 #include <boost/lexical_cast.hpp>
-#include "prefs.hpp"
+#include "tools/prefs.hpp"
 #include "spell.hpp"
 #include "view_dialogs.hpp"
-#include "cursors.hpp"
+#include "tools/cursors.hpp"
 #include "utility.hpp"
 
 short mage_spell_pos = 0,priest_spell_pos = 0,skill_pos = 0;
diff --git a/src/game/boe.infodlg.hpp b/src/game/boe.infodlg.hpp
index 509c82de..13fce0a3 100644
--- a/src/game/boe.infodlg.hpp
+++ b/src/game/boe.infodlg.hpp
@@ -2,10 +2,10 @@
 #ifndef BOE_GAME_INFODLG_H
 #define BOE_GAME_INFODLG_H
 
-#include "item.hpp"
-#include "monster.hpp"
-#include "pc.hpp"
-#include "creature.hpp"
+#include "scenario/item.hpp"
+#include "scenario/monster.hpp"
+#include "universe/pc.hpp"
+#include "universe/creature.hpp"
 
 class cDialog;
 void display_spells(eSkill mode,short force_spell,cDialog* parent);
diff --git a/src/game/boe.items.cpp b/src/game/boe.items.cpp
index 445a06f0..fa34ce33 100644
--- a/src/game/boe.items.cpp
+++ b/src/game/boe.items.cpp
@@ -4,7 +4,7 @@
 
 #include "boe.global.hpp"
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 
 #include "boe.graphics.hpp"
 #include "boe.text.hpp"
@@ -18,13 +18,13 @@
 #include "boe.monster.hpp"
 #include "boe.main.hpp"
 #include "mathutil.hpp"
-#include "strdlog.hpp"
-#include "3choice.hpp"
-#include "message.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/3choice.hpp"
+#include "dialogxml/widgets/message.hpp"
 #include <array>
 #include <boost/lexical_cast.hpp>
-#include "winutil.hpp"
-#include "cursors.hpp"
+#include "tools/winutil.hpp"
+#include "tools/cursors.hpp"
 
 extern short which_combat_type;
 extern eGameMode overall_mode;
diff --git a/src/game/boe.items.hpp b/src/game/boe.items.hpp
index 59a8e21c..a521ea51 100644
--- a/src/game/boe.items.hpp
+++ b/src/game/boe.items.hpp
@@ -1,6 +1,6 @@
 
-#include "dialog.hpp"
-#include "pict.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/widgets/pict.hpp"
 
 bool GTP(short item_num);
 bool silent_GTP(short item_num);
diff --git a/src/game/boe.locutils.cpp b/src/game/boe.locutils.cpp
index 902ba5da..aaa45c99 100644
--- a/src/game/boe.locutils.cpp
+++ b/src/game/boe.locutils.cpp
@@ -2,7 +2,7 @@
 #include "mathutil.hpp"
 #include "boe.global.hpp"
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "boe.locutils.hpp"
 #include "boe.text.hpp"
 #include "boe.monster.hpp"
diff --git a/src/game/boe.main.cpp b/src/game/boe.main.cpp
index 4db9f19a..eb25b2ec 100644
--- a/src/game/boe.main.cpp
+++ b/src/game/boe.main.cpp
@@ -1,6 +1,6 @@
 
 #include "boe.global.hpp"
-#include "universe.hpp"
+#include "universe/universe.hpp"
 
 #include <boost/filesystem/operations.hpp>
 #include <unordered_map>
@@ -20,23 +20,23 @@
 #include "boe.main.hpp"
 #include "boe.consts.hpp"
 #include "boe.ui.hpp"
-#include "winutil.hpp"
+#include "tools/winutil.hpp"
 #include "sounds.hpp"
-#include "render_image.hpp"
-#include "tiling.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/tiling.hpp"
 #include "mathutil.hpp"
-#include "fileio.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
-#include "scrollbar.hpp"
+#include "fileio/fileio.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
 #include "boe.menus.hpp"
-#include "cursors.hpp"
-#include "prefs.hpp"
-#include "button.hpp"
-#include "enum_map.hpp"
-#include "framerate_limiter.hpp"
-#include "event_listener.hpp"
-#include "drawable_manager.hpp"
+#include "tools/cursors.hpp"
+#include "tools/prefs.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "tools/enum_map.hpp"
+#include "tools/framerate_limiter.hpp"
+#include "tools/event_listener.hpp"
+#include "tools/drawable_manager.hpp"
 bool All_Done = false;
 sf::RenderWindow mainPtr;
 short had_text_freeze = 0,num_fonts;
diff --git a/src/game/boe.menus.mac.mm b/src/game/boe.menus.mac.mm
index 45f2c611..2057de51 100644
--- a/src/game/boe.menus.mac.mm
+++ b/src/game/boe.menus.mac.mm
@@ -8,7 +8,7 @@
 
 #include "boe.menus.hpp"
 
-#include "universe.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
+#include "universe/universe.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
 #include <Cocoa/Cocoa.h>
 #include <sstream>
 #include "boe.party.hpp"
diff --git a/src/game/boe.monster.cpp b/src/game/boe.monster.cpp
index 2724c6a1..beb62bdf 100644
--- a/src/game/boe.monster.cpp
+++ b/src/game/boe.monster.cpp
@@ -3,7 +3,7 @@
 
 #include "boe.global.hpp"
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "boe.locutils.hpp"
 #include "boe.monster.hpp"
 #include "boe.combat.hpp"
@@ -15,7 +15,7 @@
 #include "boe.newgraph.hpp"
 #include "boe.main.hpp"
 #include "mathutil.hpp"
-#include "gfxsheets.hpp"
+#include "gfx/gfxsheets.hpp"
 
 extern eGameMode overall_mode;
 extern short which_combat_type;
diff --git a/src/game/boe.monster.hpp b/src/game/boe.monster.hpp
index 97880deb..be3fb065 100644
--- a/src/game/boe.monster.hpp
+++ b/src/game/boe.monster.hpp
@@ -1,6 +1,6 @@
 
-#include "pict.hpp"
-#include "creature.hpp"
+#include "dialogxml/widgets/pict.hpp"
+#include "universe/creature.hpp"
 
 short out_enc_lev_tot(short which);
 void create_wand_monst();
diff --git a/src/game/boe.newgraph.cpp b/src/game/boe.newgraph.cpp
index 69a892fe..4eb3b77a 100644
--- a/src/game/boe.newgraph.cpp
+++ b/src/game/boe.newgraph.cpp
@@ -6,7 +6,7 @@
 
 #include "boe.global.hpp"
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "boe.graphics.hpp"
 #include "boe.graphutil.hpp"
 #include "boe.monster.hpp"
@@ -17,20 +17,20 @@
 #include "boe.consts.hpp"
 #include "sounds.hpp"
 #include "mathutil.hpp"
-#include "render_image.hpp"
-#include "render_shapes.hpp"
-#include "render_text.hpp"
-#include "tiling.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/render_shapes.hpp"
+#include "gfx/render_text.hpp"
+#include "gfx/tiling.hpp"
 #include "utility.hpp"
-#include "scrollbar.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
 #include <memory>
 #include "location.hpp"
-#include "shop.hpp"
+#include "scenario/shop.hpp"
 #include "spell.hpp"
-#include "button.hpp"
-#include "res_image.hpp"
-#include "prefs.hpp"
-#include "enum_map.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "tools/prefs.hpp"
+#include "tools/enum_map.hpp"
 
 short monsters_faces[190] = {
 	0,1,2,3,4,5,6,7,8,9,
diff --git a/src/game/boe.newgraph.hpp b/src/game/boe.newgraph.hpp
index 970ac17d..1621ccd2 100644
--- a/src/game/boe.newgraph.hpp
+++ b/src/game/boe.newgraph.hpp
@@ -2,8 +2,8 @@
 #include <string>
 #include <SFML/Graphics/RenderTarget.hpp>
 #include "location.hpp"
-#include "item.hpp"
-#include "gfxsheets.hpp"
+#include "scenario/item.hpp"
+#include "gfx/gfxsheets.hpp"
 
 struct word_rect_t {
 	std::string word;
diff --git a/src/game/boe.party.cpp b/src/game/boe.party.cpp
index fac701aa..d8eb90b9 100644
--- a/src/game/boe.party.cpp
+++ b/src/game/boe.party.cpp
@@ -6,7 +6,7 @@
 #include <array>
 #include <map>
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 
 #include "boe.fileio.hpp"
 #include "boe.graphics.hpp"
@@ -29,17 +29,17 @@
 #include "boe.main.hpp"
 #include "utility.hpp"
 #include "mathutil.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
-#include "pictchoice.hpp"
-#include "winutil.hpp"
-#include "fileio.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "dialogxml/dialogs/pictchoice.hpp"
+#include "tools/winutil.hpp"
+#include "fileio/fileio.hpp"
 #include "boe.menus.hpp"
 #include <boost/lexical_cast.hpp>
-#include "button.hpp"
+#include "dialogxml/widgets/button.hpp"
 #include "spell.hpp"
-#include "cursors.hpp"
-#include "render_shapes.hpp" // for colour constants
+#include "tools/cursors.hpp"
+#include "gfx/render_shapes.hpp" // for colour constants
 
 extern short skill_bonus[21];
 
diff --git a/src/game/boe.specials.cpp b/src/game/boe.specials.cpp
index da8a2acf..f3af3b82 100644
--- a/src/game/boe.specials.cpp
+++ b/src/game/boe.specials.cpp
@@ -6,7 +6,7 @@
 
 #include "boe.global.hpp"
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "boe.party.hpp"
 #include "boe.town.hpp"
 #include "boe.text.hpp"
@@ -25,9 +25,9 @@
 #include "boe.dlgutil.hpp"
 #include "mathutil.hpp"
 #include "boe.main.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
-#include "fileio.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "fileio/fileio.hpp"
 #include <array>
 #include "spell.hpp"
 #include "boe.menus.hpp"
diff --git a/src/game/boe.specials.hpp b/src/game/boe.specials.hpp
index a68a4347..730d6a1a 100644
--- a/src/game/boe.specials.hpp
+++ b/src/game/boe.specials.hpp
@@ -1,5 +1,5 @@
 
-#include "creature.hpp"
+#include "universe/creature.hpp"
 
 bool handle_wandering_specials(short mode);
 bool check_special_terrain(location where_check,eSpecCtx mode,cPlayer& which_pc,bool *forced);
diff --git a/src/game/boe.startup.cpp b/src/game/boe.startup.cpp
index c9fd90b3..34f75472 100644
--- a/src/game/boe.startup.cpp
+++ b/src/game/boe.startup.cpp
@@ -1,7 +1,7 @@
 
 #include "boe.global.hpp"
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "boe.newgraph.hpp"
 #include "boe.graphics.hpp"
 #include "boe.fileio.hpp"
@@ -13,16 +13,16 @@
 #include "boe.party.hpp"
 #include "boe.main.hpp"
 #include "sounds.hpp"
-#include "fileio.hpp"
-#include "choicedlog.hpp"
-#include "winutil.hpp"
+#include "fileio/fileio.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "tools/winutil.hpp"
 #include "boe.menus.hpp"
 #include "mathutil.hpp"
-#include "res_image.hpp"
-#include "prefs.hpp"
-#include "cursors.hpp"
-#include "render_image.hpp"
-#include "enum_map.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "tools/prefs.hpp"
+#include "tools/cursors.hpp"
+#include "gfx/render_image.hpp"
+#include "tools/enum_map.hpp"
 
 #include <vector>
 using std::vector;
diff --git a/src/game/boe.text.cpp b/src/game/boe.text.cpp
index b18d6a6f..2cc31027 100644
--- a/src/game/boe.text.cpp
+++ b/src/game/boe.text.cpp
@@ -7,21 +7,21 @@ const int TEXT_BUF_LEN = 70;
 
 #include "boe.global.hpp"
 #include "boe.graphutil.hpp"
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "boe.text.hpp"
 #include "boe.locutils.hpp"
 #include "boe.infodlg.hpp"
 #include "mathutil.hpp"
-#include "render_text.hpp"
-#include "render_image.hpp"
-#include "render_shapes.hpp"
-#include "tiling.hpp"
+#include "gfx/render_text.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/render_shapes.hpp"
+#include "gfx/tiling.hpp"
 #include "utility.hpp"
-#include "scrollbar.hpp"
-#include "res_image.hpp"
-#include "res_font.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "fileio/resmgr/res_font.hpp"
 #include "spell.hpp"
-#include "enum_map.hpp"
+#include "tools/enum_map.hpp"
 
 typedef struct {
 	char line[50];
diff --git a/src/game/boe.town.cpp b/src/game/boe.town.cpp
index 4d3354b5..4b70675b 100644
--- a/src/game/boe.town.cpp
+++ b/src/game/boe.town.cpp
@@ -4,7 +4,7 @@
 
 #include "boe.global.hpp"
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 
 #include "boe.graphutil.hpp"
 #include "boe.graphics.hpp"
@@ -22,14 +22,14 @@
 #include "boe.infodlg.hpp"
 #include "boe.ui.hpp"
 #include "mathutil.hpp"
-#include "render_image.hpp"
-#include "render_shapes.hpp"
-#include "render_text.hpp"
-#include "tiling.hpp"
-#include "strdlog.hpp"
-#include "winutil.hpp"
-#include "res_image.hpp"
-#include "cursors.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/render_shapes.hpp"
+#include "gfx/render_text.hpp"
+#include "gfx/tiling.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "tools/winutil.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "tools/cursors.hpp"
 
 extern short store_spell_target,which_combat_type,combat_active_pc;
 extern eGameMode overall_mode;
diff --git a/src/game/boe.town.hpp b/src/game/boe.town.hpp
index f1d853f2..66795f4d 100644
--- a/src/game/boe.town.hpp
+++ b/src/game/boe.town.hpp
@@ -1,6 +1,6 @@
 
 #include <SFML/Graphics.hpp>
-#include "outdoors.hpp"
+#include "scenario/outdoors.hpp"
 
 void force_town_enter(short which_town,location where_start);
 void start_town_mode(short which_town, short entry_dir);
diff --git a/src/game/boe.townspec.cpp b/src/game/boe.townspec.cpp
index d5021f1c..2a4cfb63 100644
--- a/src/game/boe.townspec.cpp
+++ b/src/game/boe.townspec.cpp
@@ -1,7 +1,7 @@
 
 #include "boe.global.hpp"
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "boe.party.hpp"
 #include "boe.town.hpp"
 #include "boe.items.hpp"
@@ -13,9 +13,9 @@
 #include "boe.townspec.hpp"
 #include "sounds.hpp"
 #include "mathutil.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
-#include "winutil.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "tools/winutil.hpp"
 #include "boe.menus.hpp"
 #include "utility.hpp"
 
diff --git a/src/game/boe.ui.cpp b/src/game/boe.ui.cpp
index 7eeacd67..9d013c55 100644
--- a/src/game/boe.ui.cpp
+++ b/src/game/boe.ui.cpp
@@ -9,13 +9,13 @@
 #include "boe.ui.hpp"
 
 #include <numeric>
-#include "enum_map.hpp"
+#include "tools/enum_map.hpp"
 #include "boe.consts.hpp"
 #include "boe.locutils.hpp"
 #include "boe.graphics.hpp"
-#include "render_shapes.hpp"
-#include "render_image.hpp"
-#include "res_image.hpp"
+#include "gfx/render_shapes.hpp"
+#include "gfx/render_image.hpp"
+#include "fileio/resmgr/res_image.hpp"
 #include "mathutil.hpp"
 #include "sounds.hpp"
 
diff --git a/src/gfx/gfxsheets.cpp b/src/gfx/gfxsheets.cpp
index fedfdc3f..51c3f1c6 100644
--- a/src/gfx/gfxsheets.cpp
+++ b/src/gfx/gfxsheets.cpp
@@ -9,8 +9,8 @@
 #include "gfxsheets.hpp"
 
 #include "location.hpp"
-#include "res_image.hpp"
-#include "render_image.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "gfx/render_image.hpp"
 
 bool use_win_graphics = false;
 
diff --git a/src/gfx/qdpict.mac.cpp b/src/gfx/qdpict.mac.cpp
index 51a988ca..33d86e1d 100644
--- a/src/gfx/qdpict.mac.cpp
+++ b/src/gfx/qdpict.mac.cpp
@@ -21,7 +21,7 @@
 #include <memory>
 #include <boost/filesystem/path.hpp>
 
-#include "strdlog.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
 #include "porting.hpp"
 #include "location.hpp"
 
diff --git a/src/gfx/render_image.cpp b/src/gfx/render_image.cpp
index 0407fe71..21588dae 100644
--- a/src/gfx/render_image.cpp
+++ b/src/gfx/render_image.cpp
@@ -12,8 +12,8 @@
 #include <fstream>
 #include <boost/filesystem/path.hpp>
 
-#include "fileio.hpp"
-#include "render_shapes.hpp"
+#include "fileio/fileio.hpp"
+#include "gfx/render_shapes.hpp"
 
 sf::Shader maskShader;
 extern fs::path progDir;
diff --git a/src/gfx/render_image.hpp b/src/gfx/render_image.hpp
index 42091ec6..01fbfcc2 100644
--- a/src/gfx/render_image.hpp
+++ b/src/gfx/render_image.hpp
@@ -16,7 +16,7 @@
 #include <boost/filesystem/path.hpp>
 #include <SFML/Graphics.hpp>
 #include "location.hpp"
-#include "pictypes.hpp"
+#include "dialogxml/widgets/pictypes.hpp"
 
 void init_shaders();
 void rect_draw_some_item(sf::RenderTarget& targ_gworld,rectangle targ_rect);
diff --git a/src/gfx/render_text.cpp b/src/gfx/render_text.cpp
index fcffbecb..68b95e9a 100644
--- a/src/gfx/render_text.cpp
+++ b/src/gfx/render_text.cpp
@@ -9,8 +9,8 @@
 #include "render_text.hpp"
 
 #include <iostream>
-#include "res_font.hpp"
-#include "render_shapes.hpp"
+#include "fileio/resmgr/res_font.hpp"
+#include "gfx/render_shapes.hpp"
 
 void TextStyle::applyTo(sf::Text& text) {
 	switch(font) {
diff --git a/src/gfx/tiling.cpp b/src/gfx/tiling.cpp
index 54010a1e..1161e93c 100644
--- a/src/gfx/tiling.cpp
+++ b/src/gfx/tiling.cpp
@@ -11,9 +11,9 @@
 #include <unordered_map>
 #include <SFML/Graphics.hpp>
 #include <SFML/OpenGL.hpp>
-#include "res_image.hpp"
-#include "render_image.hpp"
-#include "render_shapes.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/render_shapes.hpp"
 
 rectangle bg_rects[21];
 tessel_ref_t bg[21];
diff --git a/src/pcedit/pc.action.cpp b/src/pcedit/pc.action.cpp
index 0a5cdb1a..9f18bdce 100644
--- a/src/pcedit/pc.action.cpp
+++ b/src/pcedit/pc.action.cpp
@@ -2,15 +2,15 @@
 #include <cstdio>
 
 #include "pc.graphics.hpp"
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "pc.editors.hpp"
 #include "pc.fileio.hpp"
 #include "pc.action.hpp"
 #include "sounds.hpp"
 #include "mathutil.hpp"
-#include "dialog.hpp"
-#include "control.hpp"
-#include "cursors.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/widgets/control.hpp"
+#include "tools/cursors.hpp"
 #include <boost/lexical_cast.hpp>
 
 extern cUniverse univ;
diff --git a/src/pcedit/pc.action.hpp b/src/pcedit/pc.action.hpp
index 98dccefd..957efbfa 100644
--- a/src/pcedit/pc.action.hpp
+++ b/src/pcedit/pc.action.hpp
@@ -1,6 +1,6 @@
 
 #include <SFML/Window/Event.hpp>
-#include "dialog.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
 
 bool handle_action(const sf::Event&);
 void flash_rect(rectangle to_flash);
diff --git a/src/pcedit/pc.appleevents.mm b/src/pcedit/pc.appleevents.mm
index 43458571..fc4cdca0 100644
--- a/src/pcedit/pc.appleevents.mm
+++ b/src/pcedit/pc.appleevents.mm
@@ -6,10 +6,10 @@
 //
 //
 
-#include "universe.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
+#include "universe/universe.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
 #include <Cocoa/Cocoa.h>
 #include <string>
-#include "fileio.hpp"
+#include "fileio/fileio.hpp"
 #include "pc.menus.hpp"
 #include "pc.fileio.hpp"
 
diff --git a/src/pcedit/pc.editors.cpp b/src/pcedit/pc.editors.cpp
index 589e1f52..abab9d35 100644
--- a/src/pcedit/pc.editors.cpp
+++ b/src/pcedit/pc.editors.cpp
@@ -1,18 +1,18 @@
 
 #include "pc.graphics.hpp"
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "pc.editors.hpp"
 #include "utility.hpp"
-#include "dialog.hpp"
-#include "control.hpp"
-#include "button.hpp"
-#include "ledgroup.hpp"
-#include "pict.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
-#include "winutil.hpp"
-#include "cursors.hpp"
-#include "render_shapes.hpp" // for colour constants
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/widgets/control.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "dialogxml/widgets/ledgroup.hpp"
+#include "dialogxml/widgets/pict.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "tools/winutil.hpp"
+#include "tools/cursors.hpp"
+#include "gfx/render_shapes.hpp" // for colour constants
 #include <boost/lexical_cast.hpp>
 
 /*
diff --git a/src/pcedit/pc.fileio.cpp b/src/pcedit/pc.fileio.cpp
index 4f048a22..ac4db66e 100644
--- a/src/pcedit/pc.fileio.cpp
+++ b/src/pcedit/pc.fileio.cpp
@@ -2,13 +2,13 @@
 #include <cstring>
 #include <cstdio>
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "pc.fileio.hpp"
 #include "pc.graphics.hpp"
 #include "sounds.hpp"
 #include "pc.editors.hpp"
 #include "mathutil.hpp"
-#include "fileio.hpp"
+#include "fileio/fileio.hpp"
 
 extern cUniverse univ;
 extern bool party_in_scen,scen_items_loaded;
diff --git a/src/pcedit/pc.graphics.cpp b/src/pcedit/pc.graphics.cpp
index e54af26e..d2e0c00c 100644
--- a/src/pcedit/pc.graphics.cpp
+++ b/src/pcedit/pc.graphics.cpp
@@ -1,19 +1,19 @@
 
 #include <iomanip>
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "pc.graphics.hpp"
 #include "pc.editors.hpp"
 #include "pc.action.hpp"
 #include "pc.menus.hpp"
 #include "sounds.hpp"
-#include "gfxsheets.hpp"
-#include "render_shapes.hpp"
-#include "render_image.hpp"
-#include "res_image.hpp"
-#include "message.hpp"
+#include "gfx/gfxsheets.hpp"
+#include "gfx/render_shapes.hpp"
+#include "gfx/render_image.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "dialogxml/widgets/message.hpp"
 #include "mathutil.hpp"
-#include "gitrev.hpp"
-#include "tiling.hpp" // for bg
+#include "tools/gitrev.hpp"
+#include "gfx/tiling.hpp" // for bg
 #include "utility.hpp"
 
 extern cUniverse univ;
diff --git a/src/pcedit/pc.main.cpp b/src/pcedit/pc.main.cpp
index 31c387b0..921b0f61 100644
--- a/src/pcedit/pc.main.cpp
+++ b/src/pcedit/pc.main.cpp
@@ -2,27 +2,27 @@
 #include <iostream>
 #include <cstring>
 #include <boost/filesystem/operations.hpp>
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "pc.graphics.hpp"
 #include "pc.editors.hpp"
 #include "pc.action.hpp"
 #include "pc.fileio.hpp"
 #include "sounds.hpp"
-#include "render_image.hpp"
-#include "tiling.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/tiling.hpp"
 #include "utility.hpp"
-#include "dialog.hpp"
-#include "control.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
-#include "strchoice.hpp"
-#include "fileio.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/widgets/control.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "dialogxml/dialogs/strchoice.hpp"
+#include "fileio/fileio.hpp"
 #include "pc.menus.hpp"
-#include "winutil.hpp"
-#include "cursors.hpp"
-#include "res_image.hpp"
-#include "prefs.hpp"
-#include "framerate_limiter.hpp"
+#include "tools/winutil.hpp"
+#include "tools/cursors.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "tools/prefs.hpp"
+#include "tools/framerate_limiter.hpp"
 
 cUniverse univ;
 
diff --git a/src/pcedit/pc.menus.mac.mm b/src/pcedit/pc.menus.mac.mm
index 057126c3..d63e8699 100644
--- a/src/pcedit/pc.menus.mac.mm
+++ b/src/pcedit/pc.menus.mac.mm
@@ -7,9 +7,9 @@
 //
 
 #include "pc.menus.hpp"
-#include "universe.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
+#include "universe/universe.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
 #include <Cocoa/Cocoa.h>
-#include "item.hpp"
+#include "scenario/item.hpp"
 
 #ifndef __APPLE__
 #error pc.menus.mm is Mac-specific code; try compiling pc.menus.win.cpp instead
diff --git a/src/scenario/area.hpp b/src/scenario/area.hpp
index 440239e9..ff4114aa 100644
--- a/src/scenario/area.hpp
+++ b/src/scenario/area.hpp
@@ -13,9 +13,9 @@
 #include <string>
 #include <boost/dynamic_bitset.hpp>
 
-#include "vector2d.hpp"
+#include "tools/vector2d.hpp"
 #include "location.hpp"
-#include "special.hpp"
+#include "scenario/special.hpp"
 #include "mathutil.hpp"
 
 enum {
diff --git a/src/scenario/item.cpp b/src/scenario/item.cpp
index e5b94aa0..0036519a 100644
--- a/src/scenario/item.cpp
+++ b/src/scenario/item.cpp
@@ -17,7 +17,7 @@
 
 #include "oldstructs.hpp"
 #include "utility.hpp"
-#include "fileio.hpp"
+#include "fileio/fileio.hpp"
 
 #include "damage.hpp"
 #include "spell.hpp"
diff --git a/src/scenario/monster.cpp b/src/scenario/monster.cpp
index 77d581ab..d4508875 100644
--- a/src/scenario/monster.cpp
+++ b/src/scenario/monster.cpp
@@ -17,9 +17,9 @@
 #include <boost/lexical_cast.hpp>
 
 #include "oldstructs.hpp"
-#include "fileio.hpp"
+#include "fileio/fileio.hpp"
 #include "spell.hpp"
-#include "gfxsheets.hpp" // for NO_PIC
+#include "gfx/gfxsheets.hpp" // for NO_PIC
 
 void cMonster::import_legacy(legacy::monster_record_type& old){
 	level = old.level;
diff --git a/src/scenario/outdoors.cpp b/src/scenario/outdoors.cpp
index f7b65c50..9af5a126 100644
--- a/src/scenario/outdoors.cpp
+++ b/src/scenario/outdoors.cpp
@@ -13,9 +13,9 @@
 #include <map>
 #include <sstream>
 
-#include "strdlog.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
 #include "oldstructs.hpp"
-#include "scenario.hpp"
+#include "scenario/scenario.hpp"
 
 void cOutdoors::import_legacy(legacy::outdoor_record_type& old){
 	ambient_sound = AMBIENT_NONE;
diff --git a/src/scenario/scenario.hpp b/src/scenario/scenario.hpp
index a141c813..ebdc81d7 100644
--- a/src/scenario/scenario.hpp
+++ b/src/scenario/scenario.hpp
@@ -20,7 +20,7 @@
 #include "special.hpp"
 #include "outdoors.hpp"
 #include "town.hpp"
-#include "vector2d.hpp"
+#include "tools/vector2d.hpp"
 #include "shop.hpp"
 #include "quest.hpp"
 
diff --git a/src/scenario/shop.hpp b/src/scenario/shop.hpp
index ba3a844d..8e11c910 100644
--- a/src/scenario/shop.hpp
+++ b/src/scenario/shop.hpp
@@ -13,7 +13,7 @@
 #include <string>
 #include <iosfwd>
 #include "item.hpp"
-#include "pictypes.hpp" // for pic_num_t
+#include "dialogxml/widgets/pictypes.hpp" // for pic_num_t
 
 // Windows headers are really annoying with their defined constants.
 #ifdef INFINITE
diff --git a/src/scenario/special.cpp b/src/scenario/special.cpp
index 0a493181..06b61b86 100644
--- a/src/scenario/special.cpp
+++ b/src/scenario/special.cpp
@@ -13,7 +13,7 @@
 #include <sstream>
 #include <boost/lexical_cast.hpp>
 
-#include "strdlog.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
 #include "oldstructs.hpp"
 #include "utility.hpp"
 
diff --git a/src/scenario/terrain.cpp b/src/scenario/terrain.cpp
index 503170e3..96d46406 100644
--- a/src/scenario/terrain.cpp
+++ b/src/scenario/terrain.cpp
@@ -15,7 +15,7 @@
 #include <set>
 
 #include "oldstructs.hpp"
-#include "gfxsheets.hpp" // for NO_PIC
+#include "gfx/gfxsheets.hpp" // for NO_PIC
 #include "damage.hpp"
 
 void cTerrain::import_legacy(legacy::terrain_type_type& old){
diff --git a/src/scenario/terrain.hpp b/src/scenario/terrain.hpp
index 0a8c8473..f51c363b 100644
--- a/src/scenario/terrain.hpp
+++ b/src/scenario/terrain.hpp
@@ -12,7 +12,7 @@
 #include <string>
 #include <iosfwd>
 
-#include "pictypes.hpp"
+#include "dialogxml/widgets/pictypes.hpp"
 #include "location.hpp"
 #include "terrain_abilities.hpp"
 
diff --git a/src/scenario/town.cpp b/src/scenario/town.cpp
index 1520e4dd..c768f30d 100644
--- a/src/scenario/town.cpp
+++ b/src/scenario/town.cpp
@@ -16,7 +16,7 @@
 #include "scenario.hpp"
 #include "oldstructs.hpp"
 #include "mathutil.hpp"
-#include "fileio.hpp"
+#include "fileio/fileio.hpp"
 #include "utility.hpp"
 
 void cTown::import_legacy(legacy::town_record_type& old){
diff --git a/src/scenario/town_import.tpp b/src/scenario/town_import.tpp
index a1c859e6..491c11a5 100644
--- a/src/scenario/town_import.tpp
+++ b/src/scenario/town_import.tpp
@@ -12,9 +12,9 @@
 #include <sstream>
 
 #include "scenario.hpp"
-#include "strdlog.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
 #include "oldstructs.hpp"
-#include "fileio.hpp"
+#include "fileio/fileio.hpp"
 
 template<typename T>
 struct import_helper {
diff --git a/src/scenedit/scen.actions.cpp b/src/scenedit/scen.actions.cpp
index 75936693..768b0533 100644
--- a/src/scenedit/scen.actions.cpp
+++ b/src/scenedit/scen.actions.cpp
@@ -6,8 +6,8 @@
 #include <string>
 #include <stack>
 #include "scen.global.hpp"
-#include "scenario.hpp"
-#include "render_shapes.hpp"
+#include "scenario/scenario.hpp"
+#include "gfx/render_shapes.hpp"
 #include "scen.graphics.hpp"
 #include "scen.actions.hpp"
 #include "sounds.hpp"
@@ -17,13 +17,13 @@
 #include "scen.townout.hpp"
 #include "scen.menus.hpp"
 #include "mathutil.hpp"
-#include "fileio.hpp"
-#include "winutil.hpp"
-#include "cursors.hpp"
-#include "scrollbar.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
-#include "gitrev.hpp"
+#include "fileio/fileio.hpp"
+#include "tools/winutil.hpp"
+#include "tools/cursors.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "tools/gitrev.hpp"
 
 #include "scen.btnmg.hpp"
 
diff --git a/src/scenedit/scen.actions.hpp b/src/scenedit/scen.actions.hpp
index ede570f3..fcabe770 100644
--- a/src/scenedit/scen.actions.hpp
+++ b/src/scenedit/scen.actions.hpp
@@ -1,6 +1,6 @@
 
 #include "scen.global.hpp"
-#include "undo.hpp"
+#include "tools/undo.hpp"
 
 void init_screen_locs();
 void handle_action(location the_point,sf::Event event);
diff --git a/src/scenedit/scen.appleevents.mm b/src/scenedit/scen.appleevents.mm
index 23a1a8d5..0ae57a81 100644
--- a/src/scenedit/scen.appleevents.mm
+++ b/src/scenedit/scen.appleevents.mm
@@ -6,12 +6,12 @@
 //
 //
 
-#include "scenario.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
+#include "scenario/scenario.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
 #include <Cocoa/Cocoa.h>
 #include <memory>
 #include <algorithm>
 #include <iostream>
-#include "fileio.hpp"
+#include "fileio/fileio.hpp"
 #include "scen.actions.hpp"
 #include "scen.townout.hpp"
 
diff --git a/src/scenedit/scen.btnmg.cpp b/src/scenedit/scen.btnmg.cpp
index 552526ac..4b351024 100644
--- a/src/scenedit/scen.btnmg.cpp
+++ b/src/scenedit/scen.btnmg.cpp
@@ -9,7 +9,7 @@
 #include "scen.graphics.hpp"
 #include <cmath>
 #include "scen.btnmg.hpp"
-#include "scrollbar.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
 
 extern rectangle right_sbar_rect;
 
diff --git a/src/scenedit/scen.core.cpp b/src/scenedit/scen.core.cpp
index 2d00fdbc..b2ad5ca0 100644
--- a/src/scenedit/scen.core.cpp
+++ b/src/scenedit/scen.core.cpp
@@ -7,9 +7,9 @@
 #include <unordered_map>
 #include <boost/lexical_cast.hpp>
 #include "scen.global.hpp"
-#include "scenario.hpp"
-#include "town.hpp"
-#include "gfxsheets.hpp"
+#include "scenario/scenario.hpp"
+#include "scenario/town.hpp"
+#include "gfx/gfxsheets.hpp"
 #include "utility.hpp"
 #include "scen.graphics.hpp"
 #include "scen.core.hpp"
@@ -18,22 +18,22 @@
 #include "scen.fileio.hpp"
 #include "scen.actions.hpp"
 #include "scen.menus.hpp"
-#include "dialog.hpp"
-#include "control.hpp"
-#include "button.hpp"
-#include "strdlog.hpp"
-#include "3choice.hpp"
-#include "strchoice.hpp"
-#include "fileio.hpp"
-#include "field.hpp"
-#include "res_strings.hpp"
-#include "res_image.hpp"
-#include "res_sound.hpp"
-#include "cursors.hpp"
-#include "stack.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/widgets/control.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/3choice.hpp"
+#include "dialogxml/dialogs/strchoice.hpp"
+#include "fileio/fileio.hpp"
+#include "dialogxml/widgets/field.hpp"
+#include "fileio/resmgr/res_strings.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "fileio/resmgr/res_sound.hpp"
+#include "tools/cursors.hpp"
+#include "dialogxml/widgets/stack.hpp"
 #include "spell.hpp"
 #include "mathutil.hpp"
-#include "winutil.hpp"
+#include "tools/winutil.hpp"
 #include "view_dialogs.hpp"
 
 extern short cen_x, cen_y,cur_town;
diff --git a/src/scenedit/scen.fileio.cpp b/src/scenedit/scen.fileio.cpp
index 9e152057..fab9672c 100644
--- a/src/scenedit/scen.fileio.cpp
+++ b/src/scenedit/scen.fileio.cpp
@@ -1,26 +1,26 @@
 
 #include <cstring>
 #include "scen.global.hpp"
-#include "scenario.hpp"
+#include "scenario/scenario.hpp"
 #include <iostream>
 #include <fstream>
 #include <iomanip>
 #include <boost/filesystem/operations.hpp>
 #include "scen.fileio.hpp"
 #include "scen.keydlgs.hpp"
-#include "gfxsheets.hpp"
+#include "gfx/gfxsheets.hpp"
 #include "scen.core.hpp"
 #include "sounds.hpp"
 #include "mathutil.hpp"
 #include "oldstructs.hpp"
-#include "fileio.hpp"
-#include "tarball.hpp"
+#include "fileio/fileio.hpp"
+#include "fileio/tarball.hpp"
 #include "gzstream.h"
 #include "tinyprint.h"
-#include "map_parse.hpp"
-#include "winutil.hpp"
-#include "choicedlog.hpp"
-#include "undo.hpp"
+#include "fileio/map_parse.hpp"
+#include "tools/winutil.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "tools/undo.hpp"
 
 extern cScenario scenario;
 
diff --git a/src/scenedit/scen.graphics.cpp b/src/scenedit/scen.graphics.cpp
index 49b61654..4154a260 100644
--- a/src/scenedit/scen.graphics.cpp
+++ b/src/scenedit/scen.graphics.cpp
@@ -3,27 +3,27 @@
 #include <sstream>
 #include <cstring>
 #include "scen.global.hpp"
-#include "scenario.hpp"
-#include "gfxsheets.hpp"
-#include "render_image.hpp"
-#include "render_shapes.hpp"
-#include "render_text.hpp"
-#include "tiling.hpp" // for bg
+#include "scenario/scenario.hpp"
+#include "gfx/gfxsheets.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/render_shapes.hpp"
+#include "gfx/render_text.hpp"
+#include "gfx/tiling.hpp" // for bg
 #include "scen.graphics.hpp"
 #include <cmath>
 #include "scen.keydlgs.hpp"
 #include "sounds.hpp"
 #include "mathutil.hpp"
-#include "drawable_manager.hpp"
-#include "cursors.hpp"
+#include "tools/drawable_manager.hpp"
+#include "tools/cursors.hpp"
 
-#include "dialog.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
 
 #include "scen.core.hpp"
 #include "scen.menus.hpp"
 #include "scen.townout.hpp"
-#include "scrollbar.hpp"
-#include "res_image.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
+#include "fileio/resmgr/res_image.hpp"
 
 #include "scen.btnmg.hpp"
 
diff --git a/src/scenedit/scen.keydlgs.cpp b/src/scenedit/scen.keydlgs.cpp
index 88b19303..4a03b011 100644
--- a/src/scenedit/scen.keydlgs.cpp
+++ b/src/scenedit/scen.keydlgs.cpp
@@ -5,22 +5,22 @@
 #include <numeric>
 #include <boost/lexical_cast.hpp>
 #include "scen.global.hpp"
-#include "scenario.hpp"
-#include "gfxsheets.hpp"
+#include "scenario/scenario.hpp"
+#include "gfx/gfxsheets.hpp"
 #include "utility.hpp"
 #include "scen.graphics.hpp"
 #include "scen.keydlgs.hpp"
 #include "scen.core.hpp"
-#include "dialog.hpp"
-#include "control.hpp"
-#include "button.hpp"
-#include "strdlog.hpp"
-#include "3choice.hpp"
-#include "strchoice.hpp"
-#include "pictchoice.hpp"
-#include "res_strings.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/widgets/control.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/3choice.hpp"
+#include "dialogxml/dialogs/strchoice.hpp"
+#include "dialogxml/dialogs/pictchoice.hpp"
+#include "fileio/resmgr/res_strings.hpp"
 #include "spell.hpp"
-#include "render_shapes.hpp" // for colour constants
+#include "gfx/render_shapes.hpp" // for colour constants
 
 extern short cen_x, cen_y;
 extern bool mouse_button_held;
diff --git a/src/scenedit/scen.keydlgs.hpp b/src/scenedit/scen.keydlgs.hpp
index e83ce739..14d4b269 100644
--- a/src/scenedit/scen.keydlgs.hpp
+++ b/src/scenedit/scen.keydlgs.hpp
@@ -1,6 +1,6 @@
 
 #include <string>
-#include "pict.hpp" // for ePicType
+#include "dialogxml/widgets/pict.hpp" // for ePicType
 #include "location.hpp" // for info_rect_t
 class cDialog;
 
diff --git a/src/scenedit/scen.main.cpp b/src/scenedit/scen.main.cpp
index 87119b39..c2dd877a 100644
--- a/src/scenedit/scen.main.cpp
+++ b/src/scenedit/scen.main.cpp
@@ -5,9 +5,9 @@
 #include <boost/filesystem/operations.hpp>
 
 #include "scen.global.hpp"
-#include "scenario.hpp"
-#include "render_image.hpp"
-#include "tiling.hpp"
+#include "scenario/scenario.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/tiling.hpp"
 #include "scen.graphics.hpp"
 #include "scen.actions.hpp"
 #include "scen.fileio.hpp"
@@ -17,18 +17,18 @@
 #include "scen.core.hpp"
 #include "scen.keydlgs.hpp"
 #include "mathutil.hpp"
-#include "fileio.hpp"
-#include "scrollbar.hpp"
-#include "winutil.hpp"
-#include "cursors.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
+#include "fileio/fileio.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
+#include "tools/winutil.hpp"
+#include "tools/cursors.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
 #include "scen.menus.hpp"
-#include "res_image.hpp"
-#include "prefs.hpp"
-#include "framerate_limiter.hpp"
-#include "event_listener.hpp"
-#include "drawable_manager.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "tools/prefs.hpp"
+#include "tools/framerate_limiter.hpp"
+#include "tools/event_listener.hpp"
+#include "tools/drawable_manager.hpp"
 
 /* Globals */
 bool  All_Done = false;
diff --git a/src/scenedit/scen.menus.mac.mm b/src/scenedit/scen.menus.mac.mm
index c3e1b08a..75a547e1 100644
--- a/src/scenedit/scen.menus.mac.mm
+++ b/src/scenedit/scen.menus.mac.mm
@@ -7,10 +7,10 @@
 //
 
 #include "scen.menus.hpp"
-#include "scenario.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
+#include "scenario/scenario.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
 #include <Cocoa/Cocoa.h>
-#include "winutil.hpp"
-#include "undo.hpp"
+#include "tools/winutil.hpp"
+#include "tools/undo.hpp"
 
 using MenuHandle = NSMenu*;
 MenuHandle menu_bar_handle;
diff --git a/src/scenedit/scen.townout.cpp b/src/scenedit/scen.townout.cpp
index c7423b67..a7171810 100644
--- a/src/scenedit/scen.townout.cpp
+++ b/src/scenedit/scen.townout.cpp
@@ -4,8 +4,8 @@
 #include <stack>
 #include <boost/lexical_cast.hpp>
 #include "scen.global.hpp"
-#include "scenario.hpp"
-#include "town.hpp"
+#include "scenario/scenario.hpp"
+#include "scenario/town.hpp"
 #include "utility.hpp"
 #include "scen.actions.hpp"
 #include "scen.graphics.hpp"
@@ -14,15 +14,15 @@
 #include "scen.fileio.hpp"
 #include "scen.core.hpp"
 #include "mathutil.hpp"
-#include "button.hpp"
-#include "field.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
-#include "winutil.hpp"
-#include "ledgroup.hpp"
-#include "stack.hpp"
-#include "scrollpane.hpp"
-#include "fileio.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "dialogxml/widgets/field.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "tools/winutil.hpp"
+#include "dialogxml/widgets/ledgroup.hpp"
+#include "dialogxml/widgets/stack.hpp"
+#include "dialogxml/widgets/scrollpane.hpp"
+#include "fileio/fileio.hpp"
 
 extern short cen_x, cen_y, overall_mode;
 extern bool mouse_button_held,editing_town,change_made;
diff --git a/src/sounds.cpp b/src/sounds.cpp
index a95b0e22..822ef915 100644
--- a/src/sounds.cpp
+++ b/src/sounds.cpp
@@ -15,9 +15,9 @@
 #include <unordered_set>
 #include <unordered_map>
 
-#include "res_sound.hpp"
+#include "fileio/resmgr/res_sound.hpp"
 #include "mathutil.hpp"
-#include "prefs.hpp"
+#include "tools/prefs.hpp"
 
 struct SoundChannel {
 	std::shared_ptr<sf::Sound> player;
diff --git a/src/tools/cursors.mac.mm b/src/tools/cursors.mac.mm
index 54ad5555..4faee0fc 100644
--- a/src/tools/cursors.mac.mm
+++ b/src/tools/cursors.mac.mm
@@ -9,7 +9,7 @@
 #include "cursors.hpp"
 #include <Cocoa/Cocoa.h>
 #include <string>
-#include "res_cursor.hpp"
+#include "fileio/resmgr/res_cursor.hpp"
 
 static NSImage* imageFromURL(CFURLRef url) NS_RETURNS_RETAINED;
 static NSImage* imageFromURL(CFURLRef url){
diff --git a/src/universe/creature.hpp b/src/universe/creature.hpp
index 6bba86a0..593a1acd 100644
--- a/src/universe/creature.hpp
+++ b/src/universe/creature.hpp
@@ -11,7 +11,7 @@
 
 #include <iosfwd>
 #include "location.hpp"
-#include "monster.hpp"
+#include "scenario/monster.hpp"
 #include "living.hpp"
 
 class cCreature : public cMonster, public cTownperson, public iLiving {
diff --git a/src/universe/party.cpp b/src/universe/party.cpp
index f77ef98c..3c6143cc 100644
--- a/src/universe/party.cpp
+++ b/src/universe/party.cpp
@@ -14,11 +14,11 @@
 #include <sstream>
 #include <stdexcept>
 
-#include "scenario.hpp"
-#include "universe.hpp"
-#include "strdlog.hpp"
+#include "scenario/scenario.hpp"
+#include "universe/universe.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
 #include "oldstructs.hpp"
-#include "fileio.hpp"
+#include "fileio/fileio.hpp"
 #include "mathutil.hpp"
 
 cParty::cParty(ePartyPreset party_preset) {
diff --git a/src/universe/party.hpp b/src/universe/party.hpp
index 5aaf7048..e5d31c9c 100644
--- a/src/universe/party.hpp
+++ b/src/universe/party.hpp
@@ -17,14 +17,14 @@
 
 #include <boost/iterator/indirect_iterator.hpp>
 
-#include "vehicle.hpp"
+#include "scenario/vehicle.hpp"
 #include "population.hpp"
-#include "item.hpp"
+#include "scenario/item.hpp"
 #include "pc.hpp"
-#include "outdoors.hpp"
-#include "monster.hpp"
+#include "scenario/outdoors.hpp"
+#include "scenario/monster.hpp"
 #include "living.hpp"
-#include "quest.hpp"
+#include "scenario/quest.hpp"
 
 namespace legacy {
 	struct party_record_type;
diff --git a/src/universe/pc.cpp b/src/universe/pc.cpp
index d66a75a3..40d75930 100644
--- a/src/universe/pc.cpp
+++ b/src/universe/pc.cpp
@@ -18,7 +18,7 @@
 #include "universe.hpp"
 #include "oldstructs.hpp"
 #include "mathutil.hpp"
-#include "fileio.hpp"
+#include "fileio/fileio.hpp"
 #include "sounds.hpp"
 
 extern short skill_bonus[21];
diff --git a/src/universe/pc.hpp b/src/universe/pc.hpp
index 9ef6e63c..aacfbc23 100644
--- a/src/universe/pc.hpp
+++ b/src/universe/pc.hpp
@@ -17,8 +17,8 @@
 #include <cstdint>
 #include <limits>
 
-#include "item.hpp"
-#include "pictypes.hpp"
+#include "scenario/item.hpp"
+#include "dialogxml/widgets/pictypes.hpp"
 #include "living.hpp"
 #include "skills_traits.hpp"
 #include "race.hpp"
diff --git a/src/universe/population.hpp b/src/universe/population.hpp
index 1c2f2bcd..1dabe32a 100644
--- a/src/universe/population.hpp
+++ b/src/universe/population.hpp
@@ -9,7 +9,7 @@
 #ifndef BOE_DATA_CREATLIST_H
 #define BOE_DATA_CREATLIST_H
 
-#include "monster.hpp"
+#include "scenario/monster.hpp"
 #include <iosfwd>
 #include "creature.hpp"
 
diff --git a/src/universe/universe.cpp b/src/universe/universe.cpp
index 59ab41b3..63f58020 100644
--- a/src/universe/universe.cpp
+++ b/src/universe/universe.cpp
@@ -14,11 +14,11 @@
 #include <sstream>
 #include <stack>
 
-#include "town.hpp"
+#include "scenario/town.hpp"
 #include "oldstructs.hpp"
 #include "mathutil.hpp"
-#include "fileio.hpp"
-#include "gfxsheets.hpp"
+#include "fileio/fileio.hpp"
+#include "gfx/gfxsheets.hpp"
 
 void cCurOut::import_legacy(legacy::out_info_type& old){
 	for(int i = 0; i < 96; i++)
diff --git a/src/universe/universe.hpp b/src/universe/universe.hpp
index c33e77b7..c3316cfd 100644
--- a/src/universe/universe.hpp
+++ b/src/universe/universe.hpp
@@ -16,11 +16,11 @@
 #include <boost/filesystem/path.hpp>
 #include "party.hpp"
 #include "population.hpp"
-#include "item.hpp"
-#include "town.hpp"
-#include "talking.hpp"
-#include "scenario.hpp"
-#include "pictypes.hpp"
+#include "scenario/item.hpp"
+#include "scenario/town.hpp"
+#include "scenario/talking.hpp"
+#include "scenario/scenario.hpp"
+#include "dialogxml/widgets/pictypes.hpp"
 
 namespace legacy {
 	struct out_info_type;
diff --git a/src/utility.cpp b/src/utility.cpp
index 96d146f4..fbf74989 100644
--- a/src/utility.cpp
+++ b/src/utility.cpp
@@ -8,7 +8,7 @@
 
 #include "utility.hpp"
 
-#include "res_strings.hpp"
+#include "fileio/resmgr/res_strings.hpp"
 
 std::string get_str(std::string list, short j){
 	if(j == 0) return list;
diff --git a/src/view_dialogs.cpp b/src/view_dialogs.cpp
index 9e08462d..fd20055c 100644
--- a/src/view_dialogs.cpp
+++ b/src/view_dialogs.cpp
@@ -8,14 +8,14 @@
 
 #include "view_dialogs.hpp"
 
-#include "dialog.hpp"
-#include "pict.hpp"
-#include "button.hpp"
-#include "led.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/widgets/pict.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "dialogxml/widgets/led.hpp"
 
-#include "item.hpp"
-#include "creature.hpp"
-#include "scenario.hpp"
+#include "scenario/item.hpp"
+#include "universe/creature.hpp"
+#include "scenario/scenario.hpp"
 #include "utility.hpp"
 
 void put_item_info(cDialog& me, const cItem& s_i, const cScenario& scen) {
diff --git a/test/catch.cpp b/test/catch.cpp
index 8b381432..34b96294 100644
--- a/test/catch.cpp
+++ b/test/catch.cpp
@@ -4,16 +4,16 @@
 #include "catch.hpp"
 
 // After this are some globals that are referenced from common code but not defined, and not used in the test cases
-#include "gfxsheets.hpp"
-#include "universe.hpp"
+#include "gfx/gfxsheets.hpp"
+#include "universe/universe.hpp"
 sf::RenderWindow mainPtr;
 std::string scenario_temp_dir_name = "test_scenario";
 cCustomGraphics spec_scen_g;
 cUniverse univ;
 
 // And these are referenced from the scenario code, though not used in test cases
-#include "scenario.hpp"
-#include "undo.hpp"
+#include "scenario/scenario.hpp"
+#include "tools/undo.hpp"
 location cur_out;
 short cur_town;
 cScenario scenario;
diff --git a/test/enums.cpp b/test/enums.cpp
index 91352d44..d5b14d84 100644
--- a/test/enums.cpp
+++ b/test/enums.cpp
@@ -9,7 +9,7 @@
 #include <type_traits>
 #include <boost/lexical_cast.hpp>
 #include "catch.hpp"
-#include "universe.hpp"
+#include "universe/universe.hpp"
 
 using namespace std;
 using boost::lexical_cast;
diff --git a/test/init.cpp b/test/init.cpp
index a76ca88d..7f0ebc02 100644
--- a/test/init.cpp
+++ b/test/init.cpp
@@ -7,11 +7,11 @@
 //
 
 #include "catch.hpp"
-#include "scenario.hpp"
-#include "creature.hpp"
-#include "population.hpp"
-#include "pc.hpp"
-#include "party.hpp"
+#include "scenario/scenario.hpp"
+#include "universe/creature.hpp"
+#include "universe/population.hpp"
+#include "universe/pc.hpp"
+#include "universe/party.hpp"
 
 TEST_CASE("Initialization sanity test for terrain") {
 	cTerrain ter;
diff --git a/test/item_legacy.cpp b/test/item_legacy.cpp
index 0611de28..1ec7c5dc 100644
--- a/test/item_legacy.cpp
+++ b/test/item_legacy.cpp
@@ -7,7 +7,7 @@
 //
 
 #include "catch.hpp"
-#include "item.hpp"
+#include "scenario/item.hpp"
 #include "oldstructs.hpp"
 #include "spell.hpp"
 #include "damage.hpp"
diff --git a/test/item_read.cpp b/test/item_read.cpp
index cbd935ed..b55d67d8 100644
--- a/test/item_read.cpp
+++ b/test/item_read.cpp
@@ -9,8 +9,8 @@
 #include <fstream>
 #include "ticpp.h"
 #include "catch.hpp"
-#include "dialog.hpp"
-#include "scenario.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "scenario/scenario.hpp"
 
 using namespace std;
 using namespace ticpp;
diff --git a/test/item_write.cpp b/test/item_write.cpp
index 9ddf4a9c..64235b72 100644
--- a/test/item_write.cpp
+++ b/test/item_write.cpp
@@ -9,7 +9,7 @@
 #include <fstream>
 #include "catch.hpp"
 #include "tinyprint.h"
-#include "scenario.hpp"
+#include "scenario/scenario.hpp"
 
 using namespace std;
 using namespace ticpp;
diff --git a/test/map_read.cpp b/test/map_read.cpp
index d86bf982..7ff1e5c8 100644
--- a/test/map_read.cpp
+++ b/test/map_read.cpp
@@ -8,9 +8,9 @@
 
 #include <fstream>
 #include "catch.hpp"
-#include "map_parse.hpp"
-#include "scenario.hpp"
-#include "town.hpp"
+#include "fileio/map_parse.hpp"
+#include "scenario/scenario.hpp"
+#include "scenario/town.hpp"
 
 using namespace std;
 ostream& operator<< (ostream& out, eMapFeature feat);
diff --git a/test/map_write.cpp b/test/map_write.cpp
index b66ef12c..d6fd8638 100644
--- a/test/map_write.cpp
+++ b/test/map_write.cpp
@@ -8,9 +8,9 @@
 
 #include <fstream>
 #include "catch.hpp"
-#include "map_parse.hpp"
-#include "scenario.hpp"
-#include "town.hpp"
+#include "fileio/map_parse.hpp"
+#include "scenario/scenario.hpp"
+#include "scenario/town.hpp"
 
 using namespace std;
 
diff --git a/test/monst_legacy.cpp b/test/monst_legacy.cpp
index 73f12c96..9f2935a6 100644
--- a/test/monst_legacy.cpp
+++ b/test/monst_legacy.cpp
@@ -7,7 +7,7 @@
 //
 
 #include "catch.hpp"
-#include "creature.hpp"
+#include "universe/creature.hpp"
 #include "oldstructs.hpp"
 
 TEST_CASE("Converting monsters from legacy scenarios") {
diff --git a/test/monst_read.cpp b/test/monst_read.cpp
index 14205f26..ab37c763 100644
--- a/test/monst_read.cpp
+++ b/test/monst_read.cpp
@@ -9,8 +9,8 @@
 #include <fstream>
 #include "ticpp.h"
 #include "catch.hpp"
-#include "dialog.hpp"
-#include "scenario.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "scenario/scenario.hpp"
 
 using namespace std;
 using namespace ticpp;
diff --git a/test/monst_write.cpp b/test/monst_write.cpp
index 1c0226f4..aa2bfc42 100644
--- a/test/monst_write.cpp
+++ b/test/monst_write.cpp
@@ -9,7 +9,7 @@
 #include <fstream>
 #include "catch.hpp"
 #include "tinyprint.h"
-#include "scenario.hpp"
+#include "scenario/scenario.hpp"
 
 using namespace std;
 using namespace ticpp;
diff --git a/test/out_legacy.cpp b/test/out_legacy.cpp
index 766af3c2..00576e0f 100644
--- a/test/out_legacy.cpp
+++ b/test/out_legacy.cpp
@@ -7,8 +7,8 @@
 //
 
 #include "catch.hpp"
-#include "outdoors.hpp"
-#include "scenario.hpp"
+#include "scenario/outdoors.hpp"
+#include "scenario/scenario.hpp"
 #include "oldstructs.hpp"
 
 TEST_CASE("Converting legacy outdoor section data") {
diff --git a/test/out_read.cpp b/test/out_read.cpp
index 2fe8bfe8..ee65fef9 100644
--- a/test/out_read.cpp
+++ b/test/out_read.cpp
@@ -9,9 +9,9 @@
 #include <fstream>
 #include "ticpp.h"
 #include "catch.hpp"
-#include "dialog.hpp"
-#include "scenario.hpp"
-#include "outdoors.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "scenario/scenario.hpp"
+#include "scenario/outdoors.hpp"
 
 using namespace std;
 using namespace ticpp;
diff --git a/test/out_write.cpp b/test/out_write.cpp
index 34db884c..c33a5c8d 100644
--- a/test/out_write.cpp
+++ b/test/out_write.cpp
@@ -9,8 +9,8 @@
 #include <fstream>
 #include "catch.hpp"
 #include "tinyprint.h"
-#include "scenario.hpp"
-#include "outdoors.hpp"
+#include "scenario/scenario.hpp"
+#include "scenario/outdoors.hpp"
 
 using namespace std;
 using namespace ticpp;
diff --git a/test/pc_read.cpp b/test/pc_read.cpp
index 73395511..004d0c28 100644
--- a/test/pc_read.cpp
+++ b/test/pc_read.cpp
@@ -8,8 +8,8 @@
 
 #include <fstream>
 #include "catch.hpp"
-#include "pc.hpp"
-#include "party.hpp"
+#include "universe/pc.hpp"
+#include "universe/party.hpp"
 
 using namespace std;
 
diff --git a/test/scen_legacy.cpp b/test/scen_legacy.cpp
index 8537dcc3..d6032166 100644
--- a/test/scen_legacy.cpp
+++ b/test/scen_legacy.cpp
@@ -7,7 +7,7 @@
 //
 
 #include "catch.hpp"
-#include "scenario.hpp"
+#include "scenario/scenario.hpp"
 #include "oldstructs.hpp"
 
 TEST_CASE("Converting legacy scenario data") {
diff --git a/test/scen_read.cpp b/test/scen_read.cpp
index 8cf6cd0b..13d592b6 100644
--- a/test/scen_read.cpp
+++ b/test/scen_read.cpp
@@ -2,10 +2,10 @@
 #include <fstream>
 #include <iostream>
 #include "ticpp.h"
-#include "dialog.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
 #include "catch.hpp"
-#include "scenario.hpp"
-#include "res_strings.hpp"
+#include "scenario/scenario.hpp"
+#include "fileio/resmgr/res_strings.hpp"
 
 using namespace std;
 using namespace ticpp;
diff --git a/test/scen_write.cpp b/test/scen_write.cpp
index 1d25c835..dfe1866c 100644
--- a/test/scen_write.cpp
+++ b/test/scen_write.cpp
@@ -2,11 +2,11 @@
 #include <fstream>
 #include <iostream>
 #include "tinyprint.h"
-#include "dialog.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
 #include "catch.hpp"
-#include "scenario.hpp"
-#include "town.hpp"
-#include "res_strings.hpp"
+#include "scenario/scenario.hpp"
+#include "scenario/town.hpp"
+#include "fileio/resmgr/res_strings.hpp"
 
 using namespace std;
 using namespace ticpp;
diff --git a/test/spec_legacy.cpp b/test/spec_legacy.cpp
index 2bc59e9f..c4c31926 100644
--- a/test/spec_legacy.cpp
+++ b/test/spec_legacy.cpp
@@ -8,16 +8,16 @@
 
 #include "catch.hpp"
 #include "oldstructs.hpp"
-#include "special.hpp"
-#include "res_strings.hpp"
-#include "pictypes.hpp"
+#include "scenario/special.hpp"
+#include "fileio/resmgr/res_strings.hpp"
+#include "dialogxml/widgets/pictypes.hpp"
 #include "spell.hpp"
 #include "damage.hpp"
 #include "skills_traits.hpp"
 #include "fields.hpp"
 #include "race.hpp"
-#include "monster.hpp" // for eAttitude
-#include "town.hpp" // for lighting constants
+#include "scenario/monster.hpp" // for eAttitude
+#include "scenario/town.hpp" // for lighting constants
 
 using namespace std;
 
diff --git a/test/talk_legacy.cpp b/test/talk_legacy.cpp
index 9e98b848..37aaa898 100644
--- a/test/talk_legacy.cpp
+++ b/test/talk_legacy.cpp
@@ -7,9 +7,9 @@
 //
 
 #include "catch.hpp"
-#include "town.hpp"
-#include "talking.hpp"
-#include "scenario.hpp"
+#include "scenario/town.hpp"
+#include "scenario/talking.hpp"
+#include "scenario/scenario.hpp"
 #include "oldstructs.hpp"
 
 TEST_CASE("Converting legacy talk data") {
diff --git a/test/talk_read.cpp b/test/talk_read.cpp
index fbe889f9..1a136cbc 100644
--- a/test/talk_read.cpp
+++ b/test/talk_read.cpp
@@ -9,8 +9,8 @@
 #include <fstream>
 #include "ticpp.h"
 #include "catch.hpp"
-#include "dialog.hpp"
-#include "talking.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "scenario/talking.hpp"
 
 using namespace std;
 using namespace ticpp;
diff --git a/test/talk_write.cpp b/test/talk_write.cpp
index e9a53b3b..53576236 100644
--- a/test/talk_write.cpp
+++ b/test/talk_write.cpp
@@ -13,7 +13,7 @@
 #include <fstream>
 #include "catch.hpp"
 #include "tinyprint.h"
-#include "talking.hpp"
+#include "scenario/talking.hpp"
 
 using namespace std;
 using namespace ticpp;
diff --git a/test/ter_legacy.cpp b/test/ter_legacy.cpp
index 838a59ae..92b1ebab 100644
--- a/test/ter_legacy.cpp
+++ b/test/ter_legacy.cpp
@@ -7,7 +7,7 @@
 //
 
 #include "catch.hpp"
-#include "terrain.hpp"
+#include "scenario/terrain.hpp"
 #include "oldstructs.hpp"
 #include "damage.hpp"
 
diff --git a/test/ter_read.cpp b/test/ter_read.cpp
index e6e25e3f..d95b0d51 100644
--- a/test/ter_read.cpp
+++ b/test/ter_read.cpp
@@ -9,8 +9,8 @@
 #include <fstream>
 #include "ticpp.h"
 #include "catch.hpp"
-#include "dialog.hpp"
-#include "scenario.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "scenario/scenario.hpp"
 
 using namespace std;
 using namespace ticpp;
diff --git a/test/ter_write.cpp b/test/ter_write.cpp
index 11e72fac..06dc1611 100644
--- a/test/ter_write.cpp
+++ b/test/ter_write.cpp
@@ -9,7 +9,7 @@
 #include <fstream>
 #include "catch.hpp"
 #include "tinyprint.h"
-#include "scenario.hpp"
+#include "scenario/scenario.hpp"
 
 using namespace std;
 using namespace ticpp;
diff --git a/test/town_legacy.cpp b/test/town_legacy.cpp
index 04f80a3d..83eaf44b 100644
--- a/test/town_legacy.cpp
+++ b/test/town_legacy.cpp
@@ -7,8 +7,8 @@
 //
 
 #include "catch.hpp"
-#include "town.hpp"
-#include "scenario.hpp"
+#include "scenario/town.hpp"
+#include "scenario/scenario.hpp"
 #include "oldstructs.hpp"
 
 TEST_CASE("Converting legacy town data") {
diff --git a/test/town_read.cpp b/test/town_read.cpp
index be78219c..337df010 100644
--- a/test/town_read.cpp
+++ b/test/town_read.cpp
@@ -9,9 +9,9 @@
 #include <fstream>
 #include "ticpp.h"
 #include "catch.hpp"
-#include "dialog.hpp"
-#include "scenario.hpp"
-#include "town.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "scenario/scenario.hpp"
+#include "scenario/town.hpp"
 
 using namespace std;
 using namespace ticpp;
diff --git a/test/town_write.cpp b/test/town_write.cpp
index fc03c33a..91e8a5ff 100644
--- a/test/town_write.cpp
+++ b/test/town_write.cpp
@@ -9,8 +9,8 @@
 #include <fstream>
 #include "catch.hpp"
 #include "tinyprint.h"
-#include "scenario.hpp"
-#include "town.hpp"
+#include "scenario/scenario.hpp"
+#include "scenario/town.hpp"
 
 using namespace std;
 using namespace ticpp;