diff --git a/ttp/AndroidProducts.mk b/ttp/AndroidProducts.mk
new file mode 100644
index 0000000..9b7188b
--- /dev/null
+++ b/ttp/AndroidProducts.mk
@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/ttp.mk
\ No newline at end of file
diff --git a/ttp/board-base.mk b/ttp/board-base.mk
new file mode 100644
index 0000000..7c03d5e
--- /dev/null
+++ b/ttp/board-base.mk
@@ -0,0 +1 @@
+TARGET_SYSTEM_PROP := device/wephone/ttp/system.prop $(TARGET_SYSTEM_PROP)
diff --git a/unihertz/files/aw9523-key.idc b/ttp/files/aw9523-key.idc
similarity index 100%
rename from unihertz/files/aw9523-key.idc
rename to ttp/files/aw9523-key.idc
diff --git a/unihertz/files/aw9523-key.kcm b/ttp/files/aw9523-key.kcm
similarity index 100%
rename from unihertz/files/aw9523-key.kcm
rename to ttp/files/aw9523-key.kcm
diff --git a/unihertz/files/aw9523-key.kl b/ttp/files/aw9523-key.kl
similarity index 100%
rename from unihertz/files/aw9523-key.kl
rename to ttp/files/aw9523-key.kl
diff --git a/unihertz/files/mtk-kpd.idc b/ttp/files/mtk-kpd.idc
similarity index 100%
rename from unihertz/files/mtk-kpd.idc
rename to ttp/files/mtk-kpd.idc
diff --git a/unihertz/files/mtk-kpd.kl b/ttp/files/mtk-kpd.kl
similarity index 100%
rename from unihertz/files/mtk-kpd.kl
rename to ttp/files/mtk-kpd.kl
diff --git a/unihertz/files/mtk-pad.idc b/ttp/files/mtk-pad.idc
similarity index 100%
rename from unihertz/files/mtk-pad.idc
rename to ttp/files/mtk-pad.idc
diff --git a/unihertz/files/mtk-tpd.kl b/ttp/files/mtk-tpd.kl
similarity index 100%
rename from unihertz/files/mtk-tpd.kl
rename to ttp/files/mtk-tpd.kl
diff --git a/unihertz/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png b/ttp/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png
similarity index 100%
rename from unihertz/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png
rename to ttp/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png
diff --git a/unihertz/overlay/frameworks/base/core/res/res/values/config.xml b/ttp/overlay/frameworks/base/core/res/res/values/config.xml
similarity index 100%
rename from unihertz/overlay/frameworks/base/core/res/res/values/config.xml
rename to ttp/overlay/frameworks/base/core/res/res/values/config.xml
diff --git a/unihertz/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml b/ttp/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml
similarity index 100%
rename from unihertz/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml
rename to ttp/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml
diff --git a/unihertz/patches/remove_launcher3_qsb.patch b/ttp/patches/remove_launcher3_qsb.patch
similarity index 100%
rename from unihertz/patches/remove_launcher3_qsb.patch
rename to ttp/patches/remove_launcher3_qsb.patch
diff --git a/unihertz/system.prop b/ttp/system.prop
similarity index 100%
rename from unihertz/system.prop
rename to ttp/system.prop
diff --git a/unihertz/unihertz/BoardConfig.mk b/ttp/titan_pocket/BoardConfig.mk
similarity index 100%
rename from unihertz/unihertz/BoardConfig.mk
rename to ttp/titan_pocket/BoardConfig.mk
diff --git a/ttp/ttp.mk b/ttp/ttp.mk
new file mode 100644
index 0000000..2a0a17d
--- /dev/null
+++ b/ttp/ttp.mk
@@ -0,0 +1,42 @@
+TARGET_GAPPS_ARCH := arm64
+
+include build/make/target/product/aosp_arm64_ab.mk
+
+PRODUCT_NAME := ttp
+PRODUCT_DEVICE := titan_pocket
+PRODUCT_BRAND := wephone
+PRODUCT_MODEL := Unihertz Titan Pocket - wePhone
+
+# This is for a device
+PRODUCT_CHARACTERISTICS := device
+
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/ttp/overlay
+
+PRODUCT_COPY_FILES += \
+	device/wephone/ttp/files/aw9523-key.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/aw9523-key.idc \
+	device/wephone/ttp/files/aw9523-key.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/aw9523-key.kcm \
+	device/wephone/ttp/files/aw9523-key.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/aw9523-key.kl \
+	device/wephone/ttp/files/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \
+	device/wephone/ttp/files/mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-kpd.kl \
+	device/wephone/ttp/files/mtk-pad.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-pad.idc \
+	device/wephone/ttp/files/mtk-tpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-tpd.kl
+
+PRODUCT_PACKAGES += \
+	BromiteSystemWebView \
+	Conversations \
+	Davx5 \
+	DeskClock \
+	Etar \
+	ExactCalculator \
+	FDroid \
+	Gallery2 \
+	Linphone \
+	Nextcloud \
+	NextcloudNotes \
+	Wireguard
+
+PRODUCT_PACKAGES -= \
+	EasterEgg \
+	webview \
+	libwebviewchromium_loader \
+    libwebviewchromium_plat_support
diff --git a/unihertz/AndroidProducts.mk b/unihertz/AndroidProducts.mk
deleted file mode 100644
index b4715c3..0000000
--- a/unihertz/AndroidProducts.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/titan_pocket.mk
\ No newline at end of file
diff --git a/unihertz/board-base.mk b/unihertz/board-base.mk
deleted file mode 100644
index 7ac1e0a..0000000
--- a/unihertz/board-base.mk
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_SYSTEM_PROP := device/wephone/unihertz/system.prop $(TARGET_SYSTEM_PROP)
diff --git a/unihertz/files/f22pro-animation.zip b/unihertz/files/f22pro-animation.zip
deleted file mode 100644
index 13f3012..0000000
Binary files a/unihertz/files/f22pro-animation.zip and /dev/null differ
diff --git a/unihertz/files/privapp-permissions-net.mezimmah.wkt9.xml b/unihertz/files/privapp-permissions-net.mezimmah.wkt9.xml
deleted file mode 100644
index be7fa9e..0000000
--- a/unihertz/files/privapp-permissions-net.mezimmah.wkt9.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="net.mezimmah.wkt9">
-    	<permission name="android.permission.INTERNET"/>
-    	<permission name="android.permission.RECORD_AUDIO"/>
-    	<permission name="android.permission.POST_NOTIFICATIONS"/>
-	    <permission name="android.permission.CONTROL_DEVICE_LIGHTS"/>
-    </privapp-permissions>
-</permissions>
diff --git a/unihertz/titan_pocket.mk b/unihertz/titan_pocket.mk
deleted file mode 100644
index fd648b5..0000000
--- a/unihertz/titan_pocket.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-TARGET_GAPPS_ARCH := arm64
-
-include build/make/target/product/aosp_arm64_ab.mk
-
-PRODUCT_NAME := titan_pocket
-PRODUCT_DEVICE := unihertz
-PRODUCT_BRAND := wephone
-PRODUCT_MODEL := Unihertz Titan Pocket - wePhone
-
-# This is for a device
-PRODUCT_CHARACTERISTICS := device
-
-PRODUCT_PACKAGE_OVERLAYS += device/wephone/unihertz/overlay
-
-PRODUCT_COPY_FILES += \
-	device/wephone/unihertz/files/aw9523-key.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/aw9523-key.idc \
-	device/wephone/unihertz/files/aw9523-key.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/aw9523-key.kcm \
-	device/wephone/unihertz/files/aw9523-key.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/aw9523-key.kl \
-	device/wephone/unihertz/files/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \
-	device/wephone/unihertz/files/mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-kpd.kl \
-	device/wephone/unihertz/files/mtk-pad.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-pad.idc \
-	device/wephone/unihertz/files/mtk-tpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-tpd.kl
-
-PRODUCT_PACKAGES += \
-	BromiteSystemWebView \
-	Conversations \
-	Davx5 \
-	DeskClock \
-	Etar \
-	ExactCalculator \
-	FDroid \
-	Gallery2 \
-	Linphone \
-	Nextcloud \
-	NextcloudNotes \
-	Wireguard
-
-PRODUCT_PACKAGES -= \
-	EasterEgg \
-	webview \
-	libwebviewchromium_loader \
-    libwebviewchromium_plat_support