tosulliv: refactoring of package names