Reorganize things into packages that make more sense