split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11
Merge remote-tracking branch 'upstream/master'