diff --git a/_data/members.yaml b/_data/members.yaml
index 31b24921..d312e626 100644
--- a/_data/members.yaml
+++ b/_data/members.yaml
@@ -22,7 +22,7 @@
 - name: Hiroko KURODA
   name_jp: 黒田　博子
   role: s
-  image: /images/team/dummy.png
+  image: /images/team/others/kuroda.png
 
 - name: Ziyan GAO
   name_jp: 高　子焱
@@ -34,7 +34,7 @@
 - name: Charlene VERANT
   name_jp: Charlene Verant
   role: is
-  image: /images/team/dummy.png
+  image: /images/team/others/Charlene.png
   url:
   badges: [Robotics]
 
@@ -122,7 +122,7 @@
 - name: Yusuke SUZUKI
   name_jp: 鈴木　優介
   role: m
-  image: /images/team/2023/suzuki.png
+  image: /images/team/master/suzuki.png
   url:
   badges: []
   date: 2024-04-01
@@ -146,7 +146,7 @@
 - name: Hai Minh Hieu BUI
   name_jp: Hai Minh Hieu Bui
   role: m
-  image: /images/team/2023/hieu.png
+  image: /images/team/master/hieu.png
   url:
   badges: []
   date: 2024-04-01
@@ -154,7 +154,7 @@
 - name: Jie LUO
   name_jp: 罗　杰
   role: m
-  image: /images/team/dummy.png
+  image: /images/team/master/Luo.png
   url:
   badges: []
   date: 2024-09-01
@@ -162,7 +162,7 @@
 - name: Binh Trong DUONG
   name_jp: Binh Trong Duong
   role: m
-  image: /images/team/dummy.png
+  image: /images/team/master/Trong.jpg
   url:
   badges: []
   date: 2024-09-01
@@ -170,7 +170,7 @@
 - name: Qifeng SUI
   name_jp: 隋　齐峰
   role: m
-  image: /images/team/dummy.png
+  image: /images/team/master/Sui.png
   url:
   badges: []
   date: 2024-09-01
@@ -186,7 +186,7 @@
 - name: Kaito KAWAI
   name_jp: 河合　海翔
   role: m
-  image: /images/team/2023/kawai.jpg
+  image: /images/team/master/kawai.jpg
   url:
   badges: []
   date: 2025-04-01
@@ -210,7 +210,7 @@
 - name: Jiashuai CHEN
   name_jp: 陳　家帥
   role: m
-  image: /images/team/2023/chen.jpg
+  image: /images/team/master/chen.jpg
   url:
   badges: []
   date: 2025-04-01
@@ -218,7 +218,7 @@
 - name: Muen LIU
   name_jp: 劉　沐恩
   role: m
-  image: /images/team/2023/liu.jpg
+  image: /images/team/master/liu.jpg
   url:
   badges: []
   date: 2025-04-01
@@ -234,7 +234,7 @@
 - name: Huiling JIN
   name_jp: 金　慧伶
   role: m
-  image: /images/team/dummy.png
+  image: /images/team/master/Jin.png
   url:
   badges: []
   date: 2025-04-01
@@ -242,7 +242,7 @@
 - name: Jun ZHANG
   name_jp: 張　俊
   role: m
-  image: /images/team/dummy.png
+  image: /images/team/master/Zhang.png
   url:
   badges: []
   date: 2025-04-01
@@ -251,7 +251,7 @@
 - name: Sogo ARAKI
   name_jp: 荒木　颯吾
   role: b
-  image: /images/team/2024/araki.jpg
+  image: /images/team/bachelor/araki.jpg
   url:
   badges: []
   date: 2022-04-01
@@ -259,7 +259,7 @@
 - name: Izuru IPPITSU
   name_jp: 一筆　一留
   role: b
-  image: /images/team/2024/ippitsu.jpg
+  image: /images/team/bachelor/ippitsu.jpg
   url:
   badges: []
   date: 2022-04-01
@@ -267,7 +267,7 @@
 - name: Takashi OKADA
   name_jp: 岡田　隆志
   role: b
-  image: /images/team/2024/okada.jpg
+  image: /images/team/bachelor/okada.jpg
   url:
   badges: []
   date: 2022-04-01
@@ -275,7 +275,7 @@
 - name: Yoichi KATO
   name_jp: 加藤　耀壱
   role: b
