diff --git a/server/config_editor.py b/server/modules/config_editor.py
similarity index 100%
rename from server/config_editor.py
rename to server/modules/config_editor.py
diff --git a/server/config_editor.ui b/server/modules/config_editor.ui
similarity index 100%
rename from server/config_editor.ui
rename to server/modules/config_editor.ui
diff --git a/server/config_editor_models.py b/server/modules/config_editor_models.py
similarity index 100%
rename from server/config_editor_models.py
rename to server/modules/config_editor_models.py
diff --git a/server/copter_table.py b/server/modules/copter_table.py
similarity index 100%
rename from server/copter_table.py
rename to server/modules/copter_table.py
diff --git a/server/copter_table_models.py b/server/modules/copter_table_models.py
similarity index 100%
rename from server/copter_table_models.py
rename to server/modules/copter_table_models.py
diff --git a/server/core_server.py b/server/modules/server_core.py
similarity index 100%
rename from server/core_server.py
rename to server/modules/server_core.py
diff --git a/server/server_gui.py b/server/modules/server_gui.py
similarity index 100%
rename from server/server_gui.py
rename to server/modules/server_gui.py
diff --git a/server/server_gui.ui b/server/modules/server_gui.ui
similarity index 100%
rename from server/server_gui.ui
rename to server/modules/server_gui.ui
diff --git a/server/visual_land.py b/server/modules/visual_land.py
similarity index 100%
rename from server/visual_land.py
rename to server/modules/visual_land.py
diff --git a/server/visual_land.ui b/server/modules/visual_land.ui
similarity index 100%
rename from server/visual_land.ui
rename to server/modules/visual_land.ui
diff --git a/server/visual_land_dialog.py b/server/modules/visual_land_dialog.py
similarity index 100%
rename from server/visual_land_dialog.py
rename to server/modules/visual_land_dialog.py