diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec59f63c..17f732f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,5 +42,5 @@ include_directories(MQTTPacket/src)
 
 enable_testing()
 ADD_SUBDIRECTORY(MQTTPacket)
-ADD_SUBDIRECTORY(MQTTClient)
 ADD_SUBDIRECTORY(MQTTClient-C)
+ADD_SUBDIRECTORY(MQTTClient-CPP)
diff --git a/MQTTClient/CMakeLists.txt b/MQTTClient-CPP/CMakeLists.txt
similarity index 100%
rename from MQTTClient/CMakeLists.txt
rename to MQTTClient-CPP/CMakeLists.txt
diff --git a/MQTTClient/samples/CMakeLists.txt b/MQTTClient-CPP/samples/CMakeLists.txt
similarity index 94%
rename from MQTTClient/samples/CMakeLists.txt
rename to MQTTClient-CPP/samples/CMakeLists.txt
index 1cd6aac4..5e550161 100644
--- a/MQTTClient/samples/CMakeLists.txt
+++ b/MQTTClient-CPP/samples/CMakeLists.txt
@@ -1,5 +1,5 @@
 #*******************************************************************************
-#  Copyright (c) 2017 IBM Corp.
+#  Copyright (c) 2017, 2023 IBM Corp.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License v1.0
diff --git a/MQTTClient/samples/arduino/Hello/Hello.ino b/MQTTClient-CPP/samples/arduino/Hello/Hello.ino
similarity index 96%
rename from MQTTClient/samples/arduino/Hello/Hello.ino
rename to MQTTClient-CPP/samples/arduino/Hello/Hello.ino
index 60893e1d..c2e85945 100644
--- a/MQTTClient/samples/arduino/Hello/Hello.ino
+++ b/MQTTClient-CPP/samples/arduino/Hello/Hello.ino
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 IBM Corp. and others
+ * Copyright (c) 2014, 2023 IBM Corp. and others
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -19,9 +19,9 @@
 
 #include <SPI.h>
 #include <Ethernet.h>
-#include <IPStack.h>
-#include <Countdown.h>
-#include <MQTTClient.h>
+#include <IPStack.hpp>
+#include <Countdown.hpp>
+#include <MQTTClient.hpp>
 
 char printbuf[100];
 
diff --git a/MQTTClient/samples/linux/CMakeLists.txt b/MQTTClient-CPP/samples/linux/CMakeLists.txt
similarity index 96%
rename from MQTTClient/samples/linux/CMakeLists.txt
rename to MQTTClient-CPP/samples/linux/CMakeLists.txt
index 6fcc1153..1913c58c 100644
--- a/MQTTClient/samples/linux/CMakeLists.txt
+++ b/MQTTClient-CPP/samples/linux/CMakeLists.txt
@@ -1,5 +1,5 @@
 #*******************************************************************************
-#  Copyright (c) 2017, 2018 IBM Corp.
+#  Copyright (c) 2017, 2023 IBM Corp.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License v1.0
diff --git a/MQTTClient/samples/linux/hello.cpp b/MQTTClient-CPP/samples/linux/hello.cpp
similarity index 99%
rename from MQTTClient/samples/linux/hello.cpp
rename to MQTTClient-CPP/samples/linux/hello.cpp
index b59c63c6..1fe4fc27 100644
--- a/MQTTClient/samples/linux/hello.cpp
+++ b/MQTTClient-CPP/samples/linux/hello.cpp
@@ -16,7 +16,7 @@
 
 #include <memory.h>
 
-#include "MQTTClient.h"
+#include "MQTTClient.hpp"
 
 #define DEFAULT_STACK_SIZE -1
 
diff --git a/MQTTClient/samples/linux/hello_class.cpp b/MQTTClient-CPP/samples/linux/hello_class.cpp
similarity index 99%
rename from MQTTClient/samples/linux/hello_class.cpp
rename to MQTTClient-CPP/samples/linux/hello_class.cpp
index 7253e8bd..ff48cc99 100644
--- a/MQTTClient/samples/linux/hello_class.cpp
+++ b/MQTTClient-CPP/samples/linux/hello_class.cpp
@@ -16,7 +16,7 @@
 
 #include <memory.h>
 
