Reorganising the project