Separate out sample from client/api a bit more