added more organization to android code, sigh in relief