Basic reorganization of the project.