refactoring of network modules