Restructuring Functions

- cleaned up some calls to make things easier to follow
- both dv and std vswitch test scripts use the same IP now