Refactoring *net classes to avoid redundant code; add Interface objects to scenario; scenario execution needs more cleanup