Bring the project up to date and rearrange the files