Simplifying everything, adding CMakeLists.txt