Merge client and server module