Refactor a bunch of things to packages that make more sense