diff --git a/demos/remote_attestation/.gitignore b/demos/remote_attestation/epid/.gitignore
similarity index 100%
rename from demos/remote_attestation/.gitignore
rename to demos/remote_attestation/epid/.gitignore
diff --git a/demos/remote_attestation/CMakeLists.txt b/demos/remote_attestation/epid/CMakeLists.txt
similarity index 100%
rename from demos/remote_attestation/CMakeLists.txt
rename to demos/remote_attestation/epid/CMakeLists.txt
diff --git a/demos/remote_attestation/README.md b/demos/remote_attestation/epid/README.md
similarity index 89%
rename from demos/remote_attestation/README.md
rename to demos/remote_attestation/epid/README.md
index 532c7e65..382e19ec 100644
--- a/demos/remote_attestation/README.md
+++ b/demos/remote_attestation/epid/README.md
@@ -1,6 +1,6 @@
-# SGX Remote Attestation Demo
+# SGX EPID Remote Attestation Demo
 
-This project demonstrates how to do remote attestation on Occlum.
+This project demonstrates how to do Intel SGX EPID (Enhanced Privacy ID) remote attestation on Occlum.
 
 In a nutshell, Occlum provides SGX capabilities to user apps through ioctls on a special device (`/dev/sgx`).
 To hide the low-level details of ioctls from user apps, a user-friendly, remote attestation library is provided in this demo.
diff --git a/demos/remote_attestation/app/ra_config.h b/demos/remote_attestation/epid/app/ra_config.h
similarity index 100%
rename from demos/remote_attestation/app/ra_config.h
rename to demos/remote_attestation/epid/app/ra_config.h
diff --git a/demos/remote_attestation/app/ra_main.cpp b/demos/remote_attestation/epid/app/ra_main.cpp
similarity index 100%
rename from demos/remote_attestation/app/ra_main.cpp
rename to demos/remote_attestation/epid/app/ra_main.cpp
diff --git a/demos/remote_attestation/conf/ra_config.json b/demos/remote_attestation/epid/conf/ra_config.json
similarity index 100%
rename from demos/remote_attestation/conf/ra_config.json
rename to demos/remote_attestation/epid/conf/ra_config.json
diff --git a/demos/remote_attestation/download_and_build.sh b/demos/remote_attestation/epid/download_and_build.sh
similarity index 100%
rename from demos/remote_attestation/download_and_build.sh
rename to demos/remote_attestation/epid/download_and_build.sh
diff --git a/demos/remote_attestation/lib/include/tee/common/error.h b/demos/remote_attestation/epid/lib/include/tee/common/error.h
similarity index 100%
rename from demos/remote_attestation/lib/include/tee/common/error.h
rename to demos/remote_attestation/epid/lib/include/tee/common/error.h
diff --git a/demos/remote_attestation/lib/include/tee/common/log.h b/demos/remote_attestation/epid/lib/include/tee/common/log.h
similarity index 100%
rename from demos/remote_attestation/lib/include/tee/common/log.h
rename to demos/remote_attestation/epid/lib/include/tee/common/log.h
diff --git a/demos/remote_attestation/lib/include/tee/common/type.h b/demos/remote_attestation/epid/lib/include/tee/common/type.h
similarity index 100%
rename from demos/remote_attestation/lib/include/tee/common/type.h
rename to demos/remote_attestation/epid/lib/include/tee/common/type.h
diff --git a/demos/remote_attestation/lib/include/tee/ra_conf_api.h b/demos/remote_attestation/epid/lib/include/tee/ra_conf_api.h
similarity index 100%
rename from demos/remote_attestation/lib/include/tee/ra_conf_api.h
rename to demos/remote_attestation/epid/lib/include/tee/ra_conf_api.h
diff --git a/demos/remote_attestation/lib/include/tee/ra_ias.h b/demos/remote_attestation/epid/lib/include/tee/ra_ias.h
similarity index 100%
rename from demos/remote_attestation/lib/include/tee/ra_ias.h
rename to demos/remote_attestation/epid/lib/include/tee/ra_ias.h
diff --git a/demos/remote_attestation/lib/include/tee/ra_json.h b/demos/remote_attestation/epid/lib/include/tee/ra_json.h
similarity index 100%
rename from demos/remote_attestation/lib/include/tee/ra_json.h
rename to demos/remote_attestation/epid/lib/include/tee/ra_json.h
diff --git a/demos/remote_attestation/lib/include/tee/ra_quote.h b/demos/remote_attestation/epid/lib/include/tee/ra_quote.h
similarity index 100%
rename from demos/remote_attestation/lib/include/tee/ra_quote.h
rename to demos/remote_attestation/epid/lib/include/tee/ra_quote.h
diff --git a/demos/remote_attestation/lib/include/tee/ra_quote_api.h b/demos/remote_attestation/epid/lib/include/tee/ra_quote_api.h
similarity index 100%
rename from demos/remote_attestation/lib/include/tee/ra_quote_api.h
rename to demos/remote_attestation/epid/lib/include/tee/ra_quote_api.h
diff --git a/demos/remote_attestation/lib/src/ra_ias.cpp b/demos/remote_attestation/epid/lib/src/ra_ias.cpp
similarity index 100%
rename from demos/remote_attestation/lib/src/ra_ias.cpp
rename to demos/remote_attestation/epid/lib/src/ra_ias.cpp
diff --git a/demos/remote_attestation/lib/src/ra_json.cpp b/demos/remote_attestation/epid/lib/src/ra_json.cpp
similarity index 100%
rename from demos/remote_attestation/lib/src/ra_json.cpp
rename to demos/remote_attestation/epid/lib/src/ra_json.cpp
diff --git a/demos/remote_attestation/lib/src/ra_quote.cpp b/demos/remote_attestation/epid/lib/src/ra_quote.cpp
similarity index 100%
rename from demos/remote_attestation/lib/src/ra_quote.cpp
rename to demos/remote_attestation/epid/lib/src/ra_quote.cpp
diff --git a/demos/remote_attestation/run_on_occlum.sh b/demos/remote_attestation/epid/run_on_occlum.sh
similarity index 100%
rename from demos/remote_attestation/run_on_occlum.sh
rename to demos/remote_attestation/epid/run_on_occlum.sh