53 files changed, 223 insertions, 185 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0022b29e..9aa75f4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,15 +61,15 @@ add_subdirectory(launcher)
 
 # Add the util library.
 add_subdirectory(libutil)
-include_directories(${LIBMMCUTIL_INCLUDE_DIR})
+include_directories(${LIBUTIL_INCLUDE_DIR})
 
 # Add the settings library.
 add_subdirectory(libsettings)
-include_directories(${LIBMMCSETTINGS_INCLUDE_DIR})
+include_directories(${LIBSETTINGS_INCLUDE_DIR})
 
 # Add the instance library.
-add_subdirectory(libinstance)
-include_directories(${LIBMMCINST_INCLUDE_DIR})
+add_subdirectory(libmultimc)
+include_directories(${LIBMULTIMC_INCLUDE_DIR})
 
 # Add the stdinstance plugin.
 add_subdirectory(plugins/stdinstance)
@@ -150,7 +150,7 @@ MESSAGE(STATUS "Job URL: ${MultiMC_JOB_URL}")
 
 ######## Configure header ########
 configure_file("${PROJECT_SOURCE_DIR}/config.h.in"
-			   "${PROJECT_BINARY_DIR}/config.h")
+			   "${PROJECT_BINARY_DIR}/include/config.h")
 
 
 ################################ FILES ################################
@@ -167,14 +167,6 @@ gui/browserdialog.h
 gui/aboutdialog.h
 gui/consolewindow.h
 
-data/version.h
-data/userinfo.h
-data/loginresponse.h
-data/appsettings.h
-data/minecraftprocess.h
-
-data/plugin/pluginmanager.h
-
 multimc_pragma.h
 
 java/annotations.h
@@ -184,10 +176,6 @@ java/javaendian.h
 java/errors.h
 java/javautils.h
 java/membuffer.h
-
-tasks/task.h
-tasks/logintask.h
-tasks/gameupdatetask.h
 )
 
 
@@ -195,14 +183,6 @@ tasks/gameupdatetask.h
 SET(MULTIMC_SOURCES
 main.cpp
 
-data/version.cpp
-data/userinfo.cpp
-data/loginresponse.cpp
-data/appsettings.cpp
-
-data/plugin/pluginmanager.cpp
-data/minecraftprocess.cpp
-
 gui/mainwindow.cpp
 gui/modeditwindow.cpp
 gui/settingsdialog.cpp
@@ -215,10 +195,6 @@ gui/consolewindow.cpp
 
 java/javautils.cpp
 java/annotations.cpp
-
-tasks/task.cpp
-tasks/logintask.cpp
-tasks/gameupdatetask.cpp
 )
 
 
@@ -272,9 +248,9 @@ ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32
 # Link
 QT5_USE_MODULES(MultiMC Widgets Network WebKitWidgets)
 TARGET_LINK_LIBRARIES(MultiMC quazip patchlib 
-libmmcutil libmmcsettings libmmcinst
+libUtil libSettings libMultiMC
 ${MultiMC_LINK_ADDITIONAL_LIBS})
-ADD_DEPENDENCIES(MultiMC MultiMCLauncher libmmcutil libmmcsettings libmmcinst)
+ADD_DEPENDENCIES(MultiMC MultiMCLauncher libUtil libSettings libMultiMC)
 
 
 ################################ INSTALLATION AND PACKAGING ################################
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 447a6619..6866da28 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -41,10 +41,10 @@
 #include "gui/aboutdialog.h"
 
 #include "instancelist.h"
-#include "data/appsettings.h"
-#include "data/version.h"
+#include "appsettings.h"
+#include "version.h"
 
-#include "tasks/logintask.h"
+#include "logintask.h"
 
 // Opens the given file in the default application.
 // TODO: Move this somewhere.
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index a57b8db4..5ea575a6 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -19,7 +19,7 @@
 #include <QMainWindow>
 
 #include "instancelist.h"
