RPC Server and header file restructuring