diff --git a/agui2/alibexceptionhandler.cpp b/agui2/AlibExceptionHandler.cpp
similarity index 96%
rename from agui2/alibexceptionhandler.cpp
rename to agui2/AlibExceptionHandler.cpp
index 45a506be2ddb3659ce69ad487639a69498c9c857..6dbcdcd148a686edd3187ca950fa84195a11aab5 100644
--- a/agui2/alibexceptionhandler.cpp
+++ b/agui2/AlibExceptionHandler.cpp
@@ -1,4 +1,4 @@
-#include <alibexceptionhandler.h>
+#include <AlibExceptionHandler.h>
 
 #include <QRegExp>
 #include <QStringList>
diff --git a/agui2/alibexceptionhandler.h b/agui2/AlibExceptionHandler.h
similarity index 100%
rename from agui2/alibexceptionhandler.h
rename to agui2/AlibExceptionHandler.h
diff --git a/agui2/CMakeLists.txt b/agui2/CMakeLists.txt
index 472c2fe135ef895c118550a63a272afb5f8d7876..732cd5eee644859dbfc2eaee80a75d86b4b11ef4 100644
--- a/agui2/CMakeLists.txt
+++ b/agui2/CMakeLists.txt
@@ -32,49 +32,49 @@ include_directories(
 link_directories(${ALIB_PATH}/bin-debug)
 
 add_executable(${PROJECT_NAME}
-        graphics/dialogs/inputdialog.cpp
-        graphics/dialogs/inputdialog.h
-        graphics/dialogs/outputdialog.cpp
-        graphics/dialogs/outputdialog.h
-        graphics/dialogs/resultdialog.cpp
-        graphics/dialogs/resultdialog.h
-        graphics/doublegraphicsbox.cpp
-        graphics/doublegraphicsbox.h
-        graphics/graphicsbox.cpp
-        graphics/graphicsbox.h
-        graphics/graphicsconnection.cpp
-        graphics/graphicsconnection.h
-        graphics/graphicsscene.cpp
-        graphics/graphicsscene.h
-        graphics/inputgraphicsbox.cpp
-        graphics/inputgraphicsbox.h
-        graphics/outputgraphicsbox.cpp
-        graphics/outputgraphicsbox.h
-        models/doublemodelbox.cpp
-        models/doublemodelbox.h
-        models/inputmodelbox.cpp
-        models/inputmodelbox.h
-        models/modelbox.cpp
-        models/modelbox.h
-        models/outputmodelbox.cpp
-        models/outputmodelbox.h
-        models/singlemodelbox.cpp
-        models/singlemodelbox.h
-        alibexceptionhandler.cpp
-        alibexceptionhandler.h
-        connectionhelper.cpp
-        connectionhelper.h
-        converter.cpp
-        converter.h
-        graphvizintegrator.cpp
-        graphvizintegrator.h
+        Graphics/Dialogs/InputDialog.cpp
+        Graphics/Dialogs/InputDialog.h
+        Graphics/Dialogs/OutputDialog.cpp
+        Graphics/Dialogs/OutputDialog.h
+        Graphics/Dialogs/ResultDialog.cpp
+        Graphics/Dialogs/ResultDialog.h
+        Graphics/DoubleGraphicsBox.cpp
+        Graphics/DoubleGraphicsBox.h
+        Graphics/GraphicsBox.cpp
+        Graphics/GraphicsBox.h
+        Graphics/GraphicsConnection.cpp
+        Graphics/GraphicsConnection.h
+        Graphics/GraphicsScene.cpp
+        Graphics/GraphicsScene.h
+        Graphics/InputGraphicsBox.cpp
+        Graphics/InputGraphicsBox.h
+        Graphics/OutputGraphicsBox.cpp
+        Graphics/OutputGraphicsBox.h
+        Models/DoubleModelBox.cpp
+        Models/DoubleModelBox.h
+        Models/InputModelBox.cpp
+        Models/InputModelBox.h
+        Models/ModelBox.cpp
+        Models/ModelBox.h
+        Models/OutputModelBox.cpp
+        Models/OutputModelBox.h
+        Models/SingleModelBox.cpp
+        Models/SingleModelBox.h
+        AlibExceptionHandler.cpp
+        AlibExceptionHandler.h
+        ConnectionHelper.cpp
+        ConnectionHelper.h
+        Converter.cpp
+        Converter.h
+        GraphvizIntegrator.cpp
+        GraphvizIntegrator.h
         main.cpp
-        mainwindow.cpp
-        mainwindow.h
-        wrapperbox.cpp
-        wrapperbox.h
-        wrapperfactory.cpp
-        wrapperfactory.h)
+        MainWindow.cpp
+        MainWindow.h
+        WrapperBox.cpp
+        WrapperBox.h
+        WrapperFactory.cpp
+        WrapperFactory.h)
 
 target_link_libraries(
         ${PROJECT_NAME}
diff --git a/agui2/connectionhelper.cpp b/agui2/ConnectionHelper.cpp
similarity index 95%
rename from agui2/connectionhelper.cpp
rename to agui2/ConnectionHelper.cpp
index b50a801ad1d8036c216bfc4c5e4ffacd7288248d..1b105a88d4bbddc13a2442d5716181b8cef61b28 100644
--- a/agui2/connectionhelper.cpp
+++ b/agui2/ConnectionHelper.cpp
@@ -1,4 +1,4 @@
-#include <connectionhelper.h>
+#include <ConnectionHelper.h>
 
 #include <QGraphicsScene>
 
diff --git a/agui2/connectionhelper.h b/agui2/ConnectionHelper.h
similarity index 79%
rename from agui2/connectionhelper.h
rename to agui2/ConnectionHelper.h
index 155ddc30c132ad4b18633e71dee4eaf030f5a8b6..a0520b067b9f33637a4518fafc628c2e32328150 100644
--- a/agui2/connectionhelper.h
+++ b/agui2/ConnectionHelper.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <graphics/graphicsconnection.h>
-#include <graphics/graphicsbox.h>
+#include <Graphics/GraphicsConnection.h>
+#include <Graphics/GraphicsBox.h>
 
 class ConnectionHelper
 {
diff --git a/agui2/converter.cpp b/agui2/Converter.cpp
similarity index 98%
rename from agui2/converter.cpp
rename to agui2/Converter.cpp
index 38b5fcb6f765a37d65c4dd890ffc2faf2256f660..bbd1f5e22ddf62d7a65b6f1784b13b28cc15e492 100644
--- a/agui2/converter.cpp
+++ b/agui2/Converter.cpp
@@ -7,8 +7,8 @@
 #include <sax/SaxParseInterface.h>
 #include <sax/SaxComposeInterface.h>
 
-#include <converter.h>
-#include <graphvizintegrator.h>
+#include <Converter.h>
+#include <GraphvizIntegrator.h>
 
 #include <QDomComment>
 
diff --git a/agui2/converter.h b/agui2/Converter.h
similarity index 100%
rename from agui2/converter.h
rename to agui2/Converter.h
diff --git a/agui2/dialog.ui b/agui2/Dialog.ui
similarity index 100%
rename from agui2/dialog.ui
rename to agui2/Dialog.ui
diff --git a/agui2/graphics/dialogs/inputdialog.cpp b/agui2/Graphics/Dialogs/InputDialog.cpp
similarity index 98%
rename from agui2/graphics/dialogs/inputdialog.cpp
rename to agui2/Graphics/Dialogs/InputDialog.cpp
index 0d9d1caffd57dec976afcb935609c59acd092c9e..c403d67a4738d3965fb56fbcc8b742c2907c46e1 100644
--- a/agui2/graphics/dialogs/inputdialog.cpp
+++ b/agui2/Graphics/Dialogs/InputDialog.cpp
@@ -1,8 +1,8 @@
 #include <common/AlgorithmHelper.h>
 #include <abstraction/ImmediateValueAbstraction.hpp>
-#include <converter.h>
-#include <graphics/dialogs/inputdialog.h>
-#include <graphvizintegrator.h>
+#include <Converter.h>
+#include <Graphics/Dialogs/InputDialog.h>
+#include <GraphvizIntegrator.h>
 
 #include <gvc.h>
 #include <QImage>
diff --git a/agui2/graphics/dialogs/inputdialog.h b/agui2/Graphics/Dialogs/InputDialog.h
similarity index 94%
rename from agui2/graphics/dialogs/inputdialog.h
rename to agui2/Graphics/Dialogs/InputDialog.h
index 118505a87c372c0c6d297b5c1ff4f45bcc0e3a5f..7faa6502bbd256e7969bc689fc70e26127b2ba82 100644
--- a/agui2/graphics/dialogs/inputdialog.h
+++ b/agui2/Graphics/Dialogs/InputDialog.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <models/inputmodelbox.h>
+#include <Models/InputModelBox.h>
 #include <abstraction/OperationAbstraction.hpp>
 
-#include <ui_inputdialog.h>
+#include <ui_InputDialog.h>
 
 #include <QDialog>
 
diff --git a/agui2/graphics/dialogs/inputdialog.ui b/agui2/Graphics/Dialogs/InputDialog.ui
similarity index 100%
rename from agui2/graphics/dialogs/inputdialog.ui
rename to agui2/Graphics/Dialogs/InputDialog.ui
diff --git a/agui2/graphics/dialogs/outputdialog.cpp b/agui2/Graphics/Dialogs/OutputDialog.cpp
similarity index 97%
rename from agui2/graphics/dialogs/outputdialog.cpp
rename to agui2/Graphics/Dialogs/OutputDialog.cpp
index 09915bb11c5cbc4a66bc1a1aad2cfc23e94c24e2..a0a50dc4d7f9855e7dfe6ab1731bcc9e136fd58c 100644
--- a/agui2/graphics/dialogs/outputdialog.cpp
+++ b/agui2/Graphics/Dialogs/OutputDialog.cpp
@@ -1,5 +1,5 @@
-#include <graphics/dialogs/outputdialog.h>
-#include <ui_outputdialog.h>
+#include <Graphics/Dialogs/OutputDialog.h>
+#include <ui_OutputDialog.h>
 
 #include <QFileDialog>
 #include <QTextStream>
diff --git a/agui2/graphics/dialogs/outputdialog.h b/agui2/Graphics/Dialogs/OutputDialog.h
similarity index 87%
rename from agui2/graphics/dialogs/outputdialog.h
rename to agui2/Graphics/Dialogs/OutputDialog.h
index 98ed196b48dc2480fc565e16529128be1ab60f0e..f00dd24b98a2540bd15a5f3ce35e6e31a561f05a 100644
--- a/agui2/graphics/dialogs/outputdialog.h
+++ b/agui2/Graphics/Dialogs/OutputDialog.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <graphics/outputgraphicsbox.h>
-#include <models/outputmodelbox.h>
+#include <Graphics/OutputGraphicsBox.h>
+#include <Models/OutputModelBox.h>
 
 #include <QDialog>
-#include <ui_outputdialog.h>
+#include <ui_OutputDialog.h>
 
 struct OutputSettings;
 
diff --git a/agui2/graphics/dialogs/outputdialog.ui b/agui2/Graphics/Dialogs/OutputDialog.ui
similarity index 100%
rename from agui2/graphics/dialogs/outputdialog.ui
rename to agui2/Graphics/Dialogs/OutputDialog.ui
diff --git a/agui2/graphics/dialogs/resultdialog.cpp b/agui2/Graphics/Dialogs/ResultDialog.cpp
similarity index 93%
rename from agui2/graphics/dialogs/resultdialog.cpp
rename to agui2/Graphics/Dialogs/ResultDialog.cpp
index 826f44840572960fa9ff6cef17de73095fc22c60..fdf8d03823591be584373c690970159c1e9e7e4d 100644
--- a/agui2/graphics/dialogs/resultdialog.cpp
+++ b/agui2/Graphics/Dialogs/ResultDialog.cpp
@@ -1,5 +1,5 @@
-#include <graphics/dialogs/resultdialog.h>
-#include <ui_resultdialog.h>
+#include <Graphics/Dialogs/ResultDialog.h>
+#include <ui_ResultDialog.h>
 #include <QPixmap>
 #include <QDesktopWidget>
 #include <QPlainTextEdit>
diff --git a/agui2/graphics/dialogs/resultdialog.h b/agui2/Graphics/Dialogs/ResultDialog.h
similarity index 92%
rename from agui2/graphics/dialogs/resultdialog.h
rename to agui2/Graphics/Dialogs/ResultDialog.h
index d471b5059e77b55376fffa21c7990e92651f9515..9bdb572995e3f4a300dc3a360e763177cab3bd80 100644
--- a/agui2/graphics/dialogs/resultdialog.h
+++ b/agui2/Graphics/Dialogs/ResultDialog.h
@@ -4,7 +4,7 @@
 
 #include <QDialog>
 #include <QImage>
-#include <ui_resultdialog.h>
+#include <ui_ResultDialog.h>
 
 class ResultDialog : public QDialog
 {
diff --git a/agui2/graphics/dialogs/resultdialog.ui b/agui2/Graphics/Dialogs/ResultDialog.ui
similarity index 100%
rename from agui2/graphics/dialogs/resultdialog.ui
rename to agui2/Graphics/Dialogs/ResultDialog.ui
diff --git a/agui2/graphics/doublegraphicsbox.cpp b/agui2/Graphics/DoubleGraphicsBox.cpp
similarity index 97%
rename from agui2/graphics/doublegraphicsbox.cpp
rename to agui2/Graphics/DoubleGraphicsBox.cpp
index 4cd922fd5a847866877d16bd5f8cee2ce3273c6b..5648c3fbf558418c844493d7ec19875cafca477b 100644
--- a/agui2/graphics/doublegraphicsbox.cpp
+++ b/agui2/Graphics/DoubleGraphicsBox.cpp
@@ -1,4 +1,4 @@
-#include <graphics/doublegraphicsbox.h>
+#include <Graphics/DoubleGraphicsBox.h>
 
 #include <iostream>
 #include <QGraphicsScene>
diff --git a/agui2/graphics/doublegraphicsbox.h b/agui2/Graphics/DoubleGraphicsBox.h
similarity index 94%
rename from agui2/graphics/doublegraphicsbox.h
rename to agui2/Graphics/DoubleGraphicsBox.h
index 45cb407a0ac25bc20738d640f4c7d63a166fe43e..c6ba0decdd456be86f726af37b24016aa96eb938 100644
--- a/agui2/graphics/doublegraphicsbox.h
+++ b/agui2/Graphics/DoubleGraphicsBox.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <graphics/graphicsbox.h>
+#include <Graphics/GraphicsBox.h>
 
 
 class DoubleGraphicsBox : public GraphicsBox
diff --git a/agui2/graphics/graphicsbox.cpp b/agui2/Graphics/GraphicsBox.cpp
similarity index 94%
rename from agui2/graphics/graphicsbox.cpp
rename to agui2/Graphics/GraphicsBox.cpp
index 40ffaf35c17136dc190a252233dc1b53fa92efa1..5d4e73b732fdf8e54fb92cb69974bb3ea3fe83fd 100644
--- a/agui2/graphics/graphicsbox.cpp
+++ b/agui2/Graphics/GraphicsBox.cpp
@@ -1,8 +1,8 @@
-#include <graphics/graphicsbox.h>
-#include <graphics/graphicsconnection.h>
-#include <graphics/graphicsscene.h>
-#include <connectionhelper.h>
-#include <graphics/dialogs/inputdialog.h>
+#include <Graphics/GraphicsBox.h>
+#include <Graphics/GraphicsConnection.h>
+#include <Graphics/GraphicsScene.h>
+#include <ConnectionHelper.h>
+#include <Graphics/Dialogs/InputDialog.h>
 
 #include <QGraphicsSceneContextMenuEvent>
 #include <QDialog>
diff --git a/agui2/graphics/graphicsbox.h b/agui2/Graphics/GraphicsBox.h
similarity index 95%
rename from agui2/graphics/graphicsbox.h
rename to agui2/Graphics/GraphicsBox.h
index ae6e860434958708d08e9f3b4d77c2c51a0cc33e..60a5b4a9362c6fedc95c8e91e8af02fd407563ae 100644
--- a/agui2/graphics/graphicsbox.h
+++ b/agui2/Graphics/GraphicsBox.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <graphics/graphicsconnection.h>
-#include <wrapperbox.h>
+#include <Graphics/GraphicsConnection.h>
+#include <WrapperBox.h>
 
 #include <QAction>
 #include <QBrush>
diff --git a/agui2/graphics/graphicsconnection.cpp b/agui2/Graphics/GraphicsConnection.cpp
similarity index 98%
rename from agui2/graphics/graphicsconnection.cpp
rename to agui2/Graphics/GraphicsConnection.cpp
index ec50cdc59b16b459f98d2f18731753ebdc0cc622..b20d17f5837d73293bc2b03b82099b2480c6f67f 100644
--- a/agui2/graphics/graphicsconnection.cpp
+++ b/agui2/Graphics/GraphicsConnection.cpp
@@ -1,5 +1,5 @@
-#include <graphics/graphicsconnection.h>
-#include <connectionhelper.h>
+#include <Graphics/GraphicsConnection.h>
+#include <ConnectionHelper.h>
 
 #include <QMenu>
 #include <QAction>
diff --git a/agui2/graphics/graphicsconnection.h b/agui2/Graphics/GraphicsConnection.h
similarity index 97%
rename from agui2/graphics/graphicsconnection.h
rename to agui2/Graphics/GraphicsConnection.h
index cbdeb9ccf6841b1be57e59db17d314518a5e5f1f..f539fe64d2f3a8ca5d5bfb11c542e2015fc8b2f4 100644
--- a/agui2/graphics/graphicsconnection.h
+++ b/agui2/Graphics/GraphicsConnection.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <tuple>
-#include <graphics/graphicsbox.h>
+#include <Graphics/GraphicsBox.h>
 
 #include <QGraphicsItem>
 #include <QGraphicsSceneMouseEvent>
diff --git a/agui2/graphics/graphicsscene.cpp b/agui2/Graphics/GraphicsScene.cpp
similarity index 88%
rename from agui2/graphics/graphicsscene.cpp
rename to agui2/Graphics/GraphicsScene.cpp
index 7c09618ae404f5593947aca347c9f7846755ef4a..2409219296ef716b470edf4931c3870202f2ea59 100644
--- a/agui2/graphics/graphicsscene.cpp
+++ b/agui2/Graphics/GraphicsScene.cpp
@@ -1,6 +1,6 @@
-#include <graphics/graphicsscene.h>
-#include <graphics/graphicsbox.h>
-#include <connectionhelper.h>
+#include <Graphics/GraphicsScene.h>
+#include <Graphics/GraphicsBox.h>
+#include <ConnectionHelper.h>
 
 #include <QGraphicsView>
 
diff --git a/agui2/graphics/graphicsscene.h b/agui2/Graphics/GraphicsScene.h
similarity index 89%
rename from agui2/graphics/graphicsscene.h
rename to agui2/Graphics/GraphicsScene.h
index bb5585dfbd0809d88fd7f0de6234d72df5ab23b2..292c7e82749f960600289d237a2c8c8d7cb9b465 100644
--- a/agui2/graphics/graphicsscene.h
+++ b/agui2/Graphics/GraphicsScene.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <graphics/graphicsconnection.h>
+#include <Graphics/GraphicsConnection.h>
 
 #include <QGraphicsScene>
 #include <QObject>
diff --git a/agui2/graphics/inputgraphicsbox.cpp b/agui2/Graphics/InputGraphicsBox.cpp
similarity index 90%
rename from agui2/graphics/inputgraphicsbox.cpp
rename to agui2/Graphics/InputGraphicsBox.cpp
index 3b836e91c8709a41d9d4dc8534c12ea422c145a3..0b85039eca86f2d728b58f4696cbde37fb21e0c6 100644
--- a/agui2/graphics/inputgraphicsbox.cpp
+++ b/agui2/Graphics/InputGraphicsBox.cpp
@@ -1,7 +1,7 @@
-#include <graphics/inputgraphicsbox.h>
-#include <connectionhelper.h>
-#include <graphics/dialogs/inputdialog.h>
-#include <models/inputmodelbox.h>
+#include <Graphics/InputGraphicsBox.h>
+#include <ConnectionHelper.h>
+#include <Graphics/Dialogs/InputDialog.h>
+#include <Models/InputModelBox.h>
 
 #include <QMenu>
 #include <QAction>
diff --git a/agui2/graphics/inputgraphicsbox.h b/agui2/Graphics/InputGraphicsBox.h
similarity index 86%
rename from agui2/graphics/inputgraphicsbox.h
rename to agui2/Graphics/InputGraphicsBox.h
index 7aaac5d5974f28bf0ee4ed32fa1554761f6bf83d..fe7d460abbcf53d8b6d396cd2f3aa38732e06d88 100644
--- a/agui2/graphics/inputgraphicsbox.h
+++ b/agui2/Graphics/InputGraphicsBox.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <graphics/graphicsbox.h>
-#include <graphics/dialogs/inputdialog.h>
+#include <Graphics/GraphicsBox.h>
+#include <Graphics/Dialogs/InputDialog.h>
 
 class GraphicsBox;
 
diff --git a/agui2/graphics/outputgraphicsbox.cpp b/agui2/Graphics/OutputGraphicsBox.cpp
similarity index 94%
rename from agui2/graphics/outputgraphicsbox.cpp
rename to agui2/Graphics/OutputGraphicsBox.cpp
index d770d14e4aab7b44f77d36c5239590ed5462a65b..9e6e333f2b06e05dbe4d8e5fe942386ea3267f74 100644
--- a/agui2/graphics/outputgraphicsbox.cpp
+++ b/agui2/Graphics/OutputGraphicsBox.cpp
@@ -1,4 +1,4 @@
-#include <graphics/outputgraphicsbox.h>
+#include <Graphics/OutputGraphicsBox.h>
 
 #include <QMenu>
 #include <QAction>
diff --git a/agui2/graphics/outputgraphicsbox.h b/agui2/Graphics/OutputGraphicsBox.h
similarity index 73%
rename from agui2/graphics/outputgraphicsbox.h
rename to agui2/Graphics/OutputGraphicsBox.h
index fef9f01000fa09d90ac3aec3b2afe3a235c896c6..0dfd1ea3049323e62ded77a1a310b23adbc81f2f 100644
--- a/agui2/graphics/outputgraphicsbox.h
+++ b/agui2/Graphics/OutputGraphicsBox.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <graphics/graphicsbox.h>
-#include <graphics/dialogs/outputdialog.h>
-#include <models/outputmodelbox.h>
+#include <Graphics/GraphicsBox.h>
+#include <Graphics/Dialogs/OutputDialog.h>
+#include <Models/OutputModelBox.h>
 
 class OutputDialog;
 
diff --git a/agui2/graphvizintegrator.cpp b/agui2/GraphvizIntegrator.cpp
similarity index 97%
rename from agui2/graphvizintegrator.cpp
rename to agui2/GraphvizIntegrator.cpp
index b5b70b776499fd6a2add0698f8ea801504b45054..2b59306680c0771a58924f45d767c72d61bf1025 100644
--- a/agui2/graphvizintegrator.cpp
+++ b/agui2/GraphvizIntegrator.cpp
@@ -1,5 +1,5 @@
 
-#include <graphvizintegrator.h>
+#include <GraphvizIntegrator.h>
 #include <gvc.h>
 
 QString selectFormat(GraphvizIntegrator::PictureFormat format) {
diff --git a/agui2/graphvizintegrator.h b/agui2/GraphvizIntegrator.h
similarity index 100%
rename from agui2/graphvizintegrator.h
rename to agui2/GraphvizIntegrator.h
diff --git a/agui2/mainwindow.cpp b/agui2/MainWindow.cpp
similarity index 96%
rename from agui2/mainwindow.cpp
rename to agui2/MainWindow.cpp
index a4e2d2746f382da3a30d4e076c4d3bcc54c98110..405ab2cd4297cc80b068fce613e24abbb4f5eae2 100644
--- a/agui2/mainwindow.cpp
+++ b/agui2/MainWindow.cpp
@@ -1,12 +1,12 @@
 #include <iostream>
 
-#include <mainwindow.h>
-#include <ui_mainwindow.h>
-#include <graphics/inputgraphicsbox.h>
-#include <graphics/outputgraphicsbox.h>
-#include <graphics/dialogs/inputdialog.h>
-#include <wrapperfactory.h>
-#include <connectionhelper.h>
+#include <MainWindow.h>
+#include <ui_MainWindow.h>
+#include <Graphics/InputGraphicsBox.h>
+#include <Graphics/OutputGraphicsBox.h>
+#include <Graphics/Dialogs/InputDialog.h>
+#include <WrapperFactory.h>
+#include <ConnectionHelper.h>
 
 #include <QFileDialog>
 #include <QGraphicsItem>
diff --git a/agui2/mainwindow.h b/agui2/MainWindow.h
similarity index 93%
rename from agui2/mainwindow.h
rename to agui2/MainWindow.h
index 6ff131f53254afb71fe1fb0d6c4234298d8adead..48847c60e9578e1722be738a130b722901c151c7 100644
--- a/agui2/mainwindow.h
+++ b/agui2/MainWindow.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <wrapperbox.h>
-#include <graphics/graphicsscene.h>
+#include <WrapperBox.h>
+#include <Graphics/GraphicsScene.h>
 
 #include <memory>
 
@@ -10,7 +10,7 @@
 #include <QGraphicsScene>
 #include <QGraphicsItem>
 
-#include <ui_mainwindow.h>
+#include <ui_MainWindow.h>
 
 class MainWindow : public QMainWindow
 {
diff --git a/agui2/mainwindow.ui b/agui2/MainWindow.ui
similarity index 100%
rename from agui2/mainwindow.ui
rename to agui2/MainWindow.ui
diff --git a/agui2/models/doublemodelbox.cpp b/agui2/Models/DoubleModelBox.cpp
similarity index 98%
rename from agui2/models/doublemodelbox.cpp
rename to agui2/Models/DoubleModelBox.cpp
index 48b74ddeab2eeec529c80b6001d97d6e3df57b50..2118afe0bd7d8bdc19edc6e8605792297ebbe85a 100644
--- a/agui2/models/doublemodelbox.cpp
+++ b/agui2/Models/DoubleModelBox.cpp
@@ -1,5 +1,5 @@
 #include <common/AlgorithmHelper.h>
-#include <models/doublemodelbox.h>
+#include <Models/DoubleModelBox.h>
 
 DoubleModelBox::DoubleModelBox(std::string func)
 {
diff --git a/agui2/models/doublemodelbox.h b/agui2/Models/DoubleModelBox.h
similarity index 96%
rename from agui2/models/doublemodelbox.h
rename to agui2/Models/DoubleModelBox.h
index 98da2e57dbc9ed50eaf4ae9a1fa4ae74d2edac86..b866c439da665c3e319a313ff302648da01af2cf 100644
--- a/agui2/models/doublemodelbox.h
+++ b/agui2/Models/DoubleModelBox.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <models/modelbox.h>
+#include <Models/ModelBox.h>
 
 class DoubleModelBox : public ModelBox
 {
diff --git a/agui2/models/inputmodelbox.cpp b/agui2/Models/InputModelBox.cpp
similarity index 96%
rename from agui2/models/inputmodelbox.cpp
rename to agui2/Models/InputModelBox.cpp
index 5600d75391ae7bcd89d6e1110252b7e54f589507..0a8e7f49962c0eee6809f94f6b5c85c3a71034c6 100644
--- a/agui2/models/inputmodelbox.cpp
+++ b/agui2/Models/InputModelBox.cpp
@@ -1,4 +1,4 @@
-#include <models/inputmodelbox.h>
+#include <Models/InputModelBox.h>
 
 InputModelBox::InputModelBox()
 {
diff --git a/agui2/models/inputmodelbox.h b/agui2/Models/InputModelBox.h
similarity index 97%
rename from agui2/models/inputmodelbox.h
rename to agui2/Models/InputModelBox.h
index db77c06dd70363080fae07e5fdb0e4ef62c823f9..d2d8e7fbc20e747c0f960c61fbc28851877a65ae 100644
--- a/agui2/models/inputmodelbox.h
+++ b/agui2/Models/InputModelBox.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <models/modelbox.h>
+#include <Models/ModelBox.h>
 
 struct InputSettings
 {
diff --git a/agui2/models/modelbox.cpp b/agui2/Models/ModelBox.cpp
similarity index 53%
rename from agui2/models/modelbox.cpp
rename to agui2/Models/ModelBox.cpp
index e1c9fe3319b2ef0084eba671d8a397751987d192..9dafa92b62b30b777a8eb7153d90db25dca37dbe 100644
--- a/agui2/models/modelbox.cpp
+++ b/agui2/Models/ModelBox.cpp
@@ -1,5 +1,5 @@
-#include <models/modelbox.h>
-#include <graphics/inputgraphicsbox.h>
+#include <Models/ModelBox.h>
+#include <Graphics/InputGraphicsBox.h>
 
 void ModelBox::setWrapper( WrapperBox* wrapper )
 {
diff --git a/agui2/models/modelbox.h b/agui2/Models/ModelBox.h
similarity index 93%
rename from agui2/models/modelbox.h
rename to agui2/Models/ModelBox.h
index 62cfa23ad149b529ba104076360049fdfb712699..0975e8c27788792c07534c829514e6e04621d166 100644
--- a/agui2/models/modelbox.h
+++ b/agui2/Models/ModelBox.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <wrapperbox.h>
+#include <WrapperBox.h>
 
 #include <abstraction/OperationAbstraction.hpp>
 #include <exception/CommonException.h>
 
 #include <memory>
 
-#include <alibexceptionhandler.h>
+#include <AlibExceptionHandler.h>
 #include <QString>
 #include <QList>
 
diff --git a/agui2/models/outputmodelbox.cpp b/agui2/Models/OutputModelBox.cpp
similarity index 97%
rename from agui2/models/outputmodelbox.cpp
rename to agui2/Models/OutputModelBox.cpp
index 855bc31c16c6237ac7ecb251fe66181e14216756..c4ab759748891fcc36c9c5f7ba18501c93c02f78 100644
--- a/agui2/models/outputmodelbox.cpp
+++ b/agui2/Models/OutputModelBox.cpp
@@ -1,7 +1,7 @@
-#include <models/outputmodelbox.h>
-#include <graphics/dialogs/resultdialog.h>
-#include <mainwindow.h>
-#include <converter.h>
+#include <Models/OutputModelBox.h>
+#include <Graphics/Dialogs/ResultDialog.h>
+#include <MainWindow.h>
+#include <Converter.h>
 
 #include <QDomDocument>
 #include <QMessageBox>
diff --git a/agui2/models/outputmodelbox.h b/agui2/Models/OutputModelBox.h
similarity index 97%
rename from agui2/models/outputmodelbox.h
rename to agui2/Models/OutputModelBox.h
index 3f2d8a85c36ceb34c374fc679e575d74bcb39647..ccff8f160ceffe29b45f25964854ab205f2dc9b9 100644
--- a/agui2/models/outputmodelbox.h
+++ b/agui2/Models/OutputModelBox.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <models/modelbox.h>
-#include <graphvizintegrator.h>
+#include <Models/ModelBox.h>
+#include <GraphvizIntegrator.h>
 
 struct OutputSettings {
     enum format {
diff --git a/agui2/models/singlemodelbox.cpp b/agui2/Models/SingleModelBox.cpp
similarity index 97%
rename from agui2/models/singlemodelbox.cpp
rename to agui2/Models/SingleModelBox.cpp
index 077bf3e93d466c9ddf8cea9a2b2e42b87547c756..e0bcd10d1757ee8cf2f5154ae3b8c82d72eb026c 100644
--- a/agui2/models/singlemodelbox.cpp
+++ b/agui2/Models/SingleModelBox.cpp
@@ -1,5 +1,5 @@
 #include <common/AlgorithmHelper.h>
-#include <models/singlemodelbox.h>
+#include <Models/SingleModelBox.h>
 
 SingleModelBox::SingleModelBox( std::string func )
 {
diff --git a/agui2/models/singlemodelbox.h b/agui2/Models/SingleModelBox.h
similarity index 96%
rename from agui2/models/singlemodelbox.h
rename to agui2/Models/SingleModelBox.h
index b57a00ec91c14bf984de043ac36bace939b94e17..d234f10c48ebe90ce26381f1a8fd7c998b8a045d 100644
--- a/agui2/models/singlemodelbox.h
+++ b/agui2/Models/SingleModelBox.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <models/modelbox.h>
+#include <Models/ModelBox.h>
 
 class SingleModelBox : public ModelBox
 {
diff --git a/agui2/wrapperbox.cpp b/agui2/WrapperBox.cpp
similarity index 98%
rename from agui2/wrapperbox.cpp
rename to agui2/WrapperBox.cpp
index 50c3ae670abd88c215078ab3917125fab88b7102..6434c384ed03c5e0bb203df74c777ae8794f8df8 100644
--- a/agui2/wrapperbox.cpp
+++ b/agui2/WrapperBox.cpp
@@ -1,4 +1,4 @@
-#include <wrapperbox.h>
+#include <WrapperBox.h>
 
 WrapperBox::WrapperBox( ModelBox * model, GraphicsBox * graphics ) :
     m_model( model ), m_graphics( graphics )
diff --git a/agui2/wrapperbox.h b/agui2/WrapperBox.h
similarity index 85%
rename from agui2/wrapperbox.h
rename to agui2/WrapperBox.h
index 78be1397b7d2dca4d13266991bbc21456a3ae991..dd371d5abd96effd9b06e1a4e85163c299bfcb26 100644
--- a/agui2/wrapperbox.h
+++ b/agui2/WrapperBox.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <models/modelbox.h>
-#include <graphics/graphicsbox.h>
-#include <graphics/graphicsconnection.h>
+#include <Models/ModelBox.h>
+#include <Graphics/GraphicsBox.h>
+#include <Graphics/GraphicsConnection.h>
 
 class ModelBox;
 class GraphicsBox;
diff --git a/agui2/wrapperfactory.cpp b/agui2/WrapperFactory.cpp
similarity index 93%
rename from agui2/wrapperfactory.cpp
rename to agui2/WrapperFactory.cpp
index 080a47bec0fb380b465170e5cb0d37ea32ead514..47638d93ac62ca5b65ac82769b53add0fe577c50 100644
--- a/agui2/wrapperfactory.cpp
+++ b/agui2/WrapperFactory.cpp
@@ -1,11 +1,11 @@
-#include <wrapperfactory.h>
-#include <graphics/inputgraphicsbox.h>
-#include <graphics/outputgraphicsbox.h>
-#include <graphics/doublegraphicsbox.h>
-#include <models/inputmodelbox.h>
-#include <models/outputmodelbox.h>
-#include <models/singlemodelbox.h>
-#include <models/doublemodelbox.h>
+#include <WrapperFactory.h>
+#include <Graphics/InputGraphicsBox.h>
+#include <Graphics/OutputGraphicsBox.h>
+#include <Graphics/DoubleGraphicsBox.h>
+#include <Models/InputModelBox.h>
+#include <Models/OutputModelBox.h>
+#include <Models/SingleModelBox.h>
+#include <Models/DoubleModelBox.h>
 
 #include <QChar>
 #include <QString>
diff --git a/agui2/wrapperfactory.h b/agui2/WrapperFactory.h
similarity index 96%
rename from agui2/wrapperfactory.h
rename to agui2/WrapperFactory.h
index 29ebcded9a78773602deb39227421d001dd66125..a8257e8117d070d51b36ab783c8e232f1c336aa6 100644
--- a/agui2/wrapperfactory.h
+++ b/agui2/WrapperFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <wrapperbox.h>
+#include <WrapperBox.h>
 
 class WrapperBox;
 
diff --git a/agui2/main.cpp b/agui2/main.cpp
index ba07cefdd134ef15f466099845dbee9bd232f401..24e57324a44d13056d8771bb596a42ebc38f2aa7 100644
--- a/agui2/main.cpp
+++ b/agui2/main.cpp
@@ -1,4 +1,4 @@
-#include <mainwindow.h>
+#include <MainWindow.h>
 #include <QApplication>
 
 int main(int argc, char *argv[])