WeBankBlockchain · cyjseagull · Sep 4, 2024 · Sep 4, 2024
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -64,28 +64,31 @@ include(TargetSettings)
 include(Dependencies)
 
 ########### set the sources ########### 
-set(JNI_SOURCE_PATH wedpr-component-sdk/bindings/java/src/main/c)
-set(SDK_SOURCE_LIST ppc-homo ppc-crypto-core wedpr-component-sdk ${JNI_SOURCE_PATH})
+set(JNI_SOURCE_PATH wedpr-crypto/sdk/bindings/java/src/main/c)
+set(SDK_SOURCE_LIST wedpr-crypto/ppc-homo wedpr-crypto/ppc-crypto-core wedpr-crypto/sdk ${JNI_SOURCE_PATH})
 # Note: the udf depends on mysql, not enabled in the full node mode
-set(UDF_SOURCE_LIST ${SDK_SOURCE_LIST} ppc-udf)
+set(UDF_SOURCE_LIST ${SDK_SOURCE_LIST} wedpr-crypto/ppc-udf)
 set(CEM_SOURCE "")
 if(BUILD_CEM)
-    set(CEM_SOURCE "ppc-cem")
+    set(CEM_SOURCE "wedpr-computing/ppc-cem")
 endif()
 #set(ALL_SOURCE_LIST 
 #        ${SDK_SOURCE_LIST} ppc-crypto 
 #        libhelper libinitializer ppc-io ppc-protocol 
 #        ppc-gateway ppc-front  ppc-tars-protocol 
-#        ppc-tools ppc-storage ppc-psi ppc-rpc 
+#        wedpr-helper/ppc-tools ppc-storage ppc-psi ppc-rpc 
 #        ppc-http ppc-mpc ppc-pir
 #        ${CEM_SOURCE} ppc-main)
 
 set(ALL_SOURCE_LIST 
-        ${SDK_SOURCE_LIST} ppc-crypto 
-        libhelper ppc-io wedpr-protocol
-        ppc-gateway ppc-front 
-        ppc-tools ppc-storage ppc-psi ppc-rpc 
-        ppc-http ppc-mpc ppc-pir ${CEM_SOURCE})
+        ${SDK_SOURCE_LIST} 
+        wedpr-crypto/ppc-crypto 
+        wedpr-protocol
+        wedpr-helper/libhelper wedpr-helper/ppc-tools
+        wedpr-storage/ppc-io wedpr-storage/ppc-storage
+        wedpr-transport/ppc-gateway wedpr-transport/ppc-front 
+        wedpr-transport/ppc-http wedpr-transport/ppc-rpc
+        wedpr-computing/ppc-psi wedpr-computing/ppc-mpc wedpr-computing/ppc-pir ${CEM_SOURCE})
 
 if(BUILD_WEDPR_TOOLKIT)
     # fetch the python dependencies

