Adding core and server modules