Some rearrangements in the project.