diff --git a/Source/Tools/CMakeLists.txt b/Source/Tools/CMakeLists.txt
index ecab4401cf..0101bf319d 100644
--- a/Source/Tools/CMakeLists.txt
+++ b/Source/Tools/CMakeLists.txt
@@ -7,7 +7,7 @@ if (NOT MINGW_BUILD)
       find_package(Qt5 COMPONENTS Qml Quick Widgets REQUIRED)
     endif()
 
-    add_subdirectory(FEXQonfig/)
+    add_subdirectory(FEXConfig/)
   endif()
 
   if (ENABLE_GDB_SYMBOLS)
diff --git a/Source/Tools/FEXQonfig/CMakeLists.txt b/Source/Tools/FEXConfig/FEXQonfig/CMakeLists.txt
similarity index 100%
rename from Source/Tools/FEXQonfig/CMakeLists.txt
rename to Source/Tools/FEXConfig/FEXQonfig/CMakeLists.txt
diff --git a/Source/Tools/FEXQonfig/Main.cpp b/Source/Tools/FEXConfig/FEXQonfig/Main.cpp
similarity index 100%
rename from Source/Tools/FEXQonfig/Main.cpp
rename to Source/Tools/FEXConfig/FEXQonfig/Main.cpp
diff --git a/Source/Tools/FEXQonfig/Main.h b/Source/Tools/FEXConfig/FEXQonfig/Main.h
similarity index 100%
rename from Source/Tools/FEXQonfig/Main.h
rename to Source/Tools/FEXConfig/FEXQonfig/Main.h
diff --git a/Source/Tools/FEXQonfig/main.qml b/Source/Tools/FEXConfig/FEXQonfig/main.qml
similarity index 100%
rename from Source/Tools/FEXQonfig/main.qml
rename to Source/Tools/FEXConfig/FEXQonfig/main.qml
diff --git a/Source/Tools/FEXQonfig/qml5.qrc b/Source/Tools/FEXConfig/FEXQonfig/qml5.qrc
similarity index 100%
rename from Source/Tools/FEXQonfig/qml5.qrc
rename to Source/Tools/FEXConfig/FEXQonfig/qml5.qrc
diff --git a/Source/Tools/FEXQonfig/qml6.qrc b/Source/Tools/FEXConfig/FEXQonfig/qml6.qrc
similarity index 100%
rename from Source/Tools/FEXQonfig/qml6.qrc
rename to Source/Tools/FEXConfig/FEXQonfig/qml6.qrc
diff --git a/Source/Tools/FEXQonfig/qt5/FileDialog.qml b/Source/Tools/FEXConfig/FEXQonfig/qt5/FileDialog.qml
similarity index 100%
rename from Source/Tools/FEXQonfig/qt5/FileDialog.qml
rename to Source/Tools/FEXConfig/FEXQonfig/qt5/FileDialog.qml
diff --git a/Source/Tools/FEXQonfig/qt5/FolderDialog.qml b/Source/Tools/FEXConfig/FEXQonfig/qt5/FolderDialog.qml
similarity index 100%
rename from Source/Tools/FEXQonfig/qt5/FolderDialog.qml
rename to Source/Tools/FEXConfig/FEXQonfig/qt5/FolderDialog.qml
diff --git a/Source/Tools/FEXQonfig/qt5/MessageDialog.qml b/Source/Tools/FEXConfig/FEXQonfig/qt5/MessageDialog.qml
similarity index 100%
rename from Source/Tools/FEXQonfig/qt5/MessageDialog.qml
rename to Source/Tools/FEXConfig/FEXQonfig/qt5/MessageDialog.qml
diff --git a/Source/Tools/FEXQonfig/qt6/FileDialog.qml b/Source/Tools/FEXConfig/FEXQonfig/qt6/FileDialog.qml
similarity index 100%
rename from Source/Tools/FEXQonfig/qt6/FileDialog.qml
rename to Source/Tools/FEXConfig/FEXQonfig/qt6/FileDialog.qml
diff --git a/Source/Tools/FEXQonfig/qt6/FolderDialog.qml b/Source/Tools/FEXConfig/FEXQonfig/qt6/FolderDialog.qml
similarity index 100%
rename from Source/Tools/FEXQonfig/qt6/FolderDialog.qml
rename to Source/Tools/FEXConfig/FEXQonfig/qt6/FolderDialog.qml
diff --git a/Source/Tools/FEXQonfig/qt6/MessageDialog.qml b/Source/Tools/FEXConfig/FEXQonfig/qt6/MessageDialog.qml
similarity index 100%
rename from Source/Tools/FEXQonfig/qt6/MessageDialog.qml
rename to Source/Tools/FEXConfig/FEXQonfig/qt6/MessageDialog.qml