Modify nmparser to use the generic network package
Update mapper to use network package
Update python script to use new network types
Modify python script to use new JSON field names