diff --git a/protocol/CMakeLists.txt b/protocol/CMakeLists.txt
index 0f52921..65cd4b9 100644
--- a/protocol/CMakeLists.txt
+++ b/protocol/CMakeLists.txt
@@ -17,10 +17,7 @@ add_compile_definitions(BUILT_WITH_CMAKE)
 configure_file(config.h.in config.h)
 
 #add_library(${PROJECT_NAME} SHARED)
-# E1.20
-#include(rdm/CMakeLists.txt)
-# E1.33
-#include(rdmnet/CMakeLists.txt)
+
 # E1.56
 #include(otp/CMakeLists.txt)
 
diff --git a/protocol/artistic/artnet/packet.h b/protocol/artistic/artnet/packet.h
index a757226..e9575bb 100644
--- a/protocol/artistic/artnet/packet.h
+++ b/protocol/artistic/artnet/packet.h
@@ -26,7 +26,7 @@
 #include "artnet.h"
 #include "config.h"
 #include "pdu-stream.h"
-#include "../../rdm/uid.h"
+#include "../../esta/rdm/uid.h"
 #include <vector>
 
 namespace ARTNET {
diff --git a/protocol/ept/CMakeLists.txt b/protocol/ept/CMakeLists.txt
deleted file mode 100644
index a5889a1..0000000
--- a/protocol/ept/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-target_sources(${PROJECT_NAME}
-    PUBLIC
-        ept/client.h
-    PRIVATE
-        ept/broker.cpp
-        ept/broker.h
-        ept/client.cpp
-        ept/ept.cpp
-        ept/ept.h
-    )
diff --git a/protocol/esta/CMakeLists.txt b/protocol/esta/CMakeLists.txt
index 0e29f6d..db9bab4 100644
--- a/protocol/esta/CMakeLists.txt
+++ b/protocol/esta/CMakeLists.txt
@@ -4,5 +4,9 @@ project(${PROJECT_NAME}_esta)
 add_subdirectory(dmx)
 # E1.17
 add_subdirectory(acn)
+# E1.20
+add_subdirectory(rdm)
 # E1.31
 add_subdirectory(sacn)
+# E1.33
+add_subdirectory(rdmnet)
diff --git a/protocol/esta/rdm/CMakeLists.txt b/protocol/esta/rdm/CMakeLists.txt
new file mode 100644
index 0000000..bcb40c8
--- /dev/null
+++ b/protocol/esta/rdm/CMakeLists.txt
@@ -0,0 +1,39 @@
+project(${PROJECT_NAME}_rdm VERSION 0.3.1 LANGUAGES CXX)
+configure_file(../../config.h.in config.h)
+
+add_library(${PROJECT_NAME} SHARED)
+
+target_sources(${PROJECT_NAME}
+    PUBLIC
+        controller.h
+        device.h
+        message.h
+        parameter.h
+        responder.h
+        sensor.h
+        status.h
+    PRIVATE
+        controller.cpp
+        device.cpp
+        E1.37-1.h
+        E1.37-2.h
+        E1.37-7.h
+        message.cpp
+        parameter.cpp
+        rdm.cpp
+        rdm.h
+        responder.cpp
+        sensor.cpp
+        uid.h
+    )
+
+target_link_libraries(${PROJECT_NAME}
+    PUBLIC
+        LCP_esta_dmx
+    )
+
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_LIBRARY)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/protocol/rdm/E1.37-1.h b/protocol/esta/rdm/E1.37-1.h
similarity index 100%
rename from protocol/rdm/E1.37-1.h
rename to protocol/esta/rdm/E1.37-1.h
diff --git a/protocol/rdm/E1.37-2.h b/protocol/esta/rdm/E1.37-2.h
similarity index 100%
rename from protocol/rdm/E1.37-2.h
rename to protocol/esta/rdm/E1.37-2.h
diff --git a/protocol/rdm/E1.37-7.h b/protocol/esta/rdm/E1.37-7.h
similarity index 100%
rename from protocol/rdm/E1.37-7.h
rename to protocol/esta/rdm/E1.37-7.h
diff --git a/protocol/rdm/README.md b/protocol/esta/rdm/README.md
similarity index 100%
rename from protocol/rdm/README.md
rename to protocol/esta/rdm/README.md
diff --git a/protocol/rdm/controller.cpp b/protocol/esta/rdm/controller.cpp
similarity index 100%
rename from protocol/rdm/controller.cpp
rename to protocol/esta/rdm/controller.cpp
diff --git a/protocol/rdm/controller.h b/protocol/esta/rdm/controller.h
similarity index 100%
rename from protocol/rdm/controller.h
rename to protocol/esta/rdm/controller.h
diff --git a/protocol/rdm/device.cpp b/protocol/esta/rdm/device.cpp
similarity index 100%
rename from protocol/rdm/device.cpp
rename to protocol/esta/rdm/device.cpp
diff --git a/protocol/rdm/device.h b/protocol/esta/rdm/device.h
similarity index 99%
rename from protocol/rdm/device.h
rename to protocol/esta/rdm/device.h
index 7acf2b0..788fa04 100644
--- a/protocol/rdm/device.h
+++ b/protocol/esta/rdm/device.h
@@ -23,7 +23,7 @@
 */
 #pragma once
 
