Organizing and cleaning the project model