-#include "MQTTClient.h"
+#include "MQTTClient.hpp"
 
 #define DEFAULT_STACK_SIZE -1
 
diff --git a/MQTTClient/samples/linux/main.cpp b/MQTTClient-CPP/samples/linux/main.cpp
similarity index 100%
rename from MQTTClient/samples/linux/main.cpp
rename to MQTTClient-CPP/samples/linux/main.cpp
diff --git a/MQTTClient/samples/linux/stdoutsub.cpp b/MQTTClient-CPP/samples/linux/stdoutsub.cpp
similarity index 98%
rename from MQTTClient/samples/linux/stdoutsub.cpp
rename to MQTTClient-CPP/samples/linux/stdoutsub.cpp
index 2e56cc29..5031475b 100644
--- a/MQTTClient/samples/linux/stdoutsub.cpp
+++ b/MQTTClient-CPP/samples/linux/stdoutsub.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2013 IBM Corp.
+ * Copyright (c) 2012, 2023 IBM Corp.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -38,7 +38,7 @@
 #include <stdio.h>
 #include <memory.h>
 #define MQTT_DEBUG 1
-#include "MQTTClient.h"
+#include "MQTTClient.hpp"
 
 #define DEFAULT_STACK_SIZE -1
 
diff --git a/MQTTClient/src/FP.h b/MQTTClient-CPP/src/FP.hpp
similarity index 95%
rename from MQTTClient/src/FP.h
rename to MQTTClient-CPP/src/FP.hpp
index de5221db..9b8111fb 100644
--- a/MQTTClient/src/FP.h
+++ b/MQTTClient-CPP/src/FP.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2014 
+ * Copyright (c) 2013, 2023 
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -10,9 +10,9 @@
  * and the Eclipse Distribution License is available at
  *   http://www.eclipse.org/org/documents/edl-v10.php.
  *
- * Contributors:
+ * Contributors:
  *    Sam Grove - initial API and implementation and/or initial documentation
- *    Ian Craggs - added attached and detached member functions
+ *    Ian Craggs - added attached and detached member functions
  *    Sam Grove - removed need for FP.cpp
  *******************************************************************************/
 
diff --git a/MQTTClient/src/MQTTClient.h b/MQTTClient-CPP/src/MQTTClient.hpp
similarity index 99%
rename from MQTTClient/src/MQTTClient.h
rename to MQTTClient-CPP/src/MQTTClient.hpp
index 791ae02c..66b289a7 100644
--- a/MQTTClient/src/MQTTClient.h
+++ b/MQTTClient-CPP/src/MQTTClient.hpp
@@ -25,7 +25,7 @@
 #if !defined(MQTTCLIENT_H)
 #define MQTTCLIENT_H
 
-#include "FP.h"
+#include "FP.hpp"
 #include "MQTTPacket.h"
 #include <stdio.h>
 #include <string.h>
