diff --git a/src/View/GeometryWindow.py b/src/View/Geometry/GeometryWindow.py
similarity index 100%
rename from src/View/GeometryWindow.py
rename to src/View/Geometry/GeometryWindow.py
diff --git a/src/View/AboutWindow.py b/src/View/Main/AboutWindow.py
similarity index 100%
rename from src/View/AboutWindow.py
rename to src/View/Main/AboutWindow.py
diff --git a/src/View/ConfigureAddSolverWindow.py b/src/View/Main/ConfigureAddSolverWindow.py
similarity index 100%
rename from src/View/ConfigureAddSolverWindow.py
rename to src/View/Main/ConfigureAddSolverWindow.py
diff --git a/src/View/ConfigureWindow.py b/src/View/Main/ConfigureWindow.py
similarity index 95%
rename from src/View/ConfigureWindow.py
rename to src/View/Main/ConfigureWindow.py
index dbc37604f51630047bcd87498f07ea92c35350f2..d8edc4d104885466cd0c0f7dbce1965ed55361d0 100644
--- a/src/View/ConfigureWindow.py
+++ b/src/View/Main/ConfigureWindow.py
@@ -3,7 +3,8 @@
 from config import Config
 from View.ASubWindow import ASubWindow
 from View.ListedSubWindow import ListedSubWindow
-from View.ConfigureAddSolverWindow import ConfigureAddSolverWindow
+
+from View.Main.ConfigureAddSolverWindow import ConfigureAddSolverWindow
 
 from PyQt5.QtCore import (
     Qt, QVariant, QAbstractTableModel,
@@ -35,10 +36,12 @@ class SolverTableModel(QAbstractTableModel):
         return self.rows[index.row()][self.headers[index.column()]]
 
     def headerData(self, section, orientation, role):
-        if role == Qt.ItemDataRole.DisplayRole and orientation == Qt.Orientation.Horizontal:
+        if (role == Qt.ItemDataRole.DisplayRole and
+            orientation == Qt.Orientation.Horizontal):
             return self.headers[section].capitalize()
 
-        if role == Qt.ItemDataRole.DisplayRole and orientation == Qt.Orientation.Vertical:
+        if (role == Qt.ItemDataRole.DisplayRole and
+            orientation == Qt.Orientation.Vertical):
             return section
 
         return QVariant()
diff --git a/src/View/NewStudyWindow.py b/src/View/Main/NewStudyWindow.py
similarity index 100%
rename from src/View/NewStudyWindow.py
rename to src/View/Main/NewStudyWindow.py
diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py
index 01e09beed9007a32c512519a1a600b55d14d2cf4..c99c4e3a4d97b4085c9211f6368ded6165ca89d1 100644
--- a/src/View/MainWindow.py
+++ b/src/View/MainWindow.py
@@ -15,11 +15,12 @@ from PyQt5.uic import loadUi
 
 from View.ListedSubWindow import ListedSubWindow
 from View.DummyWindow import DummyWindow
-from View.ConfigureWindow import ConfigureWindow
-from View.NewStudyWindow import NewStudyWindow
-from View.NetworkWindow import NetworkWindow
-from View.GeometryWindow import GeometryWindow
-from View.AboutWindow import AboutWindow
+
+from View.Main.ConfigureWindow import ConfigureWindow
+from View.Main.NewStudyWindow import NewStudyWindow
+from View.Main.AboutWindow import AboutWindow
+from View.Network.NetworkWindow import NetworkWindow
+from View.Geometry.GeometryWindow import GeometryWindow
 
 from Model.Study import Study
 
diff --git a/src/View/NetworkWindow.py b/src/View/Network/NetworkWindow.py
similarity index 100%
rename from src/View/NetworkWindow.py
rename to src/View/Network/NetworkWindow.py