Some package refactor