Restructure for class-based scripts
still need to resolve issue of access to smoketest session & framework session