Re-organization to be more practival
@Android-L-Team