Refactoring xml packages maker