diff --git a/Android.mk b/Android.mk
index c3464aa..cd589a4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),Atom_XL)
+ifneq ($(filter Atom_XL_EEA ,$(TARGET_DEVICE)),)
 subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
 $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))
 endif
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index dd13919..b445b89 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,2 +1,2 @@
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_Atom_XL.mk
+    $(LOCAL_DIR)/lineage_Atom_XL_EEA.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 178064b..60a08b8 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -3,12 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PATH := device/Unihertz/Atom_XL
+-include device/Unihertz/Atom_XL/BoardConfigCommon.mk
 
--include device/Unihertz/Atom_LXL/BoardConfigCommon.mk
+DEVICE_REGION_PATH := device/Unihertz/Atom_XL_EEA
 
-BOARD_PLAT_PRIVATE_SEPOLICY_DIR += \
-    $(DEVICE_PATH)/sepolicy/private
-
-# Properties
-TARGET_PRODUCT_PROP += $(DEVICE_PATH)/product.prop
+# Kernel
+TARGET_PREBUILT_KERNEL := $(DEVICE_REGION_PATH)/prebuilt/Image.gz
+BOARD_PREBUILT_DTBOIMAGE := $(DEVICE_REGION_PATH)/prebuilt/dtbo.img
+BOARD_PREBUILT_DTBIMAGE_DIR := $(DEVICE_REGION_PATH)/prebuilt/dtb
diff --git a/README.md b/README.md
index f64eaa9..3a25510 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-Device configuration for Unihertz Atom XL (Atom_XL)
+Device configuration for Unihertz Atom XL (Atom_XL) EEA (european union)
 =================================================
-This device tree is intended for the usage in a LineageOS or similar building environment.
-If you are looking for a special device tree for the usage in a TWRP or similar environment head over to https://github.com/ADeadTrousers/twrp_device_Unihertz_Atom_XL.
+This model device tree is intended for the usage in a LineageOS or similar building environment.
+If you are looking for a special device tree for the usage in a TWRP or similar environment head over to https://github.com/ADeadTrousers/twrp_device_Unihertz_Atom_LXL.
 
-The Unihertz Atom XL (codenamed simply _"Atom_XL"_) is a rugged small smartphone from Unihertz, released in July 2020. It is similar to the Atom L but with integrated amateur radio support.
+The Unihertz Atom XL (codenamed simply _"Atom_XL"_) is a rugged small smartphone from Unihertz, released in July 2020. It is similar to the Atom L but with an integrated digital mobile radio (DMR).
 
