Some restructuring of the project