reorganized files and updated CMakeLists.txt; small readme change