Index: lib/Comms/Comms.pro
===================================================================
diff -u -r59b4c22f45a1d098064a886452769204e90cfb4b -r51e99f2578e0901d9da91a4cb60d1b8858cfe971
--- lib/Comms/Comms.pro	(.../Comms.pro)	(revision 59b4c22f45a1d098064a886452769204e90cfb4b)
+++ lib/Comms/Comms.pro	(.../Comms.pro)	(revision 51e99f2578e0901d9da91a4cb60d1b8858cfe971)
@@ -2,8 +2,8 @@
 
 TEMPLATE = lib
 TARGET   = Comms
-CONFIG  += shared c++20 moc
-QT      += core network serialbus
+CONFIG  += shared c++17 moc
+QT      += core mqtt network serialbus
 
 QMAKE_CXXFLAGS += -Wall -Werror -Wextra
 
@@ -21,10 +21,7 @@
     include/main.h \
     include/MessageBuilder.h \
     include/MessageDispatcher.h \
-    include/MqttPacket.h \
-    include/MqttPublisher.h \
-    include/MqttTcpTransport.h \
-    include/MqttTransport.h \
+    include/MqttClient.h \
     include/types.h
 
 SOURCES = \
@@ -37,9 +34,7 @@
     src/FrameInterface.cpp \
     src/MessageBuilder.cpp \
     src/MessageDispatcher.cpp \
-    src/MqttPacket.cpp \
-    src/MqttPublisher.cpp \
-    src/MqttTcpTransport.cpp \
+    src/MqttClient.cpp \
     src/types.cpp
 
 INCLUDEPATH += $$PWD/include