comm: Added server & client objects to further segregate code for each functionality