Re-organize the client library project