-  image: /images/team/2024/katou.jpg
+  image: /images/team/bachelor/katou.jpg
   url:
   badges: []
   date: 2022-04-01
@@ -283,7 +283,7 @@
 - name: Hibiki TAKAI
   name_jp: 高井　日美暉
   role: b
-  image: /images/team/2024/takai.jpg
+  image: /images/team/bachelor/takai.jpg
   url:
   badges: []
   date: 2022-04-01
@@ -291,7 +291,7 @@
 - name: Haruki TSUKA
   name_jp: 塚　春輝
   role: b
-  image: /images/team/2024/tsuka.jpg
+  image: /images/team/bachelor/tsuka.jpg
   url:
   badges: []
   date: 2022-04-01
@@ -299,7 +299,7 @@
 - name: Koji HIROSAWA
   name_jp: 廣澤　考冶
   role: b
-  image: /images/team/2024/hirosawa.jpg
+  image: /images/team/bachelor/hirosawa.jpg
   url:
   badges: []
   date: 2022-04-01
@@ -307,7 +307,7 @@
 - name: Aina FUJII
   name_jp: 藤井　愛奈
   role: b
-  image: /images/team/2024/fujii.jpg
+  image: /images/team/bachelor/fujii.jpg
   url:
   badges: []
   date: 2022-04-01
@@ -315,7 +315,7 @@
 - name: Asahi FUMIMOTO
   name_jp: 文元　朝陽
   role: b
-  image: /images/team/2024/fumimoto.jpg
+  image: /images/team/bachelor/fumimoto.jpg
   url:
   badges: []
   date: 2022-04-01
@@ -331,7 +331,7 @@
 - name: Katsuyuki MORITA
   name_jp: 森田　勝之
   role: b
-  image: /images/team/2024/morita.png
+  image: /images/team/bachelor/morita.png
   url:
   badges: []
   date: 2022-04-01
@@ -347,7 +347,7 @@
 - name: Boheng LIU
   name_jp: 劉　博恒
   role: b
-  image: /images/team/2024/ryuu.png
+  image: /images/team/bachelor/ryuu.png
   url:
   badges: []
   date: 2022-09-01
diff --git a/_data/types.yaml b/_data/types.yaml
index 7fb89540..cb846f1e 100644
--- a/_data/types.yaml
+++ b/_data/types.yaml
@@ -5,7 +5,7 @@
 pi:
   icon: fa-solid fa-microscope
   description: Principal Investigator
-  description_jp: 主任研究員
+  description_jp: 教授
 
 ap:
   icon: fa-solid fa-microscope
