diff --git a/BoardConfig.mk b/BoardConfig.mk
index e62908d..329b5fd 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -108,3 +108,4 @@ TW_INCLUDE_JB_CRYPTO := true
 TW_NO_USB_STORAGE := true
 BOARD_RECOVERY_BLDRMSG_OFFSET := 2048
 RECOVERY_VARIANT := twrp
+TARGET_RECOVERY_DEVICE_MODULES := chargeled
diff --git a/device.mk b/device.mk
index 6fa0ffa..07ac440 100644
--- a/device.mk
+++ b/device.mk
@@ -16,20 +16,6 @@ endif
 
 COMMON_GLOBAL_CFLAGS += -DNO_SECURE_DISCARD
 
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/recovery/etc/fstab.qcom:recovery/root/fstab.qcom \
-    $(LOCAL_PATH)/recovery/etc/init.recovery.qcom.rc:root/init.recovery.qcom.rc \
-    $(LOCAL_PATH)/recovery/etc/lpm.rc:recovery/root/lpm.rc \
-    $(LOCAL_PATH)/recovery/sbin/choice_fn:recovery/root/sbin/choice_fn \
-    $(LOCAL_PATH)/recovery/sbin/detect_key:recovery/root/sbin/detect_key \
-    $(LOCAL_PATH)/recovery/sbin/offmode_charging:recovery/root/sbin/offmode_charging \
-    $(LOCAL_PATH)/recovery/sbin/power_test:recovery/root/sbin/power_test
-
-PRODUCT_PACKAGES += \
-    chargeled \
-    offmode_charging_res_images \
-    offmode_charging_warn_res_images
-
 $(call inherit-product, build/target/product/full.mk)
 
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
diff --git a/recovery/Android.mk b/recovery/Android.mk
index 8b8ea17..869e8ad 100644
--- a/recovery/Android.mk
+++ b/recovery/Android.mk
@@ -1,49 +1,2 @@
 LOCAL_PATH := $(call my-dir)
