Reorganizing the project a bit.