diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7e7bb7a..36393470 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,11 +137,11 @@ set (LOOT_SRC   "${CMAKE_SOURCE_DIR}/src/backend/app/loot_settings.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata_list.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/masterlist.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin.cpp"
+                "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin_sorter.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/git_helper.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/helpers.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/language.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/version.cpp"
-                "${CMAKE_SOURCE_DIR}/src/backend/plugin_sorter.cpp"
                 "${CMAKE_BINARY_DIR}/generated/globals.cpp")
 
 set (LOOT_HEADERS "${CMAKE_SOURCE_DIR}/src/backend/app/loot_settings.h"
@@ -162,6 +162,7 @@ set (LOOT_HEADERS "${CMAKE_SOURCE_DIR}/src/backend/app/loot_settings.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata_list.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/masterlist.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin.h"
+                "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin_sorter.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/git_helper.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/helpers.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/json.h"
@@ -169,7 +170,6 @@ set (LOOT_HEADERS "${CMAKE_SOURCE_DIR}/src/backend/app/loot_settings.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/version.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/yaml_set_helpers.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/globals.h"
-                "${CMAKE_SOURCE_DIR}/src/backend/plugin_sorter.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/error.h")
 
 set (LOOT_GUI_SRC ${LOOT_SRC}
@@ -244,9 +244,9 @@ set (LOOT_TESTS_HEADERS "${CMAKE_SOURCE_DIR}/src/tests/base_game_test.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata/plugin_metadata_test.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata/tag_test.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/plugin/plugin_test.h"
+                        "${CMAKE_SOURCE_DIR}/src/tests/backend/plugin/plugin_sorter_test.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/masterlist_test.h"
-                        "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata_list_test.h"
-                        "${CMAKE_SOURCE_DIR}/src/tests/backend/plugin_sorter_test.h")
+                        "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata_list_test.h")
 
 source_group("Header Files\\backend" FILES ${LOOT_HEADERS})
 source_group("Header Files\\gui" FILES ${LOOT_GUI_HEADERS})
diff --git a/src/api/api.cpp b/src/api/api.cpp
index 4cde203e..cf108c5f 100644
--- a/src/api/api.cpp
+++ b/src/api/api.cpp
@@ -26,7 +26,7 @@
 #include "loot_db.h"
 #include "../backend/error.h"
 #include "../backend/globals.h"
-#include "../backend/plugin_sorter.h"
+#include "../backend/plugin/plugin_sorter.h"
 
 #include <yaml-cpp/yaml.h>
 
diff --git a/src/backend/plugin_sorter.cpp b/src/backend/plugin/plugin_sorter.cpp
similarity index 99%
rename from src/backend/plugin_sorter.cpp
rename to src/backend/plugin/plugin_sorter.cpp
index 1012fc65..f2c3f6ee 100644
--- a/src/backend/plugin_sorter.cpp
+++ b/src/backend/plugin/plugin_sorter.cpp
@@ -22,10 +22,10 @@
     <http://www.gnu.org/licenses/>.
     */
 
-#include "game/game.h"
-#include "error.h"
 #include "plugin_sorter.h"
-#include "helpers/helpers.h"
+#include "backend/game/game.h"
+#include "backend/error.h"
+#include "backend/helpers/helpers.h"
 
 #include <cstdlib>
 
diff --git a/src/backend/plugin_sorter.h b/src/backend/plugin/plugin_sorter.h
similarity index 95%
rename from src/backend/plugin_sorter.h
rename to src/backend/plugin/plugin_sorter.h
index 654c0d0c..9333e1d4 100644
--- a/src/backend/plugin_sorter.h
+++ b/src/backend/plugin/plugin_sorter.h
@@ -22,10 +22,10 @@
     <http://www.gnu.org/licenses/>.
     */
 
-#ifndef __LOOT_GRAPH__
-#define __LOOT_GRAPH__
+#ifndef LOOT_BACKEND_PLUGIN_SORTER
+#define LOOT_BACKEND_PLUGIN_SORTER
 
-#include "plugin/plugin.h"
+#include "plugin.h"
 
 #include <map>
 
diff --git a/src/gui/handler.cpp b/src/gui/handler.cpp
index a427e425..9f7d6a56 100644
--- a/src/gui/handler.cpp
+++ b/src/gui/handler.cpp
@@ -29,7 +29,7 @@
 
 #include "../backend/error.h"
 #include "../backend/globals.h"
-#include "../backend/plugin_sorter.h"
+#include "../backend/plugin/plugin_sorter.h"
 #include "../backend/helpers/helpers.h"
 #include "../backend/helpers/json.h"
 #include "../backend/helpers/version.h"
diff --git a/src/tests/backend/plugin_sorter_test.h b/src/tests/backend/plugin/plugin_sorter_test.h
similarity index 99%
rename from src/tests/backend/plugin_sorter_test.h
rename to src/tests/backend/plugin/plugin_sorter_test.h
index f053676e..0a409e53 100644
--- a/src/tests/backend/plugin_sorter_test.h
+++ b/src/tests/backend/plugin/plugin_sorter_test.h
@@ -25,7 +25,7 @@ along with LOOT.  If not, see
 #ifndef LOOT_TEST_BACKEND_PLUGIN_SORTER
 #define LOOT_TEST_BACKEND_PLUGIN_SORTER
 
-#include "backend/plugin_sorter.h"
+#include "backend/plugin/plugin_sorter.h"
 #include "tests/base_game_test.h"
 
 namespace loot {
diff --git a/src/tests/main.cpp b/src/tests/main.cpp
index 01c3e123..2ba489de 100644
--- a/src/tests/main.cpp
+++ b/src/tests/main.cpp
@@ -62,9 +62,9 @@
 #include "backend/metadata/plugin_metadata_test.h"
 #include "backend/metadata/tag_test.h"
 #include "backend/plugin/plugin_test.h"
+#include "backend/plugin/plugin_sorter_test.h"
 #include "backend/masterlist_test.h"
 #include "backend/metadata_list_test.h"
-#include "backend/plugin_sorter_test.h"
 
 #include <boost/log/core.hpp>