Packageize
Repurpose test-raw.