Reorganize into one package.