Cleaning up a bit and adding CMakeLists.