Merge client and server projects