reorganizing the project a little bit