Added CMakeLists + few changes