Restructured directory for proper usage with AOSP