Add client and server to common package