tosulliv: refactoring of package structures to facilitate addition of
automated test case logic