refactoring (draft #39)
Refactoring xml packages maker