Make it more organized and proper
Merge branch 'jellybean' of https://github.com/XYAOSP/packages_apps_Settings into jellybean