diff --git a/forge-gui/res/cardsfolder/upcoming/acolyte_of_affliction.txt b/forge-gui/res/cardsfolder/a/acolyte_of_affliction.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/acolyte_of_affliction.txt rename to forge-gui/res/cardsfolder/a/acolyte_of_affliction.txt diff --git a/forge-gui/res/cardsfolder/upcoming/agonizing_remorse.txt b/forge-gui/res/cardsfolder/a/agonizing_remorse.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/agonizing_remorse.txt rename to forge-gui/res/cardsfolder/a/agonizing_remorse.txt diff --git a/forge-gui/res/cardsfolder/upcoming/alirios_enraptured.txt b/forge-gui/res/cardsfolder/a/alirios_enraptured.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/alirios_enraptured.txt rename to forge-gui/res/cardsfolder/a/alirios_enraptured.txt diff --git a/forge-gui/res/cardsfolder/upcoming/allure_of_the_unknown.txt b/forge-gui/res/cardsfolder/a/allure_of_the_unknown.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/allure_of_the_unknown.txt rename to forge-gui/res/cardsfolder/a/allure_of_the_unknown.txt diff --git a/forge-gui/res/cardsfolder/upcoming/alseid_of_lifes_bounty.txt b/forge-gui/res/cardsfolder/a/alseid_of_lifes_bounty.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/alseid_of_lifes_bounty.txt rename to forge-gui/res/cardsfolder/a/alseid_of_lifes_bounty.txt diff --git a/forge-gui/res/cardsfolder/upcoming/altar_of_the_pantheon.txt b/forge-gui/res/cardsfolder/a/altar_of_the_pantheon.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/altar_of_the_pantheon.txt rename to forge-gui/res/cardsfolder/a/altar_of_the_pantheon.txt diff --git a/forge-gui/res/cardsfolder/upcoming/anax_hardened_in_the_forge.txt b/forge-gui/res/cardsfolder/a/anax_hardened_in_the_forge.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/anax_hardened_in_the_forge.txt rename to forge-gui/res/cardsfolder/a/anax_hardened_in_the_forge.txt diff --git a/forge-gui/res/cardsfolder/upcoming/aphemia_the_cacophony.txt b/forge-gui/res/cardsfolder/a/aphemia_the_cacophony.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/aphemia_the_cacophony.txt rename to forge-gui/res/cardsfolder/a/aphemia_the_cacophony.txt diff --git a/forge-gui/res/cardsfolder/upcoming/arasta_of_the_endless_web.txt b/forge-gui/res/cardsfolder/a/arasta_of_the_endless_web.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/arasta_of_the_endless_web.txt rename to forge-gui/res/cardsfolder/a/arasta_of_the_endless_web.txt diff --git a/forge-gui/res/cardsfolder/upcoming/archon_of_falling_stars.txt b/forge-gui/res/cardsfolder/a/archon_of_falling_stars.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/archon_of_falling_stars.txt rename to forge-gui/res/cardsfolder/a/archon_of_falling_stars.txt diff --git a/forge-gui/res/cardsfolder/upcoming/archon_of_suns_grace.txt b/forge-gui/res/cardsfolder/a/archon_of_suns_grace.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/archon_of_suns_grace.txt rename to forge-gui/res/cardsfolder/a/archon_of_suns_grace.txt diff --git a/forge-gui/res/cardsfolder/upcoming/arena_trickster.txt b/forge-gui/res/cardsfolder/a/arena_trickster.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/arena_trickster.txt rename to forge-gui/res/cardsfolder/a/arena_trickster.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ashiok_nightmare_muse.txt b/forge-gui/res/cardsfolder/a/ashiok_nightmare_muse.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ashiok_nightmare_muse.txt rename to forge-gui/res/cardsfolder/a/ashiok_nightmare_muse.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ashiok_sculptor_of_fears.txt b/forge-gui/res/cardsfolder/a/ashiok_sculptor_of_fears.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ashiok_sculptor_of_fears.txt rename to forge-gui/res/cardsfolder/a/ashiok_sculptor_of_fears.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ashioks_erasure.txt b/forge-gui/res/cardsfolder/a/ashioks_erasure.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ashioks_erasure.txt rename to forge-gui/res/cardsfolder/a/ashioks_erasure.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ashioks_forerunner.txt b/forge-gui/res/cardsfolder/a/ashioks_forerunner.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ashioks_forerunner.txt rename to forge-gui/res/cardsfolder/a/ashioks_forerunner.txt diff --git a/forge-gui/res/cardsfolder/upcoming/aspect_of_lamprey.txt b/forge-gui/res/cardsfolder/a/aspect_of_lamprey.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/aspect_of_lamprey.txt rename to forge-gui/res/cardsfolder/a/aspect_of_lamprey.txt diff --git a/forge-gui/res/cardsfolder/upcoming/aspect_of_manticore.txt b/forge-gui/res/cardsfolder/a/aspect_of_manticore.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/aspect_of_manticore.txt rename to forge-gui/res/cardsfolder/a/aspect_of_manticore.txt diff --git a/forge-gui/res/cardsfolder/upcoming/athreos_shroud_veiled.txt b/forge-gui/res/cardsfolder/a/athreos_shroud_veiled.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/athreos_shroud_veiled.txt rename to forge-gui/res/cardsfolder/a/athreos_shroud_veiled.txt diff --git a/forge-gui/res/cardsfolder/upcoming/atris_oracle_of_half_truths.txt b/forge-gui/res/cardsfolder/a/atris_oracle_of_half_truths.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/atris_oracle_of_half_truths.txt rename to forge-gui/res/cardsfolder/a/atris_oracle_of_half_truths.txt diff --git a/forge-gui/res/cardsfolder/upcoming/blight_breath_catoblepas.txt b/forge-gui/res/cardsfolder/b/blight_breath_catoblepas.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/blight_breath_catoblepas.txt rename to forge-gui/res/cardsfolder/b/blight_breath_catoblepas.txt diff --git a/forge-gui/res/cardsfolder/upcoming/blood_aspirant.txt b/forge-gui/res/cardsfolder/b/blood_aspirant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/blood_aspirant.txt rename to forge-gui/res/cardsfolder/b/blood_aspirant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/brine_giant.txt b/forge-gui/res/cardsfolder/b/brine_giant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/brine_giant.txt rename to forge-gui/res/cardsfolder/b/brine_giant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bronze_sword.txt b/forge-gui/res/cardsfolder/b/bronze_sword.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bronze_sword.txt rename to forge-gui/res/cardsfolder/b/bronze_sword.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bronzehide_lion.txt b/forge-gui/res/cardsfolder/b/bronzehide_lion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bronzehide_lion.txt rename to forge-gui/res/cardsfolder/b/bronzehide_lion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/calix_destinys_hand.txt b/forge-gui/res/cardsfolder/c/calix_destinys_hand.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/calix_destinys_hand.txt rename to forge-gui/res/cardsfolder/c/calix_destinys_hand.txt diff --git a/forge-gui/res/cardsfolder/upcoming/callaphe_beloved_of_the_sea.txt b/forge-gui/res/cardsfolder/c/callaphe_beloved_of_the_sea.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/callaphe_beloved_of_the_sea.txt rename to forge-gui/res/cardsfolder/c/callaphe_beloved_of_the_sea.txt diff --git a/forge-gui/res/cardsfolder/upcoming/captivating_unicorn.txt b/forge-gui/res/cardsfolder/c/captivating_unicorn.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/captivating_unicorn.txt rename to forge-gui/res/cardsfolder/c/captivating_unicorn.txt diff --git a/forge-gui/res/cardsfolder/upcoming/careless_celebrant.txt b/forge-gui/res/cardsfolder/c/careless_celebrant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/careless_celebrant.txt rename to forge-gui/res/cardsfolder/c/careless_celebrant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chain_to_memory.txt b/forge-gui/res/cardsfolder/c/chain_to_memory.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chain_to_memory.txt rename to forge-gui/res/cardsfolder/c/chain_to_memory.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chainweb_aracnir.txt b/forge-gui/res/cardsfolder/c/chainweb_aracnir.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chainweb_aracnir.txt rename to forge-gui/res/cardsfolder/c/chainweb_aracnir.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cling_to_dust.txt b/forge-gui/res/cardsfolder/c/cling_to_dust.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cling_to_dust.txt rename to forge-gui/res/cardsfolder/c/cling_to_dust.txt diff --git a/forge-gui/res/cardsfolder/upcoming/commanding_presence.txt b/forge-gui/res/cardsfolder/c/commanding_presence.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/commanding_presence.txt rename to forge-gui/res/cardsfolder/c/commanding_presence.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dalakos_crafter_of_wonders.txt b/forge-gui/res/cardsfolder/d/dalakos_crafter_of_wonders.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dalakos_crafter_of_wonders.txt rename to forge-gui/res/cardsfolder/d/dalakos_crafter_of_wonders.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dawn_evangel.txt b/forge-gui/res/cardsfolder/d/dawn_evangel.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dawn_evangel.txt rename to forge-gui/res/cardsfolder/d/dawn_evangel.txt diff --git a/forge-gui/res/cardsfolder/upcoming/daxos_blessed_by_the_sun.txt b/forge-gui/res/cardsfolder/d/daxos_blessed_by_the_sun.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/daxos_blessed_by_the_sun.txt rename to forge-gui/res/cardsfolder/d/daxos_blessed_by_the_sun.txt diff --git a/forge-gui/res/cardsfolder/upcoming/daybreak_chimera.txt b/forge-gui/res/cardsfolder/d/daybreak_chimera.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/daybreak_chimera.txt rename to forge-gui/res/cardsfolder/d/daybreak_chimera.txt diff --git a/forge-gui/res/cardsfolder/upcoming/deathbellow_war_cry.txt b/forge-gui/res/cardsfolder/d/deathbellow_war_cry.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/deathbellow_war_cry.txt rename to forge-gui/res/cardsfolder/d/deathbellow_war_cry.txt diff --git a/forge-gui/res/cardsfolder/upcoming/demon_of_loathing.txt b/forge-gui/res/cardsfolder/d/demon_of_loathing.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/demon_of_loathing.txt rename to forge-gui/res/cardsfolder/d/demon_of_loathing.txt diff --git a/forge-gui/res/cardsfolder/upcoming/deny_the_divine.txt b/forge-gui/res/cardsfolder/d/deny_the_divine.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/deny_the_divine.txt rename to forge-gui/res/cardsfolder/d/deny_the_divine.txt diff --git a/forge-gui/res/cardsfolder/upcoming/destiny_spinner.txt b/forge-gui/res/cardsfolder/d/destiny_spinner.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/destiny_spinner.txt rename to forge-gui/res/cardsfolder/d/destiny_spinner.txt diff --git a/forge-gui/res/cardsfolder/upcoming/devourer_of_memory.txt b/forge-gui/res/cardsfolder/d/devourer_of_memory.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/devourer_of_memory.txt rename to forge-gui/res/cardsfolder/d/devourer_of_memory.txt diff --git a/forge-gui/res/cardsfolder/upcoming/discordant_piper.txt b/forge-gui/res/cardsfolder/d/discordant_piper.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/discordant_piper.txt rename to forge-gui/res/cardsfolder/d/discordant_piper.txt diff --git a/forge-gui/res/cardsfolder/upcoming/drag_to_the_underworld.txt b/forge-gui/res/cardsfolder/d/drag_to_the_underworld.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/drag_to_the_underworld.txt rename to forge-gui/res/cardsfolder/d/drag_to_the_underworld.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dreadful_apathy.txt b/forge-gui/res/cardsfolder/d/dreadful_apathy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dreadful_apathy.txt rename to forge-gui/res/cardsfolder/d/dreadful_apathy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dream_trawler.txt b/forge-gui/res/cardsfolder/d/dream_trawler.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dream_trawler.txt rename to forge-gui/res/cardsfolder/d/dream_trawler.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dreamshaper_shaman.txt b/forge-gui/res/cardsfolder/d/dreamshaper_shaman.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dreamshaper_shaman.txt rename to forge-gui/res/cardsfolder/d/dreamshaper_shaman.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dreamstalker_manticore.txt b/forge-gui/res/cardsfolder/d/dreamstalker_manticore.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dreamstalker_manticore.txt rename to forge-gui/res/cardsfolder/d/dreamstalker_manticore.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dryad_of_the_ilysian_grove.txt b/forge-gui/res/cardsfolder/d/dryad_of_the_ilysian_grove.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dryad_of_the_ilysian_grove.txt rename to forge-gui/res/cardsfolder/d/dryad_of_the_ilysian_grove.txt diff --git a/forge-gui/res/cardsfolder/upcoming/eat_to_extinction.txt b/forge-gui/res/cardsfolder/e/eat_to_extinction.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/eat_to_extinction.txt rename to forge-gui/res/cardsfolder/e/eat_to_extinction.txt diff --git a/forge-gui/res/cardsfolder/upcoming/eidolon_of_inspiration.txt b/forge-gui/res/cardsfolder/e/eidolon_of_inspiration.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/eidolon_of_inspiration.txt rename to forge-gui/res/cardsfolder/e/eidolon_of_inspiration.txt diff --git a/forge-gui/res/cardsfolder/upcoming/eidolon_of_obstruction.txt b/forge-gui/res/cardsfolder/e/eidolon_of_obstruction.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/eidolon_of_obstruction.txt rename to forge-gui/res/cardsfolder/e/eidolon_of_obstruction.txt diff --git a/forge-gui/res/cardsfolder/upcoming/eidolon_of_philosophy.txt b/forge-gui/res/cardsfolder/e/eidolon_of_philosophy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/eidolon_of_philosophy.txt rename to forge-gui/res/cardsfolder/e/eidolon_of_philosophy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/elite_instructor.txt b/forge-gui/res/cardsfolder/e/elite_instructor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/elite_instructor.txt rename to forge-gui/res/cardsfolder/e/elite_instructor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/elspeth_conquers_death.txt b/forge-gui/res/cardsfolder/e/elspeth_conquers_death.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/elspeth_conquers_death.txt rename to forge-gui/res/cardsfolder/e/elspeth_conquers_death.txt diff --git a/forge-gui/res/cardsfolder/upcoming/elspeth_suns_nemesis.txt b/forge-gui/res/cardsfolder/e/elspeth_suns_nemesis.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/elspeth_suns_nemesis.txt rename to forge-gui/res/cardsfolder/e/elspeth_suns_nemesis.txt diff --git a/forge-gui/res/cardsfolder/upcoming/elspeth_undaunted_hero.txt b/forge-gui/res/cardsfolder/e/elspeth_undaunted_hero.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/elspeth_undaunted_hero.txt rename to forge-gui/res/cardsfolder/e/elspeth_undaunted_hero.txt diff --git a/forge-gui/res/cardsfolder/upcoming/elspeths_devotee.txt b/forge-gui/res/cardsfolder/e/elspeths_devotee.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/elspeths_devotee.txt rename to forge-gui/res/cardsfolder/e/elspeths_devotee.txt diff --git a/forge-gui/res/cardsfolder/upcoming/elspeths_nightmare.txt b/forge-gui/res/cardsfolder/e/elspeths_nightmare.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/elspeths_nightmare.txt rename to forge-gui/res/cardsfolder/e/elspeths_nightmare.txt diff --git a/forge-gui/res/cardsfolder/upcoming/enemy_of_enlightenment.txt b/forge-gui/res/cardsfolder/e/enemy_of_enlightenment.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/enemy_of_enlightenment.txt rename to forge-gui/res/cardsfolder/e/enemy_of_enlightenment.txt diff --git a/forge-gui/res/cardsfolder/upcoming/enigmatic_incarnation.txt b/forge-gui/res/cardsfolder/e/enigmatic_incarnation.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/enigmatic_incarnation.txt rename to forge-gui/res/cardsfolder/e/enigmatic_incarnation.txt diff --git a/forge-gui/res/cardsfolder/upcoming/entrancing_lyre.txt b/forge-gui/res/cardsfolder/e/entrancing_lyre.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/entrancing_lyre.txt rename to forge-gui/res/cardsfolder/e/entrancing_lyre.txt diff --git a/forge-gui/res/cardsfolder/upcoming/erebos_bleak_hearted.txt b/forge-gui/res/cardsfolder/e/erebos_bleak_hearted.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/erebos_bleak_hearted.txt rename to forge-gui/res/cardsfolder/e/erebos_bleak_hearted.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ereboss_intervention.txt b/forge-gui/res/cardsfolder/e/ereboss_intervention.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ereboss_intervention.txt rename to forge-gui/res/cardsfolder/e/ereboss_intervention.txt diff --git a/forge-gui/res/cardsfolder/upcoming/escape_velocity.txt b/forge-gui/res/cardsfolder/e/escape_velocity.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/escape_velocity.txt rename to forge-gui/res/cardsfolder/e/escape_velocity.txt diff --git a/forge-gui/res/cardsfolder/upcoming/eutropia_the_twice_favored.txt b/forge-gui/res/cardsfolder/e/eutropia_the_twice_favored.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/eutropia_the_twice_favored.txt rename to forge-gui/res/cardsfolder/e/eutropia_the_twice_favored.txt diff --git a/forge-gui/res/cardsfolder/upcoming/fateful_end.txt b/forge-gui/res/cardsfolder/f/fateful_end.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/fateful_end.txt rename to forge-gui/res/cardsfolder/f/fateful_end.txt diff --git a/forge-gui/res/cardsfolder/upcoming/favored_of_iroas.txt b/forge-gui/res/cardsfolder/f/favored_of_iroas.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/favored_of_iroas.txt rename to forge-gui/res/cardsfolder/f/favored_of_iroas.txt diff --git a/forge-gui/res/cardsfolder/upcoming/final_death.txt b/forge-gui/res/cardsfolder/f/final_death.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/final_death.txt rename to forge-gui/res/cardsfolder/f/final_death.txt diff --git a/forge-gui/res/cardsfolder/upcoming/final_flare.txt b/forge-gui/res/cardsfolder/f/final_flare.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/final_flare.txt rename to forge-gui/res/cardsfolder/f/final_flare.txt diff --git a/forge-gui/res/cardsfolder/upcoming/flicker_of_fate.txt b/forge-gui/res/cardsfolder/f/flicker_of_fate.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/flicker_of_fate.txt rename to forge-gui/res/cardsfolder/f/flicker_of_fate.txt diff --git a/forge-gui/res/cardsfolder/upcoming/flummoxed_cyclops.txt b/forge-gui/res/cardsfolder/f/flummoxed_cyclops.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/flummoxed_cyclops.txt rename to forge-gui/res/cardsfolder/f/flummoxed_cyclops.txt diff --git a/forge-gui/res/cardsfolder/upcoming/fruit_of_tizerus.txt b/forge-gui/res/cardsfolder/f/fruit_of_tizerus.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/fruit_of_tizerus.txt rename to forge-gui/res/cardsfolder/f/fruit_of_tizerus.txt diff --git a/forge-gui/res/cardsfolder/upcoming/funeral_rites.txt b/forge-gui/res/cardsfolder/f/funeral_rites.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/funeral_rites.txt rename to forge-gui/res/cardsfolder/f/funeral_rites.txt diff --git a/forge-gui/res/cardsfolder/upcoming/furious_rise.txt b/forge-gui/res/cardsfolder/f/furious_rise.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/furious_rise.txt rename to forge-gui/res/cardsfolder/f/furious_rise.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gallia_of_the_endless_dance.txt b/forge-gui/res/cardsfolder/g/gallia_of_the_endless_dance.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gallia_of_the_endless_dance.txt rename to forge-gui/res/cardsfolder/g/gallia_of_the_endless_dance.txt diff --git a/forge-gui/res/cardsfolder/upcoming/glimpse_of_freedom.txt b/forge-gui/res/cardsfolder/g/glimpse_of_freedom.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/glimpse_of_freedom.txt rename to forge-gui/res/cardsfolder/g/glimpse_of_freedom.txt diff --git a/forge-gui/res/cardsfolder/upcoming/glory_bearers.txt b/forge-gui/res/cardsfolder/g/glory_bearers.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/glory_bearers.txt rename to forge-gui/res/cardsfolder/g/glory_bearers.txt diff --git a/forge-gui/res/cardsfolder/upcoming/grasping_giant.txt b/forge-gui/res/cardsfolder/g/grasping_giant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/grasping_giant.txt rename to forge-gui/res/cardsfolder/g/grasping_giant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gravebreaker_lamia.txt b/forge-gui/res/cardsfolder/g/gravebreaker_lamia.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gravebreaker_lamia.txt rename to forge-gui/res/cardsfolder/g/gravebreaker_lamia.txt diff --git a/forge-gui/res/cardsfolder/upcoming/grim_physician.txt b/forge-gui/res/cardsfolder/g/grim_physician.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/grim_physician.txt rename to forge-gui/res/cardsfolder/g/grim_physician.txt diff --git a/forge-gui/res/cardsfolder/upcoming/haktos_the_unscarred.txt b/forge-gui/res/cardsfolder/h/haktos_the_unscarred.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/haktos_the_unscarred.txt rename to forge-gui/res/cardsfolder/h/haktos_the_unscarred.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hateful_eidolon.txt b/forge-gui/res/cardsfolder/h/hateful_eidolon.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hateful_eidolon.txt rename to forge-gui/res/cardsfolder/h/hateful_eidolon.txt diff --git a/forge-gui/res/cardsfolder/upcoming/heliod_sun_crowned.txt b/forge-gui/res/cardsfolder/h/heliod_sun_crowned.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/heliod_sun_crowned.txt rename to forge-gui/res/cardsfolder/h/heliod_sun_crowned.txt diff --git a/forge-gui/res/cardsfolder/upcoming/heliods_intervention.txt b/forge-gui/res/cardsfolder/h/heliods_intervention.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/heliods_intervention.txt rename to forge-gui/res/cardsfolder/h/heliods_intervention.txt diff --git a/forge-gui/res/cardsfolder/upcoming/heliods_punishment.txt b/forge-gui/res/cardsfolder/h/heliods_punishment.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/heliods_punishment.txt rename to forge-gui/res/cardsfolder/h/heliods_punishment.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hero_of_the_games.txt b/forge-gui/res/cardsfolder/h/hero_of_the_games.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hero_of_the_games.txt rename to forge-gui/res/cardsfolder/h/hero_of_the_games.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hero_of_the_nyxborn.txt b/forge-gui/res/cardsfolder/h/hero_of_the_nyxborn.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hero_of_the_nyxborn.txt rename to forge-gui/res/cardsfolder/h/hero_of_the_nyxborn.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hero_of_the_pride.txt b/forge-gui/res/cardsfolder/h/hero_of_the_pride.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hero_of_the_pride.txt rename to forge-gui/res/cardsfolder/h/hero_of_the_pride.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hero_of_the_winds.txt b/forge-gui/res/cardsfolder/h/hero_of_the_winds.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hero_of_the_winds.txt rename to forge-gui/res/cardsfolder/h/hero_of_the_winds.txt diff --git a/forge-gui/res/cardsfolder/upcoming/heroes_of_the_revel.txt b/forge-gui/res/cardsfolder/h/heroes_of_the_revel.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/heroes_of_the_revel.txt rename to forge-gui/res/cardsfolder/h/heroes_of_the_revel.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hydras_growth.txt b/forge-gui/res/cardsfolder/h/hydras_growth.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hydras_growth.txt rename to forge-gui/res/cardsfolder/h/hydras_growth.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hyrax_tower_scout.txt b/forge-gui/res/cardsfolder/h/hyrax_tower_scout.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hyrax_tower_scout.txt rename to forge-gui/res/cardsfolder/h/hyrax_tower_scout.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ichthyomorphosis.txt b/forge-gui/res/cardsfolder/i/ichthyomorphosis.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ichthyomorphosis.txt rename to forge-gui/res/cardsfolder/i/ichthyomorphosis.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ilysian_caryatid.txt b/forge-gui/res/cardsfolder/i/ilysian_caryatid.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ilysian_caryatid.txt rename to forge-gui/res/cardsfolder/i/ilysian_caryatid.txt diff --git a/forge-gui/res/cardsfolder/upcoming/impending_doom.txt b/forge-gui/res/cardsfolder/i/impending_doom.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/impending_doom.txt rename to forge-gui/res/cardsfolder/i/impending_doom.txt diff --git a/forge-gui/res/cardsfolder/upcoming/incendiary_oracle.txt b/forge-gui/res/cardsfolder/i/incendiary_oracle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/incendiary_oracle.txt rename to forge-gui/res/cardsfolder/i/incendiary_oracle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/inevitable_end.txt b/forge-gui/res/cardsfolder/i/inevitable_end.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/inevitable_end.txt rename to forge-gui/res/cardsfolder/i/inevitable_end.txt diff --git a/forge-gui/res/cardsfolder/upcoming/inspire_awe.txt b/forge-gui/res/cardsfolder/i/inspire_awe.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/inspire_awe.txt rename to forge-gui/res/cardsfolder/i/inspire_awe.txt diff --git a/forge-gui/res/cardsfolder/upcoming/iroass_blessing.txt b/forge-gui/res/cardsfolder/i/iroass_blessing.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/iroass_blessing.txt rename to forge-gui/res/cardsfolder/i/iroass_blessing.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ironscale_hydra.txt b/forge-gui/res/cardsfolder/i/ironscale_hydra.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ironscale_hydra.txt rename to forge-gui/res/cardsfolder/i/ironscale_hydra.txt diff --git a/forge-gui/res/cardsfolder/upcoming/irreverent_revelers.txt b/forge-gui/res/cardsfolder/i/irreverent_revelers.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/irreverent_revelers.txt rename to forge-gui/res/cardsfolder/i/irreverent_revelers.txt diff --git a/forge-gui/res/cardsfolder/upcoming/karametras_blessing.txt b/forge-gui/res/cardsfolder/k/karametras_blessing.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/karametras_blessing.txt rename to forge-gui/res/cardsfolder/k/karametras_blessing.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kiora_bests_the_sea_god.txt b/forge-gui/res/cardsfolder/k/kiora_bests_the_sea_god.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kiora_bests_the_sea_god.txt rename to forge-gui/res/cardsfolder/k/kiora_bests_the_sea_god.txt diff --git a/forge-gui/res/cardsfolder/upcoming/klothys_god_of_destiny.txt b/forge-gui/res/cardsfolder/k/klothys_god_of_destiny.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/klothys_god_of_destiny.txt rename to forge-gui/res/cardsfolder/k/klothys_god_of_destiny.txt diff --git a/forge-gui/res/cardsfolder/upcoming/klothyss_design.txt b/forge-gui/res/cardsfolder/k/klothyss_design.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/klothyss_design.txt rename to forge-gui/res/cardsfolder/k/klothyss_design.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kroxa_titan_of_deaths_hunger.txt b/forge-gui/res/cardsfolder/k/kroxa_titan_of_deaths_hunger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kroxa_titan_of_deaths_hunger.txt rename to forge-gui/res/cardsfolder/k/kroxa_titan_of_deaths_hunger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kunoros_hound_of_athreos.txt b/forge-gui/res/cardsfolder/k/kunoros_hound_of_athreos.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kunoros_hound_of_athreos.txt rename to forge-gui/res/cardsfolder/k/kunoros_hound_of_athreos.txt diff --git a/forge-gui/res/cardsfolder/upcoming/labyrinth_of_skophos.txt b/forge-gui/res/cardsfolder/l/labyrinth_of_skophos.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/labyrinth_of_skophos.txt rename to forge-gui/res/cardsfolder/l/labyrinth_of_skophos.txt diff --git a/forge-gui/res/cardsfolder/upcoming/lagonna_band_storyteller.txt b/forge-gui/res/cardsfolder/l/lagonna_band_storyteller.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/lagonna_band_storyteller.txt rename to forge-gui/res/cardsfolder/l/lagonna_band_storyteller.txt diff --git a/forge-gui/res/cardsfolder/upcoming/lampad_of_deaths_vigil.txt b/forge-gui/res/cardsfolder/l/lampad_of_deaths_vigil.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/lampad_of_deaths_vigil.txt rename to forge-gui/res/cardsfolder/l/lampad_of_deaths_vigil.txt diff --git a/forge-gui/res/cardsfolder/upcoming/leonin_of_the_lost_pride.txt b/forge-gui/res/cardsfolder/l/leonin_of_the_lost_pride.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/leonin_of_the_lost_pride.txt rename to forge-gui/res/cardsfolder/l/leonin_of_the_lost_pride.txt diff --git a/forge-gui/res/cardsfolder/upcoming/loathsome_chimera.txt b/forge-gui/res/cardsfolder/l/loathsome_chimera.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/loathsome_chimera.txt rename to forge-gui/res/cardsfolder/l/loathsome_chimera.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mantle_of_the_wolf.txt b/forge-gui/res/cardsfolder/m/mantle_of_the_wolf.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mantle_of_the_wolf.txt rename to forge-gui/res/cardsfolder/m/mantle_of_the_wolf.txt diff --git a/forge-gui/res/cardsfolder/upcoming/medomais_prophecy.txt b/forge-gui/res/cardsfolder/m/medomais_prophecy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/medomais_prophecy.txt rename to forge-gui/res/cardsfolder/m/medomais_prophecy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/memory_drain.txt b/forge-gui/res/cardsfolder/m/memory_drain.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/memory_drain.txt rename to forge-gui/res/cardsfolder/m/memory_drain.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mindwrack_harpy.txt b/forge-gui/res/cardsfolder/m/mindwrack_harpy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mindwrack_harpy.txt rename to forge-gui/res/cardsfolder/m/mindwrack_harpy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/minions_return.txt b/forge-gui/res/cardsfolder/m/minions_return.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/minions_return.txt rename to forge-gui/res/cardsfolder/m/minions_return.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mire_triton.txt b/forge-gui/res/cardsfolder/m/mire_triton.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mire_triton.txt rename to forge-gui/res/cardsfolder/m/mire_triton.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mires_grasp.txt b/forge-gui/res/cardsfolder/m/mires_grasp.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mires_grasp.txt rename to forge-gui/res/cardsfolder/m/mires_grasp.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mirror_shield.txt b/forge-gui/res/cardsfolder/m/mirror_shield.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mirror_shield.txt rename to forge-gui/res/cardsfolder/m/mirror_shield.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mischievous_chimera.txt b/forge-gui/res/cardsfolder/m/mischievous_chimera.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mischievous_chimera.txt rename to forge-gui/res/cardsfolder/m/mischievous_chimera.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mogiss_favor.txt b/forge-gui/res/cardsfolder/m/mogiss_favor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mogiss_favor.txt rename to forge-gui/res/cardsfolder/m/mogiss_favor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/moss_viper.txt b/forge-gui/res/cardsfolder/m/moss_viper.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/moss_viper.txt rename to forge-gui/res/cardsfolder/m/moss_viper.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mystic_repeal.txt b/forge-gui/res/cardsfolder/m/mystic_repeal.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mystic_repeal.txt rename to forge-gui/res/cardsfolder/m/mystic_repeal.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nadir_kraken.txt b/forge-gui/res/cardsfolder/n/nadir_kraken.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nadir_kraken.txt rename to forge-gui/res/cardsfolder/n/nadir_kraken.txt diff --git a/forge-gui/res/cardsfolder/upcoming/naiad_of_hidden_coves.txt b/forge-gui/res/cardsfolder/n/naiad_of_hidden_coves.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/naiad_of_hidden_coves.txt rename to forge-gui/res/cardsfolder/n/naiad_of_hidden_coves.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nessian_boar.txt b/forge-gui/res/cardsfolder/n/nessian_boar.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nessian_boar.txt rename to forge-gui/res/cardsfolder/n/nessian_boar.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nessian_hornbeetle.txt b/forge-gui/res/cardsfolder/n/nessian_hornbeetle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nessian_hornbeetle.txt rename to forge-gui/res/cardsfolder/n/nessian_hornbeetle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nessian_wanderer.txt b/forge-gui/res/cardsfolder/n/nessian_wanderer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nessian_wanderer.txt rename to forge-gui/res/cardsfolder/n/nessian_wanderer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nexus_wardens.txt b/forge-gui/res/cardsfolder/n/nexus_wardens.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nexus_wardens.txt rename to forge-gui/res/cardsfolder/n/nexus_wardens.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nightmare_shepherd.txt b/forge-gui/res/cardsfolder/n/nightmare_shepherd.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nightmare_shepherd.txt rename to forge-gui/res/cardsfolder/n/nightmare_shepherd.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nylea_keen_eyed.txt b/forge-gui/res/cardsfolder/n/nylea_keen_eyed.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nylea_keen_eyed.txt rename to forge-gui/res/cardsfolder/n/nylea_keen_eyed.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nyleas_forerunner.txt b/forge-gui/res/cardsfolder/n/nyleas_forerunner.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nyleas_forerunner.txt rename to forge-gui/res/cardsfolder/n/nyleas_forerunner.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nyleas_huntmaster.txt b/forge-gui/res/cardsfolder/n/nyleas_huntmaster.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nyleas_huntmaster.txt rename to forge-gui/res/cardsfolder/n/nyleas_huntmaster.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nyleas_intervention.txt b/forge-gui/res/cardsfolder/n/nyleas_intervention.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nyleas_intervention.txt rename to forge-gui/res/cardsfolder/n/nyleas_intervention.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nyx_herald.txt b/forge-gui/res/cardsfolder/n/nyx_herald.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nyx_herald.txt rename to forge-gui/res/cardsfolder/n/nyx_herald.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nyx_lotus.txt b/forge-gui/res/cardsfolder/n/nyx_lotus.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nyx_lotus.txt rename to forge-gui/res/cardsfolder/n/nyx_lotus.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nyxbloom_ancient.txt b/forge-gui/res/cardsfolder/n/nyxbloom_ancient.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nyxbloom_ancient.txt rename to forge-gui/res/cardsfolder/n/nyxbloom_ancient.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nyxborn_brute.txt b/forge-gui/res/cardsfolder/n/nyxborn_brute.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nyxborn_brute.txt rename to forge-gui/res/cardsfolder/n/nyxborn_brute.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nyxborn_colossus.txt b/forge-gui/res/cardsfolder/n/nyxborn_colossus.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nyxborn_colossus.txt rename to forge-gui/res/cardsfolder/n/nyxborn_colossus.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nyxborn_courser.txt b/forge-gui/res/cardsfolder/n/nyxborn_courser.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nyxborn_courser.txt rename to forge-gui/res/cardsfolder/n/nyxborn_courser.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nyxborn_marauder.txt b/forge-gui/res/cardsfolder/n/nyxborn_marauder.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nyxborn_marauder.txt rename to forge-gui/res/cardsfolder/n/nyxborn_marauder.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nyxborn_seaguard.txt b/forge-gui/res/cardsfolder/n/nyxborn_seaguard.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nyxborn_seaguard.txt rename to forge-gui/res/cardsfolder/n/nyxborn_seaguard.txt diff --git a/forge-gui/res/cardsfolder/upcoming/omen_of_the_dead.txt b/forge-gui/res/cardsfolder/o/omen_of_the_dead.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/omen_of_the_dead.txt rename to forge-gui/res/cardsfolder/o/omen_of_the_dead.txt diff --git a/forge-gui/res/cardsfolder/upcoming/omen_of_the_forge.txt b/forge-gui/res/cardsfolder/o/omen_of_the_forge.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/omen_of_the_forge.txt rename to forge-gui/res/cardsfolder/o/omen_of_the_forge.txt diff --git a/forge-gui/res/cardsfolder/upcoming/omen_of_the_hunt.txt b/forge-gui/res/cardsfolder/o/omen_of_the_hunt.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/omen_of_the_hunt.txt rename to forge-gui/res/cardsfolder/o/omen_of_the_hunt.txt diff --git a/forge-gui/res/cardsfolder/upcoming/omen_of_the_sea.txt b/forge-gui/res/cardsfolder/o/omen_of_the_sea.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/omen_of_the_sea.txt rename to forge-gui/res/cardsfolder/o/omen_of_the_sea.txt diff --git a/forge-gui/res/cardsfolder/upcoming/omen_of_the_sun.txt b/forge-gui/res/cardsfolder/o/omen_of_the_sun.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/omen_of_the_sun.txt rename to forge-gui/res/cardsfolder/o/omen_of_the_sun.txt diff --git a/forge-gui/res/cardsfolder/upcoming/one_with_the_stars.txt b/forge-gui/res/cardsfolder/o/one_with_the_stars.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/one_with_the_stars.txt rename to forge-gui/res/cardsfolder/o/one_with_the_stars.txt diff --git a/forge-gui/res/cardsfolder/upcoming/oread_of_mountains_blaze.txt b/forge-gui/res/cardsfolder/o/oread_of_mountains_blaze.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/oread_of_mountains_blaze.txt rename to forge-gui/res/cardsfolder/o/oread_of_mountains_blaze.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ox_of_agonas.txt b/forge-gui/res/cardsfolder/o/ox_of_agonas.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ox_of_agonas.txt rename to forge-gui/res/cardsfolder/o/ox_of_agonas.txt diff --git a/forge-gui/res/cardsfolder/upcoming/phalanx_tactics.txt b/forge-gui/res/cardsfolder/p/phalanx_tactics.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/phalanx_tactics.txt rename to forge-gui/res/cardsfolder/p/phalanx_tactics.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pharikas_libation.txt b/forge-gui/res/cardsfolder/p/pharikas_libation.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pharikas_libation.txt rename to forge-gui/res/cardsfolder/p/pharikas_libation.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pharikas_spawn.txt b/forge-gui/res/cardsfolder/p/pharikas_spawn.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pharikas_spawn.txt rename to forge-gui/res/cardsfolder/p/pharikas_spawn.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pheres_band_brawler.txt b/forge-gui/res/cardsfolder/p/pheres_band_brawler.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pheres_band_brawler.txt rename to forge-gui/res/cardsfolder/p/pheres_band_brawler.txt diff --git a/forge-gui/res/cardsfolder/upcoming/phoenix_of_ash.txt b/forge-gui/res/cardsfolder/p/phoenix_of_ash.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/phoenix_of_ash.txt rename to forge-gui/res/cardsfolder/p/phoenix_of_ash.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pious_wayfarer.txt b/forge-gui/res/cardsfolder/p/pious_wayfarer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pious_wayfarer.txt rename to forge-gui/res/cardsfolder/p/pious_wayfarer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/polukranos_unchained.txt b/forge-gui/res/cardsfolder/p/polukranos_unchained.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/polukranos_unchained.txt rename to forge-gui/res/cardsfolder/p/polukranos_unchained.txt diff --git a/forge-gui/res/cardsfolder/upcoming/protean_thaumaturge.txt b/forge-gui/res/cardsfolder/p/protean_thaumaturge.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/protean_thaumaturge.txt rename to forge-gui/res/cardsfolder/p/protean_thaumaturge.txt diff --git a/forge-gui/res/cardsfolder/upcoming/purphoros_bronze_blooded.txt b/forge-gui/res/cardsfolder/p/purphoros_bronze_blooded.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/purphoros_bronze_blooded.txt rename to forge-gui/res/cardsfolder/p/purphoros_bronze_blooded.txt diff --git a/forge-gui/res/cardsfolder/upcoming/purphoross_intervention.txt b/forge-gui/res/cardsfolder/p/purphoross_intervention.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/purphoross_intervention.txt rename to forge-gui/res/cardsfolder/p/purphoross_intervention.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rage_scarred_berserker.txt b/forge-gui/res/cardsfolder/r/rage_scarred_berserker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/rage_scarred_berserker.txt rename to forge-gui/res/cardsfolder/r/rage_scarred_berserker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/relentless_pursuit.txt b/forge-gui/res/cardsfolder/r/relentless_pursuit.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/relentless_pursuit.txt rename to forge-gui/res/cardsfolder/r/relentless_pursuit.txt diff --git a/forge-gui/res/cardsfolder/upcoming/renata_called_to_the_hunt.txt b/forge-gui/res/cardsfolder/r/renata_called_to_the_hunt.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/renata_called_to_the_hunt.txt rename to forge-gui/res/cardsfolder/r/renata_called_to_the_hunt.txt diff --git a/forge-gui/res/cardsfolder/upcoming/reverent_hoplite.txt b/forge-gui/res/cardsfolder/r/reverent_hoplite.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/reverent_hoplite.txt rename to forge-gui/res/cardsfolder/r/reverent_hoplite.txt diff --git a/forge-gui/res/cardsfolder/upcoming/riptide_turtle.txt b/forge-gui/res/cardsfolder/r/riptide_turtle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/riptide_turtle.txt rename to forge-gui/res/cardsfolder/r/riptide_turtle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rise_to_glory.txt b/forge-gui/res/cardsfolder/r/rise_to_glory.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/rise_to_glory.txt rename to forge-gui/res/cardsfolder/r/rise_to_glory.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rumbling_sentry.txt b/forge-gui/res/cardsfolder/r/rumbling_sentry.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/rumbling_sentry.txt rename to forge-gui/res/cardsfolder/r/rumbling_sentry.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sage_of_mysteries.txt b/forge-gui/res/cardsfolder/s/sage_of_mysteries.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sage_of_mysteries.txt rename to forge-gui/res/cardsfolder/s/sage_of_mysteries.txt diff --git a/forge-gui/res/cardsfolder/upcoming/satyrs_cunning.txt b/forge-gui/res/cardsfolder/s/satyrs_cunning.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/satyrs_cunning.txt rename to forge-gui/res/cardsfolder/s/satyrs_cunning.txt diff --git a/forge-gui/res/cardsfolder/upcoming/scavenging_harpy.txt b/forge-gui/res/cardsfolder/s/scavenging_harpy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/scavenging_harpy.txt rename to forge-gui/res/cardsfolder/s/scavenging_harpy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sea_gods_scorn.txt b/forge-gui/res/cardsfolder/s/sea_gods_scorn.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sea_gods_scorn.txt rename to forge-gui/res/cardsfolder/s/sea_gods_scorn.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sentinels_eyes.txt b/forge-gui/res/cardsfolder/s/sentinels_eyes.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sentinels_eyes.txt rename to forge-gui/res/cardsfolder/s/sentinels_eyes.txt diff --git a/forge-gui/res/cardsfolder/upcoming/serpent_of_yawning_depths.txt b/forge-gui/res/cardsfolder/s/serpent_of_yawning_depths.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/serpent_of_yawning_depths.txt rename to forge-gui/res/cardsfolder/s/serpent_of_yawning_depths.txt diff --git a/forge-gui/res/cardsfolder/upcoming/setessan_champion.txt b/forge-gui/res/cardsfolder/s/setessan_champion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/setessan_champion.txt rename to forge-gui/res/cardsfolder/s/setessan_champion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/setessan_petitioner.txt b/forge-gui/res/cardsfolder/s/setessan_petitioner.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/setessan_petitioner.txt rename to forge-gui/res/cardsfolder/s/setessan_petitioner.txt diff --git a/forge-gui/res/cardsfolder/upcoming/setessan_skirmisher.txt b/forge-gui/res/cardsfolder/s/setessan_skirmisher.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/setessan_skirmisher.txt rename to forge-gui/res/cardsfolder/s/setessan_skirmisher.txt diff --git a/forge-gui/res/cardsfolder/upcoming/setessan_training.txt b/forge-gui/res/cardsfolder/s/setessan_training.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/setessan_training.txt rename to forge-gui/res/cardsfolder/s/setessan_training.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shadowspear.txt b/forge-gui/res/cardsfolder/s/shadowspear.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/shadowspear.txt rename to forge-gui/res/cardsfolder/s/shadowspear.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shatter_the_sky.txt b/forge-gui/res/cardsfolder/s/shatter_the_sky.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/shatter_the_sky.txt rename to forge-gui/res/cardsfolder/s/shatter_the_sky.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shimmerwing_chimera.txt b/forge-gui/res/cardsfolder/s/shimmerwing_chimera.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/shimmerwing_chimera.txt rename to forge-gui/res/cardsfolder/s/shimmerwing_chimera.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shoal_kraken.txt b/forge-gui/res/cardsfolder/s/shoal_kraken.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/shoal_kraken.txt rename to forge-gui/res/cardsfolder/s/shoal_kraken.txt diff --git a/forge-gui/res/cardsfolder/upcoming/siona_captain_of_the_pyleas.txt b/forge-gui/res/cardsfolder/s/siona_captain_of_the_pyleas.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/siona_captain_of_the_pyleas.txt rename to forge-gui/res/cardsfolder/s/siona_captain_of_the_pyleas.txt diff --git a/forge-gui/res/cardsfolder/upcoming/skola_grovedancer.txt b/forge-gui/res/cardsfolder/s/skola_grovedancer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/skola_grovedancer.txt rename to forge-gui/res/cardsfolder/s/skola_grovedancer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/skophos_maze_warden.txt b/forge-gui/res/cardsfolder/s/skophos_maze_warden.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/skophos_maze_warden.txt rename to forge-gui/res/cardsfolder/s/skophos_maze_warden.txt diff --git a/forge-gui/res/cardsfolder/upcoming/skophos_warleader.txt b/forge-gui/res/cardsfolder/s/skophos_warleader.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/skophos_warleader.txt rename to forge-gui/res/cardsfolder/s/skophos_warleader.txt diff --git a/forge-gui/res/cardsfolder/upcoming/slaughter_priest_of_mogis.txt b/forge-gui/res/cardsfolder/s/slaughter_priest_of_mogis.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/slaughter_priest_of_mogis.txt rename to forge-gui/res/cardsfolder/s/slaughter_priest_of_mogis.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sleep_of_the_dead.txt b/forge-gui/res/cardsfolder/s/sleep_of_the_dead.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sleep_of_the_dead.txt rename to forge-gui/res/cardsfolder/s/sleep_of_the_dead.txt diff --git a/forge-gui/res/cardsfolder/upcoming/soul_guide_lantern.txt b/forge-gui/res/cardsfolder/s/soul_guide_lantern.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/soul_guide_lantern.txt rename to forge-gui/res/cardsfolder/s/soul_guide_lantern.txt diff --git a/forge-gui/res/cardsfolder/upcoming/soulreaper_of_mogis.txt b/forge-gui/res/cardsfolder/s/soulreaper_of_mogis.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/soulreaper_of_mogis.txt rename to forge-gui/res/cardsfolder/s/soulreaper_of_mogis.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sphinx_mindbreaker.txt b/forge-gui/res/cardsfolder/s/sphinx_mindbreaker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sphinx_mindbreaker.txt rename to forge-gui/res/cardsfolder/s/sphinx_mindbreaker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/staggering_insight.txt b/forge-gui/res/cardsfolder/s/staggering_insight.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/staggering_insight.txt rename to forge-gui/res/cardsfolder/s/staggering_insight.txt diff --git a/forge-gui/res/cardsfolder/upcoming/stampede_rider.txt b/forge-gui/res/cardsfolder/s/stampede_rider.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/stampede_rider.txt rename to forge-gui/res/cardsfolder/s/stampede_rider.txt diff --git a/forge-gui/res/cardsfolder/upcoming/starlit_mantle.txt b/forge-gui/res/cardsfolder/s/starlit_mantle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/starlit_mantle.txt rename to forge-gui/res/cardsfolder/s/starlit_mantle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/stern_dismissal.txt b/forge-gui/res/cardsfolder/s/stern_dismissal.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/stern_dismissal.txt rename to forge-gui/res/cardsfolder/s/stern_dismissal.txt diff --git a/forge-gui/res/cardsfolder/upcoming/stinging_lionfish.txt b/forge-gui/res/cardsfolder/s/stinging_lionfish.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/stinging_lionfish.txt rename to forge-gui/res/cardsfolder/s/stinging_lionfish.txt diff --git a/forge-gui/res/cardsfolder/upcoming/storm_herald.txt b/forge-gui/res/cardsfolder/s/storm_herald.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/storm_herald.txt rename to forge-gui/res/cardsfolder/s/storm_herald.txt diff --git a/forge-gui/res/cardsfolder/upcoming/storms_wrath.txt b/forge-gui/res/cardsfolder/s/storms_wrath.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/storms_wrath.txt rename to forge-gui/res/cardsfolder/s/storms_wrath.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sunlit_hoplite.txt b/forge-gui/res/cardsfolder/s/sunlit_hoplite.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sunlit_hoplite.txt rename to forge-gui/res/cardsfolder/s/sunlit_hoplite.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sunmane_pegasus.txt b/forge-gui/res/cardsfolder/s/sunmane_pegasus.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sunmane_pegasus.txt rename to forge-gui/res/cardsfolder/s/sunmane_pegasus.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sweet_oblivion.txt b/forge-gui/res/cardsfolder/s/sweet_oblivion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sweet_oblivion.txt rename to forge-gui/res/cardsfolder/s/sweet_oblivion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/swimmer_in_nightmares.txt b/forge-gui/res/cardsfolder/s/swimmer_in_nightmares.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/swimmer_in_nightmares.txt rename to forge-gui/res/cardsfolder/s/swimmer_in_nightmares.txt diff --git a/forge-gui/res/cardsfolder/upcoming/taranika_akroan_veteran.txt b/forge-gui/res/cardsfolder/t/taranika_akroan_veteran.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/taranika_akroan_veteran.txt rename to forge-gui/res/cardsfolder/t/taranika_akroan_veteran.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tectonic_giant.txt b/forge-gui/res/cardsfolder/t/tectonic_giant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tectonic_giant.txt rename to forge-gui/res/cardsfolder/t/tectonic_giant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/temple_thief.txt b/forge-gui/res/cardsfolder/t/temple_thief.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/temple_thief.txt rename to forge-gui/res/cardsfolder/t/temple_thief.txt diff --git a/forge-gui/res/cardsfolder/upcoming/terror_of_mount_velus.txt b/forge-gui/res/cardsfolder/t/terror_of_mount_velus.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/terror_of_mount_velus.txt rename to forge-gui/res/cardsfolder/t/terror_of_mount_velus.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thassa_deep_dwelling.txt b/forge-gui/res/cardsfolder/t/thassa_deep_dwelling.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thassa_deep_dwelling.txt rename to forge-gui/res/cardsfolder/t/thassa_deep_dwelling.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thassas_intervention.txt b/forge-gui/res/cardsfolder/t/thassas_intervention.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thassas_intervention.txt rename to forge-gui/res/cardsfolder/t/thassas_intervention.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thassas_oracle.txt b/forge-gui/res/cardsfolder/t/thassas_oracle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thassas_oracle.txt rename to forge-gui/res/cardsfolder/t/thassas_oracle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thaumaturges_familiar.txt b/forge-gui/res/cardsfolder/t/thaumaturges_familiar.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thaumaturges_familiar.txt rename to forge-gui/res/cardsfolder/t/thaumaturges_familiar.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_akroan_war.txt b/forge-gui/res/cardsfolder/t/the_akroan_war.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_akroan_war.txt rename to forge-gui/res/cardsfolder/t/the_akroan_war.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_binding_of_the_titans.txt b/forge-gui/res/cardsfolder/t/the_binding_of_the_titans.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_binding_of_the_titans.txt rename to forge-gui/res/cardsfolder/t/the_binding_of_the_titans.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_birth_of_meletis.txt b/forge-gui/res/cardsfolder/t/the_birth_of_meletis.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_birth_of_meletis.txt rename to forge-gui/res/cardsfolder/t/the_birth_of_meletis.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_first_iroan_games.txt b/forge-gui/res/cardsfolder/t/the_first_iroan_games.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_first_iroan_games.txt rename to forge-gui/res/cardsfolder/t/the_first_iroan_games.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_triumph_of_anax.txt b/forge-gui/res/cardsfolder/t/the_triumph_of_anax.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_triumph_of_anax.txt rename to forge-gui/res/cardsfolder/t/the_triumph_of_anax.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thirst_for_meaning.txt b/forge-gui/res/cardsfolder/t/thirst_for_meaning.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thirst_for_meaning.txt rename to forge-gui/res/cardsfolder/t/thirst_for_meaning.txt diff --git a/forge-gui/res/cardsfolder/upcoming/threnody_singer.txt b/forge-gui/res/cardsfolder/t/threnody_singer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/threnody_singer.txt rename to forge-gui/res/cardsfolder/t/threnody_singer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thryx_the_sudden_storm.txt b/forge-gui/res/cardsfolder/t/thryx_the_sudden_storm.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thryx_the_sudden_storm.txt rename to forge-gui/res/cardsfolder/t/thryx_the_sudden_storm.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thundering_chariot.txt b/forge-gui/res/cardsfolder/t/thundering_chariot.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thundering_chariot.txt rename to forge-gui/res/cardsfolder/t/thundering_chariot.txt diff --git a/forge-gui/res/cardsfolder/upcoming/towering_wave_mystic.txt b/forge-gui/res/cardsfolder/t/towering_wave_mystic.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/towering_wave_mystic.txt rename to forge-gui/res/cardsfolder/t/towering_wave_mystic.txt diff --git a/forge-gui/res/cardsfolder/upcoming/transcendent_envoy.txt b/forge-gui/res/cardsfolder/t/transcendent_envoy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/transcendent_envoy.txt rename to forge-gui/res/cardsfolder/t/transcendent_envoy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/treacherous_blessing.txt b/forge-gui/res/cardsfolder/t/treacherous_blessing.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/treacherous_blessing.txt rename to forge-gui/res/cardsfolder/t/treacherous_blessing.txt diff --git a/forge-gui/res/cardsfolder/upcoming/treeshaker_chimera.txt b/forge-gui/res/cardsfolder/t/treeshaker_chimera.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/treeshaker_chimera.txt rename to forge-gui/res/cardsfolder/t/treeshaker_chimera.txt diff --git a/forge-gui/res/cardsfolder/upcoming/triton_waverider.txt b/forge-gui/res/cardsfolder/t/triton_waverider.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/triton_waverider.txt rename to forge-gui/res/cardsfolder/t/triton_waverider.txt diff --git a/forge-gui/res/cardsfolder/upcoming/triumphant_surge.txt b/forge-gui/res/cardsfolder/t/triumphant_surge.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/triumphant_surge.txt rename to forge-gui/res/cardsfolder/t/triumphant_surge.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tymaret_calls_the_dead.txt b/forge-gui/res/cardsfolder/t/tymaret_calls_the_dead.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tymaret_calls_the_dead.txt rename to forge-gui/res/cardsfolder/t/tymaret_calls_the_dead.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tymaret_chosen_from_death.txt b/forge-gui/res/cardsfolder/t/tymaret_chosen_from_death.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tymaret_chosen_from_death.txt rename to forge-gui/res/cardsfolder/t/tymaret_chosen_from_death.txt diff --git a/forge-gui/res/cardsfolder/upcoming/underworld_breach.txt b/forge-gui/res/cardsfolder/u/underworld_breach.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/underworld_breach.txt rename to forge-gui/res/cardsfolder/u/underworld_breach.txt diff --git a/forge-gui/res/cardsfolder/upcoming/underworld_charger.txt b/forge-gui/res/cardsfolder/u/underworld_charger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/underworld_charger.txt rename to forge-gui/res/cardsfolder/u/underworld_charger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/underworld_fires.txt b/forge-gui/res/cardsfolder/u/underworld_fires.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/underworld_fires.txt rename to forge-gui/res/cardsfolder/u/underworld_fires.txt diff --git a/forge-gui/res/cardsfolder/upcoming/underworld_rage_hound.txt b/forge-gui/res/cardsfolder/u/underworld_rage_hound.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/underworld_rage_hound.txt rename to forge-gui/res/cardsfolder/u/underworld_rage_hound.txt diff --git a/forge-gui/res/cardsfolder/upcoming/underworld_sentinel.txt b/forge-gui/res/cardsfolder/u/underworld_sentinel.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/underworld_sentinel.txt rename to forge-gui/res/cardsfolder/u/underworld_sentinel.txt diff --git a/forge-gui/res/cardsfolder/upcoming/uro_titan_of_natures_wrath.txt b/forge-gui/res/cardsfolder/u/uro_titan_of_natures_wrath.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/uro_titan_of_natures_wrath.txt rename to forge-gui/res/cardsfolder/u/uro_titan_of_natures_wrath.txt diff --git a/forge-gui/res/cardsfolder/upcoming/venomous_hierophant.txt b/forge-gui/res/cardsfolder/v/venomous_hierophant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/venomous_hierophant.txt rename to forge-gui/res/cardsfolder/v/venomous_hierophant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/vexing_gull.txt b/forge-gui/res/cardsfolder/v/vexing_gull.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/vexing_gull.txt rename to forge-gui/res/cardsfolder/v/vexing_gull.txt diff --git a/forge-gui/res/cardsfolder/upcoming/victorys_envoy.txt b/forge-gui/res/cardsfolder/v/victorys_envoy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/victorys_envoy.txt rename to forge-gui/res/cardsfolder/v/victorys_envoy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/voracious_typhon.txt b/forge-gui/res/cardsfolder/v/voracious_typhon.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/voracious_typhon.txt rename to forge-gui/res/cardsfolder/v/voracious_typhon.txt diff --git a/forge-gui/res/cardsfolder/upcoming/warbriar_blessing.txt b/forge-gui/res/cardsfolder/w/warbriar_blessing.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/warbriar_blessing.txt rename to forge-gui/res/cardsfolder/w/warbriar_blessing.txt diff --git a/forge-gui/res/cardsfolder/upcoming/warden_of_the_chained.txt b/forge-gui/res/cardsfolder/w/warden_of_the_chained.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/warden_of_the_chained.txt rename to forge-gui/res/cardsfolder/w/warden_of_the_chained.txt diff --git a/forge-gui/res/cardsfolder/upcoming/wavebreak_hippocamp.txt b/forge-gui/res/cardsfolder/w/wavebreak_hippocamp.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/wavebreak_hippocamp.txt rename to forge-gui/res/cardsfolder/w/wavebreak_hippocamp.txt diff --git a/forge-gui/res/cardsfolder/upcoming/whirlwind_denial.txt b/forge-gui/res/cardsfolder/w/whirlwind_denial.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/whirlwind_denial.txt rename to forge-gui/res/cardsfolder/w/whirlwind_denial.txt diff --git a/forge-gui/res/cardsfolder/upcoming/wings_of_hubris.txt b/forge-gui/res/cardsfolder/w/wings_of_hubris.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/wings_of_hubris.txt rename to forge-gui/res/cardsfolder/w/wings_of_hubris.txt diff --git a/forge-gui/res/cardsfolder/upcoming/witness_of_tomorrows.txt b/forge-gui/res/cardsfolder/w/witness_of_tomorrows.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/witness_of_tomorrows.txt rename to forge-gui/res/cardsfolder/w/witness_of_tomorrows.txt diff --git a/forge-gui/res/cardsfolder/upcoming/woe_strider.txt b/forge-gui/res/cardsfolder/w/woe_strider.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/woe_strider.txt rename to forge-gui/res/cardsfolder/w/woe_strider.txt diff --git a/forge-gui/res/cardsfolder/upcoming/wolfwillow_haven.txt b/forge-gui/res/cardsfolder/w/wolfwillow_haven.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/wolfwillow_haven.txt rename to forge-gui/res/cardsfolder/w/wolfwillow_haven.txt