-
-define _add-offmode_charging-image
-include $$(CLEAR_VARS)
-LOCAL_MODULE := offmode_charging_$(notdir $(1))
-LOCAL_MODULE_STEM := $(notdir $(1))
-_img_modules += $$(LOCAL_MODULE)
-LOCAL_SRC_FILES := $1
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $$(TARGET_RECOVERY_ROOT_OUT)/res/offmode_charging_images
-include $$(BUILD_PREBUILT)
-endef
-
-_img_modules :=
-$(foreach _img, $(call find-subdir-subdir-files, "res/offmode_charging_images", "*.png"), \
-  $(eval $(call _add-offmode_charging-image,$(_img))))
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := offmode_charging_res_images
-LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := $(_img_modules)
-include $(BUILD_PHONY_PACKAGE)
-
-define _add-offmode_charging_warn-image
-include $$(CLEAR_VARS)
-LOCAL_MODULE := offmode_charging_warn_$(notdir $(1))
-LOCAL_MODULE_STEM := $(notdir $(1))
-_img_modules += $$(LOCAL_MODULE)
-LOCAL_SRC_FILES := $1
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $$(TARGET_RECOVERY_ROOT_OUT)/res/offmode_charging_warn_images
-include $$(BUILD_PREBUILT)
-endef
-
-_img_modules :=
-$(foreach _img, $(call find-subdir-subdir-files, "res/offmode_charging_warn_images", "*.png"), \
-  $(eval $(call _add-offmode_charging_warn-image,$(_img))))
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := offmode_charging_warn_res_images
-LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := $(_img_modules)
-include $(BUILD_PHONY_PACKAGE)
-
-_add-offmode_charging-image :=
-_add-offmode_charging_warn-image :=
-_img_modules :=
+include $(call first-makefiles-under, $(LOCAL_PATH))
diff --git a/chargeled/Android.mk b/recovery/chargeled/Android.mk
similarity index 100%
rename from chargeled/Android.mk
rename to recovery/chargeled/Android.mk
diff --git a/chargeled/chargeled.c b/recovery/chargeled/chargeled.c
similarity index 100%
rename from chargeled/chargeled.c
rename to recovery/chargeled/chargeled.c
diff --git a/recovery/etc/fstab.qcom b/recovery/root/fstab.qcom
similarity index 100%
rename from recovery/etc/fstab.qcom
rename to recovery/root/fstab.qcom
diff --git a/recovery/etc/init.recovery.qcom.rc b/recovery/root/init.recovery.qcom.rc
similarity index 100%
rename from recovery/etc/init.recovery.qcom.rc
rename to recovery/root/init.recovery.qcom.rc
diff --git a/recovery/etc/lpm.rc b/recovery/root/lpm.rc
similarity index 100%
rename from recovery/etc/lpm.rc
rename to recovery/root/lpm.rc
diff --git a/recovery/res/offmode_charging_images/charging_00.png b/recovery/root/res/offmode_charging_images/charging_00.png
similarity index 100%
rename from recovery/res/offmode_charging_images/charging_00.png
rename to recovery/root/res/offmode_charging_images/charging_00.png
diff --git a/recovery/res/offmode_charging_images/charging_01.png b/recovery/root/res/offmode_charging_images/charging_01.png
similarity index 100%
rename from recovery/res/offmode_charging_images/charging_01.png
rename to recovery/root/res/offmode_charging_images/charging_01.png
diff --git a/recovery/res/offmode_charging_images/charging_02.png b/recovery/root/res/offmode_charging_images/charging_02.png
similarity index 100%
rename from recovery/res/offmode_charging_images/charging_02.png
rename to recovery/root/res/offmode_charging_images/charging_02.png
diff --git a/recovery/res/offmode_charging_images/charging_03.png b/recovery/root/res/offmode_charging_images/charging_03.png
similarity index 100%
rename from recovery/res/offmode_charging_images/charging_03.png
rename to recovery/root/res/offmode_charging_images/charging_03.png
diff --git a/recovery/res/offmode_charging_images/charging_04.png b/recovery/root/res/offmode_charging_images/charging_04.png
similarity index 100%
rename from recovery/res/offmode_charging_images/charging_04.png
rename to recovery/root/res/offmode_charging_images/charging_04.png
diff --git a/recovery/res/offmode_charging_images/charging_05.png b/recovery/root/res/offmode_charging_images/charging_05.png
similarity index 100%
rename from recovery/res/offmode_charging_images/charging_05.png
rename to recovery/root/res/offmode_charging_images/charging_05.png
diff --git a/recovery/res/offmode_charging_images/charging_06.png b/recovery/root/res/offmode_charging_images/charging_06.png
similarity index 100%
rename from recovery/res/offmode_charging_images/charging_06.png
rename to recovery/root/res/offmode_charging_images/charging_06.png
diff --git a/recovery/res/offmode_charging_images/charging_07.png b/recovery/root/res/offmode_charging_images/charging_07.png
similarity index 100%
rename from recovery/res/offmode_charging_images/charging_07.png
rename to recovery/root/res/offmode_charging_images/charging_07.png
diff --git a/recovery/res/offmode_charging_images/charging_08.png b/recovery/root/res/offmode_charging_images/charging_08.png
similarity index 100%
rename from recovery/res/offmode_charging_images/charging_08.png
rename to recovery/root/res/offmode_charging_images/charging_08.png
diff --git a/recovery/res/offmode_charging_images/charging_09.png b/recovery/root/res/offmode_charging_images/charging_09.png
similarity index 100%
rename from recovery/res/offmode_charging_images/charging_09.png
rename to recovery/root/res/offmode_charging_images/charging_09.png
diff --git a/recovery/res/offmode_charging_images/error.png b/recovery/root/res/offmode_charging_images/error.png
similarity index 100%
rename from recovery/res/offmode_charging_images/error.png
rename to recovery/root/res/offmode_charging_images/error.png
diff --git a/recovery/res/offmode_charging_images/r_0.png b/recovery/root/res/offmode_charging_images/r_0.png
similarity index 100%
rename from recovery/res/offmode_charging_images/r_0.png
rename to recovery/root/res/offmode_charging_images/r_0.png
diff --git a/recovery/res/offmode_charging_images/r_1.png b/recovery/root/res/offmode_charging_images/r_1.png
similarity index 100%
rename from recovery/res/offmode_charging_images/r_1.png
rename to recovery/root/res/offmode_charging_images/r_1.png
diff --git a/recovery/res/offmode_charging_images/r_2.png b/recovery/root/res/offmode_charging_images/r_2.png
similarity index 100%
rename from recovery/res/offmode_charging_images/r_2.png
rename to recovery/root/res/offmode_charging_images/r_2.png
diff --git a/recovery/res/offmode_charging_images/r_3.png b/recovery/root/res/offmode_charging_images/r_3.png
similarity index 100%
rename from recovery/res/offmode_charging_images/r_3.png
rename to recovery/root/res/offmode_charging_images/r_3.png
diff --git a/recovery/res/offmode_charging_images/r_4.png b/recovery/root/res/offmode_charging_images/r_4.png
similarity index 100%
rename from recovery/res/offmode_charging_images/r_4.png
rename to recovery/root/res/offmode_charging_images/r_4.png
diff --git a/recovery/res/offmode_charging_images/r_5.png b/recovery/root/res/offmode_charging_images/r_5.png
similarity index 100%
rename from recovery/res/offmode_charging_images/r_5.png
rename to recovery/root/res/offmode_charging_images/r_5.png
diff --git a/recovery/res/offmode_charging_images/r_6.png b/recovery/root/res/offmode_charging_images/r_6.png
similarity index 100%
rename from recovery/res/offmode_charging_images/r_6.png
rename to recovery/root/res/offmode_charging_images/r_6.png
diff --git a/recovery/res/offmode_charging_images/r_7.png b/recovery/root/res/offmode_charging_images/r_7.png
similarity index 100%
rename from recovery/res/offmode_charging_images/r_7.png
rename to recovery/root/res/offmode_charging_images/r_7.png
diff --git a/recovery/res/offmode_charging_images/r_8.png b/recovery/root/res/offmode_charging_images/r_8.png
similarity index 100%
rename from recovery/res/offmode_charging_images/r_8.png
rename to recovery/root/res/offmode_charging_images/r_8.png
diff --git a/recovery/res/offmode_charging_images/r_9.png b/recovery/root/res/offmode_charging_images/r_9.png
similarity index 100%
rename from recovery/res/offmode_charging_images/r_9.png
rename to recovery/root/res/offmode_charging_images/r_9.png
diff --git a/recovery/res/offmode_charging_images/r_percent.png b/recovery/root/res/offmode_charging_images/r_percent.png
similarity index 100%
rename from recovery/res/offmode_charging_images/r_percent.png
rename to recovery/root/res/offmode_charging_images/r_percent.png
diff --git a/recovery/res/offmode_charging_images/w_0.png b/recovery/root/res/offmode_charging_images/w_0.png
similarity index 100%
rename from recovery/res/offmode_charging_images/w_0.png
rename to recovery/root/res/offmode_charging_images/w_0.png
diff --git a/recovery/res/offmode_charging_images/w_1.png b/recovery/root/res/offmode_charging_images/w_1.png
similarity index 100%
rename from recovery/res/offmode_charging_images/w_1.png
rename to recovery/root/res/offmode_charging_images/w_1.png
diff --git a/recovery/res/offmode_charging_images/w_2.png b/recovery/root/res/offmode_charging_images/w_2.png
similarity index 100%
rename from recovery/res/offmode_charging_images/w_2.png
rename to recovery/root/res/offmode_charging_images/w_2.png
diff --git a/recovery/res/offmode_charging_images/w_3.png b/recovery/root/res/offmode_charging_images/w_3.png
similarity index 100%
rename from recovery/res/offmode_charging_images/w_3.png
rename to recovery/root/res/offmode_charging_images/w_3.png
diff --git a/recovery/res/offmode_charging_images/w_4.png b/recovery/root/res/offmode_charging_images/w_4.png
similarity index 100%
rename from recovery/res/offmode_charging_images/w_4.png
rename to recovery/root/res/offmode_charging_images/w_4.png
diff --git a/recovery/res/offmode_charging_images/w_5.png b/recovery/root/res/offmode_charging_images/w_5.png
similarity index 100%
rename from recovery/res/offmode_charging_images/w_5.png
rename to recovery/root/res/offmode_charging_images/w_5.png
diff --git a/recovery/res/offmode_charging_images/w_6.png b/recovery/root/res/offmode_charging_images/w_6.png
similarity index 100%
rename from recovery/res/offmode_charging_images/w_6.png
rename to recovery/root/res/offmode_charging_images/w_6.png
diff --git a/recovery/res/offmode_charging_images/w_7.png b/recovery/root/res/offmode_charging_images/w_7.png
similarity index 100%
rename from recovery/res/offmode_charging_images/w_7.png
rename to recovery/root/res/offmode_charging_images/w_7.png
diff --git a/recovery/res/offmode_charging_images/w_8.png b/recovery/root/res/offmode_charging_images/w_8.png
similarity index 100%
rename from recovery/res/offmode_charging_images/w_8.png
rename to recovery/root/res/offmode_charging_images/w_8.png
diff --git a/recovery/res/offmode_charging_images/w_9.png b/recovery/root/res/offmode_charging_images/w_9.png
similarity index 100%
rename from recovery/res/offmode_charging_images/w_9.png
rename to recovery/root/res/offmode_charging_images/w_9.png
diff --git a/recovery/res/offmode_charging_images/w_percent.png b/recovery/root/res/offmode_charging_images/w_percent.png
similarity index 100%
rename from recovery/res/offmode_charging_images/w_percent.png
rename to recovery/root/res/offmode_charging_images/w_percent.png
diff --git a/recovery/res/offmode_charging_images/y_0.png b/recovery/root/res/offmode_charging_images/y_0.png
similarity index 100%
rename from recovery/res/offmode_charging_images/y_0.png
rename to recovery/root/res/offmode_charging_images/y_0.png
diff --git a/recovery/res/offmode_charging_images/y_1.png b/recovery/root/res/offmode_charging_images/y_1.png
similarity index 100%
rename from recovery/res/offmode_charging_images/y_1.png
rename to recovery/root/res/offmode_charging_images/y_1.png
diff --git a/recovery/res/offmode_charging_images/y_2.png b/recovery/root/res/offmode_charging_images/y_2.png
similarity index 100%
rename from recovery/res/offmode_charging_images/y_2.png
rename to recovery/root/res/offmode_charging_images/y_2.png
diff --git a/recovery/res/offmode_charging_images/y_3.png b/recovery/root/res/offmode_charging_images/y_3.png
similarity index 100%
rename from recovery/res/offmode_charging_images/y_3.png
rename to recovery/root/res/offmode_charging_images/y_3.png
diff --git a/recovery/res/offmode_charging_images/y_4.png b/recovery/root/res/offmode_charging_images/y_4.png
similarity index 100%
rename from recovery/res/offmode_charging_images/y_4.png
rename to recovery/root/res/offmode_charging_images/y_4.png
diff --git a/recovery/res/offmode_charging_images/y_5.png b/recovery/root/res/offmode_charging_images/y_5.png
similarity index 100%
rename from recovery/res/offmode_charging_images/y_5.png
rename to recovery/root/res/offmode_charging_images/y_5.png
diff --git a/recovery/res/offmode_charging_images/y_6.png b/recovery/root/res/offmode_charging_images/y_6.png
similarity index 100%
rename from recovery/res/offmode_charging_images/y_6.png
rename to recovery/root/res/offmode_charging_images/y_6.png
diff --git a/recovery/res/offmode_charging_images/y_7.png b/recovery/root/res/offmode_charging_images/y_7.png
similarity index 100%
rename from recovery/res/offmode_charging_images/y_7.png
rename to recovery/root/res/offmode_charging_images/y_7.png
diff --git a/recovery/res/offmode_charging_images/y_8.png b/recovery/root/res/offmode_charging_images/y_8.png
similarity index 100%
rename from recovery/res/offmode_charging_images/y_8.png
rename to recovery/root/res/offmode_charging_images/y_8.png
diff --git a/recovery/res/offmode_charging_images/y_9.png b/recovery/root/res/offmode_charging_images/y_9.png
similarity index 100%
rename from recovery/res/offmode_charging_images/y_9.png
rename to recovery/root/res/offmode_charging_images/y_9.png
diff --git a/recovery/res/offmode_charging_images/y_percent.png b/recovery/root/res/offmode_charging_images/y_percent.png
similarity index 100%
rename from recovery/res/offmode_charging_images/y_percent.png
rename to recovery/root/res/offmode_charging_images/y_percent.png
diff --git a/recovery/res/offmode_charging_warn_images/batt_incompatible_charger.png b/recovery/root/res/offmode_charging_warn_images/batt_incompatible_charger.png
similarity index 100%
rename from recovery/res/offmode_charging_warn_images/batt_incompatible_charger.png
rename to recovery/root/res/offmode_charging_warn_images/batt_incompatible_charger.png
diff --git a/recovery/res/offmode_charging_warn_images/batt_low_current_charger.png b/recovery/root/res/offmode_charging_warn_images/batt_low_current_charger.png
similarity index 100%
rename from recovery/res/offmode_charging_warn_images/batt_low_current_charger.png
rename to recovery/root/res/offmode_charging_warn_images/batt_low_current_charger.png
diff --git a/recovery/sbin/choice_fn b/recovery/root/sbin/choice_fn
similarity index 100%
rename from recovery/sbin/choice_fn
rename to recovery/root/sbin/choice_fn
diff --git a/recovery/sbin/detect_key b/recovery/root/sbin/detect_key
similarity index 100%
rename from recovery/sbin/detect_key
rename to recovery/root/sbin/detect_key
diff --git a/recovery/sbin/offmode_charging b/recovery/root/sbin/offmode_charging
similarity index 100%
rename from recovery/sbin/offmode_charging
rename to recovery/root/sbin/offmode_charging
diff --git a/recovery/sbin/power_test b/recovery/root/sbin/power_test
similarity index 100%
rename from recovery/sbin/power_test
rename to recovery/root/sbin/power_test