Reorganizing the project so that it can have multiple packages.