-![](docs/images/atom_xl.png)
+![](https://github.com/ADeadTrousers/android_device_Unihertz_Atom_XL/blob/master/docs/images/atom_xl.png)
 
 | Basic                   | Spec Sheet                                                                                                                     |
 | -----------------------:|:------------------------------------------------------------------------------------------------------------------------------ |
@@ -20,6 +20,16 @@ The Unihertz Atom XL (codenamed simply _"Atom_XL"_) is a rugged small smartphone
 | Camera (Rear - Main)    | 48MP                                                                                                                           |
 | Camera (Front)          | 8MP                                                                                                                            |
 
+# Dependencies
+
+Additionally to this region device tree, you'll need the common device tree
+
+- [Atom LXL](https://github.com/ADeadTrousers/android_device_Unihertz_Atom_LXL)
+
+and the model device tree
+
+- [Atom XL Model)](https://github.com/ADeadTrousers/android_device_Unihertz_Atom_XL)
+
 ## Documentations
 
 - [HOW-TO-BUILD.md](https://github.com/ADeadTrousers/android_device_Unihertz_Atom_LXL/blob/master/docs/HOW-TO-BUILD.md) - Building instructions for LineageOS 17.1.
@@ -33,4 +43,4 @@ The Unihertz Atom XL (codenamed simply _"Atom_XL"_) is a rugged small smartphone
 ## Special Thanks To
 
 - [PeterCxy from the XDA forum](https://forum.xda-developers.com/member.php?u=5351691) for helping me and providing the device tree for Atom L.
-- [The device tree for the Atom L](https://cgit.typeblog.net/android/device/unihertz/Atom_L/) which was a great step-by-step guide to complete the Atom XL.
+- [The device tree for the Atom L](https://cgit.typeblog.net/android/device/unihertz/Atom_L/) which was a great step-by-step guide on how to setup my own device tree.
diff --git a/app/Intercom/Android.mk b/app/Intercom/Android.mk
deleted file mode 100644
index 484e55a..0000000
--- a/app/Intercom/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-INTERCOM_LIBS := libwebrtc_aecm.so libwebrtc_agc.so libwebrtc_ns.so libwebrtc_vad.so
-INTERCOM_SYMLINKS := $(addprefix $(PRODUCT_OUT)/system/app/Intercom/lib/arm64/,$(notdir $(INTERCOM_LIBS)))
-$(INTERCOM_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@echo "Intercom lib link: $@"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) ln -sf /system/lib64/$(notdir $@) $@
-
-ALL_DEFAULT_INSTALLED_MODULES += $(INTERCOM_SYMLINKS)
diff --git a/bluetooth/include/bdroid_buildcfg.h b/bluetooth/include/bdroid_buildcfg.h
deleted file mode 100644
index 2ccee84..0000000
--- a/bluetooth/include/bdroid_buildcfg.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- *  Copyright (c) 2013, The Linux Foundation. All rights reserved.
- *  Not a Contribution, Apache license notifications and license are retained
- *  for attribution purposes only.
- *
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _BDROID_BUILDCFG_H
-#define _BDROID_BUILDCFG_H
-#define BTM_DEF_LOCAL_NAME   "Atom XL"
-// Disables read remote device feature
-#define BTM_WBS_INCLUDED TRUE
-#define BTIF_HF_WBS_PREFERRED TRUE
-
-#define BLE_VND_INCLUDED   TRUE
-// skips conn update at conn completion
-#define BT_CLEAN_TURN_ON_DISABLED 1
-#endif
diff --git a/device.mk b/device.mk
deleted file mode 100644
index 1d66c79..0000000
--- a/device.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) 2020 The LineageOS Project
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-# Get non-open-source specific aspects
-$(call inherit-product-if-exists, vendor/Unihertz/Atom_XL/Atom_XL-vendor.mk)
-
-$(call inherit-product, device/Unihertz/Atom_LXL/deviceCommon.mk)
diff --git a/docs/images/atom_xl.png b/docs/images/atom_xl.png
deleted file mode 100644
index 50a88ee..0000000
Binary files a/docs/images/atom_xl.png and /dev/null differ
diff --git a/extract-files.sh b/extract-files.sh
index 3b8806e..3213d34 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -17,7 +17,7 @@
 
 set -e
 
-export DEVICE=Atom_XL
+export DEVICE=Atom_XL_EEA
 export VENDOR=Unihertz
 
 MY_DIR="${BASH_SOURCE%/*}"
@@ -25,4 +25,4 @@ if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
 
 LINEAGE_ROOT="${MY_DIR}"/../../..
 
-"${LINEAGE_ROOT}/device/${VENDOR}/Atom_LXL/extract-files-common.sh" "$@"
+"${LINEAGE_ROOT}/device/${VENDOR}/Atom_XL/extract-files.sh" "$@"
diff --git a/lineage_Atom_XL.mk b/lineage_Atom_XL_EEA.mk
similarity index 80%
rename from lineage_Atom_XL.mk
rename to lineage_Atom_XL_EEA.mk
index bbedbc1..8ddd180 100644
--- a/lineage_Atom_XL.mk
+++ b/lineage_Atom_XL_EEA.mk
@@ -9,14 +9,15 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
 # Inherit from Atom_XL device
-$(call inherit-product, device/Unihertz/Atom_XL/device.mk)
+$(call inherit-product-if-exists, vendor/Unihertz/Atom_XL_EEA/Atom_XL_EEA-vendor.mk)
+$(call inherit-product, device/Unihertz/Atom_LXL/deviceCommon.mk)
 
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 # Device identifier. This must come after all inclusions.
-PRODUCT_NAME := lineage_Atom_XL
-PRODUCT_DEVICE := Atom_XL
+PRODUCT_NAME := lineage_Atom_XL_EEA
+PRODUCT_DEVICE := Atom_XL_EEA
 PRODUCT_BRAND := Unihertz
 PRODUCT_MODEL := Atom_XL
 PRODUCT_MANUFACTURER := Unihertz
@@ -31,7 +32,7 @@ TARGET_SCREEN_WIDTH := 640
 # Build info
 BUILD_FINGERPRINT := "Unihertz/Atom_XL_EEA/Atom_XL:10/QP1A.190711.020/root.20200923.160250:user/release-keys"
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    TARGET_DEVICE=Atom_XL \
+    TARGET_DEVICE=Atom_XL_EEA \
     PRODUCT_NAME=Atom_XL_EEA \
     PRIVATE_BUILD_DESC="Atom_XL_EEA-user 10 QP1A.190711.020 root.20200923.160250 release-keys"
     
diff --git a/product.prop b/product.prop
deleted file mode 100644
index 0dc3865..0000000
--- a/product.prop
+++ /dev/null
@@ -1,10 +0,0 @@
-ro.build.wifi.ssid=Atom_XL
-ro.build.bluetooth.name=Atom_XL
-ro.build.wifip2pDN=Atom_XL
-    
-ro.agold.intercom.ptt=yes
-ro.agold.extmodule.dmr09=yes
-ro.agold.extmodule.32k=yes
-ro.agold.extmodule.hal=yes
-
-ro.agui.smartkey_ptt=com.agold.intercom
diff --git a/proprietary-files.txt b/proprietary-files.txt
deleted file mode 100644
index f305d13..0000000
--- a/proprietary-files.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# Atom XL DMR
--app/Intercom/Intercom.apk
-lib/libwebrtc_ns.so
-lib/libwebrtc_agc.so
-lib/libwebrtc_vad.so
-lib/libwebrtc_aecm.so
-lib64/libwebrtc_ns.so
-lib64/libwebrtc_agc.so
-lib64/libwebrtc_vad.so
-lib64/libwebrtc_aecm.so
-lib64/libusb
-bin/auto_update
-bin/extmodule
-bin/extcmdtest
-bin/dfu-util
-etc/init/extmodule.rc
-data/dmr/DMR006.U4A.V076.bin
-data/mcu/20190904034623.bin
-data/mcu/20200423161457.bin
-data/mcu/20200508134341.bin
-data/mcu/20200812110328.bin
-data/mcu/20201016161541.bin
diff --git a/sepolicy/private/service_contexts b/sepolicy/private/service_contexts
deleted file mode 100644
index 6836e99..0000000
--- a/sepolicy/private/service_contexts
+++ /dev/null
@@ -1 +0,0 @@
-extmodule                                                                                           u:object_r:extmodule_service:s0
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 7123300..6c7724a 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -17,7 +17,7 @@
 
 set -e
 
-export DEVICE=Atom_XL
+export DEVICE=Atom_XL_EEA
 export VENDOR=Unihertz
 export INITIAL_COPYRIGHT_YEAR=2020
 
@@ -26,4 +26,4 @@ if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
 
 LINEAGE_ROOT="${MY_DIR}"/../../..
 
-"${LINEAGE_ROOT}/device/${VENDOR}/Atom_LXL/setup-makefiles-common.sh"
+"${LINEAGE_ROOT}/device/${VENDOR}/Atom_XL/setup-makefiles.sh"