More changes to the structure of the project.