Merge TCP and UDP sockets into Socket.h