Update CMakeLists files tree and organization