Moving message-socket to match dev branch