Reorder the project to simplify the package.