Putting every source file on its own line makes it easier to resolve merge errors
Move net functions which don't depend on PCAP libraries into net.c