Successfully split the server from the rpc methods. Build separate modules for X11 and Windows methods.