henshinTGG: refactoring of package structure