diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bf0f37db31f35fe4c97c09f25a6add778d80c90..5d348360078b5ab4986a3f0f84084672ab72e995 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -477,7 +477,7 @@ if (WITH_SDK)
 	if (NOT WIN32)
 		add_subdirectory(SDK/C)
 	endif()
-	add_subdirectory(SDK/C++)
+	add_subdirectory(SDK/CPP)
 endif()
 
 if (HAVE_AVFORMAT)
diff --git a/SDK/C++/public/ext/pybind11 b/SDK/C++/public/ext/pybind11
deleted file mode 160000
index 06a54018c8a9fd9a7be5f5b56414b5da9259f637..0000000000000000000000000000000000000000
--- a/SDK/C++/public/ext/pybind11
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 06a54018c8a9fd9a7be5f5b56414b5da9259f637
diff --git a/SDK/C++/CMakeLists.txt b/SDK/CPP/CMakeLists.txt
similarity index 100%
rename from SDK/C++/CMakeLists.txt
rename to SDK/CPP/CMakeLists.txt
diff --git a/SDK/C++/private/feed_impl.cpp b/SDK/CPP/private/feed_impl.cpp
similarity index 100%
rename from SDK/C++/private/feed_impl.cpp
rename to SDK/CPP/private/feed_impl.cpp
diff --git a/SDK/C++/private/feed_impl.hpp b/SDK/CPP/private/feed_impl.hpp
similarity index 100%
rename from SDK/C++/private/feed_impl.hpp
rename to SDK/CPP/private/feed_impl.hpp
diff --git a/SDK/C++/private/frame_impl.cpp b/SDK/CPP/private/frame_impl.cpp
similarity index 100%
rename from SDK/C++/private/frame_impl.cpp
rename to SDK/CPP/private/frame_impl.cpp
diff --git a/SDK/C++/private/frame_impl.hpp b/SDK/CPP/private/frame_impl.hpp
similarity index 100%
rename from SDK/C++/private/frame_impl.hpp
rename to SDK/CPP/private/frame_impl.hpp
diff --git a/SDK/C++/private/image_impl.cpp b/SDK/CPP/private/image_impl.cpp
similarity index 100%
rename from SDK/C++/private/image_impl.cpp
rename to SDK/CPP/private/image_impl.cpp
diff --git a/SDK/C++/private/image_impl.hpp b/SDK/CPP/private/image_impl.hpp
similarity index 100%
rename from SDK/C++/private/image_impl.hpp
rename to SDK/CPP/private/image_impl.hpp
diff --git a/SDK/C++/private/observer_impl.cpp b/SDK/CPP/private/observer_impl.cpp
similarity index 100%
rename from SDK/C++/private/observer_impl.cpp
rename to SDK/CPP/private/observer_impl.cpp
diff --git a/SDK/C++/private/observer_impl.hpp b/SDK/CPP/private/observer_impl.hpp
similarity index 100%
rename from SDK/C++/private/observer_impl.hpp
rename to SDK/CPP/private/observer_impl.hpp
diff --git a/SDK/C++/private/operator_impl.cpp b/SDK/CPP/private/operator_impl.cpp
similarity index 100%
rename from SDK/C++/private/operator_impl.cpp
rename to SDK/CPP/private/operator_impl.cpp
diff --git a/SDK/C++/private/operator_impl.hpp b/SDK/CPP/private/operator_impl.hpp
similarity index 100%
rename from SDK/C++/private/operator_impl.hpp
rename to SDK/CPP/private/operator_impl.hpp
diff --git a/SDK/C++/private/pipeline_impl.cpp b/SDK/CPP/private/pipeline_impl.cpp
similarity index 100%
rename from SDK/C++/private/pipeline_impl.cpp
rename to SDK/CPP/private/pipeline_impl.cpp
diff --git a/SDK/C++/private/pipeline_impl.hpp b/SDK/CPP/private/pipeline_impl.hpp
similarity index 100%
rename from SDK/C++/private/pipeline_impl.hpp
rename to SDK/CPP/private/pipeline_impl.hpp
diff --git a/SDK/C++/private/pointcloud_impl.cpp b/SDK/CPP/private/pointcloud_impl.cpp
similarity index 100%
rename from SDK/C++/private/pointcloud_impl.cpp
rename to SDK/CPP/private/pointcloud_impl.cpp
diff --git a/SDK/C++/private/pointcloud_impl.hpp b/SDK/CPP/private/pointcloud_impl.hpp
similarity index 100%
rename from SDK/C++/private/pointcloud_impl.hpp
rename to SDK/CPP/private/pointcloud_impl.hpp
diff --git a/SDK/C++/private/property_impl.cpp b/SDK/CPP/private/property_impl.cpp
similarity index 100%
rename from SDK/C++/private/property_impl.cpp
rename to SDK/CPP/private/property_impl.cpp
diff --git a/SDK/C++/private/property_impl.hpp b/SDK/CPP/private/property_impl.hpp
similarity index 100%
rename from SDK/C++/private/property_impl.hpp
rename to SDK/CPP/private/property_impl.hpp
diff --git a/SDK/C++/private/room_impl.cpp b/SDK/CPP/private/room_impl.cpp
similarity index 100%
rename from SDK/C++/private/room_impl.cpp
rename to SDK/CPP/private/room_impl.cpp
diff --git a/SDK/C++/private/room_impl.hpp b/SDK/CPP/private/room_impl.hpp
similarity index 100%
rename from SDK/C++/private/room_impl.hpp
rename to SDK/CPP/private/room_impl.hpp
diff --git a/SDK/C++/private/system.cpp b/SDK/CPP/private/system.cpp
similarity index 100%
rename from SDK/C++/private/system.cpp
rename to SDK/CPP/private/system.cpp
diff --git a/SDK/C++/private/system_impl.hpp b/SDK/CPP/private/system_impl.hpp
similarity index 100%
rename from SDK/C++/private/system_impl.hpp
rename to SDK/CPP/private/system_impl.hpp
diff --git a/SDK/C++/public/CMakeLists.txt b/SDK/CPP/public/CMakeLists.txt
similarity index 100%
rename from SDK/C++/public/CMakeLists.txt
rename to SDK/CPP/public/CMakeLists.txt
diff --git a/SDK/C++/public/LICENSE b/SDK/CPP/public/LICENSE
similarity index 100%
rename from SDK/C++/public/LICENSE
rename to SDK/CPP/public/LICENSE
diff --git a/SDK/C++/public/README.md b/SDK/CPP/public/README.md
similarity index 100%
rename from SDK/C++/public/README.md
rename to SDK/CPP/public/README.md
diff --git a/SDK/C++/public/include/voltu/defines.hpp b/SDK/CPP/public/include/voltu/defines.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/defines.hpp
rename to SDK/CPP/public/include/voltu/defines.hpp
diff --git a/SDK/C++/public/include/voltu/feed.hpp b/SDK/CPP/public/include/voltu/feed.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/feed.hpp
rename to SDK/CPP/public/include/voltu/feed.hpp
diff --git a/SDK/C++/public/include/voltu/initialise.hpp b/SDK/CPP/public/include/voltu/initialise.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/initialise.hpp
rename to SDK/CPP/public/include/voltu/initialise.hpp
diff --git a/SDK/C++/public/include/voltu/observer.hpp b/SDK/CPP/public/include/voltu/observer.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/observer.hpp
rename to SDK/CPP/public/include/voltu/observer.hpp
diff --git a/SDK/C++/public/include/voltu/opencv.hpp b/SDK/CPP/public/include/voltu/opencv.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/opencv.hpp
rename to SDK/CPP/public/include/voltu/opencv.hpp
diff --git a/SDK/C++/public/include/voltu/operator.hpp b/SDK/CPP/public/include/voltu/operator.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/operator.hpp
rename to SDK/CPP/public/include/voltu/operator.hpp
diff --git a/SDK/C++/public/include/voltu/pipeline.hpp b/SDK/CPP/public/include/voltu/pipeline.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/pipeline.hpp
rename to SDK/CPP/public/include/voltu/pipeline.hpp
diff --git a/SDK/C++/public/include/voltu/room.hpp b/SDK/CPP/public/include/voltu/room.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/room.hpp
rename to SDK/CPP/public/include/voltu/room.hpp
diff --git a/SDK/C++/public/include/voltu/source.hpp b/SDK/CPP/public/include/voltu/source.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/source.hpp
rename to SDK/CPP/public/include/voltu/source.hpp
diff --git a/SDK/C++/public/include/voltu/system.hpp b/SDK/CPP/public/include/voltu/system.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/system.hpp
rename to SDK/CPP/public/include/voltu/system.hpp
diff --git a/SDK/C++/public/include/voltu/types/channel.hpp b/SDK/CPP/public/include/voltu/types/channel.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/types/channel.hpp
rename to SDK/CPP/public/include/voltu/types/channel.hpp
diff --git a/SDK/C++/public/include/voltu/types/errors.hpp b/SDK/CPP/public/include/voltu/types/errors.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/types/errors.hpp
rename to SDK/CPP/public/include/voltu/types/errors.hpp
diff --git a/SDK/C++/public/include/voltu/types/frame.hpp b/SDK/CPP/public/include/voltu/types/frame.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/types/frame.hpp
rename to SDK/CPP/public/include/voltu/types/frame.hpp
diff --git a/SDK/C++/public/include/voltu/types/image.hpp b/SDK/CPP/public/include/voltu/types/image.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/types/image.hpp
rename to SDK/CPP/public/include/voltu/types/image.hpp
diff --git a/SDK/C++/public/include/voltu/types/intrinsics.hpp b/SDK/CPP/public/include/voltu/types/intrinsics.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/types/intrinsics.hpp
rename to SDK/CPP/public/include/voltu/types/intrinsics.hpp
diff --git a/SDK/C++/public/include/voltu/types/pointcloud.hpp b/SDK/CPP/public/include/voltu/types/pointcloud.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/types/pointcloud.hpp
rename to SDK/CPP/public/include/voltu/types/pointcloud.hpp
diff --git a/SDK/C++/public/include/voltu/types/property.hpp b/SDK/CPP/public/include/voltu/types/property.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/types/property.hpp
rename to SDK/CPP/public/include/voltu/types/property.hpp
diff --git a/SDK/C++/public/include/voltu/voltu.hpp b/SDK/CPP/public/include/voltu/voltu.hpp
similarity index 100%
rename from SDK/C++/public/include/voltu/voltu.hpp
rename to SDK/CPP/public/include/voltu/voltu.hpp
diff --git a/SDK/C++/public/python/CMakeLists.txt b/SDK/CPP/public/python/CMakeLists.txt
similarity index 100%
rename from SDK/C++/public/python/CMakeLists.txt
rename to SDK/CPP/public/python/CMakeLists.txt
diff --git a/SDK/C++/public/python/CppHeaderParser/CppHeaderParser.py b/SDK/CPP/public/python/CppHeaderParser/CppHeaderParser.py
similarity index 100%
rename from SDK/C++/public/python/CppHeaderParser/CppHeaderParser.py
rename to SDK/CPP/public/python/CppHeaderParser/CppHeaderParser.py
diff --git a/SDK/C++/public/python/CppHeaderParser/LICENSE.txt b/SDK/CPP/public/python/CppHeaderParser/LICENSE.txt
similarity index 100%
rename from SDK/C++/public/python/CppHeaderParser/LICENSE.txt
rename to SDK/CPP/public/python/CppHeaderParser/LICENSE.txt
diff --git a/SDK/C++/public/python/CppHeaderParser/README.rst b/SDK/CPP/public/python/CppHeaderParser/README.rst
similarity index 100%
rename from SDK/C++/public/python/CppHeaderParser/README.rst
rename to SDK/CPP/public/python/CppHeaderParser/README.rst
diff --git a/SDK/C++/public/python/CppHeaderParser/__init__.py b/SDK/CPP/public/python/CppHeaderParser/__init__.py
similarity index 100%
rename from SDK/C++/public/python/CppHeaderParser/__init__.py
rename to SDK/CPP/public/python/CppHeaderParser/__init__.py
diff --git a/SDK/C++/public/python/CppHeaderParser/doxygen.py b/SDK/CPP/public/python/CppHeaderParser/doxygen.py
similarity index 100%
rename from SDK/C++/public/python/CppHeaderParser/doxygen.py
rename to SDK/CPP/public/python/CppHeaderParser/doxygen.py
diff --git a/SDK/C++/public/python/CppHeaderParser/lexer.py b/SDK/CPP/public/python/CppHeaderParser/lexer.py
similarity index 100%
rename from SDK/C++/public/python/CppHeaderParser/lexer.py
rename to SDK/CPP/public/python/CppHeaderParser/lexer.py
diff --git a/SDK/C++/public/python/CppHeaderParser/tojson.py b/SDK/CPP/public/python/CppHeaderParser/tojson.py
similarity index 100%
rename from SDK/C++/public/python/CppHeaderParser/tojson.py
rename to SDK/CPP/public/python/CppHeaderParser/tojson.py
diff --git a/SDK/C++/public/python/README.md b/SDK/CPP/public/python/README.md
similarity index 100%
rename from SDK/C++/public/python/README.md
rename to SDK/CPP/public/python/README.md
diff --git a/SDK/C++/public/python/automatic_bindings.cpp.in b/SDK/CPP/public/python/automatic_bindings.cpp.in
similarity index 100%
rename from SDK/C++/public/python/automatic_bindings.cpp.in
rename to SDK/CPP/public/python/automatic_bindings.cpp.in
diff --git a/SDK/C++/public/python/examples/example1.py b/SDK/CPP/public/python/examples/example1.py
similarity index 100%
rename from SDK/C++/public/python/examples/example1.py
rename to SDK/CPP/public/python/examples/example1.py
diff --git a/SDK/C++/public/python/examples/example2.py b/SDK/CPP/public/python/examples/example2.py
similarity index 100%
rename from SDK/C++/public/python/examples/example2.py
rename to SDK/CPP/public/python/examples/example2.py
diff --git a/SDK/C++/public/python/gen.py b/SDK/CPP/public/python/gen.py
similarity index 100%
rename from SDK/C++/public/python/gen.py
rename to SDK/CPP/public/python/gen.py
diff --git a/SDK/C++/public/python/module.cpp b/SDK/CPP/public/python/module.cpp
similarity index 100%
rename from SDK/C++/public/python/module.cpp
rename to SDK/CPP/public/python/module.cpp
diff --git a/SDK/C++/public/python/module.hpp b/SDK/CPP/public/python/module.hpp
similarity index 100%
rename from SDK/C++/public/python/module.hpp
rename to SDK/CPP/public/python/module.hpp
diff --git a/SDK/C++/public/python/tests/__init__.py b/SDK/CPP/public/python/tests/__init__.py
similarity index 100%
rename from SDK/C++/public/python/tests/__init__.py
rename to SDK/CPP/public/python/tests/__init__.py
diff --git a/SDK/C++/public/python/tests/test_load.py b/SDK/CPP/public/python/tests/test_load.py
similarity index 100%
rename from SDK/C++/public/python/tests/test_load.py
rename to SDK/CPP/public/python/tests/test_load.py
diff --git a/SDK/C++/public/python/types/image.hpp b/SDK/CPP/public/python/types/image.hpp
similarity index 100%
rename from SDK/C++/public/python/types/image.hpp
rename to SDK/CPP/public/python/types/image.hpp
diff --git a/SDK/C++/public/samples/basic_file/main.cpp b/SDK/CPP/public/samples/basic_file/main.cpp
similarity index 100%
rename from SDK/C++/public/samples/basic_file/main.cpp
rename to SDK/CPP/public/samples/basic_file/main.cpp
diff --git a/SDK/C++/public/samples/basic_test/main.cpp b/SDK/CPP/public/samples/basic_test/main.cpp
similarity index 100%
rename from SDK/C++/public/samples/basic_test/main.cpp
rename to SDK/CPP/public/samples/basic_test/main.cpp
diff --git a/SDK/C++/public/samples/basic_virtual_cam/main.cpp b/SDK/CPP/public/samples/basic_virtual_cam/main.cpp
similarity index 100%
rename from SDK/C++/public/samples/basic_virtual_cam/main.cpp
rename to SDK/CPP/public/samples/basic_virtual_cam/main.cpp
diff --git a/SDK/C++/public/samples/fusion_evaluator/main.cpp b/SDK/CPP/public/samples/fusion_evaluator/main.cpp
similarity index 100%
rename from SDK/C++/public/samples/fusion_evaluator/main.cpp
rename to SDK/CPP/public/samples/fusion_evaluator/main.cpp
diff --git a/SDK/C++/public/voltu.cpp b/SDK/CPP/public/voltu.cpp
similarity index 100%
rename from SDK/C++/public/voltu.cpp
rename to SDK/CPP/public/voltu.cpp
diff --git a/SDK/C++/public/voltu_cv.cpp b/SDK/CPP/public/voltu_cv.cpp
similarity index 100%
rename from SDK/C++/public/voltu_cv.cpp
rename to SDK/CPP/public/voltu_cv.cpp