From 47e37635f50c09b4f9a9ee7699e3120bab3e4088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 10 Apr 2016 04:29:29 +0200
Subject: [PATCH] NOISSUE split GUI stuff from logic library

---
 CMakeLists.txt                                |  4 +-
 application/CMakeLists.txt                    |  2 +-
 application/ConsoleWindow.cpp                 |  2 +-
 application/InstanceProxyModel.cpp            | 11 ++++++
 application/InstanceProxyModel.h              |  3 +-
 application/MainWindow.cpp                    | 12 +++---
 application/MultiMC.cpp                       |  4 +-
 application/MultiMC.h                         |  6 +++
 application/dialogs/CopyInstanceDialog.cpp    |  4 +-
 application/dialogs/ExportInstanceDialog.cpp  |  4 +-
 application/dialogs/IconPickerDialog.cpp      |  8 ++--
 application/dialogs/NewInstanceDialog.cpp     |  4 +-
 application/pages/VersionPage.cpp             |  2 +-
 libraries/gui/CMakeLists.txt                  | 28 ++++++++++++++
 {logic => libraries/gui}/DesktopServices.cpp  |  0
 libraries/gui/DesktopServices.h               | 37 +++++++++++++++++++
 .../minecraft => libraries/gui}/SkinUtils.cpp |  2 +-
 .../minecraft => libraries/gui}/SkinUtils.h   |  4 +-
 {logic => libraries/gui}/icons/IconList.cpp   |  0
 {logic => libraries/gui}/icons/IconList.h     |  0
 {logic => libraries/gui}/icons/MMCIcon.cpp    |  0
 {logic => libraries/gui}/icons/MMCIcon.h      |  6 +--
 .../logic}/AbstractCommonModel.cpp            |  0
 .../logic}/AbstractCommonModel.h              |  0
 .../logic}/BaseConfigObject.cpp               |  0
 {logic => libraries/logic}/BaseConfigObject.h |  0
 {logic => libraries/logic}/BaseInstaller.cpp  |  0
 {logic => libraries/logic}/BaseInstaller.h    |  0
 {logic => libraries/logic}/BaseInstance.cpp   |  5 ---
 {logic => libraries/logic}/BaseInstance.h     |  0
 {logic => libraries/logic}/BaseVersion.h      |  0
 .../logic}/BaseVersionList.cpp                |  0
 {logic => libraries/logic}/BaseVersionList.h  |  0
 {logic => libraries/logic}/CMakeLists.txt     | 14 +------
 {logic => libraries/logic}/Commandline.cpp    |  0
 {logic => libraries/logic}/Commandline.h      |  0
 {logic => libraries/logic}/DefaultVariable.h  |  0
 {logic => libraries/logic}/Env.cpp            | 12 ------
 {logic => libraries/logic}/Env.h              |  6 ---
 {logic => libraries/logic}/Exception.h        |  0
 {logic => libraries/logic}/FileSystem.cpp     |  0
 {logic => libraries/logic}/FileSystem.h       |  0
 {logic => libraries/logic}/GZip.cpp           |  0
 {logic => libraries/logic}/GZip.h             |  0
 {logic => libraries/logic}/InstanceList.cpp   |  4 +-
 {logic => libraries/logic}/InstanceList.h     |  0
 {logic => libraries/logic}/Json.cpp           |  0
 {logic => libraries/logic}/Json.h             |  0
 {logic => libraries/logic}/MMCStrings.cpp     |  0
 {logic => libraries/logic}/MMCStrings.h       |  0
 {logic => libraries/logic}/MMCZip.cpp         |  0
 {logic => libraries/logic}/MMCZip.h           |  0
 {logic => libraries/logic}/NullInstance.h     |  0
 {logic => libraries/logic}/QObjectPtr.h       |  0
 {logic => libraries/logic}/RWStorage.h        |  0
 .../logic}/RecursiveFileSystemWatcher.cpp     |  0
 .../logic}/RecursiveFileSystemWatcher.h       |  0
 .../logic}/SeparatorPrefixTree.h              |  0
 {logic => libraries/logic}/TypeMagic.h        |  0
 {logic => libraries/logic}/Version.cpp        |  0
 {logic => libraries/logic}/Version.h          |  0
 .../logic}/java/JavaChecker.cpp               |  0
 {logic => libraries/logic}/java/JavaChecker.h |  0
 .../logic}/java/JavaCheckerJob.cpp            |  0
 .../logic}/java/JavaCheckerJob.h              |  1 -
 .../logic}/java/JavaInstall.cpp               |  0
 {logic => libraries/logic}/java/JavaInstall.h |  0
 .../logic}/java/JavaInstallList.cpp           |  0
 .../logic}/java/JavaInstallList.h             |  0
 {logic => libraries/logic}/java/JavaUtils.cpp |  0
 {logic => libraries/logic}/java/JavaUtils.h   |  1 -
 .../logic}/java/JavaVersion.cpp               |  0
 {logic => libraries/logic}/java/JavaVersion.h |  0
 .../logic}/launch/LaunchStep.cpp              |  0
 .../logic}/launch/LaunchStep.h                |  0
 .../logic}/launch/LaunchTask.cpp              |  0
 .../logic}/launch/LaunchTask.h                |  0
 .../logic}/launch/LoggedProcess.cpp           |  0
 .../logic}/launch/LoggedProcess.h             |  0
 .../logic}/launch/MessageLevel.cpp            |  0
 .../logic}/launch/MessageLevel.h              |  0
 .../logic}/launch/steps/CheckJava.cpp         |  0
 .../logic}/launch/steps/CheckJava.h           |  0
 .../logic}/launch/steps/LaunchMinecraft.cpp   |  0
 .../logic}/launch/steps/LaunchMinecraft.h     |  0
 .../logic}/launch/steps/ModMinecraftJar.cpp   |  0
 .../logic}/launch/steps/ModMinecraftJar.h     |  0
 .../logic}/launch/steps/PostLaunchCommand.cpp |  0
 .../logic}/launch/steps/PostLaunchCommand.h   |  0
 .../logic}/launch/steps/PreLaunchCommand.cpp  |  0
 .../logic}/launch/steps/PreLaunchCommand.h    |  0
 .../logic}/launch/steps/TextPrint.cpp         |  0
 .../logic}/launch/steps/TextPrint.h           |  0
 .../logic}/launch/steps/Update.cpp            |  0
 .../logic}/launch/steps/Update.h              |  0
 .../logic}/minecraft/AssetsUtils.cpp          |  0
 .../logic}/minecraft/AssetsUtils.h            |  0
 .../logic}/minecraft/GradleSpecifier.h        |  0
 {logic => libraries/logic}/minecraft/JarMod.h |  0
 .../logic}/minecraft/Library.cpp              |  0
 .../logic}/minecraft/Library.h                |  0
 .../logic}/minecraft/MinecraftInstance.cpp    |  0
 .../logic}/minecraft/MinecraftInstance.h      |  0
 .../logic}/minecraft/MinecraftProfile.cpp     |  0
 .../logic}/minecraft/MinecraftProfile.h       |  0
 .../logic}/minecraft/MinecraftVersion.cpp     |  0
 .../logic}/minecraft/MinecraftVersion.h       |  0
 .../logic}/minecraft/MinecraftVersionList.cpp |  0
 .../logic}/minecraft/MinecraftVersionList.h   |  0
 {logic => libraries/logic}/minecraft/Mod.cpp  |  0
 {logic => libraries/logic}/minecraft/Mod.h    |  0
 .../logic}/minecraft/ModList.cpp              |  0
 .../logic}/minecraft/ModList.h                |  0
 .../logic}/minecraft/MojangDownloadInfo.h     |  0
 .../logic}/minecraft/MojangVersionFormat.cpp  |  0
 .../logic}/minecraft/MojangVersionFormat.h    |  0
 .../logic}/minecraft/OpSys.cpp                |  0
 {logic => libraries/logic}/minecraft/OpSys.h  |  0
 .../logic}/minecraft/ParseUtils.cpp           |  0
 .../logic}/minecraft/ParseUtils.h             |  0
 .../logic}/minecraft/ProfilePatch.h           |  0
 .../logic}/minecraft/ProfileStrategy.h        |  0
 .../logic}/minecraft/ProfileUtils.cpp         |  0
 .../logic}/minecraft/ProfileUtils.h           |  0
 {logic => libraries/logic}/minecraft/Rule.cpp |  0
 {logic => libraries/logic}/minecraft/Rule.h   |  0
 .../logic}/minecraft/VersionBuildError.h      |  0
 .../logic}/minecraft/VersionFile.cpp          |  0
 .../logic}/minecraft/VersionFile.h            |  0
 .../logic}/minecraft/VersionFilterData.cpp    |  0
 .../logic}/minecraft/VersionFilterData.h      |  0
 .../logic}/minecraft/World.cpp                |  0
 {logic => libraries/logic}/minecraft/World.h  |  0
 .../logic}/minecraft/WorldList.cpp            |  0
 .../logic}/minecraft/WorldList.h              |  0
 .../logic}/minecraft/auth/AuthSession.cpp     |  0
 .../logic}/minecraft/auth/AuthSession.h       |  0
 .../logic}/minecraft/auth/MojangAccount.cpp   |  0
 .../logic}/minecraft/auth/MojangAccount.h     |  0
 .../minecraft/auth/MojangAccountList.cpp      |  0
 .../logic}/minecraft/auth/MojangAccountList.h |  0
 .../logic}/minecraft/auth/YggdrasilTask.cpp   |  0
 .../logic}/minecraft/auth/YggdrasilTask.h     |  0
 .../minecraft/auth/flows/AuthenticateTask.cpp |  0
 .../minecraft/auth/flows/AuthenticateTask.h   |  0
 .../minecraft/auth/flows/RefreshTask.cpp      |  0
 .../logic}/minecraft/auth/flows/RefreshTask.h |  0
 .../minecraft/auth/flows/ValidateTask.cpp     |  0
 .../minecraft/auth/flows/ValidateTask.h       |  0
 .../logic}/minecraft/forge/ForgeInstaller.cpp |  0
 .../logic}/minecraft/forge/ForgeInstaller.h   |  0
 .../logic}/minecraft/forge/ForgeVersion.cpp   |  0
 .../logic}/minecraft/forge/ForgeVersion.h     |  0
 .../minecraft/forge/ForgeVersionList.cpp      |  0
 .../logic}/minecraft/forge/ForgeVersionList.h |  0
 .../minecraft/forge/ForgeXzDownload.cpp       |  0
 .../logic}/minecraft/forge/ForgeXzDownload.h  |  0
 .../logic}/minecraft/forge/LegacyForge.cpp    |  0
 .../logic}/minecraft/forge/LegacyForge.h      |  0
 .../logic}/minecraft/ftb/FTBPlugin.cpp        |  4 +-
 .../logic}/minecraft/ftb/FTBPlugin.h          |  0
 .../minecraft/ftb/FTBProfileStrategy.cpp      |  0
 .../logic}/minecraft/ftb/FTBProfileStrategy.h |  0
 .../logic}/minecraft/ftb/FTBVersion.h         |  0
 .../minecraft/ftb/LegacyFTBInstance.cpp       |  0
 .../logic}/minecraft/ftb/LegacyFTBInstance.h  |  0
 .../minecraft/ftb/OneSixFTBInstance.cpp       |  0
 .../logic}/minecraft/ftb/OneSixFTBInstance.h  |  0
 .../minecraft/legacy/LegacyInstance.cpp       |  6 ---
 .../logic}/minecraft/legacy/LegacyInstance.h  |  0
 .../logic}/minecraft/legacy/LegacyUpdate.cpp  |  0
 .../logic}/minecraft/legacy/LegacyUpdate.h    |  0
 .../minecraft/legacy/LwjglVersionList.cpp     |  0
 .../minecraft/legacy/LwjglVersionList.h       |  0
 .../liteloader/LiteLoaderInstaller.cpp        |  0
 .../liteloader/LiteLoaderInstaller.h          |  0
 .../liteloader/LiteLoaderVersionList.cpp      |  0
 .../liteloader/LiteLoaderVersionList.h        |  0
 .../minecraft/onesix/OneSixInstance.cpp       |  6 +--
 .../logic}/minecraft/onesix/OneSixInstance.h  |  0
 .../onesix/OneSixProfileStrategy.cpp          |  0
 .../minecraft/onesix/OneSixProfileStrategy.h  |  0
 .../logic}/minecraft/onesix/OneSixUpdate.cpp  |  0
 .../logic}/minecraft/onesix/OneSixUpdate.h    |  0
 .../minecraft/onesix/OneSixVersionFormat.cpp  |  0
 .../minecraft/onesix/OneSixVersionFormat.h    |  0
 .../logic}/net/ByteArrayDownload.cpp          |  0
 .../logic}/net/ByteArrayDownload.h            |  0
 .../logic}/net/CacheDownload.cpp              |  0
 .../logic}/net/CacheDownload.h                |  0
 .../logic}/net/HttpMetaCache.cpp              |  0
 .../logic}/net/HttpMetaCache.h                |  0
 .../logic}/net/MD5EtagDownload.cpp            |  0
 .../logic}/net/MD5EtagDownload.h              |  0
 {logic => libraries/logic}/net/NetAction.h    |  0
 {logic => libraries/logic}/net/NetJob.cpp     |  0
 {logic => libraries/logic}/net/NetJob.h       |  1 -
 .../logic}/net/PasteUpload.cpp                |  0
 {logic => libraries/logic}/net/PasteUpload.h  |  1 -
 .../logic}/net/URLConstants.cpp               |  0
 {logic => libraries/logic}/net/URLConstants.h |  0
 .../logic}/news/NewsChecker.cpp               |  0
 {logic => libraries/logic}/news/NewsChecker.h |  0
 {logic => libraries/logic}/news/NewsEntry.cpp |  0
 {logic => libraries/logic}/news/NewsEntry.h   |  0
 .../notifications/NotificationChecker.cpp     |  0
 .../notifications/NotificationChecker.h       |  0
 .../logic}/pathmatcher/FSTreeMatcher.h        |  0
 .../logic}/pathmatcher/IPathMatcher.h         |  0
 .../logic}/pathmatcher/MultiMatcher.h         |  0
 .../logic}/pathmatcher/RegexpMatcher.h        |  0
 .../logic}/resources/Resource.cpp             |  0
 .../logic}/resources/Resource.h               |  0
 .../logic}/resources/ResourceHandler.cpp      |  0
 .../logic}/resources/ResourceHandler.h        |  0
 .../logic}/resources/ResourceObserver.cpp     |  0
 .../logic}/resources/ResourceObserver.h       |  0
 .../logic}/resources/ResourceProxyModel.cpp   |  0
 .../logic}/resources/ResourceProxyModel.h     |  0
 .../logic}/screenshots/ImgurAlbumCreation.cpp |  0
 .../logic}/screenshots/ImgurAlbumCreation.h   |  0
 .../logic}/screenshots/ImgurUpload.cpp        |  0
 .../logic}/screenshots/ImgurUpload.h          |  0
 .../logic}/screenshots/Screenshot.h           |  0
 .../logic}/settings/INIFile.cpp               |  0
 {logic => libraries/logic}/settings/INIFile.h |  0
 .../logic}/settings/INISettingsObject.cpp     |  0
 .../logic}/settings/INISettingsObject.h       |  0
 .../logic}/settings/OverrideSetting.cpp       |  0
 .../logic}/settings/OverrideSetting.h         |  0
 .../logic}/settings/PassthroughSetting.cpp    |  0
 .../logic}/settings/PassthroughSetting.h      |  0
 .../logic}/settings/Setting.cpp               |  0
 {logic => libraries/logic}/settings/Setting.h |  0
 .../logic}/settings/SettingsObject.cpp        |  0
 .../logic}/settings/SettingsObject.h          |  0
 .../logic}/status/StatusChecker.cpp           |  0
 .../logic}/status/StatusChecker.h             |  0
 .../logic}/tasks/SequentialTask.cpp           |  0
 .../logic}/tasks/SequentialTask.h             |  0
 {logic => libraries/logic}/tasks/Task.cpp     |  0
 {logic => libraries/logic}/tasks/Task.h       |  0
 .../logic}/tasks/ThreadTask.cpp               |  0
 {logic => libraries/logic}/tasks/ThreadTask.h |  0
 .../logic}/tools/BaseExternalTool.cpp         |  1 -
 .../logic}/tools/BaseExternalTool.h           |  0
 .../logic}/tools/BaseProfiler.cpp             |  0
 .../logic}/tools/BaseProfiler.h               |  0
 .../logic}/tools/JProfiler.cpp                |  1 -
 {logic => libraries/logic}/tools/JProfiler.h  |  0
 .../logic}/tools/JVisualVM.cpp                |  0
 {logic => libraries/logic}/tools/JVisualVM.h  |  0
 .../logic}/tools/MCEditTool.cpp               |  8 ++--
 {logic => libraries/logic}/tools/MCEditTool.h |  0
 .../logic}/trans/TranslationDownloader.cpp    |  0
 .../logic}/trans/TranslationDownloader.h      |  0
 .../logic}/updater/DownloadTask.cpp           |  0
 .../logic}/updater/DownloadTask.h             |  0
 .../logic}/updater/GoUpdate.cpp               |  0
 {logic => libraries/logic}/updater/GoUpdate.h |  0
 .../logic}/updater/UpdateChecker.cpp          |  0
 .../logic}/updater/UpdateChecker.h            |  0
 .../logic}/wonko/BaseWonkoEntity.cpp          |  0
 .../logic}/wonko/BaseWonkoEntity.h            |  0
 .../logic}/wonko/WonkoIndex.cpp               |  0
 {logic => libraries/logic}/wonko/WonkoIndex.h |  0
 .../logic}/wonko/WonkoReference.cpp           |  0
 .../logic}/wonko/WonkoReference.h             |  0
 .../logic}/wonko/WonkoUtil.cpp                |  0
 {logic => libraries/logic}/wonko/WonkoUtil.h  |  0
 .../logic}/wonko/WonkoVersion.cpp             |  0
 .../logic}/wonko/WonkoVersion.h               |  0
 .../logic}/wonko/WonkoVersionList.cpp         |  0
 .../logic}/wonko/WonkoVersionList.h           |  0
 .../logic}/wonko/format/WonkoFormat.cpp       |  0
 .../logic}/wonko/format/WonkoFormat.h         |  0
 .../logic}/wonko/format/WonkoFormatV1.cpp     |  0
 .../logic}/wonko/format/WonkoFormatV1.h       |  0
 .../tasks/BaseWonkoEntityLocalLoadTask.cpp    |  0
 .../tasks/BaseWonkoEntityLocalLoadTask.h      |  0
 .../tasks/BaseWonkoEntityRemoteLoadTask.cpp   |  0
 .../tasks/BaseWonkoEntityRemoteLoadTask.h     |  0
 logic/DesktopServices.h                       | 37 -------------------
 tests/tst_Resource.cpp                        |  1 -
 wonkoclient/WonkoClient.cpp                   |  2 -
 wonkoclient/main.cpp                          |  4 +-
 286 files changed, 126 insertions(+), 132 deletions(-)
 create mode 100644 libraries/gui/CMakeLists.txt
 rename {logic => libraries/gui}/DesktopServices.cpp (100%)
 create mode 100644 libraries/gui/DesktopServices.h
 rename {logic/minecraft => libraries/gui}/SkinUtils.cpp (97%)
 rename {logic/minecraft => libraries/gui}/SkinUtils.h (84%)
 rename {logic => libraries/gui}/icons/IconList.cpp (100%)
 rename {logic => libraries/gui}/icons/IconList.h (100%)
 rename {logic => libraries/gui}/icons/MMCIcon.cpp (100%)
 rename {logic => libraries/gui}/icons/MMCIcon.h (91%)
 rename {logic => libraries/logic}/AbstractCommonModel.cpp (100%)
 rename {logic => libraries/logic}/AbstractCommonModel.h (100%)
 rename {logic => libraries/logic}/BaseConfigObject.cpp (100%)
 rename {logic => libraries/logic}/BaseConfigObject.h (100%)
 rename {logic => libraries/logic}/BaseInstaller.cpp (100%)
 rename {logic => libraries/logic}/BaseInstaller.h (100%)
 rename {logic => libraries/logic}/BaseInstance.cpp (97%)
 rename {logic => libraries/logic}/BaseInstance.h (100%)
 rename {logic => libraries/logic}/BaseVersion.h (100%)
 rename {logic => libraries/logic}/BaseVersionList.cpp (100%)
 rename {logic => libraries/logic}/BaseVersionList.h (100%)
 rename {logic => libraries/logic}/CMakeLists.txt (95%)
 rename {logic => libraries/logic}/Commandline.cpp (100%)
 rename {logic => libraries/logic}/Commandline.h (100%)
 rename {logic => libraries/logic}/DefaultVariable.h (100%)
 rename {logic => libraries/logic}/Env.cpp (96%)
 rename {logic => libraries/logic}/Env.h (93%)
 rename {logic => libraries/logic}/Exception.h (100%)
 rename {logic => libraries/logic}/FileSystem.cpp (100%)
 rename {logic => libraries/logic}/FileSystem.h (100%)
 rename {logic => libraries/logic}/GZip.cpp (100%)
 rename {logic => libraries/logic}/GZip.h (100%)
 rename {logic => libraries/logic}/InstanceList.cpp (99%)
 rename {logic => libraries/logic}/InstanceList.h (100%)
 rename {logic => libraries/logic}/Json.cpp (100%)
 rename {logic => libraries/logic}/Json.h (100%)
 rename {logic => libraries/logic}/MMCStrings.cpp (100%)
 rename {logic => libraries/logic}/MMCStrings.h (100%)
 rename {logic => libraries/logic}/MMCZip.cpp (100%)
 rename {logic => libraries/logic}/MMCZip.h (100%)
 rename {logic => libraries/logic}/NullInstance.h (100%)
 rename {logic => libraries/logic}/QObjectPtr.h (100%)
 rename {logic => libraries/logic}/RWStorage.h (100%)
 rename {logic => libraries/logic}/RecursiveFileSystemWatcher.cpp (100%)
 rename {logic => libraries/logic}/RecursiveFileSystemWatcher.h (100%)
 rename {logic => libraries/logic}/SeparatorPrefixTree.h (100%)
 rename {logic => libraries/logic}/TypeMagic.h (100%)
 rename {logic => libraries/logic}/Version.cpp (100%)
 rename {logic => libraries/logic}/Version.h (100%)
 rename {logic => libraries/logic}/java/JavaChecker.cpp (100%)
 rename {logic => libraries/logic}/java/JavaChecker.h (100%)
 rename {logic => libraries/logic}/java/JavaCheckerJob.cpp (100%)
 rename {logic => libraries/logic}/java/JavaCheckerJob.h (99%)
 rename {logic => libraries/logic}/java/JavaInstall.cpp (100%)
 rename {logic => libraries/logic}/java/JavaInstall.h (100%)
 rename {logic => libraries/logic}/java/JavaInstallList.cpp (100%)
 rename {logic => libraries/logic}/java/JavaInstallList.h (100%)
 rename {logic => libraries/logic}/java/JavaUtils.cpp (100%)
 rename {logic => libraries/logic}/java/JavaUtils.h (98%)
 rename {logic => libraries/logic}/java/JavaVersion.cpp (100%)
 rename {logic => libraries/logic}/java/JavaVersion.h (100%)
 rename {logic => libraries/logic}/launch/LaunchStep.cpp (100%)
 rename {logic => libraries/logic}/launch/LaunchStep.h (100%)
 rename {logic => libraries/logic}/launch/LaunchTask.cpp (100%)
 rename {logic => libraries/logic}/launch/LaunchTask.h (100%)
 rename {logic => libraries/logic}/launch/LoggedProcess.cpp (100%)
 rename {logic => libraries/logic}/launch/LoggedProcess.h (100%)
 rename {logic => libraries/logic}/launch/MessageLevel.cpp (100%)
 rename {logic => libraries/logic}/launch/MessageLevel.h (100%)
 rename {logic => libraries/logic}/launch/steps/CheckJava.cpp (100%)
 rename {logic => libraries/logic}/launch/steps/CheckJava.h (100%)
 rename {logic => libraries/logic}/launch/steps/LaunchMinecraft.cpp (100%)
 rename {logic => libraries/logic}/launch/steps/LaunchMinecraft.h (100%)
 rename {logic => libraries/logic}/launch/steps/ModMinecraftJar.cpp (100%)
 rename {logic => libraries/logic}/launch/steps/ModMinecraftJar.h (100%)
 rename {logic => libraries/logic}/launch/steps/PostLaunchCommand.cpp (100%)
 rename {logic => libraries/logic}/launch/steps/PostLaunchCommand.h (100%)
 rename {logic => libraries/logic}/launch/steps/PreLaunchCommand.cpp (100%)
 rename {logic => libraries/logic}/launch/steps/PreLaunchCommand.h (100%)
 rename {logic => libraries/logic}/launch/steps/TextPrint.cpp (100%)
 rename {logic => libraries/logic}/launch/steps/TextPrint.h (100%)
 rename {logic => libraries/logic}/launch/steps/Update.cpp (100%)
 rename {logic => libraries/logic}/launch/steps/Update.h (100%)
 rename {logic => libraries/logic}/minecraft/AssetsUtils.cpp (100%)
 rename {logic => libraries/logic}/minecraft/AssetsUtils.h (100%)
 rename {logic => libraries/logic}/minecraft/GradleSpecifier.h (100%)
 rename {logic => libraries/logic}/minecraft/JarMod.h (100%)
 rename {logic => libraries/logic}/minecraft/Library.cpp (100%)
 rename {logic => libraries/logic}/minecraft/Library.h (100%)
 rename {logic => libraries/logic}/minecraft/MinecraftInstance.cpp (100%)
 rename {logic => libraries/logic}/minecraft/MinecraftInstance.h (100%)
 rename {logic => libraries/logic}/minecraft/MinecraftProfile.cpp (100%)
 rename {logic => libraries/logic}/minecraft/MinecraftProfile.h (100%)
 rename {logic => libraries/logic}/minecraft/MinecraftVersion.cpp (100%)
 rename {logic => libraries/logic}/minecraft/MinecraftVersion.h (100%)
 rename {logic => libraries/logic}/minecraft/MinecraftVersionList.cpp (100%)
 rename {logic => libraries/logic}/minecraft/MinecraftVersionList.h (100%)
 rename {logic => libraries/logic}/minecraft/Mod.cpp (100%)
 rename {logic => libraries/logic}/minecraft/Mod.h (100%)
 rename {logic => libraries/logic}/minecraft/ModList.cpp (100%)
 rename {logic => libraries/logic}/minecraft/ModList.h (100%)
 rename {logic => libraries/logic}/minecraft/MojangDownloadInfo.h (100%)
 rename {logic => libraries/logic}/minecraft/MojangVersionFormat.cpp (100%)
 rename {logic => libraries/logic}/minecraft/MojangVersionFormat.h (100%)
 rename {logic => libraries/logic}/minecraft/OpSys.cpp (100%)
 rename {logic => libraries/logic}/minecraft/OpSys.h (100%)
 rename {logic => libraries/logic}/minecraft/ParseUtils.cpp (100%)
 rename {logic => libraries/logic}/minecraft/ParseUtils.h (100%)
 rename {logic => libraries/logic}/minecraft/ProfilePatch.h (100%)
 rename {logic => libraries/logic}/minecraft/ProfileStrategy.h (100%)
 rename {logic => libraries/logic}/minecraft/ProfileUtils.cpp (100%)
 rename {logic => libraries/logic}/minecraft/ProfileUtils.h (100%)
 rename {logic => libraries/logic}/minecraft/Rule.cpp (100%)
 rename {logic => libraries/logic}/minecraft/Rule.h (100%)
 rename {logic => libraries/logic}/minecraft/VersionBuildError.h (100%)
 rename {logic => libraries/logic}/minecraft/VersionFile.cpp (100%)
 rename {logic => libraries/logic}/minecraft/VersionFile.h (100%)
 rename {logic => libraries/logic}/minecraft/VersionFilterData.cpp (100%)
 rename {logic => libraries/logic}/minecraft/VersionFilterData.h (100%)
 rename {logic => libraries/logic}/minecraft/World.cpp (100%)
 rename {logic => libraries/logic}/minecraft/World.h (100%)
 rename {logic => libraries/logic}/minecraft/WorldList.cpp (100%)
 rename {logic => libraries/logic}/minecraft/WorldList.h (100%)
 rename {logic => libraries/logic}/minecraft/auth/AuthSession.cpp (100%)
 rename {logic => libraries/logic}/minecraft/auth/AuthSession.h (100%)
 rename {logic => libraries/logic}/minecraft/auth/MojangAccount.cpp (100%)
 rename {logic => libraries/logic}/minecraft/auth/MojangAccount.h (100%)
 rename {logic => libraries/logic}/minecraft/auth/MojangAccountList.cpp (100%)
 rename {logic => libraries/logic}/minecraft/auth/MojangAccountList.h (100%)
 rename {logic => libraries/logic}/minecraft/auth/YggdrasilTask.cpp (100%)
 rename {logic => libraries/logic}/minecraft/auth/YggdrasilTask.h (100%)
 rename {logic => libraries/logic}/minecraft/auth/flows/AuthenticateTask.cpp (100%)
 rename {logic => libraries/logic}/minecraft/auth/flows/AuthenticateTask.h (100%)
 rename {logic => libraries/logic}/minecraft/auth/flows/RefreshTask.cpp (100%)
 rename {logic => libraries/logic}/minecraft/auth/flows/RefreshTask.h (100%)
 rename {logic => libraries/logic}/minecraft/auth/flows/ValidateTask.cpp (100%)
 rename {logic => libraries/logic}/minecraft/auth/flows/ValidateTask.h (100%)
 rename {logic => libraries/logic}/minecraft/forge/ForgeInstaller.cpp (100%)
 rename {logic => libraries/logic}/minecraft/forge/ForgeInstaller.h (100%)
 rename {logic => libraries/logic}/minecraft/forge/ForgeVersion.cpp (100%)
 rename {logic => libraries/logic}/minecraft/forge/ForgeVersion.h (100%)
 rename {logic => libraries/logic}/minecraft/forge/ForgeVersionList.cpp (100%)
 rename {logic => libraries/logic}/minecraft/forge/ForgeVersionList.h (100%)
 rename {logic => libraries/logic}/minecraft/forge/ForgeXzDownload.cpp (100%)
 rename {logic => libraries/logic}/minecraft/forge/ForgeXzDownload.h (100%)
 rename {logic => libraries/logic}/minecraft/forge/LegacyForge.cpp (100%)
 rename {logic => libraries/logic}/minecraft/forge/LegacyForge.h (100%)
 rename {logic => libraries/logic}/minecraft/ftb/FTBPlugin.cpp (98%)
 rename {logic => libraries/logic}/minecraft/ftb/FTBPlugin.h (100%)
 rename {logic => libraries/logic}/minecraft/ftb/FTBProfileStrategy.cpp (100%)
 rename {logic => libraries/logic}/minecraft/ftb/FTBProfileStrategy.h (100%)
 rename {logic => libraries/logic}/minecraft/ftb/FTBVersion.h (100%)
 rename {logic => libraries/logic}/minecraft/ftb/LegacyFTBInstance.cpp (100%)
 rename {logic => libraries/logic}/minecraft/ftb/LegacyFTBInstance.h (100%)
 rename {logic => libraries/logic}/minecraft/ftb/OneSixFTBInstance.cpp (100%)
 rename {logic => libraries/logic}/minecraft/ftb/OneSixFTBInstance.h (100%)
 rename {logic => libraries/logic}/minecraft/legacy/LegacyInstance.cpp (98%)
 rename {logic => libraries/logic}/minecraft/legacy/LegacyInstance.h (100%)
 rename {logic => libraries/logic}/minecraft/legacy/LegacyUpdate.cpp (100%)
 rename {logic => libraries/logic}/minecraft/legacy/LegacyUpdate.h (100%)
 rename {logic => libraries/logic}/minecraft/legacy/LwjglVersionList.cpp (100%)
 rename {logic => libraries/logic}/minecraft/legacy/LwjglVersionList.h (100%)
 rename {logic => libraries/logic}/minecraft/liteloader/LiteLoaderInstaller.cpp (100%)
 rename {logic => libraries/logic}/minecraft/liteloader/LiteLoaderInstaller.h (100%)
 rename {logic => libraries/logic}/minecraft/liteloader/LiteLoaderVersionList.cpp (100%)
 rename {logic => libraries/logic}/minecraft/liteloader/LiteLoaderVersionList.h (100%)
 rename {logic => libraries/logic}/minecraft/onesix/OneSixInstance.cpp (98%)
 rename {logic => libraries/logic}/minecraft/onesix/OneSixInstance.h (100%)
 rename {logic => libraries/logic}/minecraft/onesix/OneSixProfileStrategy.cpp (100%)
 rename {logic => libraries/logic}/minecraft/onesix/OneSixProfileStrategy.h (100%)
 rename {logic => libraries/logic}/minecraft/onesix/OneSixUpdate.cpp (100%)
 rename {logic => libraries/logic}/minecraft/onesix/OneSixUpdate.h (100%)
 rename {logic => libraries/logic}/minecraft/onesix/OneSixVersionFormat.cpp (100%)
 rename {logic => libraries/logic}/minecraft/onesix/OneSixVersionFormat.h (100%)
 rename {logic => libraries/logic}/net/ByteArrayDownload.cpp (100%)
 rename {logic => libraries/logic}/net/ByteArrayDownload.h (100%)
 rename {logic => libraries/logic}/net/CacheDownload.cpp (100%)
 rename {logic => libraries/logic}/net/CacheDownload.h (100%)
 rename {logic => libraries/logic}/net/HttpMetaCache.cpp (100%)
 rename {logic => libraries/logic}/net/HttpMetaCache.h (100%)
 rename {logic => libraries/logic}/net/MD5EtagDownload.cpp (100%)
 rename {logic => libraries/logic}/net/MD5EtagDownload.h (100%)
 rename {logic => libraries/logic}/net/NetAction.h (100%)
 rename {logic => libraries/logic}/net/NetJob.cpp (100%)
 rename {logic => libraries/logic}/net/NetJob.h (99%)
 rename {logic => libraries/logic}/net/PasteUpload.cpp (100%)
 rename {logic => libraries/logic}/net/PasteUpload.h (97%)
 rename {logic => libraries/logic}/net/URLConstants.cpp (100%)
 rename {logic => libraries/logic}/net/URLConstants.h (100%)
 rename {logic => libraries/logic}/news/NewsChecker.cpp (100%)
 rename {logic => libraries/logic}/news/NewsChecker.h (100%)
 rename {logic => libraries/logic}/news/NewsEntry.cpp (100%)
 rename {logic => libraries/logic}/news/NewsEntry.h (100%)
 rename {logic => libraries/logic}/notifications/NotificationChecker.cpp (100%)
 rename {logic => libraries/logic}/notifications/NotificationChecker.h (100%)
 rename {logic => libraries/logic}/pathmatcher/FSTreeMatcher.h (100%)
 rename {logic => libraries/logic}/pathmatcher/IPathMatcher.h (100%)
 rename {logic => libraries/logic}/pathmatcher/MultiMatcher.h (100%)
 rename {logic => libraries/logic}/pathmatcher/RegexpMatcher.h (100%)
 rename {logic => libraries/logic}/resources/Resource.cpp (100%)
 rename {logic => libraries/logic}/resources/Resource.h (100%)
 rename {logic => libraries/logic}/resources/ResourceHandler.cpp (100%)
 rename {logic => libraries/logic}/resources/ResourceHandler.h (100%)
 rename {logic => libraries/logic}/resources/ResourceObserver.cpp (100%)
 rename {logic => libraries/logic}/resources/ResourceObserver.h (100%)
 rename {logic => libraries/logic}/resources/ResourceProxyModel.cpp (100%)
 rename {logic => libraries/logic}/resources/ResourceProxyModel.h (100%)
 rename {logic => libraries/logic}/screenshots/ImgurAlbumCreation.cpp (100%)
 rename {logic => libraries/logic}/screenshots/ImgurAlbumCreation.h (100%)
 rename {logic => libraries/logic}/screenshots/ImgurUpload.cpp (100%)
 rename {logic => libraries/logic}/screenshots/ImgurUpload.h (100%)
 rename {logic => libraries/logic}/screenshots/Screenshot.h (100%)
 rename {logic => libraries/logic}/settings/INIFile.cpp (100%)
 rename {logic => libraries/logic}/settings/INIFile.h (100%)
 rename {logic => libraries/logic}/settings/INISettingsObject.cpp (100%)
 rename {logic => libraries/logic}/settings/INISettingsObject.h (100%)
 rename {logic => libraries/logic}/settings/OverrideSetting.cpp (100%)
 rename {logic => libraries/logic}/settings/OverrideSetting.h (100%)
 rename {logic => libraries/logic}/settings/PassthroughSetting.cpp (100%)
 rename {logic => libraries/logic}/settings/PassthroughSetting.h (100%)
 rename {logic => libraries/logic}/settings/Setting.cpp (100%)
 rename {logic => libraries/logic}/settings/Setting.h (100%)
 rename {logic => libraries/logic}/settings/SettingsObject.cpp (100%)
 rename {logic => libraries/logic}/settings/SettingsObject.h (100%)
 rename {logic => libraries/logic}/status/StatusChecker.cpp (100%)
 rename {logic => libraries/logic}/status/StatusChecker.h (100%)
 rename {logic => libraries/logic}/tasks/SequentialTask.cpp (100%)
 rename {logic => libraries/logic}/tasks/SequentialTask.h (100%)
 rename {logic => libraries/logic}/tasks/Task.cpp (100%)
 rename {logic => libraries/logic}/tasks/Task.h (100%)
 rename {logic => libraries/logic}/tasks/ThreadTask.cpp (100%)
 rename {logic => libraries/logic}/tasks/ThreadTask.h (100%)
 rename {logic => libraries/logic}/tools/BaseExternalTool.cpp (97%)
 rename {logic => libraries/logic}/tools/BaseExternalTool.h (100%)
 rename {logic => libraries/logic}/tools/BaseProfiler.cpp (100%)
 rename {logic => libraries/logic}/tools/BaseProfiler.h (100%)
 rename {logic => libraries/logic}/tools/JProfiler.cpp (99%)
 rename {logic => libraries/logic}/tools/JProfiler.h (100%)
 rename {logic => libraries/logic}/tools/JVisualVM.cpp (100%)
 rename {logic => libraries/logic}/tools/JVisualVM.h (100%)
 rename {logic => libraries/logic}/tools/MCEditTool.cpp (96%)
 rename {logic => libraries/logic}/tools/MCEditTool.h (100%)
 rename {logic => libraries/logic}/trans/TranslationDownloader.cpp (100%)
 rename {logic => libraries/logic}/trans/TranslationDownloader.h (100%)
 rename {logic => libraries/logic}/updater/DownloadTask.cpp (100%)
 rename {logic => libraries/logic}/updater/DownloadTask.h (100%)
 rename {logic => libraries/logic}/updater/GoUpdate.cpp (100%)
 rename {logic => libraries/logic}/updater/GoUpdate.h (100%)
 rename {logic => libraries/logic}/updater/UpdateChecker.cpp (100%)
 rename {logic => libraries/logic}/updater/UpdateChecker.h (100%)
 rename {logic => libraries/logic}/wonko/BaseWonkoEntity.cpp (100%)
 rename {logic => libraries/logic}/wonko/BaseWonkoEntity.h (100%)
 rename {logic => libraries/logic}/wonko/WonkoIndex.cpp (100%)
 rename {logic => libraries/logic}/wonko/WonkoIndex.h (100%)
 rename {logic => libraries/logic}/wonko/WonkoReference.cpp (100%)
 rename {logic => libraries/logic}/wonko/WonkoReference.h (100%)
 rename {logic => libraries/logic}/wonko/WonkoUtil.cpp (100%)
 rename {logic => libraries/logic}/wonko/WonkoUtil.h (100%)
 rename {logic => libraries/logic}/wonko/WonkoVersion.cpp (100%)
 rename {logic => libraries/logic}/wonko/WonkoVersion.h (100%)
 rename {logic => libraries/logic}/wonko/WonkoVersionList.cpp (100%)
 rename {logic => libraries/logic}/wonko/WonkoVersionList.h (100%)
 rename {logic => libraries/logic}/wonko/format/WonkoFormat.cpp (100%)
 rename {logic => libraries/logic}/wonko/format/WonkoFormat.h (100%)
 rename {logic => libraries/logic}/wonko/format/WonkoFormatV1.cpp (100%)
 rename {logic => libraries/logic}/wonko/format/WonkoFormatV1.h (100%)
 rename {logic => libraries/logic}/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp (100%)
 rename {logic => libraries/logic}/wonko/tasks/BaseWonkoEntityLocalLoadTask.h (100%)
 rename {logic => libraries/logic}/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp (100%)
 rename {logic => libraries/logic}/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h (100%)
 delete mode 100644 logic/DesktopServices.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5739f923..2c021578 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,6 +117,8 @@ include(Coverity)
 ############################### Built Artifacts ###############################
 
 add_subdirectory(tests)
