Modularize & clean up aliases
Rename extract() -> unpack()