r25: refactored printer package contents for clarity