-add_subdirectory(logic)
+add_subdirectory(libraries/logic)
+add_subdirectory(libraries/gui)
+
 add_subdirectory(application)
 add_subdirectory(wonkoclient)
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
index 5983fb42..f1a95a8a 100644
--- a/application/CMakeLists.txt
+++ b/application/CMakeLists.txt
@@ -318,7 +318,7 @@ qt5_add_resources(MULTIMC_RESOURCES ${MULTIMC_QRCS})
 
 # Add executable
 add_executable(MultiMC MACOSX_BUNDLE WIN32 ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES} ${MULTIMC_RCS})
-target_link_libraries(MultiMC MultiMC_logic xz-embedded unpack200 iconfix ${QUAZIP_LIBRARIES} hoedown rainbow)
+target_link_libraries(MultiMC MultiMC_gui ${QUAZIP_LIBRARIES} hoedown rainbow)
 
 if(APPLE)
 find_library(OSX_CORE_FOUNDATION CoreFoundation)
diff --git a/application/ConsoleWindow.cpp b/application/ConsoleWindow.cpp
index a843536b..e620d700 100644
--- a/application/ConsoleWindow.cpp
+++ b/application/ConsoleWindow.cpp
@@ -58,7 +58,7 @@ ConsoleWindow::ConsoleWindow(std::shared_ptr<LaunchTask> proc, QWidget *parent)
 	setAttribute(Qt::WA_DeleteOnClose);
 
 	auto instance = m_proc->instance();