diff --git a/MQTTClient/src/MQTTLogging.h b/MQTTClient-CPP/src/MQTTLogging.h
similarity index 97%
rename from MQTTClient/src/MQTTLogging.h
rename to MQTTClient-CPP/src/MQTTLogging.h
index fd83e616..1af97935 100644
--- a/MQTTClient/src/MQTTLogging.h
+++ b/MQTTClient-CPP/src/MQTTLogging.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 IBM Corp.
+ * Copyright (c) 2014, 2023 IBM Corp.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
diff --git a/MQTTClient/src/arduino/Countdown.h b/MQTTClient-CPP/src/arduino/Countdown.hpp
similarity index 97%
rename from MQTTClient/src/arduino/Countdown.h
rename to MQTTClient-CPP/src/arduino/Countdown.hpp
index c9cb9607..19add648 100644
--- a/MQTTClient/src/arduino/Countdown.h
+++ b/MQTTClient-CPP/src/arduino/Countdown.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 IBM Corp.
+ * Copyright (c) 2014, 2023 IBM Corp.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
diff --git a/MQTTClient/src/arduino/IPStack.h b/MQTTClient-CPP/src/arduino/IPStack.hpp
similarity index 97%
rename from MQTTClient/src/arduino/IPStack.h
rename to MQTTClient-CPP/src/arduino/IPStack.hpp
index e0cea667..a7421958 100644
--- a/MQTTClient/src/arduino/IPStack.h
+++ b/MQTTClient-CPP/src/arduino/IPStack.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 IBM Corp.
+ * Copyright (c) 2014, 2023 IBM Corp.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
diff --git a/MQTTClient/src/arduino/WifiIPStack.h b/MQTTClient-CPP/src/arduino/WifiIPStack.hpp
similarity index 97%
rename from MQTTClient/src/arduino/WifiIPStack.h
rename to MQTTClient-CPP/src/arduino/WifiIPStack.hpp
index d87a9611..95ae847a 100644
--- a/MQTTClient/src/arduino/WifiIPStack.h
+++ b/MQTTClient-CPP/src/arduino/WifiIPStack.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 IBM Corp.
+ * Copyright (c) 2014, 2023 IBM Corp.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
diff --git a/MQTTClient/src/linux/linux.cpp b/MQTTClient-CPP/src/linux/linux.cpp
similarity index 100%
rename from MQTTClient/src/linux/linux.cpp
rename to MQTTClient-CPP/src/linux/linux.cpp
diff --git a/MQTTClient/src/mbed/MQTTEthernet.h b/MQTTClient-CPP/src/mbed/MQTTEthernet.hpp
similarity index 87%
rename from MQTTClient/src/mbed/MQTTEthernet.h
rename to MQTTClient-CPP/src/mbed/MQTTEthernet.hpp
index 3816a965..680e7a95 100644
--- a/MQTTClient/src/mbed/MQTTEthernet.h
+++ b/MQTTClient-CPP/src/mbed/MQTTEthernet.hpp
@@ -2,7 +2,7 @@
 #if !defined(MQTTETHERNET_H)
 #define MQTTETHERNET_H
 
-#include "MQTTmbed.h"
+#include "MQTTmbed.hpp"
 #include "EthernetInterface.h"
 #include "MQTTSocket.h"
 
diff --git a/MQTTClient/src/mbed/MQTTSocket.h b/MQTTClient-CPP/src/mbed/MQTTSocket.hpp
similarity index 100%
rename from MQTTClient/src/mbed/MQTTSocket.h
rename to MQTTClient-CPP/src/mbed/MQTTSocket.hpp
diff --git a/MQTTClient/src/mbed/MQTTmbed.h b/MQTTClient-CPP/src/mbed/MQTTmbed.hpp
similarity index 97%
rename from MQTTClient/src/mbed/MQTTmbed.h
rename to MQTTClient-CPP/src/mbed/MQTTmbed.hpp
index 46f00e61..860a1ad1 100644
--- a/MQTTClient/src/mbed/MQTTmbed.h
+++ b/MQTTClient-CPP/src/mbed/MQTTmbed.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 IBM Corp.
+ * Copyright (c) 2014, 2023 IBM Corp.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
diff --git a/MQTTClient/test/CMakeLists.txt b/MQTTClient-CPP/test/CMakeLists.txt
similarity index 100%
rename from MQTTClient/test/CMakeLists.txt
rename to MQTTClient-CPP/test/CMakeLists.txt
diff --git a/MQTTClient/test/test1.cpp b/MQTTClient-CPP/test/test1.cpp
similarity index 99%
rename from MQTTClient/test/test1.cpp
rename to MQTTClient-CPP/test/test1.cpp
index be85e0e5..ce402f29 100644
--- a/MQTTClient/test/test1.cpp
+++ b/MQTTClient-CPP/test/test1.cpp
@@ -24,7 +24,7 @@
  #include <string.h>
  #include <memory.h>
  //#define MQTT_DEBUG
- #include "MQTTClient.h"
+ #include "MQTTClient.hpp"
 
  #define DEFAULT_STACK_SIZE -1