diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index b5c6fe91..b6df2851 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -327,16 +327,16 @@ set(MINECRAFT_SOURCES
     minecraft/mod/ModDetails.h
     minecraft/mod/ModFolderModel.h
     minecraft/mod/ModFolderModel.cpp
-    minecraft/mod/ModFolderLoadTask.h
-    minecraft/mod/ModFolderLoadTask.cpp
-    minecraft/mod/LocalModParseTask.h
-    minecraft/mod/LocalModParseTask.cpp
-    minecraft/mod/LocalModUpdateTask.h
-    minecraft/mod/LocalModUpdateTask.cpp
     minecraft/mod/ResourcePackFolderModel.h
     minecraft/mod/ResourcePackFolderModel.cpp
     minecraft/mod/TexturePackFolderModel.h
     minecraft/mod/TexturePackFolderModel.cpp
+    minecraft/mod/tasks/ModFolderLoadTask.h
+    minecraft/mod/tasks/ModFolderLoadTask.cpp
+    minecraft/mod/tasks/LocalModParseTask.h
+    minecraft/mod/tasks/LocalModParseTask.cpp
+    minecraft/mod/tasks/LocalModUpdateTask.h
+    minecraft/mod/tasks/LocalModUpdateTask.cpp
 
     # Assets
     minecraft/AssetsUtils.h
diff --git a/launcher/ModDownloadTask.cpp b/launcher/ModDownloadTask.cpp
index ad1e64e3..52de9c94 100644
--- a/launcher/ModDownloadTask.cpp
+++ b/launcher/ModDownloadTask.cpp
@@ -1,6 +1,7 @@
 #include "ModDownloadTask.h"
+
 #include "Application.h"
-#include "minecraft/mod/LocalModUpdateTask.h"
+#include "minecraft/mod/tasks/LocalModUpdateTask.h"
 
 ModDownloadTask::ModDownloadTask(ModPlatform::IndexedPack mod, ModPlatform::IndexedVersion version, const std::shared_ptr<ModFolderModel> mods)
     : m_mod(mod), m_mod_version(version), mods(mods)
diff --git a/launcher/ModDownloadTask.h b/launcher/ModDownloadTask.h
index d292dfbb..5eaee187 100644
--- a/launcher/ModDownloadTask.h
+++ b/launcher/ModDownloadTask.h
@@ -1,12 +1,13 @@
 #pragma once
 
-#include "QObjectPtr.h"
-#include "minecraft/mod/LocalModUpdateTask.h"
-#include "modplatform/ModIndex.h"
-#include "tasks/SequentialTask.h"
-#include "minecraft/mod/ModFolderModel.h"
-#include "net/NetJob.h"
 #include <QUrl>
+#include "QObjectPtr.h"
+#include "minecraft/mod/ModFolderModel.h"
+#include "modplatform/ModIndex.h"
+#include "net/NetJob.h"
+
+#include "tasks/SequentialTask.h"
+#include "minecraft/mod/tasks/LocalModUpdateTask.h"
 
 class ModDownloadTask : public SequentialTask {
     Q_OBJECT
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index 615cfc0c..936b68d3 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -14,17 +14,19 @@
  */
 
 #include "ModFolderModel.h"
+
 #include <FileSystem.h>
+#include <QDebug>
+#include <QFileSystemWatcher>
 #include <QMimeData>
+#include <QString>
+#include <QThreadPool>
 #include <QUrl>
 #include <QUuid>
-#include <QString>
-#include <QFileSystemWatcher>
-#include <QDebug>
-#include "ModFolderLoadTask.h"
-#include <QThreadPool>
 #include <algorithm>
-#include "LocalModParseTask.h"
+
+#include "minecraft/mod/tasks/LocalModParseTask.h"
+#include "minecraft/mod/tasks/ModFolderLoadTask.h"
 
 ModFolderModel::ModFolderModel(const QString &dir) : QAbstractListModel(), m_dir(dir)
 {
diff --git a/launcher/minecraft/mod/ModFolderModel.h b/launcher/minecraft/mod/ModFolderModel.h
index f8ad4ca8..10a72691 100644
--- a/launcher/minecraft/mod/ModFolderModel.h
+++ b/launcher/minecraft/mod/ModFolderModel.h
@@ -24,8 +24,8 @@
 
 #include "Mod.h"
 
-#include "ModFolderLoadTask.h"
-#include "LocalModParseTask.h"
+#include "minecraft/mod/tasks/ModFolderLoadTask.h"
+#include "minecraft/mod/tasks/LocalModParseTask.h"
 
 class LegacyInstance;
 class BaseInstance;
diff --git a/launcher/minecraft/mod/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
similarity index 100%
rename from launcher/minecraft/mod/LocalModParseTask.cpp
rename to launcher/minecraft/mod/tasks/LocalModParseTask.cpp
diff --git a/launcher/minecraft/mod/LocalModParseTask.h b/launcher/minecraft/mod/tasks/LocalModParseTask.h
similarity index 90%
rename from launcher/minecraft/mod/LocalModParseTask.h
rename to launcher/minecraft/mod/tasks/LocalModParseTask.h
index 0f119ba6..ed92394c 100644
--- a/launcher/minecraft/mod/LocalModParseTask.h
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.h
@@ -1,9 +1,11 @@
 #pragma once
-#include <QRunnable>
+
 #include <QDebug>
 #include <QObject>
-#include "Mod.h"
-#include "ModDetails.h"
+#include <QRunnable>
+
+#include "minecraft/mod/Mod.h"
+#include "minecraft/mod/ModDetails.h"
 
 class LocalModParseTask : public QObject, public QRunnable
 {
diff --git a/launcher/minecraft/mod/LocalModUpdateTask.cpp b/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
similarity index 100%
rename from launcher/minecraft/mod/LocalModUpdateTask.cpp
rename to launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
diff --git a/launcher/minecraft/mod/LocalModUpdateTask.h b/launcher/minecraft/mod/tasks/LocalModUpdateTask.h
similarity index 100%
rename from launcher/minecraft/mod/LocalModUpdateTask.h
rename to launcher/minecraft/mod/tasks/LocalModUpdateTask.h
diff --git a/launcher/minecraft/mod/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
similarity index 100%
rename from launcher/minecraft/mod/ModFolderLoadTask.cpp
rename to launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
diff --git a/launcher/minecraft/mod/ModFolderLoadTask.h b/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
similarity index 94%
rename from launcher/minecraft/mod/ModFolderLoadTask.h
rename to launcher/minecraft/mod/tasks/ModFolderLoadTask.h
index c869f083..bb66022a 100644
--- a/launcher/minecraft/mod/ModFolderLoadTask.h
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
@@ -1,10 +1,11 @@
 #pragma once
-#include <QRunnable>
-#include <QObject>
+
 #include <QDir>
 #include <QMap>
-#include "Mod.h"
+#include <QObject>
+#include <QRunnable>
 #include <memory>
+#include "minecraft/mod/Mod.h"
 
 class ModFolderLoadTask : public QObject, public QRunnable
 {