diff --git a/cpp/cmake/IncludeDirectories.cmake b/cpp/cmake/IncludeDirectories.cmake
@@ -2,9 +2,14 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_BINARY_DIR}/generated/)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wedpr-protocol)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ppc-front)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ppc-gateway)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wedpr-component-sdk)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wedpr-transport)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wedpr-computing)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wedpr-crypto)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wedpr-storage)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wedpr-helper)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wedpr-crypto/sdk)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wedpr-transport/ppc-front)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wedpr-transport/ppc-gateway)
 include_directories(${PROTO_OUTPUT_PATH})
 
 set(VCPKG_INCLUDE_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")

diff --git a/cpp/cmake/TargetSettings.cmake b/cpp/cmake/TargetSettings.cmake
@@ -95,7 +95,7 @@ if (ENABLE_CPU_FEATURES)
     set(CPU_FEATURES_LIB CpuFeatures::cpu_features)
 endif ()
 
-#====== wedpr-component-sdk ===========
+#====== wedpr-crypto-sdk ===========
 set(PPC_CRYPTO_C_SDK_STATIC_TARGET ppc-crypto-c-sdk-static)
 set(PPC_CRYPTO_C_SDK_TARGET ppc-crypto-c-sdk)
 
@@ -107,7 +107,7 @@ if(ARCH_NATIVE)
     set(PPC_CRYPTO_C_SDK_STATIC_TARGET "ppc-crypto-c-sdk-aarch64")
     set(PPC_CRYPTO_C_SDK_TARGET "ppc-crypto-c-sdk-static-aarch64")
 endif()
-#====== wedpr-component-sdk ===========
+#====== wedpr-crypto-sdk ===========
 
 
 #====== ppc-crypto-sdk-jni ===========

diff --git a/cpp/ppc-pir/tests/data/AysPreDataset.csv b/cpp/ppc-pir/tests/data/AysPreDataset.csv
diff --git a/cpp/ppc-cem/CMakeLists.txt → cpp/wedpr-computing/ppc-cem/CMakeLists.txt b/cpp/ppc-cem/CMakeLists.txt → cpp/wedpr-computing/ppc-cem/CMakeLists.txt
diff --git a/cpp/ppc-cem/src/CEMService.cpp → ...edpr-computing/ppc-cem/src/CEMService.cpp b/cpp/ppc-cem/src/CEMService.cpp → ...edpr-computing/ppc-cem/src/CEMService.cpp
diff --git a/cpp/ppc-cem/src/CEMService.h → cpp/wedpr-computing/ppc-cem/src/CEMService.h b/cpp/ppc-cem/src/CEMService.h → cpp/wedpr-computing/ppc-cem/src/CEMService.h
diff --git a/cpp/ppc-cem/src/CMakeLists.txt → ...edpr-computing/ppc-cem/src/CMakeLists.txt b/cpp/ppc-cem/src/CMakeLists.txt → ...edpr-computing/ppc-cem/src/CMakeLists.txt
diff --git a/cpp/ppc-cem/src/Common.h → cpp/wedpr-computing/ppc-cem/src/Common.h b/cpp/ppc-cem/src/Common.h → cpp/wedpr-computing/ppc-cem/src/Common.h
diff --git a/cpp/ppc-cem/src/WedprUtilities.h → ...pr-computing/ppc-cem/src/WedprUtilities.h b/cpp/ppc-cem/src/WedprUtilities.h → ...pr-computing/ppc-cem/src/WedprUtilities.h
diff --git a/cpp/ppc-cem/src/wedpr_ffi_c_equality.h → ...puting/ppc-cem/src/wedpr_ffi_c_equality.h b/cpp/ppc-cem/src/wedpr_ffi_c_equality.h → ...puting/ppc-cem/src/wedpr_ffi_c_equality.h
diff --git a/cpp/ppc-cem/tests/CMakeLists.txt → ...pr-computing/ppc-cem/tests/CMakeLists.txt b/cpp/ppc-cem/tests/CMakeLists.txt → ...pr-computing/ppc-cem/tests/CMakeLists.txt
diff --git a/cpp/ppc-cem/tests/TestCEMService.cpp → ...omputing/ppc-cem/tests/TestCEMService.cpp b/cpp/ppc-cem/tests/TestCEMService.cpp → ...omputing/ppc-cem/tests/TestCEMService.cpp
diff --git a/cpp/ppc-cem/tests/data/config.ini → ...r-computing/ppc-cem/tests/data/config.ini b/cpp/ppc-cem/tests/data/config.ini → ...r-computing/ppc-cem/tests/data/config.ini
diff --git a/cpp/ppc-cem/tests/data/d1 → cpp/wedpr-computing/ppc-cem/tests/data/d1 b/cpp/ppc-cem/tests/data/d1 → cpp/wedpr-computing/ppc-cem/tests/data/d1
diff --git a/cpp/ppc-cem/tests/data/d2 → cpp/wedpr-computing/ppc-cem/tests/data/d2 b/cpp/ppc-cem/tests/data/d2 → cpp/wedpr-computing/ppc-cem/tests/data/d2
diff --git a/cpp/ppc-cem/tests/data/d3 → cpp/wedpr-computing/ppc-cem/tests/data/d3 b/cpp/ppc-cem/tests/data/d3 → cpp/wedpr-computing/ppc-cem/tests/data/d3
diff --git a/cpp/ppc-cem/tests/main.cpp → cpp/wedpr-computing/ppc-cem/tests/main.cpp b/cpp/ppc-cem/tests/main.cpp → cpp/wedpr-computing/ppc-cem/tests/main.cpp
diff --git a/cpp/ppc-mpc/CMakeLists.txt → cpp/wedpr-computing/ppc-mpc/CMakeLists.txt b/cpp/ppc-mpc/CMakeLists.txt → cpp/wedpr-computing/ppc-mpc/CMakeLists.txt
diff --git a/cpp/ppc-mpc/src/CMakeLists.txt → ...edpr-computing/ppc-mpc/src/CMakeLists.txt b/cpp/ppc-mpc/src/CMakeLists.txt → ...edpr-computing/ppc-mpc/src/CMakeLists.txt
diff --git a/cpp/ppc-mpc/src/Common.h → cpp/wedpr-computing/ppc-mpc/src/Common.h b/cpp/ppc-mpc/src/Common.h → cpp/wedpr-computing/ppc-mpc/src/Common.h
diff --git a/cpp/ppc-mpc/src/MPCService.cpp → ...edpr-computing/ppc-mpc/src/MPCService.cpp b/cpp/ppc-mpc/src/MPCService.cpp → ...edpr-computing/ppc-mpc/src/MPCService.cpp
diff --git a/cpp/ppc-mpc/src/MPCService.h → cpp/wedpr-computing/ppc-mpc/src/MPCService.h b/cpp/ppc-mpc/src/MPCService.h → cpp/wedpr-computing/ppc-mpc/src/MPCService.h
diff --git a/cpp/ppc-mpc/tests/CMakeLists.txt → ...pr-computing/ppc-mpc/tests/CMakeLists.txt b/cpp/ppc-mpc/tests/CMakeLists.txt → ...pr-computing/ppc-mpc/tests/CMakeLists.txt
diff --git a/cpp/ppc-mpc/tests/TestMPCService.cpp → ...omputing/ppc-mpc/tests/TestMPCService.cpp b/cpp/ppc-mpc/tests/TestMPCService.cpp → ...omputing/ppc-mpc/tests/TestMPCService.cpp
diff --git a/cpp/ppc-mpc/tests/data/config.ini → ...r-computing/ppc-mpc/tests/data/config.ini b/cpp/ppc-mpc/tests/data/config.ini → ...r-computing/ppc-mpc/tests/data/config.ini
diff --git a/cpp/ppc-crypto-core/tests/main.cpp → cpp/wedpr-computing/ppc-mpc/tests/main.cpp b/cpp/ppc-crypto-core/tests/main.cpp → cpp/wedpr-computing/ppc-mpc/tests/main.cpp
diff --git a/cpp/ppc-pir/CMakeLists.txt → cpp/wedpr-computing/ppc-pir/CMakeLists.txt b/cpp/ppc-pir/CMakeLists.txt → cpp/wedpr-computing/ppc-pir/CMakeLists.txt
diff --git a/cpp/ppc-pir/src/BaseOT.cpp → cpp/wedpr-computing/ppc-pir/src/BaseOT.cpp b/cpp/ppc-pir/src/BaseOT.cpp → cpp/wedpr-computing/ppc-pir/src/BaseOT.cpp
diff --git a/cpp/ppc-pir/src/BaseOT.h → cpp/wedpr-computing/ppc-pir/src/BaseOT.h b/cpp/ppc-pir/src/BaseOT.h → cpp/wedpr-computing/ppc-pir/src/BaseOT.h
diff --git a/cpp/ppc-pir/src/CMakeLists.txt → ...edpr-computing/ppc-pir/src/CMakeLists.txt b/cpp/ppc-pir/src/CMakeLists.txt → ...edpr-computing/ppc-pir/src/CMakeLists.txt
diff --git a/cpp/ppc-pir/src/Common.h → cpp/wedpr-computing/ppc-pir/src/Common.h b/cpp/ppc-pir/src/Common.h → cpp/wedpr-computing/ppc-pir/src/Common.h
diff --git a/cpp/ppc-pir/src/OtPIRConfig.h → ...wedpr-computing/ppc-pir/src/OtPIRConfig.h b/cpp/ppc-pir/src/OtPIRConfig.h → ...wedpr-computing/ppc-pir/src/OtPIRConfig.h
diff --git a/cpp/ppc-pir/src/OtPIRFactory.h → ...edpr-computing/ppc-pir/src/OtPIRFactory.h b/cpp/ppc-pir/src/OtPIRFactory.h → ...edpr-computing/ppc-pir/src/OtPIRFactory.h
diff --git a/cpp/ppc-pir/src/OtPIRImpl.cpp → ...wedpr-computing/ppc-pir/src/OtPIRImpl.cpp b/cpp/ppc-pir/src/OtPIRImpl.cpp → ...wedpr-computing/ppc-pir/src/OtPIRImpl.cpp
diff --git a/cpp/ppc-pir/src/OtPIRImpl.h → cpp/wedpr-computing/ppc-pir/src/OtPIRImpl.h b/cpp/ppc-pir/src/OtPIRImpl.h → cpp/wedpr-computing/ppc-pir/src/OtPIRImpl.h
diff --git a/cpp/ppc-pir/src/protocol/OtPIR.tars → ...computing/ppc-pir/src/protocol/OtPIR.tars b/cpp/ppc-pir/src/protocol/OtPIR.tars → ...computing/ppc-pir/src/protocol/OtPIR.tars
diff --git a/cpp/ppc-pir/tests/CMakeLists.txt → ...pr-computing/ppc-pir/tests/CMakeLists.txt b/cpp/ppc-pir/tests/CMakeLists.txt → ...pr-computing/ppc-pir/tests/CMakeLists.txt
diff --git a/cpp/ppc-pir/tests/FakeOtPIRFactory.h → ...omputing/ppc-pir/tests/FakeOtPIRFactory.h b/cpp/ppc-pir/tests/FakeOtPIRFactory.h → ...omputing/ppc-pir/tests/FakeOtPIRFactory.h
diff --git a/cpp/ppc-pir/tests/TestBaseOT.cpp → ...pr-computing/ppc-pir/tests/TestBaseOT.cpp b/cpp/ppc-pir/tests/TestBaseOT.cpp → ...pr-computing/ppc-pir/tests/TestBaseOT.cpp
diff --git a/cpp/ppc-crypto/tests/main.cpp → cpp/wedpr-computing/ppc-pir/tests/main.cpp b/cpp/ppc-crypto/tests/main.cpp → cpp/wedpr-computing/ppc-pir/tests/main.cpp
diff --git a/cpp/ppc-pir/tests/test.json → cpp/wedpr-computing/ppc-pir/tests/test.json b/cpp/ppc-pir/tests/test.json → cpp/wedpr-computing/ppc-pir/tests/test.json
diff --git a/cpp/ppc-psi/CMakeLists.txt → cpp/wedpr-computing/ppc-psi/CMakeLists.txt b/cpp/ppc-psi/CMakeLists.txt → cpp/wedpr-computing/ppc-psi/CMakeLists.txt
diff --git a/cpp/ppc-psi/demo/CMakeLists.txt → ...dpr-computing/ppc-psi/demo/CMakeLists.txt b/cpp/ppc-psi/demo/CMakeLists.txt → ...dpr-computing/ppc-psi/demo/CMakeLists.txt
diff --git a/cpp/ppc-psi/demo/hash_collision_bench.cpp → ...ing/ppc-psi/demo/hash_collision_bench.cpp b/cpp/ppc-psi/demo/hash_collision_bench.cpp → ...ing/ppc-psi/demo/hash_collision_bench.cpp
diff --git a/cpp/ppc-psi/src/Common.h → cpp/wedpr-computing/ppc-psi/src/Common.h b/cpp/ppc-psi/src/Common.h → cpp/wedpr-computing/ppc-psi/src/Common.h
diff --git a/cpp/ppc-psi/src/PSIConfig.h → cpp/wedpr-computing/ppc-psi/src/PSIConfig.h b/cpp/ppc-psi/src/PSIConfig.h → cpp/wedpr-computing/ppc-psi/src/PSIConfig.h
diff --git a/...pc-psi/src/bs-ecdh-psi/BsEcdhPSIFactory.h → ...pc-psi/src/bs-ecdh-psi/BsEcdhPSIFactory.h b/...pc-psi/src/bs-ecdh-psi/BsEcdhPSIFactory.h → ...pc-psi/src/bs-ecdh-psi/BsEcdhPSIFactory.h
diff --git a/...ppc-psi/src/bs-ecdh-psi/BsEcdhPSIImpl.cpp → ...ppc-psi/src/bs-ecdh-psi/BsEcdhPSIImpl.cpp b/...ppc-psi/src/bs-ecdh-psi/BsEcdhPSIImpl.cpp → ...ppc-psi/src/bs-ecdh-psi/BsEcdhPSIImpl.cpp
diff --git a/cpp/ppc-psi/src/bs-ecdh-psi/BsEcdhPSIImpl.h → ...g/ppc-psi/src/bs-ecdh-psi/BsEcdhPSIImpl.h b/cpp/ppc-psi/src/bs-ecdh-psi/BsEcdhPSIImpl.h → ...g/ppc-psi/src/bs-ecdh-psi/BsEcdhPSIImpl.h
diff --git a/...-psi/src/bs-ecdh-psi/BsEcdhPSIInterface.h → ...-psi/src/bs-ecdh-psi/BsEcdhPSIInterface.h b/...-psi/src/bs-ecdh-psi/BsEcdhPSIInterface.h → ...-psi/src/bs-ecdh-psi/BsEcdhPSIInterface.h
diff --git a/cpp/ppc-psi/src/bs-ecdh-psi/CMakeLists.txt → ...ng/ppc-psi/src/bs-ecdh-psi/CMakeLists.txt b/cpp/ppc-psi/src/bs-ecdh-psi/CMakeLists.txt → ...ng/ppc-psi/src/bs-ecdh-psi/CMakeLists.txt
diff --git a/cpp/ppc-psi/src/bs-ecdh-psi/Common.h → ...omputing/ppc-psi/src/bs-ecdh-psi/Common.h b/cpp/ppc-psi/src/bs-ecdh-psi/Common.h → ...omputing/ppc-psi/src/bs-ecdh-psi/Common.h
diff --git a/...-psi/src/bs-ecdh-psi/core/BsEcdhCache.cpp → ...-psi/src/bs-ecdh-psi/core/BsEcdhCache.cpp b/...-psi/src/bs-ecdh-psi/core/BsEcdhCache.cpp → ...-psi/src/bs-ecdh-psi/core/BsEcdhCache.cpp
diff --git a/...pc-psi/src/bs-ecdh-psi/core/BsEcdhCache.h → ...pc-psi/src/bs-ecdh-psi/core/BsEcdhCache.h b/...pc-psi/src/bs-ecdh-psi/core/BsEcdhCache.h → ...pc-psi/src/bs-ecdh-psi/core/BsEcdhCache.h
diff --git a/...si/src/bs-ecdh-psi/core/BsEcdhIoHandler.h → ...si/src/bs-ecdh-psi/core/BsEcdhIoHandler.h b/...si/src/bs-ecdh-psi/core/BsEcdhIoHandler.h → ...si/src/bs-ecdh-psi/core/BsEcdhIoHandler.h
diff --git a/...si/src/bs-ecdh-psi/core/BsEcdhTaskState.h → ...si/src/bs-ecdh-psi/core/BsEcdhTaskState.h b/...si/src/bs-ecdh-psi/core/BsEcdhTaskState.h → ...si/src/bs-ecdh-psi/core/BsEcdhTaskState.h
diff --git a/.../bs-ecdh-psi/ffi/wedpr_ffi_edwards25519.h → .../bs-ecdh-psi/ffi/wedpr_ffi_edwards25519.h b/.../bs-ecdh-psi/ffi/wedpr_ffi_edwards25519.h → .../bs-ecdh-psi/ffi/wedpr_ffi_edwards25519.h
diff --git a/...psi/src/bs-ecdh-psi/ffi/wedpr_utilities.h → ...psi/src/bs-ecdh-psi/ffi/wedpr_utilities.h b/...psi/src/bs-ecdh-psi/ffi/wedpr_utilities.h → ...psi/src/bs-ecdh-psi/ffi/wedpr_utilities.h
diff --git a/...i/src/bs-ecdh-psi/protocol/BsEcdhResult.h → ...i/src/bs-ecdh-psi/protocol/BsEcdhResult.h b/...i/src/bs-ecdh-psi/protocol/BsEcdhResult.h → ...i/src/bs-ecdh-psi/protocol/BsEcdhResult.h
diff --git a/...pc-psi/src/bs-ecdh-psi/protocol/Message.h → ...pc-psi/src/bs-ecdh-psi/protocol/Message.h b/...pc-psi/src/bs-ecdh-psi/protocol/Message.h → ...pc-psi/src/bs-ecdh-psi/protocol/Message.h
diff --git a/cpp/ppc-psi/src/cm2020-psi/CM2020PSIConfig.h → .../ppc-psi/src/cm2020-psi/CM2020PSIConfig.h b/cpp/ppc-psi/src/cm2020-psi/CM2020PSIConfig.h → .../ppc-psi/src/cm2020-psi/CM2020PSIConfig.h
diff --git a/...ppc-psi/src/cm2020-psi/CM2020PSIFactory.h → ...ppc-psi/src/cm2020-psi/CM2020PSIFactory.h b/...ppc-psi/src/cm2020-psi/CM2020PSIFactory.h → ...ppc-psi/src/cm2020-psi/CM2020PSIFactory.h
diff --git a/cpp/ppc-psi/src/cm2020-psi/CM2020PSIImpl.cpp → .../ppc-psi/src/cm2020-psi/CM2020PSIImpl.cpp b/cpp/ppc-psi/src/cm2020-psi/CM2020PSIImpl.cpp → .../ppc-psi/src/cm2020-psi/CM2020PSIImpl.cpp
diff --git a/cpp/ppc-psi/src/cm2020-psi/CM2020PSIImpl.h → ...ng/ppc-psi/src/cm2020-psi/CM2020PSIImpl.h b/cpp/ppc-psi/src/cm2020-psi/CM2020PSIImpl.h → ...ng/ppc-psi/src/cm2020-psi/CM2020PSIImpl.h
diff --git a/cpp/ppc-psi/src/cm2020-psi/CMakeLists.txt → ...ing/ppc-psi/src/cm2020-psi/CMakeLists.txt b/cpp/ppc-psi/src/cm2020-psi/CMakeLists.txt → ...ing/ppc-psi/src/cm2020-psi/CMakeLists.txt
diff --git a/cpp/ppc-psi/src/cm2020-psi/Common.h → ...computing/ppc-psi/src/cm2020-psi/Common.h b/cpp/ppc-psi/src/cm2020-psi/Common.h → ...computing/ppc-psi/src/cm2020-psi/Common.h
diff --git a/...src/cm2020-psi/core/CM2020PSIReceiver.cpp → ...src/cm2020-psi/core/CM2020PSIReceiver.cpp b/...src/cm2020-psi/core/CM2020PSIReceiver.cpp → ...src/cm2020-psi/core/CM2020PSIReceiver.cpp
diff --git a/...i/src/cm2020-psi/core/CM2020PSIReceiver.h → ...i/src/cm2020-psi/core/CM2020PSIReceiver.h b/...i/src/cm2020-psi/core/CM2020PSIReceiver.h → ...i/src/cm2020-psi/core/CM2020PSIReceiver.h
diff --git a/...i/src/cm2020-psi/core/CM2020PSISender.cpp → ...i/src/cm2020-psi/core/CM2020PSISender.cpp b/...i/src/cm2020-psi/core/CM2020PSISender.cpp → ...i/src/cm2020-psi/core/CM2020PSISender.cpp
diff --git a/...psi/src/cm2020-psi/core/CM2020PSISender.h → ...psi/src/cm2020-psi/core/CM2020PSISender.h b/...psi/src/cm2020-psi/core/CM2020PSISender.h → ...psi/src/cm2020-psi/core/CM2020PSISender.h
diff --git a/cpp/ppc-psi/src/cm2020-psi/core/TaskParams.h → .../ppc-psi/src/cm2020-psi/core/TaskParams.h b/cpp/ppc-psi/src/cm2020-psi/core/TaskParams.h → .../ppc-psi/src/cm2020-psi/core/TaskParams.h
diff --git a/...si/src/cm2020-psi/protocol/CM2020PSI.tars → ...si/src/cm2020-psi/protocol/CM2020PSI.tars b/...si/src/cm2020-psi/protocol/CM2020PSI.tars → ...si/src/cm2020-psi/protocol/CM2020PSI.tars
diff --git a/...src/cm2020-psi/protocol/CM2020PSIResult.h → ...src/cm2020-psi/protocol/CM2020PSIResult.h b/...src/cm2020-psi/protocol/CM2020PSIResult.h → ...src/cm2020-psi/protocol/CM2020PSIResult.h
diff --git a/cpp/ppc-psi/src/ecdh-conn-psi/CMakeLists.txt → .../ppc-psi/src/ecdh-conn-psi/CMakeLists.txt b/cpp/ppc-psi/src/ecdh-conn-psi/CMakeLists.txt → .../ppc-psi/src/ecdh-conn-psi/CMakeLists.txt
diff --git a/cpp/ppc-psi/src/ecdh-conn-psi/Common.h → ...puting/ppc-psi/src/ecdh-conn-psi/Common.h b/cpp/ppc-psi/src/ecdh-conn-psi/Common.h → ...puting/ppc-psi/src/ecdh-conn-psi/Common.h
diff --git a/...psi/src/ecdh-conn-psi/EcdhConnPSIConfig.h → ...psi/src/ecdh-conn-psi/EcdhConnPSIConfig.h b/...psi/src/ecdh-conn-psi/EcdhConnPSIConfig.h → ...psi/src/ecdh-conn-psi/EcdhConnPSIConfig.h
diff --git a/...si/src/ecdh-conn-psi/EcdhConnPSIFactory.h → ...si/src/ecdh-conn-psi/EcdhConnPSIFactory.h b/...si/src/ecdh-conn-psi/EcdhConnPSIFactory.h → ...si/src/ecdh-conn-psi/EcdhConnPSIFactory.h
diff --git a/...psi/src/ecdh-conn-psi/EcdhConnPSIImpl.cpp → ...psi/src/ecdh-conn-psi/EcdhConnPSIImpl.cpp b/...psi/src/ecdh-conn-psi/EcdhConnPSIImpl.cpp → ...psi/src/ecdh-conn-psi/EcdhConnPSIImpl.cpp
diff --git a/...c-psi/src/ecdh-conn-psi/EcdhConnPSIImpl.h → ...c-psi/src/ecdh-conn-psi/EcdhConnPSIImpl.h b/...c-psi/src/ecdh-conn-psi/EcdhConnPSIImpl.h → ...c-psi/src/ecdh-conn-psi/EcdhConnPSIImpl.h
diff --git a/...ecdh-conn-psi/EcdhConnPSIMessageFactory.h → ...ecdh-conn-psi/EcdhConnPSIMessageFactory.h b/...ecdh-conn-psi/EcdhConnPSIMessageFactory.h → ...ecdh-conn-psi/EcdhConnPSIMessageFactory.h
diff --git a/...psi/src/ecdh-conn-psi/EcdhConnTaskState.h → ...psi/src/ecdh-conn-psi/EcdhConnTaskState.h b/...psi/src/ecdh-conn-psi/EcdhConnTaskState.h → ...psi/src/ecdh-conn-psi/EcdhConnTaskState.h
diff --git a/.../ecdh-conn-psi/core/EcdhConnPSIClient.cpp → .../ecdh-conn-psi/core/EcdhConnPSIClient.cpp b/.../ecdh-conn-psi/core/EcdhConnPSIClient.cpp → .../ecdh-conn-psi/core/EcdhConnPSIClient.cpp
diff --git a/...rc/ecdh-conn-psi/core/EcdhConnPSIClient.h → ...rc/ecdh-conn-psi/core/EcdhConnPSIClient.h b/...rc/ecdh-conn-psi/core/EcdhConnPSIClient.h → ...rc/ecdh-conn-psi/core/EcdhConnPSIClient.h
diff --git a/.../ecdh-conn-psi/core/EcdhConnPSIServer.cpp → .../ecdh-conn-psi/core/EcdhConnPSIServer.cpp b/.../ecdh-conn-psi/core/EcdhConnPSIServer.cpp → .../ecdh-conn-psi/core/EcdhConnPSIServer.cpp
diff --git a/...rc/ecdh-conn-psi/core/EcdhConnPSIServer.h → ...rc/ecdh-conn-psi/core/EcdhConnPSIServer.h b/...rc/ecdh-conn-psi/core/EcdhConnPSIServer.h → ...rc/ecdh-conn-psi/core/EcdhConnPSIServer.h
diff --git a/...c/ecdh-conn-psi/protocol/PSIConnMessage.h → ...c/ecdh-conn-psi/protocol/PSIConnMessage.h b/...c/ecdh-conn-psi/protocol/PSIConnMessage.h → ...c/ecdh-conn-psi/protocol/PSIConnMessage.h
diff --git a/...nn-psi/protocol/PSIConnMessageFactory.cpp → ...nn-psi/protocol/PSIConnMessageFactory.cpp b/...nn-psi/protocol/PSIConnMessageFactory.cpp → ...nn-psi/protocol/PSIConnMessageFactory.cpp
diff --git a/...conn-psi/protocol/PSIConnMessageFactory.h → ...conn-psi/protocol/PSIConnMessageFactory.h b/...conn-psi/protocol/PSIConnMessageFactory.h → ...conn-psi/protocol/PSIConnMessageFactory.h
diff --git a/...ppc-psi/src/ecdh-multi-psi/CMakeLists.txt → ...ppc-psi/src/ecdh-multi-psi/CMakeLists.txt b/...ppc-psi/src/ecdh-multi-psi/CMakeLists.txt → ...ppc-psi/src/ecdh-multi-psi/CMakeLists.txt
diff --git a/cpp/ppc-psi/src/ecdh-multi-psi/Common.h → ...uting/ppc-psi/src/ecdh-multi-psi/Common.h b/cpp/ppc-psi/src/ecdh-multi-psi/Common.h → ...uting/ppc-psi/src/ecdh-multi-psi/Common.h
diff --git a/...c-psi/src/ecdh-multi-psi/EcdhMultiCache.h → ...c-psi/src/ecdh-multi-psi/EcdhMultiCache.h b/...c-psi/src/ecdh-multi-psi/EcdhMultiCache.h → ...c-psi/src/ecdh-multi-psi/EcdhMultiCache.h
diff --git a/...i/src/ecdh-multi-psi/EcdhMultiPSIConfig.h → ...i/src/ecdh-multi-psi/EcdhMultiPSIConfig.h b/...i/src/ecdh-multi-psi/EcdhMultiPSIConfig.h → ...i/src/ecdh-multi-psi/EcdhMultiPSIConfig.h
diff --git a/.../src/ecdh-multi-psi/EcdhMultiPSIFactory.h → .../src/ecdh-multi-psi/EcdhMultiPSIFactory.h b/.../src/ecdh-multi-psi/EcdhMultiPSIFactory.h → .../src/ecdh-multi-psi/EcdhMultiPSIFactory.h
diff --git a/...i/src/ecdh-multi-psi/EcdhMultiPSIImpl.cpp → ...i/src/ecdh-multi-psi/EcdhMultiPSIImpl.cpp b/...i/src/ecdh-multi-psi/EcdhMultiPSIImpl.cpp → ...i/src/ecdh-multi-psi/EcdhMultiPSIImpl.cpp
diff --git a/...psi/src/ecdh-multi-psi/EcdhMultiPSIImpl.h → ...psi/src/ecdh-multi-psi/EcdhMultiPSIImpl.h b/...psi/src/ecdh-multi-psi/EcdhMultiPSIImpl.h → ...psi/src/ecdh-multi-psi/EcdhMultiPSIImpl.h
diff --git a/...dh-multi-psi/EcdhMultiPSIMessageFactory.h → ...dh-multi-psi/EcdhMultiPSIMessageFactory.h b/...dh-multi-psi/EcdhMultiPSIMessageFactory.h → ...dh-multi-psi/EcdhMultiPSIMessageFactory.h
diff --git a/...multi-psi/core/EcdhMultiPSICalculator.cpp → ...multi-psi/core/EcdhMultiPSICalculator.cpp b/...multi-psi/core/EcdhMultiPSICalculator.cpp → ...multi-psi/core/EcdhMultiPSICalculator.cpp
diff --git a/...h-multi-psi/core/EcdhMultiPSICalculator.h → ...h-multi-psi/core/EcdhMultiPSICalculator.h b/...h-multi-psi/core/EcdhMultiPSICalculator.h → ...h-multi-psi/core/EcdhMultiPSICalculator.h
diff --git a/...cdh-multi-psi/core/EcdhMultiPSIMaster.cpp → ...cdh-multi-psi/core/EcdhMultiPSIMaster.cpp b/...cdh-multi-psi/core/EcdhMultiPSIMaster.cpp → ...cdh-multi-psi/core/EcdhMultiPSIMaster.cpp
diff --git a/.../ecdh-multi-psi/core/EcdhMultiPSIMaster.h → .../ecdh-multi-psi/core/EcdhMultiPSIMaster.h b/.../ecdh-multi-psi/core/EcdhMultiPSIMaster.h → .../ecdh-multi-psi/core/EcdhMultiPSIMaster.h
diff --git a/...dh-multi-psi/core/EcdhMultiPSIPartner.cpp → ...dh-multi-psi/core/EcdhMultiPSIPartner.cpp b/...dh-multi-psi/core/EcdhMultiPSIPartner.cpp → ...dh-multi-psi/core/EcdhMultiPSIPartner.cpp
diff --git a/...ecdh-multi-psi/core/EcdhMultiPSIPartner.h → ...ecdh-multi-psi/core/EcdhMultiPSIPartner.h b/...ecdh-multi-psi/core/EcdhMultiPSIPartner.h → ...ecdh-multi-psi/core/EcdhMultiPSIPartner.h
diff --git a/cpp/ppc-psi/src/ecdh-psi/CMakeLists.txt → ...uting/ppc-psi/src/ecdh-psi/CMakeLists.txt b/cpp/ppc-psi/src/ecdh-psi/CMakeLists.txt → ...uting/ppc-psi/src/ecdh-psi/CMakeLists.txt
diff --git a/cpp/ppc-psi/src/ecdh-psi/Common.h → ...r-computing/ppc-psi/src/ecdh-psi/Common.h b/cpp/ppc-psi/src/ecdh-psi/Common.h → ...r-computing/ppc-psi/src/ecdh-psi/Common.h
diff --git a/cpp/ppc-psi/src/ecdh-psi/EcdhCache.cpp → ...puting/ppc-psi/src/ecdh-psi/EcdhCache.cpp b/cpp/ppc-psi/src/ecdh-psi/EcdhCache.cpp → ...puting/ppc-psi/src/ecdh-psi/EcdhCache.cpp
diff --git a/cpp/ppc-psi/src/ecdh-psi/EcdhCache.h → ...omputing/ppc-psi/src/ecdh-psi/EcdhCache.h b/cpp/ppc-psi/src/ecdh-psi/EcdhCache.h → ...omputing/ppc-psi/src/ecdh-psi/EcdhCache.h
diff --git a/cpp/ppc-psi/src/ecdh-psi/EcdhPSIConfig.h → ...ting/ppc-psi/src/ecdh-psi/EcdhPSIConfig.h b/cpp/ppc-psi/src/ecdh-psi/EcdhPSIConfig.h → ...ting/ppc-psi/src/ecdh-psi/EcdhPSIConfig.h
diff --git a/cpp/ppc-psi/src/ecdh-psi/EcdhPSIFactory.h → ...ing/ppc-psi/src/ecdh-psi/EcdhPSIFactory.h b/cpp/ppc-psi/src/ecdh-psi/EcdhPSIFactory.h → ...ing/ppc-psi/src/ecdh-psi/EcdhPSIFactory.h
diff --git a/cpp/ppc-psi/src/ecdh-psi/EcdhPSIImpl.cpp → ...ting/ppc-psi/src/ecdh-psi/EcdhPSIImpl.cpp b/cpp/ppc-psi/src/ecdh-psi/EcdhPSIImpl.cpp → ...ting/ppc-psi/src/ecdh-psi/EcdhPSIImpl.cpp
diff --git a/cpp/ppc-psi/src/ecdh-psi/EcdhPSIImpl.h → ...puting/ppc-psi/src/ecdh-psi/EcdhPSIImpl.h b/cpp/ppc-psi/src/ecdh-psi/EcdhPSIImpl.h → ...puting/ppc-psi/src/ecdh-psi/EcdhPSIImpl.h
diff --git a/...-psi/src/ecdh-psi/EcdhPSIMessageFactory.h → ...-psi/src/ecdh-psi/EcdhPSIMessageFactory.h b/...-psi/src/ecdh-psi/EcdhPSIMessageFactory.h → ...-psi/src/ecdh-psi/EcdhPSIMessageFactory.h
diff --git a/cpp/ppc-psi/src/ecdh-psi/EcdhTaskState.h → ...ting/ppc-psi/src/ecdh-psi/EcdhTaskState.h b/cpp/ppc-psi/src/ecdh-psi/EcdhTaskState.h → ...ting/ppc-psi/src/ecdh-psi/EcdhTaskState.h
diff --git a/cpp/ppc-psi/src/labeled-psi/CMakeLists.txt → ...ng/ppc-psi/src/labeled-psi/CMakeLists.txt b/cpp/ppc-psi/src/labeled-psi/CMakeLists.txt → ...ng/ppc-psi/src/labeled-psi/CMakeLists.txt
diff --git a/cpp/ppc-psi/src/labeled-psi/Common.h → ...omputing/ppc-psi/src/labeled-psi/Common.h b/cpp/ppc-psi/src/labeled-psi/Common.h → ...omputing/ppc-psi/src/labeled-psi/Common.h
diff --git a/...pc-psi/src/labeled-psi/LabeledPSIConfig.h → ...pc-psi/src/labeled-psi/LabeledPSIConfig.h b/...pc-psi/src/labeled-psi/LabeledPSIConfig.h → ...pc-psi/src/labeled-psi/LabeledPSIConfig.h
diff --git a/...c-psi/src/labeled-psi/LabeledPSIFactory.h → ...c-psi/src/labeled-psi/LabeledPSIFactory.h b/...c-psi/src/labeled-psi/LabeledPSIFactory.h → ...c-psi/src/labeled-psi/LabeledPSIFactory.h
diff --git a/...pc-psi/src/labeled-psi/LabeledPSIImpl.cpp → ...pc-psi/src/labeled-psi/LabeledPSIImpl.cpp b/...pc-psi/src/labeled-psi/LabeledPSIImpl.cpp → ...pc-psi/src/labeled-psi/LabeledPSIImpl.cpp
diff --git a/cpp/ppc-psi/src/labeled-psi/LabeledPSIImpl.h → .../ppc-psi/src/labeled-psi/LabeledPSIImpl.h b/cpp/ppc-psi/src/labeled-psi/LabeledPSIImpl.h → .../ppc-psi/src/labeled-psi/LabeledPSIImpl.h
diff --git a/...pc-psi/src/labeled-psi/core/BinBundle.cpp → ...pc-psi/src/labeled-psi/core/BinBundle.cpp b/...pc-psi/src/labeled-psi/core/BinBundle.cpp → ...pc-psi/src/labeled-psi/core/BinBundle.cpp
diff --git a/cpp/ppc-psi/src/labeled-psi/core/BinBundle.h → .../ppc-psi/src/labeled-psi/core/BinBundle.h b/cpp/ppc-psi/src/labeled-psi/core/BinBundle.h → .../ppc-psi/src/labeled-psi/core/BinBundle.h
diff --git a/...i/src/labeled-psi/core/LabeledPSIParams.h → ...i/src/labeled-psi/core/LabeledPSIParams.h b/...i/src/labeled-psi/core/LabeledPSIParams.h → ...i/src/labeled-psi/core/LabeledPSIParams.h
diff --git a/...c/labeled-psi/core/LabeledPSIReceiver.cpp → ...c/labeled-psi/core/LabeledPSIReceiver.cpp b/...c/labeled-psi/core/LabeledPSIReceiver.cpp → ...c/labeled-psi/core/LabeledPSIReceiver.cpp
diff --git a/...src/labeled-psi/core/LabeledPSIReceiver.h → ...src/labeled-psi/core/LabeledPSIReceiver.h b/...src/labeled-psi/core/LabeledPSIReceiver.h → ...src/labeled-psi/core/LabeledPSIReceiver.h
diff --git a/...src/labeled-psi/core/LabeledPSISender.cpp → ...src/labeled-psi/core/LabeledPSISender.cpp b/...src/labeled-psi/core/LabeledPSISender.cpp → ...src/labeled-psi/core/LabeledPSISender.cpp
diff --git a/...i/src/labeled-psi/core/LabeledPSISender.h → ...i/src/labeled-psi/core/LabeledPSISender.h b/...i/src/labeled-psi/core/LabeledPSISender.h → ...i/src/labeled-psi/core/LabeledPSISender.h
diff --git a/...psi/src/labeled-psi/core/QueryPackage.cpp → ...psi/src/labeled-psi/core/QueryPackage.cpp b/...psi/src/labeled-psi/core/QueryPackage.cpp → ...psi/src/labeled-psi/core/QueryPackage.cpp
diff --git a/...c-psi/src/labeled-psi/core/QueryPackage.h → ...c-psi/src/labeled-psi/core/QueryPackage.h b/...c-psi/src/labeled-psi/core/QueryPackage.h → ...c-psi/src/labeled-psi/core/QueryPackage.h
diff --git a/...si/src/labeled-psi/core/ResultPackage.cpp → ...si/src/labeled-psi/core/ResultPackage.cpp b/...si/src/labeled-psi/core/ResultPackage.cpp → ...si/src/labeled-psi/core/ResultPackage.cpp
diff --git a/...-psi/src/labeled-psi/core/ResultPackage.h → ...-psi/src/labeled-psi/core/ResultPackage.h b/...-psi/src/labeled-psi/core/ResultPackage.h → ...-psi/src/labeled-psi/core/ResultPackage.h
diff --git a/...ppc-psi/src/labeled-psi/core/SenderDB.cpp → ...ppc-psi/src/labeled-psi/core/SenderDB.cpp b/...ppc-psi/src/labeled-psi/core/SenderDB.cpp → ...ppc-psi/src/labeled-psi/core/SenderDB.cpp
diff --git a/cpp/ppc-psi/src/labeled-psi/core/SenderDB.h → ...g/ppc-psi/src/labeled-psi/core/SenderDB.h b/cpp/ppc-psi/src/labeled-psi/core/SenderDB.h → ...g/ppc-psi/src/labeled-psi/core/SenderDB.h
diff --git a/...pc-psi/src/labeled-psi/core/TaskCommand.h → ...pc-psi/src/labeled-psi/core/TaskCommand.h b/...pc-psi/src/labeled-psi/core/TaskCommand.h → ...pc-psi/src/labeled-psi/core/TaskCommand.h
diff --git a/.../src/labeled-psi/protocol/LabeledPSI.tars → .../src/labeled-psi/protocol/LabeledPSI.tars b/.../src/labeled-psi/protocol/LabeledPSI.tars → .../src/labeled-psi/protocol/LabeledPSI.tars
diff --git a/...c/labeled-psi/protocol/LabeledPSIResult.h → ...c/labeled-psi/protocol/LabeledPSIResult.h b/...c/labeled-psi/protocol/LabeledPSIResult.h → ...c/labeled-psi/protocol/LabeledPSIResult.h
diff --git a/...c-psi/src/labeled-psi/protocol/Protocol.h → ...c-psi/src/labeled-psi/protocol/Protocol.h b/...c-psi/src/labeled-psi/protocol/Protocol.h → ...c-psi/src/labeled-psi/protocol/Protocol.h
diff --git a/...src/labeled-psi/protocol/SenderCache.tars → ...src/labeled-psi/protocol/SenderCache.tars b/...src/labeled-psi/protocol/SenderCache.tars → ...src/labeled-psi/protocol/SenderCache.tars
diff --git a/cpp/ppc-psi/src/psi-framework/CMakeLists.txt → .../ppc-psi/src/psi-framework/CMakeLists.txt b/cpp/ppc-psi/src/psi-framework/CMakeLists.txt → .../ppc-psi/src/psi-framework/CMakeLists.txt
diff --git a/...pc-psi/src/psi-framework/PSIFramework.cpp → ...pc-psi/src/psi-framework/PSIFramework.cpp b/...pc-psi/src/psi-framework/PSIFramework.cpp → ...pc-psi/src/psi-framework/PSIFramework.cpp
diff --git a/cpp/ppc-psi/src/psi-framework/PSIFramework.h → .../ppc-psi/src/psi-framework/PSIFramework.h b/cpp/ppc-psi/src/psi-framework/PSIFramework.h → .../ppc-psi/src/psi-framework/PSIFramework.h
diff --git a/cpp/ppc-psi/src/psi-framework/TaskGuarder.h → ...g/ppc-psi/src/psi-framework/TaskGuarder.h b/cpp/ppc-psi/src/psi-framework/TaskGuarder.h → ...g/ppc-psi/src/psi-framework/TaskGuarder.h
diff --git a/cpp/ppc-psi/src/psi-framework/TaskState.h → ...ing/ppc-psi/src/psi-framework/TaskState.h b/cpp/ppc-psi/src/psi-framework/TaskState.h → ...ing/ppc-psi/src/psi-framework/TaskState.h
diff --git a/...-framework/interfaces/PSIMessageFactory.h → ...-framework/interfaces/PSIMessageFactory.h b/...-framework/interfaces/PSIMessageFactory.h → ...-framework/interfaces/PSIMessageFactory.h
diff --git a/...ramework/interfaces/PSIMessageInterface.h → ...ramework/interfaces/PSIMessageInterface.h b/...ramework/interfaces/PSIMessageInterface.h → ...ramework/interfaces/PSIMessageInterface.h
diff --git a/...c-psi/src/psi-framework/protocol/PSI.tars → ...c-psi/src/psi-framework/protocol/PSI.tars b/...c-psi/src/psi-framework/protocol/PSI.tars → ...c-psi/src/psi-framework/protocol/PSI.tars
diff --git a/...src/psi-framework/protocol/PSIMessage.cpp → ...src/psi-framework/protocol/PSIMessage.cpp b/...src/psi-framework/protocol/PSIMessage.cpp → ...src/psi-framework/protocol/PSIMessage.cpp
diff --git a/...i/src/psi-framework/protocol/PSIMessage.h → ...i/src/psi-framework/protocol/PSIMessage.h b/...i/src/psi-framework/protocol/PSIMessage.h → ...i/src/psi-framework/protocol/PSIMessage.h
diff --git a/cpp/ppc-psi/src/ra2018-psi/CMakeLists.txt → ...ing/ppc-psi/src/ra2018-psi/CMakeLists.txt b/cpp/ppc-psi/src/ra2018-psi/CMakeLists.txt → ...ing/ppc-psi/src/ra2018-psi/CMakeLists.txt
diff --git a/cpp/ppc-psi/src/ra2018-psi/Common.h → ...computing/ppc-psi/src/ra2018-psi/Common.h b/cpp/ppc-psi/src/ra2018-psi/Common.h → ...computing/ppc-psi/src/ra2018-psi/Common.h
diff --git a/cpp/ppc-psi/src/ra2018-psi/RA2018PSIConfig.h → .../ppc-psi/src/ra2018-psi/RA2018PSIConfig.h b/cpp/ppc-psi/src/ra2018-psi/RA2018PSIConfig.h → .../ppc-psi/src/ra2018-psi/RA2018PSIConfig.h
diff --git a/...ppc-psi/src/ra2018-psi/RA2018PSIFactory.h → ...ppc-psi/src/ra2018-psi/RA2018PSIFactory.h b/...ppc-psi/src/ra2018-psi/RA2018PSIFactory.h → ...ppc-psi/src/ra2018-psi/RA2018PSIFactory.h
diff --git a/cpp/ppc-psi/src/ra2018-psi/RA2018PSIImpl.cpp → .../ppc-psi/src/ra2018-psi/RA2018PSIImpl.cpp b/cpp/ppc-psi/src/ra2018-psi/RA2018PSIImpl.cpp → .../ppc-psi/src/ra2018-psi/RA2018PSIImpl.cpp
diff --git a/cpp/ppc-psi/src/ra2018-psi/RA2018PSIImpl.h → ...ng/ppc-psi/src/ra2018-psi/RA2018PSIImpl.h b/cpp/ppc-psi/src/ra2018-psi/RA2018PSIImpl.h → ...ng/ppc-psi/src/ra2018-psi/RA2018PSIImpl.h
diff --git a/...si/src/ra2018-psi/core/CuckooFilterInfo.h → ...si/src/ra2018-psi/core/CuckooFilterInfo.h b/...si/src/ra2018-psi/core/CuckooFilterInfo.h → ...si/src/ra2018-psi/core/CuckooFilterInfo.h
diff --git a/...i/src/ra2018-psi/core/CuckooFilterState.h → ...i/src/ra2018-psi/core/CuckooFilterState.h b/...i/src/ra2018-psi/core/CuckooFilterState.h → ...i/src/ra2018-psi/core/CuckooFilterState.h
diff --git a/...rc/ra2018-psi/core/CuckooFiltersCache.cpp → ...rc/ra2018-psi/core/CuckooFiltersCache.cpp b/...rc/ra2018-psi/core/CuckooFiltersCache.cpp → ...rc/ra2018-psi/core/CuckooFiltersCache.cpp
diff --git a/.../src/ra2018-psi/core/CuckooFiltersCache.h → .../src/ra2018-psi/core/CuckooFiltersCache.h b/.../src/ra2018-psi/core/CuckooFiltersCache.h → .../src/ra2018-psi/core/CuckooFiltersCache.h
diff --git a/...ra2018-psi/core/CuckoofilterAllocator.cpp → ...ra2018-psi/core/CuckoofilterAllocator.cpp b/...ra2018-psi/core/CuckoofilterAllocator.cpp → ...ra2018-psi/core/CuckoofilterAllocator.cpp
diff --git a/...c/ra2018-psi/core/CuckoofilterAllocator.h → ...c/ra2018-psi/core/CuckoofilterAllocator.h b/...c/ra2018-psi/core/CuckoofilterAllocator.h → ...c/ra2018-psi/core/CuckoofilterAllocator.h
diff --git a/...i/src/ra2018-psi/core/RA2018PSIClient.cpp → ...i/src/ra2018-psi/core/RA2018PSIClient.cpp b/...i/src/ra2018-psi/core/RA2018PSIClient.cpp → ...i/src/ra2018-psi/core/RA2018PSIClient.cpp
diff --git a/...psi/src/ra2018-psi/core/RA2018PSIClient.h → ...psi/src/ra2018-psi/core/RA2018PSIClient.h b/...psi/src/ra2018-psi/core/RA2018PSIClient.h → ...psi/src/ra2018-psi/core/RA2018PSIClient.h
diff --git a/.../ra2018-psi/core/RA2018PSIClientCache.cpp → .../ra2018-psi/core/RA2018PSIClientCache.cpp b/.../ra2018-psi/core/RA2018PSIClientCache.cpp → .../ra2018-psi/core/RA2018PSIClientCache.cpp
diff --git a/...rc/ra2018-psi/core/RA2018PSIClientCache.h → ...rc/ra2018-psi/core/RA2018PSIClientCache.h b/...rc/ra2018-psi/core/RA2018PSIClientCache.h → ...rc/ra2018-psi/core/RA2018PSIClientCache.h
diff --git a/...i/src/ra2018-psi/core/RA2018PSIServer.cpp → ...i/src/ra2018-psi/core/RA2018PSIServer.cpp b/...i/src/ra2018-psi/core/RA2018PSIServer.cpp → ...i/src/ra2018-psi/core/RA2018PSIServer.cpp
diff --git a/...psi/src/ra2018-psi/core/RA2018PSIServer.h → ...psi/src/ra2018-psi/core/RA2018PSIServer.h b/...psi/src/ra2018-psi/core/RA2018PSIServer.h → ...psi/src/ra2018-psi/core/RA2018PSIServer.h
diff --git a/...psi/src/ra2018-psi/core/Ra2018TaskParam.h → ...psi/src/ra2018-psi/core/Ra2018TaskParam.h b/...psi/src/ra2018-psi/core/Ra2018TaskParam.h → ...psi/src/ra2018-psi/core/Ra2018TaskParam.h
diff --git a/...i/src/ra2018-psi/protocol/RA2018Message.h → ...i/src/ra2018-psi/protocol/RA2018Message.h b/...i/src/ra2018-psi/protocol/RA2018Message.h → ...i/src/ra2018-psi/protocol/RA2018Message.h
diff --git a/...c/ra2018-psi/storage/RA2018PSIStorage.cpp → ...c/ra2018-psi/storage/RA2018PSIStorage.cpp b/...c/ra2018-psi/storage/RA2018PSIStorage.cpp → ...c/ra2018-psi/storage/RA2018PSIStorage.cpp
diff --git a/...src/ra2018-psi/storage/RA2018PSIStorage.h → ...src/ra2018-psi/storage/RA2018PSIStorage.h b/...src/ra2018-psi/storage/RA2018PSIStorage.h → ...src/ra2018-psi/storage/RA2018PSIStorage.h
diff --git a/cpp/ppc-psi/tests/CMakeLists.txt → ...pr-computing/ppc-psi/tests/CMakeLists.txt b/cpp/ppc-psi/tests/CMakeLists.txt → ...pr-computing/ppc-psi/tests/CMakeLists.txt
diff --git a/...psi/tests/bs-ecdh-psi/TestBsEcdhCache.cpp → ...psi/tests/bs-ecdh-psi/TestBsEcdhCache.cpp b/...psi/tests/bs-ecdh-psi/TestBsEcdhCache.cpp → ...psi/tests/bs-ecdh-psi/TestBsEcdhCache.cpp
diff --git a/...i/tests/cm2020-psi/FakeCM2020PSIFactory.h → ...i/tests/cm2020-psi/FakeCM2020PSIFactory.h b/...i/tests/cm2020-psi/FakeCM2020PSIFactory.h → ...i/tests/cm2020-psi/FakeCM2020PSIFactory.h
diff --git a/...c-psi/tests/cm2020-psi/TestCM2020Impl.cpp → ...c-psi/tests/cm2020-psi/TestCM2020Impl.cpp b/...c-psi/tests/cm2020-psi/TestCM2020Impl.cpp → ...c-psi/tests/cm2020-psi/TestCM2020Impl.cpp
diff --git a/cpp/ppc-psi/tests/labeled-psi/DataTools.h → ...ing/ppc-psi/tests/labeled-psi/DataTools.h b/cpp/ppc-psi/tests/labeled-psi/DataTools.h → ...ing/ppc-psi/tests/labeled-psi/DataTools.h
diff --git a/...tests/labeled-psi/FakeLabeledPSIFactory.h → ...tests/labeled-psi/FakeLabeledPSIFactory.h b/...tests/labeled-psi/FakeLabeledPSIFactory.h → ...tests/labeled-psi/FakeLabeledPSIFactory.h
diff --git a/.../tests/labeled-psi/TestLabeledPSIImpl.cpp → .../tests/labeled-psi/TestLabeledPSIImpl.cpp b/.../tests/labeled-psi/TestLabeledPSIImpl.cpp → .../tests/labeled-psi/TestLabeledPSIImpl.cpp
diff --git a/...pc-psi/tests/labeled-psi/TestSenderDB.cpp → ...pc-psi/tests/labeled-psi/TestSenderDB.cpp b/...pc-psi/tests/labeled-psi/TestSenderDB.cpp → ...pc-psi/tests/labeled-psi/TestSenderDB.cpp
diff --git a/cpp/ppc-front/test/unittests/main.cpp → cpp/wedpr-computing/ppc-psi/tests/main.cpp b/cpp/ppc-front/test/unittests/main.cpp → cpp/wedpr-computing/ppc-psi/tests/main.cpp
diff --git a/...-psi/tests/ra2018-psi/TestEcdhPSIImpl.cpp → ...-psi/tests/ra2018-psi/TestEcdhPSIImpl.cpp b/...-psi/tests/ra2018-psi/TestEcdhPSIImpl.cpp → ...-psi/tests/ra2018-psi/TestEcdhPSIImpl.cpp
diff --git a/...c-psi/tests/ra2018-psi/TestRA2018Impl.cpp → ...c-psi/tests/ra2018-psi/TestRA2018Impl.cpp b/...c-psi/tests/ra2018-psi/TestRA2018Impl.cpp → ...c-psi/tests/ra2018-psi/TestRA2018Impl.cpp
diff --git a/...si/tests/ra2018-psi/TestRA2018Message.cpp → ...si/tests/ra2018-psi/TestRA2018Message.cpp b/...si/tests/ra2018-psi/TestRA2018Message.cpp → ...si/tests/ra2018-psi/TestRA2018Message.cpp
diff --git a/...18-psi/mock-data/append-full-evaluate.txt → ...18-psi/mock-data/append-full-evaluate.txt b/...18-psi/mock-data/append-full-evaluate.txt → ...18-psi/mock-data/append-full-evaluate.txt
diff --git a/...sts/ra2018-psi/mock-data/fullevaluate.txt → ...sts/ra2018-psi/mock-data/fullevaluate.txt b/...sts/ra2018-psi/mock-data/fullevaluate.txt → ...sts/ra2018-psi/mock-data/fullevaluate.txt
diff --git a/...pc-psi/tests/ra2018-psi/mock-data/psi.txt → ...pc-psi/tests/ra2018-psi/mock-data/psi.txt b/...pc-psi/tests/ra2018-psi/mock-data/psi.txt → ...pc-psi/tests/ra2018-psi/mock-data/psi.txt
diff --git a/...c-psi/tests/ra2018-psi/mock-data/psi2.txt → ...c-psi/tests/ra2018-psi/mock-data/psi2.txt b/...c-psi/tests/ra2018-psi/mock-data/psi2.txt → ...c-psi/tests/ra2018-psi/mock-data/psi2.txt
diff --git a/cpp/ppc-psi/tests/ra2018-psi/mock/Common.h → ...ng/ppc-psi/tests/ra2018-psi/mock/Common.h b/cpp/ppc-psi/tests/ra2018-psi/mock/Common.h → ...ng/ppc-psi/tests/ra2018-psi/mock/Common.h
diff --git a/...si/tests/ra2018-psi/mock/EcdhPSIFixture.h → ...si/tests/ra2018-psi/mock/EcdhPSIFixture.h b/...si/tests/ra2018-psi/mock/EcdhPSIFixture.h → ...si/tests/ra2018-psi/mock/EcdhPSIFixture.h
diff --git a/...ts/ra2018-psi/mock/FakeRA2018PSIStorage.h → ...ts/ra2018-psi/mock/FakeRA2018PSIStorage.h b/...ts/ra2018-psi/mock/FakeRA2018PSIStorage.h → ...ts/ra2018-psi/mock/FakeRA2018PSIStorage.h
diff --git a/...ts/ra2018-psi/mock/RA2018MessageFixture.h → ...ts/ra2018-psi/mock/RA2018MessageFixture.h b/...ts/ra2018-psi/mock/RA2018MessageFixture.h → ...ts/ra2018-psi/mock/RA2018MessageFixture.h
diff --git a/.../tests/ra2018-psi/mock/RA2018PSIFixture.h → .../tests/ra2018-psi/mock/RA2018PSIFixture.h b/.../tests/ra2018-psi/mock/RA2018PSIFixture.h → .../tests/ra2018-psi/mock/RA2018PSIFixture.h
diff --git a/cpp/ppc-crypto-core/CMakeLists.txt → ...dpr-crypto/ppc-crypto-core/CMakeLists.txt b/cpp/ppc-crypto-core/CMakeLists.txt → ...dpr-crypto/ppc-crypto-core/CMakeLists.txt
diff --git a/cpp/ppc-crypto-core/src/CMakeLists.txt → ...crypto/ppc-crypto-core/src/CMakeLists.txt b/cpp/ppc-crypto-core/src/CMakeLists.txt → ...crypto/ppc-crypto-core/src/CMakeLists.txt
diff --git a/cpp/ppc-crypto-core/src/Common.h → ...wedpr-crypto/ppc-crypto-core/src/Common.h b/cpp/ppc-crypto-core/src/Common.h → ...wedpr-crypto/ppc-crypto-core/src/Common.h
diff --git a/cpp/ppc-crypto-core/src/hash/BLAKE2bHash.h → ...to/ppc-crypto-core/src/hash/BLAKE2bHash.h b/cpp/ppc-crypto-core/src/hash/BLAKE2bHash.h → ...to/ppc-crypto-core/src/hash/BLAKE2bHash.h
diff --git a/...c-crypto-core/src/hash/BitMixMurmurHash.h → ...c-crypto-core/src/hash/BitMixMurmurHash.h b/...c-crypto-core/src/hash/BitMixMurmurHash.h → ...c-crypto-core/src/hash/BitMixMurmurHash.h
diff --git a/...pc-crypto-core/src/hash/HashFactoryImpl.h → ...pc-crypto-core/src/hash/HashFactoryImpl.h b/...pc-crypto-core/src/hash/HashFactoryImpl.h → ...pc-crypto-core/src/hash/HashFactoryImpl.h
diff --git a/cpp/ppc-crypto-core/src/hash/MD5Hash.h → ...crypto/ppc-crypto-core/src/hash/MD5Hash.h b/cpp/ppc-crypto-core/src/hash/MD5Hash.h → ...crypto/ppc-crypto-core/src/hash/MD5Hash.h
diff --git a/cpp/ppc-crypto-core/src/hash/OpenSSLHash.h → ...to/ppc-crypto-core/src/hash/OpenSSLHash.h b/cpp/ppc-crypto-core/src/hash/OpenSSLHash.h → ...to/ppc-crypto-core/src/hash/OpenSSLHash.h
diff --git a/cpp/ppc-crypto-core/src/hash/SM3Hash.h → ...crypto/ppc-crypto-core/src/hash/SM3Hash.h b/cpp/ppc-crypto-core/src/hash/SM3Hash.h → ...crypto/ppc-crypto-core/src/hash/SM3Hash.h
diff --git a/cpp/ppc-crypto-core/src/hash/Sha256Hash.h → ...pto/ppc-crypto-core/src/hash/Sha256Hash.h b/cpp/ppc-crypto-core/src/hash/Sha256Hash.h → ...pto/ppc-crypto-core/src/hash/Sha256Hash.h
diff --git a/cpp/ppc-crypto-core/src/hash/Sha512Hash.h → ...pto/ppc-crypto-core/src/hash/Sha512Hash.h b/cpp/ppc-crypto-core/src/hash/Sha512Hash.h → ...pto/ppc-crypto-core/src/hash/Sha512Hash.h
diff --git a/cpp/ppc-crypto-core/src/ore/FastOre.cpp → ...rypto/ppc-crypto-core/src/ore/FastOre.cpp b/cpp/ppc-crypto-core/src/ore/FastOre.cpp → ...rypto/ppc-crypto-core/src/ore/FastOre.cpp
diff --git a/cpp/ppc-crypto-core/src/ore/FastOre.h → ...-crypto/ppc-crypto-core/src/ore/FastOre.h b/cpp/ppc-crypto-core/src/ore/FastOre.h → ...-crypto/ppc-crypto-core/src/ore/FastOre.h
diff --git a/...rypto-core/src/sym-crypto/OpenSSL3DES.cpp → ...rypto-core/src/sym-crypto/OpenSSL3DES.cpp b/...rypto-core/src/sym-crypto/OpenSSL3DES.cpp → ...rypto-core/src/sym-crypto/OpenSSL3DES.cpp
diff --git a/...-crypto-core/src/sym-crypto/OpenSSL3DES.h → ...-crypto-core/src/sym-crypto/OpenSSL3DES.h b/...-crypto-core/src/sym-crypto/OpenSSL3DES.h → ...-crypto-core/src/sym-crypto/OpenSSL3DES.h
diff --git a/...crypto-core/src/sym-crypto/OpenSSLAES.cpp → ...crypto-core/src/sym-crypto/OpenSSLAES.cpp b/...crypto-core/src/sym-crypto/OpenSSLAES.cpp → ...crypto-core/src/sym-crypto/OpenSSLAES.cpp
diff --git a/...c-crypto-core/src/sym-crypto/OpenSSLAES.h → ...c-crypto-core/src/sym-crypto/OpenSSLAES.h b/...c-crypto-core/src/sym-crypto/OpenSSLAES.h → ...c-crypto-core/src/sym-crypto/OpenSSLAES.h
diff --git a/...rypto-core/src/sym-crypto/OpenSSLCipher.h → ...rypto-core/src/sym-crypto/OpenSSLCipher.h b/...rypto-core/src/sym-crypto/OpenSSLCipher.h → ...rypto-core/src/sym-crypto/OpenSSLCipher.h
diff --git a/...crypto-core/src/sym-crypto/OpenSSLSM4.cpp → ...crypto-core/src/sym-crypto/OpenSSLSM4.cpp b/...crypto-core/src/sym-crypto/OpenSSLSM4.cpp → ...crypto-core/src/sym-crypto/OpenSSLSM4.cpp
diff --git a/...c-crypto-core/src/sym-crypto/OpenSSLSM4.h → ...c-crypto-core/src/sym-crypto/OpenSSLSM4.h b/...c-crypto-core/src/sym-crypto/OpenSSLSM4.h → ...c-crypto-core/src/sym-crypto/OpenSSLSM4.h
diff --git a/cpp/ppc-crypto-core/src/tools/BitVector.cpp → ...o/ppc-crypto-core/src/tools/BitVector.cpp b/cpp/ppc-crypto-core/src/tools/BitVector.cpp → ...o/ppc-crypto-core/src/tools/BitVector.cpp
diff --git a/cpp/ppc-crypto-core/src/tools/BitVector.h → ...pto/ppc-crypto-core/src/tools/BitVector.h b/cpp/ppc-crypto-core/src/tools/BitVector.h → ...pto/ppc-crypto-core/src/tools/BitVector.h
diff --git a/cpp/ppc-crypto-core/tests/CMakeLists.txt → ...ypto/ppc-crypto-core/tests/CMakeLists.txt b/cpp/ppc-crypto-core/tests/CMakeLists.txt → ...ypto/ppc-crypto-core/tests/CMakeLists.txt
diff --git a/cpp/ppc-crypto-core/tests/TestBitVector.cpp → ...o/ppc-crypto-core/tests/TestBitVector.cpp b/cpp/ppc-crypto-core/tests/TestBitVector.cpp → ...o/ppc-crypto-core/tests/TestBitVector.cpp
diff --git a/cpp/ppc-crypto-core/tests/TestHash.cpp → ...crypto/ppc-crypto-core/tests/TestHash.cpp b/cpp/ppc-crypto-core/tests/TestHash.cpp → ...crypto/ppc-crypto-core/tests/TestHash.cpp
diff --git a/cpp/ppc-crypto-core/tests/TestOre4Float.cpp → ...o/ppc-crypto-core/tests/TestOre4Float.cpp b/cpp/ppc-crypto-core/tests/TestOre4Float.cpp → ...o/ppc-crypto-core/tests/TestOre4Float.cpp
diff --git a/...ppc-crypto-core/tests/TestOre4Integer.cpp → ...ppc-crypto-core/tests/TestOre4Integer.cpp b/...ppc-crypto-core/tests/TestOre4Integer.cpp → ...ppc-crypto-core/tests/TestOre4Integer.cpp
diff --git a/cpp/ppc-crypto-core/tests/TestOre4String.cpp → .../ppc-crypto-core/tests/TestOre4String.cpp b/cpp/ppc-crypto-core/tests/TestOre4String.cpp → .../ppc-crypto-core/tests/TestOre4String.cpp
diff --git a/cpp/ppc-crypto-core/tests/TestSymCrypto.cpp → ...o/ppc-crypto-core/tests/TestSymCrypto.cpp b/cpp/ppc-crypto-core/tests/TestSymCrypto.cpp → ...o/ppc-crypto-core/tests/TestSymCrypto.cpp
diff --git a/cpp/ppc-gateway/test/unittests/main.cpp → ...dpr-crypto/ppc-crypto-core/tests/main.cpp b/cpp/ppc-gateway/test/unittests/main.cpp → ...dpr-crypto/ppc-crypto-core/tests/main.cpp
diff --git a/cpp/ppc-crypto/CMakeLists.txt → cpp/wedpr-crypto/ppc-crypto/CMakeLists.txt b/cpp/ppc-crypto/CMakeLists.txt → cpp/wedpr-crypto/ppc-crypto/CMakeLists.txt
diff --git a/cpp/ppc-crypto/demo/CMakeLists.txt → ...dpr-crypto/ppc-crypto/demo/CMakeLists.txt b/cpp/ppc-crypto/demo/CMakeLists.txt → ...dpr-crypto/ppc-crypto/demo/CMakeLists.txt
diff --git a/cpp/ppc-crypto/demo/crypto_bench.cpp → ...r-crypto/ppc-crypto/demo/crypto_bench.cpp b/cpp/ppc-crypto/demo/crypto_bench.cpp → ...r-crypto/ppc-crypto/demo/crypto_bench.cpp
diff --git a/cpp/ppc-crypto/src/CMakeLists.txt → ...edpr-crypto/ppc-crypto/src/CMakeLists.txt b/cpp/ppc-crypto/src/CMakeLists.txt → ...edpr-crypto/ppc-crypto/src/CMakeLists.txt
diff --git a/cpp/ppc-crypto/src/Common.h → cpp/wedpr-crypto/ppc-crypto/src/Common.h b/cpp/ppc-crypto/src/Common.h → cpp/wedpr-crypto/ppc-crypto/src/Common.h
diff --git a/...pc-crypto/src/ecc/ECDHCryptoFactoryImpl.h → ...pc-crypto/src/ecc/ECDHCryptoFactoryImpl.h b/...pc-crypto/src/ecc/ECDHCryptoFactoryImpl.h → ...pc-crypto/src/ecc/ECDHCryptoFactoryImpl.h
diff --git a/cpp/ppc-crypto/src/ecc/ECDHCryptoImpl.h → ...rypto/ppc-crypto/src/ecc/ECDHCryptoImpl.h b/cpp/ppc-crypto/src/ecc/ECDHCryptoImpl.h → ...rypto/ppc-crypto/src/ecc/ECDHCryptoImpl.h
diff --git a/...ppc-crypto/src/ecc/EccCryptoFactoryImpl.h → ...ppc-crypto/src/ecc/EccCryptoFactoryImpl.h b/...ppc-crypto/src/ecc/EccCryptoFactoryImpl.h → ...ppc-crypto/src/ecc/EccCryptoFactoryImpl.h
diff --git a/cpp/ppc-crypto/src/ecc/Ed25519EccCrypto.cpp → ...o/ppc-crypto/src/ecc/Ed25519EccCrypto.cpp b/cpp/ppc-crypto/src/ecc/Ed25519EccCrypto.cpp → ...o/ppc-crypto/src/ecc/Ed25519EccCrypto.cpp
diff --git a/cpp/ppc-crypto/src/ecc/Ed25519EccCrypto.h → ...pto/ppc-crypto/src/ecc/Ed25519EccCrypto.h b/cpp/ppc-crypto/src/ecc/Ed25519EccCrypto.h → ...pto/ppc-crypto/src/ecc/Ed25519EccCrypto.h
diff --git a/cpp/ppc-crypto/src/ecc/IppECDHCryptoImpl.h → ...to/ppc-crypto/src/ecc/IppECDHCryptoImpl.h b/cpp/ppc-crypto/src/ecc/IppECDHCryptoImpl.h → ...to/ppc-crypto/src/ecc/IppECDHCryptoImpl.h
diff --git a/cpp/ppc-crypto/src/ecc/OpenSSLEccCrypto.cpp → ...o/ppc-crypto/src/ecc/OpenSSLEccCrypto.cpp b/cpp/ppc-crypto/src/ecc/OpenSSLEccCrypto.cpp → ...o/ppc-crypto/src/ecc/OpenSSLEccCrypto.cpp
diff --git a/cpp/ppc-crypto/src/ecc/OpenSSLEccCrypto.h → ...pto/ppc-crypto/src/ecc/OpenSSLEccCrypto.h b/cpp/ppc-crypto/src/ecc/OpenSSLEccCrypto.h → ...pto/ppc-crypto/src/ecc/OpenSSLEccCrypto.h
diff --git a/cpp/ppc-crypto/src/ecc/core/EcPoint.h → ...-crypto/ppc-crypto/src/ecc/core/EcPoint.h b/cpp/ppc-crypto/src/ecc/core/EcPoint.h → ...-crypto/ppc-crypto/src/ecc/core/EcPoint.h
diff --git a/cpp/ppc-crypto/src/oprf/EcdhOprf.cpp → ...r-crypto/ppc-crypto/src/oprf/EcdhOprf.cpp b/cpp/ppc-crypto/src/oprf/EcdhOprf.cpp → ...r-crypto/ppc-crypto/src/oprf/EcdhOprf.cpp
diff --git a/cpp/ppc-crypto/src/oprf/EcdhOprf.h → ...dpr-crypto/ppc-crypto/src/oprf/EcdhOprf.h b/cpp/ppc-crypto/src/oprf/EcdhOprf.h → ...dpr-crypto/ppc-crypto/src/oprf/EcdhOprf.h
diff --git a/cpp/ppc-crypto/src/oprf/RA2018Oprf.cpp → ...crypto/ppc-crypto/src/oprf/RA2018Oprf.cpp b/cpp/ppc-crypto/src/oprf/RA2018Oprf.cpp → ...crypto/ppc-crypto/src/oprf/RA2018Oprf.cpp
diff --git a/cpp/ppc-crypto/src/oprf/RA2018Oprf.h → ...r-crypto/ppc-crypto/src/oprf/RA2018Oprf.h b/cpp/ppc-crypto/src/oprf/RA2018Oprf.h → ...r-crypto/ppc-crypto/src/oprf/RA2018Oprf.h
diff --git a/cpp/ppc-crypto/src/prng/AESPRNG.cpp → ...pr-crypto/ppc-crypto/src/prng/AESPRNG.cpp b/cpp/ppc-crypto/src/prng/AESPRNG.cpp → ...pr-crypto/ppc-crypto/src/prng/AESPRNG.cpp
diff --git a/cpp/ppc-crypto/src/prng/AESPRNG.h → ...edpr-crypto/ppc-crypto/src/prng/AESPRNG.h b/cpp/ppc-crypto/src/prng/AESPRNG.h → ...edpr-crypto/ppc-crypto/src/prng/AESPRNG.h
diff --git a/cpp/ppc-crypto/src/prng/BLAKE2bPRNG.cpp → ...rypto/ppc-crypto/src/prng/BLAKE2bPRNG.cpp b/cpp/ppc-crypto/src/prng/BLAKE2bPRNG.cpp → ...rypto/ppc-crypto/src/prng/BLAKE2bPRNG.cpp
diff --git a/cpp/ppc-crypto/src/prng/BLAKE2bPRNG.h → ...-crypto/ppc-crypto/src/prng/BLAKE2bPRNG.h b/cpp/ppc-crypto/src/prng/BLAKE2bPRNG.h → ...-crypto/ppc-crypto/src/prng/BLAKE2bPRNG.h
diff --git a/cpp/ppc-crypto/src/randomot/SimplestOT.cpp → ...to/ppc-crypto/src/randomot/SimplestOT.cpp b/cpp/ppc-crypto/src/randomot/SimplestOT.cpp → ...to/ppc-crypto/src/randomot/SimplestOT.cpp
diff --git a/cpp/ppc-crypto/src/randomot/SimplestOT.h → ...ypto/ppc-crypto/src/randomot/SimplestOT.h b/cpp/ppc-crypto/src/randomot/SimplestOT.h → ...ypto/ppc-crypto/src/randomot/SimplestOT.h
diff --git a/cpp/ppc-crypto/tests/CMakeLists.txt → ...pr-crypto/ppc-crypto/tests/CMakeLists.txt b/cpp/ppc-crypto/tests/CMakeLists.txt → ...pr-crypto/ppc-crypto/tests/CMakeLists.txt
diff --git a/cpp/ppc-crypto/tests/TestEccCrypto.cpp → ...crypto/ppc-crypto/tests/TestEccCrypto.cpp b/cpp/ppc-crypto/tests/TestEccCrypto.cpp → ...crypto/ppc-crypto/tests/TestEccCrypto.cpp
diff --git a/cpp/ppc-crypto/tests/TestOprf.cpp → ...edpr-crypto/ppc-crypto/tests/TestOprf.cpp b/cpp/ppc-crypto/tests/TestOprf.cpp → ...edpr-crypto/ppc-crypto/tests/TestOprf.cpp
diff --git a/cpp/ppc-crypto/tests/TestPRNG.cpp → ...edpr-crypto/ppc-crypto/tests/TestPRNG.cpp b/cpp/ppc-crypto/tests/TestPRNG.cpp → ...edpr-crypto/ppc-crypto/tests/TestPRNG.cpp
diff --git a/cpp/ppc-crypto/tests/TestRandomot.cpp → ...-crypto/ppc-crypto/tests/TestRandomot.cpp b/cpp/ppc-crypto/tests/TestRandomot.cpp → ...-crypto/ppc-crypto/tests/TestRandomot.cpp
diff --git a/cpp/ppc-homo/tests/main.cpp → cpp/wedpr-crypto/ppc-crypto/tests/main.cpp b/cpp/ppc-homo/tests/main.cpp → cpp/wedpr-crypto/ppc-crypto/tests/main.cpp
diff --git a/cpp/ppc-homo/CMakeLists.txt → cpp/wedpr-crypto/ppc-homo/CMakeLists.txt b/cpp/ppc-homo/CMakeLists.txt → cpp/wedpr-crypto/ppc-homo/CMakeLists.txt
diff --git a/cpp/ppc-homo/codec/CMakeLists.txt → ...edpr-crypto/ppc-homo/codec/CMakeLists.txt b/cpp/ppc-homo/codec/CMakeLists.txt → ...edpr-crypto/ppc-homo/codec/CMakeLists.txt
diff --git a/cpp/ppc-homo/codec/Common.h → cpp/wedpr-crypto/ppc-homo/codec/Common.h b/cpp/ppc-homo/codec/Common.h → cpp/wedpr-crypto/ppc-homo/codec/Common.h
diff --git a/cpp/ppc-homo/codec/FloatingPointCipher.h → ...ypto/ppc-homo/codec/FloatingPointCipher.h b/cpp/ppc-homo/codec/FloatingPointCipher.h → ...ypto/ppc-homo/codec/FloatingPointCipher.h
diff --git a/cpp/ppc-homo/codec/FloatingPointCodec.cpp → ...pto/ppc-homo/codec/FloatingPointCodec.cpp b/cpp/ppc-homo/codec/FloatingPointCodec.cpp → ...pto/ppc-homo/codec/FloatingPointCodec.cpp
diff --git a/cpp/ppc-homo/codec/FloatingPointCodec.h → ...rypto/ppc-homo/codec/FloatingPointCodec.h b/cpp/ppc-homo/codec/FloatingPointCodec.h → ...rypto/ppc-homo/codec/FloatingPointCodec.h
diff --git a/cpp/ppc-homo/codec/SignedNumberCodec.h → ...crypto/ppc-homo/codec/SignedNumberCodec.h b/cpp/ppc-homo/codec/SignedNumberCodec.h → ...crypto/ppc-homo/codec/SignedNumberCodec.h
diff --git a/cpp/ppc-homo/demo/CMakeLists.txt → ...wedpr-crypto/ppc-homo/demo/CMakeLists.txt b/cpp/ppc-homo/demo/CMakeLists.txt → ...wedpr-crypto/ppc-homo/demo/CMakeLists.txt
diff --git a/cpp/ppc-homo/demo/homo_perf_demo.cpp → ...r-crypto/ppc-homo/demo/homo_perf_demo.cpp b/cpp/ppc-homo/demo/homo_perf_demo.cpp → ...r-crypto/ppc-homo/demo/homo_perf_demo.cpp
diff --git a/cpp/ppc-homo/fahe/CMakeLists.txt → ...wedpr-crypto/ppc-homo/fahe/CMakeLists.txt b/cpp/ppc-homo/fahe/CMakeLists.txt → ...wedpr-crypto/ppc-homo/fahe/CMakeLists.txt
diff --git a/cpp/ppc-homo/fahe/Fahe.cpp → cpp/wedpr-crypto/ppc-homo/fahe/Fahe.cpp b/cpp/ppc-homo/fahe/Fahe.cpp → cpp/wedpr-crypto/ppc-homo/fahe/Fahe.cpp
diff --git a/cpp/ppc-homo/fahe/Fahe.h → cpp/wedpr-crypto/ppc-homo/fahe/Fahe.h b/cpp/ppc-homo/fahe/Fahe.h → cpp/wedpr-crypto/ppc-homo/fahe/Fahe.h
diff --git a/cpp/ppc-homo/ihc/CMakeLists.txt → cpp/wedpr-crypto/ppc-homo/ihc/CMakeLists.txt b/cpp/ppc-homo/ihc/CMakeLists.txt → cpp/wedpr-crypto/ppc-homo/ihc/CMakeLists.txt
diff --git a/cpp/ppc-homo/ihc/FloatingPointIhc.cpp → ...-crypto/ppc-homo/ihc/FloatingPointIhc.cpp b/cpp/ppc-homo/ihc/FloatingPointIhc.cpp → ...-crypto/ppc-homo/ihc/FloatingPointIhc.cpp
diff --git a/cpp/ppc-homo/ihc/FloatingPointIhc.h → ...pr-crypto/ppc-homo/ihc/FloatingPointIhc.h b/cpp/ppc-homo/ihc/FloatingPointIhc.h → ...pr-crypto/ppc-homo/ihc/FloatingPointIhc.h
diff --git a/cpp/ppc-homo/ihc/IhcImpl.cpp → cpp/wedpr-crypto/ppc-homo/ihc/IhcImpl.cpp b/cpp/ppc-homo/ihc/IhcImpl.cpp → cpp/wedpr-crypto/ppc-homo/ihc/IhcImpl.cpp
diff --git a/cpp/ppc-homo/ihc/IhcImpl.h → cpp/wedpr-crypto/ppc-homo/ihc/IhcImpl.h b/cpp/ppc-homo/ihc/IhcImpl.h → cpp/wedpr-crypto/ppc-homo/ihc/IhcImpl.h
diff --git a/cpp/ppc-homo/paillier/CMakeLists.txt → ...r-crypto/ppc-homo/paillier/CMakeLists.txt b/cpp/ppc-homo/paillier/CMakeLists.txt → ...r-crypto/ppc-homo/paillier/CMakeLists.txt
diff --git a/cpp/ppc-homo/paillier/Common.h → cpp/wedpr-crypto/ppc-homo/paillier/Common.h b/cpp/ppc-homo/paillier/Common.h → cpp/wedpr-crypto/ppc-homo/paillier/Common.h
diff --git a/...c-homo/paillier/FloatingPointPaillier.cpp → ...c-homo/paillier/FloatingPointPaillier.cpp b/...c-homo/paillier/FloatingPointPaillier.cpp → ...c-homo/paillier/FloatingPointPaillier.cpp
diff --git a/...ppc-homo/paillier/FloatingPointPaillier.h → ...ppc-homo/paillier/FloatingPointPaillier.h b/...ppc-homo/paillier/FloatingPointPaillier.h → ...ppc-homo/paillier/FloatingPointPaillier.h
diff --git a/cpp/ppc-homo/paillier/OpenSSLPaillier.cpp → ...pto/ppc-homo/paillier/OpenSSLPaillier.cpp b/cpp/ppc-homo/paillier/OpenSSLPaillier.cpp → ...pto/ppc-homo/paillier/OpenSSLPaillier.cpp
diff --git a/cpp/ppc-homo/paillier/OpenSSLPaillier.h → ...rypto/ppc-homo/paillier/OpenSSLPaillier.h b/cpp/ppc-homo/paillier/OpenSSLPaillier.h → ...rypto/ppc-homo/paillier/OpenSSLPaillier.h
diff --git a/...-homo/paillier/OpenSSLPaillierKeyPair.cpp → ...-homo/paillier/OpenSSLPaillierKeyPair.cpp b/...-homo/paillier/OpenSSLPaillierKeyPair.cpp → ...-homo/paillier/OpenSSLPaillierKeyPair.cpp
diff --git a/...pc-homo/paillier/OpenSSLPaillierKeyPair.h → ...pc-homo/paillier/OpenSSLPaillierKeyPair.h b/...pc-homo/paillier/OpenSSLPaillierKeyPair.h → ...pc-homo/paillier/OpenSSLPaillierKeyPair.h
diff --git a/cpp/ppc-homo/tests/CMakeLists.txt → ...edpr-crypto/ppc-homo/tests/CMakeLists.txt b/cpp/ppc-homo/tests/CMakeLists.txt → ...edpr-crypto/ppc-homo/tests/CMakeLists.txt
diff --git a/cpp/ppc-homo/tests/TestFahe.cpp → cpp/wedpr-crypto/ppc-homo/tests/TestFahe.cpp b/cpp/ppc-homo/tests/TestFahe.cpp → cpp/wedpr-crypto/ppc-homo/tests/TestFahe.cpp
diff --git a/...ppc-homo/tests/TestFloatingPointCodec.cpp → ...ppc-homo/tests/TestFloatingPointCodec.cpp b/...ppc-homo/tests/TestFloatingPointCodec.cpp → ...ppc-homo/tests/TestFloatingPointCodec.cpp
diff --git a/...-homo/tests/TestFloatingPointPaillier.cpp → ...-homo/tests/TestFloatingPointPaillier.cpp b/...-homo/tests/TestFloatingPointPaillier.cpp → ...-homo/tests/TestFloatingPointPaillier.cpp
diff --git a/cpp/ppc-homo/tests/TestIhc.cpp → cpp/wedpr-crypto/ppc-homo/tests/TestIhc.cpp b/cpp/ppc-homo/tests/TestIhc.cpp → cpp/wedpr-crypto/ppc-homo/tests/TestIhc.cpp
diff --git a/cpp/ppc-homo/tests/TestIhcFloating.cpp → ...crypto/ppc-homo/tests/TestIhcFloating.cpp b/cpp/ppc-homo/tests/TestIhcFloating.cpp → ...crypto/ppc-homo/tests/TestIhcFloating.cpp
diff --git a/cpp/ppc-homo/tests/TestPaillier.cpp → ...pr-crypto/ppc-homo/tests/TestPaillier.cpp b/cpp/ppc-homo/tests/TestPaillier.cpp → ...pr-crypto/ppc-homo/tests/TestPaillier.cpp
diff --git a/cpp/ppc-io/tests/main.cpp → cpp/wedpr-crypto/ppc-homo/tests/main.cpp b/cpp/ppc-io/tests/main.cpp → cpp/wedpr-crypto/ppc-homo/tests/main.cpp
diff --git a/cpp/ppc-udf/CMakeLists.txt → cpp/wedpr-crypto/ppc-udf/CMakeLists.txt b/cpp/ppc-udf/CMakeLists.txt → cpp/wedpr-crypto/ppc-udf/CMakeLists.txt
diff --git a/cpp/ppc-udf/hive/build.gradle → cpp/wedpr-crypto/ppc-udf/hive/build.gradle b/cpp/ppc-udf/hive/build.gradle → cpp/wedpr-crypto/ppc-udf/hive/build.gradle
diff --git a/...df/hive/gradle/wrapper/gradle-wrapper.jar → ...df/hive/gradle/wrapper/gradle-wrapper.jar b/...df/hive/gradle/wrapper/gradle-wrapper.jar → ...df/hive/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/cpp/ppc-udf/hive/gradlew → cpp/wedpr-crypto/ppc-udf/hive/gradlew b/cpp/ppc-udf/hive/gradlew → cpp/wedpr-crypto/ppc-udf/hive/gradlew
diff --git a/cpp/ppc-udf/hive/gradlew.bat → cpp/wedpr-crypto/ppc-udf/hive/gradlew.bat b/cpp/ppc-udf/hive/gradlew.bat → cpp/wedpr-crypto/ppc-udf/hive/gradlew.bat
diff --git a/cpp/ppc-udf/hive/settings.gradle → ...wedpr-crypto/ppc-udf/hive/settings.gradle b/cpp/ppc-udf/hive/settings.gradle → ...wedpr-crypto/ppc-udf/hive/settings.gradle
diff --git a/.../webank/wedpr/hive/udf/config/Config.java → .../webank/wedpr/hive/udf/config/Config.java b/.../webank/wedpr/hive/udf/config/Config.java → .../webank/wedpr/hive/udf/config/Config.java
diff --git a/...k/wedpr/hive/udf/config/ConfigLoader.java → ...k/wedpr/hive/udf/config/ConfigLoader.java b/...k/wedpr/hive/udf/config/ConfigLoader.java → ...k/wedpr/hive/udf/config/ConfigLoader.java
diff --git a/...hive/udf/config/model/ConfigProperty.java → ...hive/udf/config/model/ConfigProperty.java b/...hive/udf/config/model/ConfigProperty.java → ...hive/udf/config/model/ConfigProperty.java
diff --git a/...edpr/hive/udf/config/model/KeyConfig.java → ...edpr/hive/udf/config/model/KeyConfig.java b/...edpr/hive/udf/config/model/KeyConfig.java → ...edpr/hive/udf/config/model/KeyConfig.java
diff --git a/...r/hive/udf/demo/GeneratePaillierMain.java → ...r/hive/udf/demo/GeneratePaillierMain.java b/...r/hive/udf/demo/GeneratePaillierMain.java → ...r/hive/udf/demo/GeneratePaillierMain.java
diff --git a/.../hive/udf/exceptions/ConfigException.java → .../hive/udf/exceptions/ConfigException.java b/.../hive/udf/exceptions/ConfigException.java → .../hive/udf/exceptions/ConfigException.java
diff --git a/...e/udf/exceptions/DecryptionException.java → ...e/udf/exceptions/DecryptionException.java b/...e/udf/exceptions/DecryptionException.java → ...e/udf/exceptions/DecryptionException.java
diff --git a/...e/udf/exceptions/EncryptionException.java → ...e/udf/exceptions/EncryptionException.java b/...e/udf/exceptions/EncryptionException.java → ...e/udf/exceptions/EncryptionException.java
diff --git a/...dpr/hive/udf/exceptions/KeyException.java → ...dpr/hive/udf/exceptions/KeyException.java b/...dpr/hive/udf/exceptions/KeyException.java → ...dpr/hive/udf/exceptions/KeyException.java
diff --git a/...r/hive/udf/impl/ihc/IhcDecryptionUDF.java → ...r/hive/udf/impl/ihc/IhcDecryptionUDF.java b/...r/hive/udf/impl/ihc/IhcDecryptionUDF.java → ...r/hive/udf/impl/ihc/IhcDecryptionUDF.java