Major source refactoring
Bugxif: sniffer did not process pcap