Remove redundancy in CMakeLists
First steps toward improving geometry struct and model loading