Reorganize the project slightly.