diff --git a/src/gui/json-rpc-communication.lisp b/src/gui/server/json-rpc-communication.lisp
similarity index 100%
rename from src/gui/json-rpc-communication.lisp
rename to src/gui/server/json-rpc-communication.lisp
diff --git a/src/gui/main-window-server-side.lisp b/src/gui/server/main-window-server-side.lisp
similarity index 100%
rename from src/gui/main-window-server-side.lisp
rename to src/gui/server/main-window-server-side.lisp
diff --git a/src/gui/public-api.lisp b/src/gui/server/public-api.lisp
similarity index 100%
rename from src/gui/public-api.lisp
rename to src/gui/server/public-api.lisp
diff --git a/tinmop.asd b/tinmop.asd
index 4a2602e..a509c37 100644
--- a/tinmop.asd
+++ b/tinmop.asd
@@ -146,7 +146,8 @@
                (:file "scheduled-events")
                (:file "modules")
                (:file "json-rpc2")
-               (:module gui
+               (:module gui-server
+                :pathname    "gui/server"
                 :components ((:file "main-window-server-side")
                              (:file "public-api")
                              (:file "json-rpc-communication")))