diff --git a/languages/c/templates/sdk/CMakeLists.txt b/languages/c/src/shared/CMakeLists.txt
similarity index 100%
rename from languages/c/templates/sdk/CMakeLists.txt
rename to languages/c/src/shared/CMakeLists.txt
diff --git a/languages/c/templates/sdk/cmake/HelperFunctions.cmake b/languages/c/src/shared/cmake/HelperFunctions.cmake
similarity index 100%
rename from languages/c/templates/sdk/cmake/HelperFunctions.cmake
rename to languages/c/src/shared/cmake/HelperFunctions.cmake
diff --git a/languages/c/templates/sdk/cmake/project.cmake.in b/languages/c/src/shared/cmake/project.cmake.in
similarity index 100%
rename from languages/c/templates/sdk/cmake/project.cmake.in
rename to languages/c/src/shared/cmake/project.cmake.in
diff --git a/languages/c/templates/sdk/include/error.h b/languages/c/src/shared/include/error.h
similarity index 100%
rename from languages/c/templates/sdk/include/error.h
rename to languages/c/src/shared/include/error.h
diff --git a/languages/c/templates/sdk/include/firebolt.h b/languages/c/src/shared/include/firebolt.h
similarity index 100%
rename from languages/c/templates/sdk/include/firebolt.h
rename to languages/c/src/shared/include/firebolt.h
diff --git a/languages/c/templates/sdk/include/types.h b/languages/c/src/shared/include/types.h
similarity index 100%
rename from languages/c/templates/sdk/include/types.h
rename to languages/c/src/shared/include/types.h
diff --git a/languages/c/templates/sdk/src/Accessor/Accessor.cpp b/languages/c/src/shared/src/Accessor/Accessor.cpp
similarity index 100%
rename from languages/c/templates/sdk/src/Accessor/Accessor.cpp
rename to languages/c/src/shared/src/Accessor/Accessor.cpp
diff --git a/languages/c/templates/sdk/src/Accessor/Accessor.h b/languages/c/src/shared/src/Accessor/Accessor.h
similarity index 100%
rename from languages/c/templates/sdk/src/Accessor/Accessor.h
rename to languages/c/src/shared/src/Accessor/Accessor.h
diff --git a/languages/c/templates/sdk/src/Accessor/WorkerPool.h b/languages/c/src/shared/src/Accessor/WorkerPool.h
similarity index 100%
rename from languages/c/templates/sdk/src/Accessor/WorkerPool.h
rename to languages/c/src/shared/src/Accessor/WorkerPool.h
diff --git a/languages/c/templates/sdk/src/CMakeLists.txt b/languages/c/src/shared/src/CMakeLists.txt
similarity index 100%
rename from languages/c/templates/sdk/src/CMakeLists.txt
rename to languages/c/src/shared/src/CMakeLists.txt
diff --git a/languages/c/templates/sdk/src/Event/Event.cpp b/languages/c/src/shared/src/Event/Event.cpp
similarity index 100%
rename from languages/c/templates/sdk/src/Event/Event.cpp
rename to languages/c/src/shared/src/Event/Event.cpp
diff --git a/languages/c/templates/sdk/src/Event/Event.h b/languages/c/src/shared/src/Event/Event.h
similarity index 100%
rename from languages/c/templates/sdk/src/Event/Event.h
rename to languages/c/src/shared/src/Event/Event.h
diff --git a/languages/c/templates/sdk/src/FireboltSDK.conf.in b/languages/c/src/shared/src/FireboltSDK.conf.in
similarity index 100%
rename from languages/c/templates/sdk/src/FireboltSDK.conf.in
rename to languages/c/src/shared/src/FireboltSDK.conf.in
diff --git a/languages/c/templates/sdk/src/FireboltSDK.h b/languages/c/src/shared/src/FireboltSDK.h
similarity index 100%
rename from languages/c/templates/sdk/src/FireboltSDK.h
rename to languages/c/src/shared/src/FireboltSDK.h
diff --git a/languages/c/templates/sdk/src/Logger/Logger.cpp b/languages/c/src/shared/src/Logger/Logger.cpp
similarity index 100%
rename from languages/c/templates/sdk/src/Logger/Logger.cpp
rename to languages/c/src/shared/src/Logger/Logger.cpp
diff --git a/languages/c/templates/sdk/src/Logger/Logger.h b/languages/c/src/shared/src/Logger/Logger.h
similarity index 100%
rename from languages/c/templates/sdk/src/Logger/Logger.h
rename to languages/c/src/shared/src/Logger/Logger.h
diff --git a/languages/c/templates/sdk/src/Module.cpp b/languages/c/src/shared/src/Module.cpp
similarity index 100%
rename from languages/c/templates/sdk/src/Module.cpp
rename to languages/c/src/shared/src/Module.cpp
diff --git a/languages/c/templates/sdk/src/Module.h b/languages/c/src/shared/src/Module.h
similarity index 100%
rename from languages/c/templates/sdk/src/Module.h
rename to languages/c/src/shared/src/Module.h
diff --git a/languages/c/templates/sdk/src/Properties/Properties.h b/languages/c/src/shared/src/Properties/Properties.h
similarity index 100%
rename from languages/c/templates/sdk/src/Properties/Properties.h
rename to languages/c/src/shared/src/Properties/Properties.h
diff --git a/languages/c/templates/sdk/src/Transport/Transport.cpp b/languages/c/src/shared/src/Transport/Transport.cpp
similarity index 100%
rename from languages/c/templates/sdk/src/Transport/Transport.cpp
rename to languages/c/src/shared/src/Transport/Transport.cpp
diff --git a/languages/c/templates/sdk/src/Transport/Transport.h b/languages/c/src/shared/src/Transport/Transport.h
similarity index 100%
rename from languages/c/templates/sdk/src/Transport/Transport.h
rename to languages/c/src/shared/src/Transport/Transport.h
diff --git a/languages/c/templates/sdk/src/Types.cpp b/languages/c/src/shared/src/Types.cpp
similarity index 100%
rename from languages/c/templates/sdk/src/Types.cpp
rename to languages/c/src/shared/src/Types.cpp
diff --git a/languages/c/templates/sdk/src/TypesPriv.h b/languages/c/src/shared/src/TypesPriv.h
similarity index 100%
rename from languages/c/templates/sdk/src/TypesPriv.h
rename to languages/c/src/shared/src/TypesPriv.h
diff --git a/languages/c/templates/sdk/src/firebolt.cpp b/languages/c/src/shared/src/firebolt.cpp
similarity index 100%
rename from languages/c/templates/sdk/src/firebolt.cpp
rename to languages/c/src/shared/src/firebolt.cpp
diff --git a/languages/c/templates/sdk/test/CMakeLists.txt b/languages/c/src/shared/test/CMakeLists.txt
similarity index 100%
rename from languages/c/templates/sdk/test/CMakeLists.txt
rename to languages/c/src/shared/test/CMakeLists.txt
diff --git a/languages/c/templates/sdk/test/Main.c b/languages/c/src/shared/test/Main.c
similarity index 100%
rename from languages/c/templates/sdk/test/Main.c
rename to languages/c/src/shared/test/Main.c
diff --git a/languages/c/templates/sdk/test/Module.cpp b/languages/c/src/shared/test/Module.cpp
similarity index 100%
rename from languages/c/templates/sdk/test/Module.cpp
rename to languages/c/src/shared/test/Module.cpp
diff --git a/languages/c/templates/sdk/test/Module.h b/languages/c/src/shared/test/Module.h
similarity index 100%
rename from languages/c/templates/sdk/test/Module.h
rename to languages/c/src/shared/test/Module.h
diff --git a/languages/c/templates/sdk/test/OpenRPCCTests.h b/languages/c/src/shared/test/OpenRPCCTests.h
similarity index 100%
rename from languages/c/templates/sdk/test/OpenRPCCTests.h
rename to languages/c/src/shared/test/OpenRPCCTests.h
diff --git a/languages/c/templates/sdk/test/OpenRPCTests.cpp b/languages/c/src/shared/test/OpenRPCTests.cpp
similarity index 100%
rename from languages/c/templates/sdk/test/OpenRPCTests.cpp
rename to languages/c/src/shared/test/OpenRPCTests.cpp
diff --git a/languages/c/templates/sdk/test/OpenRPCTests.h b/languages/c/src/shared/test/OpenRPCTests.h
similarity index 100%
rename from languages/c/templates/sdk/test/OpenRPCTests.h
rename to languages/c/src/shared/test/OpenRPCTests.h
diff --git a/languages/c/templates/sdk/test/TestUtils.h b/languages/c/src/shared/test/TestUtils.h
similarity index 100%
rename from languages/c/templates/sdk/test/TestUtils.h
rename to languages/c/src/shared/test/TestUtils.h