Massive re-organization.

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.

gui/mainwindow.h

@@ -19,7 +19,7 @@
 #include <QMainWindow>
 
 #include "instancelist.h"
-#include "data/loginresponse.h"
+#include "loginresponse.h"
 
 namespace Ui
 {

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>

gui/taskdialog.cpp

@@ -18,7 +18,7 @@
 
 #include <QKeyEvent>
 
-#include "tasks/task.h"
+#include "task.h"
 
 TaskDialog::TaskDialog(QWidget *parent) :
 	QDialog(parent),