diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..cd3ef8e61
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "data"]
+	path = data
+	url = git@github.com:glyh/JavSP-meta.git
diff --git a/JavSP.py b/JavSP.py
index cee585262..a177f1912 100644
--- a/JavSP.py
+++ b/JavSP.py
@@ -45,7 +45,8 @@
 
 actressAliasMap = {}
 if cfg.NFO.fix_actress_name:
-    actressAliasFilePath = mei_path("data/actress_alias.json")
+
+    actressAliasFilePath = mei_path("data/aliases/ja_JP/actress_alias.json")
     with open(actressAliasFilePath, "r", encoding="utf-8") as file:
         actressAliasMap = json.load(file)
 
diff --git a/data b/data
new file mode 160000
index 000000000..72bfe6a4a
--- /dev/null
+++ b/data
@@ -0,0 +1 @@
+Subproject commit 72bfe6a4ab0546865f5492e21f38c4568de08151
diff --git a/web/javbus.py b/web/javbus.py
index 51003678b..988680754 100644
--- a/web/javbus.py
+++ b/web/javbus.py
@@ -13,7 +13,7 @@
 
 
 logger = logging.getLogger(__name__)
-genre_map = GenreMap('data/genre_javbus.csv')
+genre_map = GenreMap('data/genres/javbus.csv')
 permanent_url = 'https://www.javbus.com'
 if cfg.Network.proxy:
     base_url = permanent_url
diff --git a/web/javdb.py b/web/javdb.py
index e725181e0..0f2e9e848 100644
--- a/web/javdb.py
+++ b/web/javdb.py
@@ -19,7 +19,7 @@
 request.headers['Accept-Language'] = 'zh-CN,zh;q=0.9,zh-TW;q=0.8,en-US;q=0.7,en;q=0.6,ja;q=0.5'
 
 logger = logging.getLogger(__name__)
-genre_map = GenreMap('data/genre_javdb.csv')
+genre_map = GenreMap('data/genres/javdb.csv')
 permanent_url = 'https://javdb.com'
 if cfg.Network.proxy:
     base_url = permanent_url
@@ -231,7 +231,7 @@ def collect_actress_alias(type=0, use_original=True):
 
     actressAliasMap = {}
 
-    actressAliasFilePath = "data/actress_alias.json"
+    actressAliasFilePath = "data/aliases/ja_JP/actress_alias.json"
     # 检查文件是否存在
     if not os.path.exists(actressAliasFilePath):
         # 如果文件不存在，创建文件并写入空字典