Split client into Android and web parts, for real this time :-).