renames and rearranges packages so that they make more sense