665 files changed, 1326 insertions, 1379 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f06a7902..53de9aa0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,13 +10,12 @@ if(WIN32)
 	cmake_policy(SET CMP0020 OLD)
 endif()
 
-project(MultiMC)
+project(Megatron)
 enable_testing()
 
 ######## Set CMake options ########
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(FILES_TO_TRANSLATE )
 
 ######## Set module path ########
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
@@ -47,7 +46,6 @@ find_package(Qt5Concurrent REQUIRED)
 find_package(Qt5Network REQUIRED)
 find_package(Qt5Test REQUIRED)
 find_package(Qt5Xml REQUIRED)
-find_package(Qt5LinguistTools REQUIRED)
 find_package(Qt5WebKitWidgets REQUIRED)
 
 include_directories(
@@ -78,95 +76,6 @@ if(${BIGENDIAN})
 	add_definitions(-DMULTIMC_BIG_ENDIAN)
 endif(${BIGENDIAN})
 
-######## Set URLs ########
-set(MultiMC_NEWS_RSS_URL "http://multimc.org/rss.xml" CACHE STRING "URL to fetch MultiMC's news RSS feed from.")
-
-######## Set version numbers ########
-set(MultiMC_VERSION_MAJOR	 0)
-set(MultiMC_VERSION_MINOR	 4)
-set(MultiMC_VERSION_HOTFIX   5)
-
-# Build number
-set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
-
-# Version type
-set(MultiMC_VERSION_TYPE "Custom" CACHE STRING "MultiMC's version type. This should be one of 'Custom', 'Release', 'ReleaseCandidate', or 'Development', depending on what type of version this is.")
-
-# Build platform.
-set(MultiMC_BUILD_PLATFORM "" CACHE STRING "A short string identifying the platform that this build was built for. Only used by the notification system and to display in the about dialog.")
-
-# Version channel
-set(MultiMC_VERSION_CHANNEL "" CACHE STRING "The current build's channel. Included in the version string.")
-
-# Channel list URL
-set(MultiMC_CHANLIST_URL "" CACHE STRING "URL for the channel list.")
-
-# Updater enabled?
-set(MultiMC_UPDATER false CACHE BOOL "Whether or not the update system is enabled. If this is enabled, you must also set MultiMC_CHANLIST_URL and MultiMC_VERSION_CHANNEL in order for it to work properly.")
-
-# Notification URL
-set(MultiMC_NOTIFICATION_URL "" CACHE STRING "URL for checking for notifications.")
-
-set(MultiMC_RELEASE_VERSION_NAME "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}")
-if(MultiMC_VERSION_HOTFIX GREATER 0)
-	set(MultiMC_RELEASE_VERSION_NAME "${MultiMC_RELEASE_VERSION_NAME}.${MultiMC_VERSION_HOTFIX}")
-endif()
-
-# Build a version string to display in the configure logs.
-if(MultiMC_VERSION_TYPE STREQUAL "Custom")
-	message(STATUS "Version Type: Custom")
-	set(MultiMC_VERSION_STRING "${MultiMC_RELEASE_VERSION_NAME}")
-elseif(MultiMC_VERSION_TYPE STREQUAL "Release")
-	message(STATUS "Version Type: Stable Release")
-	set(MultiMC_VERSION_STRING "${MultiMC_RELEASE_VERSION_NAME}")
-elseif(MultiMC_VERSION_TYPE STREQUAL "Development")
-	message(STATUS "Version Type: Development")
-	set(MultiMC_VERSION_STRING "${MultiMC_RELEASE_VERSION_NAME}-dev${MultiMC_VERSION_BUILD}")
-else()
-	message(ERROR "Invalid build type.")
-endif()
-
-message(STATUS "MultiMC 5 Version: ${MultiMC_VERSION_STRING}")
-
-# If the update system is enabled, make sure MultiMC_CHANLIST_URL and MultiMC_VERSION_CHANNEL are set.
-if(MultiMC_UPDATER)
-	if(MultiMC_VERSION_CHANNEL STREQUAL "")
-		message(FATAL_ERROR "Update system is enabled, but MultiMC_VERSION_CHANNEL is not set.\n"
-				"Please ensure the CMake variables MultiMC_VERSION_CHANNEL, MultiMC_CHANLIST_URL, and MultiMC_VERSION_BUILD are set.")
-	endif()
-	if(MultiMC_CHANLIST_URL STREQUAL "")
-	message(FATAL_ERROR "Update system is enabled, but MultiMC_CHANLIST_URL is not set.\n"
-				"Please ensure the CMake variables MultiMC_VERSION_CHANNEL, MultiMC_CHANLIST_URL, and MultiMC_VERSION_BUILD are set.")
-	endif()
-	if(MultiMC_VERSION_BUILD LESS 0)
-	message(FATAL_ERROR "Update system is enabled, but MultiMC_VERSION_BUILD is not set.\n"
-				"Please ensure the CMake variables MultiMC_VERSION_CHANNEL, MultiMC_CHANLIST_URL, and MultiMC_VERSION_BUILD are set.")
-	endif()
-	message(STATUS "Updater is enabled. Channel list URL: ${MultiMC_CHANLIST_URL}")
-endif()
-
-#### Updater-related build config options ####
-option(MultiMC_UPDATER_DRY_RUN "Enable updater dry-run mode -- for updater development." OFF)
-option(MultiMC_UPDATER_FORCE_LOCAL "Do not download updated updater -- for updater development." OFF)
-
-if(MultiMC_UPDATER_DRY_RUN)
-	set(MultiMC_UPDATER_DRY_RUN_value "true")
-else()
-	set(MultiMC_UPDATER_DRY_RUN_value "false")
-endif()
-
-if(MultiMC_UPDATER_FORCE_LOCAL)
-	set(MultiMC_UPDATER_FORCE_LOCAL_value "true")
-else()
-	set(MultiMC_UPDATER_FORCE_LOCAL_value "false")
-endif()
-
-#### For QuickMods
-option(MultiMC_WEBKIT_INSPECTOR "Enable the QWebInspector for debugging" OFF)
-if(MultiMC_WEBKIT_INSPECTOR)
-    add_definitions(-DWEBKIT_INSPECTOR)
-endif()
-
 #### Custom target to just print the version.
 add_custom_target(version echo "Version: ${MultiMC_VERSION_STRING}")
 
@@ -175,40 +84,6 @@ include(GitFunctions)
 git_run(COMMAND rev-parse HEAD DEFAULT "Unknown" OUTPUT_VAR MultiMC_GIT_COMMIT)
 message(STATUS "Git commit: ${MultiMC_GIT_COMMIT}")
 
-######## Configure header ########
-configure_file("${PROJECT_SOURCE_DIR}/BuildConfig.cpp.in" "${PROJECT_BINARY_DIR}/BuildConfig.cpp")
-
-######## Packaging/install paths setup ########
-
-if(UNIX AND APPLE)
-	set(BINARY_DEST_DIR MultiMC.app/Contents/MacOS)
-	set(PLUGIN_DEST_DIR MultiMC.app/Contents/MacOS)
-	set(QTCONF_DEST_DIR MultiMC.app/Contents/Resources)
-	set(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.app")
-
-	set(MACOSX_BUNDLE_BUNDLE_NAME "MultiMC")
-	set(MACOSX_BUNDLE_INFO_STRING "MultiMC Minecraft launcher and management utility.")
-	set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.multimc.MultiMC5")
-	set(MACOSX_BUNDLE_BUNDLE_VERSION "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}")
-	set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}")
-	set(MACOSX_BUNDLE_LONG_VERSION_STRING "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}")
-	set(MACOSX_BUNDLE_ICON_FILE MultiMC.icns)
-	set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2014 MultiMC Contributors")
-elseif(UNIX)
-	set(BINARY_DEST_DIR bin)
-	set(PLUGIN_DEST_DIR plugins)
-	set(QTCONF_DEST_DIR .)
-	set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/MultiMC")
-elseif(WIN32)
-	set(BINARY_DEST_DIR .)
-	set(PLUGIN_DEST_DIR .)
-	set(QTCONF_DEST_DIR .)
-	set(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.exe")
-endif()
-
-# directories to look for dependencies
-set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR})
-
 ################################ Included Libs ################################
 
 include(ExternalProject)
@@ -259,660 +134,11 @@ include_directories(${LOGICALGUI_INCLUDE_DIR})
 add_subdirectory(depends/iconfix)
 include_directories(${ICONFIX_INCLUDE_DIR})
 
-################################ FILES ################################
-
-######## Sources and headers ########
-SET(MULTIMC_SOURCES
-	# Application base
-	MultiMC.h
-	MultiMC.cpp
-	MMCError.h
-	BuildConfig.h
-	${PROJECT_BINARY_DIR}/BuildConfig.cpp
-
-	# GUI - general utilities
-	gui/GuiUtil.h
-	gui/GuiUtil.cpp
-	gui/ColumnResizer.h
-	gui/ColumnResizer.cpp
-	gui/InstanceProxyModel.h
-	gui/InstanceProxyModel.cpp
-
-	# GUI - windows
-	gui/MainWindow.h
-	gui/MainWindow.cpp
-	gui/ConsoleWindow.h
-	gui/ConsoleWindow.cpp
-
-	gui/InstancePageProvider.h
-	gui/InstancePageProvider.cpp
-
-	# GUI - page dialog pages
-	gui/pages/BasePage.h
-	gui/pages/VersionPage.cpp
-	gui/pages/VersionPage.h
-	gui/pages/TexturePackPage.h
-	gui/pages/ResourcePackPage.h
-	gui/pages/ModFolderPage.cpp
-	gui/pages/ModFolderPage.h
-	gui/pages/NotesPage.cpp
-	gui/pages/NotesPage.h
-	gui/pages/LegacyUpgradePage.cpp
-	gui/pages/LegacyUpgradePage.h
-	gui/pages/LegacyJarModPage.cpp
-	gui/pages/LegacyJarModPage.h
-	gui/pages/LogPage.cpp
-	gui/pages/LogPage.h
-	gui/pages/InstanceSettingsPage.cpp
-	gui/pages/InstanceSettingsPage.h
-	gui/pages/ScreenshotsPage.cpp
-	gui/pages/ScreenshotsPage.h
-	gui/pages/OtherLogsPage.cpp
-	gui/pages/OtherLogsPage.h
-
-	# GUI - global settings pages
-	gui/pages/global/AccountListPage.cpp
-	gui/pages/global/AccountListPage.h
-	gui/pages/global/ExternalToolsPage.cpp
-	gui/pages/global/ExternalToolsPage.h
-	gui/pages/global/JavaPage.cpp
-	gui/pages/global/JavaPage.h
-	gui/pages/global/MinecraftPage.cpp
-	gui/pages/global/MinecraftPage.h
-	gui/pages/global/MultiMCPage.cpp
-	gui/pages/global/MultiMCPage.h
-	gui/pages/global/ProxyPage.cpp
-	gui/pages/global/ProxyPage.h
-
-	# GUI - dialogs
-	gui/dialogs/AboutDialog.cpp
-	gui/dialogs/AboutDialog.h
-	gui/dialogs/AccountSelectDialog.cpp
-	gui/dialogs/AccountSelectDialog.h
-	gui/dialogs/CopyInstanceDialog.cpp
-	gui/dialogs/CopyInstanceDialog.h
-	gui/dialogs/CustomMessageBox.cpp
-	gui/dialogs/CustomMessageBox.h
-	gui/dialogs/EditAccountDialog.cpp
-	gui/dialogs/EditAccountDialog.h
-	gui/dialogs/IconPickerDialog.cpp
-	gui/dialogs/IconPickerDialog.h
-	gui/dialogs/LoginDialog.cpp
-	gui/dialogs/LoginDialog.h
-	gui/dialogs/ModEditDialogCommon.cpp
-	gui/dialogs/ModEditDialogCommon.h
-	gui/dialogs/NewInstanceDialog.cpp
-	gui/dialogs/NewInstanceDialog.h
-	gui/dialogs/NotificationDialog.cpp
-	gui/dialogs/NotificationDialog.h
-	gui/pagedialog/PageDialog.cpp
-	gui/pagedialog/PageDialog.h
-	gui/dialogs/ProgressDialog.cpp
-	gui/dialogs/ProgressDialog.h
-	gui/dialogs/UpdateDialog.cpp
-	gui/dialogs/UpdateDialog.h
-	gui/dialogs/VersionSelectDialog.cpp
-	gui/dialogs/VersionSelectDialog.h
-
-
-	# GUI - widgets
-	gui/widgets/Common.cpp
-	gui/widgets/Common.h
-	gui/widgets/IconLabel.cpp
-	gui/widgets/IconLabel.h
-	gui/widgets/LabeledToolButton.cpp
-	gui/widgets/LabeledToolButton.h
-	gui/widgets/LineSeparator.cpp
-	gui/widgets/LineSeparator.h
-	gui/widgets/MCModInfoFrame.cpp
-	gui/widgets/MCModInfoFrame.h
-	gui/widgets/ModListView.cpp
-	gui/widgets/ModListView.h
-	gui/widgets/PageContainer.cpp
-	gui/widgets/PageContainer.h
-	gui/widgets/PageContainer_p.h
-	gui/widgets/ServerStatus.cpp
-	gui/widgets/ServerStatus.h
-	gui/widgets/VersionListView.cpp
-	gui/widgets/VersionListView.h
-
-
-	# GUI - instance group view
-	gui/groupview/GroupedProxyModel.cpp
-	gui/groupview/GroupedProxyModel.h
-	gui/groupview/GroupView.cpp
-	gui/groupview/GroupView.h
-	gui/groupview/InstanceDelegate.cpp
-	gui/groupview/InstanceDelegate.h
-	gui/groupview/VisualGroup.cpp
-	gui/groupview/VisualGroup.h
-
-	# LOGIC - Base classes and infrastructure
-	logic/BaseVersion.h
-	logic/BaseProcess.h
-	logic/BaseProcess.cpp
-	logic/BaseInstance.h
-	logic/BaseInstance.cpp
-	logic/minecraft/Mod.h
-	logic/minecraft/Mod.cpp
-	logic/minecraft/ModList.h
-	logic/minecraft/ModList.cpp
-
-	# sets and maps for deciding based on versions
-	logic/minecraft/VersionFilterData.h
-	logic/minecraft/VersionFilterData.cpp
-
-	# Annoying nag screen logic
-	gui/NagUtils.h
-	gui/NagUtils.cpp
-
-	# Player skin utilities
-	logic/minecraft/SkinUtils.h
-	logic/minecraft/SkinUtils.cpp
-
-	# misc model filter
-
-	# JSON parsing helpers
-	logic/MMCJson.h
-	logic/MMCJson.cpp
-
-	# RW lock protected map
-	logic/RWStorage.h
-
-	# A variable that has an implicit default value and keeps track of changes
-	logic/DefaultVariable.h
-
-	# network stuffs
-	logic/Env.h
-	logic/Env.cpp
-	logic/net/NetAction.h
-	logic/net/MD5EtagDownload.h
-	logic/net/MD5EtagDownload.cpp
-	logic/net/ByteArrayDownload.h
-	logic/net/ByteArrayDownload.cpp
-	logic/net/CacheDownload.h
-	logic/net/CacheDownload.cpp
-	logic/net/NetJob.h
-	logic/net/NetJob.cpp
-	logic/net/HttpMetaCache.h
-	logic/net/HttpMetaCache.cpp
-	logic/net/PasteUpload.h
-	logic/net/PasteUpload.cpp
-	logic/net/URLConstants.h
-	logic/net/URLConstants.cpp
-
-	# Yggdrasil login stuff
-	logic/auth/AuthSession.h
-	logic/auth/AuthSession.cpp
-	logic/auth/MojangAccountList.h
-	logic/auth/MojangAccountList.cpp
-	logic/auth/MojangAccount.h
-	logic/auth/MojangAccount.cpp
-	logic/auth/YggdrasilTask.h
-	logic/auth/YggdrasilTask.cpp
-	logic/auth/flows/AuthenticateTask.h
-	logic/auth/flows/AuthenticateTask.cpp
-	logic/auth/flows/RefreshTask.cpp
-	logic/auth/flows/RefreshTask.cpp
-	logic/auth/flows/ValidateTask.h
-	logic/auth/flows/ValidateTask.cpp
-
-	# Update system
-	logic/updater/GoUpdate.h
-	logic/updater/GoUpdate.cpp
-	logic/updater/UpdateChecker.h
-	logic/updater/UpdateChecker.cpp
-	logic/updater/DownloadTask.h
-	logic/updater/DownloadTask.cpp
-
-	# Notifications - short warning messages
-	logic/notifications/NotificationChecker.h
-	logic/notifications/NotificationChecker.cpp
-
-	# News System
-	logic/news/NewsChecker.h
-	logic/news/NewsChecker.cpp
-	logic/news/NewsEntry.h
-	logic/news/NewsEntry.cpp
-
-	# Status system
-	logic/status/StatusChecker.h
-	logic/status/StatusChecker.cpp
-
-	# legacy instances
-	logic/minecraft/LegacyInstance.h
-	logic/minecraft/LegacyInstance.cpp
-	logic/minecraft/LegacyUpdate.h
-	logic/minecraft/LegacyUpdate.cpp
-
-	# OneSix instances
-	logic/minecraft/OneSixUpdate.h
-	logic/minecraft/OneSixUpdate.cpp
-	logic/minecraft/OneSixInstance.h
-	logic/minecraft/OneSixInstance.cpp
-
-	# a smart pointer wrapper intended for safer use with Qt signal/slot mechanisms
-	logic/QObjectPtr.h
-
-	# Common utils for instances
-	logic/minecraft/JarUtils.h
-	logic/minecraft/JarUtils.cpp
-
-	# Minecraft support
-	logic/minecraft/GradleSpecifier.h
-	logic/minecraft/MinecraftProfile.cpp
-	logic/minecraft/MinecraftProfile.h
-	logic/minecraft/JarMod.cpp
-	logic/minecraft/JarMod.h
-	logic/minecraft/MinecraftInstance.cpp
-	logic/minecraft/MinecraftInstance.h
-	logic/minecraft/MinecraftProcess.cpp
-	logic/minecraft/MinecraftProcess.h
-	logic/minecraft/MinecraftVersion.cpp
-	logic/minecraft/MinecraftVersion.h
-	logic/minecraft/MinecraftVersionList.cpp
-	logic/minecraft/MinecraftVersionList.h
-	logic/minecraft/NullProfileStrategy.h
-	logic/minecraft/OneSixLibrary.cpp
-	logic/minecraft/OneSixLibrary.h
-	logic/minecraft/OneSixProfileStrategy.cpp
-	logic/minecraft/OneSixProfileStrategy.h
-	logic/minecraft/OneSixRule.cpp
-	logic/minecraft/OneSixRule.h
-	logic/minecraft/OpSys.cpp
-	logic/minecraft/OpSys.h
-	logic/minecraft/ParseUtils.cpp
-	logic/minecraft/ParseUtils.h
-	logic/minecraft/ProfileUtils.cpp
-	logic/minecraft/ProfileUtils.h
-	logic/minecraft/ProfileStrategy.h
-	logic/minecraft/RawLibrary.cpp
-	logic/minecraft/RawLibrary.h
-	logic/minecraft/VersionBuilder.cpp
-	logic/minecraft/VersionBuilder.h
-	logic/minecraft/VersionBuildError.h
-	logic/minecraft/VersionFile.cpp
-	logic/minecraft/VersionFile.h
-	logic/minecraft/ProfilePatch.h
-	logic/minecraft/VersionSource.h
-
-	# A Recursive file system watcher
-	logic/RecursiveFileSystemWatcher.h
-	logic/RecursiveFileSystemWatcher.cpp
-
-	# Various base classes
-	logic/BaseInstaller.h
-	logic/BaseInstaller.cpp
-	logic/BaseVersionList.h
-	logic/BaseVersionList.cpp
-
-	logic/InstanceList.h
-	logic/InstanceList.cpp
-	logic/minecraft/LwjglVersionList.h
-	logic/minecraft/LwjglVersionList.cpp
-
-	# FTB
-	logic/ftb/OneSixFTBInstance.h
-	logic/ftb/OneSixFTBInstance.cpp
-	logic/ftb/LegacyFTBInstance.h
-	logic/ftb/LegacyFTBInstance.cpp
-	logic/ftb/FTBProfileStrategy.h
-	logic/ftb/FTBProfileStrategy.cpp
-	logic/ftb/FTBPlugin.h
-	logic/ftb/FTBPlugin.cpp
-
-	# the screenshots feature
-	logic/screenshots/Screenshot.h
-	logic/screenshots/ImgurUpload.h
-	logic/screenshots/ImgurUpload.cpp
-	logic/screenshots/ImgurAlbumCreation.h
-	logic/screenshots/ImgurAlbumCreation.cpp
-
-	# Icons
-	logic/icons/MMCIcon.h
-	logic/icons/MMCIcon.cpp
-	logic/icons/IconList.h
-	logic/icons/IconList.cpp
-
-	# Tasks
-	logic/tasks/ProgressProvider.h
-	logic/tasks/Task.h
-	logic/tasks/Task.cpp
-	logic/tasks/ThreadTask.h
-	logic/tasks/ThreadTask.cpp
-	logic/tasks/SequentialTask.h
-	logic/tasks/SequentialTask.cpp
-
-	# Settings
-	logic/settings/INIFile.cpp
-	logic/settings/INIFile.h
-	logic/settings/INISettingsObject.cpp
-	logic/settings/INISettingsObject.h
-	logic/settings/OverrideSetting.cpp
-	logic/settings/OverrideSetting.h
-	logic/settings/Setting.cpp
-	logic/settings/Setting.h
-	logic/settings/SettingsObject.cpp
-	logic/settings/SettingsObject.h
-
-	# Java related code
-	logic/java/JavaChecker.h
-	logic/java/JavaChecker.cpp
-	logic/java/JavaUtils.h
-	logic/java/JavaUtils.cpp
-	logic/java/JavaVersionList.h
-	logic/java/JavaVersionList.cpp
-	logic/java/JavaCheckerJob.h
-	logic/java/JavaCheckerJob.cpp
-
-	# Assets
-	logic/minecraft/AssetsUtils.h
-	logic/minecraft/AssetsUtils.cpp
-
-	# Tools
-	logic/tools/BaseExternalTool.h
-	logic/tools/BaseExternalTool.cpp
-	logic/tools/MCEditTool.h
-	logic/tools/MCEditTool.cpp
-	logic/tools/BaseProfiler.h
-	logic/tools/BaseProfiler.cpp
-	logic/tools/JProfiler.h
-	logic/tools/JProfiler.cpp
-	logic/tools/JVisualVM.h
-	logic/tools/JVisualVM.cpp
-
-	# Forge and all things forge related
-	logic/forge/ForgeVersion.h
-	logic/forge/ForgeVersion.cpp
-	logic/forge/ForgeVersionList.h
-	logic/forge/ForgeVersionList.cpp
-	logic/forge/ForgeMirror.h
-	logic/forge/ForgeMirrors.h
-	logic/forge/ForgeMirrors.cpp
-	logic/forge/ForgeXzDownload.h
-	logic/forge/ForgeXzDownload.cpp
-	logic/forge/LegacyForge.h
-	logic/forge/LegacyForge.cpp
-	logic/forge/ForgeInstaller.h
-	logic/forge/ForgeInstaller.cpp
-
-	# Liteloader and related things
-	logic/liteloader/LiteLoaderInstaller.h
-	logic/liteloader/LiteLoaderInstaller.cpp
-	logic/liteloader/LiteLoaderVersionList.h
-	logic/liteloader/LiteLoaderVersionList.cpp
-
-	# Translations
-	logic/trans/TranslationDownloader.h
-	logic/trans/TranslationDownloader.cpp
-)
-
-
-######## UIs ########
-SET(MULTIMC_UIS
-	# Option pages
-	gui/pages/VersionPage.ui
-	gui/pages/ModFolderPage.ui
-	gui/pages/LegacyUpgradePage.ui
-	gui/pages/LegacyJarModPage.ui
-	gui/pages/LogPage.ui
-	gui/pages/InstanceSettingsPage.ui
-	gui/pages/NotesPage.ui
-	gui/pages/ScreenshotsPage.ui
-	gui/pages/OtherLogsPage.ui
-
-	# Global settings pages
-	gui/pages/global/AccountListPage.ui
-	gui/pages/global/ExternalToolsPage.ui
-	gui/pages/global/JavaPage.ui
-	gui/pages/global/MinecraftPage.ui
-	gui/pages/global/MultiMCPage.ui
-	gui/pages/global/ProxyPage.ui
-
-	# Dialogs
-	gui/dialogs/CopyInstanceDialog.ui
-	gui/dialogs/NewInstanceDialog.ui
-	gui/dialogs/AboutDialog.ui
-	gui/dialogs/VersionSelectDialog.ui
-	gui/dialogs/ProgressDialog.ui
-	gui/dialogs/IconPickerDialog.ui
-	gui/dialogs/AccountSelectDialog.ui
-	gui/dialogs/EditAccountDialog.ui
-	gui/dialogs/LoginDialog.ui
-	gui/dialogs/UpdateDialog.ui
-	gui/dialogs/NotificationDialog.ui
-
-	# Widgets/other
-	gui/widgets/MCModInfoFrame.ui
-)
-
-set(FILES_TO_TRANSLATE)
-foreach(file ${MULTIMC_SOURCES})
-	get_filename_component(absfile "${file}" ABSOLUTE)
-	list(APPEND FILES_TO_TRANSLATE "${absfile}")
-endforeach()
-
-foreach(file ${MULTIMC_UIS})
-	get_filename_component(absfile "${file}" ABSOLUTE)
-	list(APPEND FILES_TO_TRANSLATE "${absfile}")
-endforeach()
-
-set(MULTIMC_QRCS
-	resources/backgrounds/backgrounds.qrc
-	resources/multimc/multimc.qrc
-	resources/pe_dark/pe_dark.qrc
-	resources/pe_light/pe_light.qrc
-	resources/pe_colored/pe_colored.qrc
-	resources/pe_blue/pe_blue.qrc
-	resources/OSX/OSX.qrc
-	resources/iOS/iOS.qrc
-	resources/instances/instances.qrc
-	resources/versions/versions.qrc
-)
-
-
-######## Windows resource files ########
-if(WIN32)
-	set(MULTIMC_RCS resources/multimc.rc)
-endif()
-
-####### X11 Stuff #######
-if(UNIX AND NOT APPLE)
-	find_package(Qt5X11Extras REQUIRED)
-	set(MultiMC_LINK_ADDITIONAL_LIBS ${MultiMC_LINK_ADDITIONAL_LIBS} Qt5::X11Extras)
-	set(MultiMC_LINK_ADDITIONAL_LIBS ${MultiMC_LINK_ADDITIONAL_LIBS} xcb)
-	list(APPEND MULTIMC_SOURCES gui/Platform_X11.cpp)
-else()
-	list(APPEND MULTIMC_SOURCES gui/Platform_Other.cpp)
-endif()
-
-
-################################ COMPILE ################################
-
-# Link additional libraries
-if(WIN32)
-	set(MultiMC_LINK_ADDITIONAL_LIBS ${MultiMC_LINK_ADDITIONAL_LIBS} Qt5::WinMain)
-endif(WIN32)
-
-# Tell CMake that MultiMCLauncher.jar is generated.
-#SET_SOURCE_FILES_PROPERTIES(${PROJECT_BINARY_DIR}/depends/launcher/MultiMCLauncher.jar GENERATED)
-#SET_SOURCE_FILES_PROPERTIES(${PROJECT_BINARY_DIR}/depends/javacheck/JavaCheck.jar GENERATED)
-
-# Qt 5 stuff
-qt5_wrap_ui(MULTIMC_UI ${MULTIMC_UIS})
-qt5_add_resources(MULTIMC_RESOURCES ${MULTIMC_QRCS})
-
-# Add common library
-add_library(MultiMC_common STATIC ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES})
-
-# Add executable
-add_executable(MultiMC MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS})
-
-# Link
-target_link_libraries(MultiMC MultiMC_common)
-
-target_link_libraries(MultiMC_common xz-embedded unpack200 iconfix libUtil LogicalGui
-	${QUAZIP_LIBRARIES} Qt5::Core Qt5::Xml Qt5::Widgets Qt5::Network Qt5::Concurrent Qt5::WebKitWidgets
-		${MultiMC_LINK_ADDITIONAL_LIBS}
-)
-
-target_link_libraries(MultiMC_common Qt5::Core Qt5::Widgets Qt5::Network Qt5::Concurrent Qt5::WebKitWidgets
-	${MultiMC_LINK_ADDITIONAL_LIBS}
-)
-
-add_dependencies(MultiMC_common QuaZIP)
-
-################################ INSTALLATION AND PACKAGING ################################
-
-######## Install ########
-
-#### Executable ####
-if(APPLE AND UNIX) ## OSX
-	install(TARGETS MultiMC
-		BUNDLE DESTINATION . COMPONENT Runtime
-		RUNTIME DESTINATION MultiMC.app/Contents/MacOS COMPONENT Runtime
-	)
-
-elseif(UNIX) ## LINUX and similar
-	install(TARGETS MultiMC
-		BUNDLE DESTINATION . COMPONENT Runtime
-		RUNTIME DESTINATION bin COMPONENT Runtime
-	)
-	install(PROGRAMS package/linux/MultiMC DESTINATION .)
-
-elseif(WIN32) ## WINDOWS
-	install(TARGETS MultiMC
-		BUNDLE DESTINATION . COMPONENT Runtime
-		LIBRARY DESTINATION . COMPONENT Runtime
-		RUNTIME DESTINATION . COMPONENT Runtime
-	)
-endif()
-
-#### Dist package logic ####
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-	# Image formats
-	install(
-		DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
-		DESTINATION ${PLUGIN_DEST_DIR}
-		COMPONENT Runtime
-		REGEX "tga|tiff|mng" EXCLUDE
-	)
-	# Icon engines
-	install(
-		DIRECTORY "${QT_PLUGINS_DIR}/iconengines"
-		DESTINATION ${PLUGIN_DEST_DIR}
-		COMPONENT Runtime
-		REGEX "fontawesome" EXCLUDE
-	)
-	# Platform plugins
-	install(
-		DIRECTORY "${QT_PLUGINS_DIR}/platforms"
-		DESTINATION ${PLUGIN_DEST_DIR}
-		COMPONENT Runtime
-		REGEX "minimal|linuxfb|offscreen" EXCLUDE
-	)
-else()
-	# Image formats
-	install(
-		DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
-		DESTINATION ${PLUGIN_DEST_DIR}
-		COMPONENT Runtime
-		REGEX "tga|tiff|mng" EXCLUDE
-		REGEX "d\\." EXCLUDE
-		REGEX "_debug\\." EXCLUDE
-	)
-	# Icon engines
-	install(
-		DIRECTORY "${QT_PLUGINS_DIR}/iconengines"
-		DESTINATION ${PLUGIN_DEST_DIR}
-		COMPONENT Runtime
-		REGEX "fontawesome" EXCLUDE
-		REGEX "d\\." EXCLUDE
-		REGEX "_debug\\." EXCLUDE
-	)
-	# Platform plugins
-	install(
-		DIRECTORY "${QT_PLUGINS_DIR}/platforms"
-		DESTINATION ${PLUGIN_DEST_DIR}
-		COMPONENT Runtime
-		REGEX "minimal|linuxfb|offscreen" EXCLUDE
-		REGEX "d\\." EXCLUDE
-		REGEX "_debug\\." EXCLUDE
-	)
-	if(APPLE)
-	# Accessible plugin to make buttons look decent on osx
-	install(
-		DIRECTORY "${QT_PLUGINS_DIR}/accessible"
-		DESTINATION ${PLUGIN_DEST_DIR}
-		COMPONENT Runtime
-		REGEX "quick" EXCLUDE
-		REGEX "d\\." EXCLUDE
-		REGEX "_debug\\." EXCLUDE
-	)
-	endif()
-endif()
-
-# qtconf
-install(
-	CODE "
-file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\")
-"
-	COMPONENT Runtime
-)
-
-# ICNS file for OS X
-if(APPLE)
-	install(FILES resources/MultiMC.icns DESTINATION MultiMC.app/Contents/Resources)
-endif()
-
-configure_file(
-	"${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in"
-	"${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake"
-	@ONLY
-)
-install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" COMPONENT Runtime)
-
-
-
-######## Package ########
-
-# Package with CPack
-if(UNIX)
-	if(APPLE)
-	set(CPACK_GENERATOR "ZIP")
-	else()
-	set(CPACK_GENERATOR "TGZ")
-	endif()
-elseif(WIN32)
-	set(CPACK_GENERATOR "ZIP")
-endif()
-set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
-
-set(CPACK_PACKAGE_NAME "MultiMC 5")
-set(CPACK_PACKAGE_VENDOR "")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MultiMC - Minecraft launcher and management tool.")
-set(CPACK_PACKAGE_VERSION "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_REV}.${MultiMC_VERSION_BUILD}")
-set(CPACK_PACKAGE_VERSION_MAJOR ${MultiMC_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${MultiMC_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${MultiMC_VERSION_REV})
-
-if(CPACK_GENERATOR STREQUAL "NSIS")
-	set(CPACK_PACKAGE_FILE_NAME "Setup-MultiMC")
-else()
-	set(CPACK_PACKAGE_FILE_NAME "MultiMC")
-endif()
-
-if(WIN32)
-	set(CPACK_PACKAGE_INSTALL_DIRECTORY "MultiMC 5")
-endif()
-
-include(CPack)
-
 include(Coverity)
 
-# Translations
-add_subdirectory(translations)
-
 # Tests
 add_subdirectory(tests)
+
+add_subdirectory(logic)
+
+add_subdirectory(application)
diff --git a/BuildConfig.cpp.in b/application/BuildConfig.cpp.in
index 04cfbf05..04cfbf05 100644
--- a/BuildConfig.cpp.in
+++ b/application/BuildConfig.cpp.in
diff --git a/BuildConfig.h b/application/BuildConfig.h
index 60aefeb4..60aefeb4 100644
--- a/BuildConfig.h
+++ b/application/BuildConfig.h
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
new file mode 100644
index 00000000..58a90efa
--- /dev/null
+++ b/application/CMakeLists.txt
@@ -0,0 +1,473 @@
+project(MultiMC-Application)
+
+######## Set URLs ########
+set(MultiMC_NEWS_RSS_URL "http://multimc.org/rss.xml" CACHE STRING "URL to fetch MultiMC's news RSS feed from.")
+
+######## Set version numbers ########
+set(MultiMC_VERSION_MAJOR	 0)
+set(MultiMC_VERSION_MINOR	 4)
+set(MultiMC_VERSION_HOTFIX   5)
+
+# Build number
+set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
+
+# Version type
+set(MultiMC_VERSION_TYPE "Custom" CACHE STRING "MultiMC's version type. This should be one of 'Custom', 'Release', 'ReleaseCandidate', or 'Development', depending on what type of version this is.")
+
+# Build platform.
+set(MultiMC_BUILD_PLATFORM "" CACHE STRING "A short string identifying the platform that this build was built for. Only used by the notification system and to display in the about dialog.")
+
+# Version channel
+set(MultiMC_VERSION_CHANNEL "" CACHE STRING "The current build's channel. Included in the version string.")
+
+# Channel list URL
+set(MultiMC_CHANLIST_URL "" CACHE STRING "URL for the channel list.")
+
+# Updater enabled?
+set(MultiMC_UPDATER false CACHE BOOL "Whether or not the update system is enabled. If this is enabled, you must also set MultiMC_CHANLIST_URL and MultiMC_VERSION_CHANNEL in order for it to work properly.")
+
+# Notification URL
+set(MultiMC_NOTIFICATION_URL "" CACHE STRING "URL for checking for notifications.")
+
+set(MultiMC_RELEASE_VERSION_NAME "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}")
+if(MultiMC_VERSION_HOTFIX GREATER 0)
+	set(MultiMC_RELEASE_VERSION_NAME "${MultiMC_RELEASE_VERSION_NAME}.${MultiMC_VERSION_HOTFIX}")
+endif()
+
+# Build a version string to display in the configure logs.
+if(MultiMC_VERSION_TYPE STREQUAL "Custom")
+	message(STATUS "Version Type: Custom")
+	set(MultiMC_VERSION_STRING "${MultiMC_RELEASE_VERSION_NAME}")
+elseif(MultiMC_VERSION_TYPE STREQUAL "Release")
+	message(STATUS "Version Type: Stable Release")
+	set(MultiMC_VERSION_STRING "${MultiMC_RELEASE_VERSION_NAME}")
+elseif(MultiMC_VERSION_TYPE STREQUAL "Development")
+	message(STATUS "Version Type: Development")
+	set(MultiMC_VERSION_STRING "${MultiMC_RELEASE_VERSION_NAME}-dev${MultiMC_VERSION_BUILD}")
+else()
+	message(ERROR "Invalid build type.")
+endif()
+
+message(STATUS "MultiMC 5 Version: ${MultiMC_VERSION_STRING}")
+
+# If the update system is enabled, make sure MultiMC_CHANLIST_URL and MultiMC_VERSION_CHANNEL are set.
+if(MultiMC_UPDATER)
+	if(MultiMC_VERSION_CHANNEL STREQUAL "")
+		message(FATAL_ERROR "Update system is enabled, but MultiMC_VERSION_CHANNEL is not set.\n"
+				"Please ensure the CMake variables MultiMC_VERSION_CHANNEL, MultiMC_CHANLIST_URL, and MultiMC_VERSION_BUILD are set.")
+	endif()
+	if(MultiMC_CHANLIST_URL STREQUAL "")
+	message(FATAL_ERROR "Update system is enabled, but MultiMC_CHANLIST_URL is not set.\n"
+				"Please ensure the CMake variables MultiMC_VERSION_CHANNEL, MultiMC_CHANLIST_URL, and MultiMC_VERSION_BUILD are set.")
+	endif()
+	if(MultiMC_VERSION_BUILD LESS 0)
+	message(FATAL_ERROR "Update system is enabled, but MultiMC_VERSION_BUILD is not set.\n"
+				"Please ensure the CMake variables MultiMC_VERSION_CHANNEL, MultiMC_CHANLIST_URL, and MultiMC_VERSION_BUILD are set.")
+	endif()
+	message(STATUS "Updater is enabled. Channel list URL: ${MultiMC_CHANLIST_URL}")
+endif()
+
+#### Updater-related build config options ####
+option(MultiMC_UPDATER_DRY_RUN "Enable updater dry-run mode -- for updater development." OFF)
+option(MultiMC_UPDATER_FORCE_LOCAL "Do not download updated updater -- for updater development." OFF)
+
+if(MultiMC_UPDATER_DRY_RUN)
+	set(MultiMC_UPDATER_DRY_RUN_value "true")
+else()
+	set(MultiMC_UPDATER_DRY_RUN_value "false")
+endif()
+
+if(MultiMC_UPDATER_FORCE_LOCAL)
+	set(MultiMC_UPDATER_FORCE_LOCAL_value "true")
+else()
+	set(MultiMC_UPDATER_FORCE_LOCAL_value "false")
+endif()
+
+######## Configure header ########
+configure_file("${PROJECT_SOURCE_DIR}/BuildConfig.cpp.in" "${PROJECT_BINARY_DIR}/BuildConfig.cpp")
+
+######## Packaging/install paths setup ########
+
+if(UNIX AND APPLE)
+	set(BINARY_DEST_DIR MultiMC.app/Contents/MacOS)
+	set(PLUGIN_DEST_DIR MultiMC.app/Contents/MacOS)
+	set(QTCONF_DEST_DIR MultiMC.app/Contents/Resources)
+	set(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.app")
+
+	set(MACOSX_BUNDLE_BUNDLE_NAME "MultiMC")
+	set(MACOSX_BUNDLE_INFO_STRING "MultiMC Minecraft launcher and management utility.")
+	set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.multimc.MultiMC5")
+	set(MACOSX_BUNDLE_BUNDLE_VERSION "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}")
+	set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}")
+	set(MACOSX_BUNDLE_LONG_VERSION_STRING "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}")
+	set(MACOSX_BUNDLE_ICON_FILE MultiMC.icns)
+	set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2014 MultiMC Contributors")
+elseif(UNIX)
+	set(BINARY_DEST_DIR bin)
+	set(PLUGIN_DEST_DIR plugins)
+	set(QTCONF_DEST_DIR .)
+	set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/MultiMC")
+elseif(WIN32)
+	set(BINARY_DEST_DIR .)
+	set(PLUGIN_DEST_DIR .)
+	set(QTCONF_DEST_DIR .)
+	set(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.exe")
+endif()
+
+# directories to look for dependencies
+set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR})
+
+################################ FILES ################################
+
+######## Sources and headers ########
+SET(MULTIMC_SOURCES
+	# Application base
+	main.cpp
+	MultiMC.h
+	MultiMC.cpp
+	BuildConfig.h
+	${PROJECT_BINARY_DIR}/BuildConfig.cpp
+
+	# GUI - general utilities
+	GuiUtil.h
+	GuiUtil.cpp
+	ColumnResizer.h
+	ColumnResizer.cpp
+	InstanceProxyModel.h
+	InstanceProxyModel.cpp
+
+	# GUI - windows
+	MainWindow.h
+	MainWindow.cpp
+	ConsoleWindow.h
+	ConsoleWindow.cpp
+
+	# page provider for instances
+	InstancePageProvider.h
+	InstancePageProvider.cpp
+
+	# Annoying nag screen logic
+	NagUtils.h
+	NagUtils.cpp
+
+
+	# GUI - page dialog pages
+	pages/BasePage.h
+	pages/VersionPage.cpp
+	pages/VersionPage.h
+	pages/TexturePackPage.h
+	pages/ResourcePackPage.h
+	pages/ModFolderPage.cpp
+	pages/ModFolderPage.h
+	pages/NotesPage.cpp
+	pages/NotesPage.h
+	pages/LogPage.cpp
+	pages/LogPage.h
+	pages/InstanceSettingsPage.cpp
+	pages/InstanceSettingsPage.h
+	pages/ScreenshotsPage.cpp
+	pages/ScreenshotsPage.h
+	pages/OtherLogsPage.cpp
+	pages/OtherLogsPage.h
+
+	# GUI - global settings pages
+	pages/global/AccountListPage.cpp
+	pages/global/AccountListPage.h
+	pages/global/ExternalToolsPage.cpp
+	pages/global/ExternalToolsPage.h
+	pages/global/JavaPage.cpp
+	pages/global/JavaPage.h
+	pages/global/MinecraftPage.cpp
+	pages/global/MinecraftPage.h
+	pages/global/MultiMCPage.cpp
+	pages/global/MultiMCPage.h
+	pages/global/ProxyPage.cpp
+	pages/global/ProxyPage.h
+
+	# GUI - dialogs
+	dialogs/AboutDialog.cpp
+	dialogs/AboutDialog.h
+	dialogs/AccountSelectDialog.cpp
+	dialogs/AccountSelectDialog.h
+	dialogs/CopyInstanceDialog.cpp
+	dialogs/CopyInstanceDialog.h
+	dialogs/CustomMessageBox.cpp
+	dialogs/CustomMessageBox.h
+	dialogs/EditAccountDialog.cpp
+	dialogs/EditAccountDialog.h
+	dialogs/IconPickerDialog.cpp
+	dialogs/IconPickerDialog.h
+	dialogs/LoginDialog.cpp
+	dialogs/LoginDialog.h
+	dialogs/ModEditDialogCommon.cpp
+	dialogs/ModEditDialogCommon.h
+	dialogs/NewInstanceDialog.cpp
+	dialogs/NewInstanceDialog.h
+	dialogs/NotificationDialog.cpp
+	dialogs/NotificationDialog.h
+	pagedialog/PageDialog.cpp
+	pagedialog/PageDialog.h
+	dialogs/ProgressDialog.cpp
+	dialogs/ProgressDialog.h
+	dialogs/UpdateDialog.cpp
+	dialogs/UpdateDialog.h
+	dialogs/VersionSelectDialog.cpp
+	dialogs/VersionSelectDialog.h
+
+
+	# GUI - widgets
+	widgets/Common.cpp
+	widgets/Common.h
+	widgets/IconLabel.cpp
+	widgets/IconLabel.h
+	widgets/LabeledToolButton.cpp
+	widgets/LabeledToolButton.h
+	widgets/LineSeparator.cpp
+	widgets/LineSeparator.h
+	widgets/MCModInfoFrame.cpp
+	widgets/MCModInfoFrame.h
+	widgets/ModListView.cpp
+	widgets/ModListView.h
+	widgets/PageContainer.cpp
+	widgets/PageContainer.h
+	widgets/PageContainer_p.h
+	widgets/ServerStatus.cpp
+	widgets/ServerStatus.h
+	widgets/VersionListView.cpp
+	widgets/VersionListView.h
+
+
+	# GUI - instance group view
+	groupview/GroupedProxyModel.cpp
+	groupview/GroupedProxyModel.h
+	groupview/GroupView.cpp
+	groupview/GroupView.h
+	groupview/InstanceDelegate.cpp
+	groupview/InstanceDelegate.h
+	groupview/VisualGroup.cpp
+	groupview/VisualGroup.h
+)
+
+######## UIs ########
+SET(MULTIMC_UIS
+	# Option pages
+	pages/VersionPage.ui
+	pages/ModFolderPage.ui
+	pages/LogPage.ui
+	pages/InstanceSettingsPage.ui
+	pages/NotesPage.ui
+	pages/ScreenshotsPage.ui
+	pages/OtherLogsPage.ui
+
+	# Global settings pages
+	pages/global/AccountListPage.ui
+	pages/global/ExternalToolsPage.ui
+	pages/global/JavaPage.ui
+	pages/global/MinecraftPage.ui
+	pages/global/MultiMCPage.ui
+	pages/global/ProxyPage.ui
+
+	# Dialogs
+	dialogs/CopyInstanceDialog.ui
+	dialogs/NewInstanceDialog.ui
+	dialogs/AboutDialog.ui
+	dialogs/VersionSelectDialog.ui
+	dialogs/ProgressDialog.ui
+	dialogs/IconPickerDialog.ui
+	dialogs/AccountSelectDialog.ui
+	dialogs/EditAccountDialog.ui
+	dialogs/LoginDialog.ui
+	dialogs/UpdateDialog.ui
+	dialogs/NotificationDialog.ui
+
+	# Widgets/other
+	widgets/MCModInfoFrame.ui
+)
+
+set(MULTIMC_QRCS
+	resources/backgrounds/backgrounds.qrc
+	resources/multimc/multimc.qrc
+	resources/pe_dark/pe_dark.qrc
+	resources/pe_light/pe_light.qrc
+	resources/pe_colored/pe_colored.qrc
+	resources/pe_blue/pe_blue.qrc
+	resources/OSX/OSX.qrc
+	resources/iOS/iOS.qrc
+	resources/instances/instances.qrc
+	resources/versions/versions.qrc
+)
+
+######## Windows resource files ########
+if(WIN32)
+	set(MULTIMC_RCS resources/multimc.rc)
+endif()
+
+####### X11 Stuff #######
+if(UNIX AND NOT APPLE)
+	find_package(Qt5X11Extras REQUIRED)
+	set(MultiMC_LINK_ADDITIONAL_LIBS ${MultiMC_LINK_ADDITIONAL_LIBS} xcb Qt5::X11Extras)
+	list(APPEND MULTIMC_SOURCES Platform_X11.cpp)
+else()
+	list(APPEND MULTIMC_SOURCES Platform_Other.cpp)
+endif()
+
+
+# Link additional libraries
+if(WIN32)
+	set(MultiMC_LINK_ADDITIONAL_LIBS ${MultiMC_LINK_ADDITIONAL_LIBS} Qt5::WinMain)
+endif(WIN32)
+
+include_directories(../logic)
+
+# Qt 5 stuff
+qt5_wrap_ui(MULTIMC_UI ${MULTIMC_UIS})
+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 libUtil LogicalGui
+	${QUAZIP_LIBRARIES} Qt5::Core Qt5::Xml Qt5::Widgets Qt5::Network Qt5::Concurrent Qt5::WebKitWidgets
+		${MultiMC_LINK_ADDITIONAL_LIBS})
+
+################################ INSTALLATION AND PACKAGING ################################
+
+######## Install ########
+
+#### Executable ####
+if(APPLE AND UNIX) ## OSX
+	install(TARGETS MultiMC
+		BUNDLE DESTINATION . COMPONENT Runtime
+		RUNTIME DESTINATION MultiMC.app/Contents/MacOS COMPONENT Runtime
+	)
+
+elseif(UNIX) ## LINUX and similar
+	install(TARGETS MultiMC
+		BUNDLE DESTINATION . COMPONENT Runtime
+		RUNTIME DESTINATION bin COMPONENT Runtime
+	)
+	install(PROGRAMS package/linux/MultiMC DESTINATION .)
+
+elseif(WIN32) ## WINDOWS
+	install(TARGETS MultiMC
+		BUNDLE DESTINATION . COMPONENT Runtime
+		LIBRARY DESTINATION . COMPONENT Runtime
+		RUNTIME DESTINATION . COMPONENT Runtime
+	)
+endif()
+
+#### Java bits ####
+install_jar(JavaCheck "${BINARY_DEST_DIR}/jars")
+install_jar(NewLaunch "${BINARY_DEST_DIR}/jars")
+
+#### Dist package logic ####
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+	# Image formats
+	install(
+		DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
+		DESTINATION ${PLUGIN_DEST_DIR}
+		COMPONENT Runtime
+		REGEX "tga|tiff|mng" EXCLUDE
+	)
+	# Icon engines
+	install(
+		DIRECTORY "${QT_PLUGINS_DIR}/iconengines"
+		DESTINATION ${PLUGIN_DEST_DIR}
+		COMPONENT Runtime
+		REGEX "fontawesome" EXCLUDE
+	)
+	# Platform plugins
+	install(
+		DIRECTORY "${QT_PLUGINS_DIR}/platforms"
+		DESTINATION ${PLUGIN_DEST_DIR}
+		COMPONENT Runtime
+		REGEX "minimal|linuxfb|offscreen" EXCLUDE
+	)
+else()
+	# Image formats
+	install(
+		DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
+		DESTINATION ${PLUGIN_DEST_DIR}
+		COMPONENT Runtime
+		REGEX "tga|tiff|mng" EXCLUDE
+		REGEX "d\\." EXCLUDE
+		REGEX "_debug\\." EXCLUDE
+	)
+	# Icon engines
+	install(
+		DIRECTORY "${QT_PLUGINS_DIR}/iconengines"
+		DESTINATION ${PLUGIN_DEST_DIR}
+		COMPONENT Runtime
+		REGEX "fontawesome" EXCLUDE
+		REGEX "d\\." EXCLUDE
+		REGEX "_debug\\." EXCLUDE
+	)
+	# Platform plugins
+	install(
+		DIRECTORY "${QT_PLUGINS_DIR}/platforms"
+		DESTINATION ${PLUGIN_DEST_DIR}
+		COMPONENT Runtime
+		REGEX "minimal|linuxfb|offscreen" EXCLUDE
+		REGEX "d\\." EXCLUDE
+		REGEX "_debug\\." EXCLUDE
+	)
+	if(APPLE)
+	# Accessible plugin to make buttons look decent on osx
+	install(
+		DIRECTORY "${QT_PLUGINS_DIR}/accessible"
+		DESTINATION ${PLUGIN_DEST_DIR}
+		COMPONENT Runtime
+		REGEX "quick" EXCLUDE
+		REGEX "d\\." EXCLUDE
+		REGEX "_debug\\." EXCLUDE
+	)
+	endif()
+endif()
+
+# qtconf
+install(
+	CODE "
+file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\")
+"
+	COMPONENT Runtime
+)
+
+# ICNS file for OS X
+if(APPLE)
+	install(FILES resources/MultiMC.icns DESTINATION MultiMC.app/Contents/Resources)
+endif()
+
+configure_file(
+	"${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in"
+	"${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake"
+	@ONLY
+)
+install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" COMPONENT Runtime)
+
+
+
+######## Package ########
+
+# Package with CPack
+if(UNIX)
+	if(APPLE)
+	set(CPACK_GENERATOR "ZIP")
+	else()
+	set(CPACK_GENERATOR "TGZ")
+	endif()
+elseif(WIN32)
+	set(CPACK_GENERATOR "ZIP")
+endif()
+set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
+
+set(CPACK_PACKAGE_NAME "MultiMC 5")
+set(CPACK_PACKAGE_VENDOR "")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MultiMC - Minecraft launcher and management tool.")
+set(CPACK_PACKAGE_VERSION "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_REV}.${MultiMC_VERSION_BUILD}")
+set(CPACK_PACKAGE_VERSION_MAJOR ${MultiMC_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${MultiMC_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${MultiMC_VERSION_REV})
+
+set(CPACK_PACKAGE_FILE_NAME "MultiMC")
+
+include(CPack)
diff --git a/gui/ColumnResizer.cpp b/application/ColumnResizer.cpp
index 1c5597aa..1c5597aa 100644
--- a/gui/ColumnResizer.cpp
+++ b/application/ColumnResizer.cpp
diff --git a/gui/ColumnResizer.h b/application/ColumnResizer.h
index 4bbac383..4bbac383 100644
--- a/gui/ColumnResizer.h
+++ b/application/ColumnResizer.h
diff --git a/gui/ConsoleWindow.cpp b/application/ConsoleWindow.cpp
index a9c1f455..52c68299 100644
--- a/gui/ConsoleWindow.cpp
+++ b/application/ConsoleWindow.cpp
@@ -24,14 +24,14 @@
 #include <qlayoutitem.h>
 #include <QCloseEvent>
 
-#include <gui/Platform.h>
-#include <gui/dialogs/CustomMessageBox.h>
-#include <gui/dialogs/ProgressDialog.h>
+#include <Platform.h>
+#include <dialogs/CustomMessageBox.h>
+#include <dialogs/ProgressDialog.h>
 #include "widgets/PageContainer.h"
 #include "pages/LogPage.h"
 #include "InstancePageProvider.h"
 
-#include "logic/icons/IconList.h"
+#include "icons/IconList.h"
 
 class LogPageProvider : public BasePageProvider
 {
diff --git a/gui/ConsoleWindow.h b/application/ConsoleWindow.h
index a14cd2fc..6e3849c5 100644
--- a/gui/ConsoleWindow.h
+++ b/application/ConsoleWindow.h
@@ -17,7 +17,7 @@
 
 #include <QMainWindow>
 #include <QSystemTrayIcon>
-#include "logic/BaseProcess.h"
+#include "BaseProcess.h"
 
 class QPushButton;
 class PageContainer;
diff --git a/gui/GuiUtil.cpp b/application/GuiUtil.cpp
index fcbc8acd..fb42b9bc 100644
--- a/gui/GuiUtil.cpp
+++ b/application/GuiUtil.cpp
@@ -5,7 +5,7 @@
 #include <QApplication>
 
 #include "dialogs/ProgressDialog.h"
-#include "logic/net/PasteUpload.h"
+#include "net/PasteUpload.h"
 #include "dialogs/CustomMessageBox.h"
 
 void GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
diff --git a/gui/GuiUtil.h b/application/GuiUtil.h
index 9f872f75..9f872f75 100644
--- a/gui/GuiUtil.h
+++ b/application/GuiUtil.h
diff --git a/gui/InstancePageProvider.cpp b/application/InstancePageProvider.cpp
index e69de29b..e69de29b 100644
--- a/gui/InstancePageProvider.cpp
+++ b/application/InstancePageProvider.cpp
diff --git a/gui/InstancePageProvider.h b/application/InstancePageProvider.h
index d4f7cb91..a19e21c8 100644
--- a/gui/InstancePageProvider.h
+++ b/application/InstancePageProvider.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "logic/minecraft/OneSixInstance.h"
+#include "minecraft/OneSixInstance.h"
 #include "pages/BasePage.h"
 #include "pages/VersionPage.h"
 #include "pages/ModFolderPage.h"
diff --git a/gui/InstanceProxyModel.cpp b/application/InstanceProxyModel.cpp
index 09d6fd85..2048252c 100644
--- a/gui/InstanceProxyModel.cpp
+++ b/application/InstanceProxyModel.cpp
@@ -1,6 +1,6 @@
 #include "InstanceProxyModel.h"
 #include "MultiMC.h"
-#include <logic/BaseInstance.h>
+#include <BaseInstance.h>
 
 InstanceProxyModel::InstanceProxyModel(QObject *parent) : GroupedProxyModel(parent)
 {
diff --git a/gui/InstanceProxyModel.h b/application/InstanceProxyModel.h
index e558efc4..e558efc4 100644
--- a/gui/InstanceProxyModel.h
+++ b/application/InstanceProxyModel.h
diff --git a/gui/MainWindow.cpp b/application/MainWindow.cpp
index 0b0af7f4..8e235e19 100644
--- a/gui/MainWindow.cpp
+++ b/application/MainWindow.cpp
@@ -329,69 +329,69 @@ namespace Ui {
 #include "userutils.h"
 #include "pathutils.h"
 
-#include "gui/groupview/GroupView.h"
-#include "gui/groupview/InstanceDelegate.h"
-#include "gui/InstanceProxyModel.h"
+#include "groupview/GroupView.h"
+#include "groupview/InstanceDelegate.h"
+#include "InstanceProxyModel.h"
 
-#include "gui/Platform.h"
+#include "Platform.h"
 
-#include "gui/widgets/LabeledToolButton.h"
+#include "widgets/LabeledToolButton.h"
 #include "widgets/ServerStatus.h"
 
-#include "gui/dialogs/NewInstanceDialog.h"
-#include "gui/dialogs/ProgressDialog.h"
-#include "gui/dialogs/AboutDialog.h"
-#include "gui/dialogs/VersionSelectDialog.h"
-#include "gui/dialogs/CustomMessageBox.h"
-#include "gui/dialogs/IconPickerDialog.h"
-#include "gui/dialogs/CopyInstanceDialog.h"
-#include "gui/dialogs/AccountSelectDialog.h"
-#include "gui/dialogs/UpdateDialog.h"
-#include "gui/dialogs/EditAccountDialog.h"
-#include "gui/dialogs/NotificationDialog.h"
-
-#include "gui/pages/global/MultiMCPage.h"
-#include "gui/pages/global/ExternalToolsPage.h"
-#include "gui/pages/global/AccountListPage.h"
-#include "gui/pages/global/ProxyPage.h"
-#include "gui/pages/global/JavaPage.h"
-#include "gui/pages/global/MinecraftPage.h"
-
-#include "gui/ConsoleWindow.h"
+#include "dialogs/NewInstanceDialog.h"
+#include "dialogs/ProgressDialog.h"
+#include "dialogs/AboutDialog.h"
+#include "dialogs/VersionSelectDialog.h"
+#include "dialogs/CustomMessageBox.h"
+#include "dialogs/IconPickerDialog.h"
+#include "dialogs/CopyInstanceDialog.h"
+#include "dialogs/AccountSelectDialog.h"
+#include "dialogs/UpdateDialog.h"
+#include "dialogs/EditAccountDialog.h"
+#include "dialogs/NotificationDialog.h"
+
+#include "pages/global/MultiMCPage.h"
+#include "pages/global/ExternalToolsPage.h"
+#include "pages/global/AccountListPage.h"
+#include "pages/global/ProxyPage.h"
+#include "pages/global/JavaPage.h"
+#include "pages/global/MinecraftPage.h"
+
+#include "ConsoleWindow.h"
 #include "pagedialog/PageDialog.h"
 
-#include "logic/InstanceList.h"
-#include "logic/minecraft/MinecraftVersionList.h"
-#include "logic/minecraft/LwjglVersionList.h"
-#include "logic/icons/IconList.h"
-#include "logic/java/JavaVersionList.h"
+#include "InstanceList.h"
+#include "minecraft/MinecraftVersionList.h"
+#include "minecraft/LwjglVersionList.h"
+#include "icons/IconList.h"
+#include "java/JavaVersionList.h"
 
-#include "logic/auth/flows/AuthenticateTask.h"
-#include "logic/auth/flows/RefreshTask.h"
+#include "auth/flows/AuthenticateTask.h"
+#include "auth/flows/RefreshTask.h"
 
-#include "logic/updater/DownloadTask.h"
+#include "updater/DownloadTask.h"
 
-#include "logic/news/NewsChecker.h"
+#include "news/NewsChecker.h"
 
-#include "logic/net/URLConstants.h"
-#include "logic/net/NetJob.h"
-#include "logic/Env.h"
+#include "net/URLConstants.h"
+#include "net/NetJob.h"
+#include "Env.h"
 
-#include "logic/BaseInstance.h"
-#include "logic/BaseProcess.h"
-#include "logic/java/JavaUtils.h"
-#include "gui/NagUtils.h"
+#include "BaseInstance.h"
+#include "BaseProcess.h"
+#include "java/JavaUtils.h"
+#include "NagUtils.h"
 #include "InstancePageProvider.h"
-#include "logic/minecraft/SkinUtils.h"
+#include "minecraft/SkinUtils.h"
 
-//#include "logic/minecraft/LegacyInstance.h"
+//#include "minecraft/LegacyInstance.h"
 
-#include <logic/updater/UpdateChecker.h>
-#include <logic/notifications/NotificationChecker.h>
-#include <logic/tasks/ThreadTask.h>
-#include "logic/net/CacheDownload.h"
+#include <updater/UpdateChecker.h>
+#include <notifications/NotificationChecker.h>
+#include <tasks/ThreadTask.h>
+#include <net/CacheDownload.h>
 
-#include "logic/tools/BaseProfiler.h"
+#include "tools/BaseProfiler.h"
 
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
 {
diff --git a/gui/MainWindow.h b/application/MainWindow.h
index 13edce81..96d9c7bb 100644
--- a/gui/MainWindow.h
+++ b/application/MainWindow.h
@@ -19,10 +19,10 @@
 #include <QProcess>
 #include <QTimer>
 
-#include "logic/BaseInstance.h"
-#include "logic/auth/MojangAccount.h"
-#include "logic/net/NetJob.h"
-#include "logic/updater/GoUpdate.h"
+#include "BaseInstance.h"
+#include "auth/MojangAccount.h"
+#include "net/NetJob.h"
+#include "updater/GoUpdate.h"
 
 class NewsChecker;
 class NotificationChecker;
diff --git a/MultiMC.cpp b/application/MultiMC.cpp
index 2ce668f2..ba6d7880 100644
--- a/MultiMC.cpp
+++ b/application/MultiMC.cpp
@@ -12,38 +12,37 @@
 #include <QDesktopServices>
 #include <QDebug>
 
-#include "gui/dialogs/VersionSelectDialog.h"
-#include "logic/InstanceList.h"
-#include "logic/auth/MojangAccountList.h"
-#include "logic/icons/IconList.h"
-#include "logic/minecraft/LwjglVersionList.h"
-#include "logic/minecraft/MinecraftVersionList.h"
-#include "logic/liteloader/LiteLoaderVersionList.h"
+#include "dialogs/VersionSelectDialog.h"
+#include "InstanceList.h"
+#include "auth/MojangAccountList.h"
+#include "icons/IconList.h"
+#include "minecraft/LwjglVersionList.h"
+#include "minecraft/MinecraftVersionList.h"
+#include "liteloader/LiteLoaderVersionList.h"
 
-#include "logic/forge/ForgeVersionList.h"
+#include "forge/ForgeVersionList.h"
 
-#include "logic/net/HttpMetaCache.h"
-#include "logic/net/URLConstants.h"
-#include "logic/Env.h"
+#include "net/HttpMetaCache.h"
+#include "net/URLConstants.h"
+#include "Env.h"
 
-#include "logic/java/JavaUtils.h"
+#include "java/JavaUtils.h"
 
-#include "logic/updater/UpdateChecker.h"
+#include "updater/UpdateChecker.h"
 
-#include "logic/tools/JProfiler.h"
-#include "logic/tools/JVisualVM.h"
-#include "logic/tools/MCEditTool.h"
+#include "tools/JProfiler.h"
+#include "tools/JVisualVM.h"
+#include "tools/MCEditTool.h"
 
 #include "pathutils.h"
 #include "cmdutils.h"
 #include <xdgicon.h>
-#include "logic/settings/INISettingsObject.h"
-#include "logic/settings/Setting.h"
+#include "settings/INISettingsObject.h"
+#include "settings/Setting.h"
 
+#include "trans/TranslationDownloader.h"
 
-#include "logic/trans/TranslationDownloader.h"
-
-#include "logic/ftb/FTBPlugin.h"
+#include "ftb/FTBPlugin.h"
 
 using namespace Util::Commandline;
 
diff --git a/MultiMC.h b/application/MultiMC.h
index b78bbbd2..b78bbbd2 100644
--- a/MultiMC.h
+++ b/application/MultiMC.h
diff --git a/gui/NagUtils.cpp b/application/NagUtils.cpp
index 429bdfcf..41e2f63e 100644
--- a/gui/NagUtils.cpp
+++ b/application/NagUtils.cpp
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#include "gui/NagUtils.h"
-#include "gui/dialogs/CustomMessageBox.h"
+#include "NagUtils.h"
+#include "dialogs/CustomMessageBox.h"
 
 namespace NagUtils
 {
diff --git a/gui/NagUtils.h b/application/NagUtils.h
index d757703a..d757703a 100644
--- a/gui/NagUtils.h
+++ b/application/NagUtils.h
diff --git a/gui/Platform.h b/application/Platform.h
index 349e5ecc..349e5ecc 100644
--- a/gui/Platform.h
+++ b/application/Platform.h
diff --git a/gui/Platform_Other.cpp b/application/Platform_Other.cpp
index 197af55e..7eaf91d4 100644
--- a/gui/Platform_Other.cpp
+++ b/application/Platform_Other.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gui/Platform.h>
+#include <Platform.h>
 /**
  * Stub for non-X11 platforms
  * @brief MultiMCPlatform::fixWM_CLASS
diff --git a/gui/Platform_X11.cpp b/application/Platform_X11.cpp
index b6a6cbce..baca15dd 100644
--- a/gui/Platform_X11.cpp
+++ b/application/Platform_X11.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gui/Platform.h>
+#include <Platform.h>
 #include <QtX11Extras/QX11Info>
 #include <xcb/xcb.h>
 
diff --git a/gui/dialogs/AboutDialog.cpp b/application/dialogs/AboutDialog.cpp
index ee08beea..abcc76f2 100644
--- a/gui/dialogs/AboutDialog.cpp
+++ b/application/dialogs/AboutDialog.cpp
@@ -17,10 +17,10 @@
 #include "ui_AboutDialog.h"
 #include <QIcon>
 #include "MultiMC.h"
-#include "gui/Platform.h"
+#include "Platform.h"
 #include "BuildConfig.h"
 
-#include <logic/net/NetJob.h>
+#include <net/NetJob.h>
 
 // Credits
 // This is a hack, but I can't think of a better way to do this easily without screwing with QTextDocument...
diff --git a/gui/dialogs/AboutDialog.h b/application/dialogs/AboutDialog.h
index 2022e9a3..1885e9c0 100644
--- a/gui/dialogs/AboutDialog.h
+++ b/application/dialogs/AboutDialog.h
@@ -17,7 +17,7 @@
 
 #include <QDialog>
 
-#include <logic/net/ByteArrayDownload.h>
+#include <net/ByteArrayDownload.h>
 
 namespace Ui
 {
diff --git a/gui/dialogs/AboutDialog.ui b/application/dialogs/AboutDialog.ui
index 2b5f8b78..2b5f8b78 100644
--- a/gui/dialogs/AboutDialog.ui
+++ b/application/dialogs/AboutDialog.ui
diff --git a/gui/dialogs/AccountSelectDialog.cpp b/application/dialogs/AccountSelectDialog.cpp
index 6ae60738..3bf83d62 100644
--- a/gui/dialogs/AccountSelectDialog.cpp
+++ b/application/dialogs/AccountSelectDialog.cpp
@@ -20,7 +20,7 @@
 
 #include <QDebug>
 
-#include <gui/dialogs/ProgressDialog.h>
+#include <dialogs/ProgressDialog.h>
 
 #include <MultiMC.h>
 
diff --git a/gui/dialogs/AccountSelectDialog.h b/application/dialogs/AccountSelectDialog.h
index 0bf9b403..21784032 100644
--- a/gui/dialogs/AccountSelectDialog.h
+++ b/application/dialogs/AccountSelectDialog.h
@@ -19,7 +19,7 @@
 
 #include <memory>
 
-#include "logic/auth/MojangAccountList.h"
+#include "auth/MojangAccountList.h"
 
 namespace Ui
 {
diff --git a/gui/dialogs/AccountSelectDialog.ui b/application/dialogs/AccountSelectDialog.ui
index 7af1512a..7af1512a 100644
--- a/gui/dialogs/AccountSelectDialog.ui
+++ b/application/dialogs/AccountSelectDialog.ui
diff --git a/gui/dialogs/CopyInstanceDialog.cpp b/application/dialogs/CopyInstanceDialog.cpp
index 038fb896..7c98978b 100644
--- a/gui/dialogs/CopyInstanceDialog.cpp
+++ b/application/dialogs/CopyInstanceDialog.cpp
@@ -20,16 +20,16 @@
 #include "CopyInstanceDialog.h"
 #include "ui_CopyInstanceDialog.h"
 
-#include "gui/Platform.h"
-#include "gui/dialogs/VersionSelectDialog.h"
-#include "gui/dialogs/ProgressDialog.h"
-#include "gui/dialogs/IconPickerDialog.h"
+#include "Platform.h"
+#include "dialogs/VersionSelectDialog.h"
+#include "dialogs/ProgressDialog.h"
+#include "dialogs/IconPickerDialog.h"
 
-#include "logic/BaseVersion.h"
-#include "logic/icons/IconList.h"
-#include "logic/tasks/Task.h"
-#include "logic/BaseInstance.h"
-#include "logic/InstanceList.h"
+#include "BaseVersion.h"
+#include "icons/IconList.h"
+#include "tasks/Task.h"
+#include "BaseInstance.h"
+#include "InstanceList.h"
 
 CopyInstanceDialog::CopyInstanceDialog(InstancePtr original, QWidget *parent)
 	:QDialog(parent), ui(new Ui::CopyInstanceDialog), m_original(original)
diff --git a/gui/dialogs/CopyInstanceDialog.h b/application/dialogs/CopyInstanceDialog.h
index 9e27d4ea..faa20615 100644
--- a/gui/dialogs/CopyInstanceDialog.h
+++ b/application/dialogs/CopyInstanceDialog.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <QDialog>
-#include "logic/BaseVersion.h"
-#include <logic/BaseInstance.h>
+#include "BaseVersion.h"
+#include <BaseInstance.h>
 
 class BaseInstance;
 
diff --git a/gui/dialogs/CopyInstanceDialog.ui b/application/dialogs/CopyInstanceDialog.ui
index 2615168c..2615168c 100644
--- a/gui/dialogs/CopyInstanceDialog.ui
+++ b/application/dialogs/CopyInstanceDialog.ui
diff --git a/gui/dialogs/CustomMessageBox.cpp b/application/dialogs/CustomMessageBox.cpp
index 0fb5bd19..0fb5bd19 100644
--- a/gui/dialogs/CustomMessageBox.cpp
+++ b/application/dialogs/CustomMessageBox.cpp
diff --git a/gui/dialogs/CustomMessageBox.h b/application/dialogs/CustomMessageBox.h
index 0a7202d7..0a7202d7 100644
--- a/gui/dialogs/CustomMessageBox.h
+++ b/application/dialogs/CustomMessageBox.h
diff --git a/gui/dialogs/EditAccountDialog.cpp b/application/dialogs/EditAccountDialog.cpp
index b78cebee..b78cebee 100644
--- a/gui/dialogs/EditAccountDialog.cpp
+++ b/application/dialogs/EditAccountDialog.cpp
diff --git a/gui/dialogs/EditAccountDialog.h b/application/dialogs/EditAccountDialog.h
index df8b21bf..df8b21bf 100644
--- a/gui/dialogs/EditAccountDialog.h
+++ b/application/dialogs/EditAccountDialog.h
diff --git a/gui/dialogs/EditAccountDialog.ui b/application/dialogs/EditAccountDialog.ui
index 5f727bd4..5f727bd4 100644
--- a/gui/dialogs/EditAccountDialog.ui
+++ b/application/dialogs/EditAccountDialog.ui
diff --git a/gui/dialogs/IconPickerDialog.cpp b/application/dialogs/IconPickerDialog.cpp
index 90bf2ef4..cafd47b7 100644
--- a/gui/dialogs/IconPickerDialog.cpp
+++ b/application/dialogs/IconPickerDialog.cpp
@@ -22,10 +22,10 @@
 #include "IconPickerDialog.h"
 #include "ui_IconPickerDialog.h"
 
-#include "gui/Platform.h"
-#include "gui/groupview/InstanceDelegate.h"
+#include "Platform.h"
+#include "groupview/InstanceDelegate.h"
 
-#include "logic/icons/IconList.h"
+#include "icons/IconList.h"
 
 IconPickerDialog::IconPickerDialog(QWidget *parent)
 	: QDialog(parent), ui(new Ui::IconPickerDialog)
diff --git a/gui/dialogs/IconPickerDialog.h b/application/dialogs/IconPickerDialog.h
index 610d9306..610d9306 100644
--- a/gui/dialogs/IconPickerDialog.h
+++ b/application/dialogs/IconPickerDialog.h
diff --git a/gui/dialogs/IconPickerDialog.ui b/application/dialogs/IconPickerDialog.ui
index c548edfb..c548edfb 100644
--- a/gui/dialogs/IconPickerDialog.ui
+++ b/application/dialogs/IconPickerDialog.ui
diff --git a/gui/dialogs/LoginDialog.cpp b/application/dialogs/LoginDialog.cpp
index 75fdd502..3af5c702 100644
--- a/gui/dialogs/LoginDialog.cpp
+++ b/application/dialogs/LoginDialog.cpp
@@ -16,7 +16,7 @@
 #include "LoginDialog.h"
 #include "ui_LoginDialog.h"
 
-#include "logic/auth/YggdrasilTask.h"
+#include "auth/YggdrasilTask.h"
 
 #include <QtWidgets/QPushButton>
 
diff --git a/gui/dialogs/LoginDialog.h b/application/dialogs/LoginDialog.h
index 79bad76a..63c95fb8 100644
--- a/gui/dialogs/LoginDialog.h
+++ b/application/dialogs/LoginDialog.h
@@ -18,7 +18,7 @@
 #include <QtWidgets/QDialog>
 #include <QtCore/QEventLoop>
 
-#include "logic/auth/MojangAccount.h"
+#include "auth/MojangAccount.h"
 
 namespace Ui
 {
diff --git a/gui/dialogs/LoginDialog.ui b/application/dialogs/LoginDialog.ui
index b24b1c0c..b24b1c0c 100644
--- a/gui/dialogs/LoginDialog.ui
+++ b/application/dialogs/LoginDialog.ui
diff --git a/gui/dialogs/ModEditDialogCommon.cpp b/application/dialogs/ModEditDialogCommon.cpp
index 4a2115d8..4a2115d8 100644
--- a/gui/dialogs/ModEditDialogCommon.cpp
+++ b/application/dialogs/ModEditDialogCommon.cpp
diff --git a/gui/dialogs/ModEditDialogCommon.h b/application/dialogs/ModEditDialogCommon.h
index 227e638c..e2afb98a 100644
--- a/gui/dialogs/ModEditDialogCommon.h
+++ b/application/dialogs/ModEditDialogCommon.h
@@ -2,7 +2,7 @@
 #include <QModelIndex>
 #include <QDesktopServices>
 #include <QWidget>
-#include <logic/minecraft/Mod.h>
+#include <minecraft/Mod.h>
 
 bool lastfirst(QModelIndexList &list, int &first, int &last);
 
diff --git a/gui/dialogs/NewInstanceDialog.cpp b/application/dialogs/NewInstanceDialog.cpp
index 86ffc5b8..b3aa805b 100644
--- a/gui/dialogs/NewInstanceDialog.cpp
+++ b/application/dialogs/NewInstanceDialog.cpp
@@ -17,13 +17,13 @@
 #include "NewInstanceDialog.h"
 #include "ui_NewInstanceDialog.h"
 
-#include "logic/BaseVersion.h"
-#include "logic/icons/IconList.h"
-#include "logic/minecraft/MinecraftVersionList.h"
-#include "logic/tasks/Task.h"
-#include "logic/InstanceList.h"
+#include <BaseVersion.h>
+#include <icons/IconList.h>
+#include <minecraft/MinecraftVersionList.h>
+#include <tasks/Task.h>
+#include <InstanceList.h>
 
-#include "gui/Platform.h"
+#include "Platform.h"
 #include "VersionSelectDialog.h"
 #include "ProgressDialog.h"
 #include "IconPickerDialog.h"
diff --git a/gui/dialogs/NewInstanceDialog.h b/application/dialogs/NewInstanceDialog.h
index 1e1b0bea..bc3152b9 100644
--- a/gui/dialogs/NewInstanceDialog.h
+++ b/application/dialogs/NewInstanceDialog.h
@@ -17,7 +17,7 @@
 
 #include <QDialog>
 
-#include "logic/BaseVersion.h"
+#include "BaseVersion.h"
 
 namespace Ui
 {
diff --git a/gui/dialogs/NewInstanceDialog.ui b/application/dialogs/NewInstanceDialog.ui
index 6cb0c97c..6cb0c97c 100644
--- a/gui/dialogs/NewInstanceDialog.ui
+++ b/application/dialogs/NewInstanceDialog.ui
diff --git a/gui/dialogs/NotificationDialog.cpp b/application/dialogs/NotificationDialog.cpp
index 8f920371..8f920371 100644
--- a/gui/dialogs/NotificationDialog.cpp
+++ b/application/dialogs/NotificationDialog.cpp
diff --git a/gui/dialogs/NotificationDialog.h b/application/dialogs/NotificationDialog.h
index 4717abd8..27b9e853 100644
--- a/gui/dialogs/NotificationDialog.h
+++ b/application/dialogs/NotificationDialog.h
@@ -3,7 +3,7 @@
 
 #include <QDialog>
 
-#include "logic/notifications/NotificationChecker.h"
+#include "notifications/NotificationChecker.h"
 
 namespace Ui {
 class NotificationDialog;
diff --git a/gui/dialogs/NotificationDialog.ui b/application/dialogs/NotificationDialog.ui
index a2a276e9..a2a276e9 100644
--- a/gui/dialogs/NotificationDialog.ui
+++ b/application/dialogs/NotificationDialog.ui
diff --git a/gui/dialogs/ProgressDialog.cpp b/application/dialogs/ProgressDialog.cpp
index db483a73..61ebaa28 100644
--- a/gui/dialogs/ProgressDialog.cpp
+++ b/application/dialogs/ProgressDialog.cpp
@@ -18,8 +18,8 @@
 
 #include <QKeyEvent>
 
-#include "logic/tasks/Task.h"
-#include "gui/Platform.h"
+#include "tasks/Task.h"
+#include "Platform.h"
 
 ProgressDialog::ProgressDialog(QWidget *parent) : QDialog(parent), ui(new Ui::ProgressDialog)
 {
diff --git a/gui/dialogs/ProgressDialog.h b/application/dialogs/ProgressDialog.h
index d5153680..d5153680 100644
--- a/gui/dialogs/ProgressDialog.h
+++ b/application/dialogs/ProgressDialog.h
diff --git a/gui/dialogs/ProgressDialog.ui b/application/dialogs/ProgressDialog.ui
index 04b8fef3..04b8fef3 100644
--- a/gui/dialogs/ProgressDialog.ui
+++ b/application/dialogs/ProgressDialog.ui
diff --git a/gui/dialogs/UpdateDialog.cpp b/application/dialogs/UpdateDialog.cpp
index 1fcc156a..f7e0bcd6 100644
--- a/gui/dialogs/UpdateDialog.cpp
+++ b/application/dialogs/UpdateDialog.cpp
@@ -1,9 +1,9 @@
 #include "UpdateDialog.h"
 #include "ui_UpdateDialog.h"
-#include "gui/Platform.h"
+#include "Platform.h"
 #include <QDebug>
 #include "MultiMC.h"
-#include <logic/settings/SettingsObject.h>
+#include <settings/SettingsObject.h>
 
 UpdateDialog::UpdateDialog(bool hasUpdate, QWidget *parent) : QDialog(parent), ui(new Ui::UpdateDialog)
 {
diff --git a/gui/dialogs/UpdateDialog.h b/application/dialogs/UpdateDialog.h
index bfbc0f27..2ab2ff7c 100644
--- a/gui/dialogs/UpdateDialog.h
+++ b/application/dialogs/UpdateDialog.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <QDialog>
-#include "logic/net/ByteArrayDownload.h"
-#include "logic/net/NetJob.h"
+#include "net/ByteArrayDownload.h"
+#include "net/NetJob.h"
 
 namespace Ui
 {
diff --git a/gui/dialogs/UpdateDialog.ui b/application/dialogs/UpdateDialog.ui
index 06f4f086..06f4f086 100644
--- a/gui/dialogs/UpdateDialog.ui
+++ b/application/dialogs/UpdateDialog.ui
diff --git a/gui/dialogs/VersionSelectDialog.cpp b/application/dialogs/VersionSelectDialog.cpp
index a0a58699..d1be4ad0 100644
--- a/gui/dialogs/VersionSelectDialog.cpp
+++ b/application/dialogs/VersionSelectDialog.cpp
@@ -18,13 +18,13 @@
 
 #include <QHeaderView>
 
-#include <gui/dialogs/ProgressDialog.h>
-#include "gui/Platform.h"
+#include <dialogs/ProgressDialog.h>
+#include "Platform.h"
 
-#include <logic/BaseVersion.h>
-#include <logic/BaseVersionList.h>
-#include <logic/tasks/Task.h>
-#include <depends/util/include/modutils.h>
+#include <BaseVersion.h>
+#include <BaseVersionList.h>
+#include <tasks/Task.h>
+#include <modutils.h>
 #include <QDebug>
 
 class VersionSelectProxyModel : public QSortFilterProxyModel
diff --git a/gui/dialogs/VersionSelectDialog.h b/application/dialogs/VersionSelectDialog.h
index 3bb28b83..69e52fe6 100644
--- a/gui/dialogs/VersionSelectDialog.h
+++ b/application/dialogs/VersionSelectDialog.h
@@ -18,7 +18,7 @@
 #include <QDialog>
 #include <QSortFilterProxyModel>
 
-#include "logic/BaseVersion.h"
+#include "BaseVersion.h"
 
 class BaseVersionList;
 
diff --git a/gui/dialogs/VersionSelectDialog.ui b/application/dialogs/VersionSelectDialog.ui
index 07e9e73e..e4014e11 100644
--- a/gui/dialogs/VersionSelectDialog.ui
+++ b/application/dialogs/VersionSelectDialog.ui
@@ -69,7 +69,7 @@
   <customwidget>
    <class>VersionListView</class>
    <extends>QTreeView</extends>
-   <header>gui/widgets/VersionListView.h</header>
+   <header>widgets/VersionListView.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/gui/groupview/GroupView.cpp b/application/groupview/GroupView.cpp
index 89694b87..89694b87 100644
--- a/gui/groupview/GroupView.cpp
+++ b/application/groupview/GroupView.cpp
diff --git a/gui/groupview/GroupView.h b/application/groupview/GroupView.h
index 93e45ed7..93e45ed7 100644
--- a/gui/groupview/GroupView.h
+++ b/application/groupview/GroupView.h
diff --git a/gui/groupview/GroupedProxyModel.cpp b/application/groupview/GroupedProxyModel.cpp
index a45c5ae9..a45c5ae9 100644
--- a/gui/groupview/GroupedProxyModel.cpp
+++ b/application/groupview/GroupedProxyModel.cpp
diff --git a/gui/groupview/GroupedProxyModel.h b/application/groupview/GroupedProxyModel.h
index 12edee0f..12edee0f 100644
--- a/gui/groupview/GroupedProxyModel.h
+++ b/application/groupview/GroupedProxyModel.h
diff --git a/gui/groupview/InstanceDelegate.cpp b/application/groupview/InstanceDelegate.cpp
index a195baf6..b9ad353c 100644
--- a/gui/groupview/InstanceDelegate.cpp
+++ b/application/groupview/InstanceDelegate.cpp
@@ -21,8 +21,8 @@
 #include <QtMath>
 
 #include "GroupView.h"
-#include "logic/BaseInstance.h"
-#include "logic/InstanceList.h"
+#include "BaseInstance.h"
+#include "InstanceList.h"
 
 QCache<QString, QPixmap> ListViewDelegate::m_pixmapCache;
 
diff --git a/gui/groupview/InstanceDelegate.h b/application/groupview/InstanceDelegate.h
index 2b5439cb..2b5439cb 100644
--- a/gui/groupview/InstanceDelegate.h
+++ b/application/groupview/InstanceDelegate.h
diff --git a/gui/groupview/VisualGroup.cpp b/application/groupview/VisualGroup.cpp
index 560fc9ca..560fc9ca 100644
--- a/gui/groupview/VisualGroup.cpp
+++ b/application/groupview/VisualGroup.cpp
diff --git a/gui/groupview/VisualGroup.h b/application/groupview/VisualGroup.h
index d8d1f145..d8d1f145 100644
--- a/gui/groupview/VisualGroup.h
+++ b/application/groupview/VisualGroup.h
diff --git a/install_prereqs.cmake.in b/application/install_prereqs.cmake.in
index b8fa3177..b8fa3177 100644
--- a/install_prereqs.cmake.in
+++ b/application/install_prereqs.cmake.in
diff --git a/main.cpp b/application/main.cpp
index 56ffa8a1..111a61ac 100644
--- a/main.cpp
+++ b/application/main.cpp
@@ -1,5 +1,5 @@
 #include "MultiMC.h"
-#include "gui/MainWindow.h"
+#include "MainWindow.h"
 
 int main_gui(MultiMC &app)
 {
diff --git a/package/linux/MultiMC b/application/package/linux/MultiMC
index 80225e53..80225e53 100755
--- a/package/linux/MultiMC
+++ b/application/package/linux/MultiMC
diff --git a/gui/pagedialog/PageDialog.cpp b/application/pagedialog/PageDialog.cpp
index 5399294c..a930789e 100644
--- a/gui/pagedialog/PageDialog.cpp
+++ b/application/pagedialog/PageDialog.cpp
@@ -21,10 +21,10 @@
 #include <QKeyEvent>
 
 #include "MultiMC.h"
-#include "logic/settings/SettingsObject.h"
-#include "gui/Platform.h"
-#include "gui/widgets/IconLabel.h"
-#include "gui/widgets/PageContainer.h"
+#include "settings/SettingsObject.h"
+#include "Platform.h"
+#include "widgets/IconLabel.h"
+#include "widgets/PageContainer.h"
 
 PageDialog::PageDialog(BasePageProviderPtr pageProvider, QString defaultId, QWidget *parent)
 	: QDialog(parent)
diff --git a/gui/pagedialog/PageDialog.h b/application/pagedialog/PageDialog.h
index 9248c942..8a31cd0a 100644
--- a/gui/pagedialog/PageDialog.h
+++ b/application/pagedialog/PageDialog.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QDialog>
-#include "gui/pages/BasePageProvider.h"
+#include "pages/BasePageProvider.h"
 
 class PageContainer;
 class PageDialog : public QDialog
diff --git a/gui/pages/BasePage.h b/application/pages/BasePage.h
index ecf0692c..ecf0692c 100644
--- a/gui/pages/BasePage.h
+++ b/application/pages/BasePage.h
diff --git a/gui/pages/BasePageProvider.h b/application/pages/BasePageProvider.h
index c55683e0..c55683e0 100644
--- a/gui/pages/BasePageProvider.h
+++ b/application/pages/BasePageProvider.h
diff --git a/gui/pages/InstanceSettingsPage.cpp b/application/pages/InstanceSettingsPage.cpp
index e1a9c666..1e571eff 100644
--- a/gui/pages/InstanceSettingsPage.cpp
+++ b/application/pages/InstanceSettingsPage.cpp
@@ -5,9 +5,9 @@
 #include <QDialog>
 #include <QMessageBox>
 
-#include "gui/dialogs/VersionSelectDialog.h"
-#include "gui/NagUtils.h"
-#include "logic/java/JavaVersionList.h"
+#include "dialogs/VersionSelectDialog.h"
+#include "NagUtils.h"
+#include "java/JavaVersionList.h"
 #include "MultiMC.h"
 
 InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
diff --git a/gui/pages/InstanceSettingsPage.h b/application/pages/InstanceSettingsPage.h
index 8835d02e..85df5880 100644
--- a/gui/pages/InstanceSettingsPage.h
+++ b/application/pages/InstanceSettingsPage.h
@@ -17,9 +17,9 @@
 
 #include <QWidget>
 
-#include "logic/net/NetJob.h"
-#include "logic/java/JavaChecker.h"
-#include "logic/BaseInstance.h"
+#include "net/NetJob.h"
+#include "java/JavaChecker.h"
+#include "BaseInstance.h"
 #include "BasePage.h"
 #include "MultiMC.h"
 
diff --git a/gui/pages/InstanceSettingsPage.ui b/application/pages/InstanceSettingsPage.ui
index 64109378..64109378 100644
--- a/gui/pages/InstanceSettingsPage.ui
+++ b/application/pages/InstanceSettingsPage.ui
diff --git a/gui/pages/LogPage.cpp b/application/pages/LogPage.cpp
index 4e9e4f52..8f9edb96 100644
--- a/gui/pages/LogPage.cpp
+++ b/application/pages/LogPage.cpp
@@ -7,8 +7,8 @@
 #include <QScrollBar>
 #include <QShortcut>
 
-#include "logic/BaseProcess.h"
-#include "gui/GuiUtil.h"
+#include "BaseProcess.h"
+#include "GuiUtil.h"
 
 LogPage::LogPage(BaseProcess *proc, QWidget *parent)
 	: QWidget(parent), ui(new Ui::LogPage), m_process(proc)
diff --git a/gui/pages/LogPage.h b/application/pages/LogPage.h
index fea438c0..fe7bbecb 100644
--- a/gui/pages/LogPage.h
+++ b/application/pages/LogPage.h
@@ -17,9 +17,9 @@
 
 #include <QWidget>
 
-#include "logic/BaseInstance.h"
-#include "logic/net/NetJob.h"
-#include "logic/BaseProcess.h"
+#include "BaseInstance.h"
+#include "net/NetJob.h"
+#include "BaseProcess.h"
 #include "BasePage.h"
 #include <MultiMC.h>
 
diff --git a/gui/pages/LogPage.ui b/application/pages/LogPage.ui
index 089bc906..089bc906 100644
--- a/gui/pages/LogPage.ui
+++ b/application/pages/LogPage.ui
diff --git a/gui/pages/ModFolderPage.cpp b/application/pages/ModFolderPage.cpp
index 167ba471..3c55aefc 100644
--- a/gui/pages/ModFolderPage.cpp
+++ b/application/pages/ModFolderPage.cpp
@@ -26,11 +26,11 @@
 #include <pathutils.h>
 
 #include "MultiMC.h"
-#include "gui/dialogs/CustomMessageBox.h"
-#include "gui/dialogs/ModEditDialogCommon.h"
-#include "logic/minecraft/ModList.h"
-#include "logic/minecraft/Mod.h"
-#include "logic/minecraft/VersionFilterData.h"
+#include "dialogs/CustomMessageBox.h"
+#include "dialogs/ModEditDialogCommon.h"
+#include "minecraft/ModList.h"
+#include "minecraft/Mod.h"
+#include "minecraft/VersionFilterData.h"
 
 ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id,
 							 QString iconName, QString displayName, QString helpPage,
diff --git a/gui/pages/ModFolderPage.h b/application/pages/ModFolderPage.h
index bd5156d4..4e89f85f 100644
--- a/gui/pages/ModFolderPage.h
+++ b/application/pages/ModFolderPage.h
@@ -17,8 +17,8 @@
 
 #include <QWidget>
 
-#include "logic/minecraft/OneSixInstance.h"
-#include "logic/net/NetJob.h"
+#include "minecraft/OneSixInstance.h"
+#include "net/NetJob.h"
 #include "BasePage.h"
 #include <MultiMC.h>
 
diff --git a/gui/pages/ModFolderPage.ui b/application/pages/ModFolderPage.ui
index 019b8faf..353b62c5 100644
--- a/gui/pages/ModFolderPage.ui
+++ b/application/pages/ModFolderPage.ui
@@ -110,12 +110,12 @@
   <customwidget>
    <class>ModListView</class>
    <extends>QTreeView</extends>
-   <header>gui/widgets/ModListView.h</header>
+   <header>widgets/ModListView.h</header>
   </customwidget>
   <customwidget>
    <class>MCModInfoFrame</class>
    <extends>QFrame</extends>
-   <header>gui/widgets/MCModInfoFrame.h</header>
+   <header>widgets/MCModInfoFrame.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/gui/pages/NotesPage.cpp b/application/pages/NotesPage.cpp
index 48bb468c..48bb468c 100644
--- a/gui/pages/NotesPage.cpp
+++ b/application/pages/NotesPage.cpp
diff --git a/gui/pages/NotesPage.h b/application/pages/NotesPage.h
index 6dcdce32..62e0c692 100644
--- a/gui/pages/NotesPage.h
+++ b/application/pages/NotesPage.h
@@ -17,8 +17,8 @@
 
 #include <QWidget>
 
-#include "logic/BaseInstance.h"
-#include "logic/net/NetJob.h"
+#include "BaseInstance.h"
+#include "net/NetJob.h"
 #include "BasePage.h"
 #include <MultiMC.h>
 
diff --git a/gui/pages/NotesPage.ui b/application/pages/NotesPage.ui
index 8da01c8b..8da01c8b 100644
--- a/gui/pages/NotesPage.ui
+++ b/application/pages/NotesPage.ui
diff --git a/gui/pages/OtherLogsPage.cpp b/application/pages/OtherLogsPage.cpp
index c9b0aa51..b037a6c7 100644
--- a/gui/pages/OtherLogsPage.cpp
+++ b/application/pages/OtherLogsPage.cpp
@@ -19,8 +19,8 @@
 #include <QFileDialog>
 #include <QMessageBox>
 
-#include "gui/GuiUtil.h"
-#include "logic/RecursiveFileSystemWatcher.h"
+#include "GuiUtil.h"
+#include "RecursiveFileSystemWatcher.h"
 #include <pathutils.h>
 
 OtherLogsPage::OtherLogsPage(QString path, QWidget *parent)
diff --git a/gui/pages/OtherLogsPage.h b/application/pages/OtherLogsPage.h
index d6e4ec9f..d6e4ec9f 100644
--- a/gui/pages/OtherLogsPage.h
+++ b/application/pages/OtherLogsPage.h
diff --git a/gui/pages/OtherLogsPage.ui b/application/pages/OtherLogsPage.ui
index 08200684..08200684 100644
--- a/gui/pages/OtherLogsPage.ui
+++ b/application/pages/OtherLogsPage.ui
diff --git a/gui/pages/ResourcePackPage.h b/application/pages/ResourcePackPage.h
index d79590df..d79590df 100644
--- a/gui/pages/ResourcePackPage.h
+++ b/application/pages/ResourcePackPage.h
diff --git a/gui/pages/ScreenshotsPage.cpp b/application/pages/ScreenshotsPage.cpp
index 219a47ae..c81de407 100644
--- a/gui/pages/ScreenshotsPage.cpp
+++ b/application/pages/ScreenshotsPage.cpp
@@ -18,14 +18,14 @@
 #include <pathutils.h>
 #include <MultiMC.h>
 
-#include "gui/dialogs/ProgressDialog.h"
-#include "gui/dialogs/CustomMessageBox.h"
-#include "logic/net/NetJob.h"
-#include "logic/screenshots/ImgurUpload.h"
-#include "logic/screenshots/ImgurAlbumCreation.h"
-#include "logic/tasks/SequentialTask.h"
+#include "dialogs/ProgressDialog.h"
+#include "dialogs/CustomMessageBox.h"
+#include "net/NetJob.h"
+#include "screenshots/ImgurUpload.h"
+#include "screenshots/ImgurAlbumCreation.h"
+#include "tasks/SequentialTask.h"
 
-#include "logic/RWStorage.h"
+#include "RWStorage.h"
 
 typedef RWStorage<QString, QIcon> SharedIconCache;
 typedef std::shared_ptr<SharedIconCache> SharedIconCachePtr;
diff --git a/gui/pages/ScreenshotsPage.h b/application/pages/ScreenshotsPage.h
index f5700ba8..f5700ba8 100644
--- a/gui/pages/ScreenshotsPage.h
+++ b/application/pages/ScreenshotsPage.h
diff --git a/gui/pages/ScreenshotsPage.ui b/application/pages/ScreenshotsPage.ui
index 30b55092..30b55092 100644
--- a/gui/pages/ScreenshotsPage.ui
+++ b/application/pages/ScreenshotsPage.ui
diff --git a/gui/pages/TexturePackPage.h b/application/pages/TexturePackPage.h
index 3c5c27d7..3c5c27d7 100644
--- a/gui/pages/TexturePackPage.h
+++ b/application/pages/TexturePackPage.h
diff --git a/gui/pages/VersionPage.cpp b/application/pages/VersionPage.cpp
index 712b496f..9b656220 100644
--- a/gui/pages/VersionPage.cpp
+++ b/application/pages/VersionPage.cpp
@@ -24,12 +24,12 @@
 #include "VersionPage.h"
 #include "ui_VersionPage.h"
 
-#include "gui/Platform.h"
-#include "gui/dialogs/CustomMessageBox.h"
-#include "gui/dialogs/VersionSelectDialog.h"
-#include "gui/dialogs/ModEditDialogCommon.h"
+#include "Platform.h"
+#include "dialogs/CustomMessageBox.h"
+#include "dialogs/VersionSelectDialog.h"
+#include "dialogs/ModEditDialogCommon.h"
 
-#include "gui/dialogs/ProgressDialog.h"
+#include "dialogs/ProgressDialog.h"
 
 #include <QAbstractItemModel>
 #include <QMessageBox>
@@ -37,15 +37,15 @@
 #include <QString>
 #include <QUrl>
 
-#include "logic/minecraft/MinecraftProfile.h"
-#include "logic/forge/ForgeVersionList.h"
-#include "logic/forge/ForgeInstaller.h"
-#include "logic/liteloader/LiteLoaderVersionList.h"
-#include "logic/liteloader/LiteLoaderInstaller.h"
-#include "logic/minecraft/VersionBuilder.h"
-#include "logic/auth/MojangAccountList.h"
-#include "logic/minecraft/Mod.h"
-#include "logic/icons/IconList.h"
+#include "minecraft/MinecraftProfile.h"
+#include "forge/ForgeVersionList.h"
+#include "forge/ForgeInstaller.h"
+#include "liteloader/LiteLoaderVersionList.h"
+#include "liteloader/LiteLoaderInstaller.h"
+#include "minecraft/VersionBuilder.h"
+#include "auth/MojangAccountList.h"
+#include "minecraft/Mod.h"
+#include "icons/IconList.h"
 
 
 QIcon VersionPage::icon() const
diff --git a/gui/pages/VersionPage.h b/application/pages/VersionPage.h
index 3b90d0c6..587fcf07 100644
--- a/gui/pages/VersionPage.h
+++ b/application/pages/VersionPage.h
@@ -17,8 +17,8 @@
 
 #include <QWidget>
 
-#include "logic/minecraft/OneSixInstance.h"
-#include "logic/net/NetJob.h"
+#include "minecraft/OneSixInstance.h"
+#include "net/NetJob.h"
 #include "BasePage.h"
 
 namespace Ui
diff --git a/gui/pages/VersionPage.ui b/application/pages/VersionPage.ui
index 9b270d01..67a556c8 100644
--- a/gui/pages/VersionPage.ui
+++ b/application/pages/VersionPage.ui
@@ -190,12 +190,12 @@
   <customwidget>
    <class>ModListView</class>
    <extends>QTreeView</extends>
-   <header>gui/widgets/ModListView.h</header>
+   <header>widgets/ModListView.h</header>
   </customwidget>
   <customwidget>
    <class>LineSeparator</class>
    <extends>QWidget</extends>
-   <header>gui/widgets/LineSeparator.h</header>
+   <header>widgets/LineSeparator.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/gui/pages/global/AccountListPage.cpp b/application/pages/global/AccountListPage.cpp
index 72e18405..7be72aaa 100644
--- a/gui/pages/global/AccountListPage.cpp
+++ b/application/pages/global/AccountListPage.cpp
@@ -20,19 +20,19 @@
 
 #include <QDebug>
 
-#include "logic/net/NetJob.h"
-#include "logic/net/URLConstants.h"
-#include "logic/Env.h"
-
-#include "gui/dialogs/EditAccountDialog.h"
-#include "gui/dialogs/ProgressDialog.h"
-#include "gui/dialogs/AccountSelectDialog.h"
-#include "gui/dialogs/LoginDialog.h"
-#include "gui/dialogs/CustomMessageBox.h"
-#include "logic/tasks/Task.h"
-#include "logic/auth/YggdrasilTask.h"
-
-#include <MultiMC.h>
+#include "net/NetJob.h"
+#include "net/URLConstants.h"
+#include "Env.h"
+
+#include "dialogs/EditAccountDialog.h"
+#include "dialogs/ProgressDialog.h"
+#include "dialogs/AccountSelectDialog.h"
+#include "dialogs/LoginDialog.h"
+#include "dialogs/CustomMessageBox.h"
+#include "tasks/Task.h"
+#include "auth/YggdrasilTask.h"
+
+#include "MultiMC.h"
 
 AccountListPage::AccountListPage(QWidget *parent)
 	: QWidget(parent), ui(new Ui::AccountListPage)
diff --git a/gui/pages/global/AccountListPage.h b/application/pages/global/AccountListPage.h
index 9fd894b8..dad68b0c 100644
--- a/gui/pages/global/AccountListPage.h
+++ b/application/pages/global/AccountListPage.h
@@ -18,9 +18,9 @@
 #include <QDialog>
 #include <memory>
 
-#include "gui/pages/BasePage.h"
+#include "pages/BasePage.h"
 
-#include "logic/auth/MojangAccountList.h"
+#include "auth/MojangAccountList.h"
 #include <MultiMC.h>
 
 namespace Ui
diff --git a/gui/pages/global/AccountListPage.ui b/application/pages/global/AccountListPage.ui
index 8ad78cf4..8ad78cf4 100644
--- a/gui/pages/global/AccountListPage.ui
+++ b/application/pages/global/AccountListPage.ui
diff --git a/gui/pages/global/ExternalToolsPage.cpp b/application/pages/global/ExternalToolsPage.cpp
index e2dd70dd..426432a0 100644
--- a/gui/pages/global/ExternalToolsPage.cpp
+++ b/application/pages/global/ExternalToolsPage.cpp
@@ -22,8 +22,8 @@
 
 #include <pathutils.h>
 
-#include "logic/settings/SettingsObject.h"
-#include "logic/tools/BaseProfiler.h"
+#include "settings/SettingsObject.h"
+#include "tools/BaseProfiler.h"
 #include "MultiMC.h"
 
 ExternalToolsPage::ExternalToolsPage(QWidget *parent) :
diff --git a/gui/pages/global/ExternalToolsPage.h b/application/pages/global/ExternalToolsPage.h
index 7c5efad6..43e72dcd 100644
--- a/gui/pages/global/ExternalToolsPage.h
+++ b/application/pages/global/ExternalToolsPage.h
@@ -17,7 +17,7 @@
 
 #include <QWidget>
 
-#include "gui/pages/BasePage.h"
+#include "pages/BasePage.h"
 #include <MultiMC.h>
 
 namespace Ui {
diff --git a/gui/pages/global/ExternalToolsPage.ui b/application/pages/global/ExternalToolsPage.ui
index ba1b6f01..ba1b6f01 100644
--- a/gui/pages/global/ExternalToolsPage.ui
+++ b/application/pages/global/ExternalToolsPage.ui
diff --git a/gui/pages/global/JavaPage.cpp b/application/pages/global/JavaPage.cpp
index b0ed23ea..ab02b3a3 100644
--- a/gui/pages/global/JavaPage.cpp
+++ b/application/pages/global/JavaPage.cpp
@@ -22,17 +22,17 @@
 
 #include <pathutils.h>
 
-#include "gui/NagUtils.h"
+#include "NagUtils.h"
 
-#include "gui/Platform.h"
-#include "gui/dialogs/VersionSelectDialog.h"
-#include <gui/ColumnResizer.h>
+#include "Platform.h"
+#include "dialogs/VersionSelectDialog.h"
+#include <ColumnResizer.h>
 
-#include "logic/java/JavaUtils.h"
-#include "logic/java/JavaVersionList.h"
-#include "logic/java/JavaChecker.h"
+#include "java/JavaUtils.h"
+#include "java/JavaVersionList.h"
+#include "java/JavaChecker.h"
 
-#include "logic/settings/SettingsObject.h"
+#include "settings/SettingsObject.h"
 #include "MultiMC.h"
 
 JavaPage::JavaPage(QWidget *parent) : QWidget(parent), ui(new Ui::JavaPage)
diff --git a/gui/pages/global/JavaPage.h b/application/pages/global/JavaPage.h
index f70d9dbd..2af85280 100644
--- a/gui/pages/global/JavaPage.h
+++ b/application/pages/global/JavaPage.h
@@ -18,8 +18,8 @@
 #include <memory>
 #include <QDialog>
 
-#include "logic/java/JavaChecker.h"
-#include "gui/pages/BasePage.h"
+#include "java/JavaChecker.h"
+#include "pages/BasePage.h"
 #include <MultiMC.h>
 
 class SettingsObject;
diff --git a/gui/pages/global/JavaPage.ui b/application/pages/global/JavaPage.ui
index 6ae41a49..6ae41a49 100644
--- a/gui/pages/global/JavaPage.ui
+++ b/application/pages/global/JavaPage.ui
diff --git a/gui/pages/global/MinecraftPage.cpp b/application/pages/global/MinecraftPage.cpp
index 5f752206..f5e7e57f 100644
--- a/gui/pages/global/MinecraftPage.cpp
+++ b/application/pages/global/MinecraftPage.cpp
@@ -22,21 +22,21 @@
 
 #include <pathutils.h>
 
-#include "gui/Platform.h"
-#include "gui/dialogs/VersionSelectDialog.h"
-#include "gui/dialogs/CustomMessageBox.h"
+#include "Platform.h"
+#include "dialogs/VersionSelectDialog.h"
+#include "dialogs/CustomMessageBox.h"
 
-#include "gui/NagUtils.h"
+#include "NagUtils.h"
 
-#include "logic/java/JavaUtils.h"
-#include "logic/java/JavaVersionList.h"
-#include "logic/java/JavaChecker.h"
+#include "java/JavaUtils.h"
+#include "java/JavaVersionList.h"
+#include "java/JavaChecker.h"
 
-#include "logic/updater/UpdateChecker.h"
+#include "updater/UpdateChecker.h"
 
-#include "logic/tools/BaseProfiler.h"
+#include "tools/BaseProfiler.h"
 
-#include "logic/settings/SettingsObject.h"
+#include "settings/SettingsObject.h"
 #include "MultiMC.h"
 
 MinecraftPage::MinecraftPage(QWidget *parent) : QWidget(parent), ui(new Ui::MinecraftPage)
diff --git a/gui/pages/global/MinecraftPage.h b/application/pages/global/MinecraftPage.h
index 6dd86338..6355b507 100644
--- a/gui/pages/global/MinecraftPage.h
+++ b/application/pages/global/MinecraftPage.h
@@ -18,8 +18,8 @@
 #include <memory>
 #include <QDialog>
 
-#include "logic/java/JavaChecker.h"
-#include "gui/pages/BasePage.h"
+#include "java/JavaChecker.h"
+#include "pages/BasePage.h"
 #include <MultiMC.h>
 
 class SettingsObject;
diff --git a/gui/pages/global/MinecraftPage.ui b/application/pages/global/MinecraftPage.ui
index 825f6a56..825f6a56 100644
--- a/gui/pages/global/MinecraftPage.ui
+++ b/application/pages/global/MinecraftPage.ui
diff --git a/gui/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp
index d2934666..5f56fb89 100644
--- a/gui/pages/global/MultiMCPage.cpp
+++ b/application/pages/global/MultiMCPage.cpp
@@ -23,22 +23,22 @@
 
 #include <pathutils.h>
 
-#include "gui/Platform.h"
-#include "gui/dialogs/VersionSelectDialog.h"
-#include "gui/dialogs/CustomMessageBox.h"
-#include <gui/ColumnResizer.h>
+#include "Platform.h"
+#include "dialogs/VersionSelectDialog.h"
+#include "dialogs/CustomMessageBox.h"
+#include <ColumnResizer.h>
 
-#include "gui/NagUtils.h"
+#include "NagUtils.h"
 
-#include "logic/java/JavaUtils.h"
-#include "logic/java/JavaVersionList.h"
-#include "logic/java/JavaChecker.h"
+#include "java/JavaUtils.h"
+#include "java/JavaVersionList.h"
+#include "java/JavaChecker.h"
 
-#include "logic/updater/UpdateChecker.h"
+#include "updater/UpdateChecker.h"
 
-#include "logic/tools/BaseProfiler.h"
+#include "tools/BaseProfiler.h"
 
-#include "logic/settings/SettingsObject.h"
+#include "settings/SettingsObject.h"
 #include "MultiMC.h"
 
 // FIXME: possibly move elsewhere
diff --git a/gui/pages/global/MultiMCPage.h b/application/pages/global/MultiMCPage.h
index 96e56f47..d90acc13 100644
--- a/gui/pages/global/MultiMCPage.h
+++ b/application/pages/global/MultiMCPage.h
@@ -18,8 +18,8 @@
 #include <memory>
 #include <QDialog>
 
-#include "logic/java/JavaChecker.h"
-#include "gui/pages/BasePage.h"
+#include "java/JavaChecker.h"
+#include "pages/BasePage.h"
 #include <MultiMC.h>
 
 class QTextCharFormat;
diff --git a/gui/pages/global/MultiMCPage.ui b/application/pages/global/MultiMCPage.ui
index 38d1bb1d..38d1bb1d 100644
--- a/gui/pages/global/MultiMCPage.ui
+++ b/application/pages/global/MultiMCPage.ui
diff --git a/gui/pages/global/ProxyPage.cpp b/application/pages/global/ProxyPage.cpp
index 02a5beb4..f18f7049 100644
--- a/gui/pages/global/ProxyPage.cpp
+++ b/application/pages/global/ProxyPage.cpp
@@ -16,7 +16,7 @@
 #include "ProxyPage.h"
 #include "ui_ProxyPage.h"
 
-#include "logic/settings/SettingsObject.h"
+#include "settings/SettingsObject.h"
 #include "MultiMC.h"
 
 ProxyPage::ProxyPage(QWidget *parent) : QWidget(parent), ui(new Ui::ProxyPage)
diff --git a/gui/pages/global/ProxyPage.h b/application/pages/global/ProxyPage.h
index edb7587a..362e67a0 100644
--- a/gui/pages/global/ProxyPage.h
+++ b/application/pages/global/ProxyPage.h
@@ -18,8 +18,7 @@
 #include <memory>
 #include <QDialog>
 
-#include "logic/java/JavaChecker.h"
-#include "gui/pages/BasePage.h"
+#include "pages/BasePage.h"
 #include <MultiMC.h>
 
 namespace Ui
diff --git a/gui/pages/global/ProxyPage.ui b/application/pages/global/ProxyPage.ui
index 7cddd66d..7cddd66d 100644
--- a/gui/pages/global/ProxyPage.ui
+++ b/application/pages/global/ProxyPage.ui
diff --git a/resources/MultiMC.icns b/application/resources/MultiMC.icns
index 05ce9207..05ce9207 100644
--- a/resources/MultiMC.icns
+++ b/application/resources/MultiMC.icns
diff --git a/resources/MultiMC.ico b/application/resources/MultiMC.ico
index 734af0fb..734af0fb 100644
--- a/resources/MultiMC.ico
+++ b/application/resources/MultiMC.ico
diff --git a/resources/MultiMC.manifest b/application/resources/MultiMC.manifest
index 3acf8f7f..3acf8f7f 100644
--- a/resources/MultiMC.manifest
+++ b/application/resources/MultiMC.manifest
diff --git a/resources/OSX/OSX.qrc b/application/resources/OSX/OSX.qrc
index 20c71eb8..20c71eb8 100644
--- a/resources/OSX/OSX.qrc
+++ b/application/resources/OSX/OSX.qrc
diff --git a/resources/OSX/index.theme b/application/resources/OSX/index.theme
index 7f90a32e..7f90a32e 100644
--- a/resources/OSX/index.theme
+++ b/application/resources/OSX/index.theme
diff --git a/resources/OSX/scalable/about.svg b/application/resources/OSX/scalable/about.svg
index eb87ccf1..eb87ccf1 100644
--- a/resources/OSX/scalable/about.svg
+++ b/application/resources/OSX/scalable/about.svg
diff --git a/resources/OSX/scalable/accounts.svg b/application/resources/OSX/scalable/accounts.svg
index 163bcee0..163bcee0 100644
--- a/resources/OSX/scalable/accounts.svg
+++ b/application/resources/OSX/scalable/accounts.svg
diff --git a/resources/OSX/scalable/bug.svg b/application/resources/OSX/scalable/bug.svg
index 00565bb6..00565bb6 100644
--- a/resources/OSX/scalable/bug.svg
+++ b/application/resources/OSX/scalable/bug.svg
diff --git a/resources/OSX/scalable/centralmods.svg b/application/resources/OSX/scalable/centralmods.svg
index 37b821e4..37b821e4 100644
--- a/resources/OSX/scalable/centralmods.svg
+++ b/application/resources/OSX/scalable/centralmods.svg
diff --git a/resources/OSX/scalable/checkupdate.svg b/application/resources/OSX/scalable/checkupdate.svg
index 30cec51f..30cec51f 100644
--- a/resources/OSX/scalable/checkupdate.svg
+++ b/application/resources/OSX/scalable/checkupdate.svg
diff --git a/resources/OSX/scalable/copy.svg b/application/resources/OSX/scalable/copy.svg
index 7382d6e2..7382d6e2 100644
--- a/resources/OSX/scalable/copy.svg
+++ b/application/resources/OSX/scalable/copy.svg
diff --git a/resources/OSX/scalable/coremods.svg b/application/resources/OSX/scalable/coremods.svg
index b0df6052..b0df6052 100644
--- a/resources/OSX/scalable/coremods.svg
+++ b/application/resources/OSX/scalable/coremods.svg
diff --git a/resources/OSX/scalable/externaltools.svg b/application/resources/OSX/scalable/externaltools.svg
index a2b7488e..a2b7488e 100644
--- a/resources/OSX/scalable/externaltools.svg
+++ b/application/resources/OSX/scalable/externaltools.svg
diff --git a/resources/OSX/scalable/instance-settings.svg b/application/resources/OSX/scalable/instance-settings.svg
index 394877f8..394877f8 100644
--- a/resources/OSX/scalable/instance-settings.svg
+++ b/application/resources/OSX/scalable/instance-settings.svg
diff --git a/resources/OSX/scalable/jarmods.svg b/application/resources/OSX/scalable/jarmods.svg
index 213ec833..213ec833 100644
--- a/resources/OSX/scalable/jarmods.svg
+++ b/application/resources/OSX/scalable/jarmods.svg
diff --git a/resources/OSX/scalable/java.svg b/application/resources/OSX/scalable/java.svg
index e1aee159..e1aee159 100644
--- a/resources/OSX/scalable/java.svg
+++ b/application/resources/OSX/scalable/java.svg
diff --git a/resources/OSX/scalable/loadermods.svg b/application/resources/OSX/scalable/loadermods.svg
index 76951ebd..76951ebd 100644
--- a/resources/OSX/scalable/loadermods.svg
+++ b/application/resources/OSX/scalable/loadermods.svg
diff --git a/resources/OSX/scalable/log.svg b/application/resources/OSX/scalable/log.svg
index 0ac45d54..0ac45d54 100644
--- a/resources/OSX/scalable/log.svg
+++ b/application/resources/OSX/scalable/log.svg
diff --git a/resources/OSX/scalable/minecraft.svg b/application/resources/OSX/scalable/minecraft.svg
index 86c915bc..86c915bc 100644
--- a/resources/OSX/scalable/minecraft.svg
+++ b/application/resources/OSX/scalable/minecraft.svg
diff --git a/resources/OSX/scalable/multimc.svg b/application/resources/OSX/scalable/multimc.svg
index caad21b5..caad21b5 100644
--- a/resources/OSX/scalable/multimc.svg
+++ b/application/resources/OSX/scalable/multimc.svg
diff --git a/resources/OSX/scalable/new.svg b/application/resources/OSX/scalable/new.svg
index 79ee87ba..79ee87ba 100644
--- a/resources/OSX/scalable/new.svg
+++ b/application/resources/OSX/scalable/new.svg
diff --git a/resources/OSX/scalable/news.svg b/application/resources/OSX/scalable/news.svg
index b8ce3cd1..b8ce3cd1 100644
--- a/resources/OSX/scalable/news.svg
+++ b/application/resources/OSX/scalable/news.svg
diff --git a/resources/OSX/scalable/notes.svg b/application/resources/OSX/scalable/notes.svg
index c2e95cfd..c2e95cfd 100644
--- a/resources/OSX/scalable/notes.svg
+++ b/application/resources/OSX/scalable/notes.svg
diff --git a/resources/OSX/scalable/patreon.svg b/application/resources/OSX/scalable/patreon.svg
index 4f0da3e5..4f0da3e5 100644
--- a/resources/OSX/scalable/patreon.svg
+++ b/application/resources/OSX/scalable/patreon.svg
diff --git a/resources/OSX/scalable/proxy.svg b/application/resources/OSX/scalable/proxy.svg
index 99acaa2b..99acaa2b 100644
--- a/resources/OSX/scalable/proxy.svg
+++ b/application/resources/OSX/scalable/proxy.svg
diff --git a/resources/OSX/scalable/quickmods.svg b/application/resources/OSX/scalable/quickmods.svg
index e0aaad87..e0aaad87 100644
--- a/resources/OSX/scalable/quickmods.svg
+++ b/application/resources/OSX/scalable/quickmods.svg
diff --git a/resources/OSX/scalable/refresh.svg b/application/resources/OSX/scalable/refresh.svg
index c97489c1..c97489c1 100644
--- a/resources/OSX/scalable/refresh.svg
+++ b/application/resources/OSX/scalable/refresh.svg
diff --git a/resources/OSX/scalable/resourcepacks.svg b/application/resources/OSX/scalable/resourcepacks.svg
index c85d4e3c..c85d4e3c 100644
--- a/resources/OSX/scalable/resourcepacks.svg
+++ b/application/resources/OSX/scalable/resourcepacks.svg
diff --git a/resources/OSX/scalable/screenshots.svg b/application/resources/OSX/scalable/screenshots.svg
index 12df0c88..12df0c88 100644
--- a/resources/OSX/scalable/screenshots.svg
+++ b/application/resources/OSX/scalable/screenshots.svg
diff --git a/resources/OSX/scalable/settings.svg b/application/resources/OSX/scalable/settings.svg
index dcdd9f1c..dcdd9f1c 100644
--- a/resources/OSX/scalable/settings.svg
+++ b/application/resources/OSX/scalable/settings.svg
diff --git a/resources/OSX/scalable/status-bad.svg b/application/resources/OSX/scalable/status-bad.svg
index add7a6f7..add7a6f7 100644
--- a/resources/OSX/scalable/status-bad.svg
+++ b/application/resources/OSX/scalable/status-bad.svg
diff --git a/resources/OSX/scalable/status-good.svg b/application/resources/OSX/scalable/status-good.svg
index f10da757..f10da757 100644
--- a/resources/OSX/scalable/status-good.svg
+++ b/application/resources/OSX/scalable/status-good.svg
diff --git a/resources/OSX/scalable/status-yellow.svg b/application/resources/OSX/scalable/status-yellow.svg
index fba697bc..fba697bc 100644
--- a/resources/OSX/scalable/status-yellow.svg
+++ b/application/resources/OSX/scalable/status-yellow.svg
diff --git a/resources/OSX/scalable/viewfolder.svg b/application/resources/OSX/scalable/viewfolder.svg
index 682c72c7..682c72c7 100644
--- a/resources/OSX/scalable/viewfolder.svg
+++ b/application/resources/OSX/scalable/viewfolder.svg
diff --git a/resources/backgrounds/backgrounds.qrc b/application/resources/backgrounds/backgrounds.qrc
index 55de139e..55de139e 100644
--- a/resources/backgrounds/backgrounds.qrc
+++ b/application/resources/backgrounds/backgrounds.qrc
diff --git a/resources/backgrounds/catbgrnd2.png b/application/resources/backgrounds/catbgrnd2.png
index 2b949e0b..2b949e0b 100644
--- a/resources/backgrounds/catbgrnd2.png
+++ b/application/resources/backgrounds/catbgrnd2.png
diff --git a/resources/iOS/iOS.qrc b/application/resources/iOS/iOS.qrc
index eb625d0b..eb625d0b 100644
--- a/resources/iOS/iOS.qrc
+++ b/application/resources/iOS/iOS.qrc
diff --git a/resources/iOS/index.theme b/application/resources/iOS/index.theme
index b0f2f6ba..b0f2f6ba 100644
--- a/resources/iOS/index.theme
+++ b/application/resources/iOS/index.theme
diff --git a/resources/iOS/scalable/about.svg b/application/resources/iOS/scalable/about.svg
index c4d35471..c4d35471 100644
--- a/resources/iOS/scalable/about.svg
+++ b/application/resources/iOS/scalable/about.svg
diff --git a/resources/iOS/scalable/accounts.svg b/application/resources/iOS/scalable/accounts.svg
index 65f76c3f..65f76c3f 100644
--- a/resources/iOS/scalable/accounts.svg
+++ b/application/resources/iOS/scalable/accounts.svg
diff --git a/resources/iOS/scalable/bug.svg b/application/resources/iOS/scalable/bug.svg
index fc4a3d69..fc4a3d69 100644
--- a/resources/iOS/scalable/bug.svg
+++ b/application/resources/iOS/scalable/bug.svg
diff --git a/resources/iOS/scalable/centralmods.svg b/application/resources/iOS/scalable/centralmods.svg
index 1b4c4741..1b4c4741 100644
--- a/resources/iOS/scalable/centralmods.svg
+++ b/application/resources/iOS/scalable/centralmods.svg
diff --git a/resources/iOS/scalable/checkupdate.svg b/application/resources/iOS/scalable/checkupdate.svg
index 9fc983d1..9fc983d1 100644
--- a/resources/iOS/scalable/checkupdate.svg
+++ b/application/resources/iOS/scalable/checkupdate.svg
diff --git a/resources/iOS/scalable/copy.svg b/application/resources/iOS/scalable/copy.svg
index 3ccc2f06..3ccc2f06 100644
--- a/resources/iOS/scalable/copy.svg
+++ b/application/resources/iOS/scalable/copy.svg
diff --git a/resources/iOS/scalable/coremods.svg b/application/resources/iOS/scalable/coremods.svg
index ea47872c..ea47872c 100644
--- a/resources/iOS/scalable/coremods.svg
+++ b/application/resources/iOS/scalable/coremods.svg
diff --git a/resources/iOS/scalable/externaltools.svg b/application/resources/iOS/scalable/externaltools.svg
index 16e9fa48..16e9fa48 100644
--- a/resources/iOS/scalable/externaltools.svg
+++ b/application/resources/iOS/scalable/externaltools.svg
diff --git a/resources/iOS/scalable/instance-settings.svg b/application/resources/iOS/scalable/instance-settings.svg
index 95b8a508..95b8a508 100644
--- a/resources/iOS/scalable/instance-settings.svg
+++ b/application/resources/iOS/scalable/instance-settings.svg
diff --git a/resources/iOS/scalable/jarmods.svg b/application/resources/iOS/scalable/jarmods.svg
index c4c5ca8c..c4c5ca8c 100644
--- a/resources/iOS/scalable/jarmods.svg
+++ b/application/resources/iOS/scalable/jarmods.svg
diff --git a/resources/iOS/scalable/java.svg b/application/resources/iOS/scalable/java.svg
index 8d7c2798..8d7c2798 100644
--- a/resources/iOS/scalable/java.svg
+++ b/application/resources/iOS/scalable/java.svg
diff --git a/resources/iOS/scalable/loadermods.svg b/application/resources/iOS/scalable/loadermods.svg
index 010efa11..010efa11 100644
--- a/resources/iOS/scalable/loadermods.svg
+++ b/application/resources/iOS/scalable/loadermods.svg
diff --git a/resources/iOS/scalable/log.svg b/application/resources/iOS/scalable/log.svg
index 5d1c7f06..5d1c7f06 100644
--- a/resources/iOS/scalable/log.svg
+++ b/application/resources/iOS/scalable/log.svg
diff --git a/resources/iOS/scalable/minecraft.svg b/application/resources/iOS/scalable/minecraft.svg
index 069b4e71..069b4e71 100644
--- a/resources/iOS/scalable/minecraft.svg
+++ b/application/resources/iOS/scalable/minecraft.svg
diff --git a/resources/iOS/scalable/multimc.svg b/application/resources/iOS/scalable/multimc.svg
index bc819433..bc819433 100644
--- a/resources/iOS/scalable/multimc.svg
+++ b/application/resources/iOS/scalable/multimc.svg
diff --git a/resources/iOS/scalable/new.svg b/application/resources/iOS/scalable/new.svg
index 9f221580..9f221580 100644
--- a/resources/iOS/scalable/new.svg
+++ b/application/resources/iOS/scalable/new.svg
diff --git a/resources/iOS/scalable/news.svg b/application/resources/iOS/scalable/news.svg
index d3c010bb..d3c010bb 100644
--- a/resources/iOS/scalable/news.svg
+++ b/application/resources/iOS/scalable/news.svg
diff --git a/resources/iOS/scalable/notes.svg b/application/resources/iOS/scalable/notes.svg
index b42ebeef..b42ebeef 100644
--- a/resources/iOS/scalable/notes.svg
+++ b/application/resources/iOS/scalable/notes.svg
diff --git a/resources/iOS/scalable/patreon.svg b/application/resources/iOS/scalable/patreon.svg
index 1bd06f4a..1bd06f4a 100644
--- a/resources/iOS/scalable/patreon.svg
+++ b/application/resources/iOS/scalable/patreon.svg
diff --git a/resources/iOS/scalable/proxy.svg b/application/resources/iOS/scalable/proxy.svg
index f6552281..f6552281 100644
--- a/resources/iOS/scalable/proxy.svg
+++ b/application/resources/iOS/scalable/proxy.svg
diff --git a/resources/iOS/scalable/quickmods.svg b/application/resources/iOS/scalable/quickmods.svg
index cd63ba71..cd63ba71 100644
--- a/resources/iOS/scalable/quickmods.svg
+++ b/application/resources/iOS/scalable/quickmods.svg
diff --git a/resources/iOS/scalable/refresh.svg b/application/resources/iOS/scalable/refresh.svg
index 297b79c9..297b79c9 100644
--- a/resources/iOS/scalable/refresh.svg
+++ b/application/resources/iOS/scalable/refresh.svg
diff --git a/resources/iOS/scalable/resourcepacks.svg b/application/resources/iOS/scalable/resourcepacks.svg
index 5b359d63..5b359d63 100644
--- a/resources/iOS/scalable/resourcepacks.svg
+++ b/application/resources/iOS/scalable/resourcepacks.svg
diff --git a/resources/iOS/scalable/screenshots.svg b/application/resources/iOS/scalable/screenshots.svg
index 39ce7b82..39ce7b82 100644
--- a/resources/iOS/scalable/screenshots.svg
+++ b/application/resources/iOS/scalable/screenshots.svg
diff --git a/resources/iOS/scalable/settings.svg b/application/resources/iOS/scalable/settings.svg
index 95b8a508..95b8a508 100644
--- a/resources/iOS/scalable/settings.svg
+++ b/application/resources/iOS/scalable/settings.svg
diff --git a/resources/iOS/scalable/status-bad.svg b/application/resources/iOS/scalable/status-bad.svg
index 4019c8da..4019c8da 100644
--- a/resources/iOS/scalable/status-bad.svg
+++ b/application/resources/iOS/scalable/status-bad.svg
diff --git a/resources/iOS/scalable/status-good.svg b/application/resources/iOS/scalable/status-good.svg
index e1859113..e1859113 100644
--- a/resources/iOS/scalable/status-good.svg
+++ b/application/resources/iOS/scalable/status-good.svg
diff --git a/resources/iOS/scalable/status-yellow.svg b/application/resources/iOS/scalable/status-yellow.svg
index d8a28e23..d8a28e23 100644
--- a/resources/iOS/scalable/status-yellow.svg
+++ b/application/resources/iOS/scalable/status-yellow.svg
diff --git a/resources/iOS/scalable/viewfolder.svg b/application/resources/iOS/scalable/viewfolder.svg
index 0ae0c0b5..0ae0c0b5 100644
--- a/resources/iOS/scalable/viewfolder.svg
+++ b/application/resources/iOS/scalable/viewfolder.svg
diff --git a/resources/instances/brick.png b/application/resources/instances/brick.png
index 0b534366..0b534366 100644
--- a/resources/instances/brick.png
+++ b/application/resources/instances/brick.png
diff --git a/resources/instances/broken.png b/application/resources/instances/broken.png
index 7a80a76e..7a80a76e 100644
--- a/resources/instances/broken.png
+++ b/application/resources/instances/broken.png
diff --git a/resources/instances/chicken.png b/application/resources/instances/chicken.png
index f870467a..f870467a 100644
--- a/resources/instances/chicken.png
+++ b/application/resources/instances/chicken.png
diff --git a/resources/instances/chicken128.png b/application/resources/instances/chicken128.png
index 71f6dedc..71f6dedc 100644
--- a/resources/instances/chicken128.png
+++ b/application/resources/instances/chicken128.png
diff --git a/resources/instances/creeper.png b/application/resources/instances/creeper.png
index a67ecfc3..a67ecfc3 100644
--- a/resources/instances/creeper.png
+++ b/application/resources/instances/creeper.png
diff --git a/resources/instances/creeper128.png b/application/resources/instances/creeper128.png
index 41b7d07d..41b7d07d 100644
--- a/resources/instances/creeper128.png
+++ b/application/resources/instances/creeper128.png
diff --git a/resources/instances/derp.png b/application/resources/instances/derp.png
index 4c361942..4c361942 100644
--- a/resources/instances/derp.png
+++ b/application/resources/instances/derp.png
diff --git a/resources/instances/diamond.png b/application/resources/instances/diamond.png
index 376ab901..376ab901 100644
--- a/resources/instances/diamond.png
+++ b/application/resources/instances/diamond.png
diff --git a/resources/instances/dirt.png b/application/resources/instances/dirt.png
index 9e19eb8f..9e19eb8f 100644
--- a/resources/instances/dirt.png
+++ b/application/resources/instances/dirt.png
diff --git a/resources/instances/enderman.png b/application/resources/instances/enderman.png
index 9f3a72b3..9f3a72b3 100644
--- a/resources/instances/enderman.png
+++ b/application/resources/instances/enderman.png
diff --git a/resources/instances/enderpearl.png b/application/resources/instances/enderpearl.png
index a818eb8e..a818eb8e 100644
--- a/resources/instances/enderpearl.png
+++ b/application/resources/instances/enderpearl.png
diff --git a/resources/instances/enderpearl128.png b/application/resources/instances/enderpearl128.png
index 0a5bf91a..0a5bf91a 100644
--- a/resources/instances/enderpearl128.png
+++ b/application/resources/instances/enderpearl128.png
diff --git a/resources/instances/ftb_glow.png b/application/resources/instances/ftb_glow.png
index c4e6fd5d..c4e6fd5d 100644
--- a/resources/instances/ftb_glow.png
+++ b/application/resources/instances/ftb_glow.png
diff --git a/resources/instances/ftb_glow128.png b/application/resources/instances/ftb_glow128.png
index 86632b21..86632b21 100644
--- a/resources/instances/ftb_glow128.png
+++ b/application/resources/instances/ftb_glow128.png
diff --git a/resources/instances/ftb_logo.png b/application/resources/instances/ftb_logo.png
index 20df7171..20df7171 100644
--- a/resources/instances/ftb_logo.png
+++ b/application/resources/instances/ftb_logo.png
diff --git a/resources/instances/ftb_logo128.png b/application/resources/instances/ftb_logo128.png
index e725b7fe..e725b7fe 100644
--- a/resources/instances/ftb_logo128.png
+++ b/application/resources/instances/ftb_logo128.png
diff --git a/resources/instances/gear.png b/application/resources/instances/gear.png
index da9ba2f9..da9ba2f9 100644
--- a/resources/instances/gear.png
+++ b/application/resources/instances/gear.png
diff --git a/resources/instances/gear128.png b/application/resources/instances/gear128.png
index 75c68a66..75c68a66 100644
--- a/resources/instances/gear128.png
+++ b/application/resources/instances/gear128.png
diff --git a/resources/instances/gold.png b/application/resources/instances/gold.png
index 9bedda16..9bedda16 100644
--- a/resources/instances/gold.png
+++ b/application/resources/instances/gold.png
diff --git a/resources/instances/grass.png b/application/resources/instances/grass.png
index f1694547..f1694547 100644
--- a/resources/instances/grass.png
+++ b/application/resources/instances/grass.png
diff --git a/resources/instances/herobrine.png b/application/resources/instances/herobrine.png
index e5460da3..e5460da3 100644
--- a/resources/instances/herobrine.png
+++ b/application/resources/instances/herobrine.png
diff --git a/resources/instances/herobrine128.png b/application/resources/instances/herobrine128.png
index 13f1494c..13f1494c 100644
--- a/resources/instances/herobrine128.png
+++ b/application/resources/instances/herobrine128.png
diff --git a/resources/instances/infinity.png b/application/resources/instances/infinity.png
index bd94a3dc..bd94a3dc 100644
--- a/resources/instances/infinity.png
+++ b/application/resources/instances/infinity.png
diff --git a/resources/instances/infinity128.png b/application/resources/instances/infinity128.png
index 226847fb..226847fb 100644
--- a/resources/instances/infinity128.png
+++ b/application/resources/instances/infinity128.png
diff --git a/resources/instances/instances.qrc b/application/resources/instances/instances.qrc
index 09ae25d0..09ae25d0 100644
--- a/resources/instances/instances.qrc
+++ b/application/resources/instances/instances.qrc
diff --git a/resources/instances/iron.png b/application/resources/instances/iron.png
index 28960782..28960782 100644
--- a/resources/instances/iron.png
+++ b/application/resources/instances/iron.png
diff --git a/resources/instances/kitten.png b/application/resources/instances/kitten.png
index d17661ce..d17661ce 100644
--- a/resources/instances/kitten.png
+++ b/application/resources/instances/kitten.png
diff --git a/resources/instances/magitech.png b/application/resources/instances/magitech.png
index 6fd8ff60..6fd8ff60 100644
--- a/resources/instances/magitech.png
+++ b/application/resources/instances/magitech.png
diff --git a/resources/instances/magitech128.png b/application/resources/instances/magitech128.png
index 0f81a199..0f81a199 100644
--- a/resources/instances/magitech128.png
+++ b/application/resources/instances/magitech128.png
diff --git a/resources/instances/meat.png b/application/resources/instances/meat.png
index 6694859d..6694859d 100644
--- a/resources/instances/meat.png
+++ b/application/resources/instances/meat.png
diff --git a/resources/instances/meat128.png b/application/resources/instances/meat128.png
index fefc9bf1..fefc9bf1 100644
--- a/resources/instances/meat128.png
+++ b/application/resources/instances/meat128.png
diff --git a/resources/instances/netherstar.png b/application/resources/instances/netherstar.png
index 43cb5113..43cb5113 100644
--- a/resources/instances/netherstar.png
+++ b/application/resources/instances/netherstar.png
diff --git a/resources/instances/netherstar128.png b/application/resources/instances/netherstar128.png
index 132085f0..132085f0 100644
--- a/resources/instances/netherstar128.png
+++ b/application/resources/instances/netherstar128.png
diff --git a/resources/instances/planks.png b/application/resources/instances/planks.png
index 7fcf8467..7fcf8467 100644
--- a/resources/instances/planks.png
+++ b/application/resources/instances/planks.png
diff --git a/resources/instances/skeleton.png b/application/resources/instances/skeleton.png
index 0c8d3505..0c8d3505 100644
--- a/resources/instances/skeleton.png
+++ b/application/resources/instances/skeleton.png
diff --git a/resources/instances/skeleton128.png b/application/resources/instances/skeleton128.png
index 55fcf5a9..55fcf5a9 100644
--- a/resources/instances/skeleton128.png
+++ b/application/resources/instances/skeleton128.png
diff --git a/resources/instances/squarecreeper.png b/application/resources/instances/squarecreeper.png
index b78c4ae0..b78c4ae0 100644
--- a/resources/instances/squarecreeper.png
+++ b/application/resources/instances/squarecreeper.png
diff --git a/resources/instances/squarecreeper128.png b/application/resources/instances/squarecreeper128.png
index c82d8406..c82d8406 100644
--- a/resources/instances/squarecreeper128.png
+++ b/application/resources/instances/squarecreeper128.png
diff --git a/resources/instances/steve.png b/application/resources/instances/steve.png
index 07c6acde..07c6acde 100644
--- a/resources/instances/steve.png
+++ b/application/resources/instances/steve.png
diff --git a/resources/instances/steve128.png b/application/resources/instances/steve128.png
index a07cbd2f..a07cbd2f 100644
--- a/resources/instances/steve128.png
+++ b/application/resources/instances/steve128.png
diff --git a/resources/instances/stone.png b/application/resources/instances/stone.png
index 34f9a751..34f9a751 100644
--- a/resources/instances/stone.png
+++ b/application/resources/instances/stone.png
diff --git a/resources/instances/tnt.png b/application/resources/instances/tnt.png
index e40d404d..e40d404d 100644
--- a/resources/instances/tnt.png
+++ b/application/resources/instances/tnt.png
diff --git a/resources/instances/updateavailable.png b/application/resources/instances/updateavailable.png
index 754005f9..754005f9 100644
--- a/resources/instances/updateavailable.png
+++ b/application/resources/instances/updateavailable.png
diff --git a/resources/multimc.rc b/application/resources/multimc.rc
index e7340f2a..e7340f2a 100644
--- a/resources/multimc.rc
+++ b/application/resources/multimc.rc
diff --git a/resources/multimc/16x16/about.png b/application/resources/multimc/16x16/about.png
index a6a986e1..a6a986e1 100644
--- a/resources/multimc/16x16/about.png
+++ b/application/resources/multimc/16x16/about.png
diff --git a/resources/multimc/16x16/bug.png b/application/resources/multimc/16x16/bug.png
index 0c5b78b4..0c5b78b4 100644
--- a/resources/multimc/16x16/bug.png
+++ b/application/resources/multimc/16x16/bug.png
diff --git a/resources/multimc/16x16/cat.png b/application/resources/multimc/16x16/cat.png
index e6e31b44..e6e31b44 100644
--- a/resources/multimc/16x16/cat.png
+++ b/application/resources/multimc/16x16/cat.png
diff --git a/resources/multimc/16x16/centralmods.png b/application/resources/multimc/16x16/centralmods.png
index c1b91c76..c1b91c76 100644
--- a/resources/multimc/16x16/centralmods.png
+++ b/application/resources/multimc/16x16/centralmods.png
diff --git a/resources/multimc/16x16/checkupdate.png b/application/resources/multimc/16x16/checkupdate.png
index f3742058..f3742058 100644
--- a/resources/multimc/16x16/checkupdate.png
+++ b/application/resources/multimc/16x16/checkupdate.png
diff --git a/resources/multimc/16x16/copy.png b/application/resources/multimc/16x16/copy.png
index ccaed9e1..ccaed9e1 100644
--- a/resources/multimc/16x16/copy.png
+++ b/application/resources/multimc/16x16/copy.png
diff --git a/resources/multimc/16x16/coremods.png b/application/resources/multimc/16x16/coremods.png
index af0f1166..af0f1166 100644
--- a/resources/multimc/16x16/coremods.png
+++ b/application/resources/multimc/16x16/coremods.png
diff --git a/resources/multimc/16x16/help.png b/application/resources/multimc/16x16/help.png
index e6edf6ba..e6edf6ba 100644
--- a/resources/multimc/16x16/help.png
+++ b/application/resources/multimc/16x16/help.png
diff --git a/resources/multimc/16x16/instance-settings.png b/application/resources/multimc/16x16/instance-settings.png
index b916cd24..b916cd24 100644
--- a/resources/multimc/16x16/instance-settings.png
+++ b/application/resources/multimc/16x16/instance-settings.png
diff --git a/resources/multimc/16x16/jarmods.png b/application/resources/multimc/16x16/jarmods.png
index 1a97c9c0..1a97c9c0 100644
--- a/resources/multimc/16x16/jarmods.png
+++ b/application/resources/multimc/16x16/jarmods.png
diff --git a/resources/multimc/16x16/loadermods.png b/application/resources/multimc/16x16/loadermods.png
index b5ab3fce..b5ab3fce 100644
--- a/resources/multimc/16x16/loadermods.png
+++ b/application/resources/multimc/16x16/loadermods.png
diff --git a/resources/multimc/16x16/log.png b/application/resources/multimc/16x16/log.png
index efa2a0b5..efa2a0b5 100644
--- a/resources/multimc/16x16/log.png
+++ b/application/resources/multimc/16x16/log.png
diff --git a/resources/multimc/16x16/minecraft.png b/application/resources/multimc/16x16/minecraft.png
index e9f2f2a5..e9f2f2a5 100644
--- a/resources/multimc/16x16/minecraft.png
+++ b/application/resources/multimc/16x16/minecraft.png
diff --git a/resources/multimc/16x16/new.png b/application/resources/multimc/16x16/new.png
index 2e56f589..2e56f589 100644
--- a/resources/multimc/16x16/new.png
+++ b/application/resources/multimc/16x16/new.png
diff --git a/resources/multimc/16x16/news.png b/application/resources/multimc/16x16/news.png
index 872e85db..872e85db 100644
--- a/resources/multimc/16x16/news.png
+++ b/application/resources/multimc/16x16/news.png
diff --git a/resources/multimc/16x16/noaccount.png b/application/resources/multimc/16x16/noaccount.png
index b49bcf36..b49bcf36 100644
--- a/resources/multimc/16x16/noaccount.png
+++ b/application/resources/multimc/16x16/noaccount.png
diff --git a/resources/multimc/16x16/patreon.png b/application/resources/multimc/16x16/patreon.png
index cde2b326..cde2b326 100644
--- a/resources/multimc/16x16/patreon.png
+++ b/application/resources/multimc/16x16/patreon.png
diff --git a/resources/multimc/16x16/refresh.png b/application/resources/multimc/16x16/refresh.png
index 86b6f82c..86b6f82c 100644
--- a/resources/multimc/16x16/refresh.png
+++ b/application/resources/multimc/16x16/refresh.png
diff --git a/resources/multimc/16x16/resourcepacks.png b/application/resources/multimc/16x16/resourcepacks.png
index d862f5ca..d862f5ca 100644
--- a/resources/multimc/16x16/resourcepacks.png
+++ b/application/resources/multimc/16x16/resourcepacks.png
diff --git a/resources/multimc/16x16/screenshots.png b/application/resources/multimc/16x16/screenshots.png
index 460000d4..460000d4 100644
--- a/resources/multimc/16x16/screenshots.png
+++ b/application/resources/multimc/16x16/screenshots.png
diff --git a/resources/multimc/16x16/settings.png b/application/resources/multimc/16x16/settings.png
index b916cd24..b916cd24 100644
--- a/resources/multimc/16x16/settings.png
+++ b/application/resources/multimc/16x16/settings.png
diff --git a/resources/multimc/16x16/status-bad.png b/application/resources/multimc/16x16/status-bad.png
index 5b3f2051..5b3f2051 100644
--- a/resources/multimc/16x16/status-bad.png
+++ b/application/resources/multimc/16x16/status-bad.png
diff --git a/resources/multimc/16x16/status-good.png b/application/resources/multimc/16x16/status-good.png
index 5cbdee81..5cbdee81 100644
--- a/resources/multimc/16x16/status-good.png
+++ b/application/resources/multimc/16x16/status-good.png
diff --git a/resources/multimc/16x16/status-yellow.png b/application/resources/multimc/16x16/status-yellow.png
index b25375d1..b25375d1 100644
--- a/resources/multimc/16x16/status-yellow.png
+++ b/application/resources/multimc/16x16/status-yellow.png
diff --git a/resources/multimc/16x16/viewfolder.png b/application/resources/multimc/16x16/viewfolder.png
index 98b8a944..98b8a944 100644
--- a/resources/multimc/16x16/viewfolder.png
+++ b/application/resources/multimc/16x16/viewfolder.png
diff --git a/resources/multimc/22x22/about.png b/application/resources/multimc/22x22/about.png
index 57775e25..57775e25 100644
--- a/resources/multimc/22x22/about.png
+++ b/application/resources/multimc/22x22/about.png
diff --git a/resources/multimc/22x22/bug.png b/application/resources/multimc/22x22/bug.png
index 90481bba..90481bba 100644
--- a/resources/multimc/22x22/bug.png
+++ b/application/resources/multimc/22x22/bug.png
diff --git a/resources/multimc/22x22/cat.png b/application/resources/multimc/22x22/cat.png
index 3ea7ba69..3ea7ba69 100644
--- a/resources/multimc/22x22/cat.png
+++ b/application/resources/multimc/22x22/cat.png
diff --git a/resources/multimc/22x22/centralmods.png b/application/resources/multimc/22x22/centralmods.png
index a10f9a2b..a10f9a2b 100644
--- a/resources/multimc/22x22/centralmods.png
+++ b/application/resources/multimc/22x22/centralmods.png
diff --git a/resources/multimc/22x22/checkupdate.png b/application/resources/multimc/22x22/checkupdate.png
index badb200c..badb200c 100644
--- a/resources/multimc/22x22/checkupdate.png
+++ b/application/resources/multimc/22x22/checkupdate.png
diff --git a/resources/multimc/22x22/copy.png b/application/resources/multimc/22x22/copy.png
index ea236a24..ea236a24 100644
--- a/resources/multimc/22x22/copy.png
+++ b/application/resources/multimc/22x22/copy.png
diff --git a/resources/multimc/22x22/help.png b/application/resources/multimc/22x22/help.png
index da79b3e3..da79b3e3 100644
--- a/resources/multimc/22x22/help.png
+++ b/application/resources/multimc/22x22/help.png
diff --git a/resources/multimc/22x22/instance-settings.png b/application/resources/multimc/22x22/instance-settings.png
index daf56aad..daf56aad 100644
--- a/resources/multimc/22x22/instance-settings.png
+++ b/application/resources/multimc/22x22/instance-settings.png
diff --git a/resources/multimc/22x22/new.png b/application/resources/multimc/22x22/new.png
index c707fbbf..c707fbbf 100644
--- a/resources/multimc/22x22/new.png
+++ b/application/resources/multimc/22x22/new.png
diff --git a/resources/multimc/22x22/news.png b/application/resources/multimc/22x22/news.png
index 1953bf7b..1953bf7b 100644
--- a/resources/multimc/22x22/news.png
+++ b/application/resources/multimc/22x22/news.png
diff --git a/resources/multimc/22x22/patreon.png b/application/resources/multimc/22x22/patreon.png
index b6235ad2..b6235ad2 100644
--- a/resources/multimc/22x22/patreon.png
+++ b/application/resources/multimc/22x22/patreon.png
diff --git a/resources/multimc/22x22/refresh.png b/application/resources/multimc/22x22/refresh.png
index 45b5535c..45b5535c 100644
--- a/resources/multimc/22x22/refresh.png
+++ b/application/resources/multimc/22x22/refresh.png
diff --git a/resources/multimc/22x22/screenshots.png b/application/resources/multimc/22x22/screenshots.png
index 6fb42bbd..6fb42bbd 100644
--- a/resources/multimc/22x22/screenshots.png
+++ b/application/resources/multimc/22x22/screenshots.png
diff --git a/resources/multimc/22x22/settings.png b/application/resources/multimc/22x22/settings.png
index daf56aad..daf56aad 100644
--- a/resources/multimc/22x22/settings.png
+++ b/application/resources/multimc/22x22/settings.png
diff --git a/resources/multimc/22x22/status-bad.png b/application/resources/multimc/22x22/status-bad.png
index 2707539e..2707539e 100644
--- a/resources/multimc/22x22/status-bad.png
+++ b/application/resources/multimc/22x22/status-bad.png
diff --git a/resources/multimc/22x22/status-good.png b/application/resources/multimc/22x22/status-good.png
index f55debc3..f55debc3 100644
--- a/resources/multimc/22x22/status-good.png
+++ b/application/resources/multimc/22x22/status-good.png
diff --git a/resources/multimc/22x22/status-yellow.png b/application/resources/multimc/22x22/status-yellow.png
index 481eb7f3..481eb7f3 100644
--- a/resources/multimc/22x22/status-yellow.png
+++ b/application/resources/multimc/22x22/status-yellow.png
diff --git a/resources/multimc/22x22/viewfolder.png b/application/resources/multimc/22x22/viewfolder.png
index b645167f..b645167f 100644
--- a/resources/multimc/22x22/viewfolder.png
+++ b/application/resources/multimc/22x22/viewfolder.png
diff --git a/resources/multimc/24x24/cat.png b/application/resources/multimc/24x24/cat.png
index c93245f6..c93245f6 100644
--- a/resources/multimc/24x24/cat.png
+++ b/application/resources/multimc/24x24/cat.png
diff --git a/resources/multimc/24x24/coremods.png b/application/resources/multimc/24x24/coremods.png
index 90603d24..90603d24 100644
--- a/resources/multimc/24x24/coremods.png
+++ b/application/resources/multimc/24x24/coremods.png
diff --git a/resources/multimc/24x24/jarmods.png b/application/resources/multimc/24x24/jarmods.png
index 68cb8e9d..68cb8e9d 100644
--- a/resources/multimc/24x24/jarmods.png
+++ b/application/resources/multimc/24x24/jarmods.png
diff --git a/resources/multimc/24x24/loadermods.png b/application/resources/multimc/24x24/loadermods.png
index 250a6260..250a6260 100644
--- a/resources/multimc/24x24/loadermods.png
+++ b/application/resources/multimc/24x24/loadermods.png
diff --git a/resources/multimc/24x24/log.png b/application/resources/multimc/24x24/log.png
index fe302053..fe302053 100644
--- a/resources/multimc/24x24/log.png
+++ b/application/resources/multimc/24x24/log.png
diff --git a/resources/multimc/24x24/minecraft.png b/application/resources/multimc/24x24/minecraft.png
index b31177c9..b31177c9 100644
--- a/resources/multimc/24x24/minecraft.png
+++ b/application/resources/multimc/24x24/minecraft.png
diff --git a/resources/multimc/24x24/noaccount.png b/application/resources/multimc/24x24/noaccount.png
index ac12437c..ac12437c 100644
--- a/resources/multimc/24x24/noaccount.png
+++ b/application/resources/multimc/24x24/noaccount.png
diff --git a/resources/multimc/24x24/patreon.png b/application/resources/multimc/24x24/patreon.png
index c1da080f..c1da080f 100644
--- a/resources/multimc/24x24/patreon.png
+++ b/application/resources/multimc/24x24/patreon.png
diff --git a/resources/multimc/24x24/resourcepacks.png b/application/resources/multimc/24x24/resourcepacks.png
index 68359d39..68359d39 100644
--- a/resources/multimc/24x24/resourcepacks.png
+++ b/application/resources/multimc/24x24/resourcepacks.png
diff --git a/resources/multimc/24x24/status-bad.png b/application/resources/multimc/24x24/status-bad.png
index d1547a47..d1547a47 100644
--- a/resources/multimc/24x24/status-bad.png
+++ b/application/resources/multimc/24x24/status-bad.png
diff --git a/resources/multimc/24x24/status-good.png b/application/resources/multimc/24x24/status-good.png
index 3545bc4c..3545bc4c 100644
--- a/resources/multimc/24x24/status-good.png
+++ b/application/resources/multimc/24x24/status-good.png
diff --git a/resources/multimc/24x24/status-yellow.png b/application/resources/multimc/24x24/status-yellow.png
index dd5fde67..dd5fde67 100644
--- a/resources/multimc/24x24/status-yellow.png
+++ b/application/resources/multimc/24x24/status-yellow.png
diff --git a/resources/multimc/256x256/minecraft.png b/application/resources/multimc/256x256/minecraft.png
index 77e3f03e..77e3f03e 100644
--- a/resources/multimc/256x256/minecraft.png
+++ b/application/resources/multimc/256x256/minecraft.png
diff --git a/resources/multimc/32x32/about.png b/application/resources/multimc/32x32/about.png
index 5174c4f1..5174c4f1 100644
--- a/resources/multimc/32x32/about.png
+++ b/application/resources/multimc/32x32/about.png
diff --git a/resources/multimc/32x32/bug.png b/application/resources/multimc/32x32/bug.png
index ada46653..ada46653 100644
--- a/resources/multimc/32x32/bug.png
+++ b/application/resources/multimc/32x32/bug.png
diff --git a/resources/multimc/32x32/cat.png b/application/resources/multimc/32x32/cat.png
index 78ff98e9..78ff98e9 100644
--- a/resources/multimc/32x32/cat.png
+++ b/application/resources/multimc/32x32/cat.png
diff --git a/resources/multimc/32x32/centralmods.png b/application/resources/multimc/32x32/centralmods.png
index cd2b8208..cd2b8208 100644
--- a/resources/multimc/32x32/centralmods.png
+++ b/application/resources/multimc/32x32/centralmods.png
diff --git a/resources/multimc/32x32/checkupdate.png b/application/resources/multimc/32x32/checkupdate.png
index 754005f9..754005f9 100644
--- a/resources/multimc/32x32/checkupdate.png
+++ b/application/resources/multimc/32x32/checkupdate.png
diff --git a/resources/multimc/32x32/copy.png b/application/resources/multimc/32x32/copy.png
index c137b0f1..c137b0f1 100644
--- a/resources/multimc/32x32/copy.png
+++ b/application/resources/multimc/32x32/copy.png
diff --git a/resources/multimc/32x32/coremods.png b/application/resources/multimc/32x32/coremods.png
index 770d695e..770d695e 100644
--- a/resources/multimc/32x32/coremods.png
+++ b/application/resources/multimc/32x32/coremods.png
diff --git a/resources/multimc/32x32/help.png b/application/resources/multimc/32x32/help.png
index b3854278..b3854278 100644
--- a/resources/multimc/32x32/help.png
+++ b/application/resources/multimc/32x32/help.png
diff --git a/resources/multimc/32x32/instance-settings.png b/application/resources/multimc/32x32/instance-settings.png
index a9c0817c..a9c0817c 100644
--- a/resources/multimc/32x32/instance-settings.png
+++ b/application/resources/multimc/32x32/instance-settings.png
diff --git a/resources/multimc/32x32/jarmods.png b/application/resources/multimc/32x32/jarmods.png
index 5cda173a..5cda173a 100644
--- a/resources/multimc/32x32/jarmods.png
+++ b/application/resources/multimc/32x32/jarmods.png
diff --git a/resources/multimc/32x32/loadermods.png b/application/resources/multimc/32x32/loadermods.png
index c4ca12e2..c4ca12e2 100644
--- a/resources/multimc/32x32/loadermods.png
+++ b/application/resources/multimc/32x32/loadermods.png
diff --git a/resources/multimc/32x32/log.png b/application/resources/multimc/32x32/log.png
index d620da12..d620da12 100644
--- a/resources/multimc/32x32/log.png
+++ b/application/resources/multimc/32x32/log.png
diff --git a/resources/multimc/32x32/minecraft.png b/application/resources/multimc/32x32/minecraft.png
index 816bec98..816bec98 100644
--- a/resources/multimc/32x32/minecraft.png
+++ b/application/resources/multimc/32x32/minecraft.png
diff --git a/resources/multimc/32x32/new.png b/application/resources/multimc/32x32/new.png
index a3555ba4..a3555ba4 100644
--- a/resources/multimc/32x32/new.png
+++ b/application/resources/multimc/32x32/new.png
diff --git a/resources/multimc/32x32/news.png b/application/resources/multimc/32x32/news.png
index c579fd44..c579fd44 100644
--- a/resources/multimc/32x32/news.png
+++ b/application/resources/multimc/32x32/news.png
diff --git a/resources/multimc/32x32/noaccount.png b/application/resources/multimc/32x32/noaccount.png
index a73afc94..a73afc94 100644
--- a/resources/multimc/32x32/noaccount.png
+++ b/application/resources/multimc/32x32/noaccount.png
diff --git a/resources/multimc/32x32/patreon.png b/application/resources/multimc/32x32/patreon.png
index f5ae8a5e..f5ae8a5e 100644
--- a/resources/multimc/32x32/patreon.png
+++ b/application/resources/multimc/32x32/patreon.png
diff --git a/resources/multimc/32x32/refresh.png b/application/resources/multimc/32x32/refresh.png
index afa2a9d7..afa2a9d7 100644
--- a/resources/multimc/32x32/refresh.png
+++ b/application/resources/multimc/32x32/refresh.png
diff --git a/resources/multimc/32x32/resourcepacks.png b/application/resources/multimc/32x32/resourcepacks.png
index c14759ef..c14759ef 100644
--- a/resources/multimc/32x32/resourcepacks.png
+++ b/application/resources/multimc/32x32/resourcepacks.png
diff --git a/resources/multimc/32x32/screenshots.png b/application/resources/multimc/32x32/screenshots.png
index 4fcd6224..4fcd6224 100644
--- a/resources/multimc/32x32/screenshots.png
+++ b/application/resources/multimc/32x32/screenshots.png
diff --git a/resources/multimc/32x32/settings.png b/application/resources/multimc/32x32/settings.png
index a9c0817c..a9c0817c 100644
--- a/resources/multimc/32x32/settings.png
+++ b/application/resources/multimc/32x32/settings.png
diff --git a/resources/multimc/32x32/status-bad.png b/application/resources/multimc/32x32/status-bad.png
index 8c2c9d4f..8c2c9d4f 100644
--- a/resources/multimc/32x32/status-bad.png
+++ b/application/resources/multimc/32x32/status-bad.png
diff --git a/resources/multimc/32x32/status-good.png b/application/resources/multimc/32x32/status-good.png
index 1a805e68..1a805e68 100644
--- a/resources/multimc/32x32/status-good.png
+++ b/application/resources/multimc/32x32/status-good.png
diff --git a/resources/multimc/32x32/status-yellow.png b/application/resources/multimc/32x32/status-yellow.png
index 42c68552..42c68552 100644
--- a/resources/multimc/32x32/status-yellow.png
+++ b/application/resources/multimc/32x32/status-yellow.png
diff --git a/resources/multimc/32x32/viewfolder.png b/application/resources/multimc/32x32/viewfolder.png
index 74ab8fa6..74ab8fa6 100644
--- a/resources/multimc/32x32/viewfolder.png
+++ b/application/resources/multimc/32x32/viewfolder.png
diff --git a/resources/multimc/48x48/about.png b/application/resources/multimc/48x48/about.png
index b4ac71b8..b4ac71b8 100644
--- a/resources/multimc/48x48/about.png
+++ b/application/resources/multimc/48x48/about.png
diff --git a/resources/multimc/48x48/bug.png b/application/resources/multimc/48x48/bug.png
index 298f9397..298f9397 100644
--- a/resources/multimc/48x48/bug.png
+++ b/application/resources/multimc/48x48/bug.png
diff --git a/resources/multimc/48x48/cat.png b/application/resources/multimc/48x48/cat.png
index 25912a3c..25912a3c 100644
--- a/resources/multimc/48x48/cat.png
+++ b/application/resources/multimc/48x48/cat.png
diff --git a/resources/multimc/48x48/centralmods.png b/application/resources/multimc/48x48/centralmods.png
index d927e39b..d927e39b 100644
--- a/resources/multimc/48x48/centralmods.png
+++ b/application/resources/multimc/48x48/centralmods.png
diff --git a/resources/multimc/48x48/checkupdate.png b/application/resources/multimc/48x48/checkupdate.png
index 2e2c7d6b..2e2c7d6b 100644
--- a/resources/multimc/48x48/checkupdate.png
+++ b/application/resources/multimc/48x48/checkupdate.png
diff --git a/resources/multimc/48x48/copy.png b/application/resources/multimc/48x48/copy.png
index ea40e34b..ea40e34b 100644
--- a/resources/multimc/48x48/copy.png
+++ b/application/resources/multimc/48x48/copy.png
diff --git a/resources/multimc/48x48/help.png b/application/resources/multimc/48x48/help.png
index 82d828fa..82d828fa 100644
--- a/resources/multimc/48x48/help.png
+++ b/application/resources/multimc/48x48/help.png
diff --git a/resources/multimc/48x48/instance-settings.png b/application/resources/multimc/48x48/instance-settings.png
index 6674eb23..6674eb23 100644
--- a/resources/multimc/48x48/instance-settings.png
+++ b/application/resources/multimc/48x48/instance-settings.png
diff --git a/resources/multimc/48x48/log.png b/application/resources/multimc/48x48/log.png
index 45f60e6b..45f60e6b 100644
--- a/resources/multimc/48x48/log.png
+++ b/application/resources/multimc/48x48/log.png
diff --git a/resources/multimc/48x48/minecraft.png b/application/resources/multimc/48x48/minecraft.png
index 38fc9f6c..38fc9f6c 100644
--- a/resources/multimc/48x48/minecraft.png
+++ b/application/resources/multimc/48x48/minecraft.png
diff --git a/resources/multimc/48x48/new.png b/application/resources/multimc/48x48/new.png
index a81753b3..a81753b3 100644
--- a/resources/multimc/48x48/new.png
+++ b/application/resources/multimc/48x48/new.png
diff --git a/resources/multimc/48x48/news.png b/application/resources/multimc/48x48/news.png
index 0f82d857..0f82d857 100644
--- a/resources/multimc/48x48/news.png
+++ b/application/resources/multimc/48x48/news.png
diff --git a/resources/multimc/48x48/noaccount.png b/application/resources/multimc/48x48/noaccount.png
index 4703796c..4703796c 100644
--- a/resources/multimc/48x48/noaccount.png
+++ b/application/resources/multimc/48x48/noaccount.png
diff --git a/resources/multimc/48x48/patreon.png b/application/resources/multimc/48x48/patreon.png
index 2708a85a..2708a85a 100644
--- a/resources/multimc/48x48/patreon.png
+++ b/application/resources/multimc/48x48/patreon.png
diff --git a/resources/multimc/48x48/refresh.png b/application/resources/multimc/48x48/refresh.png
index 0b08b238..0b08b238 100644
--- a/resources/multimc/48x48/refresh.png
+++ b/application/resources/multimc/48x48/refresh.png
diff --git a/resources/multimc/48x48/screenshots.png b/application/resources/multimc/48x48/screenshots.png
index 03c0059f..03c0059f 100644
--- a/resources/multimc/48x48/screenshots.png
+++ b/application/resources/multimc/48x48/screenshots.png
diff --git a/resources/multimc/48x48/settings.png b/application/resources/multimc/48x48/settings.png
index 6674eb23..6674eb23 100644
--- a/resources/multimc/48x48/settings.png
+++ b/application/resources/multimc/48x48/settings.png
diff --git a/resources/multimc/48x48/status-bad.png b/application/resources/multimc/48x48/status-bad.png
index 41c9cf22..41c9cf22 100644
--- a/resources/multimc/48x48/status-bad.png
+++ b/application/resources/multimc/48x48/status-bad.png
diff --git a/resources/multimc/48x48/status-good.png b/application/resources/multimc/48x48/status-good.png
index df7cb59b..df7cb59b 100644
--- a/resources/multimc/48x48/status-good.png
+++ b/application/resources/multimc/48x48/status-good.png
diff --git a/resources/multimc/48x48/status-yellow.png b/application/resources/multimc/48x48/status-yellow.png
index 4f3b11d6..4f3b11d6 100644
--- a/resources/multimc/48x48/status-yellow.png
+++ b/application/resources/multimc/48x48/status-yellow.png
diff --git a/resources/multimc/48x48/viewfolder.png b/application/resources/multimc/48x48/viewfolder.png
index 0492a736..0492a736 100644
--- a/resources/multimc/48x48/viewfolder.png
+++ b/application/resources/multimc/48x48/viewfolder.png
diff --git a/resources/multimc/64x64/about.png b/application/resources/multimc/64x64/about.png
index b83e9269..b83e9269 100644
--- a/resources/multimc/64x64/about.png
+++ b/application/resources/multimc/64x64/about.png
diff --git a/resources/multimc/64x64/bug.png b/application/resources/multimc/64x64/bug.png
index 156b0315..156b0315 100644
--- a/resources/multimc/64x64/bug.png
+++ b/application/resources/multimc/64x64/bug.png
diff --git a/resources/multimc/64x64/cat.png b/application/resources/multimc/64x64/cat.png
index 2cc21f80..2cc21f80 100644
--- a/resources/multimc/64x64/cat.png
+++ b/application/resources/multimc/64x64/cat.png
diff --git a/resources/multimc/64x64/centralmods.png b/application/resources/multimc/64x64/centralmods.png
index 8831f437..8831f437 100644
--- a/resources/multimc/64x64/centralmods.png
+++ b/application/resources/multimc/64x64/centralmods.png
diff --git a/resources/multimc/64x64/checkupdate.png b/application/resources/multimc/64x64/checkupdate.png
index dd1e29ac..dd1e29ac 100644
--- a/resources/multimc/64x64/checkupdate.png
+++ b/application/resources/multimc/64x64/checkupdate.png
diff --git a/resources/multimc/64x64/copy.png b/application/resources/multimc/64x64/copy.png
index d12cf9c8..d12cf9c8 100644
--- a/resources/multimc/64x64/copy.png
+++ b/application/resources/multimc/64x64/copy.png
diff --git a/resources/multimc/64x64/coremods.png b/application/resources/multimc/64x64/coremods.png
index 668be334..668be334 100644
--- a/resources/multimc/64x64/coremods.png
+++ b/application/resources/multimc/64x64/coremods.png
diff --git a/resources/multimc/64x64/help.png b/application/resources/multimc/64x64/help.png
index 0f3948c2..0f3948c2 100644
--- a/resources/multimc/64x64/help.png
+++ b/application/resources/multimc/64x64/help.png
diff --git a/resources/multimc/64x64/instance-settings.png b/application/resources/multimc/64x64/instance-settings.png
index e3ff58fa..e3ff58fa 100644
--- a/resources/multimc/64x64/instance-settings.png
+++ b/application/resources/multimc/64x64/instance-settings.png
diff --git a/resources/multimc/64x64/jarmods.png b/application/resources/multimc/64x64/jarmods.png
index 55d1a42a..55d1a42a 100644
--- a/resources/multimc/64x64/jarmods.png
+++ b/application/resources/multimc/64x64/jarmods.png
diff --git a/resources/multimc/64x64/loadermods.png b/application/resources/multimc/64x64/loadermods.png
index 24618fd0..24618fd0 100644
--- a/resources/multimc/64x64/loadermods.png
+++ b/application/resources/multimc/64x64/loadermods.png
diff --git a/resources/multimc/64x64/log.png b/application/resources/multimc/64x64/log.png
index 0f531cdf..0f531cdf 100644
--- a/resources/multimc/64x64/log.png
+++ b/application/resources/multimc/64x64/log.png
diff --git a/resources/multimc/64x64/new.png b/application/resources/multimc/64x64/new.png
index c3c6796c..c3c6796c 100644
--- a/resources/multimc/64x64/new.png
+++ b/application/resources/multimc/64x64/new.png
diff --git a/resources/multimc/64x64/news.png b/application/resources/multimc/64x64/news.png
index e306eed3..e306eed3 100644
--- a/resources/multimc/64x64/news.png
+++ b/application/resources/multimc/64x64/news.png
diff --git a/resources/multimc/64x64/patreon.png b/application/resources/multimc/64x64/patreon.png
index 7b4814ec..7b4814ec 100644
--- a/resources/multimc/64x64/patreon.png
+++ b/application/resources/multimc/64x64/patreon.png
diff --git a/resources/multimc/64x64/refresh.png b/application/resources/multimc/64x64/refresh.png
index 8373d819..8373d819 100644
--- a/resources/multimc/64x64/refresh.png
+++ b/application/resources/multimc/64x64/refresh.png
diff --git a/resources/multimc/64x64/resourcepacks.png b/application/resources/multimc/64x64/resourcepacks.png
index fb874e7d..fb874e7d 100644
--- a/resources/multimc/64x64/resourcepacks.png
+++ b/application/resources/multimc/64x64/resourcepacks.png
diff --git a/resources/multimc/64x64/screenshots.png b/application/resources/multimc/64x64/screenshots.png
index af18e39c..af18e39c 100644
--- a/resources/multimc/64x64/screenshots.png
+++ b/application/resources/multimc/64x64/screenshots.png
diff --git a/resources/multimc/64x64/settings.png b/application/resources/multimc/64x64/settings.png
index e3ff58fa..e3ff58fa 100644
--- a/resources/multimc/64x64/settings.png
+++ b/application/resources/multimc/64x64/settings.png
diff --git a/resources/multimc/64x64/status-bad.png b/application/resources/multimc/64x64/status-bad.png
index 64060ba0..64060ba0 100644
--- a/resources/multimc/64x64/status-bad.png
+++ b/application/resources/multimc/64x64/status-bad.png
diff --git a/resources/multimc/64x64/status-good.png b/application/resources/multimc/64x64/status-good.png
index e862ddcd..e862ddcd 100644
--- a/resources/multimc/64x64/status-good.png
+++ b/application/resources/multimc/64x64/status-good.png
diff --git a/resources/multimc/64x64/status-yellow.png b/application/resources/multimc/64x64/status-yellow.png
index 3d54d320..3d54d320 100644
--- a/resources/multimc/64x64/status-yellow.png
+++ b/application/resources/multimc/64x64/status-yellow.png
diff --git a/resources/multimc/64x64/viewfolder.png b/application/resources/multimc/64x64/viewfolder.png
index 7d531f9c..7d531f9c 100644
--- a/resources/multimc/64x64/viewfolder.png
+++ b/application/resources/multimc/64x64/viewfolder.png
diff --git a/resources/multimc/8x8/noaccount.png b/application/resources/multimc/8x8/noaccount.png
index 466e4c07..466e4c07 100644
--- a/resources/multimc/8x8/noaccount.png
+++ b/application/resources/multimc/8x8/noaccount.png
diff --git a/resources/multimc/index.theme b/application/resources/multimc/index.theme
index 5f7d3f3f..5f7d3f3f 100644
--- a/resources/multimc/index.theme
+++ b/application/resources/multimc/index.theme
diff --git a/resources/multimc/multimc.qrc b/application/resources/multimc/multimc.qrc
index d02d0e0e..d02d0e0e 100644
--- a/resources/multimc/multimc.qrc
+++ b/application/resources/multimc/multimc.qrc
diff --git a/resources/multimc/scalable/bug.svg b/application/resources/multimc/scalable/bug.svg
index 178e3c23..178e3c23 100644
--- a/resources/multimc/scalable/bug.svg
+++ b/application/resources/multimc/scalable/bug.svg
diff --git a/resources/multimc/scalable/centralmods.svg b/application/resources/multimc/scalable/centralmods.svg
index a8b123d0..a8b123d0 100644
--- a/resources/multimc/scalable/centralmods.svg
+++ b/application/resources/multimc/scalable/centralmods.svg
diff --git a/resources/multimc/scalable/checkupdate.svg b/application/resources/multimc/scalable/checkupdate.svg
index fc09cb4c..fc09cb4c 100644
--- a/resources/multimc/scalable/checkupdate.svg
+++ b/application/resources/multimc/scalable/checkupdate.svg
diff --git a/resources/multimc/scalable/console.svg b/application/resources/multimc/scalable/console.svg
index ec14ab68..ec14ab68 100644
--- a/resources/multimc/scalable/console.svg
+++ b/application/resources/multimc/scalable/console.svg
diff --git a/resources/multimc/scalable/console_error.svg b/application/resources/multimc/scalable/console_error.svg
index a71c6b35..a71c6b35 100644
--- a/resources/multimc/scalable/console_error.svg
+++ b/application/resources/multimc/scalable/console_error.svg
diff --git a/resources/multimc/scalable/java.svg b/application/resources/multimc/scalable/java.svg
index fd15e5c6..fd15e5c6 100644
--- a/resources/multimc/scalable/java.svg
+++ b/application/resources/multimc/scalable/java.svg
diff --git a/resources/multimc/scalable/multimc.svg b/application/resources/multimc/scalable/multimc.svg
index 178509ac..178509ac 100644
--- a/resources/multimc/scalable/multimc.svg
+++ b/application/resources/multimc/scalable/multimc.svg
diff --git a/resources/multimc/scalable/new.svg b/application/resources/multimc/scalable/new.svg
index c9cff358..c9cff358 100644
--- a/resources/multimc/scalable/new.svg
+++ b/application/resources/multimc/scalable/new.svg
diff --git a/resources/multimc/scalable/news.svg b/application/resources/multimc/scalable/news.svg
index 67a370df..67a370df 100644
--- a/resources/multimc/scalable/news.svg
+++ b/application/resources/multimc/scalable/news.svg
diff --git a/resources/multimc/scalable/proxy.svg b/application/resources/multimc/scalable/proxy.svg
index 55ee6f93..55ee6f93 100644
--- a/resources/multimc/scalable/proxy.svg
+++ b/application/resources/multimc/scalable/proxy.svg
diff --git a/resources/multimc/scalable/screenshot-placeholder.svg b/application/resources/multimc/scalable/screenshot-placeholder.svg
index a7a2a3d6..a7a2a3d6 100644
--- a/resources/multimc/scalable/screenshot-placeholder.svg
+++ b/application/resources/multimc/scalable/screenshot-placeholder.svg
diff --git a/resources/multimc/scalable/screenshots.svg b/application/resources/multimc/scalable/screenshots.svg
index a3d4d8e2..a3d4d8e2 100644
--- a/resources/multimc/scalable/screenshots.svg
+++ b/application/resources/multimc/scalable/screenshots.svg
diff --git a/resources/multimc/scalable/status-bad.svg b/application/resources/multimc/scalable/status-bad.svg
index 9f47307e..9f47307e 100644
--- a/resources/multimc/scalable/status-bad.svg
+++ b/application/resources/multimc/scalable/status-bad.svg
diff --git a/resources/multimc/scalable/status-good.svg b/application/resources/multimc/scalable/status-good.svg
index 0a35c80f..0a35c80f 100644
--- a/resources/multimc/scalable/status-good.svg
+++ b/application/resources/multimc/scalable/status-good.svg
diff --git a/resources/multimc/scalable/status-yellow.svg b/application/resources/multimc/scalable/status-yellow.svg
index 140e6082..140e6082 100644
--- a/resources/multimc/scalable/status-yellow.svg
+++ b/application/resources/multimc/scalable/status-yellow.svg
diff --git a/resources/multimc/scalable/viewfolder.svg b/application/resources/multimc/scalable/viewfolder.svg
index 4ba0ed0a..4ba0ed0a 100644
--- a/resources/multimc/scalable/viewfolder.svg
+++ b/application/resources/multimc/scalable/viewfolder.svg
diff --git a/resources/pe_blue/index.theme b/application/resources/pe_blue/index.theme
index c9e0d93a..c9e0d93a 100644
--- a/resources/pe_blue/index.theme
+++ b/application/resources/pe_blue/index.theme
diff --git a/resources/pe_blue/pe_blue.qrc b/application/resources/pe_blue/pe_blue.qrc
index a4525d2e..a4525d2e 100644
--- a/resources/pe_blue/pe_blue.qrc
+++ b/application/resources/pe_blue/pe_blue.qrc
diff --git a/resources/pe_blue/scalable/about.svg b/application/resources/pe_blue/scalable/about.svg
index 56e7fc9b..56e7fc9b 100644
--- a/resources/pe_blue/scalable/about.svg
+++ b/application/resources/pe_blue/scalable/about.svg
diff --git a/resources/pe_blue/scalable/accounts.svg b/application/resources/pe_blue/scalable/accounts.svg
index 77e3f45a..77e3f45a 100644
--- a/resources/pe_blue/scalable/accounts.svg
+++ b/application/resources/pe_blue/scalable/accounts.svg
diff --git a/resources/pe_blue/scalable/bug.svg b/application/resources/pe_blue/scalable/bug.svg
index 75a19e29..75a19e29 100644
--- a/resources/pe_blue/scalable/bug.svg
+++ b/application/resources/pe_blue/scalable/bug.svg
diff --git a/resources/pe_blue/scalable/centralmods.svg b/application/resources/pe_blue/scalable/centralmods.svg
index cda39b1f..cda39b1f 100644
--- a/resources/pe_blue/scalable/centralmods.svg
+++ b/application/resources/pe_blue/scalable/centralmods.svg
diff --git a/resources/pe_blue/scalable/checkupdate.svg b/application/resources/pe_blue/scalable/checkupdate.svg
index a7d9ee81..a7d9ee81 100644
--- a/resources/pe_blue/scalable/checkupdate.svg
+++ b/application/resources/pe_blue/scalable/checkupdate.svg
diff --git a/resources/pe_blue/scalable/copy.svg b/application/resources/pe_blue/scalable/copy.svg
index 7ce014ed..7ce014ed 100644
--- a/resources/pe_blue/scalable/copy.svg
+++ b/application/resources/pe_blue/scalable/copy.svg
diff --git a/resources/pe_blue/scalable/coremods.svg b/application/resources/pe_blue/scalable/coremods.svg
index 4cc030d0..4cc030d0 100644
--- a/resources/pe_blue/scalable/coremods.svg
+++ b/application/resources/pe_blue/scalable/coremods.svg
diff --git a/resources/pe_blue/scalable/externaltools.svg b/application/resources/pe_blue/scalable/externaltools.svg
index 45b73496..45b73496 100644
--- a/resources/pe_blue/scalable/externaltools.svg
+++ b/application/resources/pe_blue/scalable/externaltools.svg
diff --git a/resources/pe_blue/scalable/instance-settings.svg b/application/resources/pe_blue/scalable/instance-settings.svg
index 43f0b2f2..43f0b2f2 100644
--- a/resources/pe_blue/scalable/instance-settings.svg
+++ b/application/resources/pe_blue/scalable/instance-settings.svg
diff --git a/resources/pe_blue/scalable/jarmods.svg b/application/resources/pe_blue/scalable/jarmods.svg
index bb75f4b1..bb75f4b1 100644
--- a/resources/pe_blue/scalable/jarmods.svg
+++ b/application/resources/pe_blue/scalable/jarmods.svg
diff --git a/resources/pe_blue/scalable/java.svg b/application/resources/pe_blue/scalable/java.svg
index 5e369203..5e369203 100644
--- a/resources/pe_blue/scalable/java.svg
+++ b/application/resources/pe_blue/scalable/java.svg
diff --git a/resources/pe_blue/scalable/loadermods.svg b/application/resources/pe_blue/scalable/loadermods.svg
index a54dc211..a54dc211 100644
--- a/resources/pe_blue/scalable/loadermods.svg
+++ b/application/resources/pe_blue/scalable/loadermods.svg
diff --git a/resources/pe_blue/scalable/log.svg b/application/resources/pe_blue/scalable/log.svg
index 89d373f4..89d373f4 100644
--- a/resources/pe_blue/scalable/log.svg
+++ b/application/resources/pe_blue/scalable/log.svg
diff --git a/resources/pe_blue/scalable/minecraft.svg b/application/resources/pe_blue/scalable/minecraft.svg
index 2fe6a028..2fe6a028 100644
--- a/resources/pe_blue/scalable/minecraft.svg
+++ b/application/resources/pe_blue/scalable/minecraft.svg
diff --git a/resources/pe_blue/scalable/multimc.svg b/application/resources/pe_blue/scalable/multimc.svg
index 820c0b53..820c0b53 100644
--- a/resources/pe_blue/scalable/multimc.svg
+++ b/application/resources/pe_blue/scalable/multimc.svg
diff --git a/resources/pe_blue/scalable/new.svg b/application/resources/pe_blue/scalable/new.svg
index dcc8579e..dcc8579e 100644
--- a/resources/pe_blue/scalable/new.svg
+++ b/application/resources/pe_blue/scalable/new.svg
diff --git a/resources/pe_blue/scalable/news.svg b/application/resources/pe_blue/scalable/news.svg
index 3ca3be37..3ca3be37 100644
--- a/resources/pe_blue/scalable/news.svg
+++ b/application/resources/pe_blue/scalable/news.svg
diff --git a/resources/pe_blue/scalable/notes.svg b/application/resources/pe_blue/scalable/notes.svg
index d0991259..d0991259 100644
--- a/resources/pe_blue/scalable/notes.svg
+++ b/application/resources/pe_blue/scalable/notes.svg
diff --git a/resources/pe_blue/scalable/patreon.svg b/application/resources/pe_blue/scalable/patreon.svg
index 644b9b41..644b9b41 100644
--- a/resources/pe_blue/scalable/patreon.svg
+++ b/application/resources/pe_blue/scalable/patreon.svg
diff --git a/resources/pe_blue/scalable/proxy.svg b/application/resources/pe_blue/scalable/proxy.svg
index 8266f9b8..8266f9b8 100644
--- a/resources/pe_blue/scalable/proxy.svg
+++ b/application/resources/pe_blue/scalable/proxy.svg
diff --git a/resources/pe_blue/scalable/quickmods.svg b/application/resources/pe_blue/scalable/quickmods.svg
index 8b577376..8b577376 100644
--- a/resources/pe_blue/scalable/quickmods.svg
+++ b/application/resources/pe_blue/scalable/quickmods.svg
diff --git a/resources/pe_blue/scalable/refresh.svg b/application/resources/pe_blue/scalable/refresh.svg
index a3d2281d..a3d2281d 100644
--- a/resources/pe_blue/scalable/refresh.svg
+++ b/application/resources/pe_blue/scalable/refresh.svg
diff --git a/resources/pe_blue/scalable/resourcepacks.svg b/application/resources/pe_blue/scalable/resourcepacks.svg
index a17e7e82..a17e7e82 100644
--- a/resources/pe_blue/scalable/resourcepacks.svg
+++ b/application/resources/pe_blue/scalable/resourcepacks.svg
diff --git a/resources/pe_blue/scalable/screenshots.svg b/application/resources/pe_blue/scalable/screenshots.svg
index 1aa4e559..1aa4e559 100644
--- a/resources/pe_blue/scalable/screenshots.svg
+++ b/application/resources/pe_blue/scalable/screenshots.svg
diff --git a/resources/pe_blue/scalable/settings.svg b/application/resources/pe_blue/scalable/settings.svg
index 43f0b2f2..43f0b2f2 100644
--- a/resources/pe_blue/scalable/settings.svg
+++ b/application/resources/pe_blue/scalable/settings.svg
diff --git a/resources/pe_blue/scalable/status-bad.svg b/application/resources/pe_blue/scalable/status-bad.svg
index 4a48b5d8..4a48b5d8 100644
--- a/resources/pe_blue/scalable/status-bad.svg
+++ b/application/resources/pe_blue/scalable/status-bad.svg
diff --git a/resources/pe_blue/scalable/status-good.svg b/application/resources/pe_blue/scalable/status-good.svg
index 4cfa56f0..4cfa56f0 100644
--- a/resources/pe_blue/scalable/status-good.svg
+++ b/application/resources/pe_blue/scalable/status-good.svg
diff --git a/resources/pe_blue/scalable/status-yellow.svg b/application/resources/pe_blue/scalable/status-yellow.svg
index 0551fed2..0551fed2 100644
--- a/resources/pe_blue/scalable/status-yellow.svg
+++ b/application/resources/pe_blue/scalable/status-yellow.svg
diff --git a/resources/pe_blue/scalable/viewfolder.svg b/application/resources/pe_blue/scalable/viewfolder.svg
index 2634f8ff..2634f8ff 100644
--- a/resources/pe_blue/scalable/viewfolder.svg
+++ b/application/resources/pe_blue/scalable/viewfolder.svg
diff --git a/resources/pe_colored/index.theme b/application/resources/pe_colored/index.theme
index b757bbd7..b757bbd7 100644
--- a/resources/pe_colored/index.theme
+++ b/application/resources/pe_colored/index.theme
diff --git a/resources/pe_colored/pe_colored.qrc b/application/resources/pe_colored/pe_colored.qrc
index 7de8d5ab..7de8d5ab 100644
--- a/resources/pe_colored/pe_colored.qrc
+++ b/application/resources/pe_colored/pe_colored.qrc
diff --git a/resources/pe_colored/scalable/about.svg b/application/resources/pe_colored/scalable/about.svg
index 95e99689..95e99689 100644
--- a/resources/pe_colored/scalable/about.svg
+++ b/application/resources/pe_colored/scalable/about.svg
diff --git a/resources/pe_colored/scalable/accounts.svg b/application/resources/pe_colored/scalable/accounts.svg
index 301eb368..301eb368 100644
--- a/resources/pe_colored/scalable/accounts.svg
+++ b/application/resources/pe_colored/scalable/accounts.svg
diff --git a/resources/pe_colored/scalable/bug.svg b/application/resources/pe_colored/scalable/bug.svg
index 8c92df0a..8c92df0a 100644
--- a/resources/pe_colored/scalable/bug.svg
+++ b/application/resources/pe_colored/scalable/bug.svg
diff --git a/resources/pe_colored/scalable/centralmods.svg b/application/resources/pe_colored/scalable/centralmods.svg
index 57a97259..57a97259 100644
--- a/resources/pe_colored/scalable/centralmods.svg
+++ b/application/resources/pe_colored/scalable/centralmods.svg
diff --git a/resources/pe_colored/scalable/checkupdate.svg b/application/resources/pe_colored/scalable/checkupdate.svg
index 0adc8eeb..0adc8eeb 100644
--- a/resources/pe_colored/scalable/checkupdate.svg
+++ b/application/resources/pe_colored/scalable/checkupdate.svg
diff --git a/resources/pe_colored/scalable/copy.svg b/application/resources/pe_colored/scalable/copy.svg
index b9b0f1b1..b9b0f1b1 100644
--- a/resources/pe_colored/scalable/copy.svg
+++ b/application/resources/pe_colored/scalable/copy.svg
diff --git a/resources/pe_colored/scalable/coremods.svg b/application/resources/pe_colored/scalable/coremods.svg
index ca7a22f0..ca7a22f0 100644
--- a/resources/pe_colored/scalable/coremods.svg
+++ b/application/resources/pe_colored/scalable/coremods.svg
diff --git a/resources/pe_colored/scalable/externaltools.svg b/application/resources/pe_colored/scalable/externaltools.svg
index 1469674f..1469674f 100644
--- a/resources/pe_colored/scalable/externaltools.svg
+++ b/application/resources/pe_colored/scalable/externaltools.svg
diff --git a/resources/pe_colored/scalable/instance-settings.svg b/application/resources/pe_colored/scalable/instance-settings.svg
index 72032f8a..72032f8a 100644
--- a/resources/pe_colored/scalable/instance-settings.svg
+++ b/application/resources/pe_colored/scalable/instance-settings.svg
diff --git a/resources/pe_colored/scalable/jarmods.svg b/application/resources/pe_colored/scalable/jarmods.svg
index bb75f4b1..bb75f4b1 100644
--- a/resources/pe_colored/scalable/jarmods.svg
+++ b/application/resources/pe_colored/scalable/jarmods.svg
diff --git a/resources/pe_colored/scalable/java.svg b/application/resources/pe_colored/scalable/java.svg
index 32c0225b..32c0225b 100644
--- a/resources/pe_colored/scalable/java.svg
+++ b/application/resources/pe_colored/scalable/java.svg
diff --git a/resources/pe_colored/scalable/loadermods.svg b/application/resources/pe_colored/scalable/loadermods.svg
index 2d80c7f3..2d80c7f3 100644
--- a/resources/pe_colored/scalable/loadermods.svg
+++ b/application/resources/pe_colored/scalable/loadermods.svg
diff --git a/resources/pe_colored/scalable/log.svg b/application/resources/pe_colored/scalable/log.svg
index 42659b53..42659b53 100644
--- a/resources/pe_colored/scalable/log.svg
+++ b/application/resources/pe_colored/scalable/log.svg
diff --git a/resources/pe_colored/scalable/minecraft.svg b/application/resources/pe_colored/scalable/minecraft.svg
index 52815487..52815487 100644
--- a/resources/pe_colored/scalable/minecraft.svg
+++ b/application/resources/pe_colored/scalable/minecraft.svg
diff --git a/resources/pe_colored/scalable/multimc.svg b/application/resources/pe_colored/scalable/multimc.svg
index a146c52e..a146c52e 100644
--- a/resources/pe_colored/scalable/multimc.svg
+++ b/application/resources/pe_colored/scalable/multimc.svg
diff --git a/resources/pe_colored/scalable/new.svg b/application/resources/pe_colored/scalable/new.svg
index f18ed28a..f18ed28a 100644
--- a/resources/pe_colored/scalable/new.svg
+++ b/application/resources/pe_colored/scalable/new.svg
diff --git a/resources/pe_colored/scalable/news.svg b/application/resources/pe_colored/scalable/news.svg
index 4f924cd8..4f924cd8 100644
--- a/resources/pe_colored/scalable/news.svg
+++ b/application/resources/pe_colored/scalable/news.svg
diff --git a/resources/pe_colored/scalable/notes.svg b/application/resources/pe_colored/scalable/notes.svg
index 55ece163..55ece163 100644
--- a/resources/pe_colored/scalable/notes.svg
+++ b/application/resources/pe_colored/scalable/notes.svg
diff --git a/resources/pe_colored/scalable/patreon.svg b/application/resources/pe_colored/scalable/patreon.svg
index d3c6d2d5..d3c6d2d5 100644
--- a/resources/pe_colored/scalable/patreon.svg
+++ b/application/resources/pe_colored/scalable/patreon.svg
diff --git a/resources/pe_colored/scalable/proxy.svg b/application/resources/pe_colored/scalable/proxy.svg
index 0aee69b7..0aee69b7 100644
--- a/resources/pe_colored/scalable/proxy.svg
+++ b/application/resources/pe_colored/scalable/proxy.svg
diff --git a/resources/pe_colored/scalable/quickmods.svg b/application/resources/pe_colored/scalable/quickmods.svg
index 199b2dae..199b2dae 100644
--- a/resources/pe_colored/scalable/quickmods.svg
+++ b/application/resources/pe_colored/scalable/quickmods.svg
diff --git a/resources/pe_colored/scalable/refresh.svg b/application/resources/pe_colored/scalable/refresh.svg
index c2e7e91f..c2e7e91f 100644
--- a/resources/pe_colored/scalable/refresh.svg
+++ b/application/resources/pe_colored/scalable/refresh.svg
diff --git a/resources/pe_colored/scalable/resourcepacks.svg b/application/resources/pe_colored/scalable/resourcepacks.svg
index 0318354c..0318354c 100644
--- a/resources/pe_colored/scalable/resourcepacks.svg
+++ b/application/resources/pe_colored/scalable/resourcepacks.svg
diff --git a/resources/pe_colored/scalable/screenshots.svg b/application/resources/pe_colored/scalable/screenshots.svg
index 844fcbaa..844fcbaa 100644
--- a/resources/pe_colored/scalable/screenshots.svg
+++ b/application/resources/pe_colored/scalable/screenshots.svg
diff --git a/resources/pe_colored/scalable/settings.svg b/application/resources/pe_colored/scalable/settings.svg
index 72032f8a..72032f8a 100644
--- a/resources/pe_colored/scalable/settings.svg
+++ b/application/resources/pe_colored/scalable/settings.svg
diff --git a/resources/pe_colored/scalable/status-bad.svg b/application/resources/pe_colored/scalable/status-bad.svg
index bc42c248..bc42c248 100644
--- a/resources/pe_colored/scalable/status-bad.svg
+++ b/application/resources/pe_colored/scalable/status-bad.svg
diff --git a/resources/pe_colored/scalable/status-good.svg b/application/resources/pe_colored/scalable/status-good.svg
index 4cfa56f0..4cfa56f0 100644
--- a/resources/pe_colored/scalable/status-good.svg
+++ b/application/resources/pe_colored/scalable/status-good.svg
diff --git a/resources/pe_colored/scalable/status-yellow.svg b/application/resources/pe_colored/scalable/status-yellow.svg
index 0551fed2..0551fed2 100644
--- a/resources/pe_colored/scalable/status-yellow.svg
+++ b/application/resources/pe_colored/scalable/status-yellow.svg
diff --git a/resources/pe_colored/scalable/viewfolder.svg b/application/resources/pe_colored/scalable/viewfolder.svg
index 91832577..91832577 100644
--- a/resources/pe_colored/scalable/viewfolder.svg
+++ b/application/resources/pe_colored/scalable/viewfolder.svg
diff --git a/resources/pe_dark/index.theme b/application/resources/pe_dark/index.theme
index b7d1ad01..b7d1ad01 100644
--- a/resources/pe_dark/index.theme
+++ b/application/resources/pe_dark/index.theme
diff --git a/resources/pe_dark/pe_dark.qrc b/application/resources/pe_dark/pe_dark.qrc
index cafc2559..cafc2559 100644
--- a/resources/pe_dark/pe_dark.qrc
+++ b/application/resources/pe_dark/pe_dark.qrc
diff --git a/resources/pe_dark/scalable/about.svg b/application/resources/pe_dark/scalable/about.svg
index e75ea6ca..e75ea6ca 100644
--- a/resources/pe_dark/scalable/about.svg
+++ b/application/resources/pe_dark/scalable/about.svg
diff --git a/resources/pe_dark/scalable/accounts.svg b/application/resources/pe_dark/scalable/accounts.svg
index 6d46b2df..6d46b2df 100644
--- a/resources/pe_dark/scalable/accounts.svg
+++ b/application/resources/pe_dark/scalable/accounts.svg
diff --git a/resources/pe_dark/scalable/bug.svg b/application/resources/pe_dark/scalable/bug.svg
index 9da71adb..9da71adb 100644
--- a/resources/pe_dark/scalable/bug.svg
+++ b/application/resources/pe_dark/scalable/bug.svg
diff --git a/resources/pe_dark/scalable/centralmods.svg b/application/resources/pe_dark/scalable/centralmods.svg
index f3b0c0e4..f3b0c0e4 100644
--- a/resources/pe_dark/scalable/centralmods.svg
+++ b/application/resources/pe_dark/scalable/centralmods.svg
diff --git a/resources/pe_dark/scalable/checkupdate.svg b/application/resources/pe_dark/scalable/checkupdate.svg
index 97585447..97585447 100644
--- a/resources/pe_dark/scalable/checkupdate.svg
+++ b/application/resources/pe_dark/scalable/checkupdate.svg
diff --git a/resources/pe_dark/scalable/copy.svg b/application/resources/pe_dark/scalable/copy.svg
index 8c30ac0b..8c30ac0b 100644
--- a/resources/pe_dark/scalable/copy.svg
+++ b/application/resources/pe_dark/scalable/copy.svg
diff --git a/resources/pe_dark/scalable/coremods.svg b/application/resources/pe_dark/scalable/coremods.svg
index 1e2eb227..1e2eb227 100644
--- a/resources/pe_dark/scalable/coremods.svg
+++ b/application/resources/pe_dark/scalable/coremods.svg
diff --git a/resources/pe_dark/scalable/externaltools.svg b/application/resources/pe_dark/scalable/externaltools.svg
index 29b45f26..29b45f26 100644
--- a/resources/pe_dark/scalable/externaltools.svg
+++ b/application/resources/pe_dark/scalable/externaltools.svg
diff --git a/resources/pe_dark/scalable/instance-settings.svg b/application/resources/pe_dark/scalable/instance-settings.svg
index c9f701e7..c9f701e7 100644
--- a/resources/pe_dark/scalable/instance-settings.svg
+++ b/application/resources/pe_dark/scalable/instance-settings.svg
diff --git a/resources/pe_dark/scalable/jarmods.svg b/application/resources/pe_dark/scalable/jarmods.svg
index cb9a97ba..cb9a97ba 100644
--- a/resources/pe_dark/scalable/jarmods.svg
+++ b/application/resources/pe_dark/scalable/jarmods.svg
diff --git a/resources/pe_dark/scalable/java.svg b/application/resources/pe_dark/scalable/java.svg
index 9e1091fa..9e1091fa 100644
--- a/resources/pe_dark/scalable/java.svg
+++ b/application/resources/pe_dark/scalable/java.svg
diff --git a/resources/pe_dark/scalable/loadermods.svg b/application/resources/pe_dark/scalable/loadermods.svg
index 24226a09..24226a09 100644
--- a/resources/pe_dark/scalable/loadermods.svg
+++ b/application/resources/pe_dark/scalable/loadermods.svg
diff --git a/resources/pe_dark/scalable/log.svg b/application/resources/pe_dark/scalable/log.svg
index 68686a7d..68686a7d 100644
--- a/resources/pe_dark/scalable/log.svg
+++ b/application/resources/pe_dark/scalable/log.svg
diff --git a/resources/pe_dark/scalable/minecraft.svg b/application/resources/pe_dark/scalable/minecraft.svg
index 01baf575..01baf575 100644
--- a/resources/pe_dark/scalable/minecraft.svg
+++ b/application/resources/pe_dark/scalable/minecraft.svg
diff --git a/resources/pe_dark/scalable/multimc.svg b/application/resources/pe_dark/scalable/multimc.svg
index e4cf7b7f..e4cf7b7f 100644
--- a/resources/pe_dark/scalable/multimc.svg
+++ b/application/resources/pe_dark/scalable/multimc.svg
diff --git a/resources/pe_dark/scalable/new.svg b/application/resources/pe_dark/scalable/new.svg
index 0377aceb..0377aceb 100644
--- a/resources/pe_dark/scalable/new.svg
+++ b/application/resources/pe_dark/scalable/new.svg
diff --git a/resources/pe_dark/scalable/news.svg b/application/resources/pe_dark/scalable/news.svg
index 84979dcb..84979dcb 100644
--- a/resources/pe_dark/scalable/news.svg
+++ b/application/resources/pe_dark/scalable/news.svg
diff --git a/resources/pe_dark/scalable/notes.svg b/application/resources/pe_dark/scalable/notes.svg
index 72649721..72649721 100644
--- a/resources/pe_dark/scalable/notes.svg
+++ b/application/resources/pe_dark/scalable/notes.svg
diff --git a/resources/pe_dark/scalable/patreon.svg b/application/resources/pe_dark/scalable/patreon.svg
index 01cb279a..01cb279a 100644
--- a/resources/pe_dark/scalable/patreon.svg
+++ b/application/resources/pe_dark/scalable/patreon.svg
diff --git a/resources/pe_dark/scalable/proxy.svg b/application/resources/pe_dark/scalable/proxy.svg
index 98bcfac1..98bcfac1 100644
--- a/resources/pe_dark/scalable/proxy.svg
+++ b/application/resources/pe_dark/scalable/proxy.svg
diff --git a/resources/pe_dark/scalable/quickmods.svg b/application/resources/pe_dark/scalable/quickmods.svg
index 346729f1..346729f1 100644
--- a/resources/pe_dark/scalable/quickmods.svg
+++ b/application/resources/pe_dark/scalable/quickmods.svg
diff --git a/resources/pe_dark/scalable/refresh.svg b/application/resources/pe_dark/scalable/refresh.svg
index c227cd6c..c227cd6c 100644
--- a/resources/pe_dark/scalable/refresh.svg
+++ b/application/resources/pe_dark/scalable/refresh.svg
diff --git a/resources/pe_dark/scalable/resourcepacks.svg b/application/resources/pe_dark/scalable/resourcepacks.svg
index 0db2beb1..0db2beb1 100644
--- a/resources/pe_dark/scalable/resourcepacks.svg
+++ b/application/resources/pe_dark/scalable/resourcepacks.svg
diff --git a/resources/pe_dark/scalable/screenshots.svg b/application/resources/pe_dark/scalable/screenshots.svg
index 2803b9aa..2803b9aa 100644
--- a/resources/pe_dark/scalable/screenshots.svg
+++ b/application/resources/pe_dark/scalable/screenshots.svg
diff --git a/resources/pe_dark/scalable/settings.svg b/application/resources/pe_dark/scalable/settings.svg
index c9f701e7..c9f701e7 100644
--- a/resources/pe_dark/scalable/settings.svg
+++ b/application/resources/pe_dark/scalable/settings.svg
diff --git a/resources/pe_dark/scalable/status-bad.svg b/application/resources/pe_dark/scalable/status-bad.svg
index f455965a..f455965a 100644
--- a/resources/pe_dark/scalable/status-bad.svg
+++ b/application/resources/pe_dark/scalable/status-bad.svg
diff --git a/resources/pe_dark/scalable/status-good.svg b/application/resources/pe_dark/scalable/status-good.svg
index 4ba91f2d..4ba91f2d 100644
--- a/resources/pe_dark/scalable/status-good.svg
+++ b/application/resources/pe_dark/scalable/status-good.svg
diff --git a/resources/pe_dark/scalable/status-yellow.svg b/application/resources/pe_dark/scalable/status-yellow.svg
index 69133817..69133817 100644
--- a/resources/pe_dark/scalable/status-yellow.svg
+++ b/application/resources/pe_dark/scalable/status-yellow.svg
diff --git a/resources/pe_dark/scalable/viewfolder.svg b/application/resources/pe_dark/scalable/viewfolder.svg
index 3af36240..3af36240 100644
--- a/resources/pe_dark/scalable/viewfolder.svg
+++ b/application/resources/pe_dark/scalable/viewfolder.svg
diff --git a/resources/pe_light/index.theme b/application/resources/pe_light/index.theme
index c106acc8..c106acc8 100644
--- a/resources/pe_light/index.theme
+++ b/application/resources/pe_light/index.theme
diff --git a/resources/pe_light/pe_light.qrc b/application/resources/pe_light/pe_light.qrc
index 53d0890b..53d0890b 100644
--- a/resources/pe_light/pe_light.qrc
+++ b/application/resources/pe_light/pe_light.qrc
diff --git a/resources/pe_light/scalable/about.svg b/application/resources/pe_light/scalable/about.svg
index 8d00c32e..8d00c32e 100644
--- a/resources/pe_light/scalable/about.svg
+++ b/application/resources/pe_light/scalable/about.svg
diff --git a/resources/pe_light/scalable/accounts.svg b/application/resources/pe_light/scalable/accounts.svg
index 3a092d03..3a092d03 100644
--- a/resources/pe_light/scalable/accounts.svg
+++ b/application/resources/pe_light/scalable/accounts.svg
diff --git a/resources/pe_light/scalable/bug.svg b/application/resources/pe_light/scalable/bug.svg
index ccb64bc5..ccb64bc5 100644
--- a/resources/pe_light/scalable/bug.svg
+++ b/application/resources/pe_light/scalable/bug.svg
diff --git a/resources/pe_light/scalable/centralmods.svg b/application/resources/pe_light/scalable/centralmods.svg
index 050fdc58..050fdc58 100644
--- a/resources/pe_light/scalable/centralmods.svg
+++ b/application/resources/pe_light/scalable/centralmods.svg
diff --git a/resources/pe_light/scalable/checkupdate.svg b/application/resources/pe_light/scalable/checkupdate.svg
index 08b8dcd5..08b8dcd5 100644
--- a/resources/pe_light/scalable/checkupdate.svg
+++ b/application/resources/pe_light/scalable/checkupdate.svg
diff --git a/resources/pe_light/scalable/copy.svg b/application/resources/pe_light/scalable/copy.svg
index abdcce09..abdcce09 100644
--- a/resources/pe_light/scalable/copy.svg
+++ b/application/resources/pe_light/scalable/copy.svg
diff --git a/resources/pe_light/scalable/coremods.svg b/application/resources/pe_light/scalable/coremods.svg
index c8fb0eb9..c8fb0eb9 100644
--- a/resources/pe_light/scalable/coremods.svg
+++ b/application/resources/pe_light/scalable/coremods.svg
diff --git a/resources/pe_light/scalable/externaltools.svg b/application/resources/pe_light/scalable/externaltools.svg
index 4d232bcf..4d232bcf 100644
--- a/resources/pe_light/scalable/externaltools.svg
+++ b/application/resources/pe_light/scalable/externaltools.svg
diff --git a/resources/pe_light/scalable/instance-settings.svg b/application/resources/pe_light/scalable/instance-settings.svg
index 83b92a52..83b92a52 100644
--- a/resources/pe_light/scalable/instance-settings.svg
+++ b/application/resources/pe_light/scalable/instance-settings.svg
diff --git a/resources/pe_light/scalable/jarmods.svg b/application/resources/pe_light/scalable/jarmods.svg
index 9852c805..9852c805 100644
--- a/resources/pe_light/scalable/jarmods.svg
+++ b/application/resources/pe_light/scalable/jarmods.svg
diff --git a/resources/pe_light/scalable/java.svg b/application/resources/pe_light/scalable/java.svg
index 0584058a..0584058a 100644
--- a/resources/pe_light/scalable/java.svg
+++ b/application/resources/pe_light/scalable/java.svg
diff --git a/resources/pe_light/scalable/loadermods.svg b/application/resources/pe_light/scalable/loadermods.svg
index 913c1968..913c1968 100644
--- a/resources/pe_light/scalable/loadermods.svg
+++ b/application/resources/pe_light/scalable/loadermods.svg
diff --git a/resources/pe_light/scalable/log.svg b/application/resources/pe_light/scalable/log.svg
index 82282ca4..82282ca4 100644
--- a/resources/pe_light/scalable/log.svg
+++ b/application/resources/pe_light/scalable/log.svg
diff --git a/resources/pe_light/scalable/minecraft.svg b/application/resources/pe_light/scalable/minecraft.svg
index d772111f..d772111f 100644
--- a/resources/pe_light/scalable/minecraft.svg
+++ b/application/resources/pe_light/scalable/minecraft.svg
diff --git a/resources/pe_light/scalable/multimc.svg b/application/resources/pe_light/scalable/multimc.svg
index 8b2cb631..8b2cb631 100644
--- a/resources/pe_light/scalable/multimc.svg
+++ b/application/resources/pe_light/scalable/multimc.svg
diff --git a/resources/pe_light/scalable/new.svg b/application/resources/pe_light/scalable/new.svg
index 96fd1f5b..96fd1f5b 100644
--- a/resources/pe_light/scalable/new.svg
+++ b/application/resources/pe_light/scalable/new.svg
diff --git a/resources/pe_light/scalable/news.svg b/application/resources/pe_light/scalable/news.svg
index 6f184afc..6f184afc 100644
--- a/resources/pe_light/scalable/news.svg
+++ b/application/resources/pe_light/scalable/news.svg
diff --git a/resources/pe_light/scalable/notes.svg b/application/resources/pe_light/scalable/notes.svg
index 02dc11ec..02dc11ec 100644
--- a/resources/pe_light/scalable/notes.svg
+++ b/application/resources/pe_light/scalable/notes.svg
diff --git a/resources/pe_light/scalable/patreon.svg b/application/resources/pe_light/scalable/patreon.svg
index 0bd08826..0bd08826 100644
--- a/resources/pe_light/scalable/patreon.svg
+++ b/application/resources/pe_light/scalable/patreon.svg
diff --git a/resources/pe_light/scalable/proxy.svg b/application/resources/pe_light/scalable/proxy.svg
index 9de8d6d1..9de8d6d1 100644
--- a/resources/pe_light/scalable/proxy.svg
+++ b/application/resources/pe_light/scalable/proxy.svg
diff --git a/resources/pe_light/scalable/quickmods.svg b/application/resources/pe_light/scalable/quickmods.svg
index 6dbeab52..6dbeab52 100644
--- a/resources/pe_light/scalable/quickmods.svg
+++ b/application/resources/pe_light/scalable/quickmods.svg
diff --git a/resources/pe_light/scalable/refresh.svg b/application/resources/pe_light/scalable/refresh.svg
index 9a724d91..9a724d91 100644
--- a/resources/pe_light/scalable/refresh.svg
+++ b/application/resources/pe_light/scalable/refresh.svg
diff --git a/resources/pe_light/scalable/resourcepacks.svg b/application/resources/pe_light/scalable/resourcepacks.svg
index 7d6323f2..7d6323f2 100644
--- a/resources/pe_light/scalable/resourcepacks.svg
+++ b/application/resources/pe_light/scalable/resourcepacks.svg
diff --git a/resources/pe_light/scalable/screenshots.svg b/application/resources/pe_light/scalable/screenshots.svg
index f2887be6..f2887be6 100644
--- a/resources/pe_light/scalable/screenshots.svg
+++ b/application/resources/pe_light/scalable/screenshots.svg
diff --git a/resources/pe_light/scalable/settings.svg b/application/resources/pe_light/scalable/settings.svg
index 83b92a52..83b92a52 100644
--- a/resources/pe_light/scalable/settings.svg
+++ b/application/resources/pe_light/scalable/settings.svg
diff --git a/resources/pe_light/scalable/status-bad.svg b/application/resources/pe_light/scalable/status-bad.svg
index 2c24970c..2c24970c 100644
--- a/resources/pe_light/scalable/status-bad.svg
+++ b/application/resources/pe_light/scalable/status-bad.svg
diff --git a/resources/pe_light/scalable/status-good.svg b/application/resources/pe_light/scalable/status-good.svg
index bf9a4174..bf9a4174 100644
--- a/resources/pe_light/scalable/status-good.svg
+++ b/application/resources/pe_light/scalable/status-good.svg
diff --git a/resources/pe_light/scalable/status-yellow.svg b/application/resources/pe_light/scalable/status-yellow.svg
index f7d2236b..f7d2236b 100644
--- a/resources/pe_light/scalable/status-yellow.svg
+++ b/application/resources/pe_light/scalable/status-yellow.svg
diff --git a/resources/pe_light/scalable/viewfolder.svg b/application/resources/pe_light/scalable/viewfolder.svg
index b36343fe..b36343fe 100644
--- a/resources/pe_light/scalable/viewfolder.svg
+++ b/application/resources/pe_light/scalable/viewfolder.svg
diff --git a/resources/sources/clucker.svg b/application/resources/sources/clucker.svg
index 0c1727eb..0c1727eb 100644
--- a/resources/sources/clucker.svg
+++ b/application/resources/sources/clucker.svg
diff --git a/resources/sources/creeper.svg b/application/resources/sources/creeper.svg
index 2a2e39b6..2a2e39b6 100644
--- a/resources/sources/creeper.svg
+++ b/application/resources/sources/creeper.svg
diff --git a/resources/sources/enderpearl.svg b/application/resources/sources/enderpearl.svg
index ac9378f5..ac9378f5 100644
--- a/resources/sources/enderpearl.svg
+++ b/application/resources/sources/enderpearl.svg
diff --git a/resources/sources/ftb-glow.svg b/application/resources/sources/ftb-glow.svg
index be78c78e..be78c78e 100644
--- a/resources/sources/ftb-glow.svg
+++ b/application/resources/sources/ftb-glow.svg
diff --git a/resources/sources/ftb-logo.svg b/application/resources/sources/ftb-logo.svg
index 8cf73567..8cf73567 100644
--- a/resources/sources/ftb-logo.svg
+++ b/application/resources/sources/ftb-logo.svg
diff --git a/resources/sources/gear.svg b/application/resources/sources/gear.svg
index c0169aec..c0169aec 100644
--- a/resources/sources/gear.svg
+++ b/application/resources/sources/gear.svg
diff --git a/resources/sources/herobrine.svg b/application/resources/sources/herobrine.svg
index 7392ba36..7392ba36 100644
--- a/resources/sources/herobrine.svg
+++ b/application/resources/sources/herobrine.svg
diff --git a/resources/sources/magitech.svg b/application/resources/sources/magitech.svg
index c6dd6bc0..c6dd6bc0 100644
--- a/resources/sources/magitech.svg
+++ b/application/resources/sources/magitech.svg
diff --git a/resources/sources/meat.svg b/application/resources/sources/meat.svg
index 69a20073..69a20073 100644
--- a/resources/sources/meat.svg
+++ b/application/resources/sources/meat.svg
diff --git a/resources/sources/netherstar.svg b/application/resources/sources/netherstar.svg
index 4046e4ec..4046e4ec 100644
--- a/resources/sources/netherstar.svg
+++ b/application/resources/sources/netherstar.svg
diff --git a/resources/sources/pskeleton.svg b/application/resources/sources/pskeleton.svg
index c2783df8..c2783df8 100644
--- a/resources/sources/pskeleton.svg
+++ b/application/resources/sources/pskeleton.svg
diff --git a/resources/sources/skeleton.svg b/application/resources/sources/skeleton.svg
index 5d55f272..5d55f272 100644
--- a/resources/sources/skeleton.svg
+++ b/application/resources/sources/skeleton.svg
diff --git a/resources/sources/squarecreeper.svg b/application/resources/sources/squarecreeper.svg
index a1b0f4d1..a1b0f4d1 100644
--- a/resources/sources/squarecreeper.svg
+++ b/application/resources/sources/squarecreeper.svg
diff --git a/resources/sources/steve.svg b/application/resources/sources/steve.svg
index 2233272c..2233272c 100644
--- a/resources/sources/steve.svg
+++ b/application/resources/sources/steve.svg
diff --git a/resources/versions/LWJGL/2.9.0.json b/application/resources/versions/LWJGL/2.9.0.json
index 5dbd624e..5dbd624e 100644
--- a/resources/versions/LWJGL/2.9.0.json
+++ b/application/resources/versions/LWJGL/2.9.0.json
diff --git a/resources/versions/LWJGL/2.9.1-nightly-20130708-debug3.json b/application/resources/versions/LWJGL/2.9.1-nightly-20130708-debug3.json
index 7265b3b0..7265b3b0 100644
--- a/resources/versions/LWJGL/2.9.1-nightly-20130708-debug3.json
+++ b/application/resources/versions/LWJGL/2.9.1-nightly-20130708-debug3.json
diff --git a/resources/versions/LWJGL/2.9.1.json b/application/resources/versions/LWJGL/2.9.1.json
index e7f5e947..e7f5e947 100644
--- a/resources/versions/LWJGL/2.9.1.json
+++ b/application/resources/versions/LWJGL/2.9.1.json
diff --git a/resources/versions/LWJGL/2.9.2-nightly-20140822.json b/application/resources/versions/LWJGL/2.9.2-nightly-20140822.json
index 25b22eb9..25b22eb9 100644
--- a/resources/versions/LWJGL/2.9.2-nightly-20140822.json
+++ b/application/resources/versions/LWJGL/2.9.2-nightly-20140822.json
diff --git a/resources/versions/minecraft.json b/application/resources/versions/minecraft.json
index 58b153c2..58b153c2 100644
--- a/resources/versions/minecraft.json
+++ b/application/resources/versions/minecraft.json
diff --git a/resources/versions/versions.qrc b/application/resources/versions/versions.qrc
index e9621e97..e9621e97 100644
--- a/resources/versions/versions.qrc
+++ b/application/resources/versions/versions.qrc
diff --git a/gui/widgets/Common.cpp b/application/widgets/Common.cpp
index 9b730d6c..9b730d6c 100644
--- a/gui/widgets/Common.cpp
+++ b/application/widgets/Common.cpp
diff --git a/gui/widgets/Common.h b/application/widgets/Common.h
index fc46e08f..fc46e08f 100644
--- a/gui/widgets/Common.h
+++ b/application/widgets/Common.h
diff --git a/gui/widgets/IconLabel.cpp b/application/widgets/IconLabel.cpp
index 86c8a431..86c8a431 100644
--- a/gui/widgets/IconLabel.cpp
+++ b/application/widgets/IconLabel.cpp
diff --git a/gui/widgets/IconLabel.h b/application/widgets/IconLabel.h
index a2f1eef3..a2f1eef3 100644
--- a/gui/widgets/IconLabel.h
+++ b/application/widgets/IconLabel.h
diff --git a/gui/widgets/LabeledToolButton.cpp b/application/widgets/LabeledToolButton.cpp
index dfdde1bc..dfdde1bc 100644
--- a/gui/widgets/LabeledToolButton.cpp
+++ b/application/widgets/LabeledToolButton.cpp
diff --git a/gui/widgets/LabeledToolButton.h b/application/widgets/LabeledToolButton.h
index 1b74c4ee..1b74c4ee 100644
--- a/gui/widgets/LabeledToolButton.h
+++ b/application/widgets/LabeledToolButton.h
diff --git a/gui/widgets/LineSeparator.cpp b/application/widgets/LineSeparator.cpp
index f4ee173d..f4ee173d 100644
--- a/gui/widgets/LineSeparator.cpp
+++ b/application/widgets/LineSeparator.cpp
diff --git a/gui/widgets/LineSeparator.h b/application/widgets/LineSeparator.h
index 9546e747..9546e747 100644
--- a/gui/widgets/LineSeparator.h
+++ b/application/widgets/LineSeparator.h
diff --git a/gui/widgets/MCModInfoFrame.cpp b/application/widgets/MCModInfoFrame.cpp
index b87147aa..2f859ed3 100644
--- a/gui/widgets/MCModInfoFrame.cpp
+++ b/application/widgets/MCModInfoFrame.cpp
@@ -18,7 +18,7 @@
 
 #include "MCModInfoFrame.h"
 #include "ui_MCModInfoFrame.h"
-#include "gui/dialogs/CustomMessageBox.h"
+#include "dialogs/CustomMessageBox.h"
 
 void MCModInfoFrame::updateWithMod(Mod &m)
 {
diff --git a/gui/widgets/MCModInfoFrame.h b/application/widgets/MCModInfoFrame.h
index 9e63d29a..3f75279c 100644
--- a/gui/widgets/MCModInfoFrame.h
+++ b/application/widgets/MCModInfoFrame.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QFrame>
-#include "logic/minecraft/Mod.h"
+#include "minecraft/Mod.h"
 
 namespace Ui
 {
diff --git a/gui/widgets/MCModInfoFrame.ui b/application/widgets/MCModInfoFrame.ui
index 60e0a65c..60e0a65c 100644
--- a/gui/widgets/MCModInfoFrame.ui
+++ b/application/widgets/MCModInfoFrame.ui
diff --git a/gui/widgets/ModListView.cpp b/application/widgets/ModListView.cpp
index aa16ad05..aa16ad05 100644
--- a/gui/widgets/ModListView.cpp
+++ b/application/widgets/ModListView.cpp
diff --git a/gui/widgets/ModListView.h b/application/widgets/ModListView.h
index 43de9811..43de9811 100644
--- a/gui/widgets/ModListView.h
+++ b/application/widgets/ModListView.h
diff --git a/gui/widgets/PageContainer.cpp b/application/widgets/PageContainer.cpp
index 59b800cc..679039a7 100644
--- a/gui/widgets/PageContainer.cpp
+++ b/application/widgets/PageContainer.cpp
@@ -28,9 +28,9 @@
 #include <QDesktopServices>
 
 #include "MultiMC.h"
-#include "logic/settings/SettingsObject.h"
-#include "gui/widgets/IconLabel.h"
-#include "gui/Platform.h"
+#include "settings/SettingsObject.h"
+#include "widgets/IconLabel.h"
+#include "Platform.h"
 #include "PageContainer_p.h"
 #include <MultiMC.h>
 
diff --git a/gui/widgets/PageContainer.h b/application/widgets/PageContainer.h
index 9795625b..3027af36 100644
--- a/gui/widgets/PageContainer.h
+++ b/application/widgets/PageContainer.h
@@ -18,7 +18,7 @@
 #include <QWidget>
 #include <QModelIndex>
 
-#include "gui/pages/BasePageProvider.h"
+#include "pages/BasePageProvider.h"
 
 class QLayout;
 class IconLabel;
diff --git a/gui/widgets/PageContainer_p.h b/application/widgets/PageContainer_p.h
index 4c720e4c..4c720e4c 100644
--- a/gui/widgets/PageContainer_p.h
+++ b/application/widgets/PageContainer_p.h
diff --git a/gui/widgets/ServerStatus.cpp b/application/widgets/ServerStatus.cpp
index a73f499e..0c11b9bf 100644
--- a/gui/widgets/ServerStatus.cpp
+++ b/application/widgets/ServerStatus.cpp
@@ -1,7 +1,7 @@
 #include "ServerStatus.h"
 #include "LineSeparator.h"
 #include "IconLabel.h"
-#include "logic/status/StatusChecker.h"
+#include "status/StatusChecker.h"
 
 #include "MultiMC.h"
 
diff --git a/gui/widgets/ServerStatus.h b/application/widgets/ServerStatus.h
index fdd43677..fdd43677 100644
--- a/gui/widgets/ServerStatus.h
+++ b/application/widgets/ServerStatus.h
diff --git a/gui/widgets/VersionListView.cpp b/application/widgets/VersionListView.cpp
index fc0bcd0a..fc0bcd0a 100644
--- a/gui/widgets/VersionListView.cpp
+++ b/application/widgets/VersionListView.cpp
diff --git a/gui/widgets/VersionListView.h b/application/widgets/VersionListView.h
index f33a6fdb..f33a6fdb 100644
--- a/gui/widgets/VersionListView.h
+++ b/application/widgets/VersionListView.h
diff --git a/depends/javacheck/CMakeLists.txt b/depends/javacheck/CMakeLists.txt
index ac8009ff..d4f29ff7 100644
--- a/depends/javacheck/CMakeLists.txt
+++ b/depends/javacheck/CMakeLists.txt
@@ -11,5 +11,3 @@ set(SRC
 )
 
 add_jar(JavaCheck ${SRC})
-
-install_jar(JavaCheck "${BINARY_DEST_DIR}/jars")
diff --git a/depends/launcher/CMakeLists.txt b/depends/launcher/CMakeLists.txt
index 42c77a89..7564161d 100644
--- a/depends/launcher/CMakeLists.txt
+++ b/depends/launcher/CMakeLists.txt
@@ -32,4 +32,3 @@ set(SRC
 )
 add_jar(NewLaunch ${SRC})
 
-install_jar(NewLaunch "${BINARY_DEST_DIR}/jars")
diff --git a/logic/BaseInstaller.cpp b/logic/BaseInstaller.cpp
index b2cdefbc..d8e83bb2 100644
--- a/logic/BaseInstaller.cpp
+++ b/logic/BaseInstaller.cpp
@@ -15,8 +15,8 @@
 
 #include <QFile>
 
-#include "logic/BaseInstaller.h"
-#include "logic/minecraft/OneSixInstance.h"
+#include "BaseInstaller.h"
+#include "minecraft/OneSixInstance.h"
 
 BaseInstaller::BaseInstaller()
 {
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp
index 902c9e7e..69bc7597 100644
--- a/logic/BaseInstance.cpp
+++ b/logic/BaseInstance.cpp
@@ -18,14 +18,14 @@
 #include <QFileInfo>
 #include <QDir>
 
-#include "logic/settings/INISettingsObject.h"
-#include "logic/settings/Setting.h"
-#include "logic/settings/OverrideSetting.h"
+#include "settings/INISettingsObject.h"
+#include "settings/Setting.h"
+#include "settings/OverrideSetting.h"
 
 #include "pathutils.h"
 #include <cmdutils.h>
-#include "logic/minecraft/MinecraftVersionList.h"
-#include "logic/icons/IconList.h"
+#include "minecraft/MinecraftVersionList.h"
+#include "icons/IconList.h"
 
 BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
 	: QObject()
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h
index 3a4fa4a6..6a8ba11c 100644
--- a/logic/BaseInstance.h
+++ b/logic/BaseInstance.h
@@ -19,11 +19,11 @@
 #include <QDateTime>
 #include <QSet>
 
-#include "logic/settings/SettingsObject.h"
+#include "settings/SettingsObject.h"
 
-#include "logic/settings/INIFile.h"
-#include "logic/BaseVersionList.h"
-#include "logic/auth/MojangAccount.h"
+#include "settings/INIFile.h"
+#include "BaseVersionList.h"
+#include "auth/MojangAccount.h"
 
 class QDir;
 class Task;
@@ -186,7 +186,7 @@ protected slots:
 protected:
 	QString m_rootDir;
 	QString m_group;
-	std::shared_ptr<SettingsObject> m_settings;
+	SettingsObjectPtr m_settings;
 	InstanceFlags m_flags;
 	bool m_isRunning = false;
 };
diff --git a/logic/BaseProcess.cpp b/logic/BaseProcess.cpp
index b0509d46..749efe0a 100644
--- a/logic/BaseProcess.cpp
+++ b/logic/BaseProcess.cpp
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "logic/BaseProcess.h"
+
+#include "BaseProcess.h"
 #include <QDebug>
 #include <QDir>
 #include <QEventLoop>
diff --git a/logic/BaseVersionList.cpp b/logic/BaseVersionList.cpp
index fe8af278..7752b14c 100644
--- a/logic/BaseVersionList.cpp
+++ b/logic/BaseVersionList.cpp
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#include "logic/BaseVersionList.h"
-#include "logic/BaseVersion.h"
+#include "BaseVersionList.h"
+#include "BaseVersion.h"
 
 BaseVersionList::BaseVersionList(QObject *parent) : QAbstractListModel(parent)
 {
diff --git a/logic/BaseVersionList.h b/logic/BaseVersionList.h
index f8737b32..584d6ca7 100644
--- a/logic/BaseVersionList.h
+++ b/logic/BaseVersionList.h
@@ -19,7 +19,7 @@
 #include <QVariant>
 #include <QAbstractListModel>
 
-#include "logic/BaseVersion.h"
+#include "BaseVersion.h"
 
 class Task;
 
diff --git a/logic/CMakeLists.txt b/logic/CMakeLists.txt
new file mode 100644
index 00000000..cf55695d
--- /dev/null
+++ b/logic/CMakeLists.txt
@@ -0,0 +1,258 @@
+project(MultiMC-Logic)
+
+SET(LOGIC_SOURCES
+	# LOGIC - Base classes and infrastructure
+	BaseInstaller.h
+	BaseInstaller.cpp
+	BaseVersionList.h
+	BaseVersionList.cpp
+	InstanceList.h
+	InstanceList.cpp
+	BaseVersion.h
+	BaseProcess.h
+	BaseProcess.cpp
+	BaseInstance.h
+	BaseInstance.cpp
+	MMCError.h
+
+	# WARNING: globals live here
+	Env.h
+	Env.cpp
+
+	# JSON parsing helpers
+	MMCJson.h
+	MMCJson.cpp
+
+	# RW lock protected map
+	RWStorage.h
+
+	# A variable that has an implicit default value and keeps track of changes
+	DefaultVariable.h
+
+	# a smart pointer wrapper intended for safer use with Qt signal/slot mechanisms
+	QObjectPtr.h
+
+	# network stuffs
+	net/NetAction.h
+	net/MD5EtagDownload.h
+	net/MD5EtagDownload.cpp
+	net/ByteArrayDownload.h
+	net/ByteArrayDownload.cpp
+	net/CacheDownload.h
+	net/CacheDownload.cpp
+	net/NetJob.h
+	net/NetJob.cpp
+	net/HttpMetaCache.h
+	net/HttpMetaCache.cpp
+	net/PasteUpload.h
+	net/PasteUpload.cpp
+	net/URLConstants.h
+	net/URLConstants.cpp
+
+	# Yggdrasil login stuff
+	auth/AuthSession.h
+	auth/AuthSession.cpp
+	auth/MojangAccountList.h
+	auth/MojangAccountList.cpp
+	auth/MojangAccount.h
+	auth/MojangAccount.cpp
+	auth/YggdrasilTask.h
+	auth/YggdrasilTask.cpp
+	auth/flows/AuthenticateTask.h
+	auth/flows/AuthenticateTask.cpp
+	auth/flows/RefreshTask.cpp
+	auth/flows/RefreshTask.cpp
+	auth/flows/ValidateTask.h
+	auth/flows/ValidateTask.cpp
+
+	# Update system
+	updater/GoUpdate.h
+	updater/GoUpdate.cpp
+	updater/UpdateChecker.h
+	updater/UpdateChecker.cpp
+	updater/DownloadTask.h
+	updater/DownloadTask.cpp
+
+	# Notifications - short warning messages
+	notifications/NotificationChecker.h
+	notifications/NotificationChecker.cpp
+
+	# News System
+	news/NewsChecker.h
+	news/NewsChecker.cpp
+	news/NewsEntry.h
+	news/NewsEntry.cpp
+
+	# Status system
+	status/StatusChecker.h
+	status/StatusChecker.cpp
+
+	# Minecraft support
+	minecraft/OneSixUpdate.h
+	minecraft/OneSixUpdate.cpp
+	minecraft/OneSixInstance.h
+	minecraft/OneSixInstance.cpp
+	minecraft/LegacyUpdate.h
+	minecraft/LegacyUpdate.cpp
+	minecraft/LegacyInstance.h
+	minecraft/LegacyInstance.cpp
+	minecraft/LwjglVersionList.h
+	minecraft/LwjglVersionList.cpp
+	minecraft/SkinUtils.h
+	minecraft/SkinUtils.cpp
+	minecraft/JarUtils.h
+	minecraft/JarUtils.cpp
+	minecraft/GradleSpecifier.h
+	minecraft/MinecraftProfile.cpp
+	minecraft/MinecraftProfile.h
+	minecraft/JarMod.cpp
+	minecraft/JarMod.h
+	minecraft/MinecraftInstance.cpp
+	minecraft/MinecraftInstance.h
+	minecraft/MinecraftProcess.cpp
+	minecraft/MinecraftProcess.h
+	minecraft/MinecraftVersion.cpp
+	minecraft/MinecraftVersion.h
+	minecraft/MinecraftVersionList.cpp
+	minecraft/MinecraftVersionList.h
+	minecraft/NullProfileStrategy.h
+	minecraft/OneSixLibrary.cpp
+	minecraft/OneSixLibrary.h
+	minecraft/OneSixProfileStrategy.cpp
+	minecraft/OneSixProfileStrategy.h
+	minecraft/OneSixRule.cpp
+	minecraft/OneSixRule.h
+	minecraft/OpSys.cpp
+	minecraft/OpSys.h
+	minecraft/ParseUtils.cpp
+	minecraft/ParseUtils.h
+	minecraft/ProfileUtils.cpp
+	minecraft/ProfileUtils.h
+	minecraft/ProfileStrategy.h
+	minecraft/RawLibrary.cpp
+	minecraft/RawLibrary.h
+	minecraft/VersionBuilder.cpp
+	minecraft/VersionBuilder.h
+	minecraft/VersionBuildError.h
+	minecraft/VersionFile.cpp
+	minecraft/VersionFile.h
+	minecraft/ProfilePatch.h
+	minecraft/VersionSource.h
+	minecraft/VersionFilterData.h
+	minecraft/VersionFilterData.cpp
+	minecraft/Mod.h
+	minecraft/Mod.cpp
+	minecraft/ModList.h
+	minecraft/ModList.cpp
+
+	# FTB
+	ftb/OneSixFTBInstance.h
+	ftb/OneSixFTBInstance.cpp
+	ftb/LegacyFTBInstance.h
+	ftb/LegacyFTBInstance.cpp
+	ftb/FTBProfileStrategy.h
+	ftb/FTBProfileStrategy.cpp
+	ftb/FTBPlugin.h
+	ftb/FTBPlugin.cpp
+
+	# A Recursive file system watcher
+	RecursiveFileSystemWatcher.h
+	RecursiveFileSystemWatcher.cpp
+
+	# the screenshots feature
+	screenshots/Screenshot.h
+	screenshots/ImgurUpload.h
+	screenshots/ImgurUpload.cpp
+	screenshots/ImgurAlbumCreation.h
+	screenshots/ImgurAlbumCreation.cpp
+
+	# Icons
+	icons/MMCIcon.h
+	icons/MMCIcon.cpp
+	icons/IconList.h
+	icons/IconList.cpp
+
+	# Tasks
+	tasks/ProgressProvider.h
+	tasks/Task.h
+	tasks/Task.cpp
+	tasks/ThreadTask.h
+	tasks/ThreadTask.cpp
+	tasks/SequentialTask.h
+	tasks/SequentialTask.cpp
+
+	# Settings
+	settings/INIFile.cpp
+	settings/INIFile.h
+	settings/INISettingsObject.cpp
+	settings/INISettingsObject.h
+	settings/OverrideSetting.cpp
+	settings/OverrideSetting.h
+	settings/Setting.cpp
+	settings/Setting.h
+	settings/SettingsObject.cpp
+	settings/SettingsObject.h
+
+	# Java related code
+	java/JavaChecker.h
+	java/JavaChecker.cpp
+	java/JavaUtils.h
+	java/JavaUtils.cpp
+	java/JavaVersionList.h
+	java/JavaVersionList.cpp
+	java/JavaCheckerJob.h
+	java/JavaCheckerJob.cpp
+
+	# Assets
+	minecraft/AssetsUtils.h
+	minecraft/AssetsUtils.cpp
+
+	# Forge and all things forge related
+	forge/ForgeVersion.h
+	forge/ForgeVersion.cpp
+	forge/ForgeVersionList.h
+	forge/ForgeVersionList.cpp
+	forge/ForgeMirror.h
+	forge/ForgeMirrors.h
+	forge/ForgeMirrors.cpp
+	forge/ForgeXzDownload.h
+	forge/ForgeXzDownload.cpp
+	forge/LegacyForge.h
+	forge/LegacyForge.cpp
+	forge/ForgeInstaller.h
+	forge/ForgeInstaller.cpp
+
+	# Liteloader and related things
+	liteloader/LiteLoaderInstaller.h
+	liteloader/LiteLoaderInstaller.cpp
+	liteloader/LiteLoaderVersionList.h
+	liteloader/LiteLoaderVersionList.cpp
+
+	# Translations
+	trans/TranslationDownloader.h
+	trans/TranslationDownloader.cpp
+
+	# Tools
+	tools/BaseExternalTool.cpp
+	tools/BaseExternalTool.h
+	tools/BaseProfiler.cpp
+	tools/BaseProfiler.h
+	tools/JProfiler.cpp
+	tools/JProfiler.h
+	tools/JVisualVM.cpp
+	tools/JVisualVM.h
+	tools/MCEditTool.cpp
+	tools/MCEditTool.h
+
+)
+################################ COMPILE ################################
+
+# Add common library
+add_library(MultiMC_logic STATIC ${LOGIC_SOURCES})
+
+# Link
+target_link_libraries(MultiMC_logic xz-embedded unpack200 iconfix libUtil LogicalGui ${QUAZIP_LIBRARIES}
+	Qt5::Core Qt5::Xml Qt5::Widgets Qt5::Network Qt5::Concurrent Qt5::WebKitWidgets
+		${MultiMC_LINK_ADDITIONAL_LIBS})
+
+add_dependencies(MultiMC_logic QuaZIP)
diff --git a/logic/Env.cpp b/logic/Env.cpp
index 69986be2..0607c7ea 100644
--- a/logic/Env.cpp
+++ b/logic/Env.cpp
@@ -1,5 +1,5 @@
 #include "Env.h"
-#include "logic/net/HttpMetaCache.h"
+#include "net/HttpMetaCache.h"
 #include "icons/IconList.h"
 #include "BaseVersion.h"
 #include "BaseVersionList.h"
@@ -7,7 +7,7 @@
 #include <QNetworkProxy>
 #include <QNetworkAccessManager>
 #include <QDebug>
-#include "logic/tasks/Task.h"
+#include "tasks/Task.h"
 #include <QDebug>
 
 /*
diff --git a/logic/InstanceList.cpp b/logic/InstanceList.cpp
index 10faf1ca..013de31e 100644
--- a/logic/InstanceList.cpp
+++ b/logic/InstanceList.cpp
@@ -27,16 +27,16 @@
 #include <pathutils.h>
 #include <QDebug>
 
-#include "logic/InstanceList.h"
-#include "logic/icons/IconList.h"
-#include "logic/BaseInstance.h"
+#include "InstanceList.h"
+#include "icons/IconList.h"
+#include "BaseInstance.h"
 
 //FIXME: this really doesn't belong *here*
-#include "logic/minecraft/OneSixInstance.h"
-#include "logic/minecraft/LegacyInstance.h"
+#include "minecraft/OneSixInstance.h"
+#include "minecraft/LegacyInstance.h"
 #include "minecraft/MinecraftVersion.h"
 #include "settings/INISettingsObject.h"
-#include "logic/ftb/FTBPlugin.h"
+#include "ftb/FTBPlugin.h"
 
 const static int GROUP_FILE_FORMAT_VERSION = 1;
 
diff --git a/logic/InstanceList.h b/logic/InstanceList.h
index 9600ffe9..07a71ffb 100644
--- a/logic/InstanceList.h
+++ b/logic/InstanceList.h
@@ -19,7 +19,7 @@
 #include <QAbstractListModel>
 #include <QSet>
 
-#include "logic/BaseInstance.h"
+#include "BaseInstance.h"
 
 class BaseInstance;
 class QDir;
diff --git a/MMCError.h b/logic/MMCError.h
index e81054a6..e81054a6 100644
--- a/MMCError.h
+++ b/logic/MMCError.h
diff --git a/logic/auth/MojangAccountList.cpp b/logic/auth/MojangAccountList.cpp
index abed9b24..b69b9b81 100644
--- a/logic/auth/MojangAccountList.cpp
+++ b/logic/auth/MojangAccountList.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "logic/auth/MojangAccountList.h"
+#include "auth/MojangAccountList.h"
 
 #include <QIODevice>
 #include <QFile>
@@ -26,7 +26,7 @@
 
 #include <QDebug>
 
-#include "logic/auth/MojangAccount.h"
+#include "auth/MojangAccount.h"
 #include <pathutils.h>
 
 #define ACCOUNT_LIST_FORMAT_VERSION 2
diff --git a/logic/auth/MojangAccountList.h b/logic/auth/MojangAccountList.h
index 383d9dc4..b68343f2 100644
--- a/logic/auth/MojangAccountList.h
+++ b/logic/auth/MojangAccountList.h
@@ -20,7 +20,7 @@
 #include <QAbstractListModel>
 #include <QSharedPointer>
 
-#include "logic/auth/MojangAccount.h"
+#include "auth/MojangAccount.h"
 
 /*!
  * \brief List of available Mojang accounts.
diff --git a/logic/auth/YggdrasilTask.cpp b/logic/auth/YggdrasilTask.cpp
index 4d5c2594..3b6e0cfb 100644
--- a/logic/auth/YggdrasilTask.cpp
+++ b/logic/auth/YggdrasilTask.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <logic/auth/YggdrasilTask.h>
+#include <auth/YggdrasilTask.h>
 
 #include <QObject>
 #include <QString>
@@ -22,9 +22,9 @@
 #include <QNetworkReply>
 #include <QByteArray>
 
-#include <logic/Env.h>
-#include <logic/auth/MojangAccount.h>
-#include <logic/net/URLConstants.h>
+#include <Env.h>
+#include <auth/MojangAccount.h>
+#include <net/URLConstants.h>
 
 #include <QDebug>
 
diff --git a/logic/auth/YggdrasilTask.h b/logic/auth/YggdrasilTask.h
index 1677bcf5..306d7358 100644
--- a/logic/auth/YggdrasilTask.h
+++ b/logic/auth/YggdrasilTask.h
@@ -15,14 +15,14 @@
 
 #pragma once
 
-#include <logic/tasks/Task.h>
+#include <tasks/Task.h>
 
 #include <QString>
 #include <QJsonObject>
 #include <QTimer>
 #include <qsslerror.h>
 
-#include "logic/auth/MojangAccount.h"
+#include "auth/MojangAccount.h"
 
 class QNetworkReply;
 
diff --git a/logic/auth/flows/AuthenticateTask.cpp b/logic/auth/flows/AuthenticateTask.cpp
index 4141f00d..b26769d9 100644
--- a/logic/auth/flows/AuthenticateTask.cpp
+++ b/logic/auth/flows/AuthenticateTask.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <logic/auth/flows/AuthenticateTask.h>
+#include <auth/flows/AuthenticateTask.h>
 
-#include <logic/auth/MojangAccount.h>
+#include <auth/MojangAccount.h>
 
 #include <QJsonDocument>
 #include <QJsonObject>
diff --git a/logic/auth/flows/AuthenticateTask.h b/logic/auth/flows/AuthenticateTask.h
index 8b5f3efc..65975ae5 100644
--- a/logic/auth/flows/AuthenticateTask.h
+++ b/logic/auth/flows/AuthenticateTask.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <logic/auth/YggdrasilTask.h>
+#include <auth/YggdrasilTask.h>
 
 #include <QObject>
 #include <QString>
diff --git a/logic/auth/flows/RefreshTask.cpp b/logic/auth/flows/RefreshTask.cpp
index 2216c7e4..83511200 100644
--- a/logic/auth/flows/RefreshTask.cpp
+++ b/logic/auth/flows/RefreshTask.cpp
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-#include <logic/auth/flows/RefreshTask.h>
+#include <auth/flows/RefreshTask.h>
 
-#include <logic/auth/MojangAccount.h>
+#include <auth/MojangAccount.h>
 
 #include <QJsonDocument>
 #include <QJsonObject>
diff --git a/logic/auth/flows/RefreshTask.h b/logic/auth/flows/RefreshTask.h
index 1b556776..6894e963 100644
--- a/logic/auth/flows/RefreshTask.h
+++ b/logic/auth/flows/RefreshTask.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <logic/auth/YggdrasilTask.h>
+#include <auth/YggdrasilTask.h>
 
 #include <QObject>
 #include <QString>
diff --git a/logic/auth/flows/ValidateTask.cpp b/logic/auth/flows/ValidateTask.cpp
index 21afb596..9a4dcd6d 100644
--- a/logic/auth/flows/ValidateTask.cpp
+++ b/logic/auth/flows/ValidateTask.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <logic/auth/flows/ValidateTask.h>
+#include <auth/flows/ValidateTask.h>
 
-#include <logic/auth/MojangAccount.h>
+#include <auth/MojangAccount.h>
 
 #include <QJsonDocument>
 #include <QJsonObject>
diff --git a/logic/auth/flows/ValidateTask.h b/logic/auth/flows/ValidateTask.h
index aa9da912..204596f9 100644
--- a/logic/auth/flows/ValidateTask.h
+++ b/logic/auth/flows/ValidateTask.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <logic/auth/YggdrasilTask.h>
+#include <auth/YggdrasilTask.h>
 
 #include <QObject>
 #include <QString>
diff --git a/logic/forge/ForgeInstaller.cpp b/logic/forge/ForgeInstaller.cpp
index cbd96869..ee68069b 100644
--- a/logic/forge/ForgeInstaller.cpp
+++ b/logic/forge/ForgeInstaller.cpp
@@ -14,14 +14,14 @@
  */
 
 #include "ForgeInstaller.h"
-#include "logic/minecraft/MinecraftProfile.h"
-#include "logic/minecraft/OneSixLibrary.h"
-#include "logic/net/HttpMetaCache.h"
-#include "logic/tasks/Task.h"
-#include "logic/minecraft/OneSixInstance.h"
-#include "logic/forge/ForgeVersionList.h"
-#include "logic/minecraft/VersionFilterData.h"
-#include "logic/Env.h"
+#include "minecraft/MinecraftProfile.h"
+#include "minecraft/OneSixLibrary.h"
+#include "net/HttpMetaCache.h"
+#include "tasks/Task.h"
+#include "minecraft/OneSixInstance.h"
+#include "forge/ForgeVersionList.h"
+#include "minecraft/VersionFilterData.h"
+#include "Env.h"
 
 #include <quazip.h>
 #include <quazipfile.h>
diff --git a/logic/forge/ForgeInstaller.h b/logic/forge/ForgeInstaller.h
index e85582fd..1b31d39f 100644
--- a/logic/forge/ForgeInstaller.h
+++ b/logic/forge/ForgeInstaller.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "logic/BaseInstaller.h"
+#include "BaseInstaller.h"
 
 #include <QString>
 #include <memory>
diff --git a/logic/forge/ForgeMirrors.cpp b/logic/forge/ForgeMirrors.cpp
index e922fcc3..0dea0826 100644
--- a/logic/forge/ForgeMirrors.cpp
+++ b/logic/forge/ForgeMirrors.cpp
@@ -1,4 +1,4 @@
-#include "logic/Env.h"
+#include "Env.h"
 #include "ForgeMirrors.h"
 #include <QDebug>
 #include <algorithm>
diff --git a/logic/forge/ForgeMirrors.h b/logic/forge/ForgeMirrors.h
index 21d91a11..e7c90fa5 100644
--- a/logic/forge/ForgeMirrors.h
+++ b/logic/forge/ForgeMirrors.h
@@ -15,10 +15,10 @@
 
 #pragma once
 
-#include "logic/net/NetAction.h"
-#include "logic/net/HttpMetaCache.h"
-#include "logic/net/NetJob.h"
-#include "logic/forge/ForgeXzDownload.h"
+#include "net/NetAction.h"
+#include "net/HttpMetaCache.h"
+#include "net/NetJob.h"
+#include "forge/ForgeXzDownload.h"
 #include <QFile>
 #include <QTemporaryFile>
 typedef std::shared_ptr<class ForgeMirrors> ForgeMirrorsPtr;
diff --git a/logic/forge/ForgeVersion.cpp b/logic/forge/ForgeVersion.cpp
index f3e64204..b859a28c 100644
--- a/logic/forge/ForgeVersion.cpp
+++ b/logic/forge/ForgeVersion.cpp
@@ -1,5 +1,5 @@
 #include "ForgeVersion.h"
-#include "logic/minecraft/VersionFilterData.h"
+#include "minecraft/VersionFilterData.h"
 #include <QObject>
 
 QString ForgeVersion::name()
diff --git a/logic/forge/ForgeVersion.h b/logic/forge/ForgeVersion.h
index e3c1aab9..e77d32f1 100644
--- a/logic/forge/ForgeVersion.h
+++ b/logic/forge/ForgeVersion.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <QString>
 #include <memory>
-#include "logic/BaseVersion.h"
+#include "BaseVersion.h"
 
 struct ForgeVersion;
 typedef std::shared_ptr<ForgeVersion> ForgeVersionPtr;
diff --git a/logic/forge/ForgeVersionList.cpp b/logic/forge/ForgeVersionList.cpp
index 260f84eb..56ffad11 100644
--- a/logic/forge/ForgeVersionList.cpp
+++ b/logic/forge/ForgeVersionList.cpp
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-#include "logic/forge/ForgeVersionList.h"
-#include "logic/forge/ForgeVersion.h"
-#include "logic/net/NetJob.h"
-#include "logic/net/URLConstants.h"
-#include "logic/Env.h"
+#include "forge/ForgeVersionList.h"
+#include "forge/ForgeVersion.h"
+#include "net/NetJob.h"
+#include "net/URLConstants.h"
+#include "Env.h"
 
 #include <QtNetwork>
 #include <QtXml>
diff --git a/logic/forge/ForgeVersionList.h b/logic/forge/ForgeVersionList.h
index 6bc9e0a9..75e1dd78 100644
--- a/logic/forge/ForgeVersionList.h
+++ b/logic/forge/ForgeVersionList.h
@@ -20,10 +20,10 @@
 #include <QUrl>
 #include <QNetworkReply>
 
-#include "logic/BaseVersionList.h"
-#include "logic/tasks/Task.h"
-#include "logic/net/NetJob.h"
-#include "logic/forge/ForgeVersion.h"
+#include "BaseVersionList.h"
+#include "tasks/Task.h"
+#include "net/NetJob.h"
+#include "forge/ForgeVersion.h"
 
 class ForgeVersionList : public BaseVersionList
 {
diff --git a/logic/forge/ForgeXzDownload.cpp b/logic/forge/ForgeXzDownload.cpp
index 65b20959..712deb33 100644
--- a/logic/forge/ForgeXzDownload.cpp
+++ b/logic/forge/ForgeXzDownload.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "logic/Env.h"
+#include "Env.h"
 #include "ForgeXzDownload.h"
 #include <pathutils.h>
 
diff --git a/logic/forge/ForgeXzDownload.h b/logic/forge/ForgeXzDownload.h
index 49cedbdf..45722812 100644
--- a/logic/forge/ForgeXzDownload.h
+++ b/logic/forge/ForgeXzDownload.h
@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include "logic/net/NetAction.h"
-#include "logic/net/HttpMetaCache.h"
+#include "net/NetAction.h"
+#include "net/HttpMetaCache.h"
 #include <QFile>
 #include <QTemporaryFile>
 #include "ForgeMirror.h"
diff --git a/logic/forge/LegacyForge.h b/logic/forge/LegacyForge.h
index 5bc43fbf..f51d5e85 100644
--- a/logic/forge/LegacyForge.h
+++ b/logic/forge/LegacyForge.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "logic/minecraft/Mod.h"
+#include "minecraft/Mod.h"
 
 class MinecraftForge : public Mod
 {
diff --git a/logic/ftb/FTBPlugin.cpp b/logic/ftb/FTBPlugin.cpp
index de04e485..88f6e793 100644
--- a/logic/ftb/FTBPlugin.cpp
+++ b/logic/ftb/FTBPlugin.cpp
@@ -2,11 +2,11 @@
 #include "FTBVersion.h"
 #include "LegacyFTBInstance.h"
 #include "OneSixFTBInstance.h"
-#include <logic/BaseInstance.h>
-#include <logic/icons/IconList.h>
-#include <logic/InstanceList.h>
-#include <logic/minecraft/MinecraftVersionList.h>
-#include <logic/settings/INISettingsObject.h>
+#include <BaseInstance.h>
+#include <icons/IconList.h>
+#include <InstanceList.h>
+#include <minecraft/MinecraftVersionList.h>
+#include <settings/INISettingsObject.h>
 #include <pathutils.h>
 #include "QDebug"
 #include <QXmlStreamReader>
diff --git a/logic/ftb/FTBPlugin.h b/logic/ftb/FTBPlugin.h
index 8a38e2bb..30913d19 100644
--- a/logic/ftb/FTBPlugin.h
+++ b/logic/ftb/FTBPlugin.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <logic/BaseInstance.h>
+#include <BaseInstance.h>
 
 // Pseudo-plugin for FTB related things. Super derpy!
 class FTBPlugin
diff --git a/logic/ftb/FTBProfileStrategy.cpp b/logic/ftb/FTBProfileStrategy.cpp
index 87be0ff9..cc20b247 100644
--- a/logic/ftb/FTBProfileStrategy.cpp
+++ b/logic/ftb/FTBProfileStrategy.cpp
@@ -1,7 +1,7 @@
-#include "logic/ftb/FTBProfileStrategy.h"
-#include "logic/minecraft/VersionBuildError.h"
-#include "logic/ftb/OneSixFTBInstance.h"
-#include "logic/minecraft/MinecraftVersionList.h"
+#include "ftb/FTBProfileStrategy.h"
+#include "minecraft/VersionBuildError.h"
+#include "ftb/OneSixFTBInstance.h"
+#include "minecraft/MinecraftVersionList.h"
 
 #include <pathutils.h>
 #include <QDir>
diff --git a/logic/ftb/FTBVersion.h b/logic/ftb/FTBVersion.h
index dbd9c29e..805319b4 100644
--- a/logic/ftb/FTBVersion.h
+++ b/logic/ftb/FTBVersion.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <logic/minecraft/MinecraftVersion.h>
+#include <minecraft/MinecraftVersion.h>
 
 class FTBVersion : public BaseVersion
 {
diff --git a/logic/ftb/LegacyFTBInstance.cpp b/logic/ftb/LegacyFTBInstance.cpp
index 43a9b42a..e7490679 100644
--- a/logic/ftb/LegacyFTBInstance.cpp
+++ b/logic/ftb/LegacyFTBInstance.cpp
@@ -1,5 +1,5 @@
 #include "LegacyFTBInstance.h"
-#include <logic/settings/INISettingsObject.h>
+#include <settings/INISettingsObject.h>
 #include <QDir>
 
 LegacyFTBInstance::LegacyFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) :
diff --git a/logic/ftb/LegacyFTBInstance.h b/logic/ftb/LegacyFTBInstance.h
index 80c6c5ab..3bacf653 100644
--- a/logic/ftb/LegacyFTBInstance.h
+++ b/logic/ftb/LegacyFTBInstance.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "logic/minecraft/LegacyInstance.h"
+#include "minecraft/LegacyInstance.h"
 
 class LegacyFTBInstance : public LegacyInstance
 {
diff --git a/logic/ftb/OneSixFTBInstance.cpp b/logic/ftb/OneSixFTBInstance.cpp
index 4902be08..7374b78f 100644
--- a/logic/ftb/OneSixFTBInstance.cpp
+++ b/logic/ftb/OneSixFTBInstance.cpp
@@ -1,13 +1,13 @@
 #include "OneSixFTBInstance.h"
 #include "FTBProfileStrategy.h"
 
-#include "logic/minecraft/MinecraftProfile.h"
-#include "logic/minecraft/OneSixLibrary.h"
-#include "logic/minecraft/VersionBuilder.h"
-#include "logic/tasks/SequentialTask.h"
-#include "logic/forge/ForgeInstaller.h"
-#include "logic/forge/ForgeVersionList.h"
-#include <logic/settings/INISettingsObject.h>
+#include "minecraft/MinecraftProfile.h"
+#include "minecraft/OneSixLibrary.h"
+#include "minecraft/VersionBuilder.h"
+#include "tasks/SequentialTask.h"
+#include "forge/ForgeInstaller.h"
+#include "forge/ForgeVersionList.h"
+#include <settings/INISettingsObject.h>
 #include "pathutils.h"
 
 OneSixFTBInstance::OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) :
diff --git a/logic/ftb/OneSixFTBInstance.h b/logic/ftb/OneSixFTBInstance.h
index 7af7c770..dd652fd1 100644
--- a/logic/ftb/OneSixFTBInstance.h
+++ b/logic/ftb/OneSixFTBInstance.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "logic/minecraft/OneSixInstance.h"
+#include "minecraft/OneSixInstance.h"
 
 class OneSixLibrary;
 
diff --git a/logic/icons/IconList.h b/logic/icons/IconList.h
index 124ecf27..07fb1379 100644
--- a/logic/icons/IconList.h
+++ b/logic/icons/IconList.h
@@ -22,8 +22,8 @@
 #include <QtGui/QIcon>
 #include <memory>
 #include "MMCIcon.h"
-#include "logic/settings/Setting.h"
-#include "logic/Env.h" // there is a global icon list inside Env.
+#include "settings/Setting.h"
+#include "Env.h" // there is a global icon list inside Env.
 
 class QFileSystemWatcher;
 
diff --git a/logic/java/JavaCheckerJob.h b/logic/java/JavaCheckerJob.h
index eba3751a..a98d88cd 100644
--- a/logic/java/JavaCheckerJob.h
+++ b/logic/java/JavaCheckerJob.h
@@ -18,7 +18,7 @@
 #include <QtNetwork>
 #include <QLabel>
 #include "JavaChecker.h"
-#include "logic/tasks/ProgressProvider.h"
+#include "tasks/ProgressProvider.h"
 
 class JavaCheckerJob;
 typedef std::shared_ptr<JavaCheckerJob> JavaCheckerJobPtr;
diff --git a/logic/java/JavaUtils.cpp b/logic/java/JavaUtils.cpp
index 3cacbbd2..ac1d60e4 100644
--- a/logic/java/JavaUtils.cpp
+++ b/logic/java/JavaUtils.cpp
@@ -18,13 +18,13 @@
 #include <QDir>
 #include <QStringList>
 
-#include <logic/settings/Setting.h>
+#include <settings/Setting.h>
 #include <pathutils.h>
 
 #include <QDebug>
-#include "logic/java/JavaUtils.h"
-#include "logic/java/JavaCheckerJob.h"
-#include "logic/java/JavaVersionList.h"
+#include "java/JavaUtils.h"
+#include "java/JavaCheckerJob.h"
+#include "java/JavaVersionList.h"
 
 JavaUtils::JavaUtils()
 {
diff --git a/logic/java/JavaVersionList.cpp b/logic/java/JavaVersionList.cpp
index 4f8592ce..bb5f025f 100644
--- a/logic/java/JavaVersionList.cpp
+++ b/logic/java/JavaVersionList.cpp
@@ -19,9 +19,9 @@
 
 #include <QDebug>
 
-#include "logic/java/JavaVersionList.h"
-#include "logic/java/JavaCheckerJob.h"
-#include "logic/java/JavaUtils.h"
+#include "java/JavaVersionList.h"
+#include "java/JavaCheckerJob.h"
+#include "java/JavaUtils.h"
 
 JavaVersionList::JavaVersionList(QObject *parent) : BaseVersionList(parent)
 {
diff --git a/logic/java/JavaVersionList.h b/logic/java/JavaVersionList.h
index 288f0608..820bd5a6 100644
--- a/logic/java/JavaVersionList.h
+++ b/logic/java/JavaVersionList.h
@@ -18,9 +18,9 @@
 #include <QObject>
 #include <QAbstractListModel>
 
-#include "logic/BaseVersionList.h"
-#include "logic/tasks/Task.h"
-#include "logic/java/JavaCheckerJob.h"
+#include "BaseVersionList.h"
+#include "tasks/Task.h"
+#include "java/JavaCheckerJob.h"
 
 class JavaListLoadTask;
 
diff --git a/logic/liteloader/LiteLoaderInstaller.cpp b/logic/liteloader/LiteLoaderInstaller.cpp
index fadcc790..ab802380 100644
--- a/logic/liteloader/LiteLoaderInstaller.cpp
+++ b/logic/liteloader/LiteLoaderInstaller.cpp
@@ -20,10 +20,10 @@
 
 #include <QDebug>
 
-#include "logic/minecraft/MinecraftProfile.h"
-#include "logic/minecraft/OneSixLibrary.h"
-#include "logic/minecraft/OneSixInstance.h"
-#include "logic/liteloader/LiteLoaderVersionList.h"
+#include "minecraft/MinecraftProfile.h"
+#include "minecraft/OneSixLibrary.h"
+#include "minecraft/OneSixInstance.h"
+#include "liteloader/LiteLoaderVersionList.h"
 
 LiteLoaderInstaller::LiteLoaderInstaller() : BaseInstaller()
 {
diff --git a/logic/liteloader/LiteLoaderInstaller.h b/logic/liteloader/LiteLoaderInstaller.h
index b326cc3e..51d58706 100644
--- a/logic/liteloader/LiteLoaderInstaller.h
+++ b/logic/liteloader/LiteLoaderInstaller.h
@@ -18,8 +18,8 @@
 #include <QString>
 #include <QMap>
 
-#include "logic/BaseInstaller.h"
-#include "logic/liteloader/LiteLoaderVersionList.h"
+#include "BaseInstaller.h"
+#include "liteloader/LiteLoaderVersionList.h"
 
 class LiteLoaderInstaller : public BaseInstaller
 {
diff --git a/logic/liteloader/LiteLoaderVersionList.cpp b/logic/liteloader/LiteLoaderVersionList.cpp
index 89ea5df5..2e54afdf 100644
--- a/logic/liteloader/LiteLoaderVersionList.cpp
+++ b/logic/liteloader/LiteLoaderVersionList.cpp
@@ -14,9 +14,9 @@
  */
 
 #include "LiteLoaderVersionList.h"
-#include "logic/Env.h"
-#include "logic/net/URLConstants.h"
-#include <MMCError.h>
+#include "Env.h"
+#include "net/URLConstants.h"
+#include "MMCError.h"
 
 #include <QtXml>
 
diff --git a/logic/liteloader/LiteLoaderVersionList.h b/logic/liteloader/LiteLoaderVersionList.h
index f9764d72..fd20fcfa 100644
--- a/logic/liteloader/LiteLoaderVersionList.h
+++ b/logic/liteloader/LiteLoaderVersionList.h
@@ -19,11 +19,11 @@
 
 #include <QString>
 #include <QStringList>
-#include "logic/BaseVersion.h"
-#include "logic/BaseVersionList.h"
-#include "logic/tasks/Task.h"
-#include "logic/net/NetJob.h"
-#include <logic/minecraft/RawLibrary.h>
+#include "BaseVersion.h"
+#include "BaseVersionList.h"
+#include "tasks/Task.h"
+#include "net/NetJob.h"
+#include <minecraft/RawLibrary.h>
 
 class LLListLoadTask;
 class QNetworkReply;
diff --git a/logic/minecraft/GradleSpecifier.h b/logic/minecraft/GradleSpecifier.h
index 411aed65..18308537 100644
--- a/logic/minecraft/GradleSpecifier.h
+++ b/logic/minecraft/GradleSpecifier.h
@@ -2,7 +2,7 @@
 
 #include <QString>
 #include <QStringList>
-#include "logic/DefaultVariable.h"
+#include "DefaultVariable.h"
 
 struct GradleSpecifier
 {
diff --git a/logic/minecraft/JarMod.cpp b/logic/minecraft/JarMod.cpp
index fce8a492..c7ba58f1 100644
--- a/logic/minecraft/JarMod.cpp
+++ b/logic/minecraft/JarMod.cpp
@@ -1,5 +1,5 @@
 #include "JarMod.h"
-#include "logic/MMCJson.h"
+#include "MMCJson.h"
 using namespace MMCJson;
 
 JarmodPtr Jarmod::fromJson(const QJsonObject &libObj, const QString &filename)
diff --git a/logic/minecraft/JarUtils.cpp b/logic/minecraft/JarUtils.cpp
index 59326aba..b8fb6f0d 100644
--- a/logic/minecraft/JarUtils.cpp
+++ b/logic/minecraft/JarUtils.cpp
@@ -1,4 +1,4 @@
-#include "logic/minecraft/JarUtils.h"
+#include "minecraft/JarUtils.h"
 #include <quazip.h>
 #include <quazipfile.h>
 #include <JlCompress.h>
diff --git a/logic/minecraft/LegacyInstance.cpp b/logic/minecraft/LegacyInstance.cpp
index c0fe1513..a330842d 100644
--- a/logic/minecraft/LegacyInstance.cpp
+++ b/logic/minecraft/LegacyInstance.cpp
@@ -16,15 +16,17 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QImage>
-#include <logic/settings/Setting.h>
+#include <settings/Setting.h>
 #include <pathutils.h>
 #include <cmdutils.h>
 
 #include "LegacyInstance.h"
 
-#include "logic/minecraft/LegacyUpdate.h"
-#include "logic/icons/IconList.h"
-#include "logic/minecraft/MinecraftProcess.h"
+#include "minecraft/LegacyUpdate.h"
+#include "icons/IconList.h"
+#include "minecraft/MinecraftProcess.h"
+#include "minecraft/ModList.h"
+/*
 #include "gui/pages/LegacyUpgradePage.h"
 #include "gui/pages/ModFolderPage.h"
 #include "gui/pages/LegacyJarModPage.h"
@@ -32,6 +34,7 @@
 #include <gui/pages/InstanceSettingsPage.h>
 #include <gui/pages/NotesPage.h>
 #include <gui/pages/ScreenshotsPage.h>
+*/
 
 LegacyInstance::LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
 	: MinecraftInstance(globalSettings, settings, rootDir)
@@ -53,6 +56,7 @@ LegacyInstance::LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectP
 	settings->registerSetting("CustomBaseJar", "");
 }
 
+/*
 QList<BasePage *> LegacyInstance::getPages()
 {
 	QList<BasePage *> values;
@@ -74,6 +78,7 @@ QString LegacyInstance::dialogTitle()
 {
 	return tr("Edit Instance (%1)").arg(name());
 }
+*/
 
 QString LegacyInstance::baseJar() const
 {
diff --git a/logic/minecraft/LegacyInstance.h b/logic/minecraft/LegacyInstance.h
index 353718c1..64bcb08b 100644
--- a/logic/minecraft/LegacyInstance.h
+++ b/logic/minecraft/LegacyInstance.h
@@ -15,13 +15,12 @@
 
 #pragma once
 
-#include "logic/minecraft/MinecraftInstance.h"
-#include "gui/pages/BasePageProvider.h"
+#include "minecraft/MinecraftInstance.h"
 
 class ModList;
 class Task;
 
-class LegacyInstance : public MinecraftInstance, public BasePageProvider
+class LegacyInstance : public MinecraftInstance
 {
 	Q_OBJECT
 public:
@@ -36,9 +35,11 @@ public:
 	//! Path to the instance's modlist file.
 	QString modListFile() const;
 
+	/*
 	////// Edit Instance Dialog stuff //////
 	virtual QList<BasePage *> getPages();
 	virtual QString dialogTitle();
+	*/
 
 	//////  Mod Lists  //////
 	std::shared_ptr<ModList> jarModList() const ;
diff --git a/logic/minecraft/LegacyUpdate.cpp b/logic/minecraft/LegacyUpdate.cpp
index d853536a..e2fffbb3 100644
--- a/logic/minecraft/LegacyUpdate.cpp
+++ b/logic/minecraft/LegacyUpdate.cpp
@@ -20,16 +20,16 @@
 #include <JlCompress.h>
 #include <QDebug>
 
-#include "logic/Env.h"
-#include "logic/BaseInstance.h"
-#include "logic/net/URLConstants.h"
-
-#include "logic/minecraft/JarUtils.h"
-#include "logic/minecraft/LegacyUpdate.h"
-#include "logic/minecraft/LwjglVersionList.h"
-#include "logic/minecraft/MinecraftVersionList.h"
-#include "logic/minecraft/ModList.h"
-#include "logic/minecraft/LegacyInstance.h"
+#include "Env.h"
+#include "BaseInstance.h"
+#include "net/URLConstants.h"
+
+#include "minecraft/JarUtils.h"
+#include "minecraft/LegacyUpdate.h"
+#include "minecraft/LwjglVersionList.h"
+#include "minecraft/MinecraftVersionList.h"
+#include "minecraft/ModList.h"
+#include "minecraft/LegacyInstance.h"
 
 LegacyUpdate::LegacyUpdate(BaseInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
 {
diff --git a/logic/minecraft/LegacyUpdate.h b/logic/minecraft/LegacyUpdate.h
index 78e456a1..61de75d3 100644
--- a/logic/minecraft/LegacyUpdate.h
+++ b/logic/minecraft/LegacyUpdate.h
@@ -19,9 +19,9 @@
 #include <QList>
 #include <QUrl>
 
-#include "logic/net/NetJob.h"
-#include "logic/tasks/Task.h"
-#include "logic/minecraft/VersionFilterData.h"
+#include "net/NetJob.h"
+#include "tasks/Task.h"
+#include "minecraft/VersionFilterData.h"
 
 class MinecraftVersion;
 class BaseInstance;
diff --git a/logic/minecraft/LwjglVersionList.cpp b/logic/minecraft/LwjglVersionList.cpp
index 9e101b74..bb017368 100644
--- a/logic/minecraft/LwjglVersionList.cpp
+++ b/logic/minecraft/LwjglVersionList.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "LwjglVersionList.h"
-#include "logic/Env.h"
+#include "Env.h"
 
 #include <QtNetwork>
 #include <QtXml>
diff --git a/logic/minecraft/LwjglVersionList.h b/logic/minecraft/LwjglVersionList.h
index c364fa13..9584f837 100644
--- a/logic/minecraft/LwjglVersionList.h
+++ b/logic/minecraft/LwjglVersionList.h
@@ -21,8 +21,8 @@
 #include <QNetworkReply>
 #include <memory>
 
-#include "logic/BaseVersion.h"
-#include "logic/BaseVersionList.h"
+#include "BaseVersion.h"
+#include "BaseVersionList.h"
 
 class LWJGLVersion;
 typedef std::shared_ptr<LWJGLVersion> PtrLWJGLVersion;
diff --git a/logic/minecraft/MinecraftInstance.cpp b/logic/minecraft/MinecraftInstance.cpp
index 93aeecd1..e4273cb9 100644
--- a/logic/minecraft/MinecraftInstance.cpp
+++ b/logic/minecraft/MinecraftInstance.cpp
@@ -1,8 +1,8 @@
 #include "MinecraftInstance.h"
-#include "logic/settings/SettingsObject.h"
+#include "settings/SettingsObject.h"
 #include <pathutils.h>
-#include "logic/Env.h"
-#include "logic/minecraft/MinecraftVersionList.h"
+#include "Env.h"
+#include "minecraft/MinecraftVersionList.h"
 
 MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
 	: BaseInstance(globalSettings, settings, rootDir)
diff --git a/logic/minecraft/MinecraftInstance.h b/logic/minecraft/MinecraftInstance.h
index 63519ae8..d7ae18ea 100644
--- a/logic/minecraft/MinecraftInstance.h
+++ b/logic/minecraft/MinecraftInstance.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "logic/BaseInstance.h"
-#include "logic/minecraft/Mod.h"
+#include "BaseInstance.h"
+#include "minecraft/Mod.h"
 
 class ModList;
 
diff --git a/logic/minecraft/MinecraftProcess.cpp b/logic/minecraft/MinecraftProcess.cpp
index 75287856..9d18ad90 100644
--- a/logic/minecraft/MinecraftProcess.cpp
+++ b/logic/minecraft/MinecraftProcess.cpp
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "logic/minecraft/MinecraftProcess.h"
-#include "logic/BaseInstance.h"
+#include "minecraft/MinecraftProcess.h"
+#include "BaseInstance.h"
 
 #include <QDataStream>
 #include <QFile>
diff --git a/logic/minecraft/MinecraftProcess.h b/logic/minecraft/MinecraftProcess.h
index 30a59e91..34c02b77 100644
--- a/logic/minecraft/MinecraftProcess.h
+++ b/logic/minecraft/MinecraftProcess.h
@@ -18,8 +18,8 @@
 #pragma once
 
 #include <QString>
-#include "logic/minecraft/MinecraftInstance.h"
-#include "logic/BaseProcess.h"
+#include "minecraft/MinecraftInstance.h"
+#include "BaseProcess.h"
 
 /**
  * The MinecraftProcess class
diff --git a/logic/minecraft/MinecraftProfile.cpp b/logic/minecraft/MinecraftProfile.cpp
index 27277ab2..f38f8378 100644
--- a/logic/minecraft/MinecraftProfile.cpp
+++ b/logic/minecraft/MinecraftProfile.cpp
@@ -19,8 +19,8 @@
 #include <QJsonArray>
 #include <pathutils.h>
 
-#include "logic/minecraft/MinecraftProfile.h"
-#include "logic/minecraft/VersionBuilder.h"
+#include "minecraft/MinecraftProfile.h"
+#include "minecraft/VersionBuilder.h"
 #include "ProfileUtils.h"
 #include "NullProfileStrategy.h"
 
diff --git a/logic/minecraft/MinecraftVersion.cpp b/logic/minecraft/MinecraftVersion.cpp
index 0d484497..977a1892 100644
--- a/logic/minecraft/MinecraftVersion.cpp
+++ b/logic/minecraft/MinecraftVersion.cpp
@@ -3,7 +3,7 @@
 #include "VersionBuildError.h"
 #include "VersionBuilder.h"
 #include "ProfileUtils.h"
-#include "logic/settings/SettingsObject.h"
+#include "settings/SettingsObject.h"
 
 bool MinecraftVersion::usesLegacyLauncher()
 {
diff --git a/logic/minecraft/MinecraftVersion.h b/logic/minecraft/MinecraftVersion.h
index fbb209f2..9ee8425a 100644
--- a/logic/minecraft/MinecraftVersion.h
+++ b/logic/minecraft/MinecraftVersion.h
@@ -19,7 +19,7 @@
 #include <QSet>
 #include <QDateTime>
 
-#include "logic/BaseVersion.h"
+#include "BaseVersion.h"
 #include "ProfilePatch.h"
 #include "VersionFile.h"
 #include "VersionSource.h"
diff --git a/logic/minecraft/MinecraftVersionList.cpp b/logic/minecraft/MinecraftVersionList.cpp
index 2f549752..34c1e3d4 100644
--- a/logic/minecraft/MinecraftVersionList.cpp
+++ b/logic/minecraft/MinecraftVersionList.cpp
@@ -14,15 +14,15 @@
  */
 
 #include <QtXml>
-#include "logic/MMCJson.h"
+#include "MMCJson.h"
 #include <QtAlgorithms>
 #include <QtNetwork>
 
-#include "logic/Env.h"
+#include "Env.h"
 #include "MMCError.h"
 
 #include "MinecraftVersionList.h"
-#include "logic/net/URLConstants.h"
+#include "net/URLConstants.h"
 
 #include "ParseUtils.h"
 #include "ProfileUtils.h"
diff --git a/logic/minecraft/MinecraftVersionList.h b/logic/minecraft/MinecraftVersionList.h
index be9f8581..3266fc2d 100644
--- a/logic/minecraft/MinecraftVersionList.h
+++ b/logic/minecraft/MinecraftVersionList.h
@@ -19,10 +19,10 @@
 #include <QList>
 #include <QSet>
 
-#include "logic/BaseVersionList.h"
-#include "logic/tasks/Task.h"
-#include "logic/minecraft/MinecraftVersion.h"
-#include <logic/net/NetJob.h>
+#include "BaseVersionList.h"
+#include "tasks/Task.h"
+#include "minecraft/MinecraftVersion.h"
+#include <net/NetJob.h>
 
 class MCVListLoadTask;
 class MCVListVersionUpdateTask;
diff --git a/logic/minecraft/Mod.cpp b/logic/minecraft/Mod.cpp
index 7fa4905e..f8eb4faf 100644
--- a/logic/minecraft/Mod.cpp
+++ b/logic/minecraft/Mod.cpp
@@ -24,7 +24,7 @@
 
 #include "Mod.h"
 #include <pathutils.h>
-#include "logic/settings/INIFile.h"
+#include "settings/INIFile.h"
 #include <QDebug>
 
 Mod::Mod(const QFileInfo &file)
diff --git a/logic/minecraft/ModList.h b/logic/minecraft/ModList.h
index e227356b..70eb5569 100644
--- a/logic/minecraft/ModList.h
+++ b/logic/minecraft/ModList.h
@@ -20,7 +20,7 @@
 #include <QDir>
 #include <QAbstractListModel>
 
-#include "logic/minecraft/Mod.h"
+#include "minecraft/Mod.h"
 
 class LegacyInstance;
 class BaseInstance;
diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp
index f43275ab..915314d0 100644
--- a/logic/minecraft/OneSixInstance.cpp
+++ b/logic/minecraft/OneSixInstance.cpp
@@ -18,16 +18,16 @@
 #include <QDebug>
 #include "MMCError.h"
 
-#include "logic/minecraft/OneSixInstance.h"
+#include "minecraft/OneSixInstance.h"
 
-#include "logic/minecraft/OneSixUpdate.h"
-#include "logic/minecraft/MinecraftProfile.h"
-#include "logic/minecraft/VersionBuildError.h"
-#include "logic/minecraft/MinecraftProcess.h"
-#include "logic/minecraft/OneSixProfileStrategy.h"
+#include "minecraft/OneSixUpdate.h"
+#include "minecraft/MinecraftProfile.h"
+#include "minecraft/VersionBuildError.h"
+#include "minecraft/MinecraftProcess.h"
+#include "minecraft/OneSixProfileStrategy.h"
 
-#include "logic/minecraft/AssetsUtils.h"
-#include "logic/icons/IconList.h"
+#include "minecraft/AssetsUtils.h"
+#include "icons/IconList.h"
 
 OneSixInstance::OneSixInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
 	: MinecraftInstance(globalSettings, settings, rootDir)
diff --git a/logic/minecraft/OneSixInstance.h b/logic/minecraft/OneSixInstance.h
index 79e67bd2..dd5ddf5e 100644
--- a/logic/minecraft/OneSixInstance.h
+++ b/logic/minecraft/OneSixInstance.h
@@ -15,10 +15,10 @@
 
 #pragma once
 
-#include "logic/minecraft/MinecraftInstance.h"
+#include "minecraft/MinecraftInstance.h"
 
-#include "logic/minecraft/MinecraftProfile.h"
-#include "logic/minecraft/ModList.h"
+#include "minecraft/MinecraftProfile.h"
+#include "minecraft/ModList.h"
 
 class OneSixInstance : public MinecraftInstance
 {
diff --git a/logic/minecraft/OneSixLibrary.h b/logic/minecraft/OneSixLibrary.h
index bdd3c85e..76e04c2c 100644
--- a/logic/minecraft/OneSixLibrary.h
+++ b/logic/minecraft/OneSixLibrary.h
@@ -22,9 +22,9 @@
 #include <QDir>
 #include <memory>
 
-#include "logic/net/URLConstants.h"
-#include "logic/minecraft/OpSys.h"
-#include "logic/minecraft/RawLibrary.h"
+#include "net/URLConstants.h"
+#include "minecraft/OpSys.h"
+#include "minecraft/RawLibrary.h"
 
 class OneSixLibrary;
 typedef std::shared_ptr<OneSixLibrary> OneSixLibraryPtr;
diff --git a/logic/minecraft/OneSixProfileStrategy.cpp b/logic/minecraft/OneSixProfileStrategy.cpp
index 6d80963f..4f596d12 100644
--- a/logic/minecraft/OneSixProfileStrategy.cpp
+++ b/logic/minecraft/OneSixProfileStrategy.cpp
@@ -1,8 +1,8 @@
-#include "logic/minecraft/OneSixProfileStrategy.h"
-#include "logic/minecraft/VersionBuildError.h"
-#include "logic/minecraft/OneSixInstance.h"
-#include "logic/minecraft/MinecraftVersionList.h"
-#include "logic/Env.h"
+#include "minecraft/OneSixProfileStrategy.h"
+#include "minecraft/VersionBuildError.h"
+#include "minecraft/OneSixInstance.h"
+#include "minecraft/MinecraftVersionList.h"
+#include "Env.h"
 
 #include <pathutils.h>
 #include <QDir>
diff --git a/logic/minecraft/OneSixUpdate.cpp b/logic/minecraft/OneSixUpdate.cpp
index f9ab6c65..6cea2341 100644
--- a/logic/minecraft/OneSixUpdate.cpp
+++ b/logic/minecraft/OneSixUpdate.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "logic/Env.h"
+#include "Env.h"
 #include "OneSixUpdate.h"
 
 #include <QtNetwork>
@@ -25,15 +25,15 @@
 #include <pathutils.h>
 #include <JlCompress.h>
 
-#include "logic/BaseInstance.h"
-#include "logic/minecraft/MinecraftVersionList.h"
-#include "logic/minecraft/MinecraftProfile.h"
-#include "logic/minecraft/OneSixLibrary.h"
-#include "logic/minecraft/OneSixInstance.h"
-#include "logic/forge/ForgeMirrors.h"
-#include "logic/net/URLConstants.h"
-#include "logic/minecraft/AssetsUtils.h"
-#include "logic/minecraft/JarUtils.h"
+#include "BaseInstance.h"
+#include "minecraft/MinecraftVersionList.h"
+#include "minecraft/MinecraftProfile.h"
+#include "minecraft/OneSixLibrary.h"
+#include "minecraft/OneSixInstance.h"
+#include "forge/ForgeMirrors.h"
+#include "net/URLConstants.h"
+#include "minecraft/AssetsUtils.h"
+#include "minecraft/JarUtils.h"
 
 OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
 {
diff --git a/logic/minecraft/OneSixUpdate.h b/logic/minecraft/OneSixUpdate.h
index e3571e5a..c8c3b03f 100644
--- a/logic/minecraft/OneSixUpdate.h
+++ b/logic/minecraft/OneSixUpdate.h
@@ -19,9 +19,9 @@
 #include <QList>
 #include <QUrl>
 
-#include "logic/net/NetJob.h"
-#include "logic/tasks/Task.h"
-#include "logic/minecraft/VersionFilterData.h"
+#include "net/NetJob.h"
+#include "tasks/Task.h"
+#include "minecraft/VersionFilterData.h"
 #include <quazip.h>
 
 class MinecraftVersion;
diff --git a/logic/minecraft/ParseUtils.cpp b/logic/minecraft/ParseUtils.cpp
index f94de6ff..49e0e0ca 100644
--- a/logic/minecraft/ParseUtils.cpp
+++ b/logic/minecraft/ParseUtils.cpp
@@ -1,7 +1,7 @@
 #include <QDateTime>
 #include <QString>
 #include "ParseUtils.h"
-#include <logic/MMCJson.h>
+#include <MMCJson.h>
 
 QDateTime timeFromS3Time(QString str)
 {
diff --git a/logic/minecraft/ProfileUtils.cpp b/logic/minecraft/ProfileUtils.cpp
index 21fcb2ef..3eaca920 100644
--- a/logic/minecraft/ProfileUtils.cpp
+++ b/logic/minecraft/ProfileUtils.cpp
@@ -1,6 +1,6 @@
 #include "ProfileUtils.h"
-#include "logic/minecraft/VersionFilterData.h"
-#include "logic/MMCJson.h"
+#include "minecraft/VersionFilterData.h"
+#include "MMCJson.h"
 #include <QDebug>
 
 #include <QJsonDocument>
diff --git a/logic/minecraft/RawLibrary.cpp b/logic/minecraft/RawLibrary.cpp
index 87dbf3ec..3c771895 100644
--- a/logic/minecraft/RawLibrary.cpp
+++ b/logic/minecraft/RawLibrary.cpp
@@ -1,4 +1,4 @@
-#include "logic/MMCJson.h"
+#include "MMCJson.h"
 using namespace MMCJson;
 
 #include "RawLibrary.h"
diff --git a/logic/minecraft/RawLibrary.h b/logic/minecraft/RawLibrary.h
index 6263f99a..a3990740 100644
--- a/logic/minecraft/RawLibrary.h
+++ b/logic/minecraft/RawLibrary.h
@@ -7,10 +7,10 @@
 #include <QDir>
 #include <memory>
 
-#include "logic/minecraft/OneSixRule.h"
-#include "logic/minecraft/OpSys.h"
+#include "minecraft/OneSixRule.h"
+#include "minecraft/OpSys.h"
 #include "GradleSpecifier.h"
-#include "logic/net/URLConstants.h"
+#include "net/URLConstants.h"
 
 class RawLibrary;
 typedef std::shared_ptr<RawLibrary> RawLibraryPtr;
diff --git a/logic/minecraft/SkinUtils.cpp b/logic/minecraft/SkinUtils.cpp
index f44c9c70..e6e513a5 100644
--- a/logic/minecraft/SkinUtils.cpp
+++ b/logic/minecraft/SkinUtils.cpp
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-#include "logic/minecraft/SkinUtils.h"
-#include "logic/net/HttpMetaCache.h"
-#include "logic/Env.h"
+#include "minecraft/SkinUtils.h"
+#include "net/HttpMetaCache.h"
+#include "Env.h"
 
 #include <QFile>
 #include <QJsonDocument>
diff --git a/logic/minecraft/VersionBuilder.cpp b/logic/minecraft/VersionBuilder.cpp
index bc29c187..4d58b060 100644
--- a/logic/minecraft/VersionBuilder.cpp
+++ b/logic/minecraft/VersionBuilder.cpp
@@ -26,17 +26,17 @@
 #include <modutils.h>
 #include <pathutils.h>
 
-#include "logic/minecraft/VersionBuilder.h"
-#include "logic/minecraft/MinecraftProfile.h"
-#include "logic/minecraft/OneSixRule.h"
-#include "logic/minecraft/ProfilePatch.h"
-#include "logic/minecraft/VersionFile.h"
+#include "minecraft/VersionBuilder.h"
+#include "minecraft/MinecraftProfile.h"
+#include "minecraft/OneSixRule.h"
+#include "minecraft/ProfilePatch.h"
+#include "minecraft/VersionFile.h"
 #include "VersionBuildError.h"
 #include "MinecraftVersionList.h"
 #include "ProfileUtils.h"
 
-#include "logic/minecraft/OneSixInstance.h"
-#include "logic/MMCJson.h"
+#include "minecraft/OneSixInstance.h"
+#include "MMCJson.h"
 
 #include <QDebug>
 
diff --git a/logic/minecraft/VersionFile.cpp b/logic/minecraft/VersionFile.cpp
index 275be12e..0a20efcb 100644
--- a/logic/minecraft/VersionFile.cpp
+++ b/logic/minecraft/VersionFile.cpp
@@ -4,13 +4,13 @@
 
 #include <QDebug>
 
-#include "logic/minecraft/VersionFile.h"
-#include "logic/minecraft/OneSixLibrary.h"
-#include "logic/minecraft/MinecraftProfile.h"
-#include "logic/minecraft/JarMod.h"
+#include "minecraft/VersionFile.h"
+#include "minecraft/OneSixLibrary.h"
+#include "minecraft/MinecraftProfile.h"
+#include "minecraft/JarMod.h"
 #include "ParseUtils.h"
 
-#include "logic/MMCJson.h"
+#include "MMCJson.h"
 using namespace MMCJson;
 
 #include "VersionBuildError.h"
diff --git a/logic/minecraft/VersionFile.h b/logic/minecraft/VersionFile.h
index 1e8772af..346a8dcd 100644
--- a/logic/minecraft/VersionFile.h
+++ b/logic/minecraft/VersionFile.h
@@ -4,8 +4,8 @@
 #include <QStringList>
 #include <QDateTime>
 #include <memory>
-#include "logic/minecraft/OpSys.h"
-#include "logic/minecraft/OneSixRule.h"
+#include "minecraft/OpSys.h"
+#include "minecraft/OneSixRule.h"
 #include "ProfilePatch.h"
 #include "MMCError.h"
 #include "OneSixLibrary.h"
diff --git a/logic/net/ByteArrayDownload.cpp b/logic/net/ByteArrayDownload.cpp
index 7a41ee28..151487f0 100644
--- a/logic/net/ByteArrayDownload.cpp
+++ b/logic/net/ByteArrayDownload.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "ByteArrayDownload.h"
-#include "logic/Env.h"
+#include "Env.h"
 #include <QDebug>
 
 ByteArrayDownload::ByteArrayDownload(QUrl url) : NetAction()
diff --git a/logic/net/CacheDownload.cpp b/logic/net/CacheDownload.cpp
index 0bbe75c3..a4fac6ef 100644
--- a/logic/net/CacheDownload.cpp
+++ b/logic/net/CacheDownload.cpp
@@ -20,7 +20,7 @@
 #include <QFileInfo>
 #include <QDateTime>
 #include <QDebug>
-#include "logic/Env.h"
+#include "Env.h"
 
 CacheDownload::CacheDownload(QUrl url, MetaEntryPtr entry)
 	: NetAction(), md5sum(QCryptographicHash::Md5)
diff --git a/logic/net/HttpMetaCache.cpp b/logic/net/HttpMetaCache.cpp
index 7e52f16c..bfd2cb42 100644
--- a/logic/net/HttpMetaCache.cpp
+++ b/logic/net/HttpMetaCache.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "logic/Env.h"
+#include "Env.h"
 #include "HttpMetaCache.h"
 #include <pathutils.h>
 
diff --git a/logic/net/MD5EtagDownload.cpp b/logic/net/MD5EtagDownload.cpp
index 03752ea8..651ab602 100644
--- a/logic/net/MD5EtagDownload.cpp
+++ b/logic/net/MD5EtagDownload.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "logic/Env.h"
+#include "Env.h"
 #include "MD5EtagDownload.h"
 #include <pathutils.h>
 #include <QCryptographicHash>
diff --git a/logic/net/NetAction.h b/logic/net/NetAction.h
index b306bdfe..7c5bd5de 100644
--- a/logic/net/NetAction.h
+++ b/logic/net/NetAction.h
@@ -19,7 +19,7 @@
 #include <QUrl>
 #include <memory>
 #include <QNetworkReply>
-#include <logic/QObjectPtr.h>
+#include <QObjectPtr.h>
 
 enum JobStatus
 {
diff --git a/logic/net/NetJob.h b/logic/net/NetJob.h
index 708afa79..7f7b418c 100644
--- a/logic/net/NetJob.h
+++ b/logic/net/NetJob.h
@@ -21,8 +21,8 @@
 #include "MD5EtagDownload.h"
 #include "CacheDownload.h"
 #include "HttpMetaCache.h"
-#include "logic/tasks/ProgressProvider.h"
-#include "logic/QObjectPtr.h"
+#include "tasks/ProgressProvider.h"
+#include "QObjectPtr.h"
 
 class NetJob;
 typedef QObjectPtr<NetJob> NetJobPtr;
diff --git a/logic/net/PasteUpload.cpp b/logic/net/PasteUpload.cpp
index 6bed0887..b780194f 100644
--- a/logic/net/PasteUpload.cpp
+++ b/logic/net/PasteUpload.cpp
@@ -1,5 +1,5 @@
 #include "PasteUpload.h"
-#include "logic/Env.h"
+#include "Env.h"
 #include <QDebug>
 #include <QJsonObject>
 #include <QJsonDocument>
diff --git a/logic/net/PasteUpload.h b/logic/net/PasteUpload.h
index 307d592b..e353f421 100644
--- a/logic/net/PasteUpload.h
+++ b/logic/net/PasteUpload.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "logic/tasks/Task.h"
+#include "tasks/Task.h"
 #include <QMessageBox>
 #include <QNetworkReply>
 #include <memory>
diff --git a/logic/news/NewsChecker.h b/logic/news/NewsChecker.h
index d4855208..3a0f9ec8 100644
--- a/logic/news/NewsChecker.h
+++ b/logic/news/NewsChecker.h
@@ -19,7 +19,7 @@
 #include <QString>
 #include <QList>
 
-#include <logic/net/NetJob.h>
+#include <net/NetJob.h>
 
 #include "NewsEntry.h"
 
diff --git a/logic/notifications/NotificationChecker.cpp b/logic/notifications/NotificationChecker.cpp
index 77721770..4e35cacc 100644
--- a/logic/notifications/NotificationChecker.cpp
+++ b/logic/notifications/NotificationChecker.cpp
@@ -5,8 +5,8 @@
 #include <QJsonArray>
 #include <QDebug>
 
-#include "logic/Env.h"
-#include "logic/net/CacheDownload.h"
+#include "Env.h"
+#include "net/CacheDownload.h"
 
 
 NotificationChecker::NotificationChecker(QObject *parent)
diff --git a/logic/notifications/NotificationChecker.h b/logic/notifications/NotificationChecker.h
index a3e615db..92bc23dc 100644
--- a/logic/notifications/NotificationChecker.h
+++ b/logic/notifications/NotificationChecker.h
@@ -2,8 +2,8 @@
 
 #include <QObject>
 
-#include "logic/net/NetJob.h"
-#include "logic/net/CacheDownload.h"
+#include "net/NetJob.h"
+#include "net/CacheDownload.h"
 
 class NotificationChecker : public QObject
 {
diff --git a/logic/screenshots/ImgurAlbumCreation.cpp b/logic/screenshots/ImgurAlbumCreation.cpp
index f7cc2971..f332c220 100644
--- a/logic/screenshots/ImgurAlbumCreation.cpp
+++ b/logic/screenshots/ImgurAlbumCreation.cpp
@@ -6,8 +6,8 @@
 #include <QUrl>
 #include <QStringList>
 
-#include "logic/net/URLConstants.h"
-#include "logic/Env.h"
+#include "net/URLConstants.h"
+#include "Env.h"
 #include <QDebug>
 
 ImgurAlbumCreation::ImgurAlbumCreation(QList<ScreenshotPtr> screenshots) : NetAction(), m_screenshots(screenshots)
diff --git a/logic/screenshots/ImgurAlbumCreation.h b/logic/screenshots/ImgurAlbumCreation.h
index 6e8fbe94..f4adf6f2 100644
--- a/logic/screenshots/ImgurAlbumCreation.h
+++ b/logic/screenshots/ImgurAlbumCreation.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "logic/net/NetAction.h"
+#include "net/NetAction.h"
 #include "Screenshot.h"
 
 typedef std::shared_ptr<class ImgurAlbumCreation> ImgurAlbumCreationPtr;
diff --git a/logic/screenshots/ImgurUpload.cpp b/logic/screenshots/ImgurUpload.cpp
index 4ae37dfa..053156b9 100644
--- a/logic/screenshots/ImgurUpload.cpp
+++ b/logic/screenshots/ImgurUpload.cpp
@@ -8,8 +8,8 @@
 #include <QFile>
 #include <QUrl>
 
-#include "logic/net/URLConstants.h"
-#include "logic/Env.h"
+#include "net/URLConstants.h"
+#include "Env.h"
 #include <QDebug>
 
 ImgurUpload::ImgurUpload(ScreenshotPtr shot) : NetAction(), m_shot(shot)
diff --git a/logic/screenshots/ImgurUpload.h b/logic/screenshots/ImgurUpload.h
index 1111a8d0..f569ac3e 100644
--- a/logic/screenshots/ImgurUpload.h
+++ b/logic/screenshots/ImgurUpload.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "logic/net/NetAction.h"
+#include "net/NetAction.h"
 #include "Screenshot.h"
 
 typedef std::shared_ptr<class ImgurUpload> ImgurUploadPtr;
diff --git a/logic/settings/INIFile.cpp b/logic/settings/INIFile.cpp
index cc35aa83..27534f12 100644
--- a/logic/settings/INIFile.cpp
+++ b/logic/settings/INIFile.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "logic/settings/INIFile.h"
+#include "settings/INIFile.h"
 
 #include <QFile>
 #include <QTextStream>
diff --git a/logic/settings/INISettingsObject.h b/logic/settings/INISettingsObject.h
index a862135f..4d26ddf1 100644
--- a/logic/settings/INISettingsObject.h
+++ b/logic/settings/INISettingsObject.h
@@ -17,9 +17,9 @@
 
 #include <QObject>
 
-#include "logic/settings/INIFile.h"
+#include "settings/INIFile.h"
 
-#include "logic/settings/SettingsObject.h"
+#include "settings/SettingsObject.h"
 
 /*!
  * \brief A settings object that stores its settings in an INIFile.
diff --git a/logic/settings/Setting.cpp b/logic/settings/Setting.cpp
index c2cffd11..b17101a2 100644
--- a/logic/settings/Setting.cpp
+++ b/logic/settings/Setting.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "Setting.h"
-#include "logic/settings/SettingsObject.h"
+#include "settings/SettingsObject.h"
 
 Setting::Setting(QStringList synonyms, QVariant defVal)
 	: QObject(), m_synonyms(synonyms), m_defVal(defVal)
diff --git a/logic/settings/SettingsObject.cpp b/logic/settings/SettingsObject.cpp
index 280c07fa..e88eae49 100644
--- a/logic/settings/SettingsObject.cpp
+++ b/logic/settings/SettingsObject.cpp
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-#include "logic/settings/SettingsObject.h"
-#include "logic/settings/Setting.h"
-#include "logic/settings/OverrideSetting.h"
+#include "settings/SettingsObject.h"
+#include "settings/Setting.h"
+#include "settings/OverrideSetting.h"
 #include <QDebug>
 
 #include <QVariant>
diff --git a/logic/status/StatusChecker.cpp b/logic/status/StatusChecker.cpp
index 0e60db40..5e6cc612 100644
--- a/logic/status/StatusChecker.cpp
+++ b/logic/status/StatusChecker.cpp
@@ -15,10 +15,9 @@
 
 #include "StatusChecker.h"
 
-#include <logic/net/URLConstants.h>
+#include <net/URLConstants.h>
 
 #include <QByteArray>
-#include <QDomDocument>
 
 #include <QDebug>
 
@@ -40,7 +39,7 @@ void StatusChecker::reloadStatus()
 		// qDebug() << "Ignored request to reload status. Currently reloading already.";
 		return;
 	}
-	
+
 	// qDebug() << "Reloading status.";
 
 	NetJob* job = new NetJob("Status JSON");
diff --git a/logic/status/StatusChecker.h b/logic/status/StatusChecker.h
index 503d9f28..316066fe 100644
--- a/logic/status/StatusChecker.h
+++ b/logic/status/StatusChecker.h
@@ -19,7 +19,7 @@
 #include <QString>
 #include <QList>
 
-#include <logic/net/NetJob.h>
+#include <net/NetJob.h>
 
 class StatusChecker : public QObject
 {
diff --git a/logic/tools/BaseExternalTool.cpp b/logic/tools/BaseExternalTool.cpp
index 04edece8..d2931db7 100644
--- a/logic/tools/BaseExternalTool.cpp
+++ b/logic/tools/BaseExternalTool.cpp
@@ -8,11 +8,10 @@
 #include <windows.h>
 #endif
 
-#include "logic/BaseInstance.h"
-#include "MultiMC.h"
+#include "BaseInstance.h"
 
-BaseExternalTool::BaseExternalTool(InstancePtr instance, QObject *parent)
-	: QObject(parent), m_instance(instance)
+BaseExternalTool::BaseExternalTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent)
+	: QObject(parent), m_instance(instance), globalSettings(settings)
 {
 }
 
@@ -30,8 +29,8 @@ qint64 BaseExternalTool::pid(QProcess *process)
 #endif
 }
 
-BaseDetachedTool::BaseDetachedTool(InstancePtr instance, QObject *parent)
-	: BaseExternalTool(instance, parent)
+BaseDetachedTool::BaseDetachedTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent)
+	: BaseExternalTool(settings, instance, parent)
 {
 
 }
diff --git a/logic/tools/BaseExternalTool.h b/logic/tools/BaseExternalTool.h
index 8b8b2790..3c0b23ed 100644
--- a/logic/tools/BaseExternalTool.h
+++ b/logic/tools/BaseExternalTool.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <QObject>
-#include <logic/BaseInstance.h>
+#include <BaseInstance.h>
 
 class BaseInstance;
 class SettingsObject;
@@ -11,12 +11,12 @@ class BaseExternalTool : public QObject
 {
 	Q_OBJECT
 public:
-	explicit BaseExternalTool(InstancePtr instance, QObject *parent = 0);
+	explicit BaseExternalTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
 	virtual ~BaseExternalTool();
 
 protected:
 	InstancePtr m_instance;
-
+	SettingsObjectPtr globalSettings;
 	qint64 pid(QProcess *process);
 };
 
@@ -24,7 +24,7 @@ class BaseDetachedTool : public BaseExternalTool
 {
 	Q_OBJECT
 public:
-	explicit BaseDetachedTool(InstancePtr instance, QObject *parent = 0);
+	explicit BaseDetachedTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
 
 public
 slots:
@@ -41,12 +41,15 @@ public:
 
 	virtual QString name() const = 0;
 
-	virtual void registerSettings(std::shared_ptr<SettingsObject> settings) = 0;
+	virtual void registerSettings(SettingsObjectPtr settings) = 0;
 
 	virtual BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) = 0;
 
 	virtual bool check(QString *error) = 0;
 	virtual bool check(const QString &path, QString *error) = 0;
+
+protected:
+	SettingsObjectPtr globalSettings;
 };
 
 class BaseDetachedToolFactory : public BaseExternalToolFactory
diff --git a/logic/tools/BaseProfiler.cpp b/logic/tools/BaseProfiler.cpp
index d3c8d41e..2c9fed9b 100644
--- a/logic/tools/BaseProfiler.cpp
+++ b/logic/tools/BaseProfiler.cpp
@@ -2,8 +2,8 @@
 
 #include <QProcess>
 
-BaseProfiler::BaseProfiler(InstancePtr instance, QObject *parent)
-	: BaseExternalTool(instance, parent)
+BaseProfiler::BaseProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject *parent)
+	: BaseExternalTool(settings, instance, parent)
 {
 }
 
diff --git a/logic/tools/BaseProfiler.h b/logic/tools/BaseProfiler.h
index decaa5b8..56397489 100644
--- a/logic/tools/BaseProfiler.h
+++ b/logic/tools/BaseProfiler.h
@@ -11,7 +11,7 @@ class BaseProfiler : public BaseExternalTool
 {
 	Q_OBJECT
 public:
-	explicit BaseProfiler(InstancePtr instance, QObject *parent = 0);
+	explicit BaseProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
 
 public
 slots:
diff --git a/logic/tools/JProfiler.cpp b/logic/tools/JProfiler.cpp
index 7cdf0268..d53ec615 100644
--- a/logic/tools/JProfiler.cpp
+++ b/logic/tools/JProfiler.cpp
@@ -3,22 +3,23 @@
 #include <QDir>
 #include <QMessageBox>
 
-#include "logic/settings/SettingsObject.h"
-#include "logic/BaseProcess.h"
-#include "logic/BaseInstance.h"
-#include "MultiMC.h"
+#include "settings/SettingsObject.h"
+#include "BaseProcess.h"
+#include "BaseInstance.h"
 
-JProfiler::JProfiler(InstancePtr instance, QObject *parent) : BaseProfiler(instance, parent)
+JProfiler::JProfiler(SettingsObjectPtr settings, InstancePtr instance,
+					 QObject *parent)
+	: BaseProfiler(settings, instance, parent)
 {
 }
 
 void JProfiler::beginProfilingImpl(BaseProcess *process)
 {
-	int port = MMC->settings()->get("JProfilerPort").toInt();
+	int port = globalSettings->get("JProfilerPort").toInt();
 	QProcess *profiler = new QProcess(this);
 	profiler->setArguments(QStringList() << "-d" << QString::number(pid(process)) << "--gui"
 										 << "-p" << QString::number(port));
-	profiler->setProgram(QDir(MMC->settings()->get("JProfilerPath").toString())
+	profiler->setProgram(QDir(globalSettings->get("JProfilerPath").toString())
 #ifdef Q_OS_WIN
 							 .absoluteFilePath("bin/jpenable.exe"));
 #else
@@ -44,20 +45,21 @@ void JProfiler::beginProfilingImpl(BaseProcess *process)
 	m_profilerProcess = profiler;
 }
 
-void JProfilerFactory::registerSettings(std::shared_ptr<SettingsObject> settings)
+void JProfilerFactory::registerSettings(SettingsObjectPtr settings)
 {
 	settings->registerSetting("JProfilerPath");
 	settings->registerSetting("JProfilerPort", 42042);
+	globalSettings = settings;
 }
 
 BaseExternalTool *JProfilerFactory::createTool(InstancePtr instance, QObject *parent)
 {
-	return new JProfiler(instance, parent);
+	return new JProfiler(globalSettings, instance, parent);
 }
 
 bool JProfilerFactory::check(QString *error)
 {
-	return check(MMC->settings()->get("JProfilerPath").toString(), error);
+	return check(globalSettings->get("JProfilerPath").toString(), error);
 }
 
 bool JProfilerFactory::check(const QString &path, QString *error)
diff --git a/logic/tools/JProfiler.h b/logic/tools/JProfiler.h
index 0763a799..11df0779 100644
--- a/logic/tools/JProfiler.h
+++ b/logic/tools/JProfiler.h
@@ -6,7 +6,7 @@ class JProfiler : public BaseProfiler
 {
 	Q_OBJECT
 public:
-	JProfiler(InstancePtr instance, QObject *parent = 0);
+	JProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
 
 protected:
 	void beginProfilingImpl(BaseProcess *process);
@@ -16,7 +16,7 @@ class JProfilerFactory : public BaseProfilerFactory
 {
 public:
 	QString name() const override { return "JProfiler"; }
-	void registerSettings(std::shared_ptr<SettingsObject> settings) override;
+	void registerSettings(SettingsObjectPtr settings) override;
 	BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override;
 	bool check(QString *error) override;
 	bool check(const QString &path, QString *error) override;
diff --git a/logic/tools/JVisualVM.cpp b/logic/tools/JVisualVM.cpp
index 312be863..d258fde9 100644
--- a/logic/tools/JVisualVM.cpp
+++ b/logic/tools/JVisualVM.cpp
@@ -3,12 +3,12 @@
 #include <QDir>
 #include <QStandardPaths>
 
-#include "logic/settings/SettingsObject.h"
-#include "logic/BaseProcess.h"
-#include "logic/BaseInstance.h"
-#include "MultiMC.h"
+#include "settings/SettingsObject.h"
+#include "BaseProcess.h"
+#include "BaseInstance.h"
 
-JVisualVM::JVisualVM(InstancePtr instance, QObject *parent) : BaseProfiler(instance, parent)
+JVisualVM::JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject *parent)
+	: BaseProfiler(settings, instance, parent)
 {
 }
 
@@ -16,7 +16,7 @@ void JVisualVM::beginProfilingImpl(BaseProcess *process)
 {
 	QProcess *profiler = new QProcess(this);
 	profiler->setArguments(QStringList() << "--openpid" << QString::number(pid(process)));
-	profiler->setProgram(MMC->settings()->get("JVisualVMPath").toString());
+	profiler->setProgram(globalSettings->get("JVisualVMPath").toString());
 	connect(profiler, &QProcess::started, [this]()
 	{ emit readyToLaunch(tr("JVisualVM started")); });
 	connect(profiler,
@@ -37,7 +37,7 @@ void JVisualVM::beginProfilingImpl(BaseProcess *process)
 	m_profilerProcess = profiler;
 }
 
-void JVisualVMFactory::registerSettings(std::shared_ptr<SettingsObject> settings)
+void JVisualVMFactory::registerSettings(SettingsObjectPtr settings)
 {
 	QString defaultValue = QStandardPaths::findExecutable("jvisualvm");
 	if (defaultValue.isNull())
@@ -45,16 +45,17 @@ void JVisualVMFactory::registerSettings(std::shared_ptr<SettingsObject> settings
 		defaultValue = QStandardPaths::findExecutable("visualvm");
 	}
 	settings->registerSetting("JVisualVMPath", defaultValue);
+	globalSettings = settings;
 }
 
 BaseExternalTool *JVisualVMFactory::createTool(InstancePtr instance, QObject *parent)
 {
-	return new JVisualVM(instance, parent);
+	return new JVisualVM(globalSettings, instance, parent);
 }
 
 bool JVisualVMFactory::check(QString *error)
 {
-	return check(MMC->settings()->get("JVisualVMPath").toString(), error);
+	return check(globalSettings->get("JVisualVMPath").toString(), error);
 }
 
 bool JVisualVMFactory::check(const QString &path, QString *error)
diff --git a/logic/tools/JVisualVM.h b/logic/tools/JVisualVM.h
index 2a273568..f4ffe1bd 100644
--- a/logic/tools/JVisualVM.h
+++ b/logic/tools/JVisualVM.h
@@ -6,7 +6,7 @@ class JVisualVM : public BaseProfiler
 {
 	Q_OBJECT
 public:
-	JVisualVM(InstancePtr instance, QObject *parent = 0);
+	JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
 
 protected:
 	void beginProfilingImpl(BaseProcess *process);
@@ -16,7 +16,7 @@ class JVisualVMFactory : public BaseProfilerFactory
 {
 public:
 	QString name() const override { return "JVisualVM"; }
-	void registerSettings(std::shared_ptr<SettingsObject> settings) override;
+	void registerSettings(SettingsObjectPtr settings) override;
 	BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override;
 	bool check(QString *error) override;
 	bool check(const QString &path, QString *error) override;
diff --git a/logic/tools/MCEditTool.cpp b/logic/tools/MCEditTool.cpp
index c918d5d0..058eede8 100644
--- a/logic/tools/MCEditTool.cpp
+++ b/logic/tools/MCEditTool.cpp
@@ -6,14 +6,14 @@
 #include <QUrl>
 // FIXME: mixing logic and UI!!!!
 #include <QInputDialog>
+#include <QApplication>
 
-#include "logic/settings/SettingsObject.h"
-#include "logic/BaseInstance.h"
-#include "logic/minecraft/MinecraftInstance.h"
-#include "MultiMC.h"
+#include "settings/SettingsObject.h"
+#include "BaseInstance.h"
+#include "minecraft/MinecraftInstance.h"
 
-MCEditTool::MCEditTool(InstancePtr instance, QObject *parent)
-	: BaseDetachedTool(instance, parent)
+MCEditTool::MCEditTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent)
+	: BaseDetachedTool(settings, instance, parent)
 {
 }
 
@@ -37,8 +37,7 @@ QString MCEditTool::getSave() const
 		}
 	}
 	bool ok = true;
-	const QString save = QInputDialog::getItem(
-		MMC->activeWindow(), tr("MCEdit"), tr("Choose which world to open:"),
+	const QString save = QInputDialog::getItem(QApplication::activeWindow(), tr("MCEdit"), tr("Choose which world to open:"),
 		worlds, 0, false, &ok);
 	if (ok)
 	{
@@ -49,7 +48,7 @@ QString MCEditTool::getSave() const
 
 void MCEditTool::runImpl()
 {
-	const QString mceditPath = MMC->settings()->get("MCEditPath").toString();
+	const QString mceditPath = globalSettings->get("MCEditPath").toString();
 	const QString save = getSave();
 	if (save.isNull())
 	{
@@ -80,17 +79,18 @@ void MCEditTool::runImpl()
 #endif
 }
 
-void MCEditFactory::registerSettings(std::shared_ptr<SettingsObject> settings)
+void MCEditFactory::registerSettings(SettingsObjectPtr settings)
 {
 	settings->registerSetting("MCEditPath");
+	globalSettings = settings;
 }
 BaseExternalTool *MCEditFactory::createTool(InstancePtr instance, QObject *parent)
 {
-	return new MCEditTool(instance, parent);
+	return new MCEditTool(globalSettings, instance, parent);
 }
 bool MCEditFactory::check(QString *error)
 {
-	return check(MMC->settings()->get("MCEditPath").toString(), error);
+	return check(globalSettings->get("MCEditPath").toString(), error);
 }
 bool MCEditFactory::check(const QString &path, QString *error)
 {
diff --git a/logic/tools/MCEditTool.h b/logic/tools/MCEditTool.h
index b5cfc64e..bd40f02d 100644
--- a/logic/tools/MCEditTool.h
+++ b/logic/tools/MCEditTool.h
@@ -6,7 +6,7 @@ class MCEditTool : public BaseDetachedTool
 {
 	Q_OBJECT
 public:
-	explicit MCEditTool(InstancePtr instance, QObject *parent = 0);
+	explicit MCEditTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
 
 protected:
 	QString getSave() const;
@@ -17,7 +17,7 @@ class MCEditFactory : public BaseDetachedToolFactory
 {
 public:
 	QString name() const override { return "MCEdit"; }
-	void registerSettings(std::shared_ptr<SettingsObject> settings) override;
+	void registerSettings(SettingsObjectPtr settings) override;
 	BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override;
 	bool check(QString *error) override;
 	bool check(const QString &path, QString *error) override;
diff --git a/logic/trans/TranslationDownloader.cpp b/logic/trans/TranslationDownloader.cpp
index e977b65c..ccc4d590 100644
--- a/logic/trans/TranslationDownloader.cpp
+++ b/logic/trans/TranslationDownloader.cpp
@@ -1,9 +1,8 @@
 #include "TranslationDownloader.h"
-#include "logic/net/NetJob.h"
-#include "logic/net/ByteArrayDownload.h"
-#include "logic/net/CacheDownload.h"
-#include "logic/net/URLConstants.h"
-#include "logic/Env.h"
+#include "net/NetJob.h"
+#include "net/CacheDownload.h"
+#include "net/URLConstants.h"
+#include "Env.h"
 #include <QDebug>
 
 TranslationDownloader::TranslationDownloader()
diff --git a/logic/updater/DownloadTask.cpp b/logic/updater/DownloadTask.cpp
index badbc0d0..65d894f9 100644
--- a/logic/updater/DownloadTask.cpp
+++ b/logic/updater/DownloadTask.cpp
@@ -15,9 +15,9 @@
 
 #include "DownloadTask.h"
 
-#include "logic/updater/UpdateChecker.h"
+#include "updater/UpdateChecker.h"
 #include "GoUpdate.h"
-#include "logic/net/NetJob.h"
+#include "net/NetJob.h"
 #include "pathutils.h"
 
 #include <QFile>
diff --git a/logic/updater/DownloadTask.h b/logic/updater/DownloadTask.h
index 2b8c6299..24e39415 100644
--- a/logic/updater/DownloadTask.h
+++ b/logic/updater/DownloadTask.h
@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include "logic/tasks/Task.h"
-#include "logic/net/NetJob.h"
+#include "tasks/Task.h"
+#include "net/NetJob.h"
 #include "GoUpdate.h"
 
 namespace GoUpdate
diff --git a/logic/updater/GoUpdate.cpp b/logic/updater/GoUpdate.cpp
index 84dc164c..21bef2c0 100644
--- a/logic/updater/GoUpdate.cpp
+++ b/logic/updater/GoUpdate.cpp
@@ -3,7 +3,7 @@
 #include <QDebug>
 #include <QDomDocument>
 #include <QFile>
-#include <logic/Env.h>
+#include <Env.h>
 
 namespace GoUpdate
 {
diff --git a/logic/updater/GoUpdate.h b/logic/updater/GoUpdate.h
index bea6cce7..c58fd1eb 100644
--- a/logic/updater/GoUpdate.h
+++ b/logic/updater/GoUpdate.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <QByteArray>
-#include <logic/net/NetJob.h>
+#include <net/NetJob.h>
 
 namespace GoUpdate
 {
diff --git a/logic/updater/UpdateChecker.h b/logic/updater/UpdateChecker.h
index 0eaceea0..760245cd 100644
--- a/logic/updater/UpdateChecker.h
+++ b/logic/updater/UpdateChecker.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "logic/net/NetJob.h"
+#include "net/NetJob.h"
 #include "GoUpdate.h"
 
 #include <QUrl>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e891c379..2cf9e7cb 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,8 @@
 # run the unit tests with `make test`
 find_package(Qt5 COMPONENTS Test Core Network)
 
-include_directories(${MMC_SRC})
+include_directories(../logic)
+include_directories(../depends/util/include/)
 
 unset(MultiMC_TESTS)
 macro(add_unit_test name)
@@ -14,7 +15,7 @@ macro(add_unit_test name)
 	endforeach()
 	add_executable(tst_${name} ${srcs})
 	qt5_use_modules(tst_${name} Test Core Network)
-	target_link_libraries(tst_${name} MultiMC_common)
+	target_link_libraries(tst_${name} MultiMC_logic)
 	list(APPEND MultiMC_TESTS tst_${name})
 	add_test(NAME ${name} COMMAND tst_${name})
 endmacro()
@@ -38,9 +39,9 @@ set(COVERAGE_SOURCE_DIRS
 	${MMC_SRC}/logic/lists/*
 	${MMC_SRC}/logic/net/*
 	${MMC_SRC}/logic/tasks/*
-	${MMC_SRC}/gui/*
-	${MMC_SRC}/gui/dialogs/*
-	${MMC_SRC}/gui/widgets/*
+	${MMC_SRC}/application/*
+	${MMC_SRC}/application/dialogs/*
+	${MMC_SRC}/application/widgets/*
 	${MMC_SRC}/depends/settings/include/*
 	${MMC_SRC}/depends/settings/src/*
 	${MMC_SRC}/depends/util/include/*
diff --git a/tests/tst_DownloadTask.cpp b/tests/tst_DownloadTask.cpp
index 9c87b027..9482b666 100644
--- a/tests/tst_DownloadTask.cpp
+++ b/tests/tst_DownloadTask.cpp
@@ -3,10 +3,10 @@
 
 #include "TestUtil.h"
 
-#include "logic/updater/GoUpdate.h"
-#include "logic/updater/DownloadTask.h"
-#include "logic/updater/UpdateChecker.h"
-#include "depends/util/include/pathutils.h"
+#include "updater/GoUpdate.h"
+#include "updater/DownloadTask.h"
+#include "updater/UpdateChecker.h"
+#include "pathutils.h"
 
 using namespace GoUpdate;
 
diff --git a/tests/tst_UpdateChecker.cpp b/tests/tst_UpdateChecker.cpp
index d212f79b..42d44e77 100644
--- a/tests/tst_UpdateChecker.cpp
+++ b/tests/tst_UpdateChecker.cpp
@@ -2,7 +2,7 @@
 #include <QSignalSpy>
 
 #include "TestUtil.h"
-#include "logic/updater/UpdateChecker.h"
+#include "updater/UpdateChecker.h"
 
 Q_DECLARE_METATYPE(UpdateChecker::ChannelListEntry)
 
diff --git a/tests/tst_gradlespecifier.cpp b/tests/tst_gradlespecifier.cpp
index 56c29b85..146c9838 100644
--- a/tests/tst_gradlespecifier.cpp
+++ b/tests/tst_gradlespecifier.cpp
@@ -1,7 +1,7 @@
 #include <QTest>
 #include "TestUtil.h"
 
-#include "logic/minecraft/GradleSpecifier.h"
+#include "minecraft/GradleSpecifier.h"
 
 class GradleSpecifierTest : public QObject
 {
diff --git a/tests/tst_inifile.cpp b/tests/tst_inifile.cpp
index 6bec32f5..94b5e559 100644
--- a/tests/tst_inifile.cpp
+++ b/tests/tst_inifile.cpp
@@ -1,7 +1,7 @@
 #include <QTest>
 #include "TestUtil.h"
 
-#include "logic/settings/INIFile.h"
+#include "settings/INIFile.h"
 
 class IniFileTest : public QObject
 {
diff --git a/tests/tst_pathutils.cpp b/tests/tst_pathutils.cpp
index eed5b560..bccc6dca 100644
--- a/tests/tst_pathutils.cpp
+++ b/tests/tst_pathutils.cpp
@@ -1,7 +1,7 @@
 #include <QTest>
 #include "TestUtil.h"
 
-#include "depends/util/include/pathutils.h"
+#include "pathutils.h"
 
 class PathUtilsTest : public QObject
 {
diff --git a/tests/tst_userutils.cpp b/tests/tst_userutils.cpp
index 893e064e..bc7644f3 100644
--- a/tests/tst_userutils.cpp
+++ b/tests/tst_userutils.cpp
@@ -2,7 +2,7 @@
 #include <QStandardPaths>
 #include "TestUtil.h"
 
-#include "depends/util/include/userutils.h"
+#include "userutils.h"
 
 class UserUtilsTest : public QObject
 {
diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt
deleted file mode 100644
index c5ae65a6..00000000
--- a/translations/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM 1)
-
-### translation stuff
-
-file(GLOB TRANSLATION_FILES ${CMAKE_CURRENT_LIST_DIR}/*.ts)
-
-qt5_create_translation(TRANSLATION_MESSAGES ${FILES_TO_TRANSLATE} ${TRANSLATION_FILES})
-qt5_add_translation(TRANSLATION_QM ${TRANSLATION_FILES})
-add_custom_target(translations_update DEPENDS ${TRANSLATION_MESSAGES})
-add_custom_target(translations DEPENDS ${TRANSLATION_QM})
-
-if(APPLE AND UNIX) ## OSX
-	install(FILES ${TRANSLATION_QM} DESTINATION MultiMC.app/Contents/Resources/translations)
-else()
-	install(FILES ${TRANSLATION_QM} DESTINATION translations)
-endif()