A few changes to the file setup of the project