Re-structured Android configuration for more clarity and faster setup