-	auto icon = ENV.icons()->getIcon(instance->iconKey());
+	auto icon = MMC->icons()->getIcon(instance->iconKey());
 	QString windowTitle = tr("Console window for ") + instance->name();
 
 	// Set window properties
diff --git a/application/InstanceProxyModel.cpp b/application/InstanceProxyModel.cpp
index 2048252c..d0e9e10d 100644
--- a/application/InstanceProxyModel.cpp
+++ b/application/InstanceProxyModel.cpp
@@ -1,11 +1,22 @@
 #include "InstanceProxyModel.h"
 #include "MultiMC.h"
 #include <BaseInstance.h>
+#include <icons/IconList.h>
 
 InstanceProxyModel::InstanceProxyModel(QObject *parent) : GroupedProxyModel(parent)
 {
 }
 
+QVariant InstanceProxyModel::data(const QModelIndex & index, int role) const
+{
+	QVariant data = QSortFilterProxyModel::data(index, role);
+	if(role == Qt::DecorationRole)
+	{
+		return QVariant(MMC->icons()->getIcon(data.toString()));
+	}
+	return data;
+}
+
 bool InstanceProxyModel::subSortLessThan(const QModelIndex &left,
 										 const QModelIndex &right) const
 {
diff --git a/application/InstanceProxyModel.h b/application/InstanceProxyModel.h
index cc6c1b86..c063f526 100644
--- a/application/InstanceProxyModel.h
+++ b/application/InstanceProxyModel.h
@@ -9,7 +9,8 @@ class InstanceProxyModel : public GroupedProxyModel
 {
 public:
 	explicit InstanceProxyModel(QObject *parent = 0);
+	QVariant data(const QModelIndex & index, int role) const override;
 
 protected:
-	virtual bool subSortLessThan(const QModelIndex &left, const QModelIndex &right) const;
+	virtual bool subSortLessThan(const QModelIndex &left, const QModelIndex &right) const override;
 };
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
index e1d306b0..97c0b02a 100644
--- a/application/MainWindow.cpp
+++ b/application/MainWindow.cpp
@@ -56,7 +56,7 @@
 #include <launch/LaunchTask.h>
 #include <minecraft/MinecraftVersionList.h>
 #include <minecraft/legacy/LwjglVersionList.h>
-#include <minecraft/SkinUtils.h>
+#include <SkinUtils.h>
 #include <net/URLConstants.h>
 #include <net/NetJob.h>
 #include <net/CacheDownload.h>
@@ -468,7 +468,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
 	connect(view->selectionModel(), &QItemSelectionModel::currentChanged, this, &MainWindow::instanceChanged);
 
 	// track icon changes and update the toolbar!
-	connect(ENV.icons().get(), &IconList::iconUpdated, this, &MainWindow::iconUpdated);
+	connect(MMC->icons().get(), &IconList::iconUpdated, this, &MainWindow::iconUpdated);
 
 	// model reset -> selection is invalid. All the instance pointers are wrong.
 	connect(MMC->instances().get(), &InstanceList::dataIsInvalid, this, &MainWindow::selectionBad);
@@ -1108,7 +1108,7 @@ InstancePtr MainWindow::instanceFromZipPack(QString instName, QString instGroup,
 		if (QFile::exists(importIconPath))
 		{
 			// import icon
-			auto iconList = ENV.icons();
+			auto iconList = MMC->icons();
 			// FIXME: check if the file is OK before removing the existing one...
 			if (iconList->iconFileExists(instIcon))
 			{
@@ -1311,7 +1311,7 @@ void MainWindow::on_actionChangeInstIcon_triggered()
 	if (dlg.result() == QDialog::Accepted)
 	{
 		m_selectedInstance->setIconKey(dlg.selectedIconKey);
-		auto ico = ENV.icons()->getBigIcon(dlg.selectedIconKey);
+		auto ico = MMC->icons()->getBigIcon(dlg.selectedIconKey);
 		ui->actionChangeInstIcon->setIcon(ico);
 	}
 }
@@ -1320,14 +1320,14 @@ void MainWindow::iconUpdated(QString icon)
 {
 	if (icon == m_currentInstIcon)
 	{
-		ui->actionChangeInstIcon->setIcon(ENV.icons()->getBigIcon(m_currentInstIcon));
+		ui->actionChangeInstIcon->setIcon(MMC->icons()->getBigIcon(m_currentInstIcon));
 	}
 }
 
 void MainWindow::updateInstanceToolIcon(QString new_icon)
 {
 	m_currentInstIcon = new_icon;
-	ui->actionChangeInstIcon->setIcon(ENV.icons()->getBigIcon(m_currentInstIcon));
+	ui->actionChangeInstIcon->setIcon(MMC->icons()->getBigIcon(m_currentInstIcon));
 }
 
 void MainWindow::setSelectedInstanceById(const QString &id)
diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp
index 4a84c6bd..24e71fa0 100644
--- a/application/MultiMC.cpp
+++ b/application/MultiMC.cpp
@@ -342,10 +342,10 @@ void MultiMC::initTranslations()
 void MultiMC::initIcons()
 {
 	auto setting = MMC->settings()->getSetting("IconsDir");
-	ENV.m_icons.reset(new IconList(QString(":/icons/instances/"), setting->get().toString()));
+	m_icons.reset(new IconList(QString(":/icons/instances/"), setting->get().toString()));
 	connect(setting.get(), &Setting::SettingChanged,[&](const Setting &, QVariant value)
 	{
-		ENV.m_icons->directoryChanged(value.toString());
+		m_icons->directoryChanged(value.toString());
 	});
 
 	//FIXME: none of this should be here.
diff --git a/application/MultiMC.h b/application/MultiMC.h
index 5b19db19..8219d66c 100644
--- a/application/MultiMC.h
+++ b/application/MultiMC.h
@@ -87,6 +87,11 @@ public:
 		return m_instances;
 	}
 
+	std::shared_ptr<IconList> icons()
+	{
+		return m_icons;
+	}
+
 	// APPLICATION ONLY
 	std::shared_ptr<MojangAccountList> accounts()
 	{
@@ -154,6 +159,7 @@ private:
 	std::shared_ptr<QTranslator> m_mmc_translator;
 	std::shared_ptr<SettingsObject> m_settings;
 	std::shared_ptr<InstanceList> m_instances;
+	std::shared_ptr<IconList> m_icons;
 	std::shared_ptr<UpdateChecker> m_updateChecker;
 	std::shared_ptr<MojangAccountList> m_accounts;
 	std::shared_ptr<LWJGLVersionList> m_lwjgllist;
diff --git a/application/dialogs/CopyInstanceDialog.cpp b/application/dialogs/CopyInstanceDialog.cpp
index 67e2e8e1..85c70d91 100644
--- a/application/dialogs/CopyInstanceDialog.cpp
+++ b/application/dialogs/CopyInstanceDialog.cpp
@@ -36,7 +36,7 @@ CopyInstanceDialog::CopyInstanceDialog(InstancePtr original, QWidget *parent)
 	layout()->setSizeConstraint(QLayout::SetFixedSize);
 
 	InstIconKey = original->iconKey();
-	ui->iconButton->setIcon(ENV.icons()->getIcon(InstIconKey));
+	ui->iconButton->setIcon(MMC->icons()->getIcon(InstIconKey));
 	ui->instNameTextBox->setText(original->name());
 	ui->instNameTextBox->setFocus();
 	auto groups = MMC->instances()->getGroups().toSet();
@@ -88,7 +88,7 @@ void CopyInstanceDialog::on_iconButton_clicked()
 	if (dlg.result() == QDialog::Accepted)
 	{
 		InstIconKey = dlg.selectedIconKey;
-		ui->iconButton->setIcon(ENV.icons()->getIcon(InstIconKey));
+		ui->iconButton->setIcon(MMC->icons()->getIcon(InstIconKey));
 	}
 }
 
diff --git a/application/dialogs/ExportInstanceDialog.cpp b/application/dialogs/ExportInstanceDialog.cpp
index a38fd238..2712f24c 100644
--- a/application/dialogs/ExportInstanceDialog.cpp
+++ b/application/dialogs/ExportInstanceDialog.cpp
@@ -27,7 +27,7 @@
 #include <QSaveFile>
 #include "MMCStrings.h"
 #include "SeparatorPrefixTree.h"
-#include "Env.h"
+#include "MultiMC.h"
 #include <icons/IconList.h>
 #include <FileSystem.h>
 
@@ -339,7 +339,7 @@ ExportInstanceDialog::~ExportInstanceDialog()
 void SaveIcon(InstancePtr m_instance)
 {
 	auto iconKey = m_instance->iconKey();
-	auto iconList = ENV.icons();
+	auto iconList = MMC->icons();
 	auto mmcIcon = iconList->icon(iconKey);
 	if(mmcIcon)
 	{
diff --git a/application/dialogs/IconPickerDialog.cpp b/application/dialogs/IconPickerDialog.cpp
index f750cd27..7ee7d045 100644
--- a/application/dialogs/IconPickerDialog.cpp
+++ b/application/dialogs/IconPickerDialog.cpp
@@ -57,7 +57,7 @@ IconPickerDialog::IconPickerDialog(QWidget *parent)
 
 	contentsWidget->installEventFilter(this);
 
-	contentsWidget->setModel(ENV.icons().get());
+	contentsWidget->setModel(MMC->icons().get());
 
 	auto buttonAdd = ui->buttonBox->addButton(tr("Add Icon"), QDialogButtonBox::ResetRole);
 	auto buttonRemove =
@@ -102,12 +102,12 @@ void IconPickerDialog::addNewIcon()
 	//: The type of icon files
 	QStringList fileNames = QFileDialog::getOpenFileNames(this, selectIcons, QString(),
 														  tr("Icons") + "(*.png *.jpg *.jpeg *.ico)");
-	ENV.icons()->installIcons(fileNames);
+	MMC->icons()->installIcons(fileNames);
 }
 
 void IconPickerDialog::removeSelectedIcon()
 {
-	ENV.icons()->deleteIcon(selectedIconKey);
+	MMC->icons()->deleteIcon(selectedIconKey);
 }
 
 void IconPickerDialog::activated(QModelIndex index)
@@ -128,7 +128,7 @@ void IconPickerDialog::selectionChanged(QItemSelection selected, QItemSelection
 
 int IconPickerDialog::execWithSelection(QString selection)
 {
-	auto list = ENV.icons();
+	auto list = MMC->icons();
 	auto contentsWidget = ui->iconView;
 	selectedIconKey = selection;
 
diff --git a/application/dialogs/NewInstanceDialog.cpp b/application/dialogs/NewInstanceDialog.cpp
index a883d1dc..1e12c9ba 100644
--- a/application/dialogs/NewInstanceDialog.cpp
+++ b/application/dialogs/NewInstanceDialog.cpp
@@ -64,7 +64,7 @@ NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, QWidget *pare
 
 	setSelectedVersion(MMC->minecraftlist()->getRecommended());
 	InstIconKey = "default";
-	ui->iconButton->setIcon(ENV.icons()->getIcon(InstIconKey));
+	ui->iconButton->setIcon(MMC->icons()->getIcon(InstIconKey));
 
 	ui->modpackEdit->setValidator(new UrlValidator(ui->modpackEdit));
 
@@ -211,7 +211,7 @@ void NewInstanceDialog::on_iconButton_clicked()
 	if (dlg.result() == QDialog::Accepted)
 	{
 		InstIconKey = dlg.selectedIconKey;
-		ui->iconButton->setIcon(ENV.icons()->getIcon(InstIconKey));
+		ui->iconButton->setIcon(MMC->icons()->getIcon(InstIconKey));
 	}
 }
 
diff --git a/application/pages/VersionPage.cpp b/application/pages/VersionPage.cpp
index 6cbc9e92..14e48cff 100644
--- a/application/pages/VersionPage.cpp
+++ b/application/pages/VersionPage.cpp
@@ -94,7 +94,7 @@ private:
 
 QIcon VersionPage::icon() const
 {
-	return ENV.icons()->getIcon(m_inst->iconKey());
+	return MMC->icons()->getIcon(m_inst->iconKey());
 }
 bool VersionPage::shouldDisplay() const
 {
diff --git a/libraries/gui/CMakeLists.txt b/libraries/gui/CMakeLists.txt
new file mode 100644
index 00000000..1551a927
--- /dev/null
+++ b/libraries/gui/CMakeLists.txt
@@ -0,0 +1,28 @@
+project(MultiMC_logic)
+
+set(GUI_SOURCES
+	DesktopServices.h
+	DesktopServices.cpp
+
+	# Icons
+	icons/MMCIcon.h
+	icons/MMCIcon.cpp
+	icons/IconList.h
+	icons/IconList.cpp
+
+	SkinUtils.cpp
+	SkinUtils.h
+)
+################################ COMPILE ################################
+
+add_library(MultiMC_gui SHARED ${GUI_SOURCES})
+set_target_properties(MultiMC_gui PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1)
+
+generate_export_header(MultiMC_gui)
+
+# Link
+target_link_libraries(MultiMC_gui iconfix MultiMC_logic)
+qt5_use_modules(MultiMC_gui Gui)
+
+# Mark and export headers
+target_include_directories(MultiMC_gui PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
diff --git a/logic/DesktopServices.cpp b/libraries/gui/DesktopServices.cpp
similarity index 100%
rename from logic/DesktopServices.cpp
rename to libraries/gui/DesktopServices.cpp
diff --git a/libraries/gui/DesktopServices.h b/libraries/gui/DesktopServices.h
new file mode 100644
index 00000000..9daf192a
--- /dev/null
+++ b/libraries/gui/DesktopServices.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <QUrl>
+#include <QString>
+#include "multimc_gui_export.h"
+
+/**
+ * This wraps around QDesktopServices and adds workarounds where needed
+ * Use this instead of QDesktopServices!
+ */
+namespace DesktopServices
+{
+	/**
+	 * Open a file in whatever application is applicable
+	 */
+	MULTIMC_GUI_EXPORT bool openFile(const QString &path);
+
+	/**
+	 * Open a file in the specified application
+	 */
+	MULTIMC_GUI_EXPORT bool openFile(const QString &application, const QString &path, const QString & workingDirectory = QString(), qint64 *pid = 0);
+
+	/**
+	 * Run an application
+	 */
+	MULTIMC_GUI_EXPORT bool run(const QString &application,const QStringList &args, const QString & workingDirectory = QString(), qint64 *pid = 0);
+
+	/**
+	 * Open a directory
+	 */
+	MULTIMC_GUI_EXPORT bool openDirectory(const QString &path, bool ensureExists = false);
+
+	/**
+	 * Open the URL, most likely in a browser. Maybe.
+	 */
+	MULTIMC_GUI_EXPORT bool openUrl(const QUrl &url);
+};
diff --git a/logic/minecraft/SkinUtils.cpp b/libraries/gui/SkinUtils.cpp
similarity index 97%
rename from logic/minecraft/SkinUtils.cpp
rename to libraries/gui/SkinUtils.cpp
index e6e513a5..f69a1071 100644
--- a/logic/minecraft/SkinUtils.cpp
+++ b/libraries/gui/SkinUtils.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "minecraft/SkinUtils.h"
+#include "SkinUtils.h"
 #include "net/HttpMetaCache.h"
 #include "Env.h"
 
diff --git a/logic/minecraft/SkinUtils.h b/libraries/gui/SkinUtils.h
similarity index 84%
rename from logic/minecraft/SkinUtils.h
rename to libraries/gui/SkinUtils.h
index 5f5b1897..29dcd6a6 100644
--- a/logic/minecraft/SkinUtils.h
+++ b/libraries/gui/SkinUtils.h
@@ -17,9 +17,9 @@
 
 #include <QPixmap>
 
-#include "multimc_logic_export.h"
+#include "multimc_gui_export.h"
 
 namespace SkinUtils
 {
-QPixmap MULTIMC_LOGIC_EXPORT getFaceFromCache(QString id, int height = 64, int width = 64);
+QPixmap MULTIMC_GUI_EXPORT getFaceFromCache(QString id, int height = 64, int width = 64);
 }
diff --git a/logic/icons/IconList.cpp b/libraries/gui/icons/IconList.cpp
similarity index 100%
rename from logic/icons/IconList.cpp
rename to libraries/gui/icons/IconList.cpp
diff --git a/logic/icons/IconList.h b/libraries/gui/icons/IconList.h
similarity index 100%
rename from logic/icons/IconList.h
rename to libraries/gui/icons/IconList.h
diff --git a/logic/icons/MMCIcon.cpp b/libraries/gui/icons/MMCIcon.cpp
similarity index 100%
rename from logic/icons/MMCIcon.cpp
rename to libraries/gui/icons/MMCIcon.cpp
diff --git a/logic/icons/MMCIcon.h b/libraries/gui/icons/MMCIcon.h
similarity index 91%
rename from logic/icons/MMCIcon.h
rename to libraries/gui/icons/MMCIcon.h
index 753e916d..6f9617c2 100644
--- a/logic/icons/MMCIcon.h
+++ b/libraries/gui/icons/MMCIcon.h
@@ -18,9 +18,9 @@
 #include <QDateTime>
 #include <QIcon>
 
-#include "multimc_logic_export.h"
+#include "multimc_gui_export.h"
 
-struct MULTIMC_LOGIC_EXPORT MMCImage
+struct MULTIMC_GUI_EXPORT MMCImage
 {
 	QIcon icon;
 	QString filename;
@@ -31,7 +31,7 @@ struct MULTIMC_LOGIC_EXPORT MMCImage
 	}
 };
 
-struct MULTIMC_LOGIC_EXPORT MMCIcon
+struct MULTIMC_GUI_EXPORT MMCIcon
 {
 	enum Type : unsigned
 	{
diff --git a/logic/AbstractCommonModel.cpp b/libraries/logic/AbstractCommonModel.cpp
similarity index 100%
rename from logic/AbstractCommonModel.cpp
rename to libraries/logic/AbstractCommonModel.cpp
diff --git a/logic/AbstractCommonModel.h b/libraries/logic/AbstractCommonModel.h
similarity index 100%
rename from logic/AbstractCommonModel.h
rename to libraries/logic/AbstractCommonModel.h
diff --git a/logic/BaseConfigObject.cpp b/libraries/logic/BaseConfigObject.cpp
similarity index 100%
rename from logic/BaseConfigObject.cpp
rename to libraries/logic/BaseConfigObject.cpp
diff --git a/logic/BaseConfigObject.h b/libraries/logic/BaseConfigObject.h
similarity index 100%
rename from logic/BaseConfigObject.h
rename to libraries/logic/BaseConfigObject.h
diff --git a/logic/BaseInstaller.cpp b/libraries/logic/BaseInstaller.cpp
similarity index 100%
rename from logic/BaseInstaller.cpp
rename to libraries/logic/BaseInstaller.cpp
diff --git a/logic/BaseInstaller.h b/libraries/logic/BaseInstaller.h
similarity index 100%
rename from logic/BaseInstaller.h
rename to libraries/logic/BaseInstaller.h
diff --git a/logic/BaseInstance.cpp b/libraries/logic/BaseInstance.cpp
similarity index 97%
rename from logic/BaseInstance.cpp
rename to libraries/logic/BaseInstance.cpp
index f8530c9d..ce55d5e4 100644
--- a/logic/BaseInstance.cpp
+++ b/libraries/logic/BaseInstance.cpp
@@ -23,7 +23,6 @@
 #include "settings/OverrideSetting.h"
 
 #include "minecraft/MinecraftVersionList.h"
-#include "icons/IconList.h"
 #include "FileSystem.h"
 #include "Commandline.h"
 
@@ -35,10 +34,6 @@ BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr s
 
 	m_settings->registerSetting("name", "Unnamed Instance");
 	m_settings->registerSetting("iconKey", "default");
-	if (ENV.hasIcons())
-	{
-		connect(ENV.icons().get(), SIGNAL(iconUpdated(QString)), SLOT(iconUpdated(QString)));
-	}
 	m_settings->registerSetting("notes", "");
 	m_settings->registerSetting("lastLaunchTime", 0);
 	m_settings->registerSetting("totalTimePlayed", 0);
diff --git a/logic/BaseInstance.h b/libraries/logic/BaseInstance.h
similarity index 100%
rename from logic/BaseInstance.h
rename to libraries/logic/BaseInstance.h
diff --git a/logic/BaseVersion.h b/libraries/logic/BaseVersion.h
similarity index 100%
rename from logic/BaseVersion.h
rename to libraries/logic/BaseVersion.h
diff --git a/logic/BaseVersionList.cpp b/libraries/logic/BaseVersionList.cpp
similarity index 100%
rename from logic/BaseVersionList.cpp
rename to libraries/logic/BaseVersionList.cpp
diff --git a/logic/BaseVersionList.h b/libraries/logic/BaseVersionList.h
similarity index 100%
rename from logic/BaseVersionList.h
rename to libraries/logic/BaseVersionList.h
diff --git a/logic/CMakeLists.txt b/libraries/logic/CMakeLists.txt
similarity index 95%
rename from logic/CMakeLists.txt
rename to libraries/logic/CMakeLists.txt
index cd8aa246..317627d5 100644
--- a/logic/CMakeLists.txt
+++ b/libraries/logic/CMakeLists.txt
@@ -35,8 +35,6 @@ set(LOGIC_SOURCES
 
 	FileSystem.h
 	FileSystem.cpp
-	DesktopServices.h
-	DesktopServices.cpp
 
 	Exception.h
 
@@ -171,8 +169,6 @@ set(LOGIC_SOURCES
 	minecraft/legacy/LegacyInstance.cpp
 	minecraft/legacy/LwjglVersionList.h
 	minecraft/legacy/LwjglVersionList.cpp
-	minecraft/SkinUtils.h
-	minecraft/SkinUtils.cpp
 	minecraft/GradleSpecifier.h
 	minecraft/MinecraftProfile.cpp
 	minecraft/MinecraftProfile.h
@@ -233,12 +229,6 @@ set(LOGIC_SOURCES
 	screenshots/ImgurAlbumCreation.h
 	screenshots/ImgurAlbumCreation.cpp
 
-	# Icons
-	icons/MMCIcon.h
-	icons/MMCIcon.cpp
-	icons/IconList.h
-	icons/IconList.cpp
-
 	# Tasks
 	tasks/Task.h
 	tasks/Task.cpp
@@ -346,8 +336,8 @@ set_target_properties(MultiMC_logic PROPERTIES CXX_VISIBILITY_PRESET hidden VISI
 generate_export_header(MultiMC_logic)
 
 # Link
-target_link_libraries(MultiMC_logic xz-embedded unpack200 iconfix LogicalGui ${QUAZIP_LIBRARIES} nbt++ ${ZLIB_LIBRARIES})
-qt5_use_modules(MultiMC_logic Core Xml Widgets Network Concurrent)
+target_link_libraries(MultiMC_logic xz-embedded unpack200 ${QUAZIP_LIBRARIES} nbt++ ${ZLIB_LIBRARIES})
+qt5_use_modules(MultiMC_logic Core Xml Network Concurrent)
 add_dependencies(MultiMC_logic QuaZIP)
 
 # Mark and export headers
diff --git a/logic/Commandline.cpp b/libraries/logic/Commandline.cpp
similarity index 100%
rename from logic/Commandline.cpp
rename to libraries/logic/Commandline.cpp
diff --git a/logic/Commandline.h b/libraries/logic/Commandline.h
similarity index 100%
rename from logic/Commandline.h
rename to libraries/logic/Commandline.h
diff --git a/logic/DefaultVariable.h b/libraries/logic/DefaultVariable.h
similarity index 100%
rename from logic/DefaultVariable.h
rename to libraries/logic/DefaultVariable.h
diff --git a/logic/Env.cpp b/libraries/logic/Env.cpp
similarity index 96%
rename from logic/Env.cpp
rename to libraries/logic/Env.cpp
index d66ec184..cc0c5981 100644
--- a/logic/Env.cpp
+++ b/libraries/logic/Env.cpp
@@ -1,6 +1,5 @@
 #include "Env.h"
 #include "net/HttpMetaCache.h"
-#include "icons/IconList.h"
 #include "BaseVersion.h"
 #include "BaseVersionList.h"
 #include <QDir>
@@ -24,7 +23,6 @@ void Env::destroy()
 {
 	m_metacache.reset();
 	m_qnam.reset();
-	m_icons.reset();
 	m_versionLists.clear();
 }
 
@@ -45,16 +43,6 @@ std::shared_ptr< QNetworkAccessManager > Env::qnam()
 	return m_qnam;
 }
 
-std::shared_ptr<IconList> Env::icons()
-{
-	Q_ASSERT(m_icons != nullptr);
-	return m_icons;
-}
-
-bool Env::hasIcons()
-{
-	return m_icons != nullptr;
-}
 /*
 class NullVersion : public BaseVersion
 {
diff --git a/logic/Env.h b/libraries/logic/Env.h
similarity index 93%
rename from logic/Env.h
rename to libraries/logic/Env.h
index 2b29acaa..4d8945d7 100644
--- a/logic/Env.h
+++ b/libraries/logic/Env.h
@@ -6,7 +6,6 @@
 
 #include "multimc_logic_export.h"
 
-class IconList;
 class QNetworkAccessManager;
 class HttpMetaCache;
 class BaseVersionList;
@@ -33,10 +32,6 @@ public:
 
 	std::shared_ptr<HttpMetaCache> metacache();
 
-	std::shared_ptr<IconList> icons();
-
-	bool hasIcons();
-
 	/// init the cache. FIXME: possible future hook point
 	void initHttpMetaCache();
 
@@ -59,7 +54,6 @@ public:
 protected:
 	std::shared_ptr<QNetworkAccessManager> m_qnam;
 	std::shared_ptr<HttpMetaCache> m_metacache;
-	std::shared_ptr<IconList> m_icons;
 	QMap<QString, std::shared_ptr<BaseVersionList>> m_versionLists;
 	std::shared_ptr<WonkoIndex> m_wonkoIndex;
 	QString m_wonkoRootUrl;
diff --git a/logic/Exception.h b/libraries/logic/Exception.h
similarity index 100%
rename from logic/Exception.h
rename to libraries/logic/Exception.h
diff --git a/logic/FileSystem.cpp b/libraries/logic/FileSystem.cpp
similarity index 100%
rename from logic/FileSystem.cpp
rename to libraries/logic/FileSystem.cpp
diff --git a/logic/FileSystem.h b/libraries/logic/FileSystem.h
similarity index 100%
rename from logic/FileSystem.h
rename to libraries/logic/FileSystem.h
diff --git a/logic/GZip.cpp b/libraries/logic/GZip.cpp
similarity index 100%
rename from logic/GZip.cpp
rename to libraries/logic/GZip.cpp
diff --git a/logic/GZip.h b/libraries/logic/GZip.h
similarity index 100%
rename from logic/GZip.h
rename to libraries/logic/GZip.h
diff --git a/logic/InstanceList.cpp b/libraries/logic/InstanceList.cpp
similarity index 99%
rename from logic/InstanceList.cpp
rename to libraries/logic/InstanceList.cpp
index 741b8611..783df660 100644
--- a/logic/InstanceList.cpp
+++ b/libraries/logic/InstanceList.cpp
@@ -27,7 +27,6 @@
 #include <QDebug>
 
 #include "InstanceList.h"
-#include "icons/IconList.h"
 #include "BaseInstance.h"
 
 //FIXME: this really doesn't belong *here*
@@ -98,8 +97,7 @@ QVariant InstanceList::data(const QModelIndex &index, int role) const
 	}
 	case Qt::DecorationRole:
 	{
-		QString key = pdata->iconKey();
-		return ENV.icons()->getIcon(key);
+		return pdata->iconKey();
 	}
 	// HACK: see GroupView.h in gui!
 	case GroupRole:
diff --git a/logic/InstanceList.h b/libraries/logic/InstanceList.h
similarity index 100%
rename from logic/InstanceList.h
rename to libraries/logic/InstanceList.h
diff --git a/logic/Json.cpp b/libraries/logic/Json.cpp
similarity index 100%
rename from logic/Json.cpp
rename to libraries/logic/Json.cpp
diff --git a/logic/Json.h b/libraries/logic/Json.h
similarity index 100%
rename from logic/Json.h
rename to libraries/logic/Json.h
diff --git a/logic/MMCStrings.cpp b/libraries/logic/MMCStrings.cpp
similarity index 100%
rename from logic/MMCStrings.cpp
rename to libraries/logic/MMCStrings.cpp
diff --git a/logic/MMCStrings.h b/libraries/logic/MMCStrings.h
similarity index 100%
rename from logic/MMCStrings.h
rename to libraries/logic/MMCStrings.h
diff --git a/logic/MMCZip.cpp b/libraries/logic/MMCZip.cpp
similarity index 100%
rename from logic/MMCZip.cpp
rename to libraries/logic/MMCZip.cpp
diff --git a/logic/MMCZip.h b/libraries/logic/MMCZip.h
similarity index 100%
rename from logic/MMCZip.h
rename to libraries/logic/MMCZip.h
diff --git a/logic/NullInstance.h b/libraries/logic/NullInstance.h
similarity index 100%
rename from logic/NullInstance.h
rename to libraries/logic/NullInstance.h
diff --git a/logic/QObjectPtr.h b/libraries/logic/QObjectPtr.h
similarity index 100%
rename from logic/QObjectPtr.h
rename to libraries/logic/QObjectPtr.h
diff --git a/logic/RWStorage.h b/libraries/logic/RWStorage.h
similarity index 100%
rename from logic/RWStorage.h
rename to libraries/logic/RWStorage.h
diff --git a/logic/RecursiveFileSystemWatcher.cpp b/libraries/logic/RecursiveFileSystemWatcher.cpp
similarity index 100%
rename from logic/RecursiveFileSystemWatcher.cpp
rename to libraries/logic/RecursiveFileSystemWatcher.cpp
diff --git a/logic/RecursiveFileSystemWatcher.h b/libraries/logic/RecursiveFileSystemWatcher.h
similarity index 100%
rename from logic/RecursiveFileSystemWatcher.h
rename to libraries/logic/RecursiveFileSystemWatcher.h
diff --git a/logic/SeparatorPrefixTree.h b/libraries/logic/SeparatorPrefixTree.h
similarity index 100%
rename from logic/SeparatorPrefixTree.h
rename to libraries/logic/SeparatorPrefixTree.h
diff --git a/logic/TypeMagic.h b/libraries/logic/TypeMagic.h
similarity index 100%
rename from logic/TypeMagic.h
rename to libraries/logic/TypeMagic.h
diff --git a/logic/Version.cpp b/libraries/logic/Version.cpp
similarity index 100%
rename from logic/Version.cpp
rename to libraries/logic/Version.cpp
diff --git a/logic/Version.h b/libraries/logic/Version.h
similarity index 100%
rename from logic/Version.h
rename to libraries/logic/Version.h
diff --git a/logic/java/JavaChecker.cpp b/libraries/logic/java/JavaChecker.cpp
similarity index 100%
rename from logic/java/JavaChecker.cpp
rename to libraries/logic/java/JavaChecker.cpp
diff --git a/logic/java/JavaChecker.h b/libraries/logic/java/JavaChecker.h
similarity index 100%
rename from logic/java/JavaChecker.h
rename to libraries/logic/java/JavaChecker.h
diff --git a/logic/java/JavaCheckerJob.cpp b/libraries/logic/java/JavaCheckerJob.cpp
similarity index 100%
rename from logic/java/JavaCheckerJob.cpp
rename to libraries/logic/java/JavaCheckerJob.cpp
diff --git a/logic/java/JavaCheckerJob.h b/libraries/logic/java/JavaCheckerJob.h
similarity index 99%
rename from logic/java/JavaCheckerJob.h
rename to libraries/logic/java/JavaCheckerJob.h
index d031c435..aca0d02e 100644
--- a/logic/java/JavaCheckerJob.h
+++ b/libraries/logic/java/JavaCheckerJob.h
@@ -16,7 +16,6 @@
 #pragma once
 
 #include <QtNetwork>
-#include <QLabel>
 #include "JavaChecker.h"
 #include "tasks/Task.h"
 
diff --git a/logic/java/JavaInstall.cpp b/libraries/logic/java/JavaInstall.cpp
similarity index 100%
rename from logic/java/JavaInstall.cpp
rename to libraries/logic/java/JavaInstall.cpp
diff --git a/logic/java/JavaInstall.h b/libraries/logic/java/JavaInstall.h
similarity index 100%
rename from logic/java/JavaInstall.h
rename to libraries/logic/java/JavaInstall.h
diff --git a/logic/java/JavaInstallList.cpp b/libraries/logic/java/JavaInstallList.cpp
similarity index 100%
rename from logic/java/JavaInstallList.cpp
rename to libraries/logic/java/JavaInstallList.cpp
diff --git a/logic/java/JavaInstallList.h b/libraries/logic/java/JavaInstallList.h
similarity index 100%
rename from logic/java/JavaInstallList.h
rename to libraries/logic/java/JavaInstallList.h
diff --git a/logic/java/JavaUtils.cpp b/libraries/logic/java/JavaUtils.cpp
similarity index 100%
rename from logic/java/JavaUtils.cpp
rename to libraries/logic/java/JavaUtils.cpp
diff --git a/logic/java/JavaUtils.h b/libraries/logic/java/JavaUtils.h
similarity index 98%
rename from logic/java/JavaUtils.h
rename to libraries/logic/java/JavaUtils.h
index b671d0a5..3fb88341 100644
--- a/logic/java/JavaUtils.h
+++ b/libraries/logic/java/JavaUtils.h
@@ -16,7 +16,6 @@
 #pragma once
 
 #include <QStringList>
-#include <QWidget>
 
 #include "JavaCheckerJob.h"
 #include "JavaChecker.h"
diff --git a/logic/java/JavaVersion.cpp b/libraries/logic/java/JavaVersion.cpp
similarity index 100%
rename from logic/java/JavaVersion.cpp
rename to libraries/logic/java/JavaVersion.cpp
diff --git a/logic/java/JavaVersion.h b/libraries/logic/java/JavaVersion.h
similarity index 100%
rename from logic/java/JavaVersion.h
rename to libraries/logic/java/JavaVersion.h
diff --git a/logic/launch/LaunchStep.cpp b/libraries/logic/launch/LaunchStep.cpp
similarity index 100%
rename from logic/launch/LaunchStep.cpp
rename to libraries/logic/launch/LaunchStep.cpp
diff --git a/logic/launch/LaunchStep.h b/libraries/logic/launch/LaunchStep.h
similarity index 100%
rename from logic/launch/LaunchStep.h
rename to libraries/logic/launch/LaunchStep.h
diff --git a/logic/launch/LaunchTask.cpp b/libraries/logic/launch/LaunchTask.cpp
similarity index 100%
rename from logic/launch/LaunchTask.cpp
rename to libraries/logic/launch/LaunchTask.cpp
diff --git a/logic/launch/LaunchTask.h b/libraries/logic/launch/LaunchTask.h
similarity index 100%
rename from logic/launch/LaunchTask.h
rename to libraries/logic/launch/LaunchTask.h
diff --git a/logic/launch/LoggedProcess.cpp b/libraries/logic/launch/LoggedProcess.cpp
similarity index 100%
rename from logic/launch/LoggedProcess.cpp
rename to libraries/logic/launch/LoggedProcess.cpp
diff --git a/logic/launch/LoggedProcess.h b/libraries/logic/launch/LoggedProcess.h
similarity index 100%
rename from logic/launch/LoggedProcess.h
rename to libraries/logic/launch/LoggedProcess.h
diff --git a/logic/launch/MessageLevel.cpp b/libraries/logic/launch/MessageLevel.cpp
similarity index 100%
rename from logic/launch/MessageLevel.cpp
rename to libraries/logic/launch/MessageLevel.cpp
diff --git a/logic/launch/MessageLevel.h b/libraries/logic/launch/MessageLevel.h
similarity index 100%
rename from logic/launch/MessageLevel.h
rename to libraries/logic/launch/MessageLevel.h
diff --git a/logic/launch/steps/CheckJava.cpp b/libraries/logic/launch/steps/CheckJava.cpp
similarity index 100%
rename from logic/launch/steps/CheckJava.cpp
rename to libraries/logic/launch/steps/CheckJava.cpp
diff --git a/logic/launch/steps/CheckJava.h b/libraries/logic/launch/steps/CheckJava.h
similarity index 100%
rename from logic/launch/steps/CheckJava.h
rename to libraries/logic/launch/steps/CheckJava.h
diff --git a/logic/launch/steps/LaunchMinecraft.cpp b/libraries/logic/launch/steps/LaunchMinecraft.cpp
similarity index 100%
rename from logic/launch/steps/LaunchMinecraft.cpp
rename to libraries/logic/launch/steps/LaunchMinecraft.cpp
diff --git a/logic/launch/steps/LaunchMinecraft.h b/libraries/logic/launch/steps/LaunchMinecraft.h
similarity index 100%
rename from logic/launch/steps/LaunchMinecraft.h
rename to libraries/logic/launch/steps/LaunchMinecraft.h
diff --git a/logic/launch/steps/ModMinecraftJar.cpp b/libraries/logic/launch/steps/ModMinecraftJar.cpp
similarity index 100%
rename from logic/launch/steps/ModMinecraftJar.cpp
rename to libraries/logic/launch/steps/ModMinecraftJar.cpp
diff --git a/logic/launch/steps/ModMinecraftJar.h b/libraries/logic/launch/steps/ModMinecraftJar.h
similarity index 100%
rename from logic/launch/steps/ModMinecraftJar.h
rename to libraries/logic/launch/steps/ModMinecraftJar.h
diff --git a/logic/launch/steps/PostLaunchCommand.cpp b/libraries/logic/launch/steps/PostLaunchCommand.cpp
similarity index 100%
rename from logic/launch/steps/PostLaunchCommand.cpp
rename to libraries/logic/launch/steps/PostLaunchCommand.cpp
diff --git a/logic/launch/steps/PostLaunchCommand.h b/libraries/logic/launch/steps/PostLaunchCommand.h
similarity index 100%
rename from logic/launch/steps/PostLaunchCommand.h
rename to libraries/logic/launch/steps/PostLaunchCommand.h
diff --git a/logic/launch/steps/PreLaunchCommand.cpp b/libraries/logic/launch/steps/PreLaunchCommand.cpp
similarity index 100%
rename from logic/launch/steps/PreLaunchCommand.cpp
rename to libraries/logic/launch/steps/PreLaunchCommand.cpp
diff --git a/logic/launch/steps/PreLaunchCommand.h b/libraries/logic/launch/steps/PreLaunchCommand.h
similarity index 100%
rename from logic/launch/steps/PreLaunchCommand.h
rename to libraries/logic/launch/steps/PreLaunchCommand.h
diff --git a/logic/launch/steps/TextPrint.cpp b/libraries/logic/launch/steps/TextPrint.cpp
similarity index 100%
rename from logic/launch/steps/TextPrint.cpp
rename to libraries/logic/launch/steps/TextPrint.cpp
diff --git a/logic/launch/steps/TextPrint.h b/libraries/logic/launch/steps/TextPrint.h
similarity index 100%
rename from logic/launch/steps/TextPrint.h
rename to libraries/logic/launch/steps/TextPrint.h
diff --git a/logic/launch/steps/Update.cpp b/libraries/logic/launch/steps/Update.cpp
similarity index 100%
rename from logic/launch/steps/Update.cpp
rename to libraries/logic/launch/steps/Update.cpp
diff --git a/logic/launch/steps/Update.h b/libraries/logic/launch/steps/Update.h
similarity index 100%
rename from logic/launch/steps/Update.h
rename to libraries/logic/launch/steps/Update.h
diff --git a/logic/minecraft/AssetsUtils.cpp b/libraries/logic/minecraft/AssetsUtils.cpp
similarity index 100%
rename from logic/minecraft/AssetsUtils.cpp
rename to libraries/logic/minecraft/AssetsUtils.cpp
diff --git a/logic/minecraft/AssetsUtils.h b/libraries/logic/minecraft/AssetsUtils.h
similarity index 100%
rename from logic/minecraft/AssetsUtils.h
rename to libraries/logic/minecraft/AssetsUtils.h
diff --git a/logic/minecraft/GradleSpecifier.h b/libraries/logic/minecraft/GradleSpecifier.h
similarity index 100%
rename from logic/minecraft/GradleSpecifier.h
rename to libraries/logic/minecraft/GradleSpecifier.h
diff --git a/logic/minecraft/JarMod.h b/libraries/logic/minecraft/JarMod.h
similarity index 100%
rename from logic/minecraft/JarMod.h
rename to libraries/logic/minecraft/JarMod.h
diff --git a/logic/minecraft/Library.cpp b/libraries/logic/minecraft/Library.cpp
similarity index 100%
rename from logic/minecraft/Library.cpp
rename to libraries/logic/minecraft/Library.cpp
diff --git a/logic/minecraft/Library.h b/libraries/logic/minecraft/Library.h
similarity index 100%
rename from logic/minecraft/Library.h
rename to libraries/logic/minecraft/Library.h
diff --git a/logic/minecraft/MinecraftInstance.cpp b/libraries/logic/minecraft/MinecraftInstance.cpp
similarity index 100%
rename from logic/minecraft/MinecraftInstance.cpp
rename to libraries/logic/minecraft/MinecraftInstance.cpp
diff --git a/logic/minecraft/MinecraftInstance.h b/libraries/logic/minecraft/MinecraftInstance.h
similarity index 100%
rename from logic/minecraft/MinecraftInstance.h
rename to libraries/logic/minecraft/MinecraftInstance.h
diff --git a/logic/minecraft/MinecraftProfile.cpp b/libraries/logic/minecraft/MinecraftProfile.cpp
similarity index 100%
rename from logic/minecraft/MinecraftProfile.cpp
rename to libraries/logic/minecraft/MinecraftProfile.cpp
diff --git a/logic/minecraft/MinecraftProfile.h b/libraries/logic/minecraft/MinecraftProfile.h
similarity index 100%
rename from logic/minecraft/MinecraftProfile.h
rename to libraries/logic/minecraft/MinecraftProfile.h
diff --git a/logic/minecraft/MinecraftVersion.cpp b/libraries/logic/minecraft/MinecraftVersion.cpp
similarity index 100%
rename from logic/minecraft/MinecraftVersion.cpp
rename to libraries/logic/minecraft/MinecraftVersion.cpp
diff --git a/logic/minecraft/MinecraftVersion.h b/libraries/logic/minecraft/MinecraftVersion.h
similarity index 100%
rename from logic/minecraft/MinecraftVersion.h
rename to libraries/logic/minecraft/MinecraftVersion.h
diff --git a/logic/minecraft/MinecraftVersionList.cpp b/libraries/logic/minecraft/MinecraftVersionList.cpp
similarity index 100%
rename from logic/minecraft/MinecraftVersionList.cpp
rename to libraries/logic/minecraft/MinecraftVersionList.cpp
diff --git a/logic/minecraft/MinecraftVersionList.h b/libraries/logic/minecraft/MinecraftVersionList.h
similarity index 100%
rename from logic/minecraft/MinecraftVersionList.h
rename to libraries/logic/minecraft/MinecraftVersionList.h
diff --git a/logic/minecraft/Mod.cpp b/libraries/logic/minecraft/Mod.cpp
similarity index 100%
rename from logic/minecraft/Mod.cpp
rename to libraries/logic/minecraft/Mod.cpp
diff --git a/logic/minecraft/Mod.h b/libraries/logic/minecraft/Mod.h
similarity index 100%
rename from logic/minecraft/Mod.h
rename to libraries/logic/minecraft/Mod.h
diff --git a/logic/minecraft/ModList.cpp b/libraries/logic/minecraft/ModList.cpp
similarity index 100%
rename from logic/minecraft/ModList.cpp
rename to libraries/logic/minecraft/ModList.cpp
diff --git a/logic/minecraft/ModList.h b/libraries/logic/minecraft/ModList.h
similarity index 100%
rename from logic/minecraft/ModList.h
rename to libraries/logic/minecraft/ModList.h
diff --git a/logic/minecraft/MojangDownloadInfo.h b/libraries/logic/minecraft/MojangDownloadInfo.h
similarity index 100%
rename from logic/minecraft/MojangDownloadInfo.h
rename to libraries/logic/minecraft/MojangDownloadInfo.h
diff --git a/logic/minecraft/MojangVersionFormat.cpp b/libraries/logic/minecraft/MojangVersionFormat.cpp
similarity index 100%
rename from logic/minecraft/MojangVersionFormat.cpp
rename to libraries/logic/minecraft/MojangVersionFormat.cpp
diff --git a/logic/minecraft/MojangVersionFormat.h b/libraries/logic/minecraft/MojangVersionFormat.h
similarity index 100%
rename from logic/minecraft/MojangVersionFormat.h
rename to libraries/logic/minecraft/MojangVersionFormat.h
diff --git a/logic/minecraft/OpSys.cpp b/libraries/logic/minecraft/OpSys.cpp
similarity index 100%
rename from logic/minecraft/OpSys.cpp
rename to libraries/logic/minecraft/OpSys.cpp
diff --git a/logic/minecraft/OpSys.h b/libraries/logic/minecraft/OpSys.h
similarity index 100%
rename from logic/minecraft/OpSys.h
rename to libraries/logic/minecraft/OpSys.h
diff --git a/logic/minecraft/ParseUtils.cpp b/libraries/logic/minecraft/ParseUtils.cpp
similarity index 100%
rename from logic/minecraft/ParseUtils.cpp
rename to libraries/logic/minecraft/ParseUtils.cpp
diff --git a/logic/minecraft/ParseUtils.h b/libraries/logic/minecraft/ParseUtils.h
similarity index 100%
rename from logic/minecraft/ParseUtils.h
rename to libraries/logic/minecraft/ParseUtils.h
diff --git a/logic/minecraft/ProfilePatch.h b/libraries/logic/minecraft/ProfilePatch.h
similarity index 100%
rename from logic/minecraft/ProfilePatch.h
rename to libraries/logic/minecraft/ProfilePatch.h
diff --git a/logic/minecraft/ProfileStrategy.h b/libraries/logic/minecraft/ProfileStrategy.h
similarity index 100%
rename from logic/minecraft/ProfileStrategy.h
rename to libraries/logic/minecraft/ProfileStrategy.h
diff --git a/logic/minecraft/ProfileUtils.cpp b/libraries/logic/minecraft/ProfileUtils.cpp
similarity index 100%
rename from logic/minecraft/ProfileUtils.cpp
rename to libraries/logic/minecraft/ProfileUtils.cpp
diff --git a/logic/minecraft/ProfileUtils.h b/libraries/logic/minecraft/ProfileUtils.h
similarity index 100%
rename from logic/minecraft/ProfileUtils.h
rename to libraries/logic/minecraft/ProfileUtils.h
diff --git a/logic/minecraft/Rule.cpp b/libraries/logic/minecraft/Rule.cpp
similarity index 100%
rename from logic/minecraft/Rule.cpp
rename to libraries/logic/minecraft/Rule.cpp
diff --git a/logic/minecraft/Rule.h b/libraries/logic/minecraft/Rule.h
similarity index 100%
rename from logic/minecraft/Rule.h
rename to libraries/logic/minecraft/Rule.h
diff --git a/logic/minecraft/VersionBuildError.h b/libraries/logic/minecraft/VersionBuildError.h
similarity index 100%
rename from logic/minecraft/VersionBuildError.h
rename to libraries/logic/minecraft/VersionBuildError.h
diff --git a/logic/minecraft/VersionFile.cpp b/libraries/logic/minecraft/VersionFile.cpp
similarity index 100%
rename from logic/minecraft/VersionFile.cpp
rename to libraries/logic/minecraft/VersionFile.cpp
diff --git a/logic/minecraft/VersionFile.h b/libraries/logic/minecraft/VersionFile.h
similarity index 100%
rename from logic/minecraft/VersionFile.h
rename to libraries/logic/minecraft/VersionFile.h
diff --git a/logic/minecraft/VersionFilterData.cpp b/libraries/logic/minecraft/VersionFilterData.cpp
similarity index 100%
rename from logic/minecraft/VersionFilterData.cpp
rename to libraries/logic/minecraft/VersionFilterData.cpp
diff --git a/logic/minecraft/VersionFilterData.h b/libraries/logic/minecraft/VersionFilterData.h
similarity index 100%
rename from logic/minecraft/VersionFilterData.h
rename to libraries/logic/minecraft/VersionFilterData.h
diff --git a/logic/minecraft/World.cpp b/libraries/logic/minecraft/World.cpp
similarity index 100%
rename from logic/minecraft/World.cpp
rename to libraries/logic/minecraft/World.cpp
diff --git a/logic/minecraft/World.h b/libraries/logic/minecraft/World.h
similarity index 100%
rename from logic/minecraft/World.h
rename to libraries/logic/minecraft/World.h
diff --git a/logic/minecraft/WorldList.cpp b/libraries/logic/minecraft/WorldList.cpp
similarity index 100%
rename from logic/minecraft/WorldList.cpp
rename to libraries/logic/minecraft/WorldList.cpp
diff --git a/logic/minecraft/WorldList.h b/libraries/logic/minecraft/WorldList.h
similarity index 100%
rename from logic/minecraft/WorldList.h
rename to libraries/logic/minecraft/WorldList.h
diff --git a/logic/minecraft/auth/AuthSession.cpp b/libraries/logic/minecraft/auth/AuthSession.cpp
similarity index 100%
rename from logic/minecraft/auth/AuthSession.cpp
rename to libraries/logic/minecraft/auth/AuthSession.cpp
diff --git a/logic/minecraft/auth/AuthSession.h b/libraries/logic/minecraft/auth/AuthSession.h
similarity index 100%
rename from logic/minecraft/auth/AuthSession.h
rename to libraries/logic/minecraft/auth/AuthSession.h
diff --git a/logic/minecraft/auth/MojangAccount.cpp b/libraries/logic/minecraft/auth/MojangAccount.cpp
similarity index 100%
rename from logic/minecraft/auth/MojangAccount.cpp
rename to libraries/logic/minecraft/auth/MojangAccount.cpp
diff --git a/logic/minecraft/auth/MojangAccount.h b/libraries/logic/minecraft/auth/MojangAccount.h
similarity index 100%
rename from logic/minecraft/auth/MojangAccount.h
rename to libraries/logic/minecraft/auth/MojangAccount.h
diff --git a/logic/minecraft/auth/MojangAccountList.cpp b/libraries/logic/minecraft/auth/MojangAccountList.cpp
similarity index 100%
rename from logic/minecraft/auth/MojangAccountList.cpp
rename to libraries/logic/minecraft/auth/MojangAccountList.cpp
diff --git a/logic/minecraft/auth/MojangAccountList.h b/libraries/logic/minecraft/auth/MojangAccountList.h
similarity index 100%
rename from logic/minecraft/auth/MojangAccountList.h
rename to libraries/logic/minecraft/auth/MojangAccountList.h
diff --git a/logic/minecraft/auth/YggdrasilTask.cpp b/libraries/logic/minecraft/auth/YggdrasilTask.cpp
similarity index 100%
rename from logic/minecraft/auth/YggdrasilTask.cpp
rename to libraries/logic/minecraft/auth/YggdrasilTask.cpp
diff --git a/logic/minecraft/auth/YggdrasilTask.h b/libraries/logic/minecraft/auth/YggdrasilTask.h
similarity index 100%
rename from logic/minecraft/auth/YggdrasilTask.h
rename to libraries/logic/minecraft/auth/YggdrasilTask.h
diff --git a/logic/minecraft/auth/flows/AuthenticateTask.cpp b/libraries/logic/minecraft/auth/flows/AuthenticateTask.cpp
similarity index 100%
rename from logic/minecraft/auth/flows/AuthenticateTask.cpp
rename to libraries/logic/minecraft/auth/flows/AuthenticateTask.cpp
diff --git a/logic/minecraft/auth/flows/AuthenticateTask.h b/libraries/logic/minecraft/auth/flows/AuthenticateTask.h
similarity index 100%
rename from logic/minecraft/auth/flows/AuthenticateTask.h
rename to libraries/logic/minecraft/auth/flows/AuthenticateTask.h
diff --git a/logic/minecraft/auth/flows/RefreshTask.cpp b/libraries/logic/minecraft/auth/flows/RefreshTask.cpp
similarity index 100%
rename from logic/minecraft/auth/flows/RefreshTask.cpp
rename to libraries/logic/minecraft/auth/flows/RefreshTask.cpp
diff --git a/logic/minecraft/auth/flows/RefreshTask.h b/libraries/logic/minecraft/auth/flows/RefreshTask.h
similarity index 100%
rename from logic/minecraft/auth/flows/RefreshTask.h
rename to libraries/logic/minecraft/auth/flows/RefreshTask.h
diff --git a/logic/minecraft/auth/flows/ValidateTask.cpp b/libraries/logic/minecraft/auth/flows/ValidateTask.cpp
similarity index 100%
rename from logic/minecraft/auth/flows/ValidateTask.cpp
rename to libraries/logic/minecraft/auth/flows/ValidateTask.cpp
diff --git a/logic/minecraft/auth/flows/ValidateTask.h b/libraries/logic/minecraft/auth/flows/ValidateTask.h
similarity index 100%
rename from logic/minecraft/auth/flows/ValidateTask.h
rename to libraries/logic/minecraft/auth/flows/ValidateTask.h
diff --git a/logic/minecraft/forge/ForgeInstaller.cpp b/libraries/logic/minecraft/forge/ForgeInstaller.cpp
similarity index 100%
rename from logic/minecraft/forge/ForgeInstaller.cpp
rename to libraries/logic/minecraft/forge/ForgeInstaller.cpp
diff --git a/logic/minecraft/forge/ForgeInstaller.h b/libraries/logic/minecraft/forge/ForgeInstaller.h
similarity index 100%
rename from logic/minecraft/forge/ForgeInstaller.h
rename to libraries/logic/minecraft/forge/ForgeInstaller.h
diff --git a/logic/minecraft/forge/ForgeVersion.cpp b/libraries/logic/minecraft/forge/ForgeVersion.cpp
similarity index 100%
rename from logic/minecraft/forge/ForgeVersion.cpp
rename to libraries/logic/minecraft/forge/ForgeVersion.cpp
diff --git a/logic/minecraft/forge/ForgeVersion.h b/libraries/logic/minecraft/forge/ForgeVersion.h
similarity index 100%
rename from logic/minecraft/forge/ForgeVersion.h
rename to libraries/logic/minecraft/forge/ForgeVersion.h
diff --git a/logic/minecraft/forge/ForgeVersionList.cpp b/libraries/logic/minecraft/forge/ForgeVersionList.cpp
similarity index 100%
rename from logic/minecraft/forge/ForgeVersionList.cpp
rename to libraries/logic/minecraft/forge/ForgeVersionList.cpp
diff --git a/logic/minecraft/forge/ForgeVersionList.h b/libraries/logic/minecraft/forge/ForgeVersionList.h
similarity index 100%
rename from logic/minecraft/forge/ForgeVersionList.h
rename to libraries/logic/minecraft/forge/ForgeVersionList.h
diff --git a/logic/minecraft/forge/ForgeXzDownload.cpp b/libraries/logic/minecraft/forge/ForgeXzDownload.cpp
similarity index 100%
rename from logic/minecraft/forge/ForgeXzDownload.cpp
rename to libraries/logic/minecraft/forge/ForgeXzDownload.cpp
diff --git a/logic/minecraft/forge/ForgeXzDownload.h b/libraries/logic/minecraft/forge/ForgeXzDownload.h
similarity index 100%
rename from logic/minecraft/forge/ForgeXzDownload.h
rename to libraries/logic/minecraft/forge/ForgeXzDownload.h
diff --git a/logic/minecraft/forge/LegacyForge.cpp b/libraries/logic/minecraft/forge/LegacyForge.cpp
similarity index 100%
rename from logic/minecraft/forge/LegacyForge.cpp
rename to libraries/logic/minecraft/forge/LegacyForge.cpp
diff --git a/logic/minecraft/forge/LegacyForge.h b/libraries/logic/minecraft/forge/LegacyForge.h
similarity index 100%
rename from logic/minecraft/forge/LegacyForge.h
rename to libraries/logic/minecraft/forge/LegacyForge.h
diff --git a/logic/minecraft/ftb/FTBPlugin.cpp b/libraries/logic/minecraft/ftb/FTBPlugin.cpp
similarity index 98%
rename from logic/minecraft/ftb/FTBPlugin.cpp
rename to libraries/logic/minecraft/ftb/FTBPlugin.cpp
index 8a08f916..a142c106 100644
--- a/logic/minecraft/ftb/FTBPlugin.cpp
+++ b/libraries/logic/minecraft/ftb/FTBPlugin.cpp
@@ -1,9 +1,9 @@
 #include "FTBPlugin.h"
+#include <Env.h>
 #include "FTBVersion.h"
 #include "LegacyFTBInstance.h"
 #include "OneSixFTBInstance.h"
 #include <BaseInstance.h>
-#include <icons/IconList.h>
 #include <InstanceList.h>
 #include <minecraft/MinecraftVersionList.h>
 #include <settings/INISettingsObject.h>
@@ -257,7 +257,7 @@ void FTBPlugin::loadInstances(SettingsObjectPtr globalSettings, QMap<QString, QS
 	{
 		qDebug() << "Loading FTB instance from " << record.instanceDir;
 		QString iconKey = record.iconKey;
-		ENV.icons()->addIcon(iconKey, iconKey, FS::PathCombine(record.templateDir, record.logo), MMCIcon::Transient);
+		// MMC->icons()->addIcon(iconKey, iconKey, FS::PathCombine(record.templateDir, record.logo), MMCIcon::Transient);
 		auto settingsFilePath = FS::PathCombine(record.instanceDir, "instance.cfg");
 		qDebug() << "ICON get!";
 
diff --git a/logic/minecraft/ftb/FTBPlugin.h b/libraries/logic/minecraft/ftb/FTBPlugin.h
similarity index 100%
rename from logic/minecraft/ftb/FTBPlugin.h
rename to libraries/logic/minecraft/ftb/FTBPlugin.h
diff --git a/logic/minecraft/ftb/FTBProfileStrategy.cpp b/libraries/logic/minecraft/ftb/FTBProfileStrategy.cpp
similarity index 100%
rename from logic/minecraft/ftb/FTBProfileStrategy.cpp
rename to libraries/logic/minecraft/ftb/FTBProfileStrategy.cpp
diff --git a/logic/minecraft/ftb/FTBProfileStrategy.h b/libraries/logic/minecraft/ftb/FTBProfileStrategy.h
similarity index 100%
rename from logic/minecraft/ftb/FTBProfileStrategy.h
rename to libraries/logic/minecraft/ftb/FTBProfileStrategy.h
diff --git a/logic/minecraft/ftb/FTBVersion.h b/libraries/logic/minecraft/ftb/FTBVersion.h
similarity index 100%
rename from logic/minecraft/ftb/FTBVersion.h
rename to libraries/logic/minecraft/ftb/FTBVersion.h
diff --git a/logic/minecraft/ftb/LegacyFTBInstance.cpp b/libraries/logic/minecraft/ftb/LegacyFTBInstance.cpp
similarity index 100%
rename from logic/minecraft/ftb/LegacyFTBInstance.cpp
rename to libraries/logic/minecraft/ftb/LegacyFTBInstance.cpp
diff --git a/logic/minecraft/ftb/LegacyFTBInstance.h b/libraries/logic/minecraft/ftb/LegacyFTBInstance.h
similarity index 100%
rename from logic/minecraft/ftb/LegacyFTBInstance.h
rename to libraries/logic/minecraft/ftb/LegacyFTBInstance.h
diff --git a/logic/minecraft/ftb/OneSixFTBInstance.cpp b/libraries/logic/minecraft/ftb/OneSixFTBInstance.cpp
similarity index 100%
rename from logic/minecraft/ftb/OneSixFTBInstance.cpp
rename to libraries/logic/minecraft/ftb/OneSixFTBInstance.cpp
diff --git a/logic/minecraft/ftb/OneSixFTBInstance.h b/libraries/logic/minecraft/ftb/OneSixFTBInstance.h
similarity index 100%
rename from logic/minecraft/ftb/OneSixFTBInstance.h
rename to libraries/logic/minecraft/ftb/OneSixFTBInstance.h
diff --git a/logic/minecraft/legacy/LegacyInstance.cpp b/libraries/logic/minecraft/legacy/LegacyInstance.cpp
similarity index 98%
rename from logic/minecraft/legacy/LegacyInstance.cpp
rename to libraries/logic/minecraft/legacy/LegacyInstance.cpp
index 6650598d..f8264f20 100644
--- a/logic/minecraft/legacy/LegacyInstance.cpp
+++ b/libraries/logic/minecraft/legacy/LegacyInstance.cpp
@@ -15,13 +15,11 @@
 
 #include <QFileInfo>
 #include <QDir>
-#include <QImage>
 #include <settings/Setting.h>
 
 #include "LegacyInstance.h"
 
 #include "minecraft/legacy/LegacyUpdate.h"
-#include "icons/IconList.h"
 #include "launch/LaunchTask.h"
 #include <launch/steps/LaunchMinecraft.h>
 #include <launch/steps/PostLaunchCommand.h>
@@ -105,10 +103,6 @@ std::shared_ptr<Task> LegacyInstance::createUpdateTask()
 
 std::shared_ptr<LaunchTask> LegacyInstance::createLaunchTask(AuthSessionPtr session)
 {
-	QIcon icon = ENV.icons()->getIcon(iconKey());
-	auto pixmap = icon.pixmap(128, 128);
-	pixmap.save(FS::PathCombine(minecraftRoot(), "icon.png"), "PNG");
-
 	auto process = LaunchTask::create(std::dynamic_pointer_cast<MinecraftInstance>(getSharedPtr()));
 	auto pptr = process.get();
 
diff --git a/logic/minecraft/legacy/LegacyInstance.h b/libraries/logic/minecraft/legacy/LegacyInstance.h
similarity index 100%
rename from logic/minecraft/legacy/LegacyInstance.h
rename to libraries/logic/minecraft/legacy/LegacyInstance.h
diff --git a/logic/minecraft/legacy/LegacyUpdate.cpp b/libraries/logic/minecraft/legacy/LegacyUpdate.cpp
similarity index 100%
rename from logic/minecraft/legacy/LegacyUpdate.cpp
rename to libraries/logic/minecraft/legacy/LegacyUpdate.cpp
diff --git a/logic/minecraft/legacy/LegacyUpdate.h b/libraries/logic/minecraft/legacy/LegacyUpdate.h
similarity index 100%
rename from logic/minecraft/legacy/LegacyUpdate.h
rename to libraries/logic/minecraft/legacy/LegacyUpdate.h
diff --git a/logic/minecraft/legacy/LwjglVersionList.cpp b/libraries/logic/minecraft/legacy/LwjglVersionList.cpp
similarity index 100%
rename from logic/minecraft/legacy/LwjglVersionList.cpp
rename to libraries/logic/minecraft/legacy/LwjglVersionList.cpp
diff --git a/logic/minecraft/legacy/LwjglVersionList.h b/libraries/logic/minecraft/legacy/LwjglVersionList.h
similarity index 100%
rename from logic/minecraft/legacy/LwjglVersionList.h
rename to libraries/logic/minecraft/legacy/LwjglVersionList.h
diff --git a/logic/minecraft/liteloader/LiteLoaderInstaller.cpp b/libraries/logic/minecraft/liteloader/LiteLoaderInstaller.cpp
similarity index 100%
rename from logic/minecraft/liteloader/LiteLoaderInstaller.cpp
rename to libraries/logic/minecraft/liteloader/LiteLoaderInstaller.cpp
diff --git a/logic/minecraft/liteloader/LiteLoaderInstaller.h b/libraries/logic/minecraft/liteloader/LiteLoaderInstaller.h
similarity index 100%
rename from logic/minecraft/liteloader/LiteLoaderInstaller.h
rename to libraries/logic/minecraft/liteloader/LiteLoaderInstaller.h
diff --git a/logic/minecraft/liteloader/LiteLoaderVersionList.cpp b/libraries/logic/minecraft/liteloader/LiteLoaderVersionList.cpp
similarity index 100%
rename from logic/minecraft/liteloader/LiteLoaderVersionList.cpp
rename to libraries/logic/minecraft/liteloader/LiteLoaderVersionList.cpp
diff --git a/logic/minecraft/liteloader/LiteLoaderVersionList.h b/libraries/logic/minecraft/liteloader/LiteLoaderVersionList.h
similarity index 100%
rename from logic/minecraft/liteloader/LiteLoaderVersionList.h
rename to libraries/logic/minecraft/liteloader/LiteLoaderVersionList.h
diff --git a/logic/minecraft/onesix/OneSixInstance.cpp b/libraries/logic/minecraft/onesix/OneSixInstance.cpp
similarity index 98%
rename from logic/minecraft/onesix/OneSixInstance.cpp
rename to libraries/logic/minecraft/onesix/OneSixInstance.cpp
index 8d46eefc..258e26c5 100644
--- a/logic/minecraft/onesix/OneSixInstance.cpp
+++ b/libraries/logic/minecraft/onesix/OneSixInstance.cpp
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#include <QIcon>
 #include <QDebug>
+#include <Env.h>
 
 #include "OneSixInstance.h"
 #include "OneSixUpdate.h"
@@ -33,7 +33,6 @@
 #include "MMCZip.h"
 
 #include "minecraft/AssetsUtils.h"
-#include "icons/IconList.h"
 #include "minecraft/WorldList.h"
 #include <FileSystem.h>
 
@@ -146,9 +145,6 @@ QStringList OneSixInstance::processMinecraftArgs(AuthSessionPtr session)
 QString OneSixInstance::createLaunchScript(AuthSessionPtr session)
 {
 	QString launchScript;
-	QIcon icon = ENV.icons()->getIcon(iconKey());
-	auto pixmap = icon.pixmap(128, 128);
-	pixmap.save(FS::PathCombine(minecraftRoot(), "icon.png"), "PNG");
 
 	if (!m_profile)
 		return nullptr;
diff --git a/logic/minecraft/onesix/OneSixInstance.h b/libraries/logic/minecraft/onesix/OneSixInstance.h
similarity index 100%
rename from logic/minecraft/onesix/OneSixInstance.h
rename to libraries/logic/minecraft/onesix/OneSixInstance.h
diff --git a/logic/minecraft/onesix/OneSixProfileStrategy.cpp b/libraries/logic/minecraft/onesix/OneSixProfileStrategy.cpp
similarity index 100%
rename from logic/minecraft/onesix/OneSixProfileStrategy.cpp
rename to libraries/logic/minecraft/onesix/OneSixProfileStrategy.cpp
diff --git a/logic/minecraft/onesix/OneSixProfileStrategy.h b/libraries/logic/minecraft/onesix/OneSixProfileStrategy.h
similarity index 100%
rename from logic/minecraft/onesix/OneSixProfileStrategy.h
rename to libraries/logic/minecraft/onesix/OneSixProfileStrategy.h
diff --git a/logic/minecraft/onesix/OneSixUpdate.cpp b/libraries/logic/minecraft/onesix/OneSixUpdate.cpp
similarity index 100%
rename from logic/minecraft/onesix/OneSixUpdate.cpp
rename to libraries/logic/minecraft/onesix/OneSixUpdate.cpp
diff --git a/logic/minecraft/onesix/OneSixUpdate.h b/libraries/logic/minecraft/onesix/OneSixUpdate.h
similarity index 100%
rename from logic/minecraft/onesix/OneSixUpdate.h
rename to libraries/logic/minecraft/onesix/OneSixUpdate.h
diff --git a/logic/minecraft/onesix/OneSixVersionFormat.cpp b/libraries/logic/minecraft/onesix/OneSixVersionFormat.cpp
similarity index 100%
rename from logic/minecraft/onesix/OneSixVersionFormat.cpp
rename to libraries/logic/minecraft/onesix/OneSixVersionFormat.cpp
diff --git a/logic/minecraft/onesix/OneSixVersionFormat.h b/libraries/logic/minecraft/onesix/OneSixVersionFormat.h
similarity index 100%
rename from logic/minecraft/onesix/OneSixVersionFormat.h
rename to libraries/logic/minecraft/onesix/OneSixVersionFormat.h
diff --git a/logic/net/ByteArrayDownload.cpp b/libraries/logic/net/ByteArrayDownload.cpp
similarity index 100%
rename from logic/net/ByteArrayDownload.cpp
rename to libraries/logic/net/ByteArrayDownload.cpp
diff --git a/logic/net/ByteArrayDownload.h b/libraries/logic/net/ByteArrayDownload.h
similarity index 100%
rename from logic/net/ByteArrayDownload.h
rename to libraries/logic/net/ByteArrayDownload.h
diff --git a/logic/net/CacheDownload.cpp b/libraries/logic/net/CacheDownload.cpp
similarity index 100%
rename from logic/net/CacheDownload.cpp
rename to libraries/logic/net/CacheDownload.cpp
diff --git a/logic/net/CacheDownload.h b/libraries/logic/net/CacheDownload.h
similarity index 100%
rename from logic/net/CacheDownload.h
rename to libraries/logic/net/CacheDownload.h
diff --git a/logic/net/HttpMetaCache.cpp b/libraries/logic/net/HttpMetaCache.cpp
similarity index 100%
rename from logic/net/HttpMetaCache.cpp
rename to libraries/logic/net/HttpMetaCache.cpp
diff --git a/logic/net/HttpMetaCache.h b/libraries/logic/net/HttpMetaCache.h
similarity index 100%
rename from logic/net/HttpMetaCache.h
rename to libraries/logic/net/HttpMetaCache.h
diff --git a/logic/net/MD5EtagDownload.cpp b/libraries/logic/net/MD5EtagDownload.cpp
similarity index 100%
rename from logic/net/MD5EtagDownload.cpp
rename to libraries/logic/net/MD5EtagDownload.cpp
diff --git a/logic/net/MD5EtagDownload.h b/libraries/logic/net/MD5EtagDownload.h
similarity index 100%
rename from logic/net/MD5EtagDownload.h
rename to libraries/logic/net/MD5EtagDownload.h
diff --git a/logic/net/NetAction.h b/libraries/logic/net/NetAction.h
similarity index 100%
rename from logic/net/NetAction.h
rename to libraries/logic/net/NetAction.h
diff --git a/logic/net/NetJob.cpp b/libraries/logic/net/NetJob.cpp
similarity index 100%
rename from logic/net/NetJob.cpp
rename to libraries/logic/net/NetJob.cpp
diff --git a/logic/net/NetJob.h b/libraries/logic/net/NetJob.h
similarity index 99%
rename from logic/net/NetJob.h
rename to libraries/logic/net/NetJob.h
index afbe9ff3..167fe176 100644
--- a/logic/net/NetJob.h
+++ b/libraries/logic/net/NetJob.h
@@ -15,7 +15,6 @@
 
 #pragma once
 #include <QtNetwork>
-#include <QLabel>
 #include "NetAction.h"
 #include "ByteArrayDownload.h"
 #include "MD5EtagDownload.h"
diff --git a/logic/net/PasteUpload.cpp b/libraries/logic/net/PasteUpload.cpp
similarity index 100%
rename from logic/net/PasteUpload.cpp
rename to libraries/logic/net/PasteUpload.cpp
diff --git a/logic/net/PasteUpload.h b/libraries/logic/net/PasteUpload.h
similarity index 97%
rename from logic/net/PasteUpload.h
rename to libraries/logic/net/PasteUpload.h
index 5bc3d276..06e3f955 100644
--- a/logic/net/PasteUpload.h
+++ b/libraries/logic/net/PasteUpload.h
@@ -1,6 +1,5 @@
 #pragma once
 #include "tasks/Task.h"
-#include <QMessageBox>
 #include <QNetworkReply>
 #include <QBuffer>
 #include <memory>
diff --git a/logic/net/URLConstants.cpp b/libraries/logic/net/URLConstants.cpp
similarity index 100%
rename from logic/net/URLConstants.cpp
rename to libraries/logic/net/URLConstants.cpp
diff --git a/logic/net/URLConstants.h b/libraries/logic/net/URLConstants.h
similarity index 100%
rename from logic/net/URLConstants.h
rename to libraries/logic/net/URLConstants.h
diff --git a/logic/news/NewsChecker.cpp b/libraries/logic/news/NewsChecker.cpp
similarity index 100%
rename from logic/news/NewsChecker.cpp
rename to libraries/logic/news/NewsChecker.cpp
diff --git a/logic/news/NewsChecker.h b/libraries/logic/news/NewsChecker.h
similarity index 100%
rename from logic/news/NewsChecker.h
rename to libraries/logic/news/NewsChecker.h
diff --git a/logic/news/NewsEntry.cpp b/libraries/logic/news/NewsEntry.cpp
similarity index 100%
rename from logic/news/NewsEntry.cpp
rename to libraries/logic/news/NewsEntry.cpp
diff --git a/logic/news/NewsEntry.h b/libraries/logic/news/NewsEntry.h
similarity index 100%
rename from logic/news/NewsEntry.h
rename to libraries/logic/news/NewsEntry.h
diff --git a/logic/notifications/NotificationChecker.cpp b/libraries/logic/notifications/NotificationChecker.cpp
similarity index 100%
rename from logic/notifications/NotificationChecker.cpp
rename to libraries/logic/notifications/NotificationChecker.cpp
diff --git a/logic/notifications/NotificationChecker.h b/libraries/logic/notifications/NotificationChecker.h
similarity index 100%
rename from logic/notifications/NotificationChecker.h
rename to libraries/logic/notifications/NotificationChecker.h
diff --git a/logic/pathmatcher/FSTreeMatcher.h b/libraries/logic/pathmatcher/FSTreeMatcher.h
similarity index 100%
rename from logic/pathmatcher/FSTreeMatcher.h
rename to libraries/logic/pathmatcher/FSTreeMatcher.h
diff --git a/logic/pathmatcher/IPathMatcher.h b/libraries/logic/pathmatcher/IPathMatcher.h
similarity index 100%
rename from logic/pathmatcher/IPathMatcher.h
rename to libraries/logic/pathmatcher/IPathMatcher.h
diff --git a/logic/pathmatcher/MultiMatcher.h b/libraries/logic/pathmatcher/MultiMatcher.h
similarity index 100%
rename from logic/pathmatcher/MultiMatcher.h
rename to libraries/logic/pathmatcher/MultiMatcher.h
diff --git a/logic/pathmatcher/RegexpMatcher.h b/libraries/logic/pathmatcher/RegexpMatcher.h
similarity index 100%
rename from logic/pathmatcher/RegexpMatcher.h
rename to libraries/logic/pathmatcher/RegexpMatcher.h
diff --git a/logic/resources/Resource.cpp b/libraries/logic/resources/Resource.cpp
similarity index 100%
rename from logic/resources/Resource.cpp
rename to libraries/logic/resources/Resource.cpp
diff --git a/logic/resources/Resource.h b/libraries/logic/resources/Resource.h
similarity index 100%
rename from logic/resources/Resource.h
rename to libraries/logic/resources/Resource.h
diff --git a/logic/resources/ResourceHandler.cpp b/libraries/logic/resources/ResourceHandler.cpp
similarity index 100%
rename from logic/resources/ResourceHandler.cpp
rename to libraries/logic/resources/ResourceHandler.cpp
diff --git a/logic/resources/ResourceHandler.h b/libraries/logic/resources/ResourceHandler.h
similarity index 100%
rename from logic/resources/ResourceHandler.h
rename to libraries/logic/resources/ResourceHandler.h
diff --git a/logic/resources/ResourceObserver.cpp b/libraries/logic/resources/ResourceObserver.cpp
similarity index 100%
rename from logic/resources/ResourceObserver.cpp
rename to libraries/logic/resources/ResourceObserver.cpp
diff --git a/logic/resources/ResourceObserver.h b/libraries/logic/resources/ResourceObserver.h
similarity index 100%
rename from logic/resources/ResourceObserver.h
rename to libraries/logic/resources/ResourceObserver.h
diff --git a/logic/resources/ResourceProxyModel.cpp b/libraries/logic/resources/ResourceProxyModel.cpp
similarity index 100%
rename from logic/resources/ResourceProxyModel.cpp
rename to libraries/logic/resources/ResourceProxyModel.cpp
diff --git a/logic/resources/ResourceProxyModel.h b/libraries/logic/resources/ResourceProxyModel.h
similarity index 100%
rename from logic/resources/ResourceProxyModel.h
rename to libraries/logic/resources/ResourceProxyModel.h
diff --git a/logic/screenshots/ImgurAlbumCreation.cpp b/libraries/logic/screenshots/ImgurAlbumCreation.cpp
similarity index 100%
rename from logic/screenshots/ImgurAlbumCreation.cpp
rename to libraries/logic/screenshots/ImgurAlbumCreation.cpp
diff --git a/logic/screenshots/ImgurAlbumCreation.h b/libraries/logic/screenshots/ImgurAlbumCreation.h
similarity index 100%
rename from logic/screenshots/ImgurAlbumCreation.h
rename to libraries/logic/screenshots/ImgurAlbumCreation.h
diff --git a/logic/screenshots/ImgurUpload.cpp b/libraries/logic/screenshots/ImgurUpload.cpp
similarity index 100%
rename from logic/screenshots/ImgurUpload.cpp
rename to libraries/logic/screenshots/ImgurUpload.cpp
diff --git a/logic/screenshots/ImgurUpload.h b/libraries/logic/screenshots/ImgurUpload.h
similarity index 100%
rename from logic/screenshots/ImgurUpload.h
rename to libraries/logic/screenshots/ImgurUpload.h
diff --git a/logic/screenshots/Screenshot.h b/libraries/logic/screenshots/Screenshot.h
similarity index 100%
rename from logic/screenshots/Screenshot.h
rename to libraries/logic/screenshots/Screenshot.h
diff --git a/logic/settings/INIFile.cpp b/libraries/logic/settings/INIFile.cpp
similarity index 100%
rename from logic/settings/INIFile.cpp
rename to libraries/logic/settings/INIFile.cpp
diff --git a/logic/settings/INIFile.h b/libraries/logic/settings/INIFile.h
similarity index 100%
rename from logic/settings/INIFile.h
rename to libraries/logic/settings/INIFile.h
diff --git a/logic/settings/INISettingsObject.cpp b/libraries/logic/settings/INISettingsObject.cpp
similarity index 100%
rename from logic/settings/INISettingsObject.cpp
rename to libraries/logic/settings/INISettingsObject.cpp
diff --git a/logic/settings/INISettingsObject.h b/libraries/logic/settings/INISettingsObject.h
similarity index 100%
rename from logic/settings/INISettingsObject.h
rename to libraries/logic/settings/INISettingsObject.h
diff --git a/logic/settings/OverrideSetting.cpp b/libraries/logic/settings/OverrideSetting.cpp
similarity index 100%
rename from logic/settings/OverrideSetting.cpp
rename to libraries/logic/settings/OverrideSetting.cpp
diff --git a/logic/settings/OverrideSetting.h b/libraries/logic/settings/OverrideSetting.h
similarity index 100%
rename from logic/settings/OverrideSetting.h
rename to libraries/logic/settings/OverrideSetting.h
diff --git a/logic/settings/PassthroughSetting.cpp b/libraries/logic/settings/PassthroughSetting.cpp
similarity index 100%
rename from logic/settings/PassthroughSetting.cpp
rename to libraries/logic/settings/PassthroughSetting.cpp
diff --git a/logic/settings/PassthroughSetting.h b/libraries/logic/settings/PassthroughSetting.h
similarity index 100%
rename from logic/settings/PassthroughSetting.h
rename to libraries/logic/settings/PassthroughSetting.h
diff --git a/logic/settings/Setting.cpp b/libraries/logic/settings/Setting.cpp
similarity index 100%
rename from logic/settings/Setting.cpp
rename to libraries/logic/settings/Setting.cpp
diff --git a/logic/settings/Setting.h b/libraries/logic/settings/Setting.h
similarity index 100%
rename from logic/settings/Setting.h
rename to libraries/logic/settings/Setting.h
diff --git a/logic/settings/SettingsObject.cpp b/libraries/logic/settings/SettingsObject.cpp
similarity index 100%
rename from logic/settings/SettingsObject.cpp
rename to libraries/logic/settings/SettingsObject.cpp
diff --git a/logic/settings/SettingsObject.h b/libraries/logic/settings/SettingsObject.h
similarity index 100%
rename from logic/settings/SettingsObject.h
rename to libraries/logic/settings/SettingsObject.h
diff --git a/logic/status/StatusChecker.cpp b/libraries/logic/status/StatusChecker.cpp
similarity index 100%
rename from logic/status/StatusChecker.cpp
rename to libraries/logic/status/StatusChecker.cpp
diff --git a/logic/status/StatusChecker.h b/libraries/logic/status/StatusChecker.h
similarity index 100%
rename from logic/status/StatusChecker.h
rename to libraries/logic/status/StatusChecker.h
diff --git a/logic/tasks/SequentialTask.cpp b/libraries/logic/tasks/SequentialTask.cpp
similarity index 100%
rename from logic/tasks/SequentialTask.cpp
rename to libraries/logic/tasks/SequentialTask.cpp
diff --git a/logic/tasks/SequentialTask.h b/libraries/logic/tasks/SequentialTask.h
similarity index 100%
rename from logic/tasks/SequentialTask.h
rename to libraries/logic/tasks/SequentialTask.h
diff --git a/logic/tasks/Task.cpp b/libraries/logic/tasks/Task.cpp
similarity index 100%
rename from logic/tasks/Task.cpp
rename to libraries/logic/tasks/Task.cpp
diff --git a/logic/tasks/Task.h b/libraries/logic/tasks/Task.h
similarity index 100%
rename from logic/tasks/Task.h
rename to libraries/logic/tasks/Task.h
diff --git a/logic/tasks/ThreadTask.cpp b/libraries/logic/tasks/ThreadTask.cpp
similarity index 100%
rename from logic/tasks/ThreadTask.cpp
rename to libraries/logic/tasks/ThreadTask.cpp
diff --git a/logic/tasks/ThreadTask.h b/libraries/logic/tasks/ThreadTask.h
similarity index 100%
rename from logic/tasks/ThreadTask.h
rename to libraries/logic/tasks/ThreadTask.h
diff --git a/logic/tools/BaseExternalTool.cpp b/libraries/logic/tools/BaseExternalTool.cpp
similarity index 97%
rename from logic/tools/BaseExternalTool.cpp
rename to libraries/logic/tools/BaseExternalTool.cpp
index af7f9a3f..2b97c3c9 100644
--- a/logic/tools/BaseExternalTool.cpp
+++ b/libraries/logic/tools/BaseExternalTool.cpp
@@ -2,7 +2,6 @@
 
 #include <QProcess>
 #include <QDir>
-#include <QInputDialog>
 
 #ifdef Q_OS_WIN
 #include <windows.h>
diff --git a/logic/tools/BaseExternalTool.h b/libraries/logic/tools/BaseExternalTool.h
similarity index 100%
rename from logic/tools/BaseExternalTool.h
rename to libraries/logic/tools/BaseExternalTool.h
diff --git a/logic/tools/BaseProfiler.cpp b/libraries/logic/tools/BaseProfiler.cpp
similarity index 100%
rename from logic/tools/BaseProfiler.cpp
rename to libraries/logic/tools/BaseProfiler.cpp
diff --git a/logic/tools/BaseProfiler.h b/libraries/logic/tools/BaseProfiler.h
similarity index 100%
rename from logic/tools/BaseProfiler.h
rename to libraries/logic/tools/BaseProfiler.h
diff --git a/logic/tools/JProfiler.cpp b/libraries/logic/tools/JProfiler.cpp
similarity index 99%
rename from logic/tools/JProfiler.cpp
rename to libraries/logic/tools/JProfiler.cpp
index 45b33f79..a0e3c895 100644
--- a/logic/tools/JProfiler.cpp
+++ b/libraries/logic/tools/JProfiler.cpp
@@ -1,7 +1,6 @@
 #include "JProfiler.h"
 
 #include <QDir>
-#include <QMessageBox>
 
 #include "settings/SettingsObject.h"
 #include "launch/LaunchTask.h"
diff --git a/logic/tools/JProfiler.h b/libraries/logic/tools/JProfiler.h
similarity index 100%
rename from logic/tools/JProfiler.h
rename to libraries/logic/tools/JProfiler.h
diff --git a/logic/tools/JVisualVM.cpp b/libraries/logic/tools/JVisualVM.cpp
similarity index 100%
rename from logic/tools/JVisualVM.cpp
rename to libraries/logic/tools/JVisualVM.cpp
diff --git a/logic/tools/JVisualVM.h b/libraries/logic/tools/JVisualVM.h
similarity index 100%
rename from logic/tools/JVisualVM.h
rename to libraries/logic/tools/JVisualVM.h
diff --git a/logic/tools/MCEditTool.cpp b/libraries/logic/tools/MCEditTool.cpp
similarity index 96%
rename from logic/tools/MCEditTool.cpp
rename to libraries/logic/tools/MCEditTool.cpp
index f0f715c3..32695c8d 100644
--- a/logic/tools/MCEditTool.cpp
+++ b/libraries/logic/tools/MCEditTool.cpp
@@ -3,14 +3,10 @@
 #include <QDir>
 #include <QProcess>
 #include <QUrl>
-// FIXME: mixing logic and UI!!!!
-#include <QInputDialog>
-#include <QApplication>
 
 #include "settings/SettingsObject.h"
 #include "BaseInstance.h"
 #include "minecraft/MinecraftInstance.h"
-#include <DesktopServices.h>
 
 MCEditTool::MCEditTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent)
 	: BaseDetachedTool(settings, instance, parent)
@@ -37,12 +33,14 @@ QString MCEditTool::getSave() const
 		}
 	}
 	bool ok = true;
+	/*
 	const QString save = QInputDialog::getItem(QApplication::activeWindow(), tr("MCEdit"), tr("Choose which world to open:"),
 		worlds, 0, false, &ok);
 	if (ok)
 	{
 		return saves.absoluteFilePath(save);
 	}
+	*/
 	return QString();
 }
 
@@ -82,10 +80,12 @@ void MCEditTool::runImpl()
 		program = mceditDir.absoluteFilePath("mcedit2.exe");
 	}
 	#endif
+	/*
 	if(program.size())
 	{
 		DesktopServices::openFile(program, save, mceditPath);
 	}
+	*/
 #endif
 }
 
diff --git a/logic/tools/MCEditTool.h b/libraries/logic/tools/MCEditTool.h
similarity index 100%
rename from logic/tools/MCEditTool.h
rename to libraries/logic/tools/MCEditTool.h
diff --git a/logic/trans/TranslationDownloader.cpp b/libraries/logic/trans/TranslationDownloader.cpp
similarity index 100%
rename from logic/trans/TranslationDownloader.cpp
rename to libraries/logic/trans/TranslationDownloader.cpp
diff --git a/logic/trans/TranslationDownloader.h b/libraries/logic/trans/TranslationDownloader.h
similarity index 100%
rename from logic/trans/TranslationDownloader.h
rename to libraries/logic/trans/TranslationDownloader.h
diff --git a/logic/updater/DownloadTask.cpp b/libraries/logic/updater/DownloadTask.cpp
similarity index 100%
rename from logic/updater/DownloadTask.cpp
rename to libraries/logic/updater/DownloadTask.cpp
diff --git a/logic/updater/DownloadTask.h b/libraries/logic/updater/DownloadTask.h
similarity index 100%
rename from logic/updater/DownloadTask.h
rename to libraries/logic/updater/DownloadTask.h
diff --git a/logic/updater/GoUpdate.cpp b/libraries/logic/updater/GoUpdate.cpp
similarity index 100%
rename from logic/updater/GoUpdate.cpp
rename to libraries/logic/updater/GoUpdate.cpp
diff --git a/logic/updater/GoUpdate.h b/libraries/logic/updater/GoUpdate.h
similarity index 100%
rename from logic/updater/GoUpdate.h
rename to libraries/logic/updater/GoUpdate.h
diff --git a/logic/updater/UpdateChecker.cpp b/libraries/logic/updater/UpdateChecker.cpp
similarity index 100%
rename from logic/updater/UpdateChecker.cpp
rename to libraries/logic/updater/UpdateChecker.cpp
diff --git a/logic/updater/UpdateChecker.h b/libraries/logic/updater/UpdateChecker.h
similarity index 100%
rename from logic/updater/UpdateChecker.h
rename to libraries/logic/updater/UpdateChecker.h
diff --git a/logic/wonko/BaseWonkoEntity.cpp b/libraries/logic/wonko/BaseWonkoEntity.cpp
similarity index 100%
rename from logic/wonko/BaseWonkoEntity.cpp
rename to libraries/logic/wonko/BaseWonkoEntity.cpp
diff --git a/logic/wonko/BaseWonkoEntity.h b/libraries/logic/wonko/BaseWonkoEntity.h
similarity index 100%
rename from logic/wonko/BaseWonkoEntity.h
rename to libraries/logic/wonko/BaseWonkoEntity.h
diff --git a/logic/wonko/WonkoIndex.cpp b/libraries/logic/wonko/WonkoIndex.cpp
similarity index 100%
rename from logic/wonko/WonkoIndex.cpp
rename to libraries/logic/wonko/WonkoIndex.cpp
diff --git a/logic/wonko/WonkoIndex.h b/libraries/logic/wonko/WonkoIndex.h
similarity index 100%
rename from logic/wonko/WonkoIndex.h
rename to libraries/logic/wonko/WonkoIndex.h
diff --git a/logic/wonko/WonkoReference.cpp b/libraries/logic/wonko/WonkoReference.cpp
similarity index 100%
rename from logic/wonko/WonkoReference.cpp
rename to libraries/logic/wonko/WonkoReference.cpp
diff --git a/logic/wonko/WonkoReference.h b/libraries/logic/wonko/WonkoReference.h
similarity index 100%
rename from logic/wonko/WonkoReference.h
rename to libraries/logic/wonko/WonkoReference.h
diff --git a/logic/wonko/WonkoUtil.cpp b/libraries/logic/wonko/WonkoUtil.cpp
similarity index 100%
rename from logic/wonko/WonkoUtil.cpp
rename to libraries/logic/wonko/WonkoUtil.cpp
diff --git a/logic/wonko/WonkoUtil.h b/libraries/logic/wonko/WonkoUtil.h
similarity index 100%
rename from logic/wonko/WonkoUtil.h
rename to libraries/logic/wonko/WonkoUtil.h
diff --git a/logic/wonko/WonkoVersion.cpp b/libraries/logic/wonko/WonkoVersion.cpp
similarity index 100%
rename from logic/wonko/WonkoVersion.cpp
rename to libraries/logic/wonko/WonkoVersion.cpp
diff --git a/logic/wonko/WonkoVersion.h b/libraries/logic/wonko/WonkoVersion.h
similarity index 100%
rename from logic/wonko/WonkoVersion.h
rename to libraries/logic/wonko/WonkoVersion.h
diff --git a/logic/wonko/WonkoVersionList.cpp b/libraries/logic/wonko/WonkoVersionList.cpp
similarity index 100%
rename from logic/wonko/WonkoVersionList.cpp
rename to libraries/logic/wonko/WonkoVersionList.cpp
diff --git a/logic/wonko/WonkoVersionList.h b/libraries/logic/wonko/WonkoVersionList.h
similarity index 100%
rename from logic/wonko/WonkoVersionList.h
rename to libraries/logic/wonko/WonkoVersionList.h
diff --git a/logic/wonko/format/WonkoFormat.cpp b/libraries/logic/wonko/format/WonkoFormat.cpp
similarity index 100%
rename from logic/wonko/format/WonkoFormat.cpp
rename to libraries/logic/wonko/format/WonkoFormat.cpp
diff --git a/logic/wonko/format/WonkoFormat.h b/libraries/logic/wonko/format/WonkoFormat.h
similarity index 100%
rename from logic/wonko/format/WonkoFormat.h
rename to libraries/logic/wonko/format/WonkoFormat.h
diff --git a/logic/wonko/format/WonkoFormatV1.cpp b/libraries/logic/wonko/format/WonkoFormatV1.cpp
similarity index 100%
rename from logic/wonko/format/WonkoFormatV1.cpp
rename to libraries/logic/wonko/format/WonkoFormatV1.cpp
diff --git a/logic/wonko/format/WonkoFormatV1.h b/libraries/logic/wonko/format/WonkoFormatV1.h
similarity index 100%
rename from logic/wonko/format/WonkoFormatV1.h
rename to libraries/logic/wonko/format/WonkoFormatV1.h
diff --git a/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp b/libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp
similarity index 100%
rename from logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp
rename to libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp
diff --git a/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h b/libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h
similarity index 100%
rename from logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h
rename to libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h
diff --git a/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp b/libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp
similarity index 100%
rename from logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp
rename to libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp
diff --git a/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h b/libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h
similarity index 100%
rename from logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h
rename to libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h
diff --git a/logic/DesktopServices.h b/logic/DesktopServices.h
deleted file mode 100644
index 1e67e4cb..00000000
--- a/logic/DesktopServices.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include <QUrl>
-#include <QString>
-#include "multimc_logic_export.h"
-
-/**
- * This wraps around QDesktopServices and adds workarounds where needed
- * Use this instead of QDesktopServices!
- */
-namespace DesktopServices
-{
-	/**
-	 * Open a file in whatever application is applicable
-	 */
-	MULTIMC_LOGIC_EXPORT bool openFile(const QString &path);
-
-	/**
-	 * Open a file in the specified application
-	 */
-	MULTIMC_LOGIC_EXPORT bool openFile(const QString &application, const QString &path, const QString & workingDirectory = QString(), qint64 *pid = 0);
-
-	/**
-	 * Run an application
-	 */
-	MULTIMC_LOGIC_EXPORT bool run(const QString &application,const QStringList &args, const QString & workingDirectory = QString(), qint64 *pid = 0);
-
-	/**
-	 * Open a directory
-	 */
-	MULTIMC_LOGIC_EXPORT bool openDirectory(const QString &path, bool ensureExists = false);
-
-	/**
-	 * Open the URL, most likely in a browser. Maybe.
-	 */
-	MULTIMC_LOGIC_EXPORT bool openUrl(const QUrl &url);
-};
diff --git a/tests/tst_Resource.cpp b/tests/tst_Resource.cpp
index 54d029d5..4bf41a03 100644
--- a/tests/tst_Resource.cpp
+++ b/tests/tst_Resource.cpp
@@ -1,5 +1,4 @@
 #include <QTest>
-#include <QAction>
 #include "TestUtil.h"
 
 #include "resources/Resource.h"
diff --git a/wonkoclient/WonkoClient.cpp b/wonkoclient/WonkoClient.cpp
index 83efb285..ca22d407 100644
--- a/wonkoclient/WonkoClient.cpp
+++ b/wonkoclient/WonkoClient.cpp
@@ -11,8 +11,6 @@
 #include <settings/INISettingsObject.h>
 #include <resources/Resource.h>
 #include "WonkoClient.h"
-#include <icons/IconList.h>
-
 
 WonkoClient &WonkoClient::getInstance() {
     static WonkoClient instance;
diff --git a/wonkoclient/main.cpp b/wonkoclient/main.cpp
index 1ee6d881..eaf92c5d 100644
--- a/wonkoclient/main.cpp
+++ b/wonkoclient/main.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "WonkoClient.h"
-#include <QApplication>
+#include <QCoreApplication>
 #include <QDebug>
 #include <QtWidgets/QInputDialog>
 #include <QtGui/QDesktopServices>
@@ -11,7 +11,7 @@
 
 int main(int argc, char *argv[])
 {
-	QApplication a(argc, argv);
+	QCoreApplication a(argc, argv);
 	if (a.arguments().contains("-d"))
 	{
 		int i = a.arguments().lastIndexOf("-d") + 1;