Network module refactor