Refactored package letter to package generator