igz package refactor