diff --git a/addons/ee/$PBOPREFIX$ b/addons/ee/$PBOPREFIX$
deleted file mode 100644
index 58937b0bf5..0000000000
--- a/addons/ee/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-x\cba\addons\ee
diff --git a/addons/ee/script_component.hpp b/addons/ee/script_component.hpp
deleted file mode 100644
index 607b347874..0000000000
--- a/addons/ee/script_component.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "\x\cba\addons\xeh\script_component.hpp"
-
-// macro add a dummy cfgPatch
-#define CBA_EE_PATCH_NOT_LOADED(NAME,CAUSE) \
-class CfgPatches { \
-    class DOUBLES(NAME,notLoaded) { \
-        units[] = {}; \
-        weapons[] = {}; \
-        cba_not_loaded = CAUSE; \
-    }; \
-};
diff --git a/addons/ee/addon.toml b/addons/xeh/addon.toml
similarity index 100%
rename from addons/ee/addon.toml
rename to addons/xeh/addon.toml
diff --git a/addons/ee/compat_contact/config.cpp b/addons/xeh/compat_contact/config.cpp
similarity index 92%
rename from addons/ee/compat_contact/config.cpp
rename to addons/xeh/compat_contact/config.cpp
index 07ff34a759..d1e9fef768 100644
--- a/addons/ee/compat_contact/config.cpp
+++ b/addons/xeh/compat_contact/config.cpp
@@ -1,6 +1,6 @@
-#include "\x\cba\addons\ee\script_component.hpp"
+#include "\x\cba\addons\xeh\script_component.hpp"
 #undef COMPONENT
-#define COMPONENT ee_compat_contact
+#define COMPONENT xeh_compat_contact
 
 #if __has_include("\a3\Data_F_Contact\config.bin")
 #else
@@ -8,7 +8,7 @@
 #endif
 
 #ifdef PATCH_SKIP
-CBA_EE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
+CBA_XEH_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
 #else
 class CfgPatches {
     class ADDON {
diff --git a/addons/ee/compat_csla/config.cpp b/addons/xeh/compat_csla/config.cpp
similarity index 91%
rename from addons/ee/compat_csla/config.cpp
rename to addons/xeh/compat_csla/config.cpp
index 6739eff580..79fda896e7 100644
--- a/addons/ee/compat_csla/config.cpp
+++ b/addons/xeh/compat_csla/config.cpp
@@ -1,6 +1,6 @@
-#include "\x\cba\addons\ee\script_component.hpp"
+#include "\x\cba\addons\xeh\script_component.hpp"
 #undef COMPONENT
-#define COMPONENT ee_compat_csla
+#define COMPONENT xeh_compat_csla
 
 #if __has_include("\csla_cfg\config.bin")
 #else
@@ -8,7 +8,7 @@
 #endif
 
 #ifdef PATCH_SKIP
-CBA_EE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
+CBA_XEH_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
 #else
 class CfgPatches {
     class ADDON {
diff --git a/addons/ee/compat_sog/config.cpp b/addons/xeh/compat_sog/config.cpp
similarity index 90%
rename from addons/ee/compat_sog/config.cpp
rename to addons/xeh/compat_sog/config.cpp
index 2e1aac3157..40d6522ff0 100644
--- a/addons/ee/compat_sog/config.cpp
+++ b/addons/xeh/compat_sog/config.cpp
@@ -1,6 +1,6 @@
-#include "\x\cba\addons\ee\script_component.hpp"
+#include "\x\cba\addons\xeh\script_component.hpp"
 #undef COMPONENT
-#define COMPONENT ee_compat_sog
+#define COMPONENT xeh_compat_sog
 
 #if __has_include("\vn\weapons_f_vietnam\config.bin")
 #else
@@ -8,7 +8,7 @@
 #endif
 
 #ifdef PATCH_SKIP
-CBA_EE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
+CBA_XEH_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
 #else
 class CfgPatches {
     class ADDON {
diff --git a/addons/ee/compat_ws/config.cpp b/addons/xeh/compat_ws/config.cpp
similarity index 94%
rename from addons/ee/compat_ws/config.cpp
rename to addons/xeh/compat_ws/config.cpp
index f028059a5d..3e299f82e2 100644
--- a/addons/ee/compat_ws/config.cpp
+++ b/addons/xeh/compat_ws/config.cpp
@@ -1,6 +1,6 @@
-#include "\x\cba\addons\ee\script_component.hpp"
+#include "\x\cba\addons\xeh\script_component.hpp"
 #undef COMPONENT
-#define COMPONENT ee_compat_ws
+#define COMPONENT xeh_compat_ws
 
 #if __has_include("\lxWS\data_f_lxWS\config.bin")
 #else
@@ -8,7 +8,7 @@
 #endif
 
 #ifdef PATCH_SKIP
-CBA_EE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
+CBA_XEH_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
 #else
 class CfgPatches {
     class ADDON {
diff --git a/addons/ee/config.cpp b/addons/xeh/ee/config.cpp
similarity index 76%
rename from addons/ee/config.cpp
rename to addons/xeh/ee/config.cpp
index 9a5d0afb9c..1dc18df178 100644
--- a/addons/ee/config.cpp
+++ b/addons/xeh/ee/config.cpp
@@ -1,5 +1,3 @@
-#include "script_component.hpp"
-
 class CfgPatches {
     class cba_ee {
         requiredAddons[] = {"cba_xeh"};
diff --git a/addons/xeh/script_component.hpp b/addons/xeh/script_component.hpp
index fb99a60563..06040bf03f 100644
--- a/addons/xeh/script_component.hpp
+++ b/addons/xeh/script_component.hpp
@@ -38,6 +38,16 @@
 
 #include "script_xeh.hpp"
 
+// macro add a dummy cfgPatch - this macro may be removed after 2.14 cleanup!
+#define CBA_XEH_PATCH_NOT_LOADED(NAME,CAUSE) \
+class CfgPatches { \
+    class DOUBLES(NAME,notLoaded) { \
+        units[] = {}; \
+        weapons[] = {}; \
+        cba_not_loaded = CAUSE; \
+    }; \
+};
+
 #undef XEH_ENABLED
 #define XEH_ENABLED class EventHandlers {class XEH_CLASS: XEH_CLASS_BASE {};}; SLX_XEH_DISABLED = 0