The changes to CMakeLists.txt were all made by the scaffolding script. I am happy to change this but it seems like we'll need to change the scaffolding script too.