Refactor with a Package class

I find the and_then lines annoying; but ? isn't an option here since returning is not desired.