small restructurization of the project.