Moved package content writing to storage class.