-#include "esta/dmx/device.h"
+#include "../dmx/device.h"
 #include "parameter.h"
 #include "rdm.h"
 #include "sensor.h"
diff --git a/protocol/rdm/message.cpp b/protocol/esta/rdm/message.cpp
similarity index 100%
rename from protocol/rdm/message.cpp
rename to protocol/esta/rdm/message.cpp
diff --git a/protocol/rdm/message.h b/protocol/esta/rdm/message.h
similarity index 100%
rename from protocol/rdm/message.h
rename to protocol/esta/rdm/message.h
diff --git a/protocol/rdm/parameter.cpp b/protocol/esta/rdm/parameter.cpp
similarity index 100%
rename from protocol/rdm/parameter.cpp
rename to protocol/esta/rdm/parameter.cpp
diff --git a/protocol/rdm/parameter.h b/protocol/esta/rdm/parameter.h
similarity index 100%
rename from protocol/rdm/parameter.h
rename to protocol/esta/rdm/parameter.h
diff --git a/protocol/rdm/rdm.cpp b/protocol/esta/rdm/rdm.cpp
similarity index 100%
rename from protocol/rdm/rdm.cpp
rename to protocol/esta/rdm/rdm.cpp
diff --git a/protocol/rdm/rdm.h b/protocol/esta/rdm/rdm.h
similarity index 100%
rename from protocol/rdm/rdm.h
rename to protocol/esta/rdm/rdm.h
diff --git a/protocol/rdm/responder.cpp b/protocol/esta/rdm/responder.cpp
similarity index 100%
rename from protocol/rdm/responder.cpp
rename to protocol/esta/rdm/responder.cpp
diff --git a/protocol/rdm/responder.h b/protocol/esta/rdm/responder.h
similarity index 100%
rename from protocol/rdm/responder.h
rename to protocol/esta/rdm/responder.h
diff --git a/protocol/rdm/sensor.cpp b/protocol/esta/rdm/sensor.cpp
similarity index 100%
rename from protocol/rdm/sensor.cpp
rename to protocol/esta/rdm/sensor.cpp
diff --git a/protocol/rdm/sensor.h b/protocol/esta/rdm/sensor.h
similarity index 100%
rename from protocol/rdm/sensor.h
rename to protocol/esta/rdm/sensor.h
diff --git a/protocol/rdm/status.h b/protocol/esta/rdm/status.h
similarity index 100%
rename from protocol/rdm/status.h
rename to protocol/esta/rdm/status.h
diff --git a/protocol/rdm/uid.h b/protocol/esta/rdm/uid.h
similarity index 100%
rename from protocol/rdm/uid.h
rename to protocol/esta/rdm/uid.h
diff --git a/protocol/esta/rdmnet/CMakeLists.txt b/protocol/esta/rdmnet/CMakeLists.txt
new file mode 100644
index 0000000..8794b49
--- /dev/null
+++ b/protocol/esta/rdmnet/CMakeLists.txt
@@ -0,0 +1,40 @@
+project(${PROJECT_NAME}_rdmnet VERSION 0.3.1 LANGUAGES CXX)
+
+add_library(${PROJECT_NAME} SHARED)
+
+target_sources(${PROJECT_NAME}
+    PUBLIC
+        broker.h
+        controller.h
+        device.h
+    PRIVATE
+        broker-protocol.cpp
+        broker-protocol.h
+        broker.cpp
+        controller.cpp
+        device.cpp
+        implementation.cpp
+        implementation.h
+        pdu.cpp
+        pdu.h
+        rdmnet.h
+    )
+
+target_link_libraries(${PROJECT_NAME}
+    PUBLIC
+        LCP_esta_acn
+        LCP_esta_rdm
+        LCP_esta_rdmnet_ept
+        LCP_esta_rdmnet_llrp
+        LCP_esta_rdmnet_rpt
+    )
+
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_LIBRARY)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_subdirectory(ept)
+add_subdirectory(llrp)
+add_subdirectory(rpt)
diff --git a/protocol/rdmnet/broker-protocol.cpp b/protocol/esta/rdmnet/broker-protocol.cpp
similarity index 100%
rename from protocol/rdmnet/broker-protocol.cpp
rename to protocol/esta/rdmnet/broker-protocol.cpp
diff --git a/protocol/rdmnet/broker-protocol.h b/protocol/esta/rdmnet/broker-protocol.h
similarity index 99%
rename from protocol/rdmnet/broker-protocol.h
rename to protocol/esta/rdmnet/broker-protocol.h
index f3b2527..a530aa4 100644
--- a/protocol/rdmnet/broker-protocol.h
+++ b/protocol/esta/rdmnet/broker-protocol.h
@@ -24,8 +24,8 @@
 #pragma once
 
 #include "pdu.h"
