After #93 we will have bigtable/admin and bigtable/client, and as @mbrukman points out both directories have a client. We should also consider bigtable/{data,admin}_client, thought that gets too verbose.
When changing the code remember to change the #include guards too.