-#include "data/loginresponse.h"
+#include "loginresponse.h"
 
 namespace Ui
 {
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index 7c8eacd1..38844509 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -16,7 +16,7 @@
 #include "settingsdialog.h"
 #include "ui_settingsdialog.h"
 
-#include "data/appsettings.h"
+#include "appsettings.h"
 
 #include <QFileDialog>
 #include <QMessageBox>
diff --git a/gui/taskdialog.cpp b/gui/taskdialog.cpp
index a8738fe3..9b1ddf23 100644
--- a/gui/taskdialog.cpp
+++ b/gui/taskdialog.cpp
@@ -18,7 +18,7 @@
 
 #include <QKeyEvent>
 
-#include "tasks/task.h"
+#include "task.h"
 
 TaskDialog::TaskDialog(QWidget *parent) :
 	QDialog(parent),
diff --git a/libinstance/CMakeLists.txt b/libinstance/CMakeLists.txt
deleted file mode 100644
index d0a9aa08..00000000
--- a/libinstance/CMakeLists.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-project(libmmcinst)
-
-set(CMAKE_AUTOMOC ON)
-
-# Find Qt
-find_package(Qt5Core REQUIRED)
-
-# Include Qt headers.
-include_directories(${Qt5Base_INCLUDE_DIRS})
-include_directories(${Qt5Network_INCLUDE_DIRS})
-
-# Include utility library.
-include_directories(${CMAKE_SOURCE_DIR}/libutil/include)
-
-# Include utility library.
-include_directories(${CMAKE_SOURCE_DIR}/libsettings/include)
-
-SET(LIBINST_HEADERS
-include/libinstance_config.h
-
-include/instancetypeinterface.h
-
-include/instance.h
-include/instancelist.h
-include/instanceloader.h
-
-include/instversion.h
-include/instversionlist.h
-)
-
-SET(LIBINST_SOURCES
-src/instance.cpp
-src/instancelist.cpp
-src/instanceloader.cpp
-
-src/instversion.cpp
-src/instversionlist.cpp
-)
-
-# Set the include dir path.
-SET(LIBMMCINST_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
-
-add_definitions(-DLIBMMCINST_LIBRARY)
-
-add_library(libmmcinst SHARED ${LIBINST_SOURCES} ${LIBINST_HEADERS})
-qt5_use_modules(libmmcinst Core)
-target_link_libraries(libmmcinst libmmcutil libmmcsettings)
diff --git a/libmultimc/CMakeLists.txt b/libmultimc/CMakeLists.txt
new file mode 100644
index 00000000..06102d9f
--- /dev/null
+++ b/libmultimc/CMakeLists.txt
@@ -0,0 +1,96 @@
+project(libMultiMC)
+
+set(CMAKE_AUTOMOC ON)
+
+# Find Qt
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Network REQUIRED)
+
+# Include Qt headers.
+include_directories(${Qt5Base_INCLUDE_DIRS})
+include_directories(${Qt5Network_INCLUDE_DIRS})
+
+# Include utility library.
+include_directories(${CMAKE_SOURCE_DIR}/libutil/include)
+
+# Include settings library.
+include_directories(${CMAKE_SOURCE_DIR}/libsettings/include)
+
+SET(LIBINST_HEADERS
+include/libmmc_config.h
+
+
+# Instance Stuff
+include/instance.h
+include/instancelist.h
+include/instanceloader.h
+
+include/instversion.h
+include/instversionlist.h
+
+
+# Plugin Stuff
+include/pluginmanager.h
+include/instancetypeinterface.h
+
+
+# Tasks
+include/task.h
+include/logintask.h
+include/gameupdatetask.h
+
+
+# Login Data
+include/userinfo.h
+include/loginresponse.h
+
+
+# Misc Data
+include/version.h
+include/appsettings.h
+include/minecraftprocess.h
+)
+
+SET(LIBINST_SOURCES
+# Instance Stuff
+src/instance.cpp
+src/instancelist.cpp
+src/instanceloader.cpp
+
+src/instversion.cpp
+src/instversionlist.cpp
+
+
+# Plugin Stuff
+src/pluginmanager.cpp
+
+
+# Tasks
+src/task.cpp
+src/logintask.cpp
+src/gameupdatetask.cpp
+
+
+# Login Data
+src/userinfo.cpp
+src/loginresponse.cpp
+
+
+# Misc Data
+src/version.cpp
+src/appsettings.cpp
+src/minecraftprocess.cpp
+)
+
+# Set the include dir path.
+SET(LIBMULTIMC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
+
+# Include self.
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${CMAKE_BINARY_DIR}/include)
+
+add_definitions(-DLIBMULTIMC_LIBRARY)
+
+add_library(libMultiMC SHARED ${LIBINST_SOURCES} ${LIBINST_HEADERS})
+qt5_use_modules(libMultiMC Core Network)
+target_link_libraries(libMultiMC libUtil libSettings)
diff --git a/data/appsettings.h b/libmultimc/include/appsettings.h
index ba4ef242..66ffb7b5 100644
--- a/data/appsettings.h
+++ b/libmultimc/include/appsettings.h
@@ -20,7 +20,9 @@
 
 #include <basicsettingsobject.h>
 
-class AppSettings : public BasicSettingsObject
+#include "libmmc_config.h"
+
+class LIBMULTIMC_EXPORT AppSettings : public BasicSettingsObject
 {
 	Q_OBJECT
 public:
diff --git a/tasks/gameupdatetask.h b/libmultimc/include/gameupdatetask.h
index b768f6f9..eabfbd1f 100644
--- a/tasks/gameupdatetask.h
+++ b/libmultimc/include/gameupdatetask.h
@@ -18,13 +18,15 @@
 
 #include <QObject>
 
-#include <data/loginresponse.h>
+#include "loginresponse.h"
+
+#include "libmmc_config.h"
 
 /*!
  * \brief The game update task is the task that handles downloading instances.
  * Each instance type has its own class inheriting from this base game update task.
  */
-class GameUpdateTask : public QObject
+class LIBMULTIMC_EXPORT GameUpdateTask : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/libinstance/include/instance.h b/libmultimc/include/instance.h
index 9c89fbc3..7de61343 100644
--- a/libinstance/include/instance.h
+++ b/libmultimc/include/instance.h
@@ -23,7 +23,7 @@
 
 #include "inifile.h"
 
-#include "libinstance_config.h"
+#include "libmmc_config.h"
 
 class InstanceList;
 
@@ -35,7 +35,7 @@ class InstanceList;
  * To create a new instance type, create a new class inheriting from this class
  * and implement the pure virtual functions.
  */
-class LIBMMCINST_EXPORT Instance : public QObject
+class LIBMULTIMC_EXPORT Instance : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/libinstance/include/instancelist.h b/libmultimc/include/instancelist.h
index d5b8c196..d4e7556a 100644
--- a/libinstance/include/instancelist.h
+++ b/libmultimc/include/instancelist.h
@@ -22,11 +22,11 @@
 
 #include "siglist.h"
 
-#include "libinstance_config.h"
+#include "libmmc_config.h"
 
 class Instance;
 
-class LIBMMCINST_EXPORT InstanceList : public QObject, public SigList< QSharedPointer<Instance> >
+class LIBMULTIMC_EXPORT InstanceList : public QObject, public SigList< QSharedPointer<Instance> >
 {
 	Q_OBJECT
 public:
diff --git a/libinstance/include/instanceloader.h b/libmultimc/include/instanceloader.h
index 96be36fb..3326d7d0 100644
--- a/libinstance/include/instanceloader.h
+++ b/libmultimc/include/instanceloader.h
@@ -20,7 +20,7 @@
 #include <QMap>
 #include <QList>
 
-#include "libinstance_config.h"
+#include "libmmc_config.h"
 
 class InstanceTypeInterface;
 class Instance;
@@ -32,7 +32,7 @@ typedef QList<const InstanceTypeInterface *> InstTypeList;
  * Instance types are registered with the instance loader through its registerInstType() function. 
  * Creating instances is done through the InstanceLoader's createInstance() function. This function takes 
  */
-class LIBMMCINST_EXPORT InstanceLoader : public QObject
+class LIBMULTIMC_EXPORT InstanceLoader : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/libinstance/include/instancetypeinterface.h b/libmultimc/include/instancetypeinterface.h
index 30a12d99..30a12d99 100644
--- a/libinstance/include/instancetypeinterface.h
+++ b/libmultimc/include/instancetypeinterface.h
diff --git a/libinstance/include/instversion.h b/libmultimc/include/instversion.h
index c505c5a3..3c6b7ac9 100644
--- a/libinstance/include/instversion.h
+++ b/libmultimc/include/instversion.h
@@ -18,11 +18,11 @@
 
 #include <QObject>
 
-#include "libinstance_config.h"
+#include "libmmc_config.h"
 
 class InstVersionList;
 
-class LIBMMCINST_EXPORT InstVersion : public QObject
+class LIBMULTIMC_EXPORT InstVersion : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/libinstance/include/instversionlist.h b/libmultimc/include/instversionlist.h
index 2cd9ed1e..d64a286f 100644
--- a/libinstance/include/instversionlist.h
+++ b/libmultimc/include/instversionlist.h
@@ -18,7 +18,7 @@
 
 #include <QObject>
 
-#include "libinstance_config.h"
+#include "libmmc_config.h"
 
 class InstVersion;
 
@@ -26,7 +26,7 @@ class InstVersion;
 // the lists that keep track of the available game versions for that instance. 
 // This list will not be loaded on startup. It will be loaded when the list's 
 // load function is called.
-class LIBMMCINST_EXPORT InstVersionList : public QObject
+class LIBMULTIMC_EXPORT InstVersionList : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/libinstance/include/libinstance_config.h b/libmultimc/include/libmmc_config.h
index 2e6dc884..0ff2154a 100644
--- a/libinstance/include/libinstance_config.h
+++ b/libmultimc/include/libmmc_config.h
@@ -18,10 +18,10 @@
 
 #include <QtCore/QtGlobal>
 
-#ifdef LIBMMCINST_LIBRARY
-#  define LIBMMCINST_EXPORT Q_DECL_EXPORT
+#ifdef LIBMULTIMC_LIBRARY
+#  define LIBMULTIMC_EXPORT Q_DECL_EXPORT
 #else
-#  define LIBMMCINST_EXPORT Q_DECL_IMPORT
+#  define LIBMULTIMC_EXPORT Q_DECL_IMPORT
 #endif
 
 //#endif // LIBINSTANCE_CONFIG_H
diff --git a/data/loginresponse.h b/libmultimc/include/loginresponse.h
index c30897c3..0b06a972 100644
--- a/data/loginresponse.h
+++ b/libmultimc/include/loginresponse.h
@@ -18,10 +18,12 @@
 
 #include <QObject>
 
+#include "libmmc_config.h"
+
 /*!
  * \brief The LoginResponse class represents a response received from Minecraft's login servers.
  */
-class LoginResponse : public QObject
+class LIBMULTIMC_EXPORT LoginResponse : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/tasks/logintask.h b/libmultimc/include/logintask.h
index d96bfec7..c1efb223 100644
--- a/tasks/logintask.h
+++ b/libmultimc/include/logintask.h
@@ -18,13 +18,15 @@
 
 #include "task.h"
 
-#include "data/userinfo.h"
-#include "data/loginresponse.h"
+#include "userinfo.h"
+#include "loginresponse.h"
+
+#include "libmmc_config.h"
 
 //class QNetworkAccessManager;
 class QNetworkReply;
 
-class LoginTask : public Task
+class LIBMULTIMC_EXPORT LoginTask : public Task
 {
 	Q_OBJECT
 public:
diff --git a/data/minecraftprocess.h b/libmultimc/include/minecraftprocess.h
index bede9486..8986f7ad 100644
--- a/data/minecraftprocess.h
+++ b/libmultimc/include/minecraftprocess.h
@@ -19,15 +19,15 @@
 
 #include <QProcess>
 
-#include "gui/consolewindow.h"
-
 #include "instance.h"
 
+#include "libmmc_config.h"
+
 /**
  * @file data/minecraftprocess.h
  * @brief The MinecraftProcess class
  */
-class MinecraftProcess : public QProcess
+class LIBMULTIMC_EXPORT MinecraftProcess : public QProcess
 {
     Q_OBJECT
 public:
@@ -38,7 +38,7 @@ public:
      * @param session the minecraft session id
      * @param console the instance console window
      */
-    MinecraftProcess(InstancePtr inst, QString user, QString session, ConsoleWindow *console);
+    MinecraftProcess(InstancePtr inst, QString user, QString session);
 
     /**
      * @brief launch minecraft
@@ -78,7 +78,6 @@ signals:
     void ended();
 
 protected:
-    ConsoleWindow *m_console;
     InstancePtr m_instance;
     QString m_user;
     QString m_session;
diff --git a/data/plugin/pluginmanager.h b/libmultimc/include/pluginmanager.h
index b93fd6d2..1fc22a6c 100644
--- a/data/plugin/pluginmanager.h
+++ b/libmultimc/include/pluginmanager.h
@@ -20,10 +20,12 @@
 #include <QList>
 #include <QPluginLoader>
 
+#include "libmmc_config.h"
+
 /*!
  * \brief This class is a singleton that manages loading plugins.
  */
-class PluginManager : public QObject
+class LIBMULTIMC_EXPORT PluginManager : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/tasks/task.h b/libmultimc/include/task.h
index 0124d8cf..b1a3052d 100644
--- a/tasks/task.h
+++ b/libmultimc/include/task.h
@@ -20,7 +20,9 @@
 #include <QThread>
 #include <QString>
 
-class Task : public QThread
+#include "libmmc_config.h"
+
+class LIBMULTIMC_EXPORT Task : public QThread
 {
 	Q_OBJECT
 public:
diff --git a/data/userinfo.h b/libmultimc/include/userinfo.h
index 486ce2a6..280f98de 100644
--- a/data/userinfo.h
+++ b/libmultimc/include/userinfo.h
@@ -18,7 +18,9 @@
 
 #include <QObject>
 
-class UserInfo : public QObject
+#include "libmmc_config.h"
+
+class LIBMULTIMC_EXPORT UserInfo : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/data/version.h b/libmultimc/include/version.h
index d5d276db..3025260b 100644
--- a/data/version.h
+++ b/libmultimc/include/version.h
@@ -18,10 +18,12 @@
 
 #include <QObject>
 
+#include "libmmc_config.h"
+
 /*!
  * \brief The Version class represents a MultiMC version number.
  */
-class Version : public QObject
+class LIBMULTIMC_EXPORT Version : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/data/appsettings.cpp b/libmultimc/src/appsettings.cpp
index 6b724cd9..68d2c015 100644
--- a/data/appsettings.cpp
+++ b/libmultimc/src/appsettings.cpp
@@ -18,7 +18,7 @@
 #include <setting.h>
 
 #include <QPoint>
-#include <QColor>
+//#include <QColor>
 
 AppSettings::AppSettings(QObject *parent) :
 	BasicSettingsObject(parent)
@@ -41,9 +41,9 @@ AppSettings::AppSettings(QObject *parent) :
 	registerSetting(new Setting("InstanceToolbarPosition", QPoint()));
 	
 	// Console Colors
-	registerSetting(new Setting("SysMessageColor", QColor(Qt::blue)));
-	registerSetting(new Setting("StdOutColor", QColor(Qt::black)));
-	registerSetting(new Setting("StdErrColor", QColor(Qt::red)));
+//	registerSetting(new Setting("SysMessageColor", QColor(Qt::blue)));
+//	registerSetting(new Setting("StdOutColor", QColor(Qt::black)));
+//	registerSetting(new Setting("StdErrColor", QColor(Qt::red)));
 	
 	// Window Size
 	registerSetting(new Setting("LaunchCompatMode", false));
diff --git a/tasks/gameupdatetask.cpp b/libmultimc/src/gameupdatetask.cpp
index c152147e..c152147e 100644
--- a/tasks/gameupdatetask.cpp
+++ b/libmultimc/src/gameupdatetask.cpp
diff --git a/libinstance/src/instance.cpp b/libmultimc/src/instance.cpp
index 377acd32..377acd32 100644
--- a/libinstance/src/instance.cpp
+++ b/libmultimc/src/instance.cpp
diff --git a/libinstance/src/instancelist.cpp b/libmultimc/src/instancelist.cpp
index 3b0b668f..3b0b668f 100644
--- a/libinstance/src/instancelist.cpp
+++ b/libmultimc/src/instancelist.cpp
diff --git a/libinstance/src/instanceloader.cpp b/libmultimc/src/instanceloader.cpp
index 9d98230f..9d98230f 100644
--- a/libinstance/src/instanceloader.cpp
+++ b/libmultimc/src/instanceloader.cpp
diff --git a/libinstance/src/instversion.cpp b/libmultimc/src/instversion.cpp
index cedb61df..cedb61df 100644
--- a/libinstance/src/instversion.cpp
+++ b/libmultimc/src/instversion.cpp
diff --git a/libinstance/src/instversionlist.cpp b/libmultimc/src/instversionlist.cpp
index e171cfa5..e171cfa5 100644
--- a/libinstance/src/instversionlist.cpp
+++ b/libmultimc/src/instversionlist.cpp
diff --git a/data/loginresponse.cpp b/libmultimc/src/loginresponse.cpp
index 99a618ad..99a618ad 100644
--- a/data/loginresponse.cpp
+++ b/libmultimc/src/loginresponse.cpp
diff --git a/tasks/logintask.cpp b/libmultimc/src/logintask.cpp
index 71075630..71075630 100644
--- a/tasks/logintask.cpp
+++ b/libmultimc/src/logintask.cpp
diff --git a/data/minecraftprocess.cpp b/libmultimc/src/minecraftprocess.cpp
index 1eea8f82..943d76b1 100644
--- a/data/minecraftprocess.cpp
+++ b/libmultimc/src/minecraftprocess.cpp
@@ -20,7 +20,7 @@
 #include <QDataStream>
 #include <QFile>
 #include <QDir>
-#include <QImage>
+//#include <QImage>
 #include <QProcessEnvironment>
 
 #include "instance.h"
@@ -75,7 +75,7 @@ QStringList MinecraftProcess::splitArgs(QString args)
 // prepare tools
 inline void MinecraftProcess::extractIcon(InstancePtr inst, QString destination)
 {
-	QImage(":/icons/instances/" + inst->iconKey()).save(destination);
+//	QImage(":/icons/instances/" + inst->iconKey()).save(destination);
 }
 
 inline void MinecraftProcess::extractLauncher(QString destination)
@@ -90,8 +90,8 @@ void MinecraftProcess::prepare(InstancePtr inst)
 }
 
 // constructor
-MinecraftProcess::MinecraftProcess(InstancePtr inst, QString user, QString session, ConsoleWindow *console) :
-	m_instance(inst), m_user(user), m_session(session), m_console(console)
+MinecraftProcess::MinecraftProcess(InstancePtr inst, QString user, QString session) :
+	m_instance(inst), m_user(user), m_session(session)
 {
 	connect(this, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(finish(int, QProcess::ExitStatus)));
 	
@@ -125,21 +125,21 @@ MinecraftProcess::MinecraftProcess(InstancePtr inst, QString user, QString sessi
 // console window
 void MinecraftProcess::on_stdErr()
 {
-	if (m_console != nullptr)
-		m_console->write(readAllStandardError(), ConsoleWindow::ERROR);
+//	if (m_console != nullptr)
+//		m_console->write(readAllStandardError(), ConsoleWindow::ERROR);
 }
 
 void MinecraftProcess::on_stdOut()
 {
-	if (m_console != nullptr)
-		m_console->write(readAllStandardOutput(), ConsoleWindow::DEFAULT);
+//	if (m_console != nullptr)
+//		m_console->write(readAllStandardOutput(), ConsoleWindow::DEFAULT);
 }
 
 void MinecraftProcess::log(QString text)
 {
-	if (m_console != nullptr)
-		m_console->write(text);
-	else
+//	if (m_console != nullptr)
+//		m_console->write(text);
+//	else
 		qDebug(qPrintable(text));
 }
 
@@ -166,8 +166,8 @@ void MinecraftProcess::finish(int code, ExitStatus status)
 		}
 	}
 	
-	if (m_console != nullptr)
-		m_console->setMayClose(true);
+//	if (m_console != nullptr)
+//		m_console->setMayClose(true);
 	
 	emit ended();
 }
@@ -200,8 +200,8 @@ void MinecraftProcess::launch()
 		//TODO: error handling
 	}
 	
-	if(m_console != nullptr)
-		m_console->setMayClose(false);
+//	if(m_console != nullptr)
+//		m_console->setMayClose(false);
 }
 
 void MinecraftProcess::genArgs()
diff --git a/data/plugin/pluginmanager.cpp b/libmultimc/src/pluginmanager.cpp
index 2f066293..2f066293 100644
--- a/data/plugin/pluginmanager.cpp
+++ b/libmultimc/src/pluginmanager.cpp
diff --git a/tasks/task.cpp b/libmultimc/src/task.cpp
index d581a1dd..d581a1dd 100644
--- a/tasks/task.cpp
+++ b/libmultimc/src/task.cpp
diff --git a/data/userinfo.cpp b/libmultimc/src/userinfo.cpp
index 0bb5da11..0bb5da11 100644
--- a/data/userinfo.cpp
+++ b/libmultimc/src/userinfo.cpp
diff --git a/data/version.cpp b/libmultimc/src/version.cpp
index eec50e13..eec50e13 100644
--- a/data/version.cpp
+++ b/libmultimc/src/version.cpp
diff --git a/libsettings/CMakeLists.txt b/libsettings/CMakeLists.txt
index 4ec019a5..9ae48354 100644
--- a/libsettings/CMakeLists.txt
+++ b/libsettings/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(libmmcsettings)
+project(libSettings)
 
 # Find Qt
 find_package(Qt5Core REQUIRED)
@@ -7,12 +7,11 @@ find_package(Qt5Core REQUIRED)
 include_directories(${Qt5Base_INCLUDE_DIRS})
 include_directories(${Qt5Network_INCLUDE_DIRS})
 
-# Include utils library headers.
-include_directories(${CMAKE_SOURCE_DIR}/libutil/include)
-
 SET(LIBSETTINGS_HEADERS
 include/libsettings_config.h
 
+include/inifile.h
+
 include/settingsobject.h
 include/setting.h
 include/overridesetting.h
@@ -22,6 +21,8 @@ include/inisettingsobject.h
 )
 
 SET(LIBSETTINGS_SOURCES
+src/inifile.cpp
+
 src/settingsobject.cpp
 src/setting.cpp
 src/overridesetting.cpp
@@ -31,10 +32,11 @@ src/inisettingsobject.cpp
 )
 
 # Set the include dir path.
-SET(LIBMMCSETTINGS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
+SET(LIBSETTINGS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
+include_directories(${LIBSETTINGS_INCLUDE_DIR})
 
-add_definitions(-DLIBMMCSETTINGS_LIBRARY)
+add_definitions(-DLIBSETTINGS_LIBRARY)
 
-add_library(libmmcsettings SHARED ${LIBSETTINGS_SOURCES} ${LIBSETTINGS_HEADERS})
-qt5_use_modules(libmmcsettings Core)
-target_link_libraries(libmmcsettings libmmcutil)
+add_library(libSettings SHARED ${LIBSETTINGS_SOURCES} ${LIBSETTINGS_HEADERS})
+qt5_use_modules(libSettings Core)
+target_link_libraries(libSettings)
diff --git a/libsettings/include/basicsettingsobject.h b/libsettings/include/basicsettingsobject.h
index ec592b1e..b7e5851d 100644
--- a/libsettings/include/basicsettingsobject.h
+++ b/libsettings/include/basicsettingsobject.h
@@ -26,7 +26,7 @@
 /*!
  * \brief A settings object that stores its settings in a QSettings object.
  */
-class LIBMMCSETTINGS_EXPORT BasicSettingsObject : public SettingsObject
+class LIBSETTINGS_EXPORT BasicSettingsObject : public SettingsObject
 {
 	Q_OBJECT
 public:
diff --git a/libutil/include/inifile.h b/libsettings/include/inifile.h
index 1280c7e3..94467832 100644
--- a/libutil/include/inifile.h
+++ b/libsettings/include/inifile.h
@@ -20,10 +20,10 @@
 #include <QString>
 #include <QVariant>
 
-#include "libutil_config.h"
+#include "libsettings_config.h"
 
 // Sectionless INI parser (for instance config files)
-class LIBMMCUTIL_EXPORT INIFile : public QMap<QString, QVariant>
+class LIBSETTINGS_EXPORT INIFile : public QMap<QString, QVariant>
 {
 public:
 	explicit INIFile();
diff --git a/libsettings/include/inisettingsobject.h b/libsettings/include/inisettingsobject.h
index 6eead951..36c8e4bd 100644
--- a/libsettings/include/inisettingsobject.h
+++ b/libsettings/include/inisettingsobject.h
@@ -18,7 +18,7 @@
 
 #include <QObject>
 
-#include <inifile.h>
+#include "inifile.h"
 
 #include "settingsobject.h"
 
@@ -27,7 +27,7 @@
 /*!
  * \brief A settings object that stores its settings in an INIFile.
  */
-class LIBMMCSETTINGS_EXPORT INISettingsObject : public SettingsObject
+class LIBSETTINGS_EXPORT INISettingsObject : public SettingsObject
 {
 	Q_OBJECT
 public:
diff --git a/libsettings/include/libsettings_config.h b/libsettings/include/libsettings_config.h
index 05df5bfa..dc8e6228 100644
--- a/libsettings/include/libsettings_config.h
+++ b/libsettings/include/libsettings_config.h
@@ -18,10 +18,10 @@
 
 #include <QtCore/QtGlobal>
 
-#ifdef LIBMMCSETTINGS_LIBRARY
-#  define LIBMMCSETTINGS_EXPORT Q_DECL_EXPORT
+#ifdef LIBSETTINGS_LIBRARY
+#  define LIBSETTINGS_EXPORT Q_DECL_EXPORT
 #else
-#  define LIBMMCSETTINGS_EXPORT Q_DECL_IMPORT
+#  define LIBSETTINGS_EXPORT Q_DECL_IMPORT
 #endif
 
 #endif // LIBINSTANCE_CONFIG_H
diff --git a/libsettings/include/overridesetting.h b/libsettings/include/overridesetting.h
index e7bf2c32..58bb6d40 100644
--- a/libsettings/include/overridesetting.h
+++ b/libsettings/include/overridesetting.h
@@ -28,7 +28,7 @@
  * The other setting can be (and usually is) a part of a different SettingsObject 
  * than this one.
  */
-class LIBMMCSETTINGS_EXPORT OverrideSetting : public Setting
+class LIBSETTINGS_EXPORT OverrideSetting : public Setting
 {
 	Q_OBJECT
 public:
diff --git a/libsettings/include/setting.h b/libsettings/include/setting.h
index 49185347..36709729 100644
--- a/libsettings/include/setting.h
+++ b/libsettings/include/setting.h
@@ -26,7 +26,7 @@ class SettingsObject;
 /*!
  * 
  */
-class LIBMMCSETTINGS_EXPORT Setting : public QObject
+class LIBSETTINGS_EXPORT Setting : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/libsettings/include/settingsobject.h b/libsettings/include/settingsobject.h
index f35d01b1..23f0d644 100644
--- a/libsettings/include/settingsobject.h
+++ b/libsettings/include/settingsobject.h
@@ -34,7 +34,7 @@ class Setting;
  *
  * \sa Setting
  */
-class LIBMMCSETTINGS_EXPORT SettingsObject : public QObject
+class LIBSETTINGS_EXPORT SettingsObject : public QObject
 {
 	Q_OBJECT
 public:
@@ -165,6 +165,6 @@ private:
 /*!
  * \brief A global settings object.
  */
-LIBMMCSETTINGS_EXPORT extern SettingsObject *globalSettings;
+LIBSETTINGS_EXPORT extern SettingsObject *globalSettings;
 
 #endif // SETTINGSOBJECT_H
diff --git a/libutil/src/inifile.cpp b/libsettings/src/inifile.cpp
index 43545a4a..43545a4a 100644
--- a/libutil/src/inifile.cpp
+++ b/libsettings/src/inifile.cpp
diff --git a/libutil/CMakeLists.txt b/libutil/CMakeLists.txt
index b934d4c0..5b2c3837 100644
--- a/libutil/CMakeLists.txt
+++ b/libutil/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(libmmcutil)
+project(libUtil)
 
 ######## Set compiler flags ########
 IF(APPLE)
@@ -32,8 +32,6 @@ include/osutils.h
 include/userutils.h
 include/cmdutils.h
 
-include/inifile.h
-
 include/siglist.h
 include/siglist_impl.h
 )
@@ -43,15 +41,13 @@ src/pathutils.cpp
 src/osutils.cpp
 src/userutils.cpp
 src/cmdutils.cpp
-
-src/inifile.cpp
 )
 
 # Set the include dir path.
-SET(LIBMMCUTIL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
+SET(LIBUTIL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
 
-add_definitions(-DLIBMMCUTIL_LIBRARY)
+add_definitions(-DLIBUTIL_LIBRARY)
 
-add_library(libmmcutil SHARED ${LIBUTIL_SOURCES} ${LIBUTIL_HEADERS})
-qt5_use_modules(libmmcutil Core)
-target_link_libraries(libmmcutil)
+add_library(libUtil SHARED ${LIBUTIL_SOURCES} ${LIBUTIL_HEADERS})
+qt5_use_modules(libUtil Core)
+target_link_libraries(libUtil)
diff --git a/libutil/include/cmdutils.h b/libutil/include/cmdutils.h
index 984826d6..32261dd7 100644
--- a/libutil/include/cmdutils.h
+++ b/libutil/include/cmdutils.h
@@ -42,7 +42,7 @@ namespace Commandline {
 
 namespace FlagStyle
 {
-enum LIBMMCUTIL_EXPORT Enum
+enum LIBUTIL_EXPORT Enum
 {
 	GNU,     /**< --option and -o (GNU Style) */
 	Unix,    /**< -option and -o  (Unix Style) */
@@ -60,7 +60,7 @@ enum LIBMMCUTIL_EXPORT Enum
  */
 namespace ArgumentStyle 
 {
-enum LIBMMCUTIL_EXPORT Enum
+enum LIBUTIL_EXPORT Enum
 {
 	Space,          /**< --option=value */
 	Equals,         /**< --option value */
@@ -75,7 +75,7 @@ enum LIBMMCUTIL_EXPORT Enum
 
 namespace OptionType
 {
-enum LIBMMCUTIL_EXPORT Enum
+enum LIBUTIL_EXPORT Enum
 {
 	Switch,
 	Option
@@ -85,7 +85,7 @@ enum LIBMMCUTIL_EXPORT Enum
 /**
  * @brief The ParsingError class
  */
-class LIBMMCUTIL_EXPORT ParsingError : public std::exception
+class LIBUTIL_EXPORT ParsingError : public std::exception
 {
 public:
 	ParsingError(const QString &what);
@@ -100,7 +100,7 @@ private:
 /**
  * @brief The Parser class
  */
-class LIBMMCUTIL_EXPORT Parser
+class LIBUTIL_EXPORT Parser
 {
 public:
 	/**
diff --git a/libutil/include/libutil_config.h b/libutil/include/libutil_config.h
index 41766184..4bf111e6 100644
--- a/libutil/include/libutil_config.h
+++ b/libutil/include/libutil_config.h
@@ -18,10 +18,10 @@
 
 #include <QtCore/QtGlobal>
 
-#ifdef LIBMMCUTIL_LIBRARY
-#  define LIBMMCUTIL_EXPORT Q_DECL_EXPORT
+#ifdef LIBUTIL_LIBRARY
+#  define LIBUTIL_EXPORT Q_DECL_EXPORT
 #else
-#  define LIBMMCUTIL_EXPORT Q_DECL_IMPORT
+#  define LIBUTIL_EXPORT Q_DECL_IMPORT
 #endif
 
 #endif // LIBUTIL_CONFIG_H
diff --git a/libutil/include/pathutils.h b/libutil/include/pathutils.h
index d5f106ef..be6c8917 100644
--- a/libutil/include/pathutils.h
+++ b/libutil/include/pathutils.h
@@ -20,9 +20,9 @@
 
 #include "libutil_config.h"
 
-LIBMMCUTIL_EXPORT QString PathCombine(QString path1, QString path2);
-LIBMMCUTIL_EXPORT QString PathCombine(QString path1, QString path2, QString path3);
+LIBUTIL_EXPORT QString PathCombine(QString path1, QString path2);
+LIBUTIL_EXPORT QString PathCombine(QString path1, QString path2, QString path3);
 
-LIBMMCUTIL_EXPORT QString AbsolutePath(QString path);
+LIBUTIL_EXPORT QString AbsolutePath(QString path);
 
 #endif // PATHUTILS_H
diff --git a/libutil/include/userutils.h b/libutil/include/userutils.h
index 06a8ca16..4f2760b1 100644
--- a/libutil/include/userutils.h
+++ b/libutil/include/userutils.h
@@ -8,12 +8,12 @@
 namespace Util
 {
 // Get the Directory representing the User's Desktop
-LIBMMCUTIL_EXPORT QString getDesktopDir();
+LIBUTIL_EXPORT QString getDesktopDir();
 
 // Create a shortcut at *location*, pointing to *dest* called with the arguments *args*
 // call it *name* and assign it the icon *icon*
 // return true if operation succeeded
-LIBMMCUTIL_EXPORT bool createShortCut(QString location, QString dest, QStringList args, QString name, QString iconLocation);
+LIBUTIL_EXPORT bool createShortCut(QString location, QString dest, QStringList args, QString name, QString iconLocation);
 }
 
 #endif // USERUTILS_H
diff --git a/main.cpp b/main.cpp
index 2969ca6f..465ee3c7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -26,13 +26,13 @@
 #include "gui/taskdialog.h"
 #include "gui/consolewindow.h"
 
-#include "data/appsettings.h"
+#include "appsettings.h"
 #include "instancelist.h"
-#include "data/loginresponse.h"
-#include "tasks/logintask.h"
-#include "data/minecraftprocess.h"
+#include "loginresponse.h"
+#include "logintask.h"
+#include "minecraftprocess.h"
 
-#include "data/plugin/pluginmanager.h"
+#include "pluginmanager.h"
 
 #include "pathutils.h"
 #include "cmdutils.h"
@@ -85,7 +85,7 @@ private slots:
 	{
 		// TODO: console
 		console = new ConsoleWindow();
-		proc = new MinecraftProcess(instance, response.username(), response.sessionID(), console);
+		proc = new MinecraftProcess(instance, response.username(), response.sessionID());
 		//if (instance->getShowConsole())
 		console->show();
 		connect(proc, SIGNAL(ended()), SLOT(onTerminated()));
diff --git a/plugins/stdinstance/CMakeLists.txt b/plugins/stdinstance/CMakeLists.txt
index b25b93b2..7b1ff192 100644
--- a/plugins/stdinstance/CMakeLists.txt
+++ b/plugins/stdinstance/CMakeLists.txt
@@ -47,7 +47,7 @@ quazip
 patchlib
 
 # Link the util, settings, and instance libraries.
-libmmcutil
-libmmcsettings
-libmmcinst
+libUtil
+libSettings
+libMultiMC
 )