diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2017b045..ea9a2bea6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -257,12 +257,12 @@ endif (ENABLE_TAGLIB)
 
 if (TAGLIB_FOUND)
     SET( CANTATA_SRCS ${CANTATA_SRCS}
-        gui/httpserversettings.cpp
         tags/tageditor.cpp
         tags/trackorganiser.cpp
         tags/tags.cpp
         devices/deviceoptions.cpp
         devices/filenameschemedialog.cpp
+        http/httpserversettings.cpp
         http/httpserver.cpp
         http/httpsocket.cpp
     )
@@ -276,7 +276,7 @@ if (TAGLIB_FOUND)
     )
 
     SET( CANTATA_UIS ${CANTATA_UIS}
-        gui/httpserversettings.ui
+        http/httpserversettings.ui
         tags/tageditor.ui
         tags/trackorganiser.ui
         devices/filenameschemedialog.ui
diff --git a/gui/httpserversettings.cpp b/http/httpserversettings.cpp
similarity index 100%
rename from gui/httpserversettings.cpp
rename to http/httpserversettings.cpp
diff --git a/gui/httpserversettings.h b/http/httpserversettings.h
similarity index 100%
rename from gui/httpserversettings.h
rename to http/httpserversettings.h
diff --git a/gui/httpserversettings.ui b/http/httpserversettings.ui
similarity index 100%
rename from gui/httpserversettings.ui
rename to http/httpserversettings.ui