Some package refactoring in ZetesWings