diff --git a/forge-gui/res/cardsfolder/upcoming/aggressive_instinct.txt b/forge-gui/res/cardsfolder/a/aggressive_instinct.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aggressive_instinct.txt
rename to forge-gui/res/cardsfolder/a/aggressive_instinct.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ancestor_dragon.txt b/forge-gui/res/cardsfolder/a/ancestor_dragon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ancestor_dragon.txt
rename to forge-gui/res/cardsfolder/a/ancestor_dragon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/armored_whirl_turtle.txt b/forge-gui/res/cardsfolder/a/armored_whirl_turtle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/armored_whirl_turtle.txt
rename to forge-gui/res/cardsfolder/a/armored_whirl_turtle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/breath_of_fire.txt b/forge-gui/res/cardsfolder/b/breath_of_fire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/breath_of_fire.txt
rename to forge-gui/res/cardsfolder/b/breath_of_fire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cleansing_screech.txt b/forge-gui/res/cardsfolder/c/cleansing_screech.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cleansing_screech.txt
rename to forge-gui/res/cardsfolder/c/cleansing_screech.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/colorful_feiyi_sparrow.txt b/forge-gui/res/cardsfolder/c/colorful_feiyi_sparrow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/colorful_feiyi_sparrow.txt
rename to forge-gui/res/cardsfolder/c/colorful_feiyi_sparrow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/confidence_from_strength.txt b/forge-gui/res/cardsfolder/c/confidence_from_strength.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/confidence_from_strength.txt
rename to forge-gui/res/cardsfolder/c/confidence_from_strength.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dragons_presence.txt b/forge-gui/res/cardsfolder/d/dragons_presence.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dragons_presence.txt
rename to forge-gui/res/cardsfolder/d/dragons_presence.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drown_in_shapelessness.txt b/forge-gui/res/cardsfolder/d/drown_in_shapelessness.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drown_in_shapelessness.txt
rename to forge-gui/res/cardsfolder/d/drown_in_shapelessness.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/earth_origin_yak.txt b/forge-gui/res/cardsfolder/e/earth_origin_yak.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/earth_origin_yak.txt
rename to forge-gui/res/cardsfolder/e/earth_origin_yak.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/earthshaking_si.txt b/forge-gui/res/cardsfolder/e/earthshaking_si.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/earthshaking_si.txt
rename to forge-gui/res/cardsfolder/e/earthshaking_si.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/feiyi_snake.txt b/forge-gui/res/cardsfolder/f/feiyi_snake.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/feiyi_snake.txt
rename to forge-gui/res/cardsfolder/f/feiyi_snake.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ferocious_zheng.txt b/forge-gui/res/cardsfolder/f/ferocious_zheng.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ferocious_zheng.txt
rename to forge-gui/res/cardsfolder/f/ferocious_zheng.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fire_omen_crane.txt b/forge-gui/res/cardsfolder/f/fire_omen_crane.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fire_omen_crane.txt
rename to forge-gui/res/cardsfolder/f/fire_omen_crane.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hardened_scale_armor.txt b/forge-gui/res/cardsfolder/h/hardened_scale_armor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hardened_scale_armor.txt
rename to forge-gui/res/cardsfolder/h/hardened_scale_armor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/heavenly_qilin.txt b/forge-gui/res/cardsfolder/h/heavenly_qilin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/heavenly_qilin.txt
rename to forge-gui/res/cardsfolder/h/heavenly_qilin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jiang_yanggu.txt b/forge-gui/res/cardsfolder/j/jiang_yanggu.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jiang_yanggu.txt
rename to forge-gui/res/cardsfolder/j/jiang_yanggu.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/journey_for_the_elixir.txt b/forge-gui/res/cardsfolder/j/journey_for_the_elixir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/journey_for_the_elixir.txt
rename to forge-gui/res/cardsfolder/j/journey_for_the_elixir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/leopard_spotted_jiao.txt b/forge-gui/res/cardsfolder/l/leopard_spotted_jiao.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/leopard_spotted_jiao.txt
rename to forge-gui/res/cardsfolder/l/leopard_spotted_jiao.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/moon_eating_dog.txt b/forge-gui/res/cardsfolder/m/moon_eating_dog.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/moon_eating_dog.txt
rename to forge-gui/res/cardsfolder/m/moon_eating_dog.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mu_yanling.txt b/forge-gui/res/cardsfolder/m/mu_yanling.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mu_yanling.txt
rename to forge-gui/res/cardsfolder/m/mu_yanling.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nine_tail_white_fox.txt b/forge-gui/res/cardsfolder/n/nine_tail_white_fox.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nine_tail_white_fox.txt
rename to forge-gui/res/cardsfolder/n/nine_tail_white_fox.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/purple_crystal_crab.txt b/forge-gui/res/cardsfolder/p/purple_crystal_crab.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/purple_crystal_crab.txt
rename to forge-gui/res/cardsfolder/p/purple_crystal_crab.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/qilins_blessing.txt b/forge-gui/res/cardsfolder/q/qilins_blessing.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/qilins_blessing.txt
rename to forge-gui/res/cardsfolder/q/qilins_blessing.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reckless_pangolin.txt b/forge-gui/res/cardsfolder/r/reckless_pangolin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reckless_pangolin.txt
rename to forge-gui/res/cardsfolder/r/reckless_pangolin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rhythmic_water_vortex.txt b/forge-gui/res/cardsfolder/r/rhythmic_water_vortex.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rhythmic_water_vortex.txt
rename to forge-gui/res/cardsfolder/r/rhythmic_water_vortex.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sacred_white_deer.txt b/forge-gui/res/cardsfolder/s/sacred_white_deer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sacred_white_deer.txt
rename to forge-gui/res/cardsfolder/s/sacred_white_deer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/screeching_phoenix.txt b/forge-gui/res/cardsfolder/s/screeching_phoenix.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/screeching_phoenix.txt
rename to forge-gui/res/cardsfolder/s/screeching_phoenix.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stormcloud_spirit.txt b/forge-gui/res/cardsfolder/s/stormcloud_spirit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stormcloud_spirit.txt
rename to forge-gui/res/cardsfolder/s/stormcloud_spirit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vivid_flying_fish.txt b/forge-gui/res/cardsfolder/v/vivid_flying_fish.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vivid_flying_fish.txt
rename to forge-gui/res/cardsfolder/v/vivid_flying_fish.txt