diff --git a/BoardConfig.mk b/BoardConfig.mk
index a2f2a52..4f189bd 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -39,8 +39,6 @@ WIFI_DRIVER_MODULE_PATH     := "/system/lib/modules/wlan.ko"
 WIFI_DRIVER_MODULE_ARG      := ""
 WIFI_DRIVER_MODULE_NAME     := "wlan"
 WIFI_FIRMWARE_LOADER        := "wlan_loader"
-#WIFI_DRIVER_FW_STA_PATH     := "/etc/firmware/tiinit_5.3.53.bts"
-#WIFI_DRIVER_FW_AP_PATH      := "/etc/wifi/Fw1251r1c.bin"
 
 TARGET_PROVIDES_INIT_RC := false
 
diff --git a/click-vendor-blobs.mk b/click-vendor-blobs.mk
index e1f6af7..005dd30 100644
--- a/click-vendor-blobs.mk
+++ b/click-vendor-blobs.mk
@@ -50,9 +50,9 @@ PRODUCT_COPY_FILES += \
     device/htc/click/proprietary/libmm-adspsvc.so:system/lib/libmm-adspsvc.so \
     device/htc/click/proprietary/libhtc_acoustic.so:system/lib/libhtc_acoustic.so \
     device/htc/click/proprietary/libhtc_ril.so:system/lib/libhtc_ril.so \
-    device/htc/click/firmware/Fw1251r1c.bin:system/etc/wifi/Fw1251r1c.bin \
-    device/htc/click/firmware/brf6300.bin:system/etc/firmware/brf6300.bin \
-    device/htc/click/firmware/brf6350.bin:system/etc/firmware/brf6350.bin
+    device/htc/click/proprietary/firmware/Fw1251r1c.bin:system/etc/wifi/Fw1251r1c.bin \
+    device/htc/click/proprietary/firmware/brf6300.bin:system/etc/firmware/brf6300.bin \
+    device/htc/click/proprietary/firmware/brf6350.bin:system/etc/firmware/brf6350.bin
 
 ifdef WITH_WINDOWS_MEDIA
 PRODUCT_COPY_FILES += \
diff --git a/click.mk b/click.mk
index e3e972c..c714119 100644
--- a/click.mk
+++ b/click.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-DEVICE_PACKAGE_OVERLAYS += device/htc/click/overlay
+DEVICE_PACKAGE_OVERLAYS += device/htc/buzz/overlay
 
 # Live wallpaper packages
 PRODUCT_PACKAGES += \
diff --git a/copy-files.sh b/copy-files.sh
index 740288a..3f96464 100755
--- a/copy-files.sh
+++ b/copy-files.sh
@@ -1,3 +1,8 @@
+    mkdir proprietary
+    mkdir proprietary/app
+    mkdir proprietary/keylayout
+    mkdir proprietary/firmware
+    mkdir proprietary/keychars
     adb pull /system/app/HTCCalibrate.apk proprietary/app/
     adb pull /system/etc/AudioPara4.csv proprietary/
     adb pull /system/etc/AudioFilter.csv proprietary/
@@ -31,3 +36,6 @@
     adb pull /system/usr/keylayout/bahamas-keypad.kl proprietary/keylayout/
     adb pull /system/usr/keylayout/h2w_headset.kl proprietary/keylayout/
     adb pull /system/usr/keylayout/qwerty.kl proprietary/keylayout/
+    adb pull /system/etc/wifi/Fw1251r1c.bin proprietary/firmware/
+    adb pull /system/etc/firmware/brf6300.bin proprietary/firmware/
+    adb pull /system/etc/firmware/brf6350.bin proprietary/firmware/
diff --git a/firmware/Fw1251r1c.bin b/firmware/Fw1251r1c.bin
deleted file mode 100644
index f5767b5..0000000
Binary files a/firmware/Fw1251r1c.bin and /dev/null differ
diff --git a/firmware/brf6300.bin b/firmware/brf6300.bin
deleted file mode 100644
index 4cfa2c7..0000000
Binary files a/firmware/brf6300.bin and /dev/null differ
diff --git a/firmware/brf6350.bin b/firmware/brf6350.bin
deleted file mode 100644
index ac227e7..0000000
Binary files a/firmware/brf6350.bin and /dev/null differ
diff --git a/firmware/tiinit_5.3.53.bts b/firmware/tiinit_5.3.53.bts
deleted file mode 100644
index 2f8470f..0000000
Binary files a/firmware/tiinit_5.3.53.bts and /dev/null differ