client: started merging structures and included stubs, re2 is currently broken tbc