diff --git a/src/View/Main/AboutWindow.py b/src/View/About/Window.py
similarity index 100%
rename from src/View/Main/AboutWindow.py
rename to src/View/About/Window.py
diff --git a/src/View/Main/ConfigureAddSolverWindow.py b/src/View/Configure/Solver/Window.py
similarity index 96%
rename from src/View/Main/ConfigureAddSolverWindow.py
rename to src/View/Configure/Solver/Window.py
index 69bd69a5..cc98fd65 100644
--- a/src/View/Main/ConfigureAddSolverWindow.py
+++ b/src/View/Configure/Solver/Window.py
@@ -8,9 +8,9 @@ from PyQt5.QtWidgets import (
     QPushButton,
 )
 
-class ConfigureAddSolverWindow(ASubWindow):
+class ConfigureSolverWindow(ASubWindow):
     def __init__(self, data=None, title="Configuration : Add Solver", parent=None):
-        super(ConfigureAddSolverWindow, self).__init__(
+        super(ConfigureSolverWindow, self).__init__(
             name=title, ui="ConfigureAddSolverDialog", parent=parent
         )
         self.ui.setWindowTitle(title)
diff --git a/src/View/Main/ConfigureWindow.py b/src/View/Configure/Window.py
similarity index 96%
rename from src/View/Main/ConfigureWindow.py
rename to src/View/Configure/Window.py
index 4988863b..659e92ed 100644
--- a/src/View/Main/ConfigureWindow.py
+++ b/src/View/Configure/Window.py
@@ -4,7 +4,7 @@ from config import Config
 from View.ASubWindow import ASubWindow
 from View.ListedSubWindow import ListedSubWindow
 
-from View.Main.ConfigureAddSolverWindow import ConfigureAddSolverWindow
+from View.Configure.Solver.Window import ConfigureSolverWindow
 
 from PyQt5.QtCore import (
     Qt, QVariant, QAbstractTableModel,
@@ -161,7 +161,7 @@ class ConfigureWindow(ASubWindow, ListedSubWindow):
     def edit_solver(self):
         indexes = self.find(QTableView, "tableView_solver").selectionModel().selectedRows()
         for index in indexes:
-            self.edit_solver = ConfigureAddSolverWindow(
+            self.edit_solver = ConfigureSolverWindow(
                 data=self.solver_table_model.rows[index.row()],
                 parent=self
             )
@@ -169,7 +169,7 @@ class ConfigureWindow(ASubWindow, ListedSubWindow):
                 self.solver_table_model.change_solver(self.edit_solver.data, index)
 
     def add_solver(self):
-        dialog_solver = ConfigureAddSolverWindow(parent=self)
+        dialog_solver = ConfigureSolverWindow(parent=self)
         if dialog_solver.exec_():
             self.solver_table_model.add_solver(dialog_solver.data)
 
diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py
index 187cedeb..68e8ef37 100644
--- a/src/View/MainWindow.py
+++ b/src/View/MainWindow.py
@@ -17,9 +17,9 @@ from View.ASubWindow import WindowToolKit
 from View.ListedSubWindow import ListedSubWindow
 from View.DummyWindow import DummyWindow
 
-from View.Main.ConfigureWindow import ConfigureWindow
-from View.Main.NewStudyWindow import NewStudyWindow
-from View.Main.AboutWindow import AboutWindow
+from View.Configure.Window import ConfigureWindow
+from View.Study.Window import NewStudyWindow
+from View.About.Window import AboutWindow
 from View.Network.Window import NetworkWindow
 from View.Geometry.Window import GeometryWindow
 from View.BoundaryCondition.Window import BoundaryConditionWindow
diff --git a/src/View/Main/NewStudyWindow.py b/src/View/Study/Window.py
similarity index 100%
rename from src/View/Main/NewStudyWindow.py
rename to src/View/Study/Window.py