diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2cde6b98..2a7b49e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,7 @@ cmake_minimum_required(VERSION 3.13)
 
 set(CMAKE_SCRIPT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
+option(ADD_ETL_LIB "Add ETL library" ON)
 if(NOT OS_FSFW)
 	set(OS_FSFW host CACHE STRING "OS for the FSFW.")
 endif()
@@ -37,15 +38,20 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 # Set names and variables
 set(TARGET_NAME ${CMAKE_PROJECT_NAME}) 
 set(LIB_FSFW_NAME fsfw)
+set(LIB_ETL_NAME etl)
 set(LIB_CSP_NAME libcsp)
+set(THIRD_PARTY_FOLDER thirdparty)
 
 # Set path names
 set(FSFW_PATH fsfw)
 set(MISSION_PATH mission)
-set(CSPLIB_PATH libcsp)
 set(TEST_PATH test/testtasks)
 set(LINUX_PATH linux)
 
+set(CSP_LIB_PATH ${THIRD_PARTY_FOLDER}/libcsp)
+set(ETL_LIB_PATH ${THIRD_PARTY_FOLDER}/etl)
+set(LWGPS_LIB_PATH ${THIRD_PARTY_FOLDER}/lwgps)
+
 set(FSFW_WARNING_SHADOW_LOCAL_GCC OFF)
 set(ADD_LINUX_FILES FALSE)
 
@@ -87,7 +93,11 @@ if(ROOT_CONFIG_FOLDER)
 endif()
 
 if(ADD_CSP_LIB)
-    add_subdirectory(${CSPLIB_PATH})
+    add_subdirectory(${CSP_LIB_PATH})
+endif()
+
+if(ADD_ETL_LIB)
+    add_subdirectory(${ETL_LIB_PATH})
 endif()
 
 if(ADD_LINUX_FILES)
@@ -111,6 +121,12 @@ target_link_libraries(${TARGET_NAME} PRIVATE
 	${LIB_OS_NAME} 
 )
 
+if(ADD_ETL_LIB)
+    target_link_libraries(${TARGET_NAME} PRIVATE
+        ${LIB_ETL_NAME}
+    )
+endif()
+
 if(ADD_CSP_LIB)
 	target_link_libraries(${TARGET_NAME} PRIVATE
 		${LIB_CSP_NAME}
diff --git a/test/testtasks/TestTask.cpp b/test/testtasks/TestTask.cpp
index 9a5018c5..4b80c127 100644
--- a/test/testtasks/TestTask.cpp
+++ b/test/testtasks/TestTask.cpp
@@ -41,8 +41,12 @@ ReturnValue_t TestTask::performOperation(uint8_t operationCode) {
 	return result;
 }
 
+#include <etl/vector.h>
+
 ReturnValue_t TestTask::performOneShotAction() {
 	/* Everything here will only be performed once. */
+    etl::vector<uint8_t, 30> testVec;
+
     return HasReturnvaluesIF::RETURN_OK;
 }
 
diff --git a/libcsp/CMakeLists.txt b/thirdparty/libcsp/CMakeLists.txt
similarity index 100%
rename from libcsp/CMakeLists.txt
rename to thirdparty/libcsp/CMakeLists.txt
diff --git a/libcsp/bindings/python/libcsp/__init__.py b/thirdparty/libcsp/bindings/python/libcsp/__init__.py
similarity index 100%
rename from libcsp/bindings/python/libcsp/__init__.py
rename to thirdparty/libcsp/bindings/python/libcsp/__init__.py
diff --git a/libcsp/doc/example.rst b/thirdparty/libcsp/doc/example.rst
similarity index 100%
rename from libcsp/doc/example.rst
rename to thirdparty/libcsp/doc/example.rst
diff --git a/libcsp/doc/history.rst b/thirdparty/libcsp/doc/history.rst
similarity index 100%
rename from libcsp/doc/history.rst
rename to thirdparty/libcsp/doc/history.rst
diff --git a/libcsp/doc/interfaces.rst b/thirdparty/libcsp/doc/interfaces.rst
similarity index 100%
rename from libcsp/doc/interfaces.rst
rename to thirdparty/libcsp/doc/interfaces.rst
diff --git a/libcsp/doc/libcsp.rst b/thirdparty/libcsp/doc/libcsp.rst
similarity index 100%
rename from libcsp/doc/libcsp.rst
rename to thirdparty/libcsp/doc/libcsp.rst
diff --git a/libcsp/doc/memory.rst b/thirdparty/libcsp/doc/memory.rst
similarity index 100%
rename from libcsp/doc/memory.rst
rename to thirdparty/libcsp/doc/memory.rst
diff --git a/libcsp/doc/mtu.rst b/thirdparty/libcsp/doc/mtu.rst
similarity index 100%
rename from libcsp/doc/mtu.rst
rename to thirdparty/libcsp/doc/mtu.rst
diff --git a/libcsp/doc/protocolstack.rst b/thirdparty/libcsp/doc/protocolstack.rst
similarity index 100%
rename from libcsp/doc/protocolstack.rst
rename to thirdparty/libcsp/doc/protocolstack.rst
diff --git a/libcsp/doc/structure.rst b/thirdparty/libcsp/doc/structure.rst
similarity index 100%
rename from libcsp/doc/structure.rst
rename to thirdparty/libcsp/doc/structure.rst
diff --git a/libcsp/doc/topology.rst b/thirdparty/libcsp/doc/topology.rst
similarity index 100%
rename from libcsp/doc/topology.rst
rename to thirdparty/libcsp/doc/topology.rst
diff --git a/libcsp/examples/csp_if_fifo.c b/thirdparty/libcsp/examples/csp_if_fifo.c
similarity index 100%
rename from libcsp/examples/csp_if_fifo.c
rename to thirdparty/libcsp/examples/csp_if_fifo.c
diff --git a/libcsp/examples/csp_if_fifo_windows.c b/thirdparty/libcsp/examples/csp_if_fifo_windows.c
similarity index 100%
rename from libcsp/examples/csp_if_fifo_windows.c
rename to thirdparty/libcsp/examples/csp_if_fifo_windows.c
diff --git a/libcsp/examples/kiss.c b/thirdparty/libcsp/examples/kiss.c
similarity index 100%
rename from libcsp/examples/kiss.c
rename to thirdparty/libcsp/examples/kiss.c
diff --git a/libcsp/examples/python_bindings_example_client.py b/thirdparty/libcsp/examples/python_bindings_example_client.py
similarity index 100%
rename from libcsp/examples/python_bindings_example_client.py
rename to thirdparty/libcsp/examples/python_bindings_example_client.py
diff --git a/libcsp/examples/python_bindings_example_client_can.py b/thirdparty/libcsp/examples/python_bindings_example_client_can.py
similarity index 100%
rename from libcsp/examples/python_bindings_example_client_can.py
rename to thirdparty/libcsp/examples/python_bindings_example_client_can.py
diff --git a/libcsp/examples/python_bindings_example_server.py b/thirdparty/libcsp/examples/python_bindings_example_server.py
similarity index 100%
rename from libcsp/examples/python_bindings_example_server.py
rename to thirdparty/libcsp/examples/python_bindings_example_server.py
diff --git a/libcsp/examples/simple.c b/thirdparty/libcsp/examples/simple.c
similarity index 100%
rename from libcsp/examples/simple.c
rename to thirdparty/libcsp/examples/simple.c
diff --git a/libcsp/examples/zmqproxy.c b/thirdparty/libcsp/examples/zmqproxy.c
similarity index 100%
rename from libcsp/examples/zmqproxy.c
rename to thirdparty/libcsp/examples/zmqproxy.c
diff --git a/libcsp/include/CMakeLists.txt b/thirdparty/libcsp/include/CMakeLists.txt
similarity index 100%
rename from libcsp/include/CMakeLists.txt
rename to thirdparty/libcsp/include/CMakeLists.txt
diff --git a/libcsp/include/csp/arch/csp_clock.h b/thirdparty/libcsp/include/csp/arch/csp_clock.h
similarity index 100%
rename from libcsp/include/csp/arch/csp_clock.h
rename to thirdparty/libcsp/include/csp/arch/csp_clock.h
diff --git a/libcsp/include/csp/arch/csp_malloc.h b/thirdparty/libcsp/include/csp/arch/csp_malloc.h
similarity index 100%
rename from libcsp/include/csp/arch/csp_malloc.h
rename to thirdparty/libcsp/include/csp/arch/csp_malloc.h
diff --git a/libcsp/include/csp/arch/csp_queue.h b/thirdparty/libcsp/include/csp/arch/csp_queue.h
similarity index 100%
rename from libcsp/include/csp/arch/csp_queue.h
rename to thirdparty/libcsp/include/csp/arch/csp_queue.h
diff --git a/libcsp/include/csp/arch/csp_semaphore.h b/thirdparty/libcsp/include/csp/arch/csp_semaphore.h
similarity index 100%
rename from libcsp/include/csp/arch/csp_semaphore.h
rename to thirdparty/libcsp/include/csp/arch/csp_semaphore.h
diff --git a/libcsp/include/csp/arch/csp_system.h b/thirdparty/libcsp/include/csp/arch/csp_system.h
similarity index 100%
rename from libcsp/include/csp/arch/csp_system.h
rename to thirdparty/libcsp/include/csp/arch/csp_system.h
diff --git a/libcsp/include/csp/arch/csp_thread.h b/thirdparty/libcsp/include/csp/arch/csp_thread.h
similarity index 100%
rename from libcsp/include/csp/arch/csp_thread.h
rename to thirdparty/libcsp/include/csp/arch/csp_thread.h
diff --git a/libcsp/include/csp/arch/csp_time.h b/thirdparty/libcsp/include/csp/arch/csp_time.h
similarity index 100%
rename from libcsp/include/csp/arch/csp_time.h
rename to thirdparty/libcsp/include/csp/arch/csp_time.h
diff --git a/libcsp/include/csp/arch/posix/pthread_queue.h b/thirdparty/libcsp/include/csp/arch/posix/pthread_queue.h
similarity index 100%
rename from libcsp/include/csp/arch/posix/pthread_queue.h
rename to thirdparty/libcsp/include/csp/arch/posix/pthread_queue.h
diff --git a/libcsp/include/csp/crypto/csp_hmac.h b/thirdparty/libcsp/include/csp/crypto/csp_hmac.h
similarity index 100%
rename from libcsp/include/csp/crypto/csp_hmac.h
rename to thirdparty/libcsp/include/csp/crypto/csp_hmac.h
diff --git a/libcsp/include/csp/crypto/csp_sha1.h b/thirdparty/libcsp/include/csp/crypto/csp_sha1.h
similarity index 100%
rename from libcsp/include/csp/crypto/csp_sha1.h
rename to thirdparty/libcsp/include/csp/crypto/csp_sha1.h
diff --git a/libcsp/include/csp/crypto/csp_xtea.h b/thirdparty/libcsp/include/csp/crypto/csp_xtea.h
similarity index 100%
rename from libcsp/include/csp/crypto/csp_xtea.h
rename to thirdparty/libcsp/include/csp/crypto/csp_xtea.h
diff --git a/libcsp/include/csp/csp.h b/thirdparty/libcsp/include/csp/csp.h
similarity index 100%
rename from libcsp/include/csp/csp.h
rename to thirdparty/libcsp/include/csp/csp.h
diff --git a/libcsp/include/csp/csp_autoconfig.h b/thirdparty/libcsp/include/csp/csp_autoconfig.h
similarity index 100%
rename from libcsp/include/csp/csp_autoconfig.h
rename to thirdparty/libcsp/include/csp/csp_autoconfig.h
diff --git a/libcsp/include/csp/csp_buffer.h b/thirdparty/libcsp/include/csp/csp_buffer.h
similarity index 100%
rename from libcsp/include/csp/csp_buffer.h
rename to thirdparty/libcsp/include/csp/csp_buffer.h
diff --git a/libcsp/include/csp/csp_cmp.h b/thirdparty/libcsp/include/csp/csp_cmp.h
similarity index 100%
rename from libcsp/include/csp/csp_cmp.h
rename to thirdparty/libcsp/include/csp/csp_cmp.h
diff --git a/libcsp/include/csp/csp_crc32.h b/thirdparty/libcsp/include/csp/csp_crc32.h
similarity index 100%
rename from libcsp/include/csp/csp_crc32.h
rename to thirdparty/libcsp/include/csp/csp_crc32.h
diff --git a/libcsp/include/csp/csp_debug.h b/thirdparty/libcsp/include/csp/csp_debug.h
similarity index 100%
rename from libcsp/include/csp/csp_debug.h
rename to thirdparty/libcsp/include/csp/csp_debug.h
diff --git a/libcsp/include/csp/csp_endian.h b/thirdparty/libcsp/include/csp/csp_endian.h
similarity index 100%
rename from libcsp/include/csp/csp_endian.h
rename to thirdparty/libcsp/include/csp/csp_endian.h
diff --git a/libcsp/include/csp/csp_error.h b/thirdparty/libcsp/include/csp/csp_error.h
similarity index 100%
rename from libcsp/include/csp/csp_error.h
rename to thirdparty/libcsp/include/csp/csp_error.h
diff --git a/libcsp/include/csp/csp_iflist.h b/thirdparty/libcsp/include/csp/csp_iflist.h
similarity index 100%
rename from libcsp/include/csp/csp_iflist.h
rename to thirdparty/libcsp/include/csp/csp_iflist.h
diff --git a/libcsp/include/csp/csp_interface.h b/thirdparty/libcsp/include/csp/csp_interface.h
similarity index 100%
rename from libcsp/include/csp/csp_interface.h
rename to thirdparty/libcsp/include/csp/csp_interface.h
diff --git a/libcsp/include/csp/csp_platform.h b/thirdparty/libcsp/include/csp/csp_platform.h
similarity index 100%
rename from libcsp/include/csp/csp_platform.h
rename to thirdparty/libcsp/include/csp/csp_platform.h
diff --git a/libcsp/include/csp/csp_rtable.h b/thirdparty/libcsp/include/csp/csp_rtable.h
similarity index 100%
rename from libcsp/include/csp/csp_rtable.h
rename to thirdparty/libcsp/include/csp/csp_rtable.h
diff --git a/libcsp/include/csp/csp_types.h b/thirdparty/libcsp/include/csp/csp_types.h
similarity index 100%
rename from libcsp/include/csp/csp_types.h
rename to thirdparty/libcsp/include/csp/csp_types.h
diff --git a/libcsp/include/csp/drivers/can_socketcan.h b/thirdparty/libcsp/include/csp/drivers/can_socketcan.h
similarity index 100%
rename from libcsp/include/csp/drivers/can_socketcan.h
rename to thirdparty/libcsp/include/csp/drivers/can_socketcan.h
diff --git a/libcsp/include/csp/drivers/i2c.h b/thirdparty/libcsp/include/csp/drivers/i2c.h
similarity index 100%
rename from libcsp/include/csp/drivers/i2c.h
rename to thirdparty/libcsp/include/csp/drivers/i2c.h
diff --git a/libcsp/include/csp/drivers/usart.h b/thirdparty/libcsp/include/csp/drivers/usart.h
similarity index 100%
rename from libcsp/include/csp/drivers/usart.h
rename to thirdparty/libcsp/include/csp/drivers/usart.h
diff --git a/libcsp/include/csp/interfaces/csp_if_can.h b/thirdparty/libcsp/include/csp/interfaces/csp_if_can.h
similarity index 100%
rename from libcsp/include/csp/interfaces/csp_if_can.h
rename to thirdparty/libcsp/include/csp/interfaces/csp_if_can.h
diff --git a/libcsp/include/csp/interfaces/csp_if_i2c.h b/thirdparty/libcsp/include/csp/interfaces/csp_if_i2c.h
similarity index 100%
rename from libcsp/include/csp/interfaces/csp_if_i2c.h
rename to thirdparty/libcsp/include/csp/interfaces/csp_if_i2c.h
diff --git a/libcsp/include/csp/interfaces/csp_if_kiss.h b/thirdparty/libcsp/include/csp/interfaces/csp_if_kiss.h
similarity index 100%
rename from libcsp/include/csp/interfaces/csp_if_kiss.h
rename to thirdparty/libcsp/include/csp/interfaces/csp_if_kiss.h
diff --git a/libcsp/include/csp/interfaces/csp_if_lo.h b/thirdparty/libcsp/include/csp/interfaces/csp_if_lo.h
similarity index 100%
rename from libcsp/include/csp/interfaces/csp_if_lo.h
rename to thirdparty/libcsp/include/csp/interfaces/csp_if_lo.h
diff --git a/libcsp/include/csp/interfaces/csp_if_zmqhub.h b/thirdparty/libcsp/include/csp/interfaces/csp_if_zmqhub.h
similarity index 100%
rename from libcsp/include/csp/interfaces/csp_if_zmqhub.h
rename to thirdparty/libcsp/include/csp/interfaces/csp_if_zmqhub.h
diff --git a/libcsp/libcsp.mk b/thirdparty/libcsp/libcsp.mk
similarity index 100%
rename from libcsp/libcsp.mk
rename to thirdparty/libcsp/libcsp.mk
diff --git a/libcsp/src/CMakeLists.txt b/thirdparty/libcsp/src/CMakeLists.txt
similarity index 100%
rename from libcsp/src/CMakeLists.txt
rename to thirdparty/libcsp/src/CMakeLists.txt
diff --git a/libcsp/src/arch/CMakeLists.txt b/thirdparty/libcsp/src/arch/CMakeLists.txt
similarity index 100%
rename from libcsp/src/arch/CMakeLists.txt
rename to thirdparty/libcsp/src/arch/CMakeLists.txt
diff --git a/libcsp/src/arch/freertos/csp_malloc.c b/thirdparty/libcsp/src/arch/freertos/csp_malloc.c
similarity index 100%
rename from libcsp/src/arch/freertos/csp_malloc.c
rename to thirdparty/libcsp/src/arch/freertos/csp_malloc.c
diff --git a/libcsp/src/arch/freertos/csp_queue.c b/thirdparty/libcsp/src/arch/freertos/csp_queue.c
similarity index 100%
rename from libcsp/src/arch/freertos/csp_queue.c
rename to thirdparty/libcsp/src/arch/freertos/csp_queue.c
diff --git a/libcsp/src/arch/freertos/csp_semaphore.c b/thirdparty/libcsp/src/arch/freertos/csp_semaphore.c
similarity index 100%
rename from libcsp/src/arch/freertos/csp_semaphore.c
rename to thirdparty/libcsp/src/arch/freertos/csp_semaphore.c
diff --git a/libcsp/src/arch/freertos/csp_system.c b/thirdparty/libcsp/src/arch/freertos/csp_system.c
similarity index 100%
rename from libcsp/src/arch/freertos/csp_system.c
rename to thirdparty/libcsp/src/arch/freertos/csp_system.c
diff --git a/libcsp/src/arch/freertos/csp_thread.c b/thirdparty/libcsp/src/arch/freertos/csp_thread.c
similarity index 100%
rename from libcsp/src/arch/freertos/csp_thread.c
rename to thirdparty/libcsp/src/arch/freertos/csp_thread.c
diff --git a/libcsp/src/arch/freertos/csp_time.c b/thirdparty/libcsp/src/arch/freertos/csp_time.c
similarity index 100%
rename from libcsp/src/arch/freertos/csp_time.c
rename to thirdparty/libcsp/src/arch/freertos/csp_time.c
diff --git a/libcsp/src/arch/macosx/csp_malloc.c b/thirdparty/libcsp/src/arch/macosx/csp_malloc.c
similarity index 100%
rename from libcsp/src/arch/macosx/csp_malloc.c
rename to thirdparty/libcsp/src/arch/macosx/csp_malloc.c
diff --git a/libcsp/src/arch/macosx/csp_queue.c b/thirdparty/libcsp/src/arch/macosx/csp_queue.c
similarity index 100%
rename from libcsp/src/arch/macosx/csp_queue.c
rename to thirdparty/libcsp/src/arch/macosx/csp_queue.c
diff --git a/libcsp/src/arch/macosx/csp_semaphore.c b/thirdparty/libcsp/src/arch/macosx/csp_semaphore.c
similarity index 100%
rename from libcsp/src/arch/macosx/csp_semaphore.c
rename to thirdparty/libcsp/src/arch/macosx/csp_semaphore.c
diff --git a/libcsp/src/arch/macosx/csp_system.c b/thirdparty/libcsp/src/arch/macosx/csp_system.c
similarity index 100%
rename from libcsp/src/arch/macosx/csp_system.c
rename to thirdparty/libcsp/src/arch/macosx/csp_system.c
diff --git a/libcsp/src/arch/macosx/csp_thread.c b/thirdparty/libcsp/src/arch/macosx/csp_thread.c
similarity index 100%
rename from libcsp/src/arch/macosx/csp_thread.c
rename to thirdparty/libcsp/src/arch/macosx/csp_thread.c
diff --git a/libcsp/src/arch/macosx/csp_time.c b/thirdparty/libcsp/src/arch/macosx/csp_time.c
similarity index 100%
rename from libcsp/src/arch/macosx/csp_time.c
rename to thirdparty/libcsp/src/arch/macosx/csp_time.c
diff --git a/libcsp/src/arch/macosx/pthread_queue.c b/thirdparty/libcsp/src/arch/macosx/pthread_queue.c
similarity index 100%
rename from libcsp/src/arch/macosx/pthread_queue.c
rename to thirdparty/libcsp/src/arch/macosx/pthread_queue.c
diff --git a/libcsp/src/arch/posix/CMakeLists.txt b/thirdparty/libcsp/src/arch/posix/CMakeLists.txt
similarity index 100%
rename from libcsp/src/arch/posix/CMakeLists.txt
rename to thirdparty/libcsp/src/arch/posix/CMakeLists.txt
diff --git a/libcsp/src/arch/posix/csp_malloc.c b/thirdparty/libcsp/src/arch/posix/csp_malloc.c
similarity index 100%
rename from libcsp/src/arch/posix/csp_malloc.c
rename to thirdparty/libcsp/src/arch/posix/csp_malloc.c
diff --git a/libcsp/src/arch/posix/csp_queue.c b/thirdparty/libcsp/src/arch/posix/csp_queue.c
similarity index 100%
rename from libcsp/src/arch/posix/csp_queue.c
rename to thirdparty/libcsp/src/arch/posix/csp_queue.c
diff --git a/libcsp/src/arch/posix/csp_semaphore.c b/thirdparty/libcsp/src/arch/posix/csp_semaphore.c
similarity index 100%
rename from libcsp/src/arch/posix/csp_semaphore.c
rename to thirdparty/libcsp/src/arch/posix/csp_semaphore.c
diff --git a/libcsp/src/arch/posix/csp_system.c b/thirdparty/libcsp/src/arch/posix/csp_system.c
similarity index 100%
rename from libcsp/src/arch/posix/csp_system.c
rename to thirdparty/libcsp/src/arch/posix/csp_system.c
diff --git a/libcsp/src/arch/posix/csp_thread.c b/thirdparty/libcsp/src/arch/posix/csp_thread.c
similarity index 100%
rename from libcsp/src/arch/posix/csp_thread.c
rename to thirdparty/libcsp/src/arch/posix/csp_thread.c
diff --git a/libcsp/src/arch/posix/csp_time.c b/thirdparty/libcsp/src/arch/posix/csp_time.c
similarity index 100%
rename from libcsp/src/arch/posix/csp_time.c
rename to thirdparty/libcsp/src/arch/posix/csp_time.c
diff --git a/libcsp/src/arch/posix/pthread_queue.c b/thirdparty/libcsp/src/arch/posix/pthread_queue.c
similarity index 100%
rename from libcsp/src/arch/posix/pthread_queue.c
rename to thirdparty/libcsp/src/arch/posix/pthread_queue.c
diff --git a/libcsp/src/arch/windows/README b/thirdparty/libcsp/src/arch/windows/README
similarity index 100%
rename from libcsp/src/arch/windows/README
rename to thirdparty/libcsp/src/arch/windows/README
diff --git a/libcsp/src/arch/windows/csp_malloc.c b/thirdparty/libcsp/src/arch/windows/csp_malloc.c
similarity index 100%
rename from libcsp/src/arch/windows/csp_malloc.c
rename to thirdparty/libcsp/src/arch/windows/csp_malloc.c
diff --git a/libcsp/src/arch/windows/csp_queue.c b/thirdparty/libcsp/src/arch/windows/csp_queue.c
similarity index 100%
rename from libcsp/src/arch/windows/csp_queue.c
rename to thirdparty/libcsp/src/arch/windows/csp_queue.c
diff --git a/libcsp/src/arch/windows/csp_semaphore.c b/thirdparty/libcsp/src/arch/windows/csp_semaphore.c
similarity index 100%
rename from libcsp/src/arch/windows/csp_semaphore.c
rename to thirdparty/libcsp/src/arch/windows/csp_semaphore.c
diff --git a/libcsp/src/arch/windows/csp_system.c b/thirdparty/libcsp/src/arch/windows/csp_system.c
similarity index 100%
rename from libcsp/src/arch/windows/csp_system.c
rename to thirdparty/libcsp/src/arch/windows/csp_system.c
diff --git a/libcsp/src/arch/windows/csp_thread.c b/thirdparty/libcsp/src/arch/windows/csp_thread.c
similarity index 100%
rename from libcsp/src/arch/windows/csp_thread.c
rename to thirdparty/libcsp/src/arch/windows/csp_thread.c
diff --git a/libcsp/src/arch/windows/csp_time.c b/thirdparty/libcsp/src/arch/windows/csp_time.c
similarity index 100%
rename from libcsp/src/arch/windows/csp_time.c
rename to thirdparty/libcsp/src/arch/windows/csp_time.c
diff --git a/libcsp/src/arch/windows/windows_glue.h b/thirdparty/libcsp/src/arch/windows/windows_glue.h
similarity index 100%
rename from libcsp/src/arch/windows/windows_glue.h
rename to thirdparty/libcsp/src/arch/windows/windows_glue.h
diff --git a/libcsp/src/arch/windows/windows_queue.c b/thirdparty/libcsp/src/arch/windows/windows_queue.c
similarity index 100%
rename from libcsp/src/arch/windows/windows_queue.c
rename to thirdparty/libcsp/src/arch/windows/windows_queue.c
diff --git a/libcsp/src/arch/windows/windows_queue.h b/thirdparty/libcsp/src/arch/windows/windows_queue.h
similarity index 100%
rename from libcsp/src/arch/windows/windows_queue.h
rename to thirdparty/libcsp/src/arch/windows/windows_queue.h
diff --git a/libcsp/src/bindings/python/pycsp.c b/thirdparty/libcsp/src/bindings/python/pycsp.c
similarity index 100%
rename from libcsp/src/bindings/python/pycsp.c
rename to thirdparty/libcsp/src/bindings/python/pycsp.c
diff --git a/libcsp/src/crypto/CMakeLists.txt b/thirdparty/libcsp/src/crypto/CMakeLists.txt
similarity index 100%
rename from libcsp/src/crypto/CMakeLists.txt
rename to thirdparty/libcsp/src/crypto/CMakeLists.txt
diff --git a/libcsp/src/crypto/csp_hmac.c b/thirdparty/libcsp/src/crypto/csp_hmac.c
similarity index 100%
rename from libcsp/src/crypto/csp_hmac.c
rename to thirdparty/libcsp/src/crypto/csp_hmac.c
diff --git a/libcsp/src/crypto/csp_sha1.c b/thirdparty/libcsp/src/crypto/csp_sha1.c
similarity index 100%
rename from libcsp/src/crypto/csp_sha1.c
rename to thirdparty/libcsp/src/crypto/csp_sha1.c
diff --git a/libcsp/src/crypto/csp_xtea.c b/thirdparty/libcsp/src/crypto/csp_xtea.c
similarity index 100%
rename from libcsp/src/crypto/csp_xtea.c
rename to thirdparty/libcsp/src/crypto/csp_xtea.c
diff --git a/libcsp/src/csp_bridge.c b/thirdparty/libcsp/src/csp_bridge.c
similarity index 100%
rename from libcsp/src/csp_bridge.c
rename to thirdparty/libcsp/src/csp_bridge.c
diff --git a/libcsp/src/csp_buffer.c b/thirdparty/libcsp/src/csp_buffer.c
similarity index 100%
rename from libcsp/src/csp_buffer.c
rename to thirdparty/libcsp/src/csp_buffer.c
diff --git a/libcsp/src/csp_conn.c b/thirdparty/libcsp/src/csp_conn.c
similarity index 100%
rename from libcsp/src/csp_conn.c
rename to thirdparty/libcsp/src/csp_conn.c
diff --git a/libcsp/src/csp_conn.h b/thirdparty/libcsp/src/csp_conn.h
similarity index 100%
rename from libcsp/src/csp_conn.h
rename to thirdparty/libcsp/src/csp_conn.h
diff --git a/libcsp/src/csp_crc32.c b/thirdparty/libcsp/src/csp_crc32.c
similarity index 100%
rename from libcsp/src/csp_crc32.c
rename to thirdparty/libcsp/src/csp_crc32.c
diff --git a/libcsp/src/csp_debug.c b/thirdparty/libcsp/src/csp_debug.c
similarity index 100%
rename from libcsp/src/csp_debug.c
rename to thirdparty/libcsp/src/csp_debug.c
diff --git a/libcsp/src/csp_dedup.c b/thirdparty/libcsp/src/csp_dedup.c
similarity index 100%
rename from libcsp/src/csp_dedup.c
rename to thirdparty/libcsp/src/csp_dedup.c
diff --git a/libcsp/src/csp_dedup.h b/thirdparty/libcsp/src/csp_dedup.h
similarity index 100%
rename from libcsp/src/csp_dedup.h
rename to thirdparty/libcsp/src/csp_dedup.h
diff --git a/libcsp/src/csp_endian.c b/thirdparty/libcsp/src/csp_endian.c
similarity index 100%
rename from libcsp/src/csp_endian.c
rename to thirdparty/libcsp/src/csp_endian.c
diff --git a/libcsp/src/csp_hex_dump.c b/thirdparty/libcsp/src/csp_hex_dump.c
similarity index 100%
rename from libcsp/src/csp_hex_dump.c
rename to thirdparty/libcsp/src/csp_hex_dump.c
diff --git a/libcsp/src/csp_iflist.c b/thirdparty/libcsp/src/csp_iflist.c
similarity index 100%
rename from libcsp/src/csp_iflist.c
rename to thirdparty/libcsp/src/csp_iflist.c
diff --git a/libcsp/src/csp_io.c b/thirdparty/libcsp/src/csp_io.c
similarity index 100%
rename from libcsp/src/csp_io.c
rename to thirdparty/libcsp/src/csp_io.c
diff --git a/libcsp/src/csp_io.h b/thirdparty/libcsp/src/csp_io.h
similarity index 100%
rename from libcsp/src/csp_io.h
rename to thirdparty/libcsp/src/csp_io.h
diff --git a/libcsp/src/csp_port.c b/thirdparty/libcsp/src/csp_port.c
similarity index 100%
rename from libcsp/src/csp_port.c
rename to thirdparty/libcsp/src/csp_port.c
diff --git a/libcsp/src/csp_port.h b/thirdparty/libcsp/src/csp_port.h
similarity index 100%
rename from libcsp/src/csp_port.h
rename to thirdparty/libcsp/src/csp_port.h
diff --git a/libcsp/src/csp_promisc.c b/thirdparty/libcsp/src/csp_promisc.c
similarity index 100%
rename from libcsp/src/csp_promisc.c
rename to thirdparty/libcsp/src/csp_promisc.c
diff --git a/libcsp/src/csp_promisc.h b/thirdparty/libcsp/src/csp_promisc.h
similarity index 100%
rename from libcsp/src/csp_promisc.h
rename to thirdparty/libcsp/src/csp_promisc.h
diff --git a/libcsp/src/csp_qfifo.c b/thirdparty/libcsp/src/csp_qfifo.c
similarity index 100%
rename from libcsp/src/csp_qfifo.c
rename to thirdparty/libcsp/src/csp_qfifo.c
diff --git a/libcsp/src/csp_qfifo.h b/thirdparty/libcsp/src/csp_qfifo.h
similarity index 100%
rename from libcsp/src/csp_qfifo.h
rename to thirdparty/libcsp/src/csp_qfifo.h
diff --git a/libcsp/src/csp_route.c b/thirdparty/libcsp/src/csp_route.c
similarity index 100%
rename from libcsp/src/csp_route.c
rename to thirdparty/libcsp/src/csp_route.c
diff --git a/libcsp/src/csp_route.h b/thirdparty/libcsp/src/csp_route.h
similarity index 100%
rename from libcsp/src/csp_route.h
rename to thirdparty/libcsp/src/csp_route.h
diff --git a/libcsp/src/csp_service_handler.c b/thirdparty/libcsp/src/csp_service_handler.c
similarity index 100%
rename from libcsp/src/csp_service_handler.c
rename to thirdparty/libcsp/src/csp_service_handler.c
diff --git a/libcsp/src/csp_services.c b/thirdparty/libcsp/src/csp_services.c
similarity index 100%
rename from libcsp/src/csp_services.c
rename to thirdparty/libcsp/src/csp_services.c
diff --git a/libcsp/src/csp_sfp.c b/thirdparty/libcsp/src/csp_sfp.c
similarity index 100%
rename from libcsp/src/csp_sfp.c
rename to thirdparty/libcsp/src/csp_sfp.c
diff --git a/libcsp/src/drivers/CMakeLists.txt b/thirdparty/libcsp/src/drivers/CMakeLists.txt
similarity index 100%
rename from libcsp/src/drivers/CMakeLists.txt
rename to thirdparty/libcsp/src/drivers/CMakeLists.txt
diff --git a/libcsp/src/drivers/can/CMakeLists.txt b/thirdparty/libcsp/src/drivers/can/CMakeLists.txt
similarity index 100%
rename from libcsp/src/drivers/can/CMakeLists.txt
rename to thirdparty/libcsp/src/drivers/can/CMakeLists.txt
diff --git a/libcsp/src/drivers/can/can_socketcan.c b/thirdparty/libcsp/src/drivers/can/can_socketcan.c
similarity index 100%
rename from libcsp/src/drivers/can/can_socketcan.c
rename to thirdparty/libcsp/src/drivers/can/can_socketcan.c
diff --git a/libcsp/src/drivers/usart/usart_linux.c b/thirdparty/libcsp/src/drivers/usart/usart_linux.c
similarity index 100%
rename from libcsp/src/drivers/usart/usart_linux.c
rename to thirdparty/libcsp/src/drivers/usart/usart_linux.c
diff --git a/libcsp/src/drivers/usart/usart_windows.c b/thirdparty/libcsp/src/drivers/usart/usart_windows.c
similarity index 100%
rename from libcsp/src/drivers/usart/usart_windows.c
rename to thirdparty/libcsp/src/drivers/usart/usart_windows.c
diff --git a/libcsp/src/interfaces/CMakeLists.txt b/thirdparty/libcsp/src/interfaces/CMakeLists.txt
similarity index 100%
rename from libcsp/src/interfaces/CMakeLists.txt
rename to thirdparty/libcsp/src/interfaces/CMakeLists.txt
diff --git a/libcsp/src/interfaces/csp_if_can.c b/thirdparty/libcsp/src/interfaces/csp_if_can.c
similarity index 100%
rename from libcsp/src/interfaces/csp_if_can.c
rename to thirdparty/libcsp/src/interfaces/csp_if_can.c
diff --git a/libcsp/src/interfaces/csp_if_can_pbuf.c b/thirdparty/libcsp/src/interfaces/csp_if_can_pbuf.c
similarity index 100%
rename from libcsp/src/interfaces/csp_if_can_pbuf.c
rename to thirdparty/libcsp/src/interfaces/csp_if_can_pbuf.c
diff --git a/libcsp/src/interfaces/csp_if_can_pbuf.h b/thirdparty/libcsp/src/interfaces/csp_if_can_pbuf.h
similarity index 100%
rename from libcsp/src/interfaces/csp_if_can_pbuf.h
rename to thirdparty/libcsp/src/interfaces/csp_if_can_pbuf.h
diff --git a/libcsp/src/interfaces/csp_if_i2c.c b/thirdparty/libcsp/src/interfaces/csp_if_i2c.c
similarity index 100%
rename from libcsp/src/interfaces/csp_if_i2c.c
rename to thirdparty/libcsp/src/interfaces/csp_if_i2c.c
diff --git a/libcsp/src/interfaces/csp_if_kiss.c b/thirdparty/libcsp/src/interfaces/csp_if_kiss.c
similarity index 100%
rename from libcsp/src/interfaces/csp_if_kiss.c
rename to thirdparty/libcsp/src/interfaces/csp_if_kiss.c
diff --git a/libcsp/src/interfaces/csp_if_lo.c b/thirdparty/libcsp/src/interfaces/csp_if_lo.c
similarity index 100%
rename from libcsp/src/interfaces/csp_if_lo.c
rename to thirdparty/libcsp/src/interfaces/csp_if_lo.c
diff --git a/libcsp/src/rtable/CMakeLists.txt b/thirdparty/libcsp/src/rtable/CMakeLists.txt
similarity index 100%
rename from libcsp/src/rtable/CMakeLists.txt
rename to thirdparty/libcsp/src/rtable/CMakeLists.txt
diff --git a/libcsp/src/rtable/csp_rtable_cidr.c b/thirdparty/libcsp/src/rtable/csp_rtable_cidr.c
similarity index 100%
rename from libcsp/src/rtable/csp_rtable_cidr.c
rename to thirdparty/libcsp/src/rtable/csp_rtable_cidr.c
diff --git a/libcsp/src/rtable/csp_rtable_static.c b/thirdparty/libcsp/src/rtable/csp_rtable_static.c
similarity index 100%
rename from libcsp/src/rtable/csp_rtable_static.c
rename to thirdparty/libcsp/src/rtable/csp_rtable_static.c
diff --git a/libcsp/src/transport/CMakeLists.txt b/thirdparty/libcsp/src/transport/CMakeLists.txt
similarity index 100%
rename from libcsp/src/transport/CMakeLists.txt
rename to thirdparty/libcsp/src/transport/CMakeLists.txt
diff --git a/libcsp/src/transport/csp_rdp.c b/thirdparty/libcsp/src/transport/csp_rdp.c
similarity index 100%
rename from libcsp/src/transport/csp_rdp.c
rename to thirdparty/libcsp/src/transport/csp_rdp.c
diff --git a/libcsp/src/transport/csp_transport.h b/thirdparty/libcsp/src/transport/csp_transport.h
similarity index 100%
rename from libcsp/src/transport/csp_transport.h
rename to thirdparty/libcsp/src/transport/csp_transport.h
diff --git a/libcsp/src/transport/csp_udp.c b/thirdparty/libcsp/src/transport/csp_udp.c
similarity index 100%
rename from libcsp/src/transport/csp_udp.c
rename to thirdparty/libcsp/src/transport/csp_udp.c
diff --git a/libcsp/utils/cfpsplit.py b/thirdparty/libcsp/utils/cfpsplit.py
similarity index 100%
rename from libcsp/utils/cfpsplit.py
rename to thirdparty/libcsp/utils/cfpsplit.py
diff --git a/libcsp/utils/cspsplit.py b/thirdparty/libcsp/utils/cspsplit.py
similarity index 100%
rename from libcsp/utils/cspsplit.py
rename to thirdparty/libcsp/utils/cspsplit.py