diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ba02b15..1c003b9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,13 +86,13 @@ set (LOOT_SRC   "${CMAKE_SOURCE_DIR}/src/backend/metadata/conditional_metadata.c
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata/plugin_dirty_info.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata/plugin_metadata.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata/tag.cpp"
-                "${CMAKE_SOURCE_DIR}/src/backend/game.cpp"
-                "${CMAKE_SOURCE_DIR}/src/backend/game_settings.cpp"
+                "${CMAKE_SOURCE_DIR}/src/backend/game/game.cpp"
+                "${CMAKE_SOURCE_DIR}/src/backend/game/game_settings.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/game/load_order_handler.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata_list.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/masterlist.cpp"
-                "${CMAKE_SOURCE_DIR}/src/backend/plugin.cpp"
-                "${CMAKE_SOURCE_DIR}/src/backend/plugin_loader.cpp"
+                "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin.cpp"
+                "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin_loader.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/language.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/version.cpp"
@@ -110,13 +110,13 @@ set (LOOT_HEADERS "${CMAKE_SOURCE_DIR}/src/backend/metadata/condition_grammar.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata/plugin_dirty_info.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata/plugin_metadata.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata/tag.h"
-                "${CMAKE_SOURCE_DIR}/src/backend/game.h"
-                "${CMAKE_SOURCE_DIR}/src/backend/game_settings.h"
+                "${CMAKE_SOURCE_DIR}/src/backend/game/game.h"
+                "${CMAKE_SOURCE_DIR}/src/backend/game/game_settings.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/game/load_order_handler.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata_list.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/masterlist.h"
-                "${CMAKE_SOURCE_DIR}/src/backend/plugin.h"
-                "${CMAKE_SOURCE_DIR}/src/backend/plugin_loader.h"
+                "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin.h"
+                "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin_loader.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/language.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/version.h"
diff --git a/src/api/api.cpp b/src/api/api.cpp
index 99f1d520..24dcd9f0 100644
--- a/src/api/api.cpp
+++ b/src/api/api.cpp
@@ -23,7 +23,7 @@
     */
 
 #include "api.h"
-#include "../backend/game.h"
+#include "../backend/game/game.h"
 #include "../backend/globals.h"
 #include "../backend/error.h"
 #include "../backend/streams.h"
diff --git a/src/backend/game.cpp b/src/backend/game/game.cpp
similarity index 98%
rename from src/backend/game.cpp
rename to src/backend/game/game.cpp
index 410d3bd8..99b66906 100644
--- a/src/backend/game.cpp
+++ b/src/backend/game/game.cpp
@@ -23,11 +23,11 @@
     */
 
 #include "game.h"
-#include "globals.h"
-#include "helpers.h"
-#include "error.h"
-#include "streams.h"
-#include "graph.h"
+#include "../globals.h"
+#include "../helpers.h"
+#include "../error.h"
+#include "../streams.h"
+#include "../graph.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/thread.hpp>
diff --git a/src/backend/game.h b/src/backend/game/game.h
similarity index 96%
rename from src/backend/game.h
rename to src/backend/game/game.h
index 1351a6e9..154a6b67 100644
--- a/src/backend/game.h
+++ b/src/backend/game/game.h
@@ -26,10 +26,10 @@
 #define __LOOT_GAME__
 
 #include "game_settings.h"
-#include "game/load_order_handler.h"
-#include "plugin.h"
-#include "metadata_list.h"
-#include "masterlist.h"
+#include "load_order_handler.h"
+#include "../plugin/plugin.h"
+#include "../metadata_list.h"
+#include "../masterlist.h"
 
 #include <string>
 #include <vector>
diff --git a/src/backend/game_settings.cpp b/src/backend/game/game_settings.cpp
similarity index 99%
rename from src/backend/game_settings.cpp
rename to src/backend/game/game_settings.cpp
index 33db1327..e8726ab3 100644
--- a/src/backend/game_settings.cpp
+++ b/src/backend/game/game_settings.cpp
@@ -23,9 +23,9 @@
     */
 
 #include "game_settings.h"
-#include "globals.h"
-#include "helpers.h"
-#include "error.h"
+#include "../globals.h"
+#include "../helpers.h"
+#include "../error.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/locale.hpp>
diff --git a/src/backend/game_settings.h b/src/backend/game/game_settings.h
similarity index 100%
rename from src/backend/game_settings.h
rename to src/backend/game/game_settings.h
diff --git a/src/backend/game/load_order_handler.h b/src/backend/game/load_order_handler.h
index 72655fab..44a0f712 100644
--- a/src/backend/game/load_order_handler.h
+++ b/src/backend/game/load_order_handler.h
@@ -25,7 +25,7 @@
 #ifndef __LOOT_LOAD_ORDER_HANDLER__
 #define __LOOT_LOAD_ORDER_HANDLER__
 
-#include "../game_settings.h"
+#include "game_settings.h"
 
 #include <string>
 #include <list>
diff --git a/src/backend/git.cpp b/src/backend/git.cpp
index 3b140647..f1bd007c 100644
--- a/src/backend/git.cpp
+++ b/src/backend/git.cpp
@@ -25,7 +25,7 @@
 #include "error.h"
 #include "streams.h"
 #include "helpers.h"
-#include "game.h"
+#include "game/game.h"
 
 #include <boost/log/trivial.hpp>
 #include <boost/locale.hpp>
diff --git a/src/backend/graph.h b/src/backend/graph.h
index aab0e074..20623a68 100644
--- a/src/backend/graph.h
+++ b/src/backend/graph.h
@@ -25,7 +25,7 @@
 #ifndef __LOOT_GRAPH__
 #define __LOOT_GRAPH__
 
-#include "plugin.h"
+#include "plugin/plugin.h"
 
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/adjacency_list.hpp>
diff --git a/src/backend/masterlist.cpp b/src/backend/masterlist.cpp
index aa131f81..c6e72ba7 100644
--- a/src/backend/masterlist.cpp
+++ b/src/backend/masterlist.cpp
@@ -23,7 +23,7 @@
     */
 
 #include "masterlist.h"
-#include "game.h"
+#include "game/game.h"
 #include "error.h"
 
 using namespace std;
diff --git a/src/backend/metadata/condition_grammar.h b/src/backend/metadata/condition_grammar.h
index 8c7f9c70..9ecf33d7 100644
--- a/src/backend/metadata/condition_grammar.h
+++ b/src/backend/metadata/condition_grammar.h
@@ -33,9 +33,9 @@
 #define BOOST_SPIRIT_USE_PHOENIX_V3 1
 #endif
 
-#include "../game.h"
+#include "../game/game.h"
 #include "../helpers.h"
-#include "../plugin.h"
+#include "../plugin/plugin.h"
 #include "../version.h"
 #include "../error.h"
 
diff --git a/src/backend/metadata/plugin_metadata.cpp b/src/backend/metadata/plugin_metadata.cpp
index b732f97f..e09f181f 100644
--- a/src/backend/metadata/plugin_metadata.cpp
+++ b/src/backend/metadata/plugin_metadata.cpp
@@ -23,7 +23,7 @@
     */
 
 #include "plugin_metadata.h"
-#include "../game.h"
+#include "../game/game.h"
 #include "../helpers.h"
 
 #include <boost/algorithm/string.hpp>
diff --git a/src/backend/plugin.cpp b/src/backend/plugin/plugin.cpp
similarity index 99%
rename from src/backend/plugin.cpp
rename to src/backend/plugin/plugin.cpp
index d94b0a81..5c35bf7e 100644
--- a/src/backend/plugin.cpp
+++ b/src/backend/plugin/plugin.cpp
@@ -24,8 +24,8 @@
 
 #include "plugin.h"
 #include "plugin_loader.h"
-#include "game.h"
-#include "helpers.h"
+#include "../game/game.h"
+#include "../helpers.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
diff --git a/src/backend/plugin.h b/src/backend/plugin/plugin.h
similarity index 97%
rename from src/backend/plugin.h
rename to src/backend/plugin/plugin.h
index 4aa2f1dc..56f34744 100644
--- a/src/backend/plugin.h
+++ b/src/backend/plugin/plugin.h
@@ -24,8 +24,8 @@
 #ifndef __LOOT_PLUGIN__
 #define __LOOT_PLUGIN__
 
-#include "metadata/formid.h"
-#include "metadata/plugin_metadata.h"
+#include "../metadata/formid.h"
+#include "../metadata/plugin_metadata.h"
 
 #include <cstdint>
 #include <string>
diff --git a/src/backend/plugin_loader.cpp b/src/backend/plugin/plugin_loader.cpp
similarity index 98%
rename from src/backend/plugin_loader.cpp
rename to src/backend/plugin/plugin_loader.cpp
index 1b96bf68..8fb34254 100644
--- a/src/backend/plugin_loader.cpp
+++ b/src/backend/plugin/plugin_loader.cpp
@@ -23,8 +23,8 @@
     */
 
 #include "plugin_loader.h"
-#include "game.h"
-#include "helpers.h"
+#include "../game/game.h"
+#include "../helpers.h"
 
 #include <src/libespm.h>
 
@@ -110,7 +110,7 @@ namespace loot {
             BOOST_LOG_TRIVIAL(trace) << name << ": " << "Reading the description.";
             _description = boost::locale::conv::to_utf<char>(file->getDescription(), "Windows-1252", boost::locale::conv::stop);
         }
-        catch (std::exception& e) {
+        catch (std::exception&) {
             delete file;
             throw;
         }
diff --git a/src/backend/plugin_loader.h b/src/backend/plugin/plugin_loader.h
similarity index 98%
rename from src/backend/plugin_loader.h
rename to src/backend/plugin/plugin_loader.h
index f52eac35..4e22060d 100644
--- a/src/backend/plugin_loader.h
+++ b/src/backend/plugin/plugin_loader.h
@@ -24,7 +24,7 @@
 #ifndef __LOOT_PLUGIN_LOADER__
 #define __LOOT_PLUGIN_LOADER__
 
-#include "metadata/formid.h"
+#include "../metadata/formid.h"
 
 #include <cstdint>
 #include <string>
diff --git a/src/backend/version.h b/src/backend/version.h
index 5e28d173..61cdfa9d 100644
--- a/src/backend/version.h
+++ b/src/backend/version.h
@@ -25,7 +25,7 @@
 #ifndef __LOOT_VERSION__
 #define __LOOT_VERSION__
 
-#include "plugin.h"
+#include "plugin/plugin.h"
 
 #include <string>
 #include <boost/filesystem.hpp>
diff --git a/src/gui/handler.h b/src/gui/handler.h
index 69ceff3f..60ec284f 100644
--- a/src/gui/handler.h
+++ b/src/gui/handler.h
@@ -26,7 +26,7 @@
 #define __LOOT_GUI_HANDLER__
 
 #include "loot_state.h"
-#include "../backend/plugin.h"
+#include "../backend/plugin/plugin.h"
 #include "../backend/metadata/plugin_metadata.h"
 
 #include <include/wrapper/cef_message_router.h>
diff --git a/src/gui/loot_state.h b/src/gui/loot_state.h
index e306cdc4..88a7d572 100644
--- a/src/gui/loot_state.h
+++ b/src/gui/loot_state.h
@@ -25,7 +25,7 @@
 #ifndef __LOOT_GUI_LOOT_STATE__
 #define __LOOT_GUI_LOOT_STATE__
 
-#include "../backend/game.h"
+#include "../backend/game/game.h"
 
 #include <include/cef_app.h>
 #include <include/base/cef_lock.h>