Package structure minor changes.