tosulliv: package name refactoring