-#include "rdm/uid.h"
-#include "uuid/uuid.h"
+#include "uid.h"
+#include "uuid.h"
 
 namespace RDMnet::BrokerProtocol {
 
diff --git a/protocol/rdmnet/broker.cpp b/protocol/esta/rdmnet/broker.cpp
similarity index 100%
rename from protocol/rdmnet/broker.cpp
rename to protocol/esta/rdmnet/broker.cpp
diff --git a/protocol/rdmnet/broker.h b/protocol/esta/rdmnet/broker.h
similarity index 100%
rename from protocol/rdmnet/broker.h
rename to protocol/esta/rdmnet/broker.h
diff --git a/protocol/rdmnet/controller.cpp b/protocol/esta/rdmnet/controller.cpp
similarity index 100%
rename from protocol/rdmnet/controller.cpp
rename to protocol/esta/rdmnet/controller.cpp
diff --git a/protocol/rdmnet/controller.h b/protocol/esta/rdmnet/controller.h
similarity index 98%
rename from protocol/rdmnet/controller.h
rename to protocol/esta/rdmnet/controller.h
index da3f47b..61326dd 100644
--- a/protocol/rdmnet/controller.h
+++ b/protocol/esta/rdmnet/controller.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include "implementation.h"
-#include "rdm/controller.h"
+#include "../rdm/controller.h"
 #include "rpt/controller.h"
 
 namespace RDMnet {
diff --git a/protocol/rdmnet/device.cpp b/protocol/esta/rdmnet/device.cpp
similarity index 100%
rename from protocol/rdmnet/device.cpp
rename to protocol/esta/rdmnet/device.cpp
diff --git a/protocol/rdmnet/device.h b/protocol/esta/rdmnet/device.h
similarity index 100%
rename from protocol/rdmnet/device.h
rename to protocol/esta/rdmnet/device.h
diff --git a/protocol/esta/rdmnet/ept/CMakeLists.txt b/protocol/esta/rdmnet/ept/CMakeLists.txt
new file mode 100644
index 0000000..7bef978
--- /dev/null
+++ b/protocol/esta/rdmnet/ept/CMakeLists.txt
@@ -0,0 +1,27 @@
+project(${PROJECT_NAME}_ept VERSION 0.3.1 LANGUAGES CXX)
+
+add_library(${PROJECT_NAME} SHARED)
+
+target_sources(${PROJECT_NAME}
+    PUBLIC
+        client.h
+    PRIVATE
+        broker.cpp
+        broker.h
+        client.cpp
+        ept.cpp
+        ept.h
+    )
+
+target_link_libraries(${PROJECT_NAME}
+    PUBLIC
+        LCP_ietf_uuid
+        LCP_esta_rdm
+        LCP_esta_rdmnet_rpt
+    )
+
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_LIBRARY)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/protocol/ept/broker.cpp b/protocol/esta/rdmnet/ept/broker.cpp
similarity index 100%
rename from protocol/ept/broker.cpp
rename to protocol/esta/rdmnet/ept/broker.cpp
diff --git a/protocol/ept/broker.h b/protocol/esta/rdmnet/ept/broker.h
similarity index 100%
rename from protocol/ept/broker.h
rename to protocol/esta/rdmnet/ept/broker.h
diff --git a/protocol/ept/client.cpp b/protocol/esta/rdmnet/ept/client.cpp
similarity index 100%
rename from protocol/ept/client.cpp
rename to protocol/esta/rdmnet/ept/client.cpp
diff --git a/protocol/ept/client.h b/protocol/esta/rdmnet/ept/client.h
similarity index 100%
rename from protocol/ept/client.h
rename to protocol/esta/rdmnet/ept/client.h
diff --git a/protocol/ept/ept.cpp b/protocol/esta/rdmnet/ept/ept.cpp
similarity index 98%
rename from protocol/ept/ept.cpp
rename to protocol/esta/rdmnet/ept/ept.cpp
index 4de8630..c044963 100644
--- a/protocol/ept/ept.cpp
+++ b/protocol/esta/rdmnet/ept/ept.cpp
@@ -23,8 +23,8 @@
 */
 
 #include "ept.h"
-#include "rdmnet/rdmnet.h"
-#include "rpt/rpt.h"
+#include "../rdmnet.h"
+#include "rpt.h"
 
 namespace RDMnet::EPT {
 
diff --git a/protocol/ept/ept.h b/protocol/esta/rdmnet/ept/ept.h
similarity index 98%
rename from protocol/ept/ept.h
rename to protocol/esta/rdmnet/ept/ept.h
index 667301c..05fe27f 100644
--- a/protocol/ept/ept.h
+++ b/protocol/esta/rdmnet/ept/ept.h
@@ -23,8 +23,8 @@
 */
 #pragma once
 
-#include "rdmnet/pdu.h"
-#include "uuid/uuid.h"
+#include "../pdu.h"
+#include "uuid.h"
 
 namespace RDMnet::EPT {
 
diff --git a/protocol/rdmnet/implementation.cpp b/protocol/esta/rdmnet/implementation.cpp
similarity index 100%
rename from protocol/rdmnet/implementation.cpp
rename to protocol/esta/rdmnet/implementation.cpp
diff --git a/protocol/rdmnet/implementation.h b/protocol/esta/rdmnet/implementation.h
similarity index 98%
rename from protocol/rdmnet/implementation.h
rename to protocol/esta/rdmnet/implementation.h
index 8b12531..484247b 100644
--- a/protocol/rdmnet/implementation.h
+++ b/protocol/esta/rdmnet/implementation.h
@@ -25,7 +25,7 @@
 
 #include "ept/client.h"
 #include "llrp/target.h"
-#include "rdm/responder.h"
+#include "responder.h"
 #include "rlp/component.h"
 
 namespace RDMnet {
diff --git a/protocol/esta/rdmnet/llrp/CMakeLists.txt b/protocol/esta/rdmnet/llrp/CMakeLists.txt
new file mode 100644
index 0000000..7b98044
--- /dev/null
+++ b/protocol/esta/rdmnet/llrp/CMakeLists.txt
@@ -0,0 +1,28 @@
+project(${PROJECT_NAME}_llrp VERSION 0.3.1 LANGUAGES CXX)
+
+add_library(${PROJECT_NAME} SHARED)
+
+target_sources(${PROJECT_NAME}
+    PUBLIC
+        manager.h
+    PRIVATE
+        llrp.cpp
+        llrp.h
+        manager.cpp
+        target.cpp
+        target.h
+    )
+
+target_link_libraries(${PROJECT_NAME}
+    PUBLIC
+        LCP_ietf_uuid
+        LCP_esta_acn_rlp
+        LCP_esta_rdm
+        LCP_esta_rdmnet_rpt
+    )
+
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_LIBRARY)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/protocol/llrp/llrp.cpp b/protocol/esta/rdmnet/llrp/llrp.cpp
similarity index 99%
rename from protocol/llrp/llrp.cpp
rename to protocol/esta/rdmnet/llrp/llrp.cpp
index 6fe1cd7..933677b 100644
--- a/protocol/llrp/llrp.cpp
+++ b/protocol/esta/rdmnet/llrp/llrp.cpp
@@ -23,7 +23,7 @@
 */
 
 #include "llrp.h"
-#include "rpt/rpt.h"
+#include "rpt.h"
 
 namespace RDMnet::LLRP {
 
diff --git a/protocol/llrp/llrp.h b/protocol/esta/rdmnet/llrp/llrp.h
similarity index 98%
rename from protocol/llrp/llrp.h
rename to protocol/esta/rdmnet/llrp/llrp.h
index 0d946b4..b74c03d 100644
--- a/protocol/llrp/llrp.h
+++ b/protocol/esta/rdmnet/llrp/llrp.h
@@ -23,10 +23,10 @@
 */
 #pragma once
 
-#include "rdmnet/pdu.h"
-#include "rdmnet/rdmnet.h"
-#include "rdm/uid.h"
-#include "uuid/uuid.h"
+#include "../pdu.h"
+#include "../rdmnet.h"
+#include "uid.h"
+#include "uuid.h"
 
 namespace RDMnet::LLRP {
 
diff --git a/protocol/llrp/manager.cpp b/protocol/esta/rdmnet/llrp/manager.cpp
similarity index 98%
rename from protocol/llrp/manager.cpp
rename to protocol/esta/rdmnet/llrp/manager.cpp
index e21deb2..4f268d2 100644
--- a/protocol/llrp/manager.cpp
+++ b/protocol/esta/rdmnet/llrp/manager.cpp
@@ -23,7 +23,7 @@
 */
 
 #include "manager.h"
-#include "rdmnet/rdmnet.h"
+#include "../rdmnet.h"
 
 namespace RDMnet::LLRP {
 
diff --git a/protocol/llrp/manager.h b/protocol/esta/rdmnet/llrp/manager.h
similarity index 100%
rename from protocol/llrp/manager.h
rename to protocol/esta/rdmnet/llrp/manager.h
diff --git a/protocol/llrp/target.cpp b/protocol/esta/rdmnet/llrp/target.cpp
similarity index 100%
rename from protocol/llrp/target.cpp
rename to protocol/esta/rdmnet/llrp/target.cpp
diff --git a/protocol/llrp/target.h b/protocol/esta/rdmnet/llrp/target.h
similarity index 98%
rename from protocol/llrp/target.h
rename to protocol/esta/rdmnet/llrp/target.h
index 08394df..32ae706 100644
--- a/protocol/llrp/target.h
+++ b/protocol/esta/rdmnet/llrp/target.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include "llrp.h"
-#include "rpt/rpt.h"
+#include "rpt.h"
 
 namespace RDMnet::LLRP {
 
diff --git a/protocol/rdmnet/pdu.cpp b/protocol/esta/rdmnet/pdu.cpp
similarity index 100%
rename from protocol/rdmnet/pdu.cpp
rename to protocol/esta/rdmnet/pdu.cpp
diff --git a/protocol/rdmnet/pdu.h b/protocol/esta/rdmnet/pdu.h
similarity index 97%
rename from protocol/rdmnet/pdu.h
rename to protocol/esta/rdmnet/pdu.h
index 1dc4207..04aa3a6 100644
--- a/protocol/rdmnet/pdu.h
+++ b/protocol/esta/rdmnet/pdu.h
@@ -23,8 +23,8 @@
 */
 #pragma once
 
-#include "acn/pdu.h"
-#include "rdm/uid.h"
+#include "../acn/pdu.h"
+#include "uid.h"
 
 namespace RDMnet {
 
diff --git a/protocol/rdmnet/rdmnet.h b/protocol/esta/rdmnet/rdmnet.h
similarity index 99%
rename from protocol/rdmnet/rdmnet.h
rename to protocol/esta/rdmnet/rdmnet.h
index 1b86e2d..ca92cba 100644
--- a/protocol/rdmnet/rdmnet.h
+++ b/protocol/esta/rdmnet/rdmnet.h
@@ -23,7 +23,7 @@
 */
 #pragma once
 
-#include "rdm/rdm.h"
+#include "rdm.h"
 
 /**
  * @brief @cite RDMnet The RDMnet Protocol
diff --git a/protocol/esta/rdmnet/rpt/CMakeLists.txt b/protocol/esta/rdmnet/rpt/CMakeLists.txt
new file mode 100644
index 0000000..be2e705
--- /dev/null
+++ b/protocol/esta/rdmnet/rpt/CMakeLists.txt
@@ -0,0 +1,28 @@
+project(${PROJECT_NAME}_rpt VERSION 0.3.1 LANGUAGES CXX)
+configure_file(../../../config.h.in config.h)
+
+add_library(${PROJECT_NAME} SHARED)
+
+target_sources(${PROJECT_NAME}
+    PUBLIC
+        broker.h
+        controller.h
+    PRIVATE
+        broker.cpp
+        controller.cpp
+        device.cpp
+        device.h
+        rpt.cpp
+        rpt.h
+    )
+target_link_libraries(${PROJECT_NAME}
+    PUBLIC
+        LCP_ietf_uuid
+        LCP_esta_rdm
+    )
+
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_LIBRARY)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/protocol/rpt/broker.cpp b/protocol/esta/rdmnet/rpt/broker.cpp
similarity index 100%
rename from protocol/rpt/broker.cpp
rename to protocol/esta/rdmnet/rpt/broker.cpp
diff --git a/protocol/rpt/broker.h b/protocol/esta/rdmnet/rpt/broker.h
similarity index 100%
rename from protocol/rpt/broker.h
rename to protocol/esta/rdmnet/rpt/broker.h
diff --git a/protocol/rpt/controller.cpp b/protocol/esta/rdmnet/rpt/controller.cpp
similarity index 100%
rename from protocol/rpt/controller.cpp
rename to protocol/esta/rdmnet/rpt/controller.cpp
diff --git a/protocol/rpt/controller.h b/protocol/esta/rdmnet/rpt/controller.h
similarity index 100%
rename from protocol/rpt/controller.h
rename to protocol/esta/rdmnet/rpt/controller.h
diff --git a/protocol/rpt/device.cpp b/protocol/esta/rdmnet/rpt/device.cpp
similarity index 100%
rename from protocol/rpt/device.cpp
rename to protocol/esta/rdmnet/rpt/device.cpp
diff --git a/protocol/rpt/device.h b/protocol/esta/rdmnet/rpt/device.h
similarity index 100%
rename from protocol/rpt/device.h
rename to protocol/esta/rdmnet/rpt/device.h
diff --git a/protocol/rpt/rpt.cpp b/protocol/esta/rdmnet/rpt/rpt.cpp
similarity index 99%
rename from protocol/rpt/rpt.cpp
rename to protocol/esta/rdmnet/rpt/rpt.cpp
index 137c9f2..a4e78fd 100644
--- a/protocol/rpt/rpt.cpp
+++ b/protocol/esta/rdmnet/rpt/rpt.cpp
@@ -23,7 +23,7 @@
 */
 
 #include "config.h"
-#include "rdmnet/rdmnet.h"
+#include "../rdmnet.h"
 #include "rpt.h"
 
 namespace RDMnet::RPT {
diff --git a/protocol/rpt/rpt.h b/protocol/esta/rdmnet/rpt/rpt.h
similarity index 98%
rename from protocol/rpt/rpt.h
rename to protocol/esta/rdmnet/rpt/rpt.h
index 12235a3..975ab9b 100644
--- a/protocol/rpt/rpt.h
+++ b/protocol/esta/rdmnet/rpt/rpt.h
@@ -23,9 +23,9 @@
 */
 #pragma once
 
-#include "rdmnet/pdu.h"
-#include "rdm/message.h"
-#include "rdm/uid.h"
+#include "../pdu.h"
+#include "message.h"
+#include "uid.h"
 
 namespace RDMnet::RPT {
 
diff --git a/protocol/llrp/CMakeLists.txt b/protocol/llrp/CMakeLists.txt
deleted file mode 100644
index c31d3b4..0000000
--- a/protocol/llrp/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-target_sources(${PROJECT_NAME}
-    PUBLIC
-        llrp/manager.h
-    PRIVATE
-        llrp/llrp.cpp
-        llrp/llrp.h
-        llrp/manager.cpp
-        llrp/target.cpp
-        llrp/target.h
-    )
diff --git a/protocol/rdm/CMakeLists.txt b/protocol/rdm/CMakeLists.txt
deleted file mode 100644
index 2a96fe9..0000000
--- a/protocol/rdm/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-target_sources(${PROJECT_NAME}
-    PUBLIC
-        rdm/controller.h
-        rdm/device.h
-        rdm/message.h
-        rdm/parameter.h
-        rdm/responder.h
-        rdm/sensor.h
-        rdm/status.h
-    PRIVATE
-        rdm/controller.cpp
-        rdm/device.cpp
-        rdm/E1.37-1.h
-        rdm/E1.37-2.h
-        rdm/E1.37-7.h
-        rdm/message.cpp
-        rdm/parameter.cpp
-        rdm/rdm.cpp
-        rdm/rdm.h
-        rdm/responder.cpp
-        rdm/sensor.cpp
-        rdm/uid.h
-    )
diff --git a/protocol/rdmnet/CMakeLists.txt b/protocol/rdmnet/CMakeLists.txt
deleted file mode 100644
index 71026ec..0000000
--- a/protocol/rdmnet/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-target_sources(${PROJECT_NAME}
-    PUBLIC
-        rdmnet/broker.h
-        rdmnet/controller.h
-        rdmnet/device.h
-    PRIVATE
-        rdmnet/broker-protocol.cpp
-        rdmnet/broker-protocol.h
-        rdmnet/broker.cpp
-        rdmnet/controller.cpp
-        rdmnet/device.cpp
-        rdmnet/implementation.cpp
-        rdmnet/implementation.h
-        rdmnet/pdu.cpp
-        rdmnet/pdu.h
-        rdmnet/rdmnet.h
-    )
-
-include(ept/CMakeLists.txt)
-include(llrp/CMakeLists.txt)
-include(rpt/CMakeLists.txt)
diff --git a/protocol/rpt/CMakeLists.txt b/protocol/rpt/CMakeLists.txt
deleted file mode 100644
index d0adb3b..0000000
--- a/protocol/rpt/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-target_sources(${PROJECT_NAME}
-    PUBLIC
-        rpt/broker.h
-        rpt/controller.h
-    PRIVATE
-        rpt/broker.cpp
-        rpt/controller.cpp
-        rpt/device.cpp
-        rpt/device.h
-        rpt/rpt.cpp
-        rpt/rpt.h
-    )