diff --git a/forge-gui/res/cardsfolder/upcoming/adaptive_shimmerer.txt b/forge-gui/res/cardsfolder/a/adaptive_shimmerer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/adaptive_shimmerer.txt
rename to forge-gui/res/cardsfolder/a/adaptive_shimmerer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aegis_turtle.txt b/forge-gui/res/cardsfolder/a/aegis_turtle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aegis_turtle.txt
rename to forge-gui/res/cardsfolder/a/aegis_turtle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alert_heedbonder.txt b/forge-gui/res/cardsfolder/a/alert_heedbonder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alert_heedbonder.txt
rename to forge-gui/res/cardsfolder/a/alert_heedbonder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/almighty_brushwagg.txt b/forge-gui/res/cardsfolder/a/almighty_brushwagg.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/almighty_brushwagg.txt
rename to forge-gui/res/cardsfolder/a/almighty_brushwagg.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/avian_oddity.txt b/forge-gui/res/cardsfolder/a/avian_oddity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/avian_oddity.txt
rename to forge-gui/res/cardsfolder/a/avian_oddity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/back_for_more.txt b/forge-gui/res/cardsfolder/b/back_for_more.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/back_for_more.txt
rename to forge-gui/res/cardsfolder/b/back_for_more.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/barrier_breach.txt b/forge-gui/res/cardsfolder/b/barrier_breach.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/barrier_breach.txt
rename to forge-gui/res/cardsfolder/b/barrier_breach.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bastion_of_remembrance.txt b/forge-gui/res/cardsfolder/b/bastion_of_remembrance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bastion_of_remembrance.txt
rename to forge-gui/res/cardsfolder/b/bastion_of_remembrance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blade_banish.txt b/forge-gui/res/cardsfolder/b/blade_banish.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blade_banish.txt
rename to forge-gui/res/cardsfolder/b/blade_banish.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blisterspit_gremlin.txt b/forge-gui/res/cardsfolder/b/blisterspit_gremlin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blisterspit_gremlin.txt
rename to forge-gui/res/cardsfolder/b/blisterspit_gremlin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blitz_leech.txt b/forge-gui/res/cardsfolder/b/blitz_leech.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blitz_leech.txt
rename to forge-gui/res/cardsfolder/b/blitz_leech.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blitz_of_the_thunder_raptor.txt b/forge-gui/res/cardsfolder/b/blitz_of_the_thunder_raptor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blitz_of_the_thunder_raptor.txt
rename to forge-gui/res/cardsfolder/b/blitz_of_the_thunder_raptor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blood_curdle.txt b/forge-gui/res/cardsfolder/b/blood_curdle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blood_curdle.txt
rename to forge-gui/res/cardsfolder/b/blood_curdle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bonders_enclave.txt b/forge-gui/res/cardsfolder/b/bonders_enclave.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bonders_enclave.txt
rename to forge-gui/res/cardsfolder/b/bonders_enclave.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/boon_of_the_wish_giver.txt b/forge-gui/res/cardsfolder/b/boon_of_the_wish_giver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/boon_of_the_wish_giver.txt
rename to forge-gui/res/cardsfolder/b/boon_of_the_wish_giver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/boot_nipper.txt b/forge-gui/res/cardsfolder/b/boot_nipper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/boot_nipper.txt
rename to forge-gui/res/cardsfolder/b/boot_nipper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bushmeat_poacher.txt b/forge-gui/res/cardsfolder/b/bushmeat_poacher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bushmeat_poacher.txt
rename to forge-gui/res/cardsfolder/b/bushmeat_poacher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/call_of_the_death_dweller.txt b/forge-gui/res/cardsfolder/c/call_of_the_death_dweller.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/call_of_the_death_dweller.txt
rename to forge-gui/res/cardsfolder/c/call_of_the_death_dweller.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/channeled_force.txt b/forge-gui/res/cardsfolder/c/channeled_force.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/channeled_force.txt
rename to forge-gui/res/cardsfolder/c/channeled_force.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/charge_of_the_forever_beast.txt b/forge-gui/res/cardsfolder/c/charge_of_the_forever_beast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/charge_of_the_forever_beast.txt
rename to forge-gui/res/cardsfolder/c/charge_of_the_forever_beast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/checkpoint_officer.txt b/forge-gui/res/cardsfolder/c/checkpoint_officer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/checkpoint_officer.txt
rename to forge-gui/res/cardsfolder/c/checkpoint_officer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chevill_bane_of_monsters.txt b/forge-gui/res/cardsfolder/c/chevill_bane_of_monsters.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chevill_bane_of_monsters.txt
rename to forge-gui/res/cardsfolder/c/chevill_bane_of_monsters.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clash_of_titans.txt b/forge-gui/res/cardsfolder/c/clash_of_titans.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clash_of_titans.txt
rename to forge-gui/res/cardsfolder/c/clash_of_titans.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/colossification.txt b/forge-gui/res/cardsfolder/c/colossification.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/colossification.txt
rename to forge-gui/res/cardsfolder/c/colossification.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/coordinated_charge.txt b/forge-gui/res/cardsfolder/c/coordinated_charge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/coordinated_charge.txt
rename to forge-gui/res/cardsfolder/c/coordinated_charge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crystacean.txt b/forge-gui/res/cardsfolder/c/crystacean.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crystacean.txt
rename to forge-gui/res/cardsfolder/c/crystacean.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crystalline_giant.txt b/forge-gui/res/cardsfolder/c/crystalline_giant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crystalline_giant.txt
rename to forge-gui/res/cardsfolder/c/crystalline_giant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cunning_nightbonder.txt b/forge-gui/res/cardsfolder/c/cunning_nightbonder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cunning_nightbonder.txt
rename to forge-gui/res/cardsfolder/c/cunning_nightbonder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/daysquad_marshal.txt b/forge-gui/res/cardsfolder/d/daysquad_marshal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/daysquad_marshal.txt
rename to forge-gui/res/cardsfolder/d/daysquad_marshal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deaths_oasis.txt b/forge-gui/res/cardsfolder/d/deaths_oasis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deaths_oasis.txt
rename to forge-gui/res/cardsfolder/d/deaths_oasis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dire_tactics.txt b/forge-gui/res/cardsfolder/d/dire_tactics.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dire_tactics.txt
rename to forge-gui/res/cardsfolder/d/dire_tactics.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drannith_healer.txt b/forge-gui/res/cardsfolder/d/drannith_healer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drannith_healer.txt
rename to forge-gui/res/cardsfolder/d/drannith_healer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drannith_magistrate.txt b/forge-gui/res/cardsfolder/d/drannith_magistrate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drannith_magistrate.txt
rename to forge-gui/res/cardsfolder/d/drannith_magistrate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drannith_stinger.txt b/forge-gui/res/cardsfolder/d/drannith_stinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drannith_stinger.txt
rename to forge-gui/res/cardsfolder/d/drannith_stinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/durable_coilbug.txt b/forge-gui/res/cardsfolder/d/durable_coilbug.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/durable_coilbug.txt
rename to forge-gui/res/cardsfolder/d/durable_coilbug.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/duskfang_mentor.txt b/forge-gui/res/cardsfolder/d/duskfang_mentor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/duskfang_mentor.txt
rename to forge-gui/res/cardsfolder/d/duskfang_mentor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/easy_prey.txt b/forge-gui/res/cardsfolder/e/easy_prey.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/easy_prey.txt
rename to forge-gui/res/cardsfolder/e/easy_prey.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eerie_ultimatum.txt b/forge-gui/res/cardsfolder/e/eerie_ultimatum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eerie_ultimatum.txt
rename to forge-gui/res/cardsfolder/e/eerie_ultimatum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/emergent_ultimatum.txt b/forge-gui/res/cardsfolder/e/emergent_ultimatum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/emergent_ultimatum.txt
rename to forge-gui/res/cardsfolder/e/emergent_ultimatum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/escape_protocol.txt b/forge-gui/res/cardsfolder/e/escape_protocol.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/escape_protocol.txt
rename to forge-gui/res/cardsfolder/e/escape_protocol.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/excavation_mole.txt b/forge-gui/res/cardsfolder/e/excavation_mole.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/excavation_mole.txt
rename to forge-gui/res/cardsfolder/e/excavation_mole.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/extinction_event.txt b/forge-gui/res/cardsfolder/e/extinction_event.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/extinction_event.txt
rename to forge-gui/res/cardsfolder/e/extinction_event.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/exuberant_wolfbear.txt b/forge-gui/res/cardsfolder/e/exuberant_wolfbear.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/exuberant_wolfbear.txt
rename to forge-gui/res/cardsfolder/e/exuberant_wolfbear.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/facet_reader.txt b/forge-gui/res/cardsfolder/f/facet_reader.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/facet_reader.txt
rename to forge-gui/res/cardsfolder/f/facet_reader.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/farfinder.txt b/forge-gui/res/cardsfolder/f/farfinder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/farfinder.txt
rename to forge-gui/res/cardsfolder/f/farfinder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ferocious_tigorilla.txt b/forge-gui/res/cardsfolder/f/ferocious_tigorilla.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ferocious_tigorilla.txt
rename to forge-gui/res/cardsfolder/f/ferocious_tigorilla.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fiend_artisan.txt b/forge-gui/res/cardsfolder/f/fiend_artisan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fiend_artisan.txt
rename to forge-gui/res/cardsfolder/f/fiend_artisan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fight_as_one.txt b/forge-gui/res/cardsfolder/f/fight_as_one.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fight_as_one.txt
rename to forge-gui/res/cardsfolder/f/fight_as_one.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fire_prophecy.txt b/forge-gui/res/cardsfolder/f/fire_prophecy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fire_prophecy.txt
rename to forge-gui/res/cardsfolder/f/fire_prophecy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flourishing_fox.txt b/forge-gui/res/cardsfolder/f/flourishing_fox.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flourishing_fox.txt
rename to forge-gui/res/cardsfolder/f/flourishing_fox.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flycatcher_giraffid.txt b/forge-gui/res/cardsfolder/f/flycatcher_giraffid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flycatcher_giraffid.txt
rename to forge-gui/res/cardsfolder/f/flycatcher_giraffid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/footfall_crater.txt b/forge-gui/res/cardsfolder/f/footfall_crater.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/footfall_crater.txt
rename to forge-gui/res/cardsfolder/f/footfall_crater.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/forbidden_friendship.txt b/forge-gui/res/cardsfolder/f/forbidden_friendship.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/forbidden_friendship.txt
rename to forge-gui/res/cardsfolder/f/forbidden_friendship.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frillscare_mentor.txt b/forge-gui/res/cardsfolder/f/frillscare_mentor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frillscare_mentor.txt
rename to forge-gui/res/cardsfolder/f/frillscare_mentor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frondland_felidar.txt b/forge-gui/res/cardsfolder/f/frondland_felidar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frondland_felidar.txt
rename to forge-gui/res/cardsfolder/f/frondland_felidar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frostveil_ambush.txt b/forge-gui/res/cardsfolder/f/frostveil_ambush.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frostveil_ambush.txt
rename to forge-gui/res/cardsfolder/f/frostveil_ambush.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fully_grown.txt b/forge-gui/res/cardsfolder/f/fully_grown.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fully_grown.txt
rename to forge-gui/res/cardsfolder/f/fully_grown.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/garrison_cat.txt b/forge-gui/res/cardsfolder/g/garrison_cat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/garrison_cat.txt
rename to forge-gui/res/cardsfolder/g/garrison_cat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/general_kudro_of_drannith.txt b/forge-gui/res/cardsfolder/g/general_kudro_of_drannith.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/general_kudro_of_drannith.txt
rename to forge-gui/res/cardsfolder/g/general_kudro_of_drannith.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/generals_enforcer.txt b/forge-gui/res/cardsfolder/g/generals_enforcer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/generals_enforcer.txt
rename to forge-gui/res/cardsfolder/g/generals_enforcer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/genesis_ultimatum.txt b/forge-gui/res/cardsfolder/g/genesis_ultimatum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/genesis_ultimatum.txt
rename to forge-gui/res/cardsfolder/g/genesis_ultimatum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glimmerbell.txt b/forge-gui/res/cardsfolder/g/glimmerbell.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glimmerbell.txt
rename to forge-gui/res/cardsfolder/g/glimmerbell.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gloom_pangolin.txt b/forge-gui/res/cardsfolder/g/gloom_pangolin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gloom_pangolin.txt
rename to forge-gui/res/cardsfolder/g/gloom_pangolin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/go_for_blood.txt b/forge-gui/res/cardsfolder/g/go_for_blood.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/go_for_blood.txt
rename to forge-gui/res/cardsfolder/g/go_for_blood.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/grimdancer.txt b/forge-gui/res/cardsfolder/g/grimdancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/grimdancer.txt
rename to forge-gui/res/cardsfolder/g/grimdancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gust_of_wind.txt b/forge-gui/res/cardsfolder/g/gust_of_wind.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gust_of_wind.txt
rename to forge-gui/res/cardsfolder/g/gust_of_wind.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hampering_snare.txt b/forge-gui/res/cardsfolder/h/hampering_snare.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hampering_snare.txt
rename to forge-gui/res/cardsfolder/h/hampering_snare.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/heartless_act.txt b/forge-gui/res/cardsfolder/h/heartless_act.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/heartless_act.txt
rename to forge-gui/res/cardsfolder/h/heartless_act.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/heightened_reflexes.txt b/forge-gui/res/cardsfolder/h/heightened_reflexes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/heightened_reflexes.txt
rename to forge-gui/res/cardsfolder/h/heightened_reflexes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/helica_glider.txt b/forge-gui/res/cardsfolder/h/helica_glider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/helica_glider.txt
rename to forge-gui/res/cardsfolder/h/helica_glider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/honey_mammoth.txt b/forge-gui/res/cardsfolder/h/honey_mammoth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/honey_mammoth.txt
rename to forge-gui/res/cardsfolder/h/honey_mammoth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hornbash_mentor.txt b/forge-gui/res/cardsfolder/h/hornbash_mentor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hornbash_mentor.txt
rename to forge-gui/res/cardsfolder/h/hornbash_mentor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/humble_naturalist.txt b/forge-gui/res/cardsfolder/h/humble_naturalist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/humble_naturalist.txt
rename to forge-gui/res/cardsfolder/h/humble_naturalist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/imposing_vantasaur.txt b/forge-gui/res/cardsfolder/i/imposing_vantasaur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/imposing_vantasaur.txt
rename to forge-gui/res/cardsfolder/i/imposing_vantasaur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/indatha_crystal.txt b/forge-gui/res/cardsfolder/i/indatha_crystal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/indatha_crystal.txt
rename to forge-gui/res/cardsfolder/i/indatha_crystal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/indatha_triome.txt b/forge-gui/res/cardsfolder/i/indatha_triome.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/indatha_triome.txt
rename to forge-gui/res/cardsfolder/i/indatha_triome.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/inspired_ultimatum.txt b/forge-gui/res/cardsfolder/i/inspired_ultimatum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/inspired_ultimatum.txt
rename to forge-gui/res/cardsfolder/i/inspired_ultimatum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jubilant_skybonder.txt b/forge-gui/res/cardsfolder/j/jubilant_skybonder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jubilant_skybonder.txt
rename to forge-gui/res/cardsfolder/j/jubilant_skybonder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/keensight_mentor.txt b/forge-gui/res/cardsfolder/k/keensight_mentor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/keensight_mentor.txt
rename to forge-gui/res/cardsfolder/k/keensight_mentor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/keep_safe.txt b/forge-gui/res/cardsfolder/k/keep_safe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/keep_safe.txt
rename to forge-gui/res/cardsfolder/k/keep_safe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ketria_crystal.txt b/forge-gui/res/cardsfolder/k/ketria_crystal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ketria_crystal.txt
rename to forge-gui/res/cardsfolder/k/ketria_crystal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ketria_triome.txt b/forge-gui/res/cardsfolder/k/ketria_triome.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ketria_triome.txt
rename to forge-gui/res/cardsfolder/k/ketria_triome.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kinnan_bonder_prodigy.txt b/forge-gui/res/cardsfolder/k/kinnan_bonder_prodigy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kinnan_bonder_prodigy.txt
rename to forge-gui/res/cardsfolder/k/kinnan_bonder_prodigy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kogla_the_titan_ape.txt b/forge-gui/res/cardsfolder/k/kogla_the_titan_ape.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kogla_the_titan_ape.txt
rename to forge-gui/res/cardsfolder/k/kogla_the_titan_ape.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/labyrinth_raptor.txt b/forge-gui/res/cardsfolder/l/labyrinth_raptor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/labyrinth_raptor.txt
rename to forge-gui/res/cardsfolder/l/labyrinth_raptor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lava_serpent.txt b/forge-gui/res/cardsfolder/l/lava_serpent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lava_serpent.txt
rename to forge-gui/res/cardsfolder/l/lava_serpent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/light_of_hope.txt b/forge-gui/res/cardsfolder/l/light_of_hope.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/light_of_hope.txt
rename to forge-gui/res/cardsfolder/l/light_of_hope.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lukka_coppercoat_outcast.txt b/forge-gui/res/cardsfolder/l/lukka_coppercoat_outcast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lukka_coppercoat_outcast.txt
rename to forge-gui/res/cardsfolder/l/lukka_coppercoat_outcast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/luminous_broodmoth.txt b/forge-gui/res/cardsfolder/l/luminous_broodmoth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/luminous_broodmoth.txt
rename to forge-gui/res/cardsfolder/l/luminous_broodmoth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lurking_deadeye.txt b/forge-gui/res/cardsfolder/l/lurking_deadeye.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lurking_deadeye.txt
rename to forge-gui/res/cardsfolder/l/lurking_deadeye.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/maned_serval.txt b/forge-gui/res/cardsfolder/m/maned_serval.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/maned_serval.txt
rename to forge-gui/res/cardsfolder/m/maned_serval.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/memory_leak.txt b/forge-gui/res/cardsfolder/m/memory_leak.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/memory_leak.txt
rename to forge-gui/res/cardsfolder/m/memory_leak.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/migration_path.txt b/forge-gui/res/cardsfolder/m/migration_path.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/migration_path.txt
rename to forge-gui/res/cardsfolder/m/migration_path.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/momentum_rumbler.txt b/forge-gui/res/cardsfolder/m/momentum_rumbler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/momentum_rumbler.txt
rename to forge-gui/res/cardsfolder/m/momentum_rumbler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/monstrous_step.txt b/forge-gui/res/cardsfolder/m/monstrous_step.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/monstrous_step.txt
rename to forge-gui/res/cardsfolder/m/monstrous_step.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mosscoat_goriak.txt b/forge-gui/res/cardsfolder/m/mosscoat_goriak.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mosscoat_goriak.txt
rename to forge-gui/res/cardsfolder/m/mosscoat_goriak.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mutual_destruction.txt b/forge-gui/res/cardsfolder/m/mutual_destruction.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mutual_destruction.txt
rename to forge-gui/res/cardsfolder/m/mutual_destruction.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mystic_subdual.txt b/forge-gui/res/cardsfolder/m/mystic_subdual.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mystic_subdual.txt
rename to forge-gui/res/cardsfolder/m/mystic_subdual.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mythos_of_brokkos.txt b/forge-gui/res/cardsfolder/m/mythos_of_brokkos.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mythos_of_brokkos.txt
rename to forge-gui/res/cardsfolder/m/mythos_of_brokkos.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mythos_of_illuna.txt b/forge-gui/res/cardsfolder/m/mythos_of_illuna.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mythos_of_illuna.txt
rename to forge-gui/res/cardsfolder/m/mythos_of_illuna.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mythos_of_nethroi.txt b/forge-gui/res/cardsfolder/m/mythos_of_nethroi.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mythos_of_nethroi.txt
rename to forge-gui/res/cardsfolder/m/mythos_of_nethroi.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mythos_of_snapdax.txt b/forge-gui/res/cardsfolder/m/mythos_of_snapdax.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mythos_of_snapdax.txt
rename to forge-gui/res/cardsfolder/m/mythos_of_snapdax.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mythos_of_vadrok.txt b/forge-gui/res/cardsfolder/m/mythos_of_vadrok.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mythos_of_vadrok.txt
rename to forge-gui/res/cardsfolder/m/mythos_of_vadrok.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/narset_of_the_ancient_way.txt b/forge-gui/res/cardsfolder/n/narset_of_the_ancient_way.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/narset_of_the_ancient_way.txt
rename to forge-gui/res/cardsfolder/n/narset_of_the_ancient_way.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/neutralize.txt b/forge-gui/res/cardsfolder/n/neutralize.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/neutralize.txt
rename to forge-gui/res/cardsfolder/n/neutralize.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nightsquad_commando.txt b/forge-gui/res/cardsfolder/n/nightsquad_commando.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nightsquad_commando.txt
rename to forge-gui/res/cardsfolder/n/nightsquad_commando.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/of_one_mind.txt b/forge-gui/res/cardsfolder/o/of_one_mind.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/of_one_mind.txt
rename to forge-gui/res/cardsfolder/o/of_one_mind.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/offsprings_revenge.txt b/forge-gui/res/cardsfolder/o/offsprings_revenge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/offsprings_revenge.txt
rename to forge-gui/res/cardsfolder/o/offsprings_revenge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ominous_seas.txt b/forge-gui/res/cardsfolder/o/ominous_seas.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ominous_seas.txt
rename to forge-gui/res/cardsfolder/o/ominous_seas.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/patagia_tiger.txt b/forge-gui/res/cardsfolder/p/patagia_tiger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/patagia_tiger.txt
rename to forge-gui/res/cardsfolder/p/patagia_tiger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/perimeter_sergeant.txt b/forge-gui/res/cardsfolder/p/perimeter_sergeant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/perimeter_sergeant.txt
rename to forge-gui/res/cardsfolder/p/perimeter_sergeant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phase_dolphin.txt b/forge-gui/res/cardsfolder/p/phase_dolphin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phase_dolphin.txt
rename to forge-gui/res/cardsfolder/p/phase_dolphin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prickly_marmoset.txt b/forge-gui/res/cardsfolder/p/prickly_marmoset.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prickly_marmoset.txt
rename to forge-gui/res/cardsfolder/p/prickly_marmoset.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/primal_empathy.txt b/forge-gui/res/cardsfolder/p/primal_empathy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/primal_empathy.txt
rename to forge-gui/res/cardsfolder/p/primal_empathy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/proud_wildbonder.txt b/forge-gui/res/cardsfolder/p/proud_wildbonder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/proud_wildbonder.txt
rename to forge-gui/res/cardsfolder/p/proud_wildbonder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pyroceratops.txt b/forge-gui/res/cardsfolder/p/pyroceratops.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pyroceratops.txt
rename to forge-gui/res/cardsfolder/p/pyroceratops.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quartzwood_crasher.txt b/forge-gui/res/cardsfolder/q/quartzwood_crasher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quartzwood_crasher.txt
rename to forge-gui/res/cardsfolder/q/quartzwood_crasher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/raking_claws.txt b/forge-gui/res/cardsfolder/r/raking_claws.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raking_claws.txt
rename to forge-gui/res/cardsfolder/r/raking_claws.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/raugrin_crystal.txt b/forge-gui/res/cardsfolder/r/raugrin_crystal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raugrin_crystal.txt
rename to forge-gui/res/cardsfolder/r/raugrin_crystal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/raugrin_triome.txt b/forge-gui/res/cardsfolder/r/raugrin_triome.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raugrin_triome.txt
rename to forge-gui/res/cardsfolder/r/raugrin_triome.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reconnaissance_mission.txt b/forge-gui/res/cardsfolder/r/reconnaissance_mission.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reconnaissance_mission.txt
rename to forge-gui/res/cardsfolder/r/reconnaissance_mission.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reptilian_reflection.txt b/forge-gui/res/cardsfolder/r/reptilian_reflection.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reptilian_reflection.txt
rename to forge-gui/res/cardsfolder/r/reptilian_reflection.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rielle_the_everwise.txt b/forge-gui/res/cardsfolder/r/rielle_the_everwise.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rielle_the_everwise.txt
rename to forge-gui/res/cardsfolder/r/rielle_the_everwise.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rooting_moloch.txt b/forge-gui/res/cardsfolder/r/rooting_moloch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rooting_moloch.txt
rename to forge-gui/res/cardsfolder/r/rooting_moloch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ruinous_ultimatum.txt b/forge-gui/res/cardsfolder/r/ruinous_ultimatum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ruinous_ultimatum.txt
rename to forge-gui/res/cardsfolder/r/ruinous_ultimatum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rumbling_rockslide.txt b/forge-gui/res/cardsfolder/r/rumbling_rockslide.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rumbling_rockslide.txt
rename to forge-gui/res/cardsfolder/r/rumbling_rockslide.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sanctuary_lockdown.txt b/forge-gui/res/cardsfolder/s/sanctuary_lockdown.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sanctuary_lockdown.txt
rename to forge-gui/res/cardsfolder/s/sanctuary_lockdown.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sanctuary_smasher.txt b/forge-gui/res/cardsfolder/s/sanctuary_smasher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sanctuary_smasher.txt
rename to forge-gui/res/cardsfolder/s/sanctuary_smasher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/savai_crystal.txt b/forge-gui/res/cardsfolder/s/savai_crystal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/savai_crystal.txt
rename to forge-gui/res/cardsfolder/s/savai_crystal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/savai_sabertooth.txt b/forge-gui/res/cardsfolder/s/savai_sabertooth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/savai_sabertooth.txt
rename to forge-gui/res/cardsfolder/s/savai_sabertooth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/savai_thundermane.txt b/forge-gui/res/cardsfolder/s/savai_thundermane.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/savai_thundermane.txt
rename to forge-gui/res/cardsfolder/s/savai_thundermane.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/savai_triome.txt b/forge-gui/res/cardsfolder/s/savai_triome.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/savai_triome.txt
rename to forge-gui/res/cardsfolder/s/savai_triome.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/serrated_scorpion.txt b/forge-gui/res/cardsfolder/s/serrated_scorpion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/serrated_scorpion.txt
rename to forge-gui/res/cardsfolder/s/serrated_scorpion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shark_typhoon.txt b/forge-gui/res/cardsfolder/s/shark_typhoon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shark_typhoon.txt
rename to forge-gui/res/cardsfolder/s/shark_typhoon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shredded_sails.txt b/forge-gui/res/cardsfolder/s/shredded_sails.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shredded_sails.txt
rename to forge-gui/res/cardsfolder/s/shredded_sails.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skull_prophet.txt b/forge-gui/res/cardsfolder/s/skull_prophet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skull_prophet.txt
rename to forge-gui/res/cardsfolder/s/skull_prophet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skycat_sovereign.txt b/forge-gui/res/cardsfolder/s/skycat_sovereign.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skycat_sovereign.txt
rename to forge-gui/res/cardsfolder/s/skycat_sovereign.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sleeper_dart.txt b/forge-gui/res/cardsfolder/s/sleeper_dart.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sleeper_dart.txt
rename to forge-gui/res/cardsfolder/s/sleeper_dart.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slitherwisp.txt b/forge-gui/res/cardsfolder/s/slitherwisp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slitherwisp.txt
rename to forge-gui/res/cardsfolder/s/slitherwisp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/snare_tactician.txt b/forge-gui/res/cardsfolder/s/snare_tactician.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/snare_tactician.txt
rename to forge-gui/res/cardsfolder/s/snare_tactician.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/solid_footing.txt b/forge-gui/res/cardsfolder/s/solid_footing.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/solid_footing.txt
rename to forge-gui/res/cardsfolder/s/solid_footing.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/song_of_creation.txt b/forge-gui/res/cardsfolder/s/song_of_creation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/song_of_creation.txt
rename to forge-gui/res/cardsfolder/s/song_of_creation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sonorous_howlbonder.txt b/forge-gui/res/cardsfolder/s/sonorous_howlbonder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sonorous_howlbonder.txt
rename to forge-gui/res/cardsfolder/s/sonorous_howlbonder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spelleater_wolverine.txt b/forge-gui/res/cardsfolder/s/spelleater_wolverine.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spelleater_wolverine.txt
rename to forge-gui/res/cardsfolder/s/spelleater_wolverine.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/splendor_mare.txt b/forge-gui/res/cardsfolder/s/splendor_mare.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/splendor_mare.txt
rename to forge-gui/res/cardsfolder/s/splendor_mare.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spontaneous_flight.txt b/forge-gui/res/cardsfolder/s/spontaneous_flight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spontaneous_flight.txt
rename to forge-gui/res/cardsfolder/s/spontaneous_flight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/springjaw_trap.txt b/forge-gui/res/cardsfolder/s/springjaw_trap.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/springjaw_trap.txt
rename to forge-gui/res/cardsfolder/s/springjaw_trap.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sprite_dragon.txt b/forge-gui/res/cardsfolder/s/sprite_dragon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sprite_dragon.txt
rename to forge-gui/res/cardsfolder/s/sprite_dragon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/startling_development.txt b/forge-gui/res/cardsfolder/s/startling_development.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/startling_development.txt
rename to forge-gui/res/cardsfolder/s/startling_development.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stormwild_capridor.txt b/forge-gui/res/cardsfolder/s/stormwild_capridor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stormwild_capridor.txt
rename to forge-gui/res/cardsfolder/s/stormwild_capridor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sudden_spinnerets.txt b/forge-gui/res/cardsfolder/s/sudden_spinnerets.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sudden_spinnerets.txt
rename to forge-gui/res/cardsfolder/s/sudden_spinnerets.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/suffocating_fumes.txt b/forge-gui/res/cardsfolder/s/suffocating_fumes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/suffocating_fumes.txt
rename to forge-gui/res/cardsfolder/s/suffocating_fumes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/survivors_bond.txt b/forge-gui/res/cardsfolder/s/survivors_bond.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/survivors_bond.txt
rename to forge-gui/res/cardsfolder/s/survivors_bond.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/swallow_whole.txt b/forge-gui/res/cardsfolder/s/swallow_whole.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/swallow_whole.txt
rename to forge-gui/res/cardsfolder/s/swallow_whole.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tentative_connection.txt b/forge-gui/res/cardsfolder/t/tentative_connection.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tentative_connection.txt
rename to forge-gui/res/cardsfolder/t/tentative_connection.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_ozolith.txt b/forge-gui/res/cardsfolder/t/the_ozolith.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_ozolith.txt
rename to forge-gui/res/cardsfolder/t/the_ozolith.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thieving_otter.txt b/forge-gui/res/cardsfolder/t/thieving_otter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thieving_otter.txt
rename to forge-gui/res/cardsfolder/t/thieving_otter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thwart_the_enemy.txt b/forge-gui/res/cardsfolder/t/thwart_the_enemy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thwart_the_enemy.txt
rename to forge-gui/res/cardsfolder/t/thwart_the_enemy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/titanoth_rex.txt b/forge-gui/res/cardsfolder/t/titanoth_rex.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/titanoth_rex.txt
rename to forge-gui/res/cardsfolder/t/titanoth_rex.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/titans_nest.txt b/forge-gui/res/cardsfolder/t/titans_nest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/titans_nest.txt
rename to forge-gui/res/cardsfolder/t/titans_nest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unbreakable_bond.txt b/forge-gui/res/cardsfolder/u/unbreakable_bond.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unbreakable_bond.txt
rename to forge-gui/res/cardsfolder/u/unbreakable_bond.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unexpected_fangs.txt b/forge-gui/res/cardsfolder/u/unexpected_fangs.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unexpected_fangs.txt
rename to forge-gui/res/cardsfolder/u/unexpected_fangs.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unpredictable_cyclone.txt b/forge-gui/res/cardsfolder/u/unpredictable_cyclone.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unpredictable_cyclone.txt
rename to forge-gui/res/cardsfolder/u/unpredictable_cyclone.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/valiant_rescuer.txt b/forge-gui/res/cardsfolder/v/valiant_rescuer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/valiant_rescuer.txt
rename to forge-gui/res/cardsfolder/v/valiant_rescuer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vivien_monsters_advocate.txt b/forge-gui/res/cardsfolder/v/vivien_monsters_advocate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vivien_monsters_advocate.txt
rename to forge-gui/res/cardsfolder/v/vivien_monsters_advocate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/void_beckoner.txt b/forge-gui/res/cardsfolder/v/void_beckoner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/void_beckoner.txt
rename to forge-gui/res/cardsfolder/v/void_beckoner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/voracious_greatshark.txt b/forge-gui/res/cardsfolder/v/voracious_greatshark.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/voracious_greatshark.txt
rename to forge-gui/res/cardsfolder/v/voracious_greatshark.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/weaponize_the_monsters.txt b/forge-gui/res/cardsfolder/w/weaponize_the_monsters.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/weaponize_the_monsters.txt
rename to forge-gui/res/cardsfolder/w/weaponize_the_monsters.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/whirlwind_of_thought.txt b/forge-gui/res/cardsfolder/w/whirlwind_of_thought.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/whirlwind_of_thought.txt
rename to forge-gui/res/cardsfolder/w/whirlwind_of_thought.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/whisper_squad.txt b/forge-gui/res/cardsfolder/w/whisper_squad.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/whisper_squad.txt
rename to forge-gui/res/cardsfolder/w/whisper_squad.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/will_of_the_all_hunter.txt b/forge-gui/res/cardsfolder/w/will_of_the_all_hunter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/will_of_the_all_hunter.txt
rename to forge-gui/res/cardsfolder/w/will_of_the_all_hunter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wilt.txt b/forge-gui/res/cardsfolder/w/wilt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wilt.txt
rename to forge-gui/res/cardsfolder/w/wilt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wingfold_pteron.txt b/forge-gui/res/cardsfolder/w/wingfold_pteron.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wingfold_pteron.txt
rename to forge-gui/res/cardsfolder/w/wingfold_pteron.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wingspan_mentor.txt b/forge-gui/res/cardsfolder/w/wingspan_mentor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wingspan_mentor.txt
rename to forge-gui/res/cardsfolder/w/wingspan_mentor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/winota_joiner_of_forces.txt b/forge-gui/res/cardsfolder/w/winota_joiner_of_forces.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/winota_joiner_of_forces.txt
rename to forge-gui/res/cardsfolder/w/winota_joiner_of_forces.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yidaro_wandering_monster.txt b/forge-gui/res/cardsfolder/y/yidaro_wandering_monster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yidaro_wandering_monster.txt
rename to forge-gui/res/cardsfolder/y/yidaro_wandering_monster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zagoth_crystal.txt b/forge-gui/res/cardsfolder/z/zagoth_crystal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zagoth_crystal.txt
rename to forge-gui/res/cardsfolder/z/zagoth_crystal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zagoth_triome.txt b/forge-gui/res/cardsfolder/z/zagoth_triome.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zagoth_triome.txt
rename to forge-gui/res/cardsfolder/z/zagoth_triome.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zenith_flare.txt b/forge-gui/res/cardsfolder/z/zenith_flare.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zenith_flare.txt
rename to forge-gui/res/cardsfolder/z/zenith_flare.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zilortha_strength_incarnate.txt b/forge-gui/res/cardsfolder/z/zilortha_strength_incarnate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zilortha_strength_incarnate.txt
rename to forge-gui/res/cardsfolder/z/zilortha_strength_incarnate.txt