diff --git a/images/team/2023/abe.jpg b/images/team/2023/abe.jpg
deleted file mode 100755
index 06500074..00000000
Binary files a/images/team/2023/abe.jpg and /dev/null differ
diff --git a/images/team/2023/furukawa.jpg b/images/team/2023/furukawa.jpg
deleted file mode 100755
index 3ee5ab1f..00000000
Binary files a/images/team/2023/furukawa.jpg and /dev/null differ
diff --git a/images/team/2023/hiraoka.jpg b/images/team/2023/hiraoka.jpg
deleted file mode 100755
index de0281a5..00000000
Binary files a/images/team/2023/hiraoka.jpg and /dev/null differ
diff --git a/images/team/2023/kawahara.jpg b/images/team/2023/kawahara.jpg
deleted file mode 100755
index 2b24a303..00000000
Binary files a/images/team/2023/kawahara.jpg and /dev/null differ
diff --git a/images/team/2023/minesaki.png b/images/team/2023/minesaki.png
deleted file mode 100755
index 877f878d..00000000
Binary files a/images/team/2023/minesaki.png and /dev/null differ
diff --git a/images/team/2023/nakamura.png b/images/team/2023/nakamura.png
deleted file mode 100755
index f1718358..00000000
Binary files a/images/team/2023/nakamura.png and /dev/null differ
diff --git a/images/team/2023/park.jpg b/images/team/2023/park.jpg
deleted file mode 100755
index f8008c6d..00000000
Binary files a/images/team/2023/park.jpg and /dev/null differ
diff --git a/images/team/2023/shimizu.jpg b/images/team/2023/shimizu.jpg
deleted file mode 100755
index a339fe91..00000000
Binary files a/images/team/2023/shimizu.jpg and /dev/null differ
diff --git a/images/team/2024/mitsushima.jpg b/images/team/2024/mitsushima.jpg
deleted file mode 100755
index ff0c9655..00000000
Binary files a/images/team/2024/mitsushima.jpg and /dev/null differ
diff --git a/images/team/2024/araki.jpg b/images/team/bachelor/araki.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2024/araki.jpg
rename to images/team/bachelor/araki.jpg
diff --git a/images/team/2024/fujii.jpg b/images/team/bachelor/fujii.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2024/fujii.jpg
rename to images/team/bachelor/fujii.jpg
diff --git a/images/team/2024/fumimoto.jpg b/images/team/bachelor/fumimoto.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2024/fumimoto.jpg
rename to images/team/bachelor/fumimoto.jpg
diff --git a/images/team/2024/hirosawa.jpg b/images/team/bachelor/hirosawa.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2024/hirosawa.jpg
rename to images/team/bachelor/hirosawa.jpg
diff --git a/images/team/2024/ippitsu.jpg b/images/team/bachelor/ippitsu.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2024/ippitsu.jpg
rename to images/team/bachelor/ippitsu.jpg
diff --git a/images/team/2024/katou.jpg b/images/team/bachelor/katou.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2024/katou.jpg
rename to images/team/bachelor/katou.jpg
diff --git a/images/team/2024/morita.png b/images/team/bachelor/morita.png
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2024/morita.png
rename to images/team/bachelor/morita.png
diff --git a/images/team/2024/okada.jpg b/images/team/bachelor/okada.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2024/okada.jpg
rename to images/team/bachelor/okada.jpg
diff --git a/images/team/2024/ryuu.png b/images/team/bachelor/ryuu.png
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2024/ryuu.png
rename to images/team/bachelor/ryuu.png
diff --git a/images/team/2024/takai.jpg b/images/team/bachelor/takai.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2024/takai.jpg
rename to images/team/bachelor/takai.jpg
diff --git a/images/team/2024/tsuka.jpg b/images/team/bachelor/tsuka.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2024/tsuka.jpg
rename to images/team/bachelor/tsuka.jpg
diff --git a/images/team/master/Jin.png b/images/team/master/Jin.png
new file mode 100644
index 00000000..cb9e2029
Binary files /dev/null and b/images/team/master/Jin.png differ
diff --git a/images/team/master/Luo.png b/images/team/master/Luo.png
new file mode 100644
index 00000000..057d1038
Binary files /dev/null and b/images/team/master/Luo.png differ
diff --git a/images/team/master/Sui.png b/images/team/master/Sui.png
new file mode 100644
index 00000000..a5766a99
Binary files /dev/null and b/images/team/master/Sui.png differ
diff --git a/images/team/master/Trong.jpg b/images/team/master/Trong.jpg
new file mode 100644
index 00000000..1fc27d80
Binary files /dev/null and b/images/team/master/Trong.jpg differ
diff --git a/images/team/master/Zhang.png b/images/team/master/Zhang.png
new file mode 100644
index 00000000..835dde1e
Binary files /dev/null and b/images/team/master/Zhang.png differ
diff --git a/images/team/2023/chen.jpg b/images/team/master/chen.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2023/chen.jpg
rename to images/team/master/chen.jpg
diff --git a/images/team/2023/hieu.png b/images/team/master/hieu.png
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2023/hieu.png
rename to images/team/master/hieu.png
diff --git a/images/team/2023/kawai.jpg b/images/team/master/kawai.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2023/kawai.jpg
rename to images/team/master/kawai.jpg
diff --git a/images/team/2023/liu.jpg b/images/team/master/liu.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2023/liu.jpg
rename to images/team/master/liu.jpg
diff --git a/images/team/2023/suzuki.png b/images/team/master/suzuki.png
old mode 100755
new mode 100644
similarity index 100%
rename from images/team/2023/suzuki.png
rename to images/team/master/suzuki.png
diff --git a/images/team/others/Charlene.png b/images/team/others/Charlene.png
new file mode 100644
index 00000000..313194e2
Binary files /dev/null and b/images/team/others/Charlene.png differ
diff --git a/images/team/others/kuroda.png b/images/team/others/kuroda.png
new file mode 100644
index 00000000..c40f927f
Binary files /dev/null and b/images/team/others/kuroda.png differ