Simplify our packages.

We're gonna do a big overhaul.