Refoctoring packages