NOISSUE move everything.

logic/forge/ForgeInstaller.cpp

@@ -14,14 +14,14 @@
  */
 
 #include "ForgeInstaller.h"
-#include "logic/minecraft/MinecraftProfile.h"
-#include "logic/minecraft/OneSixLibrary.h"
-#include "logic/net/HttpMetaCache.h"
-#include "logic/tasks/Task.h"
-#include "logic/minecraft/OneSixInstance.h"
-#include "logic/forge/ForgeVersionList.h"
-#include "logic/minecraft/VersionFilterData.h"
-#include "logic/Env.h"
+#include "minecraft/MinecraftProfile.h"
+#include "minecraft/OneSixLibrary.h"
+#include "net/HttpMetaCache.h"
+#include "tasks/Task.h"
+#include "minecraft/OneSixInstance.h"
+#include "forge/ForgeVersionList.h"
+#include "minecraft/VersionFilterData.h"
+#include "Env.h"
 
 #include <quazip.h>
 #include <quazipfile.h>

logic/forge/ForgeInstaller.h

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "logic/BaseInstaller.h"
+#include "BaseInstaller.h"
 
 #include <QString>
 #include <memory>

logic/forge/ForgeMirrors.cpp

@@ -1,4 +1,4 @@
-#include "logic/Env.h"
+#include "Env.h"
 #include "ForgeMirrors.h"
 #include <QDebug>
 #include <algorithm>

logic/forge/ForgeMirrors.h

@@ -15,10 +15,10 @@
 
 #pragma once
 
-#include "logic/net/NetAction.h"
-#include "logic/net/HttpMetaCache.h"
-#include "logic/net/NetJob.h"
-#include "logic/forge/ForgeXzDownload.h"
+#include "net/NetAction.h"
+#include "net/HttpMetaCache.h"
+#include "net/NetJob.h"
+#include "forge/ForgeXzDownload.h"
 #include <QFile>
 #include <QTemporaryFile>
 typedef std::shared_ptr<class ForgeMirrors> ForgeMirrorsPtr;

logic/forge/ForgeVersion.cpp

@@ -1,5 +1,5 @@
 #include "ForgeVersion.h"
-#include "logic/minecraft/VersionFilterData.h"
+#include "minecraft/VersionFilterData.h"
 #include <QObject>
 
 QString ForgeVersion::name()

logic/forge/ForgeVersion.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <QString>
 #include <memory>
-#include "logic/BaseVersion.h"
+#include "BaseVersion.h"
 
 struct ForgeVersion;
 typedef std::shared_ptr<ForgeVersion> ForgeVersionPtr;

logic/forge/ForgeVersionList.cpp

@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-#include "logic/forge/ForgeVersionList.h"
-#include "logic/forge/ForgeVersion.h"
-#include "logic/net/NetJob.h"
-#include "logic/net/URLConstants.h"
-#include "logic/Env.h"
+#include "forge/ForgeVersionList.h"
+#include "forge/ForgeVersion.h"
+#include "net/NetJob.h"
+#include "net/URLConstants.h"
+#include "Env.h"
 
 #include <QtNetwork>
 #include <QtXml>

logic/forge/ForgeVersionList.h

@@ -20,10 +20,10 @@
 #include <QUrl>
 #include <QNetworkReply>
 
-#include "logic/BaseVersionList.h"
-#include "logic/tasks/Task.h"
-#include "logic/net/NetJob.h"
-#include "logic/forge/ForgeVersion.h"
+#include "BaseVersionList.h"
+#include "tasks/Task.h"
+#include "net/NetJob.h"
+#include "forge/ForgeVersion.h"
 
 class ForgeVersionList : public BaseVersionList
 {

logic/forge/ForgeXzDownload.cpp

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "logic/Env.h"
+#include "Env.h"
 #include "ForgeXzDownload.h"
 #include <pathutils.h>
 

logic/forge/ForgeXzDownload.h

@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include "logic/net/NetAction.h"
-#include "logic/net/HttpMetaCache.h"
+#include "net/NetAction.h"
+#include "net/HttpMetaCache.h"
 #include <QFile>
 #include <QTemporaryFile>
 #include "ForgeMirror.h"

logic/forge/LegacyForge.h

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "logic/minecraft/Mod.h"
+#include "minecraft/Mod.h"
 
 class MinecraftForge : public Mod
 {