Adding client and server modules