Some package refactoring done.