diff --git a/src/SaveTool/SaveTool.cpp b/src/SaveTool/SaveTool.cpp
index 9d7b1f4..cceac79 100644
--- a/src/SaveTool/SaveTool.cpp
+++ b/src/SaveTool/SaveTool.cpp
@@ -96,36 +96,7 @@ SaveTool::SaveTool(const Arguments& arguments):
 
     _updateEventId = _initEventId + 1;
 
-    _backupsDir = Utility::Directory::join(Utility::Directory::path(Utility::Directory::executableLocation()), "backups");
-    _stagingDir = Utility::Directory::join(Utility::Directory::path(Utility::Directory::executableLocation()), "staging");
-    _armouryDir = Utility::Directory::join(Utility::Directory::path(Utility::Directory::executableLocation()), "armoury");
-    _armoursDir = Utility::Directory::join(_armouryDir, "armours");
-    _weaponsDir = Utility::Directory::join(_armouryDir, "weapons");
-    _stylesDir  = Utility::Directory::join(_armouryDir, "styles");
-
-    if(!Utility::Directory::exists(_backupsDir)) {
-        Utility::Directory::mkpath(_backupsDir);
-    }
-
-    if(!Utility::Directory::exists(_stagingDir)) {
-        Utility::Directory::mkpath(_stagingDir);
-    }
-
-    if(!Utility::Directory::exists(_armouryDir)) {
-        Utility::Directory::mkpath(_armouryDir);
-    }
-
-    if(!Utility::Directory::exists(_armoursDir)) {
-        Utility::Directory::mkpath(_armoursDir);
-    }
-
-    if(!Utility::Directory::exists(_weaponsDir)) {
-        Utility::Directory::mkpath(_weaponsDir);
-    }
-
-    if(!Utility::Directory::exists(_stylesDir)) {
-        Utility::Directory::mkpath(_stylesDir);
-    }
+    initialiseToolDirectories();
 
     if(!findGameDataDirectory()) {
         SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error initialising the app", _lastError.data(), window());
@@ -563,6 +534,39 @@ void SaveTool::initialiseManager() {
     SDL_PushEvent(&event);
 }
 
+void SaveTool::initialiseToolDirectories() {
+    _backupsDir = Utility::Directory::join(Utility::Directory::path(Utility::Directory::executableLocation()), "backups");
+    _stagingDir = Utility::Directory::join(Utility::Directory::path(Utility::Directory::executableLocation()), "staging");
+    //_armouryDir = Utility::Directory::join(Utility::Directory::path(Utility::Directory::executableLocation()), "armoury");
+    //_armoursDir = Utility::Directory::join(_armouryDir, "armours");
+    //_weaponsDir = Utility::Directory::join(_armouryDir, "weapons");
+    //_stylesDir  = Utility::Directory::join(_armouryDir, "styles");
+
+    if(!Utility::Directory::exists(_backupsDir)) {
+        Utility::Directory::mkpath(_backupsDir);
+    }
+
+    if(!Utility::Directory::exists(_stagingDir)) {
+        Utility::Directory::mkpath(_stagingDir);
+    }
+
+    //if(!Utility::Directory::exists(_armouryDir)) {
+    //    Utility::Directory::mkpath(_armouryDir);
+    //}
+
+    //if(!Utility::Directory::exists(_armoursDir)) {
+    //    Utility::Directory::mkpath(_armoursDir);
+    //}
+
+    //if(!Utility::Directory::exists(_weaponsDir)) {
+    //    Utility::Directory::mkpath(_weaponsDir);
+    //}
+
+    //if(!Utility::Directory::exists(_stylesDir)) {
+    //    Utility::Directory::mkpath(_stylesDir);
+    //}
+}
+
 auto SaveTool::findGameDataDirectory() -> bool {
     wchar_t* localappdata_path = nullptr;
     Containers::ScopeGuard guard{localappdata_path, CoTaskMemFree};
diff --git a/src/SaveTool/SaveTool.h b/src/SaveTool/SaveTool.h
index 437d15e..8b66c9c 100644
--- a/src/SaveTool/SaveTool.h
+++ b/src/SaveTool/SaveTool.h
@@ -87,6 +87,7 @@ class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener
         void initialiseConfiguration();
         void initialiseGui();
         void initialiseManager();
+        void initialiseToolDirectories();
         auto findGameDataDirectory() -> bool;
         void initialiseMassManager();
         void initialiseFileWatcher();
@@ -226,10 +227,10 @@ class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener
 
         Containers::String _backupsDir;
         Containers::String _stagingDir;
-        Containers::String _armouryDir;
-        Containers::String _armoursDir;
-        Containers::String _weaponsDir;
-        Containers::String _stylesDir;
+        //Containers::String _armouryDir;
+        //Containers::String _armoursDir;
+        //Containers::String _weaponsDir;
+        //Containers::String _stylesDir;
 
         enum class GameState : UnsignedByte {
             Unknown, NotRunning, Running