diff --git a/.github/workflows/scheduler_daily.yml b/.github/workflows/scheduler_daily.yml
index 521e39ea..17f7c8e0 100644
--- a/.github/workflows/scheduler_daily.yml
+++ b/.github/workflows/scheduler_daily.yml
@@ -71,9 +71,7 @@ jobs:
           git add Gemfile.lock
 
           # Cache responses from Japan/Clubs APIs
-          git add _data/dojos_earth.json
-          git add dojos_japan.json
-          git add events_japan.json
+          git add _data/*.json
           git add images/dojos
 
           # Save GeoJSON data to render DojoMap
diff --git a/dojos_earth_20231204.json b/_data/dojos_earth_20231204.json
similarity index 100%
rename from dojos_earth_20231204.json
rename to _data/dojos_earth_20231204.json
diff --git a/dojos_earth_20241205.json b/_data/dojos_earth_20241205.json
similarity index 100%
rename from dojos_earth_20241205.json
rename to _data/dojos_earth_20241205.json
diff --git a/dojos_japan.json b/_data/dojos_japan.json
similarity index 100%
rename from dojos_japan.json
rename to _data/dojos_japan.json
diff --git a/events_japan.json b/_data/events_japan.json
similarity index 100%
rename from events_japan.json
rename to _data/events_japan.json
diff --git a/cache_dojo_logos.rb b/cache_dojo_logos.rb
index 8a8ed217..c56ad3a0 100755
--- a/cache_dojo_logos.rb
+++ b/cache_dojo_logos.rb
@@ -4,7 +4,7 @@
 
 # Caching images from coderdojo.jp to local filesystem
 dojos_japan = []
-File.open('dojos_japan.json') do |file|
+File.open('_data/dojos_japan.json') do |file|
   dojos_japan = JSON.load(file, nil, symbolize_names: true, create_additions: false)
 end
 
diff --git a/get_data_from_japan.rb b/get_data_from_japan.rb
index 734649de..100ce7fc 100755
--- a/get_data_from_japan.rb
+++ b/get_data_from_japan.rb
@@ -9,17 +9,17 @@
 EVENTS_DATA = JSON.parse Net::HTTP.get(URI.parse "#{BASE_URL}/events.json"), symbolize_names: true
 EVENTS_JSON = JSON.pretty_generate EVENTS_DATA.sort_by{|dojo| dojo[:id]}
 
-File.open("dojos_japan.json",  "w") { |file| file.write(DOJOS_JSON)  }
-File.open("events_japan.json", "w") { |file| file.write(EVENTS_JSON) }
+File.open("_data/dojos_japan.json",  "w") { |file| file.write(DOJOS_JSON)  }
+File.open("_data/events_japan.json", "w") { |file| file.write(EVENTS_JSON) }
 
 # Show next step for developers
 puts DOJOS_JSON
 puts ''
 puts 'Check out JSON data you fetched by:'
-puts '$ cat dojos_japan.json'
+puts '$ cat _data/dojos_japan.json'
 puts ''
 puts EVENTS_JSON
 puts ''
 puts 'Check out JSON data you fetched by:'
-puts '$ cat events_japan.json'
+puts '$ cat _data/events_japan.json'
 puts ''
diff --git a/upsert_dojos_geojson.rb b/upsert_dojos_geojson.rb
index 9903a3ae..ae0ddcad 100755
--- a/upsert_dojos_geojson.rb
+++ b/upsert_dojos_geojson.rb
@@ -9,8 +9,8 @@
 
 json_load_options = { symbolize_names: true, create_additions: false }
 File.open("_data/dojos_earth.json") {|file| dojos_earth  = JSON.load(file, nil, json_load_options) }
-File.open("dojos_japan.json") {|file| dojos_japan  = JSON.load(file, nil, json_load_options) }
-File.open("events_japan.json"){|file| events_japan = JSON.load(file, nil, json_load_options) }
+File.open("_data/dojos_japan.json") {|file| dojos_japan  = JSON.load(file, nil, json_load_options) }
+File.open("_data/events_japan.json"){|file| events_japan = JSON.load(file, nil, json_load_options) }
 #pp dojos_earth.first, dojos_japan.first, events_japan.first
 
 # dojo2dojo.csv で Clubs DB と Japan DB のクラブ名を突合する