directories reorganized, CMakeLists modified