Added CMakeLists.txt
Cleanups