SCRATCH move things to the right places

34 files changed, 45 insertions, 48 deletions

diff --git a/logic/BaseInstaller.cpp b/logic/BaseInstaller.cpp
index 0416c52b..b2cdefbc 100644
--- a/logic/BaseInstaller.cpp
+++ b/logic/BaseInstaller.cpp
@@ -16,7 +16,7 @@
 #include <QFile>
 
 #include "logic/BaseInstaller.h"
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 
 BaseInstaller::BaseInstaller()
 {
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h
index cd1dcdf0..3a4fa4a6 100644
--- a/logic/BaseInstance.h
+++ b/logic/BaseInstance.h
@@ -24,18 +24,13 @@
 #include "logic/settings/INIFile.h"
 #include "logic/BaseVersionList.h"
 #include "logic/auth/MojangAccount.h"
-#include "Mod.h"
 
-class ModList;
-class QDialog;
 class QDir;
 class Task;
 class BaseProcess;
-class OneSixUpdate;
-class BaseInstancePrivate;
+class BaseInstance;
 
 // pointer for lazy people
-class BaseInstance;
 typedef std::shared_ptr<BaseInstance> InstancePtr;
 
 /*!
diff --git a/logic/InstanceList.cpp b/logic/InstanceList.cpp
index ef6594d9..10faf1ca 100644
--- a/logic/InstanceList.cpp
+++ b/logic/InstanceList.cpp
@@ -25,16 +25,18 @@
 #include <QXmlStreamReader>
 #include <QRegularExpression>
 #include <pathutils.h>
+#include <QDebug>
 
 #include "logic/InstanceList.h"
 #include "logic/icons/IconList.h"
-#include "logic/minecraft/MinecraftVersionList.h"
 #include "logic/BaseInstance.h"
-#include "logic/ftb/FTBPlugin.h"
+
+//FIXME: this really doesn't belong *here*
+#include "logic/minecraft/OneSixInstance.h"
+#include "logic/minecraft/LegacyInstance.h"
+#include "minecraft/MinecraftVersion.h"
 #include "settings/INISettingsObject.h"
-#include "OneSixInstance.h"
-#include "LegacyInstance.h"
-#include <QDebug>
+#include "logic/ftb/FTBPlugin.h"
 
 const static int GROUP_FILE_FORMAT_VERSION = 1;
 
diff --git a/logic/forge/ForgeInstaller.cpp b/logic/forge/ForgeInstaller.cpp
index b6fb426a..cbd96869 100644
--- a/logic/forge/ForgeInstaller.cpp
+++ b/logic/forge/ForgeInstaller.cpp
@@ -18,7 +18,7 @@
 #include "logic/minecraft/OneSixLibrary.h"
 #include "logic/net/HttpMetaCache.h"
 #include "logic/tasks/Task.h"
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 #include "logic/forge/ForgeVersionList.h"
 #include "logic/minecraft/VersionFilterData.h"
 #include "logic/Env.h"
diff --git a/logic/forge/LegacyForge.h b/logic/forge/LegacyForge.h
index 7795ee0d..5bc43fbf 100644
--- a/logic/forge/LegacyForge.h
+++ b/logic/forge/LegacyForge.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "logic/Mod.h"
+#include "logic/minecraft/Mod.h"
 
 class MinecraftForge : public Mod
 {
diff --git a/logic/ftb/LegacyFTBInstance.h b/logic/ftb/LegacyFTBInstance.h
index 32e85030..80c6c5ab 100644
--- a/logic/ftb/LegacyFTBInstance.h
+++ b/logic/ftb/LegacyFTBInstance.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "logic/LegacyInstance.h"
+#include "logic/minecraft/LegacyInstance.h"
 
 class LegacyFTBInstance : public LegacyInstance
 {
diff --git a/logic/ftb/OneSixFTBInstance.h b/logic/ftb/OneSixFTBInstance.h
index d5cdc362..7af7c770 100644
--- a/logic/ftb/OneSixFTBInstance.h
+++ b/logic/ftb/OneSixFTBInstance.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 
 class OneSixLibrary;
 
diff --git a/logic/liteloader/LiteLoaderInstaller.cpp b/logic/liteloader/LiteLoaderInstaller.cpp
index b105be08..fadcc790 100644
--- a/logic/liteloader/LiteLoaderInstaller.cpp
+++ b/logic/liteloader/LiteLoaderInstaller.cpp
@@ -22,7 +22,7 @@
 
 #include "logic/minecraft/MinecraftProfile.h"
 #include "logic/minecraft/OneSixLibrary.h"
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 #include "logic/liteloader/LiteLoaderVersionList.h"
 
 LiteLoaderInstaller::LiteLoaderInstaller() : BaseInstaller()
diff --git a/logic/assets/AssetsUtils.cpp b/logic/minecraft/AssetsUtils.cpp
index 9f33b1bd..9f33b1bd 100644
--- a/logic/assets/AssetsUtils.cpp
+++ b/logic/minecraft/AssetsUtils.cpp
diff --git a/logic/assets/AssetsUtils.h b/logic/minecraft/AssetsUtils.h
index ea12136d..ea12136d 100644
--- a/logic/assets/AssetsUtils.h
+++ b/logic/minecraft/AssetsUtils.h
diff --git a/logic/JarUtils.cpp b/logic/minecraft/JarUtils.cpp
index e73af53c..59326aba 100644
--- a/logic/JarUtils.cpp
+++ b/logic/minecraft/JarUtils.cpp
@@ -1,4 +1,4 @@
-#include "JarUtils.h"
+#include "logic/minecraft/JarUtils.h"
 #include <quazip.h>
 #include <quazipfile.h>
 #include <JlCompress.h>
diff --git a/logic/JarUtils.h b/logic/minecraft/JarUtils.h
index 2e8bd2a7..2e8bd2a7 100644
--- a/logic/JarUtils.h
+++ b/logic/minecraft/JarUtils.h
diff --git a/logic/LegacyInstance.cpp b/logic/minecraft/LegacyInstance.cpp
index 1d4d6150..c0fe1513 100644
--- a/logic/LegacyInstance.cpp
+++ b/logic/minecraft/LegacyInstance.cpp
@@ -22,7 +22,7 @@
 
 #include "LegacyInstance.h"
 
-#include "logic/LegacyUpdate.h"
+#include "logic/minecraft/LegacyUpdate.h"
 #include "logic/icons/IconList.h"
 #include "logic/minecraft/MinecraftProcess.h"
 #include "gui/pages/LegacyUpgradePage.h"
diff --git a/logic/LegacyInstance.h b/logic/minecraft/LegacyInstance.h
index 353718c1..353718c1 100644
--- a/logic/LegacyInstance.h
+++ b/logic/minecraft/LegacyInstance.h
diff --git a/logic/LegacyUpdate.cpp b/logic/minecraft/LegacyUpdate.cpp
index 8b970f08..d853536a 100644
--- a/logic/LegacyUpdate.cpp
+++ b/logic/minecraft/LegacyUpdate.cpp
@@ -14,23 +14,22 @@
  */
 
 #include <QStringList>
-
 #include <pathutils.h>
 #include <quazip.h>
 #include <quazipfile.h>
 #include <JlCompress.h>
+#include <QDebug>
 
-#include "logic/LegacyUpdate.h"
-#include "logic/LwjglVersionList.h"
-#include "logic/minecraft/MinecraftVersionList.h"
-#include "logic/BaseInstance.h"
-#include "logic/LegacyInstance.h"
 #include "logic/Env.h"
-#include "logic/ModList.h"
-
-#include <QDebug>
+#include "logic/BaseInstance.h"
 #include "logic/net/URLConstants.h"
-#include "JarUtils.h"
+
+#include "logic/minecraft/JarUtils.h"
+#include "logic/minecraft/LegacyUpdate.h"
+#include "logic/minecraft/LwjglVersionList.h"
+#include "logic/minecraft/MinecraftVersionList.h"
+#include "logic/minecraft/ModList.h"
+#include "logic/minecraft/LegacyInstance.h"
 
 LegacyUpdate::LegacyUpdate(BaseInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
 {
diff --git a/logic/LegacyUpdate.h b/logic/minecraft/LegacyUpdate.h
index 78e456a1..78e456a1 100644
--- a/logic/LegacyUpdate.h
+++ b/logic/minecraft/LegacyUpdate.h
diff --git a/logic/LwjglVersionList.cpp b/logic/minecraft/LwjglVersionList.cpp
index 9e101b74..9e101b74 100644
--- a/logic/LwjglVersionList.cpp
+++ b/logic/minecraft/LwjglVersionList.cpp
diff --git a/logic/LwjglVersionList.h b/logic/minecraft/LwjglVersionList.h
index 9205b964..c364fa13 100644
--- a/logic/LwjglVersionList.h
+++ b/logic/minecraft/LwjglVersionList.h
@@ -19,10 +19,10 @@
 #include <QAbstractListModel>
 #include <QUrl>
 #include <QNetworkReply>
-
 #include <memory>
-#include "BaseVersion.h"
-#include "BaseVersionList.h"
+
+#include "logic/BaseVersion.h"
+#include "logic/BaseVersionList.h"
 
 class LWJGLVersion;
 typedef std::shared_ptr<LWJGLVersion> PtrLWJGLVersion;
diff --git a/logic/minecraft/MinecraftInstance.h b/logic/minecraft/MinecraftInstance.h
index a6c786fb..63519ae8 100644
--- a/logic/minecraft/MinecraftInstance.h
+++ b/logic/minecraft/MinecraftInstance.h
@@ -1,5 +1,8 @@
 #pragma once
 #include "logic/BaseInstance.h"
+#include "logic/minecraft/Mod.h"
+
+class ModList;
 
 class MinecraftInstance: public BaseInstance
 {
diff --git a/logic/minecraft/MinecraftProfile.cpp b/logic/minecraft/MinecraftProfile.cpp
index 9b97b95f..27277ab2 100644
--- a/logic/minecraft/MinecraftProfile.cpp
+++ b/logic/minecraft/MinecraftProfile.cpp
@@ -23,7 +23,6 @@
 #include "logic/minecraft/VersionBuilder.h"
 #include "ProfileUtils.h"
 #include "NullProfileStrategy.h"
-#include "logic/OneSixInstance.h"
 
 MinecraftProfile::MinecraftProfile(ProfileStrategy *strategy)
 	: QAbstractListModel()
diff --git a/logic/Mod.cpp b/logic/minecraft/Mod.cpp
index 7fa4905e..7fa4905e 100644
--- a/logic/Mod.cpp
+++ b/logic/minecraft/Mod.cpp
diff --git a/logic/Mod.h b/logic/minecraft/Mod.h
index 5b815bc1..5b815bc1 100644
--- a/logic/Mod.h
+++ b/logic/minecraft/Mod.h
diff --git a/logic/ModList.cpp b/logic/minecraft/ModList.cpp
index 68d74e79..c943c254 100644
--- a/logic/ModList.cpp
+++ b/logic/minecraft/ModList.cpp
@@ -14,7 +14,6 @@
  */
 
 #include "ModList.h"
-#include "LegacyInstance.h"
 #include <pathutils.h>
 #include <QMimeData>
 #include <QUrl>
diff --git a/logic/ModList.h b/logic/minecraft/ModList.h
index 792ce062..e227356b 100644
--- a/logic/ModList.h
+++ b/logic/minecraft/ModList.h
@@ -20,7 +20,7 @@
 #include <QDir>
 #include <QAbstractListModel>
 
-#include "logic/Mod.h"
+#include "logic/minecraft/Mod.h"
 
 class LegacyInstance;
 class BaseInstance;
diff --git a/logic/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp
index 642a6aec..ebba22d6 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/minecraft/OneSixInstance.cpp
@@ -18,15 +18,15 @@
 #include <QDebug>
 #include "MMCError.h"
 
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 
-#include "logic/OneSixUpdate.h"
+#include "logic/minecraft/OneSixUpdate.h"
 #include "logic/minecraft/MinecraftProfile.h"
-#include "minecraft/VersionBuildError.h"
+#include "logic/minecraft/VersionBuildError.h"
 #include "logic/minecraft/MinecraftProcess.h"
-#include "minecraft/OneSixProfileStrategy.h"
+#include "logic/minecraft/OneSixProfileStrategy.h"
 
-#include "logic/assets/AssetsUtils.h"
+#include "logic/minecraft/AssetsUtils.h"
 #include "logic/icons/IconList.h"
 #include "gui/pagedialog/PageDialog.h"
 #include "gui/pages/VersionPage.h"
diff --git a/logic/OneSixInstance.h b/logic/minecraft/OneSixInstance.h
index 75e2dd3d..3a9e528e 100644
--- a/logic/OneSixInstance.h
+++ b/logic/minecraft/OneSixInstance.h
@@ -18,7 +18,7 @@
 #include "logic/minecraft/MinecraftInstance.h"
 
 #include "logic/minecraft/MinecraftProfile.h"
-#include "logic/ModList.h"
+#include "logic/minecraft/ModList.h"
 #include "gui/pages/BasePageProvider.h"
 
 class OneSixInstance : public MinecraftInstance, public BasePageProvider
diff --git a/logic/minecraft/OneSixProfileStrategy.cpp b/logic/minecraft/OneSixProfileStrategy.cpp
index 9fcd0336..6d80963f 100644
--- a/logic/minecraft/OneSixProfileStrategy.cpp
+++ b/logic/minecraft/OneSixProfileStrategy.cpp
@@ -1,6 +1,6 @@
 #include "logic/minecraft/OneSixProfileStrategy.h"
 #include "logic/minecraft/VersionBuildError.h"
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 #include "logic/minecraft/MinecraftVersionList.h"
 #include "logic/Env.h"
 
diff --git a/logic/OneSixUpdate.cpp b/logic/minecraft/OneSixUpdate.cpp
index 5ec36305..f9ab6c65 100644
--- a/logic/OneSixUpdate.cpp
+++ b/logic/minecraft/OneSixUpdate.cpp
@@ -29,11 +29,11 @@
 #include "logic/minecraft/MinecraftVersionList.h"
 #include "logic/minecraft/MinecraftProfile.h"
 #include "logic/minecraft/OneSixLibrary.h"
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 #include "logic/forge/ForgeMirrors.h"
 #include "logic/net/URLConstants.h"
-#include "logic/assets/AssetsUtils.h"
-#include "JarUtils.h"
+#include "logic/minecraft/AssetsUtils.h"
+#include "logic/minecraft/JarUtils.h"
 
 OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
 {
diff --git a/logic/OneSixUpdate.h b/logic/minecraft/OneSixUpdate.h
index e3571e5a..e3571e5a 100644
--- a/logic/OneSixUpdate.h
+++ b/logic/minecraft/OneSixUpdate.h
diff --git a/logic/SkinUtils.cpp b/logic/minecraft/SkinUtils.cpp
index 68d94117..f44c9c70 100644
--- a/logic/SkinUtils.cpp
+++ b/logic/minecraft/SkinUtils.cpp
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#include "logic/SkinUtils.h"
-#include "net/HttpMetaCache.h"
+#include "logic/minecraft/SkinUtils.h"
+#include "logic/net/HttpMetaCache.h"
 #include "logic/Env.h"
 
 #include <QFile>
diff --git a/logic/SkinUtils.h b/logic/minecraft/SkinUtils.h
index bab9d45e..bab9d45e 100644
--- a/logic/SkinUtils.h
+++ b/logic/minecraft/SkinUtils.h
diff --git a/logic/minecraft/VersionBuilder.cpp b/logic/minecraft/VersionBuilder.cpp
index f3a0d490..bc29c187 100644
--- a/logic/minecraft/VersionBuilder.cpp
+++ b/logic/minecraft/VersionBuilder.cpp
@@ -35,7 +35,7 @@
 #include "MinecraftVersionList.h"
 #include "ProfileUtils.h"
 
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 #include "logic/MMCJson.h"
 
 #include <QDebug>
diff --git a/logic/updater/NotificationChecker.cpp b/logic/notifications/NotificationChecker.cpp
index 3f8b17ba..3f8b17ba 100644
--- a/logic/updater/NotificationChecker.cpp
+++ b/logic/notifications/NotificationChecker.cpp
diff --git a/logic/updater/NotificationChecker.h b/logic/notifications/NotificationChecker.h
index 915ee54d..915ee54d 100644
--- a/logic/updater/NotificationChecker.h
+++ b/logic/notifications/NotificationChecker.h