diff --git a/CMakeLists.txt b/CMakeLists.txt
index a177a4f..f68cc1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,23 +26,23 @@ find_package (Eigen3 3.3 REQUIRED NO_MODULE)
 
 qt_add_executable(${AppExec}
     static/resources.qrc
-    src/gui/main.cpp
-    src/gui/Interface.cpp
-    src/gui/UtilWidgets/Splitter.cpp
-    src/gui/viewport/Viewport.cpp
-    src/gui/viewport/ViewportGLWidget.cpp
-    src/gui/viewport/GLCamera.cpp
-    src/gui/viewport/GLMesh.cpp
-    src/gui/viewport/GLGrid.cpp
-    src/gui/network/NetworkGraphicsView.cpp
-    src/gui/network/NetworkGraphicsScene.cpp
-    src/gui/network/Network.cpp
-    src/gui/network/NodeGraphic.cpp
-    src/gui/network/SocketGraphic.cpp
-    src/gui/network/NodeEdgeGraphic.cpp
-    src/gui/network/FloatingEdgeGraphic.cpp
-    src/gui/network/DisplayFlagButton.cpp
-    src/gui/network/NodeIconGraphic.cpp
+    src/Gui/main.cpp
+    src/Gui/Interface.cpp
+    src/Gui/UtilWidgets/Splitter.cpp
+    src/Gui/Viewport/Viewport.cpp
+    src/Gui/Viewport/ViewportGLWidget.cpp
+    src/Gui/Viewport/GLCamera.cpp
+    src/Gui/Viewport/GLMesh.cpp
+    src/Gui/Viewport/GLGrid.cpp
+    src/Gui/Network/NetworkGraphicsView.cpp
+    src/Gui/Network/NetworkGraphicsScene.cpp
+    src/Gui/Network/Network.cpp
+    src/Gui/Network/NodeGraphic.cpp
+    src/Gui/Network/SocketGraphic.cpp
+    src/Gui/Network/NodeEdgeGraphic.cpp
+    src/Gui/Network/FloatingEdgeGraphic.cpp
+    src/Gui/Network/DisplayFlagButton.cpp
+    src/Gui/Network/NodeIconGraphic.cpp
 
     src/Engine/Operator/Attribute.cpp
     src/Engine/Operator/Geometry.cpp
diff --git a/src/gui/Interface.cpp b/src/Gui/Interface.cpp
similarity index 90%
rename from src/gui/Interface.cpp
rename to src/Gui/Interface.cpp
index 98356bd..d82f59c 100644
--- a/src/gui/Interface.cpp
+++ b/src/Gui/Interface.cpp
@@ -1,11 +1,11 @@
-#include "gui/Interface.h"
+#include "Gui/Interface.h"
 #include "Engine/Network/NetworkManager.h"
-#include "gui/viewport/Viewport.h"
-#include "gui/network/Network.h"
+#include "Gui/Viewport/Viewport.h"
+#include "Gui/Network/Network.h"
 #include <qpushbutton.h>
 #include <qsplitter.h>
 #include <QTimer>
-#include <gui/UtilWidgets/Splitter.h>
+#include <Gui/UtilWidgets/Splitter.h>
 
 EnzoUI::EnzoUI()
 {
diff --git a/src/gui/Interface.h b/src/Gui/Interface.h
similarity index 88%
rename from src/gui/Interface.h
rename to src/Gui/Interface.h
index 0b551bf..6d4b504 100644
--- a/src/gui/Interface.h
+++ b/src/Gui/Interface.h
@@ -2,7 +2,7 @@
 #include <QWidget>
 #include <QBoxLayout>
 #include <QSplitter>
-#include <gui/UtilWidgets/Splitter.h>
+#include <Gui/UtilWidgets/Splitter.h>
 
 class EnzoUI
 : public QWidget
diff --git a/src/gui/network/DisplayFlagButton.cpp b/src/Gui/Network/DisplayFlagButton.cpp
similarity index 95%
rename from src/gui/network/DisplayFlagButton.cpp
rename to src/Gui/Network/DisplayFlagButton.cpp
index 21367a0..df224b4 100644
--- a/src/gui/network/DisplayFlagButton.cpp
+++ b/src/Gui/Network/DisplayFlagButton.cpp
@@ -1,5 +1,5 @@
-#include "gui/network/DisplayFlagButton.h"
-#include "gui/network/NodeGraphic.h"
+#include "Gui/Network/DisplayFlagButton.h"
+#include "Gui/Network/NodeGraphic.h"
 #include <QPainter>
 #include <qgraphicsitem.h>
 #include <qnamespace.h>
diff --git a/src/gui/network/DisplayFlagButton.h b/src/Gui/Network/DisplayFlagButton.h
similarity index 100%
rename from src/gui/network/DisplayFlagButton.h
rename to src/Gui/Network/DisplayFlagButton.h
diff --git a/src/gui/network/FloatingEdgeGraphic.cpp b/src/Gui/Network/FloatingEdgeGraphic.cpp
similarity index 95%
rename from src/gui/network/FloatingEdgeGraphic.cpp
rename to src/Gui/Network/FloatingEdgeGraphic.cpp
index 1cf7718..bb13cf9 100644
--- a/src/gui/network/FloatingEdgeGraphic.cpp
+++ b/src/Gui/Network/FloatingEdgeGraphic.cpp
@@ -1,6 +1,6 @@
-#include "gui/network/FloatingEdgeGraphic.h"
+#include "Gui/Network/FloatingEdgeGraphic.h"
 #include <QTextDocument>
-#include "gui/network/SocketGraphic.h"
+#include "Gui/Network/SocketGraphic.h"
 #include <iostream>
 #include <qgraphicsitem.h>
 #include <algorithm>
diff --git a/src/gui/network/FloatingEdgeGraphic.h b/src/Gui/Network/FloatingEdgeGraphic.h
similarity index 92%
rename from src/gui/network/FloatingEdgeGraphic.h
rename to src/Gui/Network/FloatingEdgeGraphic.h
index ead9399..2cce764 100644
--- a/src/gui/network/FloatingEdgeGraphic.h
+++ b/src/Gui/Network/FloatingEdgeGraphic.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <QGraphicsItem>
-#include "gui/network/SocketGraphic.h"
+#include "Gui/Network/SocketGraphic.h"
 
 #include <QPainter>
 
diff --git a/src/gui/network/Network.cpp b/src/Gui/Network/Network.cpp
similarity index 96%
rename from src/gui/network/Network.cpp
rename to src/Gui/Network/Network.cpp
index b6d56bd..ee5b25e 100644
--- a/src/gui/network/Network.cpp
+++ b/src/Gui/Network/Network.cpp
@@ -1,14 +1,14 @@
-#include "gui/network/Network.h"
+#include "Gui/Network/Network.h"
 #include "Engine/Operator/GeometryConnection.h"
 #include "Engine/Operator/GeometryOperator.h"
 #include "Engine/Types.h"
-#include "gui/network/DisplayFlagButton.h"
-#include "gui/network/NodeEdgeGraphic.h"
-#include "gui/network/NetworkGraphicsView.h"
-#include "gui/network/NetworkGraphicsScene.h"
-#include "gui/network/NodeGraphic.h"
-#include "gui/network/FloatingEdgeGraphic.h"
-#include "gui/network/SocketGraphic.h"
+#include "Gui/Network/DisplayFlagButton.h"
+#include "Gui/Network/NodeEdgeGraphic.h"
+#include "Gui/Network/NetworkGraphicsView.h"
+#include "Gui/Network/NetworkGraphicsScene.h"
+#include "Gui/Network/NodeGraphic.h"
+#include "Gui/Network/FloatingEdgeGraphic.h"
+#include "Gui/Network/SocketGraphic.h"
 #include "Engine/Network/NetworkManager.h"
 #include <memory>
 #include <qboxlayout.h>
diff --git a/src/gui/network/Network.h b/src/Gui/Network/Network.h
similarity index 92%
rename from src/gui/network/Network.h
rename to src/Gui/Network/Network.h
index a0e3f36..0aaf67d 100644
--- a/src/gui/network/Network.h
+++ b/src/Gui/Network/Network.h
@@ -7,12 +7,12 @@
 #include <typeinfo>
 #include "Engine/Network/NetworkManager.h"
 #include "Engine/Types.h"
-#include "gui/network/NetworkGraphicsView.h"
-#include "gui/network/NodeEdgeGraphic.h"
-#include "gui/network/NetworkGraphicsScene.h"
-#include "gui/network/NodeGraphic.h"
-#include "gui/network/SocketGraphic.h"
-#include "gui/network/FloatingEdgeGraphic.h"
+#include "Gui/Network/NetworkGraphicsView.h"
+#include "Gui/Network/NodeEdgeGraphic.h"
+#include "Gui/Network/NetworkGraphicsScene.h"
+#include "Gui/Network/NodeGraphic.h"
+#include "Gui/Network/SocketGraphic.h"
+#include "Gui/Network/FloatingEdgeGraphic.h"
 #include <iostream>
 #include <QPointer>
 #include <unordered_map>
diff --git a/src/gui/network/NetworkGraphicsScene.cpp b/src/Gui/Network/NetworkGraphicsScene.cpp
similarity index 96%
rename from src/gui/network/NetworkGraphicsScene.cpp
rename to src/Gui/Network/NetworkGraphicsScene.cpp
index 6abc73a..a68e985 100644
--- a/src/gui/network/NetworkGraphicsScene.cpp
+++ b/src/Gui/Network/NetworkGraphicsScene.cpp
@@ -1,4 +1,4 @@
-#include "gui/network/NetworkGraphicsScene.h"
+#include "Gui/Network/NetworkGraphicsScene.h"
 #include <QGraphicsScene>
 #include <QGraphicsSceneWheelEvent>
 #include <iostream>
diff --git a/src/gui/network/NetworkGraphicsScene.h b/src/Gui/Network/NetworkGraphicsScene.h
similarity index 100%
rename from src/gui/network/NetworkGraphicsScene.h
rename to src/Gui/Network/NetworkGraphicsScene.h
diff --git a/src/gui/network/NetworkGraphicsView.cpp b/src/Gui/Network/NetworkGraphicsView.cpp
similarity index 95%
rename from src/gui/network/NetworkGraphicsView.cpp
rename to src/Gui/Network/NetworkGraphicsView.cpp
index e605a8c..90dc5d2 100644
--- a/src/gui/network/NetworkGraphicsView.cpp
+++ b/src/Gui/Network/NetworkGraphicsView.cpp
@@ -1,8 +1,8 @@
-#include "gui/network/NetworkGraphicsView.h"
+#include "Gui/Network/NetworkGraphicsView.h"
 #include <QGraphicsItem>
-#include "gui/network/Network.h"
-#include "gui/network/NetworkGraphicsScene.h"
-#include "gui/network/SocketGraphic.h"
+#include "Gui/Network/Network.h"
+#include "Gui/Network/NetworkGraphicsScene.h"
+#include "Gui/Network/SocketGraphic.h"
 #include <iostream>
 #include <QMouseEvent>
 #include <QScrollBar>
diff --git a/src/gui/network/NetworkGraphicsView.h b/src/Gui/Network/NetworkGraphicsView.h
similarity index 100%
rename from src/gui/network/NetworkGraphicsView.h
rename to src/Gui/Network/NetworkGraphicsView.h
diff --git a/src/gui/network/NodeEdgeGraphic.cpp b/src/Gui/Network/NodeEdgeGraphic.cpp
similarity index 97%
rename from src/gui/network/NodeEdgeGraphic.cpp
rename to src/Gui/Network/NodeEdgeGraphic.cpp
index 5edf71a..d10f3cd 100644
--- a/src/gui/network/NodeEdgeGraphic.cpp
+++ b/src/Gui/Network/NodeEdgeGraphic.cpp
@@ -1,6 +1,6 @@
-#include "gui/network/NodeEdgeGraphic.h"
+#include "Gui/Network/NodeEdgeGraphic.h"
 #include <QTextDocument>
-#include "gui/network/SocketGraphic.h"
+#include "Gui/Network/SocketGraphic.h"
 #include <iostream>
 #include <qgraphicsitem.h>
 #include <QGraphicsScene>
diff --git a/src/gui/network/NodeEdgeGraphic.h b/src/Gui/Network/NodeEdgeGraphic.h
similarity index 96%
rename from src/gui/network/NodeEdgeGraphic.h
rename to src/Gui/Network/NodeEdgeGraphic.h
index 1420da5..05aa8ac 100644
--- a/src/gui/network/NodeEdgeGraphic.h
+++ b/src/Gui/Network/NodeEdgeGraphic.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <QGraphicsItem>
-#include "gui/network/SocketGraphic.h"
+#include "Gui/Network/SocketGraphic.h"
 
 #include <QPainter>
 
diff --git a/src/gui/network/NodeGraphic.cpp b/src/Gui/Network/NodeGraphic.cpp
similarity index 97%
rename from src/gui/network/NodeGraphic.cpp
rename to src/Gui/Network/NodeGraphic.cpp
index 815edf5..91ca6f6 100644
--- a/src/gui/network/NodeGraphic.cpp
+++ b/src/Gui/Network/NodeGraphic.cpp
@@ -1,4 +1,4 @@
-#include "gui/network/NodeGraphic.h"
+#include "Gui/Network/NodeGraphic.h"
 #include <QTextDocument>
 #include <iostream>
 #include <qgraphicsitem.h>
@@ -8,12 +8,12 @@
 #include "Engine/Network/NetworkManager.h"
 #include "Engine/Operator/GeometryOperator.h"
 #include "Engine/Types.h"
-#include "gui/network/DisplayFlagButton.h"
-#include "gui/network/SocketGraphic.h"
+#include "Gui/Network/DisplayFlagButton.h"
+#include "Gui/Network/SocketGraphic.h"
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsSvgItem>
-#include "gui/network/NodeIconGraphic.h"
+#include "Gui/Network/NodeIconGraphic.h"
 
 NodeGraphic::NodeGraphic(enzo::nt::OpId id, QGraphicsItem *parent)
 : QGraphicsItem(parent), opId_{id}
diff --git a/src/gui/network/NodeGraphic.h b/src/Gui/Network/NodeGraphic.h
similarity index 92%
rename from src/gui/network/NodeGraphic.h
rename to src/Gui/Network/NodeGraphic.h
index 42c9384..baaf29f 100644
--- a/src/gui/network/NodeGraphic.h
+++ b/src/Gui/Network/NodeGraphic.h
@@ -2,10 +2,10 @@
 #include <QGraphicsItem>
 #include <QPainter>
 #include "Engine/Types.h"
-#include "gui/network/DisplayFlagButton.h"
-#include "gui/network/SocketGraphic.h"
-#include "gui/network/NodeIconGraphic.h"
-#include "gui/network/NodeEdgeGraphic.h"
+#include "Gui/Network/DisplayFlagButton.h"
+#include "Gui/Network/SocketGraphic.h"
+#include "Gui/Network/NodeIconGraphic.h"
+#include "Gui/Network/NodeEdgeGraphic.h"
 #include <iostream>
 
 class NodeGraphic
diff --git a/src/gui/network/NodeIconGraphic.cpp b/src/Gui/Network/NodeIconGraphic.cpp
similarity index 91%
rename from src/gui/network/NodeIconGraphic.cpp
rename to src/Gui/Network/NodeIconGraphic.cpp
index b16186f..e7e6d90 100644
--- a/src/gui/network/NodeIconGraphic.cpp
+++ b/src/Gui/Network/NodeIconGraphic.cpp
@@ -1,4 +1,4 @@
-#include "gui/network/NodeIconGraphic.h"
+#include "Gui/Network/NodeIconGraphic.h"
 #include <qgraphicssvgitem.h>
 #include <QBrush>
 #include <QPainter>
diff --git a/src/gui/network/NodeIconGraphic.h b/src/Gui/Network/NodeIconGraphic.h
similarity index 100%
rename from src/gui/network/NodeIconGraphic.h
rename to src/Gui/Network/NodeIconGraphic.h
diff --git a/src/gui/network/SocketGraphic.cpp b/src/Gui/Network/SocketGraphic.cpp
similarity index 97%
rename from src/gui/network/SocketGraphic.cpp
rename to src/Gui/Network/SocketGraphic.cpp
index 0c674cd..5916fe3 100644
--- a/src/gui/network/SocketGraphic.cpp
+++ b/src/Gui/Network/SocketGraphic.cpp
@@ -1,8 +1,8 @@
-#include "gui/network/SocketGraphic.h"
+#include "Gui/Network/SocketGraphic.h"
 #include <QTextDocument>
 #include <iostream>
 #include <qgraphicsitem.h>
-#include "gui/network/NodeEdgeGraphic.h"
+#include "Gui/Network/NodeEdgeGraphic.h"
 
 SocketGraphic::SocketGraphic(enzo::nt::SocketIOType type, enzo::nt::OpId opId, unsigned int socketIndex, QGraphicsItem *parent)
 : QGraphicsItem(parent), type_{type}, opId_{opId}, socketIndex_{socketIndex}
diff --git a/src/gui/network/SocketGraphic.h b/src/Gui/Network/SocketGraphic.h
similarity index 100%
rename from src/gui/network/SocketGraphic.h
rename to src/Gui/Network/SocketGraphic.h
diff --git a/src/gui/UtilWidgets/Splitter.cpp b/src/Gui/UtilWidgets/Splitter.cpp
similarity index 68%
rename from src/gui/UtilWidgets/Splitter.cpp
rename to src/Gui/UtilWidgets/Splitter.cpp
index 23134ff..1ac339e 100644
--- a/src/gui/UtilWidgets/Splitter.cpp
+++ b/src/Gui/UtilWidgets/Splitter.cpp
@@ -1,4 +1,4 @@
-#include <gui/UtilWidgets/Splitter.h>
+#include <Gui/UtilWidgets/Splitter.h>
 
 Splitter::Splitter(QWidget *parent)
 : QSplitter(parent)
diff --git a/src/gui/UtilWidgets/Splitter.h b/src/Gui/UtilWidgets/Splitter.h
similarity index 100%
rename from src/gui/UtilWidgets/Splitter.h
rename to src/Gui/UtilWidgets/Splitter.h
diff --git a/src/gui/viewport/GLCamera.cpp b/src/Gui/Viewport/GLCamera.cpp
similarity index 98%
rename from src/gui/viewport/GLCamera.cpp
rename to src/Gui/Viewport/GLCamera.cpp
index 23f761c..d226a14 100644
--- a/src/gui/viewport/GLCamera.cpp
+++ b/src/Gui/Viewport/GLCamera.cpp
@@ -1,4 +1,4 @@
-#include "gui/viewport/GLCamera.h"
+#include "Gui/Viewport/GLCamera.h"
 #include <glm/ext/quaternion_geometric.hpp>
 #include <glm/fwd.hpp>
 #include <glm/geometric.hpp>
diff --git a/src/gui/viewport/GLCamera.h b/src/Gui/Viewport/GLCamera.h
similarity index 100%
rename from src/gui/viewport/GLCamera.h
rename to src/Gui/Viewport/GLCamera.h
diff --git a/src/gui/viewport/GLGrid.cpp b/src/Gui/Viewport/GLGrid.cpp
similarity index 99%
rename from src/gui/viewport/GLGrid.cpp
rename to src/Gui/Viewport/GLGrid.cpp
index b6d3203..776d662 100644
--- a/src/gui/viewport/GLGrid.cpp
+++ b/src/Gui/Viewport/GLGrid.cpp
@@ -1,4 +1,4 @@
-#include "gui/viewport/GLGrid.h"
+#include "Gui/Viewport/GLGrid.h"
 #include <glm/ext/vector_float3.hpp>
 #include <iostream>
 
diff --git a/src/gui/viewport/GLGrid.h b/src/Gui/Viewport/GLGrid.h
similarity index 100%
rename from src/gui/viewport/GLGrid.h
rename to src/Gui/Viewport/GLGrid.h
diff --git a/src/gui/viewport/GLMesh.cpp b/src/Gui/Viewport/GLMesh.cpp
similarity index 98%
rename from src/gui/viewport/GLMesh.cpp
rename to src/Gui/Viewport/GLMesh.cpp
index d519427..61c6195 100644
--- a/src/gui/viewport/GLMesh.cpp
+++ b/src/Gui/Viewport/GLMesh.cpp
@@ -1,4 +1,4 @@
-#include "gui/viewport/GLMesh.h"
+#include "Gui/Viewport/GLMesh.h"
 #include <GL/gl.h>
 #include <iostream>
 
diff --git a/src/gui/viewport/GLMesh.h b/src/Gui/Viewport/GLMesh.h
similarity index 100%
rename from src/gui/viewport/GLMesh.h
rename to src/Gui/Viewport/GLMesh.h
diff --git a/src/gui/viewport/Viewport.cpp b/src/Gui/Viewport/Viewport.cpp
similarity index 98%
rename from src/gui/viewport/Viewport.cpp
rename to src/Gui/Viewport/Viewport.cpp
index b1ff9c4..b8737d0 100644
--- a/src/gui/viewport/Viewport.cpp
+++ b/src/Gui/Viewport/Viewport.cpp
@@ -1,5 +1,5 @@
-#include "gui/viewport/Viewport.h"
-#include "gui/viewport/GLCamera.h"
+#include "Gui/Viewport/Viewport.h"
+#include "Gui/Viewport/GLCamera.h"
 #include <glm/common.hpp>
 #include <qboxlayout.h>
 #include <qevent.h>
diff --git a/src/gui/viewport/Viewport.h b/src/Gui/Viewport/Viewport.h
similarity index 94%
rename from src/gui/viewport/Viewport.h
rename to src/Gui/Viewport/Viewport.h
index a63ed73..bf63d68 100644
--- a/src/gui/viewport/Viewport.h
+++ b/src/Gui/Viewport/Viewport.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <qboxlayout.h>
 #include <qwidget.h>
-#include "gui/viewport/ViewportGLWidget.h"
+#include "Gui/Viewport/ViewportGLWidget.h"
 
 class Viewport
 : public QWidget
diff --git a/src/gui/viewport/ViewportGLWidget.cpp b/src/Gui/Viewport/ViewportGLWidget.cpp
similarity index 98%
rename from src/gui/viewport/ViewportGLWidget.cpp
rename to src/Gui/Viewport/ViewportGLWidget.cpp
index 13ac2d5..22fa83f 100644
--- a/src/gui/viewport/ViewportGLWidget.cpp
+++ b/src/Gui/Viewport/ViewportGLWidget.cpp
@@ -1,7 +1,7 @@
-#include "gui/viewport/ViewportGLWidget.h"
+#include "Gui/Viewport/ViewportGLWidget.h"
 #include "Engine/Operator/AttributeHandle.h"
 #include "Engine/Types.h"
-#include "gui/viewport/GLMesh.h"
+#include "Gui/Viewport/GLMesh.h"
 #include <glm/mat4x4.hpp>
 #include <glm/ext/matrix_clip_space.hpp>
 #include <glm/gtc/matrix_transform.hpp>
diff --git a/src/gui/viewport/ViewportGLWidget.h b/src/Gui/Viewport/ViewportGLWidget.h
similarity index 88%
rename from src/gui/viewport/ViewportGLWidget.h
rename to src/Gui/Viewport/ViewportGLWidget.h
index e079d89..0c02d31 100644
--- a/src/gui/viewport/ViewportGLWidget.h
+++ b/src/Gui/Viewport/ViewportGLWidget.h
@@ -3,9 +3,9 @@
 #include <QOpenGLWidget>
 #include <iostream>
 #include <QOpenGLFunctions_3_2_Core>
-#include "gui/viewport/GLCamera.h"
-#include "gui/viewport/GLMesh.h"
-#include "gui/viewport/GLGrid.h"
+#include "Gui/Viewport/GLCamera.h"
+#include "Gui/Viewport/GLMesh.h"
+#include "Gui/Viewport/GLGrid.h"
 #include "Engine/Operator/Geometry.h"
 
 class ViewportGLWidget : public QOpenGLWidget, protected QOpenGLFunctions_3_2_Core
diff --git a/src/gui/main.cpp b/src/Gui/main.cpp
similarity index 100%
rename from src/gui/main.cpp
rename to src/Gui/main.cpp