Reorganize some packages.