diff --git a/LibCarla/cmake/CMakeLists.txt b/LibCarla/cmake/CMakeLists.txt
deleted file mode 100644
index d876d72b6..000000000
--- a/LibCarla/cmake/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-cmake_minimum_required(VERSION 3.5.1)
-project(libcarla)
-
-option(LIBCARLA_BUILD_DEBUG "Build debug configuration" ON)
-option(LIBCARLA_BUILD_RELEASE "Build release configuration" ON)
-option(LIBCARLA_BUILD_TEST "Build unit tests" ON)
-
-message(STATUS "Build debug:   ${LIBCARLA_BUILD_DEBUG}")
-message(STATUS "Build release: ${LIBCARLA_BUILD_RELEASE}")
-message(STATUS "Build test:    ${LIBCARLA_BUILD_TEST}")
-
-set(libcarla_source_path "${PROJECT_SOURCE_DIR}/../source")
-set(libcarla_source_thirdparty_path "${libcarla_source_path}/third-party")
-
-include_directories(${libcarla_source_path})
-include_directories(${libcarla_source_thirdparty_path})
-
-if (CARLA_VERSION)
-  configure_file(${libcarla_source_path}/carla/Version.h.in ${libcarla_source_path}/carla/Version.h)
-endif()
-
-if (CMAKE_BUILD_TYPE STREQUAL "Client")
-  add_subdirectory("client")
-elseif (CMAKE_BUILD_TYPE STREQUAL "Server")
-  add_subdirectory("server")
-elseif (CMAKE_BUILD_TYPE STREQUAL "Pytorch")
-add_subdirectory("pytorch")
-elseif (CMAKE_BUILD_TYPE STREQUAL "ros2")
-add_subdirectory("fast_dds")
-else ()
-  message(FATAL_ERROR "Unknown build type '${CMAKE_BUILD_TYPE}'")
-endif ()
-
-# GTest is not compiled on Windows.
-if ((LIBCARLA_BUILD_TEST) AND (NOT WIN32) AND (NOT (CMAKE_BUILD_TYPE STREQUAL "Pytorch")) AND (NOT (CMAKE_BUILD_TYPE STREQUAL "ros2")))
-  add_subdirectory("test")
-endif()
diff --git a/LibCarla/cmake/client/CMakeLists.txt b/LibCarla/cmake/client/CMakeLists.txt
deleted file mode 100644
index 6f2f8e6c3..000000000
--- a/LibCarla/cmake/client/CMakeLists.txt
+++ /dev/null
@@ -1,359 +0,0 @@
-cmake_minimum_required(VERSION 3.5.1)
-project(libcarla-client)
-
-# Enable/Install RSS VARIANT
-option (BUILD_RSS_VARIANT "Enables ad-rss-lib based RSS components" OFF)
-set(carla_target_postfix "")
-if (BUILD_RSS_VARIANT)
-  set(carla_target_postfix "_rss")
-  set(ADRSS_INCLUDE_DIRS)
-  set(ADRSS_LIBS)
-
-  find_package (spdlog CONFIG REQUIRED
-    HINTS ${ADRSS_INSTALL_DIR}/spdlog/)
-  get_target_property(spdlog_include_dirs spdlog::spdlog INTERFACE_INCLUDE_DIRECTORIES)
-  get_target_property(spdlog_file spdlog::spdlog LOCATION)
-  foreach(dir ${spdlog_include_dirs})
-    file(GLOB spdlog_includes "${dir}/*")
-    install(DIRECTORY ${spdlog_includes} DESTINATION include/system)
-    list(APPEND ADRSS_INCLUDE_DIRS ${dir})
-  endforeach()
-  install(FILES ${spdlog_file} DESTINATION lib)
-  list(APPEND ADRSS_LIBS ${spdlog_file})
-
-  set(proj_include_dir ${ADRSS_INSTALL_DIR}/../../proj-install/include)
-  set(proj_lib ${ADRSS_INSTALL_DIR}/../../proj-install/lib/libproj.a)
-  install(DIRECTORY ${proj_include_dir} DESTINATION include/system)
-  list(APPEND ADRSS_INCLUDE_DIRS ${proj_include_dir})
-  install(FILES ${proj_lib} DESTINATION lib)
-  list(APPEND ADRSS_LIBS ${proj_lib})
-
-  # as long as the libosm2odr uses the same odrSprial interface it is enough to copy the built static library
-  set(odr_lib ${ADRSS_INSTALL_DIR}/../src/ad-rss-lib/dependencies/map/dependencies/odrSpiral/lib/libodrSpiral.a)
-  install(FILES ${odr_lib} DESTINATION lib)
-  list(APPEND ADRSS_LIBS ${odr_lib})
-
-  foreach(ad_lib ad_physics ad_rss ad_map_access ad_map_opendrive_reader ad_rss_map_integration)
-    set(${ad_lib}_file ${ADRSS_INSTALL_DIR}/${ad_lib}/lib/lib${ad_lib}.a)
-    install(FILES ${${ad_lib}_file} DESTINATION lib)
-    list(APPEND ADRSS_LIBS ${${ad_lib}_file})
-
-    # Install corresponding python libs if available
-    file(GLOB ${ad_lib}_python_libs "${ADRSS_INSTALL_DIR}/${ad_lib}/lib/lib${ad_lib}_python*.a")
-    foreach(ad_python_lib ${${ad_lib}_python_libs})
-      if (EXISTS ${ad_python_lib})
-        install(FILES ${ad_python_lib} DESTINATION lib)
-      endif()
-    endforeach()
-
-    set(${ad_lib}_include_dir ${ADRSS_INSTALL_DIR}/${ad_lib}/include)
-    file(GLOB ${ad_lib}_includes "${${ad_lib}_include_dir}/*")
-    install(DIRECTORY ${${ad_lib}_includes} DESTINATION include/system)
-    list(APPEND ADRSS_INCLUDE_DIRS ${${ad_lib}_include_dir})
-  endforeach()
-endif()
-
-# Install Recast&Detour libraries
-install(DIRECTORY "${RECAST_INCLUDE_PATH}/recast" DESTINATION include/system)
-file(GLOB libcarla_carla_recastlib "${RECAST_LIB_PATH}/*.*")
-install(FILES ${libcarla_carla_recastlib} DESTINATION lib)
-
-# Install rpclib (install in system folder to avoid extra warnings).
-install(DIRECTORY "${RPCLIB_INCLUDE_PATH}/rpc" DESTINATION include/system)
-file(GLOB libcarla_carla_rpclib "${RPCLIB_LIB_PATH}/*.*")
-install(FILES ${libcarla_carla_rpclib} DESTINATION lib)
-
-# Install boost headers (install in system folder to avoid extra warnings).
-# @todo Remove boost from public interface of LibCarla.client.
-install(DIRECTORY "${BOOST_INCLUDE_PATH}/boost" DESTINATION include/system)
-file(GLOB boost_libraries "${BOOST_LIB_PATH}/*.*")
-install(FILES ${boost_libraries} DESTINATION lib)
-
-# Windows need libpng alongside with zlib to be installed
-if (WIN32)
-    # Install zlib headers.
-    file(GLOB zlib_includes "${ZLIB_INCLUDE_PATH}/*")
-    install(FILES ${zlib_includes} DESTINATION include)
-    # Install zlib lib.
-    file(GLOB zlib_libraries "${ZLIB_LIB_PATH}/*")
-    install(FILES ${zlib_libraries} DESTINATION lib)
-
-    # Install libpng headers.
-    file(GLOB pnglib_includes "${LIBPNG_INCLUDE_PATH}/*")
-    install(FILES ${pnglib_includes} DESTINATION include)
-    # Install zlib lib.
-    file(GLOB libpng_libraries "${LIBPNG_LIB_PATH}/*")
-    install(FILES ${libpng_libraries} DESTINATION lib)
-else ()
-  # Install libpng library
-  install(DIRECTORY "${LIBPNG_INCLUDE_PATH}" DESTINATION include/system)
-  file(GLOB libcarla_carla_libpnglib "${LIBPNG_LIB_PATH}/*.*")
-  install(FILES ${libcarla_carla_libpnglib} DESTINATION lib)
-endif (WIN32)
-
-# Add sources.
-file(GLOB libcarla_carla_sources
-    "${libcarla_source_path}/carla/*.cpp"
-    "${libcarla_source_path}/carla/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_sources}")
-install(FILES ${libcarla_carla_sources} DESTINATION include/carla)
-
-file(GLOB libcarla_carla_client_sources
-    "${libcarla_source_path}/carla/client/*.cpp"
-    "${libcarla_source_path}/carla/client/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_client_sources}")
-install(FILES ${libcarla_carla_client_sources} DESTINATION include/carla/client)
-
-file(GLOB libcarla_carla_client_detail_sources
-    "${libcarla_source_path}/carla/client/detail/*.cpp"
-    "${libcarla_source_path}/carla/client/detail/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_client_detail_sources}")
-install(FILES ${libcarla_carla_client_detail_sources} DESTINATION include/carla/client/detail)
-
-file(GLOB libcarla_carla_geom_sources
-    "${libcarla_source_path}/carla/geom/*.cpp"
-    "${libcarla_source_path}/carla/geom/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_geom_sources}")
-install(FILES ${libcarla_carla_geom_sources} DESTINATION include/carla/geom)
-
-file(GLOB libcarla_carla_image_sources
-    "${libcarla_source_path}/carla/image/*.cpp"
-    "${libcarla_source_path}/carla/image/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_image_sources}")
-install(FILES ${libcarla_carla_image_sources} DESTINATION include/carla/image)
-
-file(GLOB libcarla_carla_nav_sources
-    "${libcarla_source_path}/carla/nav/*.cpp"
-    "${libcarla_source_path}/carla/nav/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_nav_sources}")
-install(FILES ${libcarla_carla_nav_sources} DESTINATION include/carla/nav)
-
-file(GLOB libcarla_carla_opendrive_sources
-    "${libcarla_source_path}/carla/opendrive/*.cpp"
-    "${libcarla_source_path}/carla/opendrive/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_opendrive_sources}")
-install(FILES ${libcarla_carla_opendrive_sources} DESTINATION include/carla/opendrive)
-
-file(GLOB libcarla_carla_opendrive_parser_sources
-    "${libcarla_source_path}/carla/opendrive/parser/*.cpp"
-    "${libcarla_source_path}/carla/opendrive/parser/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_opendrive_parser_sources}")
-install(FILES ${libcarla_carla_opendrive_parser_sources} DESTINATION include/carla/opendrive/parser)
-
-file(GLOB libcarla_carla_pointcloud_sources
-    "${libcarla_source_path}/carla/pointcloud/*.cpp"
-    "${libcarla_source_path}/carla/pointcloud/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_pointcloud_sources}")
-install(FILES ${libcarla_carla_pointcloud_sources} DESTINATION include/carla/pointcloud)
-
-file(GLOB libcarla_carla_profiler_headers
-    "${libcarla_source_path}/carla/profiler/*.h")
-install(FILES ${libcarla_carla_profiler_headers} DESTINATION include/carla/profiler)
-
-file(GLOB libcarla_carla_road_sources
-    "${libcarla_source_path}/carla/road/*.cpp"
-    "${libcarla_source_path}/carla/road/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_road_sources}")
-install(FILES ${libcarla_carla_road_sources} DESTINATION include/carla/road)
-
-file(GLOB libcarla_carla_road_element_sources
-    "${libcarla_source_path}/carla/road/element/*.cpp"
-    "${libcarla_source_path}/carla/road/element/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_road_element_sources}")
-install(FILES ${libcarla_carla_road_element_sources} DESTINATION include/carla/road/element)
-
-file(GLOB libcarla_carla_road_general_sources
-    "${libcarla_source_path}/carla/road/general/*.cpp"
-    "${libcarla_source_path}/carla/road/general/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_road_general_sources}")
-install(FILES ${libcarla_carla_road_general_sources} DESTINATION include/carla/road/general)
-
-file(GLOB libcarla_carla_road_object_sources
-    "${libcarla_source_path}/carla/road/object/*.cpp"
-    "${libcarla_source_path}/carla/road/object/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_road_object_sources}")
-install(FILES ${libcarla_carla_road_object_sources} DESTINATION include/carla/road/object)
-
-file(GLOB libcarla_carla_road_signal_sources
-    "${libcarla_source_path}/carla/road/signal/*.cpp"
-    "${libcarla_source_path}/carla/road/signal/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_road_signal_sources}")
-install(FILES ${libcarla_carla_road_signal_sources} DESTINATION include/carla/road/signal)
-
-file(GLOB libcarla_carla_rpc_sources
-    "${libcarla_source_path}/carla/rpc/*.cpp"
-    "${libcarla_source_path}/carla/rpc/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_rpc_sources}")
-install(FILES ${libcarla_carla_rpc_sources} DESTINATION include/carla/rpc)
-
-if (BUILD_RSS_VARIANT)
-  file(GLOB libcarla_carla_rss_sources
-      "${libcarla_source_path}/carla/rss/*.cpp"
-      "${libcarla_source_path}/carla/rss/*.h")
-  set(libcarla_sources "${libcarla_sources};${libcarla_carla_rss_sources}")
-  install(FILES ${libcarla_carla_rss_sources} DESTINATION include/carla/rss)
-endif()
-
-file(GLOB libcarla_carla_sensor_sources
-    "${libcarla_source_path}/carla/sensor/*.cpp"
-    "${libcarla_source_path}/carla/sensor/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_sensor_sources}")
-install(FILES ${libcarla_carla_sensor_sources} DESTINATION include/carla/sensor)
-
-file(GLOB libcarla_carla_sensor_data_sources
-    "${libcarla_source_path}/carla/sensor/data/*.cpp"
-    "${libcarla_source_path}/carla/sensor/data/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_sensor_data_sources}")
-install(FILES ${libcarla_carla_sensor_data_sources} DESTINATION include/carla/sensor/data)
-
-file(GLOB libcarla_carla_sensor_s11n_sources
-    "${libcarla_source_path}/carla/sensor/s11n/*.cpp"
-    "${libcarla_source_path}/carla/sensor/s11n/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_sensor_s11n_sources}")
-install(FILES ${libcarla_carla_sensor_s11n_sources} DESTINATION include/carla/sensor/s11n)
-
-file(GLOB libcarla_carla_streaming_sources
-    "${libcarla_source_path}/carla/streaming/*.cpp"
-    "${libcarla_source_path}/carla/streaming/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_streaming_sources}")
-install(FILES ${libcarla_carla_streaming_sources} DESTINATION include/carla/streaming)
-
-file(GLOB libcarla_carla_streaming_detail_sources
-    "${libcarla_source_path}/carla/streaming/detail/*.cpp"
-    "${libcarla_source_path}/carla/streaming/detail/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_streaming_detail_sources}")
-install(FILES ${libcarla_carla_streaming_detail_sources} DESTINATION include/carla/streaming/detail)
-
-file(GLOB libcarla_carla_streaming_detail_tcp_sources
-    "${libcarla_source_path}/carla/streaming/detail/tcp/*.cpp"
-    "${libcarla_source_path}/carla/streaming/detail/tcp/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_streaming_detail_tcp_sources}")
-install(FILES ${libcarla_carla_streaming_detail_tcp_sources} DESTINATION include/carla/streaming/detail/tcp)
-
-file(GLOB libcarla_carla_streaming_low_level_sources
-    "${libcarla_source_path}/carla/streaming/low_level/*.cpp"
-    "${libcarla_source_path}/carla/streaming/low_level/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_streaming_low_level_sources}")
-install(FILES ${libcarla_carla_streaming_low_level_sources} DESTINATION include/carla/streaming/low_level)
-
-file(GLOB libcarla_carla_multigpu_sources
-    "${libcarla_source_path}/carla/multigpu/*.cpp"
-    "${libcarla_source_path}/carla/multigpu/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_multigpu_sources}")
-install(FILES ${libcarla_carla_multigpu_sources} DESTINATION include/carla/multigpu)
-
-file(GLOB libcarla_odr_spiral_sources
-    "${libcarla_source_thirdparty_path}/odrSpiral/*.cpp"
-    "${libcarla_source_thirdparty_path}/odrSpiral/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_odr_spiral_sources}")
-install(FILES ${libcarla_odr_spiral_sources} DESTINATION include/odrSpiral)
-
-file(GLOB libcarla_moodycamel_sources
-    "${libcarla_source_thirdparty_path}/moodycamel/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_moodycamel_sources}")
-install(FILES ${libcarla_moodycamel_sources} DESTINATION include/moodycamel)
-
-file(GLOB libcarla_pugixml_sources
-    "${libcarla_source_thirdparty_path}/pugixml/*.cpp"
-    "${libcarla_source_thirdparty_path}/pugixml/*.hpp"
-    "${libcarla_source_thirdparty_path}/pugixml/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_pugixml_sources}")
-install(FILES ${libcarla_pugixml_sources} DESTINATION include/pugixml)
-
-file(GLOB libcarla_carla_trafficmanager_sources
-    "${libcarla_source_path}/carla/trafficmanager/*.cpp"
-    "${libcarla_source_path}/carla/trafficmanager/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_trafficmanager_sources}")
-install(FILES ${libcarla_carla_trafficmanager_sources} DESTINATION include/carla/trafficmanager)
-
-file(GLOB libcarla_carla_ros2_sources
-    "${libcarla_source_path}/carla/ros2/*.cpp"
-    "${libcarla_source_path}/carla/ros2/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_ros2_sources}")
-install(FILES ${libcarla_carla_ros2_sources} DESTINATION include/carla/ros2)
-
-# ==============================================================================
-# Create targets for debug and release in the same build type.
-# ==============================================================================
-
-
-if (LIBCARLA_BUILD_RELEASE)
-  add_library(carla_client${carla_target_postfix} STATIC ${libcarla_sources})
-
-  target_include_directories(carla_client${carla_target_postfix} SYSTEM PRIVATE
-      "${BOOST_INCLUDE_PATH}"
-      "${RPCLIB_INCLUDE_PATH}"
-      "${RECAST_INCLUDE_PATH}"
-      "${LIBPNG_INCLUDE_PATH}")
-
-  if (BUILD_RSS_VARIANT)
-    target_compile_definitions(carla_client${carla_target_postfix} PRIVATE RSS_ENABLED RSS_USE_TBB)
-    target_link_libraries(carla_client${carla_target_postfix} ${ADRSS_LIBS} tbb)
-    target_include_directories(carla_client${carla_target_postfix} SYSTEM PRIVATE
-      ${ADRSS_INCLUDE_DIRS})
-  endif()
-
-  install(TARGETS carla_client${carla_target_postfix} DESTINATION lib)
-
-  if (WIN32) # @todo Fix PythonAPI build on Windows.
-    set_target_properties(carla_client${carla_target_postfix} PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}")
-
-    target_link_libraries(carla_client${carla_target_postfix} "${RECAST_LIB_PATH}/Recast.lib")
-    target_link_libraries(carla_client${carla_target_postfix} "${RECAST_LIB_PATH}/Detour.lib")
-    target_link_libraries(carla_client${carla_target_postfix} "${RECAST_LIB_PATH}/DetourCrowd.lib")
-  else ()
-    if (NOT DEFINED CMAKE_CXX_FLAGS_RELEASE_CLIENT)
-      set(CMAKE_CXX_FLAGS_RELEASE_CLIENT ${CMAKE_CXX_FLAGS_RELEASE})
-    endif()
-
-    set_target_properties(carla_client${carla_target_postfix} PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE_CLIENT}")
-
-    target_link_libraries(carla_client${carla_target_postfix} "${RECAST_LIB_PATH}/libRecast.a")
-    target_link_libraries(carla_client${carla_target_postfix} "${RECAST_LIB_PATH}/libDetour.a")
-    target_link_libraries(carla_client${carla_target_postfix} "${RECAST_LIB_PATH}/libDetourCrowd.a")
-
-  endif (WIN32)
-
-endif()
-
-if (LIBCARLA_BUILD_DEBUG)
-
-  add_library(carla_client${carla_target_postfix}_debug STATIC ${libcarla_sources})
-
-  target_include_directories(carla_client${carla_target_postfix}_debug SYSTEM PRIVATE
-      "${BOOST_INCLUDE_PATH}"
-      "${RPCLIB_INCLUDE_PATH}"
-      "${RECAST_INCLUDE_PATH}"
-      "${LIBPNG_INCLUDE_PATH}")
-
-  if (BUILD_RSS_VARIANT)
-    target_compile_definitions(carla_client${carla_target_postfix}_debug PRIVATE RSS_ENABLED RSS_USE_TBB)
-    target_link_libraries(carla_client${carla_target_postfix}_debug ${ADRSS_LIBS} tbb)
-    target_include_directories(carla_client${carla_target_postfix}_debug SYSTEM PRIVATE
-      ${ADRSS_INCLUDE_DIRS})
-  endif()
-
-  install(TARGETS carla_client${carla_target_postfix}_debug DESTINATION lib)
-
-  if (WIN32) # @todo Fix PythonAPI build on Windows.
-    set_target_properties(carla_client${carla_target_postfix}_debug PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG}")
-
-    target_link_libraries(carla_client${carla_target_postfix}_debug "${RECAST_LIB_PATH}/Recast.lib")
-    target_link_libraries(carla_client${carla_target_postfix}_debug "${RECAST_LIB_PATH}/Detour.lib")
-    target_link_libraries(carla_client${carla_target_postfix}_debug "${RECAST_LIB_PATH}/DetourCrowd.lib")
-  else ()
-    if (NOT DEFINED CMAKE_CXX_FLAGS_DEBUG_CLIENT)
-      set(CMAKE_CXX_FLAGS_DEBUG_CLIENT ${CMAKE_CXX_FLAGS_DEBUG})
-    endif()
-
-    set_target_properties(carla_client${carla_target_postfix}_debug PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG_CLIENT}")
-
-    target_link_libraries(carla_client${carla_target_postfix}_debug "${RECAST_LIB_PATH}/libRecast.a")
-    target_link_libraries(carla_client${carla_target_postfix}_debug "${RECAST_LIB_PATH}/libDetour.a")
-    target_link_libraries(carla_client${carla_target_postfix}_debug "${RECAST_LIB_PATH}/libDetourCrowd.a")
-
-  endif (WIN32)
-
-  target_compile_definitions(carla_client${carla_target_postfix}_debug PUBLIC -DBOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
-
-endif()
diff --git a/LibCarla/cmake/fast_dds/CMakeLists.txt b/LibCarla/cmake/fast_dds/CMakeLists.txt
deleted file mode 100644
index 9f2bd0378..000000000
--- a/LibCarla/cmake/fast_dds/CMakeLists.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-cmake_minimum_required(VERSION 3.5.1)
-project(libcarla_fastdds)
-
-# Install headers.
-
-file(GLOB libcarla_carla_fastdds_headers
-  "${libcarla_source_path}/carla/ros2/publishers/*.h"
-  "${libcarla_source_path}/carla/ros2/subscribers/*.h"
-  "${libcarla_source_path}/carla/ros2/listeners/*.h"
-  "${libcarla_source_path}/carla/ros2/types/*.h"
-  )
-install(FILES ${libcarla_carla_fastdds_headers} DESTINATION include/carla/ros2)
-
-file(GLOB fast_dds_dependencies "${FASTDDS_LIB_PATH}/*.so*")
-install(FILES ${fast_dds_dependencies} DESTINATION lib)
-
-
-file(GLOB libcarla_fastdds_sources
-  "${libcarla_source_path}/carla/ros2/publishers/*.cpp"
-  "${libcarla_source_path}/carla/ros2/subscribers/*.cpp"
-  "${libcarla_source_path}/carla/ros2/listeners/*.cpp"
-  "${libcarla_source_path}/carla/ros2/types/*.cpp")
-
-set(FASTDDS_CPP_STD_INCLUDES "/usr/include/c++/7")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -I${FASTDDS_CPP_STD_INCLUDES}" CACHE STRING "" FORCE)
-
-# ==============================================================================
-# Create targets for debug and release in the same build type.
-# ==============================================================================
-
-if (LIBCARLA_BUILD_RELEASE)
-  add_library(carla_fastdds STATIC ${libcarla_fastdds_sources})
-
-  target_include_directories(carla_fastdds SYSTEM PRIVATE
-      "${BOOST_INCLUDE_PATH}"
-      "${RPCLIB_INCLUDE_PATH}")
-
-  target_include_directories(carla_fastdds PRIVATE "${FASTDDS_INCLUDE_PATH}")
-  target_include_directories(carla_fastdds PRIVATE "${libcarla_source_path}/carla/ros2")
-  target_link_libraries(carla_fastdds fastrtps fastcdr "${FAST_DDS_LIBRARIES}")
-  install(TARGETS carla_fastdds DESTINATION lib)
-  set_target_properties(carla_fastdds PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}")
-
-endif()
-
-if (LIBCARLA_BUILD_DEBUG)
-
-  add_library(carla_fastdds_debug STATIC ${libcarla_fastdds_sources})
- target_include_directories(carla_fastdds_debug SYSTEM PRIVATE
-      "${BOOST_INCLUDE_PATH}"
-      "${RPCLIB_INCLUDE_PATH}")
-  install(TARGETS carla_fastdds_debug DESTINATION lib)
-  set_target_properties(carla_fastdds_debug PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG}")
-  target_compile_definitions(carla_fastdds_debug PUBLIC -DBOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
-
-endif()
diff --git a/LibCarla/cmake/pytorch/CMakeLists.txt b/LibCarla/cmake/pytorch/CMakeLists.txt
deleted file mode 100644
index bfdc20693..000000000
--- a/LibCarla/cmake/pytorch/CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-cmake_minimum_required(VERSION 3.5.1)
-project(libcarla-pytorch)
-
-# Install headers.
-
-file(GLOB libcarla_carla_pytorch_headers "${libcarla_source_path}/carla/pytorch/*.h")
-install(FILES ${libcarla_carla_pytorch_headers} DESTINATION include/carla/pytorch)
-
-# carla_pytorch library.
-
-file(GLOB libcarla_pytorch_sources
-    "${libcarla_source_path}/carla/pytorch/*.h"
-    "${libcarla_source_path}/carla/pytorch/*.cpp")
-
-set(CMAKE_CUDA_COMPILER /usr/local/cuda/bin/nvcc)
-find_package (Torch REQUIRED)
-find_package (TorchScatter REQUIRED)
-find_package (TorchCluster REQUIRED)
-find_package (Python3 REQUIRED)
-
-set(PYTORCH_CPP_STD_INCLUDES "/usr/include/c++/7")
-
-# @todo These flags need to be compatible with setup.py compilation.
-set(CMAKE_CXX_FLAGS_RELEASE "-DDEBUG -std=c++14 -O2 -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -I${PYTORCH_CPP_STD_INCLUDES}" CACHE STRING "" FORCE)
- 
-# ==============================================================================
-# Create targets for debug and release in the same build type.
-# ==============================================================================
-
-if (LIBCARLA_BUILD_RELEASE)
-
-  add_library(carla_pytorch STATIC ${libcarla_pytorch_sources})
-
-  target_include_directories(carla_pytorch SYSTEM PRIVATE
-      "${BOOST_INCLUDE_PATH}"
-      "${RPCLIB_INCLUDE_PATH}")
-
-  target_include_directories(carla_pytorch PRIVATE SYSTEM "${TORCH_INCLUDE_DIRS}")
-  target_include_directories(carla_pytorch PRIVATE SYSTEM "${TorchScatter_INCLUDE_DIR}")
-  target_include_directories(carla_pytorch PRIVATE SYSTEM "${TorchCluster_INCLUDE_DIR}")
-  target_include_directories(carla_pytorch PRIVATE SYSTEM "${TorchSparse_INCLUDE_DIR}")
-  target_include_directories(carla_pytorch PRIVATE SYSTEM "${Python3_INCLUDE_DIRS}")
-  target_link_libraries(carla_pytorch "${TORCH_LIBRARIES}")
-
-  install(TARGETS carla_pytorch DESTINATION lib OPTIONAL)
-
-  set_target_properties(carla_pytorch PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}")
-
-endif()
-
-if (LIBCARLA_BUILD_DEBUG)
-
-  add_library(carla_pytorch_debug STATIC ${libcarla_pytorch_sources})
-
-  target_include_directories(carla_pytorch_debug SYSTEM PRIVATE
-      "${BOOST_INCLUDE_PATH}"
-      "${RPCLIB_INCLUDE_PATH}")
-
-  install(TARGETS carla_pytorch_debug DESTINATION lib OPTIONAL)
-
-  set_target_properties(carla_pytorch_debug PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG}")
-  target_compile_definitions(carla_pytorch_debug PUBLIC -DBOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
-
-endif()
diff --git a/LibCarla/cmake/server/CMakeLists.txt b/LibCarla/cmake/server/CMakeLists.txt
deleted file mode 100644
index b2a4a1542..000000000
--- a/LibCarla/cmake/server/CMakeLists.txt
+++ /dev/null
@@ -1,161 +0,0 @@
-cmake_minimum_required(VERSION 3.5.1)
-project(libcarla-server)
-
-# Install libc++ shared libraries.
-file(GLOB LibCXX_Libraries "${LLVM_LIB_PATH}/libc++*")
-install(FILES ${LibCXX_Libraries} DESTINATION lib)
-
-# Install rpclib.
-install(DIRECTORY "${RPCLIB_INCLUDE_PATH}/rpc" DESTINATION include)
-file(GLOB libcarla_carla_rpclib "${RPCLIB_LIB_PATH}/*.*")
-install(FILES ${libcarla_carla_rpclib} DESTINATION lib)
-
-# Install headers.
-
-install(DIRECTORY "${libcarla_source_path}/compiler" DESTINATION include)
-
-file(GLOB libcarla_carla_headers "${libcarla_source_path}/carla/*.h")
-install(FILES ${libcarla_carla_headers} DESTINATION include/carla)
-
-file(GLOB libcarla_carla_geom_headers "${libcarla_source_path}/carla/geom/*.h")
-install(FILES ${libcarla_carla_geom_headers} DESTINATION include/carla/geom)
-
-file(GLOB libcarla_carla_opendrive "${libcarla_source_path}/carla/opendrive/*.h")
-install(FILES ${libcarla_carla_opendrive} DESTINATION include/carla/opendrive)
-
-file(GLOB libcarla_carla_opendrive_parser "${libcarla_source_path}/carla/opendrive/parser/*.h")
-install(FILES ${libcarla_carla_opendrive_parser} DESTINATION include/carla/opendrive/parser)
-
-file(GLOB libcarla_carla_profiler_headers "${libcarla_source_path}/carla/profiler/*.h")
-install(FILES ${libcarla_carla_profiler_headers} DESTINATION include/carla/profiler)
-
-file(GLOB libcarla_carla_road_headers "${libcarla_source_path}/carla/road/*.h")
-install(FILES ${libcarla_carla_road_headers} DESTINATION include/carla/road)
-
-file(GLOB libcarla_carla_road_element_headers "${libcarla_source_path}/carla/road/element/*.h")
-install(FILES ${libcarla_carla_road_element_headers} DESTINATION include/carla/road/element)
-
-file(GLOB libcarla_carla_road_general_headers "${libcarla_source_path}/carla/road/general/*.h")
-install(FILES ${libcarla_carla_road_general_headers} DESTINATION include/carla/road/general)
-
-file(GLOB libcarla_carla_road_object_headers "${libcarla_source_path}/carla/road/object/*.h")
-install(FILES ${libcarla_carla_road_object_headers} DESTINATION include/carla/road/object)
-
-file(GLOB libcarla_carla_road_signal_headers "${libcarla_source_path}/carla/road/signal/*.h")
-install(FILES ${libcarla_carla_road_signal_headers} DESTINATION include/carla/road/signal)
-
-file(GLOB libcarla_carla_rpc_headers "${libcarla_source_path}/carla/rpc/*.h")
-install(FILES ${libcarla_carla_rpc_headers} DESTINATION include/carla/rpc)
-
-file(GLOB libcarla_carla_sensor_headers "${libcarla_source_path}/carla/sensor/*.h")
-install(FILES ${libcarla_carla_sensor_headers} DESTINATION include/carla/sensor)
-
-file(GLOB libcarla_carla_sensor_data_headers "${libcarla_source_path}/carla/sensor/data/*.h")
-install(FILES ${libcarla_carla_sensor_data_headers} DESTINATION include/carla/sensor/data)
-
-file(GLOB libcarla_carla_sensor_s11n_headers "${libcarla_source_path}/carla/sensor/s11n/*.h")
-install(FILES ${libcarla_carla_sensor_s11n_headers} DESTINATION include/carla/sensor/s11n)
-
-file(GLOB libcarla_carla_streaming_headers "${libcarla_source_path}/carla/streaming/*.h")
-install(FILES ${libcarla_carla_streaming_headers} DESTINATION include/carla/streaming)
-
-file(GLOB libcarla_carla_streaming_detail_headers "${libcarla_source_path}/carla/streaming/detail/*.h")
-install(FILES ${libcarla_carla_streaming_detail_headers} DESTINATION include/carla/streaming/detail)
-
-file(GLOB libcarla_carla_streaming_detail_tcp_headers "${libcarla_source_path}/carla/streaming/detail/tcp/*.h")
-install(FILES ${libcarla_carla_streaming_detail_tcp_headers} DESTINATION include/carla/streaming/detail/tcp)
-
-file(GLOB libcarla_carla_streaming_low_level_headers "${libcarla_source_path}/carla/streaming/low_level/*.h")
-install(FILES ${libcarla_carla_streaming_low_level_headers} DESTINATION include/carla/streaming/low_level)
-
-file(GLOB libcarla_carla_multigpu_headers "${libcarla_source_path}/carla/multigpu/*.h")
-install(FILES ${libcarla_carla_multigpu_headers} DESTINATION include/carla/multigpu)
-
-file(GLOB libcarla_carla_ros2_headers "${libcarla_source_path}/carla/ros2/*.h")
-install(FILES ${libcarla_carla_ros2_headers} DESTINATION include/carla/ros2)
-
-install(DIRECTORY "${BOOST_INCLUDE_PATH}/boost" DESTINATION include)
-
-if (WIN32)
-  file(GLOB boostlibs
-      "${BOOST_LIB_PATH}/libboost_date_time-*-mt-*.lib"
-      "${BOOST_LIB_PATH}/libboost_system-*-mt-*.lib"
-      "${BOOST_LIB_PATH}/libboost_filesystem-*-mt-*.lib")
-  install(FILES ${boostlibs} DESTINATION lib)
-endif()
-
-# carla_server library.
-
-file(GLOB libcarla_server_sources
-    "${libcarla_source_path}/carla/*.h"
-    "${libcarla_source_path}/carla/Buffer.cpp"
-    "${libcarla_source_path}/carla/Exception.cpp"
-    "${libcarla_source_path}/carla/geom/*.cpp"
-    "${libcarla_source_path}/carla/geom/*.h"
-    "${libcarla_source_path}/carla/opendrive/*.cpp"
-    "${libcarla_source_path}/carla/opendrive/*.h"
-    "${libcarla_source_path}/carla/opendrive/parser/*.cpp"
-    "${libcarla_source_path}/carla/opendrive/parser/*.h"
-    "${libcarla_source_path}/carla/road/*.cpp"
-    "${libcarla_source_path}/carla/road/*.h"
-    "${libcarla_source_path}/carla/road/element/*.cpp"
-    "${libcarla_source_path}/carla/road/element/*.h"
-    "${libcarla_source_path}/carla/road/general/*.cpp"
-    "${libcarla_source_path}/carla/road/general/*.h"
-    "${libcarla_source_path}/carla/road/object/*.cpp"
-    "${libcarla_source_path}/carla/road/object/*.h"
-    "${libcarla_source_path}/carla/road/signal/*.cpp"
-    "${libcarla_source_path}/carla/road/signal/*.h"
-    "${libcarla_source_path}/carla/rpc/*.cpp"
-    "${libcarla_source_path}/carla/rpc/*.h"
-    "${libcarla_source_path}/carla/sensor/*.h"
-    "${libcarla_source_path}/carla/sensor/s11n/*.h"
-    "${libcarla_source_path}/carla/sensor/s11n/SensorHeaderSerializer.cpp"
-    "${libcarla_source_path}/carla/streaming/*.h"
-    "${libcarla_source_path}/carla/streaming/detail/*.cpp"
-    "${libcarla_source_path}/carla/streaming/detail/*.h"
-    "${libcarla_source_path}/carla/streaming/detail/tcp/*.cpp"
-    "${libcarla_source_path}/carla/streaming/low_level/*.h"
-    "${libcarla_source_path}/carla/multigpu/*.h"
-    "${libcarla_source_path}/carla/multigpu/*.cpp"
-    "${libcarla_source_path}/carla/ros2/*.h"
-    "${libcarla_source_path}/carla/ros2/*.cpp"
-    "${libcarla_source_thirdparty_path}/odrSpiral/*.cpp"
-    "${libcarla_source_thirdparty_path}/odrSpiral/*.h"
-    "${libcarla_source_thirdparty_path}/moodycamel/*.cpp"
-    "${libcarla_source_thirdparty_path}/moodycamel/*.h"
-    "${libcarla_source_thirdparty_path}/pugixml/*.cpp"
-    "${libcarla_source_thirdparty_path}/pugixml/*.hpp")
-
-# ==============================================================================
-# Create targets for debug and release in the same build type.
-# ==============================================================================
-
-if (LIBCARLA_BUILD_RELEASE)
-
-  add_library(carla_server STATIC ${libcarla_server_sources})
-
-  target_include_directories(carla_server SYSTEM PRIVATE
-      "${BOOST_INCLUDE_PATH}"
-      "${RPCLIB_INCLUDE_PATH}")
-
-  install(TARGETS carla_server DESTINATION lib OPTIONAL)
-
-  set_target_properties(carla_server PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}")
-
-endif()
-
-if (LIBCARLA_BUILD_DEBUG)
-
-  add_library(carla_server_debug STATIC ${libcarla_server_sources})
-
-  target_include_directories(carla_server_debug SYSTEM PRIVATE
-      "${BOOST_INCLUDE_PATH}"
-      "${RPCLIB_INCLUDE_PATH}")
-
-  install(TARGETS carla_server_debug DESTINATION lib OPTIONAL)
-
-  set_target_properties(carla_server_debug PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG}")
-  target_compile_definitions(carla_server_debug PUBLIC -DBOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
-
-endif()
diff --git a/LibCarla/cmake/test/CMakeLists.txt b/LibCarla/cmake/test/CMakeLists.txt
deleted file mode 100644
index 5a944e333..000000000
--- a/LibCarla/cmake/test/CMakeLists.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-cmake_minimum_required(VERSION 3.5.1)
-project(libcarla-unit-tests)
-
-if (CMAKE_BUILD_TYPE STREQUAL "Client")
-  set(carla_config client)
-elseif (CMAKE_BUILD_TYPE STREQUAL "Server")
-  set(carla_config server)
-endif ()
-if (BUILD_RSS_VARIANT)
-  set(carla_target_postfix "_rss")
-else ()
-  set(carla_target_postfix "")
-endif()
-
-link_directories(
-    ${RPCLIB_LIB_PATH}
-    ${GTEST_LIB_PATH})
-
-file(GLOB libcarla_test_sources
-    "${libcarla_source_path}/carla/profiler/*.cpp"
-    "${libcarla_source_path}/carla/profiler/*.h"
-    "${libcarla_source_path}/test/*.cpp"
-    "${libcarla_source_path}/test/*.h"
-    "${libcarla_source_path}/test/${carla_config}/*.cpp"
-    "${libcarla_source_path}/test/${carla_config}/*.h"
-    "${libcarla_source_path}/test/common/*.cpp"
-    "${libcarla_source_path}/test/common/*.h")
-
-file(GLOB libcarla_test_client_sources "")
-
-if (LIBCARLA_BUILD_DEBUG)
-  list(APPEND build_targets libcarla_test_${carla_config}_debug)
-endif()
-
-if (LIBCARLA_BUILD_RELEASE)
-  list(APPEND build_targets libcarla_test_${carla_config}_release)
-endif()
-
-# Create targets for debug and release in the same build type.
-foreach(target ${build_targets})
-
-  add_executable(${target} ${libcarla_test_sources})
-
-  target_compile_definitions(${target} PUBLIC
-      -DLIBCARLA_ENABLE_PROFILER
-      -DLIBCARLA_WITH_GTEST)
-
-  target_include_directories(${target} SYSTEM PRIVATE
-      "${BOOST_INCLUDE_PATH}"
-      "${RPCLIB_INCLUDE_PATH}"
-      "${GTEST_INCLUDE_PATH}"
-      "${LIBPNG_INCLUDE_PATH}")
-
-  target_include_directories(${target} PRIVATE
-      "${libcarla_source_path}/test")
-
-  if (WIN32)
-      target_link_libraries(${target} "gtest_main.lib")
-      target_link_libraries(${target} "gtest.lib")
-      target_link_libraries(${target} "rpc.lib")
-  else ()
-      target_link_libraries(${target} "-lrpc")
-      target_link_libraries(${target} "-lgtest_main")
-      target_link_libraries(${target} "-lgtest")
-  endif()
-
-  install(TARGETS ${target} DESTINATION test OPTIONAL)
-endforeach(target)
-
-if (LIBCARLA_BUILD_DEBUG)
-  # Specific options for debug.
-  set_target_properties(libcarla_test_${carla_config}_debug PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG}")
-  target_link_libraries(libcarla_test_${carla_config}_debug "carla_${carla_config}${carla_target_postfix}_debug")
-  target_compile_definitions(libcarla_test_${carla_config}_debug PUBLIC -DBOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
-  if (CMAKE_BUILD_TYPE STREQUAL "Client")
-      target_link_libraries(libcarla_test_${carla_config}_debug "${BOOST_LIB_PATH}/libboost_filesystem.a")
-  endif()
-endif()
-
-if (LIBCARLA_BUILD_RELEASE)
-  # Specific options for release.
-  set_target_properties(libcarla_test_${carla_config}_release PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}")
-  target_link_libraries(libcarla_test_${carla_config}_release "carla_${carla_config}${carla_target_postfix}")
-  if (CMAKE_BUILD_TYPE STREQUAL "Client")
-      target_link_libraries(libcarla_test_${carla_config}_release "${BOOST_LIB_PATH}/libboost_filesystem.a")
-  endif()
-endif()