Further cmake cleanup
Rename project