cleaning up routers
merge from max

Merge branch 'FINAL' of https://github.com/zatricion/NetSim into FINAL
cleaning router code