android client commit #3

arranged packages