Refactor. Rearrange packages so they make sense.