package reorganizations

This is a cleaner hierarchy for our storage packages that can adapt to future changes.
Pretty sure we all wanted this, but our last PR was pretty efficient for discussion so I decided to open one up for this before a merge so we could all get our 2 cents in.