Re-factor package