Fixed mem file name and CMake files