Update CMakeLists for new layout
Merge pull request #23 from crumblingstatue/master

Update CMakeLists for new layout