separate and rename module network/message