diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 5799523..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Here we define a variable called "LOCAL_PATH" that just contain the path to the device tree (ex: /device/samsung/a3xeltexx)
-LOCAL_PATH := $(call my-dir)
-
-# Here we call other makefiles in the device-tree
-include $(call all-subdir-makefiles,$(LOCAL_PATH))
-
-# Here we clean variables
-include $(CLEAR_VARS)
-
diff --git a/Lineage.mk b/Lineage.mk
deleted file mode 100644
index 6823bdd..0000000
--- a/Lineage.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Note: the lineage.mk can also be called slim.mk, pa.mk, aoscp.mk, etc...
-# Depending on the ROM to build. LineageOS based roms will use lineage.mk
-
-# Inherit device configuration
-#$(call inherit-product, device/isamsung/a3xeltexx/device.mk)
-
-# Inherit from the common Open Source product configuration
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-
-# Inherit common CM phone.
-$(call inherit-product, vendor/cm/config/common_full_phone.mk)
-
-PRODUCT_NAME := cats22flip_jnsw
-PRODUCT_DEVICE := tdgsi_a64_ab
-PRODUCT_BRAND := wePhone
-PRODUCT_SYSTEM_BRAND := wePhone
-PRODUCT_MODEL := weOs | v14.1 | jnsw
-
diff --git a/cats22flip_jnsw.mk b/cats22flip_jnsw.mk
index 25cb790..687c3b7 100644
--- a/cats22flip_jnsw.mk
+++ b/cats22flip_jnsw.mk
@@ -1,4 +1,4 @@
-$(call inherit-product, device/phh/treble/treble_a64_bvN.mk)
+$(call inherit-product, device/phh/treble/lineage_a64_bvS.mk)
 
 PRODUCT_NAME := cats22flip_jnsw
 PRODUCT_DEVICE := tdgsi_a64_ab
diff --git a/device.mk b/device.mk
deleted file mode 100644
index af5cbb8..0000000
--- a/device.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/phh/cats22flip/sepolicy
-
-PRODUCT_SYSTEM_PROPERTIES += \
-    ro.system.ota.json_url=https://ota.mezimmah.net/ota.json \
-    persist.sys.phh.mainkeys=0 \
-    ro.sf.lcd_density=200 \
-    ro.telephony.default_network=9 \
-    persist.dbg.vt_avail_ovr=1 \
-    persist.dbg.volte_avail_ovr=1 \
-    persist.dbg.wfc_avail_ovr=1 \
-    persist.dbg.allow_ims_off=1
-
-PRODUCT_PACKAGE_OVERLAYS += device/phh/cats22flip/overlay
-
-PRODUCT_COPY_FILES += \
-    device/phh/cats22flip/files/qpnp_pon.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/qpnp_pon.kl \
-    device/phh/cats22flip/files/soc_matrix_keypad.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/soc_matrix_keypad.kl \
-    device/phh/cats22flip/files/soc_matrix_keypad.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/soc_matrix_keypad.kcm 
-
-PRODUCT_PACKAGES += \
-    BromiteSystemWebView \
-    DeskClock \
-    Etar \
-    ExactCalculator \
-    Gallery2 \
-    Davx5 \
-    OpenDocumentReader \
-    Wireguard \
-    WKT9 \
-    Linphone \
-    Nextcloud \
-    NextcloudNotes \
-    Conversations \
-    CatFlipScreen \
-    ImsMtkR
-
-PRODUCT_COPY_FILES += \
-    device/phh/cats22flip/wephone.rc:system/etc/init/wephone.rc \
-	device/phh/cats22flip/wephone.sh:system/bin/wephone.sh \
-    device/phh/cats22flip/catscreen.sh:system/bin/catscreen.sh
diff --git a/system.prop b/system.prop
deleted file mode 100644
index 60409fa..0000000
--- a/system.prop
+++ /dev/null
@@ -1,18 +0,0 @@
-# url for the updates
-ro.system.ota.json_url=https://ota.mezimmah.net/ota.json 
-
-# ?
-persist.sys.phh.mainkeys=0 
-
-# Screen density
-ro.sf.lcd_density=200 
-
-# Connect to LTE
-ro.telephony.default_network=9 
-
-# Used for the IME
-persist.dbg.vt_avail_ovr=1 
-persist.dbg.volte_avail_ovr=1
-persist.dbg.wfc_avail_ovr=1 
-persist.dbg.allow_ims_off=1
-