Adapt android client to new library organisation