diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in
index bc8a39f..8d13783 100644
--- a/docs/Doxyfile.in
+++ b/docs/Doxyfile.in
@@ -103,7 +103,7 @@ SHOW_NAMESPACES        = YES
 FILE_VERSION_FILTER    =
 LAYOUT_FILE            =
 CITE_BIB_FILES         = @CMAKE_CURRENT_SOURCE_DIR@/protocol/artistic/ARTISTIC.bib \
-                         @CMAKE_CURRENT_SOURCE_DIR@/ESTA.bib \
+                         @CMAKE_CURRENT_SOURCE_DIR@/protocol/esta/ESTA.bib \
                          @CMAKE_CURRENT_SOURCE_DIR@/protocol/ietf/IETF.bib
 #---------------------------------------------------------------------------
 # Configuration options related to warning and progress messages
diff --git a/protocol/CMakeLists.txt b/protocol/CMakeLists.txt
index 8644596..5d745a8 100644
--- a/protocol/CMakeLists.txt
+++ b/protocol/CMakeLists.txt
@@ -17,8 +17,6 @@ add_compile_definitions(BUILT_WITH_CMAKE)
 configure_file(config.h.in config.h)
 
 add_library(${PROJECT_NAME} SHARED)
-# E1.11
-include(dmx/CMakeLists.txt)
 # E1.17
 include(acn/CMakeLists.txt)
 # E1.20
@@ -30,6 +28,10 @@ include(rdmnet/CMakeLists.txt)
 # E1.56
 include(otp/CMakeLists.txt)
 
+
+# Entertainment Services and Technology Association
+add_subdirectory(esta)
+
 # Internet Engineering Task Force
 add_subdirectory(ietf)
 
@@ -39,6 +41,7 @@ add_subdirectory(artistic)
 target_link_libraries(${PROJECT_NAME}
     PUBLIC
         LCP_ietf_uuid
+        LCP_esta_dmx
     )
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
diff --git a/protocol/artistic/artnet/packet.cpp b/protocol/artistic/artnet/packet.cpp
index d0ebca6..44e902c 100644
--- a/protocol/artistic/artnet/packet.cpp
+++ b/protocol/artistic/artnet/packet.cpp
@@ -23,7 +23,7 @@
   */
 
 #include "packet.h"
-#include "dmx/dmx.h"
+#include "esta/dmx/dmx.h"
 #include <sstream>
 
 namespace ARTNET {
diff --git a/protocol/dmx/CMakeLists.txt b/protocol/dmx/CMakeLists.txt
deleted file mode 100644
index f986ee5..0000000
--- a/protocol/dmx/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-target_sources(${PROJECT_NAME}
-    PUBLIC
-        dmx/device.h
-        dmx/patch.h
-        dmx/personality.h
-        dmx/universe.h
-    PRIVATE
-        dmx/device.cpp
-        dmx/dmx.h
-        dmx/patch.cpp
-        dmx/personality.cpp
-        dmx/universe.cpp
-    )
diff --git a/protocol/esta/CMakeLists.txt b/protocol/esta/CMakeLists.txt
new file mode 100644
index 0000000..4663cc6
--- /dev/null
+++ b/protocol/esta/CMakeLists.txt
@@ -0,0 +1,4 @@
+project(${PROJECT_NAME}_esta)
+
+# E1.11
+add_subdirectory(dmx)
diff --git a/ESTA.bib b/protocol/esta/ESTA.bib
similarity index 100%
rename from ESTA.bib
rename to protocol/esta/ESTA.bib
diff --git a/protocol/esta/dmx/CMakeLists.txt b/protocol/esta/dmx/CMakeLists.txt
new file mode 100644
index 0000000..227e1b6
--- /dev/null
+++ b/protocol/esta/dmx/CMakeLists.txt
@@ -0,0 +1,23 @@
+project(${PROJECT_NAME}_dmx VERSION 0.3.1 LANGUAGES CXX)
+
+add_library(${PROJECT_NAME} SHARED)
+
+target_sources(${PROJECT_NAME}
+    PUBLIC
+        device.h
+        patch.h
+        personality.h
+        universe.h
+    PRIVATE
+        device.cpp
+        dmx.h
+        patch.cpp
+        personality.cpp
+        universe.cpp
+    )
+
+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/dmx/device.cpp b/protocol/esta/dmx/device.cpp
similarity index 100%
rename from protocol/dmx/device.cpp
rename to protocol/esta/dmx/device.cpp
diff --git a/protocol/dmx/device.h b/protocol/esta/dmx/device.h
similarity index 100%
rename from protocol/dmx/device.h
rename to protocol/esta/dmx/device.h
diff --git a/protocol/dmx/dmx.h b/protocol/esta/dmx/dmx.h
similarity index 100%
rename from protocol/dmx/dmx.h
rename to protocol/esta/dmx/dmx.h
diff --git a/protocol/dmx/patch.cpp b/protocol/esta/dmx/patch.cpp
similarity index 100%
rename from protocol/dmx/patch.cpp
rename to protocol/esta/dmx/patch.cpp
diff --git a/protocol/dmx/patch.h b/protocol/esta/dmx/patch.h
similarity index 100%
rename from protocol/dmx/patch.h
rename to protocol/esta/dmx/patch.h
diff --git a/protocol/dmx/personality.cpp b/protocol/esta/dmx/personality.cpp
similarity index 100%
rename from protocol/dmx/personality.cpp
rename to protocol/esta/dmx/personality.cpp
diff --git a/protocol/dmx/personality.h b/protocol/esta/dmx/personality.h
similarity index 100%
rename from protocol/dmx/personality.h
rename to protocol/esta/dmx/personality.h
diff --git a/protocol/dmx/universe.cpp b/protocol/esta/dmx/universe.cpp
similarity index 100%
rename from protocol/dmx/universe.cpp
rename to protocol/esta/dmx/universe.cpp
diff --git a/protocol/dmx/universe.h b/protocol/esta/dmx/universe.h
similarity index 100%
rename from protocol/dmx/universe.h
rename to protocol/esta/dmx/universe.h
diff --git a/protocol/rdm/device.h b/protocol/rdm/device.h
index c4eb242..7acf2b0 100644
--- a/protocol/rdm/device.h
+++ b/protocol/rdm/device.h
@@ -23,7 +23,7 @@
 */
 #pragma once
 
-#include "dmx/device.h"
+#include "esta/dmx/device.h"
 #include "parameter.h"
 #include "rdm.h"
 #include "sensor.h"
diff --git a/protocol/sacn/universe.h b/protocol/sacn/universe.h
index 6561f37..65d5de3 100644
--- a/protocol/sacn/universe.h
+++ b/protocol/sacn/universe.h
@@ -25,7 +25,7 @@
 
 #include "data.h"
 #include "dmp/dmp.h"
-#include "dmx/universe.h"
+#include "esta/dmx/universe.h"
 #include "sacn/sacn.h"
 
 #include <cstdint>