Reorganizing the rest of the project