Reorganize logic code.

9 files changed, 15 insertions, 14 deletions

diff --git a/gui/dialogs/CopyInstanceDialog.cpp b/gui/dialogs/CopyInstanceDialog.cpp
index 71429367..188cf274 100644
--- a/gui/dialogs/CopyInstanceDialog.cpp
+++ b/gui/dialogs/CopyInstanceDialog.cpp
@@ -28,7 +28,6 @@
 #include "logic/InstanceFactory.h"
 #include "logic/BaseVersion.h"
 #include "logic/icons/IconList.h"
-#include "logic/lists/MinecraftVersionList.h"
 #include "logic/tasks/Task.h"
 #include "logic/BaseInstance.h"
 
diff --git a/gui/dialogs/InstanceEditDialog.cpp b/gui/dialogs/InstanceEditDialog.cpp
index a74f3dcb..fc2d6a75 100644
--- a/gui/dialogs/InstanceEditDialog.cpp
+++ b/gui/dialogs/InstanceEditDialog.cpp
@@ -34,13 +34,13 @@
 #include "InstanceSettings.h"
 
 #include "logic/ModList.h"
-#include "logic/VersionFinal.h"
+#include "logic/minecraft/VersionFinal.h"
 #include "logic/EnabledItemFilter.h"
 #include "logic/forge/ForgeVersionList.h"
 #include "logic/forge/ForgeInstaller.h"
 #include "logic/liteloader/LiteLoaderVersionList.h"
 #include "logic/liteloader/LiteLoaderInstaller.h"
-#include "logic/OneSixVersionBuilder.h"
+#include "logic/minecraft/OneSixVersionBuilder.h"
 #include "logic/auth/MojangAccountList.h"
 
 #include <QAbstractItemModel>
diff --git a/gui/dialogs/InstanceSettings.cpp b/gui/dialogs/InstanceSettings.cpp
index edb4a921..9f0cae3b 100644
--- a/gui/dialogs/InstanceSettings.cpp
+++ b/gui/dialogs/InstanceSettings.cpp
@@ -23,10 +23,11 @@
 #include "gui/Platform.h"
 #include "gui/dialogs/VersionSelectDialog.h"
 
-#include "logic/JavaUtils.h"
 #include "logic/NagUtils.h"
-#include "logic/lists/JavaVersionList.h"
-#include "logic/JavaChecker.h"
+
+#include "logic/java/JavaUtils.h"
+#include "logic/java/JavaVersionList.h"
+#include "logic/java/JavaChecker.h"
 
 #include <QFileDialog>
 #include <QMessageBox>
diff --git a/gui/dialogs/InstanceSettings.h b/gui/dialogs/InstanceSettings.h
index e296db4c..6895589f 100644
--- a/gui/dialogs/InstanceSettings.h
+++ b/gui/dialogs/InstanceSettings.h
@@ -17,7 +17,7 @@
 
 #include <QDialog>
 #include "settingsobject.h"
-#include "logic/JavaChecker.h"
+#include "logic/java/JavaChecker.h"
 
 namespace Ui
 {
diff --git a/gui/dialogs/LwjglSelectDialog.cpp b/gui/dialogs/LwjglSelectDialog.cpp
index 046a4e2e..e64228b2 100644
--- a/gui/dialogs/LwjglSelectDialog.cpp
+++ b/gui/dialogs/LwjglSelectDialog.cpp
@@ -18,7 +18,7 @@
 #include "ui_LwjglSelectDialog.h"
 #include "gui/Platform.h"
 
-#include "logic/lists/LwjglVersionList.h"
+#include "logic/LwjglVersionList.h"
 
 LWJGLSelectDialog::LWJGLSelectDialog(QWidget *parent)
 	: QDialog(parent), ui(new Ui::LWJGLSelectDialog)
diff --git a/gui/dialogs/NewInstanceDialog.cpp b/gui/dialogs/NewInstanceDialog.cpp
index c7b273af..3192a1cd 100644
--- a/gui/dialogs/NewInstanceDialog.cpp
+++ b/gui/dialogs/NewInstanceDialog.cpp
@@ -20,7 +20,7 @@
 #include "logic/InstanceFactory.h"
 #include "logic/BaseVersion.h"
 #include "logic/icons/IconList.h"
-#include "logic/lists/MinecraftVersionList.h"
+#include "logic/minecraft/MinecraftVersionList.h"
 #include "logic/tasks/Task.h"
 
 #include "gui/Platform.h"
diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp
index 2dd19077..4c69c785 100644
--- a/gui/dialogs/SettingsDialog.cpp
+++ b/gui/dialogs/SettingsDialog.cpp
@@ -22,10 +22,11 @@
 #include "gui/dialogs/VersionSelectDialog.h"
 #include "gui/dialogs/CustomMessageBox.h"
 
-#include "logic/JavaUtils.h"
 #include "logic/NagUtils.h"
-#include "logic/lists/JavaVersionList.h"
-#include <logic/JavaChecker.h>
+
+#include "logic/java/JavaUtils.h"
+#include "logic/java/JavaVersionList.h"
+#include "logic/java/JavaChecker.h"
 
 #include "logic/updater/UpdateChecker.h"
 
diff --git a/gui/dialogs/SettingsDialog.h b/gui/dialogs/SettingsDialog.h
index d8495fdd..c65e9fb5 100644
--- a/gui/dialogs/SettingsDialog.h
+++ b/gui/dialogs/SettingsDialog.h
@@ -18,7 +18,7 @@
 #include <memory>
 #include <QDialog>
 
-#include "logic/JavaChecker.h"
+#include "logic/java/JavaChecker.h"
 
 class SettingsObject;
 
diff --git a/gui/dialogs/VersionSelectDialog.cpp b/gui/dialogs/VersionSelectDialog.cpp
index cae5a732..fd8b569d 100644
--- a/gui/dialogs/VersionSelectDialog.cpp
+++ b/gui/dialogs/VersionSelectDialog.cpp
@@ -24,7 +24,7 @@
 #include "gui/Platform.h"
 
 #include <logic/BaseVersion.h>
-#include <logic/lists/BaseVersionList.h>
+#include <logic/BaseVersionList.h>
 #include <logic/tasks/Task.h>
 
 VersionSelectDialog::VersionSelectDialog(BaseVersionList *vlist, QString title, QWidget *parent,