diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d4bb593f..d4a6e99ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,7 +226,7 @@ set (wsjt_qt_CXXSRCS
   qt_helpers.cpp
   widgets/MessageBox.cpp
   MetaDataRegistry.cpp
-  NetworkServerLookup.cpp
+  Network/NetworkServerLookup.cpp
   revision_utils.cpp
   WFPalette.cpp
   Radio.cpp
@@ -244,16 +244,16 @@ set (wsjt_qt_CXXSRCS
   GetUserId.cpp
   TraceFile.cpp
   AudioDevice.cpp
-  Transceiver.cpp
-  TransceiverBase.cpp
-  EmulateSplitTransceiver.cpp
-  TransceiverFactory.cpp
-  PollingTransceiver.cpp
-  HamlibTransceiver.cpp
-  HRDTransceiver.cpp
-  DXLabSuiteCommanderTransceiver.cpp
-  NetworkMessage.cpp
-  MessageClient.cpp
+  Transceiver/Transceiver.cpp
+  Transceiver/TransceiverBase.cpp
+  Transceiver/EmulateSplitTransceiver.cpp
+  Transceiver/TransceiverFactory.cpp
+  Transceiver/PollingTransceiver.cpp
+  Transceiver/HamlibTransceiver.cpp
+  Transceiver/HRDTransceiver.cpp
+  Transceiver/DXLabSuiteCommanderTransceiver.cpp
+  Network/NetworkMessage.cpp
+  Network/MessageClient.cpp
   widgets/LettersSpinBox.cpp
   widgets/HintedSpinBox.cpp
   widgets/RestrictedSpinBox.cpp
@@ -268,7 +268,7 @@ set (wsjt_qt_CXXSRCS
   validators/MaidenheadLocatorValidator.cpp
   validators/CallsignValidator.cpp
   widgets/SplashScreen.cpp
-  EqualizationToolsDialog.cpp
+  Transceiver/EqualizationToolsDialog.cpp
   widgets/DoubleClickablePushButton.cpp
   widgets/DoubleClickableRadioButton.cpp
   LotWUsers.cpp
@@ -303,7 +303,7 @@ set (jt9_CXXSRCS
 
 set (wsjtx_CXXSRCS
   logbook/logbook.cpp
-  psk_reporter.cpp
+  Network/psk_reporter.cpp
   Modulator.cpp
   Detector/Detector.cpp
   widgets/logqso.cpp
@@ -353,7 +353,7 @@ if (WIN32)
 
   set (wsjt_qt_CXXSRCS
     ${wsjt_qt_CXXSRCS}
-    OmniRigTransceiver.cpp
+    Transceiver/OmniRigTransceiver.cpp
     )
 endif (WIN32)
 
@@ -683,13 +683,13 @@ set (wsjtx_UISRCS
 set (UDP_library_CXXSRCS
   Radio.cpp
   RadioMetaType.cpp
-  NetworkMessage.cpp
-  MessageServer.cpp
+  Network/NetworkMessage.cpp
+  Network/MessageServer.cpp
   )
 
 set (UDP_library_HEADERS
   Radio.hpp
-  MessageServer.hpp
+  Network/MessageServer.hpp
   ${PROJECT_BINARY_DIR}/udp_export.h
   )
 
diff --git a/Configuration.cpp b/Configuration.cpp
index b78739d11..ddaee0ec0 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -172,14 +172,14 @@
 #include "item_delegates/ForeignKeyDelegate.hpp"
 #include "item_delegates/FrequencyDelegate.hpp"
 #include "item_delegates/FrequencyDeltaDelegate.hpp"
-#include "TransceiverFactory.hpp"
-#include "Transceiver.hpp"
+#include "Transceiver/TransceiverFactory.hpp"
+#include "Transceiver/Transceiver.hpp"
 #include "models/Bands.hpp"
 #include "models/IARURegions.hpp"
 #include "models/Modes.hpp"
 #include "models/FrequencyList.hpp"
 #include "models/StationList.hpp"
-#include "NetworkServerLookup.hpp"
+#include "Network/NetworkServerLookup.hpp"
 #include "widgets/MessageBox.hpp"
 #include "validators/MaidenheadLocatorValidator.hpp"
 #include "validators/CallsignValidator.hpp"
diff --git a/Configuration.hpp b/Configuration.hpp
index 80f5a5cd1..a546e63ba 100644
--- a/Configuration.hpp
+++ b/Configuration.hpp
@@ -7,7 +7,7 @@
 #include "Radio.hpp"
 #include "models/IARURegions.hpp"
 #include "AudioDevice.hpp"
-#include "Transceiver.hpp"
+#include "Transceiver/Transceiver.hpp"
 
 #include "pimpl_h.hpp"
 
diff --git a/Detector.cpp b/Detector/Detector.cpp
similarity index 100%
rename from Detector.cpp
rename to Detector/Detector.cpp
diff --git a/Detector.hpp b/Detector/Detector.hpp
similarity index 100%
rename from Detector.hpp
rename to Detector/Detector.hpp
diff --git a/MetaDataRegistry.cpp b/MetaDataRegistry.cpp
index e66a43008..a3a18439d 100644
--- a/MetaDataRegistry.cpp
+++ b/MetaDataRegistry.cpp
@@ -9,8 +9,8 @@
 #include "AudioDevice.hpp"
 #include "Configuration.hpp"
 #include "models/StationList.hpp"
-#include "Transceiver.hpp"
-#include "TransceiverFactory.hpp"
+#include "Transceiver/Transceiver.hpp"
+#include "Transceiver/TransceiverFactory.hpp"
 #include "WFPalette.hpp"
 #include "models/IARURegions.hpp"
 #include "models/DecodeHighlightingModel.hpp"
diff --git a/MessageClient.cpp b/Network/MessageClient.cpp
similarity index 100%
rename from MessageClient.cpp
rename to Network/MessageClient.cpp
diff --git a/MessageClient.hpp b/Network/MessageClient.hpp
similarity index 100%
rename from MessageClient.hpp
rename to Network/MessageClient.hpp
diff --git a/MessageServer.cpp b/Network/MessageServer.cpp
similarity index 100%
rename from MessageServer.cpp
rename to Network/MessageServer.cpp
diff --git a/MessageServer.hpp b/Network/MessageServer.hpp
similarity index 100%
rename from MessageServer.hpp
rename to Network/MessageServer.hpp
diff --git a/NetworkAccessManager.hpp b/Network/NetworkAccessManager.hpp
similarity index 100%
rename from NetworkAccessManager.hpp
rename to Network/NetworkAccessManager.hpp
diff --git a/NetworkMessage.cpp b/Network/NetworkMessage.cpp
similarity index 100%
rename from NetworkMessage.cpp
rename to Network/NetworkMessage.cpp
diff --git a/NetworkMessage.hpp b/Network/NetworkMessage.hpp
similarity index 100%
rename from NetworkMessage.hpp
rename to Network/NetworkMessage.hpp
diff --git a/NetworkServerLookup.cpp b/Network/NetworkServerLookup.cpp
similarity index 100%
rename from NetworkServerLookup.cpp
rename to Network/NetworkServerLookup.cpp
diff --git a/NetworkServerLookup.hpp b/Network/NetworkServerLookup.hpp
similarity index 100%
rename from NetworkServerLookup.hpp
rename to Network/NetworkServerLookup.hpp
diff --git a/psk_reporter.cpp b/Network/psk_reporter.cpp
similarity index 99%
rename from psk_reporter.cpp
rename to Network/psk_reporter.cpp
index b68a9c344..e84b5a921 100644
--- a/psk_reporter.cpp
+++ b/Network/psk_reporter.cpp
@@ -8,7 +8,7 @@
 #include <QHostInfo>
 #include <QTimer>
 
-#include "MessageClient.hpp"
+#include "Network/MessageClient.hpp"
 
 #include "moc_psk_reporter.cpp"
 
diff --git a/psk_reporter.h b/Network/psk_reporter.h
similarity index 100%
rename from psk_reporter.h
rename to Network/psk_reporter.h
diff --git a/DXLabSuiteCommanderTransceiver.cpp b/Transceiver/DXLabSuiteCommanderTransceiver.cpp
similarity index 99%
rename from DXLabSuiteCommanderTransceiver.cpp
rename to Transceiver/DXLabSuiteCommanderTransceiver.cpp
index d745ec17f..333f488ce 100644
--- a/DXLabSuiteCommanderTransceiver.cpp
+++ b/Transceiver/DXLabSuiteCommanderTransceiver.cpp
@@ -6,7 +6,7 @@
 #include <QThread>
 #include <QDateTime>
 
-#include "NetworkServerLookup.hpp"
+#include "Network/NetworkServerLookup.hpp"
 
 #include "moc_DXLabSuiteCommanderTransceiver.cpp"
 
diff --git a/DXLabSuiteCommanderTransceiver.hpp b/Transceiver/DXLabSuiteCommanderTransceiver.hpp
similarity index 100%
rename from DXLabSuiteCommanderTransceiver.hpp
rename to Transceiver/DXLabSuiteCommanderTransceiver.hpp
diff --git a/EmulateSplitTransceiver.cpp b/Transceiver/EmulateSplitTransceiver.cpp
similarity index 100%
rename from EmulateSplitTransceiver.cpp
rename to Transceiver/EmulateSplitTransceiver.cpp
diff --git a/EmulateSplitTransceiver.hpp b/Transceiver/EmulateSplitTransceiver.hpp
similarity index 100%
rename from EmulateSplitTransceiver.hpp
rename to Transceiver/EmulateSplitTransceiver.hpp
diff --git a/EqualizationToolsDialog.cpp b/Transceiver/EqualizationToolsDialog.cpp
similarity index 100%
rename from EqualizationToolsDialog.cpp
rename to Transceiver/EqualizationToolsDialog.cpp
diff --git a/EqualizationToolsDialog.hpp b/Transceiver/EqualizationToolsDialog.hpp
similarity index 100%
rename from EqualizationToolsDialog.hpp
rename to Transceiver/EqualizationToolsDialog.hpp
diff --git a/HRDTransceiver.cpp b/Transceiver/HRDTransceiver.cpp
similarity index 99%
rename from HRDTransceiver.cpp
rename to Transceiver/HRDTransceiver.cpp
index 873c87184..e66482084 100644
--- a/HRDTransceiver.cpp
+++ b/Transceiver/HRDTransceiver.cpp
@@ -8,7 +8,7 @@
 #include <QStandardPaths>
 #include <QDir>
 
-#include "NetworkServerLookup.hpp"
+#include "Network/NetworkServerLookup.hpp"
 
 namespace
 {
diff --git a/HRDTransceiver.hpp b/Transceiver/HRDTransceiver.hpp
similarity index 100%
rename from HRDTransceiver.hpp
rename to Transceiver/HRDTransceiver.hpp
diff --git a/HamlibTransceiver.cpp b/Transceiver/HamlibTransceiver.cpp
similarity index 100%
rename from HamlibTransceiver.cpp
rename to Transceiver/HamlibTransceiver.cpp
diff --git a/HamlibTransceiver.hpp b/Transceiver/HamlibTransceiver.hpp
similarity index 100%
rename from HamlibTransceiver.hpp
rename to Transceiver/HamlibTransceiver.hpp
diff --git a/OmniRigTransceiver.cpp b/Transceiver/OmniRigTransceiver.cpp
similarity index 99%
rename from OmniRigTransceiver.cpp
rename to Transceiver/OmniRigTransceiver.cpp
index de352fb5a..ff8dc79ec 100644
--- a/OmniRigTransceiver.cpp
+++ b/Transceiver/OmniRigTransceiver.cpp
@@ -6,7 +6,7 @@
 #include <QThread>
 #include <QEventLoop>
 
-#include "qt_helpers.hpP"
+#include "qt_helpers.hpp"
 
 #include "moc_OmniRigTransceiver.cpp"
 
diff --git a/OmniRigTransceiver.hpp b/Transceiver/OmniRigTransceiver.hpp
similarity index 100%
rename from OmniRigTransceiver.hpp
rename to Transceiver/OmniRigTransceiver.hpp
diff --git a/PollingTransceiver.cpp b/Transceiver/PollingTransceiver.cpp
similarity index 100%
rename from PollingTransceiver.cpp
rename to Transceiver/PollingTransceiver.cpp
diff --git a/PollingTransceiver.hpp b/Transceiver/PollingTransceiver.hpp
similarity index 98%
rename from PollingTransceiver.hpp
rename to Transceiver/PollingTransceiver.hpp
index a9e639f9d..7037c8261 100644
--- a/PollingTransceiver.hpp
+++ b/Transceiver/PollingTransceiver.hpp
@@ -3,7 +3,7 @@
 
 #include <QObject>
 
-#include "TransceiverBase.hpp"
+#include "Transceiver/TransceiverBase.hpp"
 
 class QTimer;
 
diff --git a/Transceiver.cpp b/Transceiver/Transceiver.cpp
similarity index 100%
rename from Transceiver.cpp
rename to Transceiver/Transceiver.cpp
diff --git a/Transceiver.hpp b/Transceiver/Transceiver.hpp
similarity index 100%
rename from Transceiver.hpp
rename to Transceiver/Transceiver.hpp
diff --git a/TransceiverBase.cpp b/Transceiver/TransceiverBase.cpp
similarity index 100%
rename from TransceiverBase.cpp
rename to Transceiver/TransceiverBase.cpp
diff --git a/TransceiverBase.hpp b/Transceiver/TransceiverBase.hpp
similarity index 100%
rename from TransceiverBase.hpp
rename to Transceiver/TransceiverBase.hpp
diff --git a/TransceiverFactory.cpp b/Transceiver/TransceiverFactory.cpp
similarity index 100%
rename from TransceiverFactory.cpp
rename to Transceiver/TransceiverFactory.cpp
diff --git a/TransceiverFactory.hpp b/Transceiver/TransceiverFactory.hpp
similarity index 100%
rename from TransceiverFactory.hpp
rename to Transceiver/TransceiverFactory.hpp
diff --git a/UDPExamples/BeaconsModel.hpp b/UDPExamples/BeaconsModel.hpp
index b089349cc..3fc9cb2af 100644
--- a/UDPExamples/BeaconsModel.hpp
+++ b/UDPExamples/BeaconsModel.hpp
@@ -3,7 +3,7 @@
 
 #include <QStandardItemModel>
 
-#include "MessageServer.hpp"
+#include "Network/MessageServer.hpp"
 
 using Frequency = MessageServer::Frequency;
 
diff --git a/UDPExamples/ClientWidget.hpp b/UDPExamples/ClientWidget.hpp
index 22488531c..14dfa4947 100644
--- a/UDPExamples/ClientWidget.hpp
+++ b/UDPExamples/ClientWidget.hpp
@@ -7,7 +7,7 @@
 #include <QRegularExpression>
 #include <QtWidgets>
 
-#include "MessageServer.hpp"
+#include "Network/MessageServer.hpp"
 
 class QAbstractItemModel;
 class QModelIndex;
diff --git a/UDPExamples/DecodesModel.hpp b/UDPExamples/DecodesModel.hpp
index 17c9ae125..384de5e0f 100644
--- a/UDPExamples/DecodesModel.hpp
+++ b/UDPExamples/DecodesModel.hpp
@@ -3,7 +3,7 @@
 
 #include <QStandardItemModel>
 
-#include "MessageServer.hpp"
+#include "Network/MessageServer.hpp"
 
 using Frequency = MessageServer::Frequency;
 
diff --git a/UDPExamples/MessageAggregatorMainWindow.hpp b/UDPExamples/MessageAggregatorMainWindow.hpp
index 29f762d3d..cd52ec1eb 100644
--- a/UDPExamples/MessageAggregatorMainWindow.hpp
+++ b/UDPExamples/MessageAggregatorMainWindow.hpp
@@ -5,7 +5,7 @@
 #include <QHash>
 #include <QString>
 
-#include "MessageServer.hpp"
+#include "Network/MessageServer.hpp"
 
 class QDateTime;
 class QStandardItemModel;
diff --git a/UDPExamples/UDPDaemon.cpp b/UDPExamples/UDPDaemon.cpp
index 20f1995b3..e2849e8b3 100644
--- a/UDPExamples/UDPDaemon.cpp
+++ b/UDPExamples/UDPDaemon.cpp
@@ -25,7 +25,7 @@
 #include <QHash>
 #include <QDebug>
 
-#include "MessageServer.hpp"
+#include "Network/MessageServer.hpp"
 #include "Radio.hpp"
 
 #include "qt_helpers.hpp"
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index f5c5cff41..a5e734664 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -41,11 +41,11 @@
 
 #include "revision_utils.hpp"
 #include "qt_helpers.hpp"
-#include "NetworkAccessManager.hpp"
+#include "Network/NetworkAccessManager.hpp"
 #include "soundout.h"
 #include "soundin.h"
 #include "Modulator.hpp"
-#include "Detector.hpp"
+#include "Detector/Detector.hpp"
 #include "plotter.h"
 #include "echoplot.h"
 #include "echograph.h"
@@ -60,10 +60,10 @@
 #include "decodedtext.h"
 #include "Radio.hpp"
 #include "models/Bands.hpp"
-#include "TransceiverFactory.hpp"
+#include "Transceiver/TransceiverFactory.hpp"
 #include "models/StationList.hpp"
 #include "validators/LiveFrequencyValidator.hpp"
-#include "MessageClient.hpp"
+#include "Network/MessageClient.hpp"
 #include "wsprnet.h"
 #include "signalmeter.h"
 #include "HelpTextWindow.hpp"
@@ -72,7 +72,7 @@
 #include "MultiSettings.hpp"
 #include "validators/MaidenheadLocatorValidator.hpp"
 #include "validators/CallsignValidator.hpp"
-#include "EqualizationToolsDialog.hpp"
+#include "Transceiver/EqualizationToolsDialog.hpp"
 #include "LotWUsers.hpp"
 #include "logbook/AD1CCty.hpp"
 #include "models/FoxLog.hpp"
diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h
index ca545ec35..a89c6c766 100644
--- a/widgets/mainwindow.h
+++ b/widgets/mainwindow.h
@@ -29,13 +29,13 @@
 #include "models/FrequencyList.hpp"
 #include "Configuration.hpp"
 #include "WSPRBandHopping.hpp"
-#include "Transceiver.hpp"
+#include "Transceiver/Transceiver.hpp"
 #include "DisplayManual.hpp"
-#include "psk_reporter.h"
+#include "Network/psk_reporter.h"
 #include "logbook/logbook.h"
 #include "astro.h"
 #include "MessageBox.hpp"
-#include "NetworkAccessManager.hpp"
+#include "Network/NetworkAccessManager.hpp"
 
 #define NUM_JT4_SYMBOLS 206                //(72+31)*2, embedded sync
 #define NUM_JT65_SYMBOLS 126               //63 data + 63 sync