Segregate proto and server stuff into separate modules