Merge branch 'reorganisation' of github.com:FacialTurd/The-Powder-Toy

175 files changed, 288 insertions, 294 deletions

diff --git a/src/Activity.h b/src/Activity.h
index 0263467..b91444d 100644
--- a/src/Activity.h
+++ b/src/Activity.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 
 class Activity
 {
diff --git a/src/PowderToyRenderer.cpp b/src/PowderToyRenderer.cpp
index b5b7fa1..929a205 100644
--- a/src/PowderToyRenderer.cpp
+++ b/src/PowderToyRenderer.cpp
@@ -9,7 +9,7 @@
 
 #include "Config.h"
 #include "Format.h"
-#include "interface/Engine.h"
+#include "gui/interface/Engine.h"
 #include "graphics/Graphics.h"
 #include "graphics/Renderer.h"
 
diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp
index 48a77b2..c57b3b9 100644
--- a/src/PowderToySDL.cpp
+++ b/src/PowderToySDL.cpp
@@ -25,13 +25,6 @@
 #endif
 
 #include "Format.h"
-#include "Style.h"
-#include "interface/Engine.h"
-#include "interface/Button.h"
-#include "interface/Panel.h"
-#include "interface/Point.h"
-#include "interface/Label.h"
-#include "interface/Keys.h"
 
 #include "client/GameSave.h"
 #include "client/SaveFile.h"
@@ -39,10 +32,12 @@
 #include "client/Client.h"
 #include "Misc.h"
 
-#include "game/GameController.h"
-#include "game/GameView.h"
+#include "gui/game/GameController.h"
+#include "gui/game/GameView.h"
 
-#include "dialogues/ErrorMessage.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/interface/Keys.h"
+#include "gui/Style.h"
 
 #include "client/HTTP.h"
 
diff --git a/src/cat/CommandInterface.cpp b/src/cat/CommandInterface.cpp
index 992ce74..6b22488 100644
--- a/src/cat/CommandInterface.cpp
+++ b/src/cat/CommandInterface.cpp
@@ -5,8 +5,8 @@
 #include <strings.h>
 #endif
 #include "CommandInterface.h"
-#include "game/GameModel.h"
-#include "game/GameController.h"
+#include "gui/game/GameModel.h"
+#include "gui/game/GameController.h"
 
 CommandInterface::CommandInterface(GameController * c, GameModel * m) {
 	this->m = m;
diff --git a/src/cat/CommandInterface.h b/src/cat/CommandInterface.h
index 192e1f9..2e1a1df 100644
--- a/src/cat/CommandInterface.h
+++ b/src/cat/CommandInterface.h
@@ -2,7 +2,7 @@
 #define COMMANDINTERFACE_H_
 
 #include <string>
-#include "interface/Engine.h"
+#include "gui/interface/Engine.h"
 //#include "game/GameModel.h"
 
 class GameModel;
diff --git a/src/cat/LegacyLuaAPI.cpp b/src/cat/LegacyLuaAPI.cpp
index 5df660c..df019fa 100644
--- a/src/cat/LegacyLuaAPI.cpp
+++ b/src/cat/LegacyLuaAPI.cpp
@@ -9,12 +9,12 @@
 #include "LuaScriptInterface.h"
 #include "LuaScriptHelper.h"
 
-#include "dialogues/ErrorMessage.h"
-#include "dialogues/InformationMessage.h"
-#include "dialogues/TextPrompt.h"
-#include "dialogues/ConfirmPrompt.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/dialogues/InformationMessage.h"
+#include "gui/dialogues/TextPrompt.h"
+#include "gui/dialogues/ConfirmPrompt.h"
+#include "gui/game/GameModel.h"
 #include "simulation/Simulation.h"
-#include "game/GameModel.h"
 
 #include <time.h>
 
diff --git a/src/cat/LuaButton.cpp b/src/cat/LuaButton.cpp
index 01ca875..013adac 100644
--- a/src/cat/LuaButton.cpp
+++ b/src/cat/LuaButton.cpp
@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaButton.h"
 #include "LuaScriptInterface.h"
-#include "interface/Button.h"
+#include "gui/interface/Button.h"
 
 const char LuaButton::className[] = "Button";
 
diff --git a/src/cat/LuaCheckbox.cpp b/src/cat/LuaCheckbox.cpp
index 8256730..bac5c4e 100644
--- a/src/cat/LuaCheckbox.cpp
+++ b/src/cat/LuaCheckbox.cpp
@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaCheckbox.h"
 #include "LuaScriptInterface.h"
-#include "interface/Checkbox.h"
+#include "gui/interface/Checkbox.h"
 
 const char LuaCheckbox::className[] = "Checkbox";
 
diff --git a/src/cat/LuaComponent.cpp b/src/cat/LuaComponent.cpp
index 8c2d3a4..75e7a21 100644
--- a/src/cat/LuaComponent.cpp
+++ b/src/cat/LuaComponent.cpp
@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaComponent.h"
 #include "LuaScriptInterface.h"
-#include "interface/Component.h"
+#include "gui/interface/Component.h"
 
 
 LuaComponent::LuaComponent(lua_State * l)
diff --git a/src/cat/LuaLabel.cpp b/src/cat/LuaLabel.cpp
index 007e009..b08e687 100644
--- a/src/cat/LuaLabel.cpp
+++ b/src/cat/LuaLabel.cpp
@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaScriptInterface.h"
 #include "LuaLabel.h"
-#include "interface/Label.h"
+#include "gui/interface/Label.h"
 
 const char LuaLabel::className[] = "Label";
 
diff --git a/src/cat/LuaProgressBar.cpp b/src/cat/LuaProgressBar.cpp
index 71b8f7b..08c88ca 100644
--- a/src/cat/LuaProgressBar.cpp
+++ b/src/cat/LuaProgressBar.cpp
@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaProgressBar.h"
 #include "LuaScriptInterface.h"
-#include "interface/ProgressBar.h"
+#include "gui/interface/ProgressBar.h"
 
 const char LuaProgressBar::className[] = "ProgressBar";
 
diff --git a/src/cat/LuaScriptInterface.cpp b/src/cat/LuaScriptInterface.cpp
index 6f8b30d..7719add 100644
--- a/src/cat/LuaScriptInterface.cpp
+++ b/src/cat/LuaScriptInterface.cpp
@@ -9,13 +9,13 @@
 #include "LuaLuna.h"
 #include "LuaScriptInterface.h"
 #include "TPTScriptInterface.h"
-#include "dialogues/ErrorMessage.h"
-#include "dialogues/InformationMessage.h"
-#include "dialogues/TextPrompt.h"
-#include "dialogues/ConfirmPrompt.h" 
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/dialogues/InformationMessage.h"
+#include "gui/dialogues/TextPrompt.h"
+#include "gui/dialogues/ConfirmPrompt.h" 
 #include "simulation/Simulation.h"
-#include "game/GameModel.h"
-#include "game/Tool.h"
+#include "gui/game/GameModel.h"
+#include "gui/game/Tool.h"
 #include "LuaScriptHelper.h"
 #include "client/HTTP.h"
 #include "PowderToy.h"
diff --git a/src/cat/LuaSlider.cpp b/src/cat/LuaSlider.cpp
index 0fedbfb..ce07ebb 100644
--- a/src/cat/LuaSlider.cpp
+++ b/src/cat/LuaSlider.cpp
@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaSlider.h"
 #include "LuaScriptInterface.h"
-#include "interface/Slider.h"
+#include "gui/interface/Slider.h"
 
 const char LuaSlider::className[] = "Slider";
 
diff --git a/src/cat/LuaTextbox.cpp b/src/cat/LuaTextbox.cpp
index 46285c8..5721525 100644
--- a/src/cat/LuaTextbox.cpp
+++ b/src/cat/LuaTextbox.cpp
@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaScriptInterface.h"
 #include "LuaTextbox.h"
-#include "interface/Textbox.h"
+#include "gui/interface/Textbox.h"
 
 const char LuaTextbox::className[] = "Textbox";
 
diff --git a/src/cat/LuaWindow.cpp b/src/cat/LuaWindow.cpp
index 502c7f1..d765d68 100644
--- a/src/cat/LuaWindow.cpp
+++ b/src/cat/LuaWindow.cpp
@@ -14,9 +14,9 @@ extern "C"
 #include "LuaCheckbox.h"
 #include "LuaSlider.h"
 #include "LuaProgressBar.h"
-#include "interface/Button.h"
-#include "interface/Label.h"
-#include "interface/Window.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Window.h"
 
 const char LuaWindow::className[] = "Window";
 
diff --git a/src/cat/LuaWindow.h b/src/cat/LuaWindow.h
index d9d25e1..f48c5f9 100644
--- a/src/cat/LuaWindow.h
+++ b/src/cat/LuaWindow.h
@@ -8,7 +8,7 @@ extern "C" {
 
 #include "LuaLuna.h"
 
-#include "interface/Platform.h"
+#include "gui/interface/Platform.h"
 namespace ui
 {
 	class Window;
diff --git a/src/cat/TPTSTypes.h b/src/cat/TPTSTypes.h
index 6a2cec4..b9fa92b 100644
--- a/src/cat/TPTSTypes.h
+++ b/src/cat/TPTSTypes.h
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <typeinfo>
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 
 enum ValueType { TypeNumber, TypePoint, TypeString, TypeNull, TypeFunction };
 
diff --git a/src/cat/TPTScriptInterface.cpp b/src/cat/TPTScriptInterface.cpp
index 84f55ef..601c228 100644
--- a/src/cat/TPTScriptInterface.cpp
+++ b/src/cat/TPTScriptInterface.cpp
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "TPTScriptInterface.h"
-#include "game/GameModel.h"
+#include "gui/game/GameModel.h"
 #include "simulation/Air.h"
 
 TPTScriptInterface::TPTScriptInterface(GameController * c, GameModel * m): CommandInterface(c, m)
diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index 22490a1..1a2f296 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -36,13 +36,13 @@
 #include "HTTP.h"
 
 #include "simulation/SaveRenderer.h"
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 #include "client/SaveInfo.h"
 #include "client/SaveFile.h"
 #include "client/GameSave.h"
 #include "client/UserInfo.h"
-#include "search/Thumbnail.h"
-#include "preview/Comment.h"
+#include "gui/search/Thumbnail.h"
+#include "gui/preview/Comment.h"
 #include "ClientListener.h"
 #include "requestbroker/RequestBroker.h"
 #include "requestbroker/APIRequest.h"
diff --git a/src/client/SaveFile.cpp b/src/client/SaveFile.cpp
index 5ca16aa..9d08c30 100644
--- a/src/client/SaveFile.cpp
+++ b/src/client/SaveFile.cpp
@@ -1,7 +1,7 @@
 #include "SaveFile.h"
 #include "GameSave.h"
 #include "Client.h"
-#include "search/Thumbnail.h"
+#include "gui/search/Thumbnail.h"
 
 SaveFile::SaveFile(SaveFile & save):
 	gameSave(NULL),
diff --git a/src/client/requestbroker/ThumbRenderRequest.cpp b/src/client/requestbroker/ThumbRenderRequest.cpp
index cf56814..3601401 100644
--- a/src/client/requestbroker/ThumbRenderRequest.cpp
+++ b/src/client/requestbroker/ThumbRenderRequest.cpp
@@ -3,7 +3,6 @@
 #include "ThumbRenderRequest.h"
 #include "client/GameSave.h"
 #include "graphics/Graphics.h"
-#include "search/Thumbnail.h"
 #include "simulation/SaveRenderer.h"
 
 ThumbRenderRequest::ThumbRenderRequest(GameSave * save, bool decorations, bool fire, int width, int height, ListenerHandle listener):
diff --git a/src/debug/DebugInfo.h b/src/debug/DebugInfo.h
index 3ddd4b3..49e46a4 100644
--- a/src/debug/DebugInfo.h
+++ b/src/debug/DebugInfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 
 class DebugInfo
 {
diff --git a/src/debug/ElementPopulation.cpp b/src/debug/ElementPopulation.cpp
index 225cf02..4caaf11 100644
--- a/src/debug/ElementPopulation.cpp
+++ b/src/debug/ElementPopulation.cpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ElementPopulation.h"
-#include "interface/Engine.h"
+#include "gui/interface/Engine.h"
 #include "simulation/Simulation.h"
 #include "Format.h"
 
diff --git a/src/graphics/Renderer.h b/src/graphics/Renderer.h
index c5fe015..6328c19 100644
--- a/src/graphics/Renderer.h
+++ b/src/graphics/Renderer.h
@@ -9,8 +9,8 @@
 #include "Config.h"
 #include "client/Client.h"
 #include "Graphics.h"
-#include "interface/Point.h"
-#include "game/RenderPreset.h"
+#include "gui/interface/Point.h"
+#include "gui/game/RenderPreset.h"
 
 class Simulation;
 
diff --git a/src/Style.cpp b/src/gui/Style.cpp
index 1972ce8..29e1d40 100644
--- a/src/Style.cpp
+++ b/src/gui/Style.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 
-#include "Style.h"
-#include "interface/Colour.h"
+#include "gui/Style.h"
+#include "gui/interface/Colour.h"
 
 namespace style {
 	ui::Colour Colour::InformationTitle = ui::Colour(140, 140, 255);
diff --git a/src/Style.h b/src/gui/Style.h
index 7ac0a01..7ac0a01 100644
--- a/src/Style.h
+++ b/src/gui/Style.h
diff --git a/src/colourpicker/ColourPickerActivity.cpp b/src/gui/colourpicker/ColourPickerActivity.cpp
index 04aa644..a7ac239 100644
--- a/src/colourpicker/ColourPickerActivity.cpp
+++ b/src/gui/colourpicker/ColourPickerActivity.cpp
@@ -1,13 +1,13 @@
 #include <algorithm>
 #include <iomanip>
 #include "ColourPickerActivity.h"
-#include "interface/Textbox.h"
-#include "interface/Label.h"
-#include "interface/Keys.h"
-#include "game/Tool.h"
-#include "Style.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Keys.h"
+#include "gui/game/Tool.h"
+#include "gui/Style.h"
 #include "Format.h"
-#include "game/GameModel.h"
+#include "gui/game/GameModel.h"
 
 ColourPickerActivity::ColourPickerActivity(ui::Colour initialColour, ColourPickedCallback * callback) :
 	WindowActivity(ui::Point(-1, -1), ui::Point(266, 175)),
diff --git a/src/colourpicker/ColourPickerActivity.h b/src/gui/colourpicker/ColourPickerActivity.h
index 5cc3f04..f1e62b7 100644
--- a/src/colourpicker/ColourPickerActivity.h
+++ b/src/gui/colourpicker/ColourPickerActivity.h
@@ -3,8 +3,8 @@
 #include <vector>
 #include <string>
 #include "Activity.h"
-#include "interface/Window.h"
-#include "interface/Textbox.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Textbox.h"
 
 class ColourPickedCallback
 {
diff --git a/src/console/ConsoleCommand.h b/src/gui/console/ConsoleCommand.h
index 31e41b0..31e41b0 100644
--- a/src/console/ConsoleCommand.h
+++ b/src/gui/console/ConsoleCommand.h
diff --git a/src/console/ConsoleController.cpp b/src/gui/console/ConsoleController.cpp
index 602636f..602636f 100644
--- a/src/console/ConsoleController.cpp
+++ b/src/gui/console/ConsoleController.cpp
diff --git a/src/console/ConsoleController.h b/src/gui/console/ConsoleController.h
index cf8b36e..cf8b36e 100644
--- a/src/console/ConsoleController.h
+++ b/src/gui/console/ConsoleController.h
diff --git a/src/console/ConsoleModel.cpp b/src/gui/console/ConsoleModel.cpp
index ceb6b32..ceb6b32 100644
--- a/src/console/ConsoleModel.cpp
+++ b/src/gui/console/ConsoleModel.cpp
diff --git a/src/console/ConsoleModel.h b/src/gui/console/ConsoleModel.h
index 312739a..312739a 100644
--- a/src/console/ConsoleModel.h
+++ b/src/gui/console/ConsoleModel.h
diff --git a/src/console/ConsoleView.cpp b/src/gui/console/ConsoleView.cpp
index 9a51366..cf398ae 100644
--- a/src/console/ConsoleView.cpp
+++ b/src/gui/console/ConsoleView.cpp
@@ -1,5 +1,5 @@
 #include "ConsoleView.h"
-#include "interface/Keys.h"
+#include "gui/interface/Keys.h"
 
 ConsoleView::ConsoleView():
 	ui::Window(ui::Point(0, 0), ui::Point(XRES+BARSIZE, 150)),
diff --git a/src/console/ConsoleView.h b/src/gui/console/ConsoleView.h
index de1c48e..22f172c 100644
--- a/src/console/ConsoleView.h
+++ b/src/gui/console/ConsoleView.h
@@ -3,11 +3,11 @@
 
 #include <vector>
 #include <queue>
-#include "interface/Label.h"
-#include "interface/Window.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Window.h"
 #include "ConsoleController.h"
 #include "ConsoleModel.h"
-#include "interface/Textbox.h"
+#include "gui/interface/Textbox.h"
 #include "ConsoleCommand.h"
 
 
diff --git a/src/dialogues/ConfirmPrompt.cpp b/src/gui/dialogues/ConfirmPrompt.cpp
index 0a89efa..ba4060f 100644
--- a/src/dialogues/ConfirmPrompt.cpp
+++ b/src/gui/dialogues/ConfirmPrompt.cpp
@@ -1,7 +1,7 @@
 #include "ConfirmPrompt.h"
-#include "Style.h"
-#include "interface/Label.h"
-#include "interface/Button.h"
+#include "gui/Style.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Button.h"
 #include "PowderToy.h"
 
 ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, ConfirmDialogueCallback * callback_):
diff --git a/src/dialogues/ConfirmPrompt.h b/src/gui/dialogues/ConfirmPrompt.h
index 9e38a48..a2a3170 100644
--- a/src/dialogues/ConfirmPrompt.h
+++ b/src/gui/dialogues/ConfirmPrompt.h
@@ -1,7 +1,7 @@
 #ifndef CONFIRMPROMPT_H_
 #define CONFIRMPROMPT_H_
 
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 
 class ConfirmDialogueCallback;
 class ConfirmPrompt: public ui::Window {
diff --git a/src/dialogues/ErrorMessage.cpp b/src/gui/dialogues/ErrorMessage.cpp
index 876bc10..b793aee 100644
--- a/src/dialogues/ErrorMessage.cpp
+++ b/src/gui/dialogues/ErrorMessage.cpp
@@ -1,7 +1,7 @@
-#include "Style.h"
+#include "gui/Style.h"
 #include "ErrorMessage.h"
-#include "interface/Button.h"
-#include "interface/Label.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
 #include "PowderToy.h"
 
 ErrorMessage::ErrorMessage(std::string title, std::string message,  ErrorMessageCallback * callback_):
diff --git a/src/dialogues/ErrorMessage.h b/src/gui/dialogues/ErrorMessage.h
index 34cdb0c..a7281b2 100644
--- a/src/dialogues/ErrorMessage.h
+++ b/src/gui/dialogues/ErrorMessage.h
@@ -1,7 +1,7 @@
 #ifndef ERRORMESSAGE_H_
 #define ERRORMESSAGE_H_
 
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 
 class ErrorMessageCallback;
 class ErrorMessage: public ui::Window {
diff --git a/src/dialogues/InformationMessage.cpp b/src/gui/dialogues/InformationMessage.cpp
index 7d11a26..23b92dc 100644
--- a/src/dialogues/InformationMessage.cpp
+++ b/src/gui/dialogues/InformationMessage.cpp
@@ -1,8 +1,8 @@
-#include "Style.h"
+#include "gui/Style.h"
 #include "InformationMessage.h"
-#include "interface/Button.h"
-#include "interface/Label.h"
-#include "interface/ScrollPanel.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/ScrollPanel.h"
 
 InformationMessage::InformationMessage(std::string title, std::string message, bool large):
 	ui::Window(ui::Point(-1, -1), ui::Point(200, 75))
diff --git a/src/dialogues/InformationMessage.h b/src/gui/dialogues/InformationMessage.h
index 1df4794..6a26b38 100644
--- a/src/dialogues/InformationMessage.h
+++ b/src/gui/dialogues/InformationMessage.h
@@ -1,7 +1,7 @@
 #ifndef INFORMATIONMESSAGE_H_
 #define INFORMATIONMESSAGE_H_
 
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 
 class InformationMessage: public ui::Window {
 public:
diff --git a/src/dialogues/LegacyDialogues.h b/src/gui/dialogues/LegacyDialogues.h
index 7f6097d..7f6097d 100644
--- a/src/dialogues/LegacyDialogues.h
+++ b/src/gui/dialogues/LegacyDialogues.h
diff --git a/src/dialogues/TextPrompt.cpp b/src/gui/dialogues/TextPrompt.cpp
index cd06a8c..92539ca 100644
--- a/src/dialogues/TextPrompt.cpp
+++ b/src/gui/dialogues/TextPrompt.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
 #include "TextPrompt.h"
-#include "interface/Label.h"
-#include "interface/Button.h"
-#include "Style.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Button.h"
+#include "gui/Style.h"
 #include "PowderToy.h"
 
 class CloseAction: public ui::ButtonAction
diff --git a/src/dialogues/TextPrompt.h b/src/gui/dialogues/TextPrompt.h
index 5478cb5..e88c977 100644
--- a/src/dialogues/TextPrompt.h
+++ b/src/gui/dialogues/TextPrompt.h
@@ -1,8 +1,8 @@
 #ifndef TEXTPROMPT_H_
 #define TEXTPROMPT_H_
 
-#include "interface/Window.h"
-#include "interface/Textbox.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Textbox.h"
 
 class TextDialogueCallback;
 class TextPrompt: public ui::Window {
diff --git a/src/elementsearch/ElementSearchActivity.cpp b/src/gui/elementsearch/ElementSearchActivity.cpp
index 7156cb1..624f0ff 100644
--- a/src/elementsearch/ElementSearchActivity.cpp
+++ b/src/gui/elementsearch/ElementSearchActivity.cpp
@@ -1,11 +1,11 @@
 #include <algorithm>
 #include "ElementSearchActivity.h"
-#include "interface/Textbox.h"
-#include "interface/Label.h"
-#include "interface/Keys.h"
-#include "game/Tool.h"
-#include "Style.h"
-#include "game/GameModel.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Keys.h"
+#include "gui/game/Tool.h"
+#include "gui/Style.h"
+#include "gui/game/GameModel.h"
 
 class ElementSearchActivity::ToolAction: public ui::ButtonAction
 {
diff --git a/src/elementsearch/ElementSearchActivity.h b/src/gui/elementsearch/ElementSearchActivity.h
index 987d8fb..dec37e5 100644
--- a/src/elementsearch/ElementSearchActivity.h
+++ b/src/gui/elementsearch/ElementSearchActivity.h
@@ -4,9 +4,9 @@
 #include <vector>
 #include <string>
 #include "Activity.h"
-#include "interface/Window.h"
-#include "interface/Textbox.h"
-#include "game/ToolButton.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Textbox.h"
+#include "gui/game/ToolButton.h"
 
 class Tool;
 
diff --git a/src/filebrowser/FileBrowserActivity.cpp b/src/gui/filebrowser/FileBrowserActivity.cpp
index 0ea7104..7612ae2 100644
--- a/src/filebrowser/FileBrowserActivity.cpp
+++ b/src/gui/filebrowser/FileBrowserActivity.cpp
@@ -1,20 +1,20 @@
 #include <sstream>
 #include <iostream>
 #include "FileBrowserActivity.h"
-#include "interface/Label.h"
-#include "interface/Textbox.h"
-#include "interface/ScrollPanel.h"
-#include "interface/SaveButton.h"
-#include "interface/ProgressBar.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/ScrollPanel.h"
+#include "gui/interface/SaveButton.h"
+#include "gui/interface/ProgressBar.h"
 #include "client/Client.h"
 #include "client/SaveFile.h"
 #include "client/GameSave.h"
-#include "Style.h"
+#include "gui/Style.h"
 #include "tasks/Task.h"
 #include "simulation/SaveRenderer.h"
-#include "dialogues/TextPrompt.h"
-#include "dialogues/ConfirmPrompt.h"
-#include "dialogues/ErrorMessage.h"
+#include "gui/dialogues/TextPrompt.h"
+#include "gui/dialogues/ConfirmPrompt.h"
+#include "gui/dialogues/ErrorMessage.h"
 
 class Thumbnail;
 
diff --git a/src/filebrowser/FileBrowserActivity.h b/src/gui/filebrowser/FileBrowserActivity.h
index fa8f32a..d607d49 100644
--- a/src/filebrowser/FileBrowserActivity.h
+++ b/src/gui/filebrowser/FileBrowserActivity.h
@@ -3,7 +3,7 @@
 #include <vector>
 #include <string>
 #include "Activity.h"
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 #include "tasks/TaskListener.h"
 
 
diff --git a/src/game/BitmapBrush.h b/src/gui/game/BitmapBrush.h
index e1c0445..e1c0445 100644
--- a/src/game/BitmapBrush.h
+++ b/src/gui/game/BitmapBrush.h
diff --git a/src/game/Brush.cpp b/src/gui/game/Brush.cpp
index 9f2f2a8..9f2f2a8 100644
--- a/src/game/Brush.cpp
+++ b/src/gui/game/Brush.cpp
diff --git a/src/game/Brush.h b/src/gui/game/Brush.h
index 7671caf..a853609 100644
--- a/src/game/Brush.h
+++ b/src/gui/game/Brush.h
@@ -2,7 +2,7 @@
 #define BRUSH_H_
 
 #include <iostream>
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 
 class Renderer;
 class Brush
diff --git a/src/game/DecorationTool.h b/src/gui/game/DecorationTool.h
index 679c854..679c854 100644
--- a/src/game/DecorationTool.h
+++ b/src/gui/game/DecorationTool.h
diff --git a/src/game/EllipseBrush.h b/src/gui/game/EllipseBrush.h
index ad28766..ad28766 100644
--- a/src/game/EllipseBrush.h
+++ b/src/gui/game/EllipseBrush.h
diff --git a/src/game/GameController.cpp b/src/gui/game/GameController.cpp
index 1493b39..8df5036 100644
--- a/src/game/GameController.cpp
+++ b/src/gui/game/GameController.cpp
@@ -7,24 +7,24 @@
 #include "GameModel.h"
 #include "client/SaveInfo.h"
 #include "client/GameSave.h"
-#include "search/SearchController.h"
-#include "render/RenderController.h"
-#include "login/LoginController.h"
-#include "interface/Point.h"
-#include "dialogues/ErrorMessage.h"
-#include "dialogues/InformationMessage.h"
-#include "dialogues/ConfirmPrompt.h"
+#include "gui/search/SearchController.h"
+#include "gui/render/RenderController.h"
+#include "gui/login/LoginController.h"
+#include "gui/interface/Point.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/dialogues/InformationMessage.h"
+#include "gui/dialogues/ConfirmPrompt.h"
 #include "GameModelException.h"
 #include "simulation/Air.h"
-#include "elementsearch/ElementSearchActivity.h"
-#include "profile/ProfileActivity.h"
-#include "colourpicker/ColourPickerActivity.h"
-#include "update/UpdateActivity.h"
+#include "gui/elementsearch/ElementSearchActivity.h"
+#include "gui/profile/ProfileActivity.h"
+#include "gui/colourpicker/ColourPickerActivity.h"
+#include "gui/update/UpdateActivity.h"
 #include "Notification.h"
-#include "filebrowser/FileBrowserActivity.h"
-#include "save/LocalSaveActivity.h"
-#include "save/ServerSaveActivity.h"
-#include "interface/Keys.h"
+#include "gui/filebrowser/FileBrowserActivity.h"
+#include "gui/save/LocalSaveActivity.h"
+#include "gui/save/ServerSaveActivity.h"
+#include "gui/interface/Keys.h"
 #include "simulation/Snapshot.h"
 #include "debug/DebugInfo.h"
 //#include "debug/ElementPopulation.h"
diff --git a/src/game/GameController.h b/src/gui/game/GameController.h
index 070d39d..644d25c 100644
--- a/src/game/GameController.h
+++ b/src/gui/game/GameController.h
@@ -4,18 +4,18 @@
 #include <queue>
 #include "GameView.h"
 #include "GameModel.h"
-#include "interface/Point.h"
 #include "simulation/Simulation.h"
-#include "search/SearchController.h"
-#include "render/RenderController.h"
-#include "preview/PreviewController.h"
-#include "login/LoginController.h"
-#include "tags/TagsController.h"
-#include "console/ConsoleController.h"
-#include "localbrowser/LocalBrowserController.h"
+#include "gui/interface/Point.h"
+#include "gui/search/SearchController.h"
+#include "gui/render/RenderController.h"
+#include "gui/preview/PreviewController.h"
+#include "gui/login/LoginController.h"
+#include "gui/tags/TagsController.h"
+#include "gui/console/ConsoleController.h"
+#include "gui/localbrowser/LocalBrowserController.h"
+#include "gui/options/OptionsController.h"
 //#include "cat/TPTScriptInterface.h"
 #include "cat/LuaScriptInterface.h"
-#include "options/OptionsController.h"
 #include "client/ClientListener.h"
 #include "RenderPreset.h"
 #include "Menu.h"
diff --git a/src/game/GameModel.cpp b/src/gui/game/GameModel.cpp
index e687674..37194a5 100644
--- a/src/game/GameModel.cpp
+++ b/src/gui/game/GameModel.cpp
@@ -1,18 +1,18 @@
-#include "interface/Engine.h"
+#include "gui/interface/Engine.h"
 #include "GameModel.h"
 #include "GameView.h"
 #include "simulation/Simulation.h"
 #include "simulation/Air.h"
 #include "simulation/Tools.h"
 #include "graphics/Renderer.h"
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 #include "Brush.h"
 #include "EllipseBrush.h"
 #include "TriangleBrush.h"
 #include "BitmapBrush.h"
 #include "client/Client.h"
 #include "client/GameSave.h"
-#include "game/DecorationTool.h"
+#include "gui/game/DecorationTool.h"
 #include "GameModelException.h"
 #include "QuickOptions.h"
 #include "Format.h"
diff --git a/src/game/GameModel.h b/src/gui/game/GameModel.h
index c1d97d6..0ade162 100644
--- a/src/game/GameModel.h
+++ b/src/gui/game/GameModel.h
@@ -5,7 +5,7 @@
 #include <deque>
 #include "client/SaveInfo.h"
 #include "simulation/Simulation.h"
-#include "interface/Colour.h"
+#include "gui/interface/Colour.h"
 #include "graphics/Renderer.h"
 #include "GameView.h"
 #include "GameController.h"
diff --git a/src/game/GameModelException.h b/src/gui/game/GameModelException.h
index c95f7e6..c95f7e6 100644
--- a/src/game/GameModelException.h
+++ b/src/gui/game/GameModelException.h
diff --git a/src/game/GameView.cpp b/src/gui/game/GameView.cpp
index 5a7ad33..c11a59d 100644
--- a/src/game/GameView.cpp
+++ b/src/gui/game/GameView.cpp
@@ -2,18 +2,18 @@
 #include <iomanip>
 
 #include "Config.h"
-#include "Style.h"
+#include "gui/Style.h"
 #include "GameView.h"
 #include "graphics/Graphics.h"
-#include "interface/Window.h"
-#include "interface/Button.h"
-#include "interface/Colour.h"
-#include "interface/Keys.h"
-#include "interface/Slider.h"
-#include "search/Thumbnail.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Colour.h"
+#include "gui/interface/Keys.h"
+#include "gui/interface/Slider.h"
+#include "gui/search/Thumbnail.h"
 #include "simulation/SaveRenderer.h"
 #include "simulation/SimulationData.h"
-#include "dialogues/ConfirmPrompt.h"
+#include "gui/dialogues/ConfirmPrompt.h"
 #include "Format.h"
 #include "QuickOption.h"
 #include "IntroText.h"
diff --git a/src/game/GameView.h b/src/gui/game/GameView.h
index 00dec5d..093d80b 100644
--- a/src/game/GameView.h
+++ b/src/gui/game/GameView.h
@@ -7,11 +7,11 @@
 #include <string>
 #include "GameController.h"
 #include "GameModel.h"
-#include "interface/Window.h"
-#include "interface/Point.h"
-#include "interface/Button.h"
-#include "interface/Slider.h"
-#include "interface/Textbox.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Point.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Slider.h"
+#include "gui/interface/Textbox.h"
 #include "ToolButton.h"
 #include "Brush.h"
 #include "simulation/Sample.h"
diff --git a/src/game/Menu.h b/src/gui/game/Menu.h
index 3f955e1..3f955e1 100644
--- a/src/game/Menu.h
+++ b/src/gui/game/Menu.h
diff --git a/src/game/Notification.h b/src/gui/game/Notification.h
index b2bf6f8..b2bf6f8 100644
--- a/src/game/Notification.h
+++ b/src/gui/game/Notification.h
diff --git a/src/game/PropertyTool.cpp b/src/gui/game/PropertyTool.cpp
index ee9f9eb..05726d3 100644
--- a/src/game/PropertyTool.cpp
+++ b/src/gui/game/PropertyTool.cpp
@@ -1,15 +1,15 @@
 #include <iostream>
 #include <sstream>
-#include "Style.h"
+#include "gui/Style.h"
 #include "simulation/Simulation.h"
 #include "Tool.h"
-#include "interface/Window.h"
-#include "interface/Button.h"
-#include "interface/Label.h"
-#include "interface/Textbox.h"
-#include "interface/DropDown.h"
-#include "interface/Keys.h"
-#include "dialogues/ErrorMessage.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/DropDown.h"
+#include "gui/interface/Keys.h"
+#include "gui/dialogues/ErrorMessage.h"
 
 class PropertyWindow: public ui::Window
 {
diff --git a/src/game/QuickOption.h b/src/gui/game/QuickOption.h
index 4bf27ff..4bf27ff 100644
--- a/src/game/QuickOption.h
+++ b/src/gui/game/QuickOption.h
diff --git a/src/game/QuickOptions.h b/src/gui/game/QuickOptions.h
index 7c31f9c..7c31f9c 100644
--- a/src/game/QuickOptions.h
+++ b/src/gui/game/QuickOptions.h
diff --git a/src/game/RenderPreset.h b/src/gui/game/RenderPreset.h
index 9cc9f4c..9cc9f4c 100644
--- a/src/game/RenderPreset.h
+++ b/src/gui/game/RenderPreset.h
diff --git a/src/game/SampleTool.cpp b/src/gui/game/SampleTool.cpp
index a42a214..b914b1c 100644
--- a/src/game/SampleTool.cpp
+++ b/src/gui/game/SampleTool.cpp
@@ -2,7 +2,7 @@
 #include "graphics/Graphics.h"
 #include "Tool.h"
 #include "GameModel.h"
-#include "interface/Colour.h"
+#include "gui/interface/Colour.h"
 
 VideoBuffer * SampleTool::GetIcon(int toolID, int width, int height)
 {
diff --git a/src/game/SignTool.cpp b/src/gui/game/SignTool.cpp
index d2bba88..a4042b1 100644
--- a/src/game/SignTool.cpp
+++ b/src/gui/game/SignTool.cpp
@@ -1,12 +1,12 @@
 #include <iostream>
-#include "Style.h"
+#include "gui/Style.h"
 #include "simulation/Simulation.h"
 #include "Tool.h"
-#include "interface/Window.h"
-#include "interface/Button.h"
-#include "interface/Label.h"
-#include "interface/Textbox.h"
-#include "interface/DropDown.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/DropDown.h"
 
 class SignWindow: public ui::Window
 {
diff --git a/src/game/Tool.cpp b/src/gui/game/Tool.cpp
index 42f9b59..def6e46 100644
--- a/src/game/Tool.cpp
+++ b/src/gui/game/Tool.cpp
@@ -1,6 +1,6 @@
 #include <string>
 #include "Tool.h"
-#include "game/Brush.h"
+#include "gui/game/Brush.h"
 
 #include "simulation/Simulation.h"
 
diff --git a/src/game/Tool.h b/src/gui/game/Tool.h
index 0c8ab65..ea38fbc 100644
--- a/src/game/Tool.h
+++ b/src/gui/game/Tool.h
@@ -5,7 +5,7 @@
 
 using namespace std;
 
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 
 class Simulation;
 class Brush;
diff --git a/src/game/ToolButton.cpp b/src/gui/game/ToolButton.cpp
index 575167f..8539ac7 100644
--- a/src/game/ToolButton.cpp
+++ b/src/gui/game/ToolButton.cpp
@@ -1,5 +1,5 @@
 #include "ToolButton.h"
-#include "interface/Keys.h"
+#include "gui/interface/Keys.h"
 
 ToolButton::ToolButton(ui::Point position, ui::Point size, std::string text_, std::string toolTip):
 	ui::Button(position, size, text_, toolTip)
diff --git a/src/game/ToolButton.h b/src/gui/game/ToolButton.h
index 6fdd733..86c8970 100644
--- a/src/game/ToolButton.h
+++ b/src/gui/game/ToolButton.h
@@ -1,7 +1,7 @@
 #ifndef TOOLBUTTON_H_
 #define TOOLBUTTON_H_
 
-#include "interface/Button.h"
+#include "gui/interface/Button.h"
 
 class ToolButton: public ui::Button {
 	int currentSelection;
diff --git a/src/game/TriangleBrush.h b/src/gui/game/TriangleBrush.h
index 7d537bd..7d537bd 100644
--- a/src/game/TriangleBrush.h
+++ b/src/gui/game/TriangleBrush.h
diff --git a/src/interface/Appearance.cpp b/src/gui/interface/Appearance.cpp
index a4c21d0..a4c21d0 100644
--- a/src/interface/Appearance.cpp
+++ b/src/gui/interface/Appearance.cpp
diff --git a/src/interface/Appearance.h b/src/gui/interface/Appearance.h
index 1c1bb5a..1c1bb5a 100644
--- a/src/interface/Appearance.h
+++ b/src/gui/interface/Appearance.h
diff --git a/src/interface/AvatarButton.cpp b/src/gui/interface/AvatarButton.cpp
index e385c77..e385c77 100644
--- a/src/interface/AvatarButton.cpp
+++ b/src/gui/interface/AvatarButton.cpp
diff --git a/src/interface/AvatarButton.h b/src/gui/interface/AvatarButton.h
index f7a7a6c..26b4348 100644
--- a/src/interface/AvatarButton.h
+++ b/src/gui/interface/AvatarButton.h
@@ -5,7 +5,7 @@
 
 #include "Component.h"
 #include "graphics/Graphics.h"
-#include "interface/Colour.h"
+#include "gui/interface/Colour.h"
 #include "client/requestbroker/RequestListener.h"
 
 namespace ui
diff --git a/src/interface/Border.h b/src/gui/interface/Border.h
index a1ceb81..a1ceb81 100644
--- a/src/interface/Border.h
+++ b/src/gui/interface/Border.h
diff --git a/src/interface/Button.cpp b/src/gui/interface/Button.cpp
index a2ecf8f..3f08153 100644
--- a/src/interface/Button.cpp
+++ b/src/gui/interface/Button.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "interface/Button.h"
+#include "gui/interface/Button.h"
 #include "graphics/Graphics.h"
 #include "Engine.h"
 #include "Misc.h"
diff --git a/src/interface/Button.h b/src/gui/interface/Button.h
index 05f466d..05f466d 100644
--- a/src/interface/Button.h
+++ b/src/gui/interface/Button.h
diff --git a/src/interface/Checkbox.cpp b/src/gui/interface/Checkbox.cpp
index 7caf18b..7caf18b 100644
--- a/src/interface/Checkbox.cpp
+++ b/src/gui/interface/Checkbox.cpp
diff --git a/src/interface/Checkbox.h b/src/gui/interface/Checkbox.h
index f82cef7..f82cef7 100644
--- a/src/interface/Checkbox.h
+++ b/src/gui/interface/Checkbox.h
diff --git a/src/interface/Colour.h b/src/gui/interface/Colour.h
index 194b9c9..194b9c9 100644
--- a/src/interface/Colour.h
+++ b/src/gui/interface/Colour.h
diff --git a/src/interface/Component.cpp b/src/gui/interface/Component.cpp
index d009c5b..6c4c548 100644
--- a/src/interface/Component.cpp
+++ b/src/gui/interface/Component.cpp
@@ -1,11 +1,11 @@
 //#include "Platform.h"
 #include <iostream>
-#include "interface/Component.h"
-#include "interface/Engine.h"
-#include "interface/Point.h"
-#include "interface/Window.h"
-#include "interface/Panel.h"
-#include "interface/ContextMenu.h"
+#include "gui/interface/Component.h"
+#include "gui/interface/Engine.h"
+#include "gui/interface/Point.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Panel.h"
+#include "gui/interface/ContextMenu.h"
 
 using namespace ui;
 
diff --git a/src/interface/Component.h b/src/gui/interface/Component.h
index c034952..c034952 100644
--- a/src/interface/Component.h
+++ b/src/gui/interface/Component.h
diff --git a/src/interface/ContextMenu.cpp b/src/gui/interface/ContextMenu.cpp
index 0d34e19..0d34e19 100644
--- a/src/interface/ContextMenu.cpp
+++ b/src/gui/interface/ContextMenu.cpp
diff --git a/src/interface/ContextMenu.h b/src/gui/interface/ContextMenu.h
index e5549d3..e5549d3 100644
--- a/src/interface/ContextMenu.h
+++ b/src/gui/interface/ContextMenu.h
diff --git a/src/interface/DropDown.cpp b/src/gui/interface/DropDown.cpp
index 4c1d761..f1dda7c 100644
--- a/src/interface/DropDown.cpp
+++ b/src/gui/interface/DropDown.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "Style.h"
+#include "gui/Style.h"
 #include "Button.h"
 #include "DropDown.h"
 
diff --git a/src/interface/DropDown.h b/src/gui/interface/DropDown.h
index c13fdf6..c13fdf6 100644
--- a/src/interface/DropDown.h
+++ b/src/gui/interface/DropDown.h
diff --git a/src/interface/Engine.cpp b/src/gui/interface/Engine.cpp
index 731f265..6911c25 100644
--- a/src/interface/Engine.cpp
+++ b/src/gui/interface/Engine.cpp
@@ -4,9 +4,9 @@
 #include <time.h>
 
 #include "Config.h"
-#include "interface/Window.h"
-#include "interface/Platform.h"
-#include "interface/Engine.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Platform.h"
+#include "gui/interface/Engine.h"
 #include "graphics/Graphics.h"
 
 using namespace ui;
diff --git a/src/interface/Engine.h b/src/gui/interface/Engine.h
index fb110e4..fb110e4 100644
--- a/src/interface/Engine.h
+++ b/src/gui/interface/Engine.h
diff --git a/src/interface/Keys.h b/src/gui/interface/Keys.h
index cd265f9..cd265f9 100644
--- a/src/interface/Keys.h
+++ b/src/gui/interface/Keys.h
diff --git a/src/interface/Label.cpp b/src/gui/interface/Label.cpp
index 24b8035..24b8035 100644
--- a/src/interface/Label.cpp
+++ b/src/gui/interface/Label.cpp
diff --git a/src/interface/Label.h b/src/gui/interface/Label.h
index d4e5088..d4e5088 100644
--- a/src/interface/Label.h
+++ b/src/gui/interface/Label.h
diff --git a/src/interface/LuaProgressBar.h b/src/gui/interface/LuaProgressBar.h
index dc2ef4e..dc2ef4e 100644
--- a/src/interface/LuaProgressBar.h
+++ b/src/gui/interface/LuaProgressBar.h
diff --git a/src/interface/Panel.cpp b/src/gui/interface/Panel.cpp
index d3bf29b..3b19264 100644
--- a/src/interface/Panel.cpp
+++ b/src/gui/interface/Panel.cpp
@@ -2,11 +2,11 @@
 #include <vector>
 //#include "Platform.h"
 
-#include "interface/Panel.h"
+#include "gui/interface/Panel.h"
 
-#include "interface/Point.h"
-#include "interface/Window.h"
-#include "interface/Component.h"
+#include "gui/interface/Point.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Component.h"
 #include "graphics/Graphics.h"
 
 using namespace ui;
diff --git a/src/interface/Panel.h b/src/gui/interface/Panel.h
index cfeace3..119be5d 100644
--- a/src/interface/Panel.h
+++ b/src/gui/interface/Panel.h
@@ -2,9 +2,9 @@
 #include <vector>
 //#include "Platform.h"
 
-#include "interface/Point.h"
-#include "interface/Window.h"
-#include "interface/Component.h"
+#include "gui/interface/Point.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Component.h"
 
 #ifdef OGLI
 #include "graphics/OpenGLHeaders.h"
diff --git a/src/interface/Platform.h b/src/gui/interface/Platform.h
index 5940303..5940303 100644
--- a/src/interface/Platform.h
+++ b/src/gui/interface/Platform.h
diff --git a/src/interface/Point.h b/src/gui/interface/Point.h
index d2eff6b..d2eff6b 100644
--- a/src/interface/Point.h
+++ b/src/gui/interface/Point.h
diff --git a/src/interface/ProgressBar.cpp b/src/gui/interface/ProgressBar.cpp
index eda88f6..95da72c 100644
--- a/src/interface/ProgressBar.cpp
+++ b/src/gui/interface/ProgressBar.cpp
@@ -1,5 +1,5 @@
 #include "ProgressBar.h"
-#include "Style.h"
+#include "gui/Style.h"
 
 using namespace ui;
 
diff --git a/src/interface/ProgressBar.h b/src/gui/interface/ProgressBar.h
index fc47f0c..fc47f0c 100644
--- a/src/interface/ProgressBar.h
+++ b/src/gui/interface/ProgressBar.h
diff --git a/src/interface/RichLabel.cpp b/src/gui/interface/RichLabel.cpp
index 84dc500..f6143d3 100644
--- a/src/interface/RichLabel.cpp
+++ b/src/gui/interface/RichLabel.cpp
@@ -3,8 +3,8 @@
 
 #include "RichLabel.h"
 #include "Misc.h"
-#include "interface/Point.h"
-#include "interface/Component.h"
+#include "gui/interface/Point.h"
+#include "gui/interface/Component.h"
 #include "graphics/Graphics.h"
 
 using namespace ui;
diff --git a/src/interface/RichLabel.h b/src/gui/interface/RichLabel.h
index d9682f2..d9682f2 100644
--- a/src/interface/RichLabel.h
+++ b/src/gui/interface/RichLabel.h
diff --git a/src/interface/SaveButton.cpp b/src/gui/interface/SaveButton.cpp
index 9b2950f..9b2950f 100644
--- a/src/interface/SaveButton.cpp
+++ b/src/gui/interface/SaveButton.cpp
diff --git a/src/interface/SaveButton.h b/src/gui/interface/SaveButton.h
index 0583d77..7bb77c4 100644
--- a/src/interface/SaveButton.h
+++ b/src/gui/interface/SaveButton.h
@@ -8,7 +8,7 @@
 #include "client/SaveInfo.h"
 #include "client/requestbroker/RequestListener.h"
 #include "graphics/Graphics.h"
-#include "interface/Colour.h"
+#include "gui/interface/Colour.h"
 
 namespace ui
 {
diff --git a/src/interface/ScrollPanel.cpp b/src/gui/interface/ScrollPanel.cpp
index 74f6b62..74f6b62 100644
--- a/src/interface/ScrollPanel.cpp
+++ b/src/gui/interface/ScrollPanel.cpp
diff --git a/src/interface/ScrollPanel.h b/src/gui/interface/ScrollPanel.h
index c26c420..c26c420 100644
--- a/src/interface/ScrollPanel.h
+++ b/src/gui/interface/ScrollPanel.h
diff --git a/src/interface/Slider.cpp b/src/gui/interface/Slider.cpp
index 3ada74f..3ada74f 100644
--- a/src/interface/Slider.cpp
+++ b/src/gui/interface/Slider.cpp
diff --git a/src/interface/Slider.h b/src/gui/interface/Slider.h
index b02366e..b02366e 100644
--- a/src/interface/Slider.h
+++ b/src/gui/interface/Slider.h
diff --git a/src/interface/Spinner.cpp b/src/gui/interface/Spinner.cpp
index fd3a61d..fd3a61d 100644
--- a/src/interface/Spinner.cpp
+++ b/src/gui/interface/Spinner.cpp
diff --git a/src/interface/Spinner.h b/src/gui/interface/Spinner.h
index deabb3c..deabb3c 100644
--- a/src/interface/Spinner.h
+++ b/src/gui/interface/Spinner.h
diff --git a/src/interface/Textbox.cpp b/src/gui/interface/Textbox.cpp
index 603c894..c23bcb4 100644
--- a/src/interface/Textbox.cpp
+++ b/src/gui/interface/Textbox.cpp
@@ -3,9 +3,9 @@
 #include <stdexcept>
 #include <time.h>
 #include "Config.h"
-#include "interface/Point.h"
-#include "interface/Textbox.h"
-#include "interface/Keys.h"
+#include "gui/interface/Point.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/Keys.h"
 #include "ContextMenu.h"
 
 using namespace ui;
diff --git a/src/interface/Textbox.h b/src/gui/interface/Textbox.h
index 0d5140b..0d5140b 100644
--- a/src/interface/Textbox.h
+++ b/src/gui/interface/Textbox.h
diff --git a/src/interface/Window.cpp b/src/gui/interface/Window.cpp
index 3cd22e6..9ec6857 100644
--- a/src/interface/Window.cpp
+++ b/src/gui/interface/Window.cpp
@@ -2,8 +2,8 @@
 #include "Window.h"
 #include "Keys.h"
 #include "Component.h"
-#include "interface/Point.h"
-#include "interface/Button.h"
+#include "gui/interface/Point.h"
+#include "gui/interface/Button.h"
 
 using namespace ui;
 
diff --git a/src/interface/Window.h b/src/gui/interface/Window.h
index 7906393..dafb910 100644
--- a/src/interface/Window.h
+++ b/src/gui/interface/Window.h
@@ -2,7 +2,7 @@
 #define WINDOW_H
 
 #include <vector>
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 #include "Engine.h"
 
 namespace ui
diff --git a/src/localbrowser/LocalBrowserController.cpp b/src/gui/localbrowser/LocalBrowserController.cpp
index fba25e3..a1a01ed 100644
--- a/src/localbrowser/LocalBrowserController.cpp
+++ b/src/gui/localbrowser/LocalBrowserController.cpp
@@ -2,8 +2,8 @@
 
 #include "client/Client.h"
 #include "LocalBrowserController.h"
-#include "interface/Engine.h"
-#include "dialogues/ConfirmPrompt.h"
+#include "gui/interface/Engine.h"
+#include "gui/dialogues/ConfirmPrompt.h"
 #include "tasks/TaskWindow.h"
 #include "tasks/Task.h"
 
diff --git a/src/localbrowser/LocalBrowserController.h b/src/gui/localbrowser/LocalBrowserController.h
index 6dcf2a5..6dcf2a5 100644
--- a/src/localbrowser/LocalBrowserController.h
+++ b/src/gui/localbrowser/LocalBrowserController.h
diff --git a/src/localbrowser/LocalBrowserModel.cpp b/src/gui/localbrowser/LocalBrowserModel.cpp
index 333e845..333e845 100644
--- a/src/localbrowser/LocalBrowserModel.cpp
+++ b/src/gui/localbrowser/LocalBrowserModel.cpp
diff --git a/src/localbrowser/LocalBrowserModel.h b/src/gui/localbrowser/LocalBrowserModel.h
index 75167d9..75167d9 100644
--- a/src/localbrowser/LocalBrowserModel.h
+++ b/src/gui/localbrowser/LocalBrowserModel.h
diff --git a/src/localbrowser/LocalBrowserModelException.h b/src/gui/localbrowser/LocalBrowserModelException.h
index 5146c53..5146c53 100644
--- a/src/localbrowser/LocalBrowserModelException.h
+++ b/src/gui/localbrowser/LocalBrowserModelException.h
diff --git a/src/localbrowser/LocalBrowserView.cpp b/src/gui/localbrowser/LocalBrowserView.cpp
index 700d24e..a25c281 100644
--- a/src/localbrowser/LocalBrowserView.cpp
+++ b/src/gui/localbrowser/LocalBrowserView.cpp
@@ -2,14 +2,14 @@
 #include "client/Client.h"
 #include "LocalBrowserView.h"
 
-#include "interface/Button.h"
-#include "interface/Textbox.h"
-#include "interface/Label.h"
-#include "interface/SaveButton.h"
-#include "interface/Keys.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/SaveButton.h"
+#include "gui/interface/Keys.h"
  
-#include "dialogues/ErrorMessage.h"
-#include "dialogues/ConfirmPrompt.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/dialogues/ConfirmPrompt.h"
 #include "LocalBrowserController.h"
 #include "LocalBrowserModel.h"
 #include "LocalBrowserModelException.h"
diff --git a/src/localbrowser/LocalBrowserView.h b/src/gui/localbrowser/LocalBrowserView.h
index 17930d9..02aca28 100644
--- a/src/localbrowser/LocalBrowserView.h
+++ b/src/gui/localbrowser/LocalBrowserView.h
@@ -2,7 +2,7 @@
 #define STAMPSVIEW_H_
 
 #include <vector>
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 
 namespace ui
 {
diff --git a/src/login/LoginController.cpp b/src/gui/login/LoginController.cpp
index fd8e576..fd8e576 100644
--- a/src/login/LoginController.cpp
+++ b/src/gui/login/LoginController.cpp
diff --git a/src/login/LoginController.h b/src/gui/login/LoginController.h
index b723cb9..b723cb9 100644
--- a/src/login/LoginController.h
+++ b/src/gui/login/LoginController.h
diff --git a/src/login/LoginModel.cpp b/src/gui/login/LoginModel.cpp
index 5b70c2c..5b70c2c 100644
--- a/src/login/LoginModel.cpp
+++ b/src/gui/login/LoginModel.cpp
diff --git a/src/login/LoginModel.h b/src/gui/login/LoginModel.h
index 8149797..8149797 100644
--- a/src/login/LoginModel.h
+++ b/src/gui/login/LoginModel.h
diff --git a/src/login/LoginView.cpp b/src/gui/login/LoginView.cpp
index a660887..8ebbeb5 100644
--- a/src/login/LoginView.cpp
+++ b/src/gui/login/LoginView.cpp
@@ -1,10 +1,10 @@
 #include "LoginView.h"
 
-#include "interface/Button.h"
-#include "interface/Label.h"
-#include "interface/Textbox.h"
-#include "interface/Keys.h"
-#include "Style.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/Keys.h"
+#include "gui/Style.h"
 
 class LoginView::LoginAction : public ui::ButtonAction
 {
diff --git a/src/login/LoginView.h b/src/gui/login/LoginView.h
index a492b75..adbe4ec 100644
--- a/src/login/LoginView.h
+++ b/src/gui/login/LoginView.h
@@ -1,7 +1,7 @@
 #ifndef LOGINVIEW_H_
 #define LOGINVIEW_H_
 
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 #include "LoginController.h"
 #include "LoginModel.h"
 
diff --git a/src/options/OptionsController.cpp b/src/gui/options/OptionsController.cpp
index 17c42f4..672f2fc 100644
--- a/src/options/OptionsController.cpp
+++ b/src/gui/options/OptionsController.cpp
@@ -1,5 +1,5 @@
 #include "OptionsController.h"
-#include "dialogues/ErrorMessage.h"
+#include "gui/dialogues/ErrorMessage.h"
 
 OptionsController::OptionsController(GameModel * gModel_, ControllerCallback * callback_):
 	callback(callback_),
diff --git a/src/options/OptionsController.h b/src/gui/options/OptionsController.h
index 481f9d2..481f9d2 100644
--- a/src/options/OptionsController.h
+++ b/src/gui/options/OptionsController.h
diff --git a/src/options/OptionsModel.cpp b/src/gui/options/OptionsModel.cpp
index 8ca2a30..829bf0c 100644
--- a/src/options/OptionsModel.cpp
+++ b/src/gui/options/OptionsModel.cpp
@@ -1,5 +1,5 @@
 #include "simulation/Air.h"
-#include "game/GameModel.h"
+#include "gui/game/GameModel.h"
 #include "OptionsModel.h"
 
 OptionsModel::OptionsModel(GameModel * gModel_) {
diff --git a/src/options/OptionsModel.h b/src/gui/options/OptionsModel.h
index 1fdf372..1fdf372 100644
--- a/src/options/OptionsModel.h
+++ b/src/gui/options/OptionsModel.h
diff --git a/src/options/OptionsView.cpp b/src/gui/options/OptionsView.cpp
index 70aeba5..71c86aa 100644
--- a/src/options/OptionsView.cpp
+++ b/src/gui/options/OptionsView.cpp
@@ -1,8 +1,8 @@
 #include "OptionsView.h"
-#include "Style.h"
-#include "interface/Button.h"
-#include "interface/Label.h"
-#include "interface/DropDown.h"
+#include "gui/Style.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/DropDown.h"
 
 OptionsView::OptionsView():
 	ui::Window(ui::Point(-1, -1), ui::Point(300, 310)){
diff --git a/src/options/OptionsView.h b/src/gui/options/OptionsView.h
index 4ee254f..2bbc3f2 100644
--- a/src/options/OptionsView.h
+++ b/src/gui/options/OptionsView.h
@@ -1,10 +1,10 @@
 #ifndef OPTIONSVIEW_H_
 #define OPTIONSVIEW_H_
 
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 #include "OptionsController.h"
-#include "interface/Checkbox.h"
-#include "interface/DropDown.h"
+#include "gui/interface/Checkbox.h"
+#include "gui/interface/DropDown.h"
 #include "OptionsModel.h"
 
 class OptionsModel;
diff --git a/src/preview/Comment.h b/src/gui/preview/Comment.h
index 1d84042..1d84042 100644
--- a/src/preview/Comment.h
+++ b/src/gui/preview/Comment.h
diff --git a/src/preview/PreviewController.cpp b/src/gui/preview/PreviewController.cpp
index 1616c63..30622c2 100644
--- a/src/preview/PreviewController.cpp
+++ b/src/gui/preview/PreviewController.cpp
@@ -4,8 +4,8 @@
 #include "PreviewView.h"
 #include "PreviewModel.h"
 #include "PreviewModelException.h"
-#include "dialogues/ErrorMessage.h"
-#include "login/LoginController.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/login/LoginController.h"
 #include "Controller.h"
 
 PreviewController::PreviewController(int saveID, int saveDate, ControllerCallback * callback):
diff --git a/src/preview/PreviewController.h b/src/gui/preview/PreviewController.h
index ab63ae4..e1e429d 100644
--- a/src/preview/PreviewController.h
+++ b/src/gui/preview/PreviewController.h
@@ -1,8 +1,8 @@
 #ifndef PREVIEWCONTROLLER_H_
 #define PREVIEWCONTROLLER_H_
 
-#include "preview/PreviewModel.h"
-#include "preview/PreviewView.h"
+#include "gui/preview/PreviewModel.h"
+#include "gui/preview/PreviewView.h"
 #include "Controller.h"
 #include "client/SaveInfo.h"
 #include "client/ClientListener.h"
diff --git a/src/preview/PreviewModel.cpp b/src/gui/preview/PreviewModel.cpp
index 8d608cf..8d608cf 100644
--- a/src/preview/PreviewModel.cpp
+++ b/src/gui/preview/PreviewModel.cpp
diff --git a/src/preview/PreviewModel.h b/src/gui/preview/PreviewModel.h
index a8800e3..846614c 100644
--- a/src/preview/PreviewModel.h
+++ b/src/gui/preview/PreviewModel.h
@@ -7,8 +7,8 @@
 #undef GetUserName //God dammit microsoft!
 #include "PreviewView.h"
 #include "client/SaveInfo.h"
-#include "preview/Comment.h"
-#include "search/Thumbnail.h"
+#include "gui/preview/Comment.h"
+#include "gui/search/Thumbnail.h"
 
 using namespace std;
 
diff --git a/src/preview/PreviewModelException.h b/src/gui/preview/PreviewModelException.h
index 85dce1d..85dce1d 100644
--- a/src/preview/PreviewModelException.h
+++ b/src/gui/preview/PreviewModelException.h
diff --git a/src/preview/PreviewView.cpp b/src/gui/preview/PreviewView.cpp
index e04295a..4211732 100644
--- a/src/preview/PreviewView.cpp
+++ b/src/gui/preview/PreviewView.cpp
@@ -2,18 +2,18 @@
 #include <vector>
 #include <cmath>
 #include "PreviewView.h"
-#include "dialogues/TextPrompt.h"
+#include "gui/dialogues/TextPrompt.h"
 #include "simulation/SaveRenderer.h"
-#include "interface/Point.h"
-#include "interface/Window.h"
-#include "interface/Textbox.h"
-#include "Style.h"
+#include "gui/interface/Point.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Textbox.h"
+#include "gui/Style.h"
 #include "Format.h"
-#include "search/Thumbnail.h"
+#include "gui/search/Thumbnail.h"
 #include "client/Client.h"
-#include "interface/ScrollPanel.h"
-#include "interface/AvatarButton.h"
-#include "interface/Keys.h"
+#include "gui/interface/ScrollPanel.h"
+#include "gui/interface/AvatarButton.h"
+#include "gui/interface/Keys.h"
 
 class PreviewView::LoginAction: public ui::ButtonAction
 {
diff --git a/src/preview/PreviewView.h b/src/gui/preview/PreviewView.h
index c9025fd..2fef5ac 100644
--- a/src/preview/PreviewView.h
+++ b/src/gui/preview/PreviewView.h
@@ -3,12 +3,12 @@
 
 #include <vector>
 #include "Comment.h"
-#include "interface/Window.h"
-#include "preview/PreviewController.h"
-#include "preview/PreviewModel.h"
-#include "interface/Button.h"
-#include "interface/Label.h"
-#include "interface/Textbox.h"
+#include "gui/interface/Window.h"
+#include "gui/preview/PreviewController.h"
+#include "gui/preview/PreviewModel.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Textbox.h"
 
 namespace ui
 {
diff --git a/src/profile/ProfileActivity.cpp b/src/gui/profile/ProfileActivity.cpp
index ed10df9..54da81e 100644
--- a/src/profile/ProfileActivity.cpp
+++ b/src/gui/profile/ProfileActivity.cpp
@@ -1,12 +1,12 @@
 #include <algorithm>
 #include "ProfileActivity.h"
-#include "interface/Button.h"
-#include "interface/Textbox.h"
-#include "interface/Label.h"
-#include "interface/AvatarButton.h"
-#include "interface/ScrollPanel.h"
-#include "interface/Keys.h"
-#include "Style.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/AvatarButton.h"
+#include "gui/interface/ScrollPanel.h"
+#include "gui/interface/Keys.h"
+#include "gui/Style.h"
 #include "client/Client.h"
 #include "client/UserInfo.h"
 #include "client/requestbroker/RequestListener.h"
diff --git a/src/profile/ProfileActivity.h b/src/gui/profile/ProfileActivity.h
index 9691dff..ed10e65 100644
--- a/src/profile/ProfileActivity.h
+++ b/src/gui/profile/ProfileActivity.h
@@ -5,7 +5,7 @@
 #include "Activity.h"
 #include "client/requestbroker/RequestListener.h"
 #include "client/UserInfo.h"
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 
 class ProfileActivity: public WindowActivity, public RequestListener {
 	ui::Component * location;
diff --git a/src/render/RenderController.cpp b/src/gui/render/RenderController.cpp
index 7b60e97..7b60e97 100644
--- a/src/render/RenderController.cpp
+++ b/src/gui/render/RenderController.cpp
diff --git a/src/render/RenderController.h b/src/gui/render/RenderController.h
index 42adb65..42adb65 100644
--- a/src/render/RenderController.h
+++ b/src/gui/render/RenderController.h
diff --git a/src/render/RenderModel.cpp b/src/gui/render/RenderModel.cpp
index b17f6fc..b17f6fc 100644
--- a/src/render/RenderModel.cpp
+++ b/src/gui/render/RenderModel.cpp
diff --git a/src/render/RenderModel.h b/src/gui/render/RenderModel.h
index 2cd24a5..2cd24a5 100644
--- a/src/render/RenderModel.h
+++ b/src/gui/render/RenderModel.h
diff --git a/src/render/RenderView.cpp b/src/gui/render/RenderView.cpp
index 508ff47..508ff47 100644
--- a/src/render/RenderView.cpp
+++ b/src/gui/render/RenderView.cpp
diff --git a/src/render/RenderView.h b/src/gui/render/RenderView.h
index 5da8c1d..8a65eb1 100644
--- a/src/render/RenderView.h
+++ b/src/gui/render/RenderView.h
@@ -3,12 +3,12 @@
 
 
 #include <vector>
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 #include "RenderController.h"
 #include "RenderModel.h"
 #include "graphics/Renderer.h"
-#include "interface/Checkbox.h"
-#include "interface/Button.h"
+#include "gui/interface/Checkbox.h"
+#include "gui/interface/Button.h"
 
 class RenderController;
 class RenderModel;
diff --git a/src/save/LocalSaveActivity.cpp b/src/gui/save/LocalSaveActivity.cpp
index 0e968aa..f494f09 100644
--- a/src/save/LocalSaveActivity.cpp
+++ b/src/gui/save/LocalSaveActivity.cpp
@@ -1,14 +1,14 @@
 #include "LocalSaveActivity.h"
-#include "interface/Label.h"
-#include "interface/Textbox.h"
-#include "interface/Button.h"
-#include "search/Thumbnail.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/Button.h"
+#include "gui/search/Thumbnail.h"
 #include "client/requestbroker/RequestBroker.h"
-#include "dialogues/ErrorMessage.h"
-#include "dialogues/ConfirmPrompt.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/dialogues/ConfirmPrompt.h"
 #include "client/Client.h"
 #include "client/GameSave.h"
-#include "Style.h"
+#include "gui/Style.h"
 
 class LocalSaveActivity::CancelAction: public ui::ButtonAction
 {
diff --git a/src/save/LocalSaveActivity.h b/src/gui/save/LocalSaveActivity.h
index b58af5e..b58af5e 100644
--- a/src/save/LocalSaveActivity.h
+++ b/src/gui/save/LocalSaveActivity.h
diff --git a/src/save/ServerSaveActivity.cpp b/src/gui/save/ServerSaveActivity.cpp
index 020e346..e8dfc1d 100644
--- a/src/save/ServerSaveActivity.cpp
+++ b/src/gui/save/ServerSaveActivity.cpp
@@ -1,15 +1,15 @@
 #include "ServerSaveActivity.h"
-#include "interface/Label.h"
-#include "interface/Textbox.h"
-#include "interface/Button.h"
-#include "interface/Checkbox.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Checkbox.h"
 #include "client/requestbroker/RequestBroker.h"
-#include "dialogues/ErrorMessage.h"
-#include "dialogues/ConfirmPrompt.h"
-#include "dialogues/InformationMessage.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/dialogues/ConfirmPrompt.h"
+#include "gui/dialogues/InformationMessage.h"
 #include "client/Client.h"
 #include "tasks/Task.h"
-#include "Style.h"
+#include "gui/Style.h"
 #include "client/GameSave.h"
 
 class ServerSaveActivity::CancelAction: public ui::ButtonAction
diff --git a/src/save/ServerSaveActivity.h b/src/gui/save/ServerSaveActivity.h
index 793579b..793579b 100644
--- a/src/save/ServerSaveActivity.h
+++ b/src/gui/save/ServerSaveActivity.h
diff --git a/src/search/SearchController.cpp b/src/gui/search/SearchController.cpp
index 4c97342..b881962 100644
--- a/src/search/SearchController.cpp
+++ b/src/gui/search/SearchController.cpp
@@ -4,10 +4,10 @@
 #include "SearchController.h"
 #include "SearchModel.h"
 #include "SearchView.h"
-#include "interface/Panel.h"
-#include "dialogues/ConfirmPrompt.h"
-#include "dialogues/ErrorMessage.h"
-#include "preview/PreviewController.h"
+#include "gui/interface/Panel.h"
+#include "gui/dialogues/ConfirmPrompt.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/preview/PreviewController.h"
 #include "client/Client.h"
 #include "tasks/Task.h"
 #include "tasks/TaskWindow.h"
diff --git a/src/search/SearchController.h b/src/gui/search/SearchController.h
index 03967b4..8d811ab 100644
--- a/src/search/SearchController.h
+++ b/src/gui/search/SearchController.h
@@ -1,10 +1,10 @@
 #ifndef SEARCHCONTROLLER_H
 #define SEARCHCONTROLLER_H
 
-#include "interface/Panel.h"
+#include "gui/interface/Panel.h"
 #include "SearchModel.h"
 #include "SearchView.h"
-#include "preview/PreviewController.h"
+#include "gui/preview/PreviewController.h"
 #include "Controller.h"
 #include "client/SaveInfo.h"
 
diff --git a/src/search/SearchModel.cpp b/src/gui/search/SearchModel.cpp
index f4de2d6..f4de2d6 100644
--- a/src/search/SearchModel.cpp
+++ b/src/gui/search/SearchModel.cpp
diff --git a/src/search/SearchModel.h b/src/gui/search/SearchModel.h
index 0fe9480..0fe9480 100644
--- a/src/search/SearchModel.h
+++ b/src/gui/search/SearchModel.h
diff --git a/src/search/SearchView.cpp b/src/gui/search/SearchView.cpp
index 474c4e3..902be77 100644
--- a/src/search/SearchView.cpp
+++ b/src/gui/search/SearchView.cpp
@@ -2,11 +2,11 @@
 
 #include "SearchView.h"
 #include "client/Client.h"
-#include "interface/Keys.h"
-#include "interface/SaveButton.h"
-#include "interface/Label.h"
-#include "interface/RichLabel.h"
-#include "interface/Textbox.h"
+#include "gui/interface/Keys.h"
+#include "gui/interface/SaveButton.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/RichLabel.h"
+#include "gui/interface/Textbox.h"
 #include "Misc.h"
 
 SearchView::SearchView():
diff --git a/src/search/SearchView.h b/src/gui/search/SearchView.h
index 05ecde2..5752a2c 100644
--- a/src/search/SearchView.h
+++ b/src/gui/search/SearchView.h
@@ -3,11 +3,11 @@
 
 #include <vector>
 #include "SearchController.h"
-#include "interface/SaveButton.h"
-#include "interface/Button.h"
-#include "interface/Label.h"
-#include "interface/Spinner.h"
-#include "interface/Textbox.h"
+#include "gui/interface/SaveButton.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Spinner.h"
+#include "gui/interface/Textbox.h"
 #include "client/ClientListener.h"
 
 using namespace std;
diff --git a/src/search/Thumbnail.cpp b/src/gui/search/Thumbnail.cpp
index 1f06c45..1f06c45 100644
--- a/src/search/Thumbnail.cpp
+++ b/src/gui/search/Thumbnail.cpp
diff --git a/src/search/Thumbnail.h b/src/gui/search/Thumbnail.h
index 74ebbad..27ffa87 100644
--- a/src/search/Thumbnail.h
+++ b/src/gui/search/Thumbnail.h
@@ -3,7 +3,7 @@
 
 #include <iostream>
 #include "graphics/Graphics.h"
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 
 class Thumbnail
 {
diff --git a/src/tags/TagsController.cpp b/src/gui/tags/TagsController.cpp
index c3ecb2e..4165642 100644
--- a/src/tags/TagsController.cpp
+++ b/src/gui/tags/TagsController.cpp
@@ -1,5 +1,5 @@
 #include "TagsController.h"
-#include "interface/Engine.h"
+#include "gui/interface/Engine.h"
 
 #include "TagsModel.h"
 #include "TagsView.h"
diff --git a/src/tags/TagsController.h b/src/gui/tags/TagsController.h
index 8a51098..8a51098 100644
--- a/src/tags/TagsController.h
+++ b/src/gui/tags/TagsController.h
diff --git a/src/tags/TagsModel.cpp b/src/gui/tags/TagsModel.cpp
index f3329ad..f3329ad 100644
--- a/src/tags/TagsModel.cpp
+++ b/src/gui/tags/TagsModel.cpp
diff --git a/src/tags/TagsModel.h b/src/gui/tags/TagsModel.h
index 8afe841..8afe841 100644
--- a/src/tags/TagsModel.h
+++ b/src/gui/tags/TagsModel.h
diff --git a/src/tags/TagsModelException.h b/src/gui/tags/TagsModelException.h
index 671bf3b..671bf3b 100644
--- a/src/tags/TagsModelException.h
+++ b/src/gui/tags/TagsModelException.h
diff --git a/src/tags/TagsView.cpp b/src/gui/tags/TagsView.cpp
index 4e3c948..03b2893 100644
--- a/src/tags/TagsView.cpp
+++ b/src/gui/tags/TagsView.cpp
@@ -1,15 +1,15 @@
 #include "client/Client.h"
 #include "TagsView.h"
 
-#include "dialogues/ErrorMessage.h"
+#include "gui/dialogues/ErrorMessage.h"
 #include "TagsController.h"
 #include "TagsModel.h"
 #include "TagsModelException.h"
 
-#include "interface/Button.h"
-#include "interface/Textbox.h"
-#include "interface/Label.h"
-#include "interface/Keys.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Keys.h"
 
 TagsView::TagsView():
 	ui::Window(ui::Point(-1, -1), ui::Point(195, 250))
diff --git a/src/tags/TagsView.h b/src/gui/tags/TagsView.h
index 222fb1b..a842e13 100644
--- a/src/tags/TagsView.h
+++ b/src/gui/tags/TagsView.h
@@ -2,7 +2,7 @@
 #define TAGSVIEW_H_
 
 #include <vector>
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 
 namespace ui
 {
diff --git a/src/update/UpdateActivity.cpp b/src/gui/update/UpdateActivity.cpp
index 8e4ee05..7eadf7f 100644
--- a/src/update/UpdateActivity.cpp
+++ b/src/gui/update/UpdateActivity.cpp
@@ -1,7 +1,7 @@
 #include <bzlib.h>
 #include <sstream>
-#include "dialogues/ConfirmPrompt.h"
-#include "interface/Engine.h"
+#include "gui/dialogues/ConfirmPrompt.h"
+#include "gui/interface/Engine.h"
 #include "UpdateActivity.h"
 #include "tasks/Task.h"
 #include "client/HTTP.h"
diff --git a/src/update/UpdateActivity.h b/src/gui/update/UpdateActivity.h
index 6ba5fb3..6ba5fb3 100644
--- a/src/update/UpdateActivity.h
+++ b/src/gui/update/UpdateActivity.h
diff --git a/src/simulation/SaveRenderer.cpp b/src/simulation/SaveRenderer.cpp
index 05601d9..4fabd95 100644
--- a/src/simulation/SaveRenderer.cpp
+++ b/src/simulation/SaveRenderer.cpp
@@ -3,7 +3,7 @@
 #include "graphics/Graphics.h"
 #include "Simulation.h"
 #include "graphics/Renderer.h"
-#include "search/Thumbnail.h"
+#include "gui/search/Thumbnail.h"
 
 
 SaveRenderer::SaveRenderer(){
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index d59ac51..bec937f 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -18,7 +18,7 @@
 //#include "graphics/Graphics.h"
 #include "Misc.h"
 #include "Tools.h"
-#include "game/Brush.h"
+#include "gui/game/Brush.h"
 #include "client/GameSave.h"
 #include "Sample.h"
 #include "Snapshot.h"
diff --git a/src/tasks/TaskWindow.cpp b/src/tasks/TaskWindow.cpp
index 69a7751..f780d32 100644
--- a/src/tasks/TaskWindow.cpp
+++ b/src/tasks/TaskWindow.cpp
@@ -1,8 +1,8 @@
 #include <sstream>
-#include "interface/Label.h"
+#include "gui/interface/Label.h"
 #include "TaskWindow.h"
-#include "dialogues/ErrorMessage.h"
-#include "Style.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/Style.h"
 #include "Task.h"
 
 TaskWindow::TaskWindow(std::string title_, Task * task_, bool closeOnDone):
diff --git a/src/tasks/TaskWindow.h b/src/tasks/TaskWindow.h
index 4b5313f..44acd22 100644
--- a/src/tasks/TaskWindow.h
+++ b/src/tasks/TaskWindow.h
@@ -2,8 +2,8 @@
 #define TASKWINDOW_H_
 
 #include <string>
-#include "interface/Label.h"
-#include "interface/Window.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Window.h"
 #include "tasks/TaskListener.h"
 
 class Task;