diff --git a/Server/server_qt.py b/Server/server_qt.py
index ee61029..81464ff 100644
--- a/Server/server_qt.py
+++ b/Server/server_qt.py
@@ -21,7 +21,7 @@ from quamash import QEventLoop
 # Importing gui form
 from server_gui import Ui_MainWindow
 
-from server import Server, Client, now
+from core_server import Server, Client, now
 
 import messaging_lib as messaging
 import config as cfg
diff --git a/Server/server.py b/server/core_server.py
similarity index 100%
rename from Server/server.py
rename to server/core_server.py