diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc3b5fb75..b617a906b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,7 +268,7 @@ set (wsjt_qt_CXXSRCS
   validators/MaidenheadLocatorValidator.cpp
   validators/CallsignValidator.cpp
   widgets/SplashScreen.cpp
-  Transceiver/EqualizationToolsDialog.cpp
+  EqualizationToolsDialog.cpp
   widgets/DoubleClickablePushButton.cpp
   widgets/DoubleClickableRadioButton.cpp
   Network/LotWUsers.cpp
@@ -684,12 +684,12 @@ set (UDP_library_CXXSRCS
   Radio.cpp
   RadioMetaType.cpp
   Network/NetworkMessage.cpp
-  Network/MessageServer.cpp
+  UDPExamples/MessageServer.cpp
   )
 
 set (UDP_library_HEADERS
   Radio.hpp
-  Network/MessageServer.hpp
+  UDPExamples/MessageServer.hpp
   ${PROJECT_BINARY_DIR}/udp_export.h
   )
 
diff --git a/Transceiver/EqualizationToolsDialog.cpp b/EqualizationToolsDialog.cpp
similarity index 100%
rename from Transceiver/EqualizationToolsDialog.cpp
rename to EqualizationToolsDialog.cpp
diff --git a/Transceiver/EqualizationToolsDialog.hpp b/EqualizationToolsDialog.hpp
similarity index 100%
rename from Transceiver/EqualizationToolsDialog.hpp
rename to EqualizationToolsDialog.hpp
diff --git a/UDPExamples/BeaconsModel.hpp b/UDPExamples/BeaconsModel.hpp
index 3fc9cb2af..b089349cc 100644
--- a/UDPExamples/BeaconsModel.hpp
+++ b/UDPExamples/BeaconsModel.hpp
@@ -3,7 +3,7 @@
 
 #include <QStandardItemModel>
 
-#include "Network/MessageServer.hpp"
+#include "MessageServer.hpp"
 
 using Frequency = MessageServer::Frequency;
 
diff --git a/UDPExamples/ClientWidget.hpp b/UDPExamples/ClientWidget.hpp
index 751f34f25..983ddd874 100644
--- a/UDPExamples/ClientWidget.hpp
+++ b/UDPExamples/ClientWidget.hpp
@@ -7,7 +7,7 @@
 #include <QString>
 #include <QRegularExpression>
 
-#include "Network/MessageServer.hpp"
+#include "MessageServer.hpp"
 
 class QAbstractItemModel;
 class QModelIndex;
diff --git a/UDPExamples/DecodesModel.hpp b/UDPExamples/DecodesModel.hpp
index 384de5e0f..17c9ae125 100644
--- a/UDPExamples/DecodesModel.hpp
+++ b/UDPExamples/DecodesModel.hpp
@@ -3,7 +3,7 @@
 
 #include <QStandardItemModel>
 
-#include "Network/MessageServer.hpp"
+#include "MessageServer.hpp"
 
 using Frequency = MessageServer::Frequency;
 
diff --git a/UDPExamples/MessageAggregatorMainWindow.hpp b/UDPExamples/MessageAggregatorMainWindow.hpp
index cd52ec1eb..29f762d3d 100644
--- a/UDPExamples/MessageAggregatorMainWindow.hpp
+++ b/UDPExamples/MessageAggregatorMainWindow.hpp
@@ -5,7 +5,7 @@
 #include <QHash>
 #include <QString>
 
-#include "Network/MessageServer.hpp"
+#include "MessageServer.hpp"
 
 class QDateTime;
 class QStandardItemModel;
diff --git a/Network/MessageServer.cpp b/UDPExamples/MessageServer.cpp
similarity index 99%
rename from Network/MessageServer.cpp
rename to UDPExamples/MessageServer.cpp
index 07b2fb429..ce7cd6fb9 100644
--- a/Network/MessageServer.cpp
+++ b/UDPExamples/MessageServer.cpp
@@ -10,7 +10,7 @@
 #include <QHash>
 
 #include "Radio.hpp"
-#include "NetworkMessage.hpp"
+#include "Network/NetworkMessage.hpp"
 #include "qt_helpers.hpp"
 
 #include "pimpl_impl.hpp"
diff --git a/Network/MessageServer.hpp b/UDPExamples/MessageServer.hpp
similarity index 100%
rename from Network/MessageServer.hpp
rename to UDPExamples/MessageServer.hpp
diff --git a/UDPExamples/UDPDaemon.cpp b/UDPExamples/UDPDaemon.cpp
index 7175e2a04..dea2c68c9 100644
--- a/UDPExamples/UDPDaemon.cpp
+++ b/UDPExamples/UDPDaemon.cpp
@@ -25,7 +25,7 @@
 #include <QHash>
 #include <QDebug>
 
-#include "Network/MessageServer.hpp"
+#include "MessageServer.hpp"
 #include "Radio.hpp"
 
 #include "qt_helpers.hpp"
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 7b9ea3677..7090a609d 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -73,7 +73,7 @@
 #include "MultiSettings.hpp"
 #include "validators/MaidenheadLocatorValidator.hpp"
 #include "validators/CallsignValidator.hpp"
-#include "Transceiver/EqualizationToolsDialog.hpp"
+#include "EqualizationToolsDialog.hpp"
 #include "Network/LotWUsers.hpp"
 #include "logbook/AD1CCty.hpp"
 #include "models/FoxLog.hpp"