Refactor net module to one include directory

Please merge with N.N.