General restructuration of the project