Restructure for AOSP 4.3