Some ZetesWings packages refactoring