diff --git a/forge-gui/res/cardsfolder/upcoming/abyssal_harvester.txt b/forge-gui/res/cardsfolder/a/abyssal_harvester.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/abyssal_harvester.txt
rename to forge-gui/res/cardsfolder/a/abyssal_harvester.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alesha_who_laughs_at_fate.txt b/forge-gui/res/cardsfolder/a/alesha_who_laughs_at_fate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alesha_who_laughs_at_fate.txt
rename to forge-gui/res/cardsfolder/a/alesha_who_laughs_at_fate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ambush_wolf.txt b/forge-gui/res/cardsfolder/a/ambush_wolf.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ambush_wolf.txt
rename to forge-gui/res/cardsfolder/a/ambush_wolf.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/anep_vizier_of_hazoret.txt b/forge-gui/res/cardsfolder/a/anep_vizier_of_hazoret.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/anep_vizier_of_hazoret.txt
rename to forge-gui/res/cardsfolder/a/anep_vizier_of_hazoret.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/anguished_recollection.txt b/forge-gui/res/cardsfolder/a/anguished_recollection.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/anguished_recollection.txt
rename to forge-gui/res/cardsfolder/a/anguished_recollection.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aphelia_viper_whisperer.txt b/forge-gui/res/cardsfolder/a/aphelia_viper_whisperer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aphelia_viper_whisperer.txt
rename to forge-gui/res/cardsfolder/a/aphelia_viper_whisperer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arahbo_the_first_fang.txt b/forge-gui/res/cardsfolder/a/arahbo_the_first_fang.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arahbo_the_first_fang.txt
rename to forge-gui/res/cardsfolder/a/arahbo_the_first_fang.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arbiter_of_woe.txt b/forge-gui/res/cardsfolder/a/arbiter_of_woe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arbiter_of_woe.txt
rename to forge-gui/res/cardsfolder/a/arbiter_of_woe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arcane_epiphany.txt b/forge-gui/res/cardsfolder/a/arcane_epiphany.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arcane_epiphany.txt
rename to forge-gui/res/cardsfolder/a/arcane_epiphany.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/archmage_of_runes.txt b/forge-gui/res/cardsfolder/a/archmage_of_runes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/archmage_of_runes.txt
rename to forge-gui/res/cardsfolder/a/archmage_of_runes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/armasaur_guide.txt b/forge-gui/res/cardsfolder/a/armasaur_guide.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/armasaur_guide.txt
rename to forge-gui/res/cardsfolder/a/armasaur_guide.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ashroot_animist.txt b/forge-gui/res/cardsfolder/a/ashroot_animist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ashroot_animist.txt
rename to forge-gui/res/cardsfolder/a/ashroot_animist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/banner_of_kinship.txt b/forge-gui/res/cardsfolder/b/banner_of_kinship.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/banner_of_kinship.txt
rename to forge-gui/res/cardsfolder/b/banner_of_kinship.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/battlesong_berserker.txt b/forge-gui/res/cardsfolder/b/battlesong_berserker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/battlesong_berserker.txt
rename to forge-gui/res/cardsfolder/b/battlesong_berserker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/beast_kin_ranger.txt b/forge-gui/res/cardsfolder/b/beast_kin_ranger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/beast_kin_ranger.txt
rename to forge-gui/res/cardsfolder/b/beast_kin_ranger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bigfin_bouncer.txt b/forge-gui/res/cardsfolder/b/bigfin_bouncer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bigfin_bouncer.txt
rename to forge-gui/res/cardsfolder/b/bigfin_bouncer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/billowing_shriekmass.txt b/forge-gui/res/cardsfolder/b/billowing_shriekmass.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/billowing_shriekmass.txt
rename to forge-gui/res/cardsfolder/b/billowing_shriekmass.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/black_panther_wakandan_king.txt b/forge-gui/res/cardsfolder/b/black_panther_wakandan_king.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/black_panther_wakandan_king.txt
rename to forge-gui/res/cardsfolder/b/black_panther_wakandan_king.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blasphemous_edict.txt b/forge-gui/res/cardsfolder/b/blasphemous_edict.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blasphemous_edict.txt
rename to forge-gui/res/cardsfolder/b/blasphemous_edict.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bloodthirsty_conqueror.txt b/forge-gui/res/cardsfolder/b/bloodthirsty_conqueror.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bloodthirsty_conqueror.txt
rename to forge-gui/res/cardsfolder/b/bloodthirsty_conqueror.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/boltwave.txt b/forge-gui/res/cardsfolder/b/boltwave.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/boltwave.txt
rename to forge-gui/res/cardsfolder/b/boltwave.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/braulios_of_pheres_band.txt b/forge-gui/res/cardsfolder/b/braulios_of_pheres_band.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/braulios_of_pheres_band.txt
rename to forge-gui/res/cardsfolder/b/braulios_of_pheres_band.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brightglass_gearhulk.txt b/forge-gui/res/cardsfolder/b/brightglass_gearhulk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brightglass_gearhulk.txt
rename to forge-gui/res/cardsfolder/b/brightglass_gearhulk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brigone_soldier_of_meletis.txt b/forge-gui/res/cardsfolder/b/brigone_soldier_of_meletis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brigone_soldier_of_meletis.txt
rename to forge-gui/res/cardsfolder/b/brigone_soldier_of_meletis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bulk_up.txt b/forge-gui/res/cardsfolder/b/bulk_up.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bulk_up.txt
rename to forge-gui/res/cardsfolder/b/bulk_up.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cackling_prowler.txt b/forge-gui/res/cardsfolder/c/cackling_prowler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cackling_prowler.txt
rename to forge-gui/res/cardsfolder/c/cackling_prowler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/captain_america_first_avenger.txt b/forge-gui/res/cardsfolder/c/captain_america_first_avenger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/captain_america_first_avenger.txt
rename to forge-gui/res/cardsfolder/c/captain_america_first_avenger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cat_collector.txt b/forge-gui/res/cardsfolder/c/cat_collector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cat_collector.txt
rename to forge-gui/res/cardsfolder/c/cat_collector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/celestial_armor.txt b/forge-gui/res/cardsfolder/c/celestial_armor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/celestial_armor.txt
rename to forge-gui/res/cardsfolder/c/celestial_armor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cephalid_inkmage.txt b/forge-gui/res/cardsfolder/c/cephalid_inkmage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cephalid_inkmage.txt
rename to forge-gui/res/cardsfolder/c/cephalid_inkmage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chandra_flameshaper.txt b/forge-gui/res/cardsfolder/c/chandra_flameshaper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chandra_flameshaper.txt
rename to forge-gui/res/cardsfolder/c/chandra_flameshaper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chittering_illuminator.txt b/forge-gui/res/cardsfolder/c/chittering_illuminator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chittering_illuminator.txt
rename to forge-gui/res/cardsfolder/c/chittering_illuminator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/claws_out.txt b/forge-gui/res/cardsfolder/c/claws_out.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/claws_out.txt
rename to forge-gui/res/cardsfolder/c/claws_out.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cleon_merry_champion.txt b/forge-gui/res/cardsfolder/c/cleon_merry_champion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cleon_merry_champion.txt
rename to forge-gui/res/cardsfolder/c/cleon_merry_champion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clinquant_skymage.txt b/forge-gui/res/cardsfolder/c/clinquant_skymage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clinquant_skymage.txt
rename to forge-gui/res/cardsfolder/c/clinquant_skymage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/courageous_goblin.txt b/forge-gui/res/cardsfolder/c/courageous_goblin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/courageous_goblin.txt
rename to forge-gui/res/cardsfolder/c/courageous_goblin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crackling_cyclops.txt b/forge-gui/res/cardsfolder/c/crackling_cyclops.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crackling_cyclops.txt
rename to forge-gui/res/cardsfolder/c/crackling_cyclops.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crude_abattoir_unsavory_kitchen.txt b/forge-gui/res/cardsfolder/c/crude_abattoir_unsavory_kitchen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crude_abattoir_unsavory_kitchen.txt
rename to forge-gui/res/cardsfolder/c/crude_abattoir_unsavory_kitchen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crypt_feaster.txt b/forge-gui/res/cardsfolder/c/crypt_feaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crypt_feaster.txt
rename to forge-gui/res/cardsfolder/c/crypt_feaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crystal_barricade.txt b/forge-gui/res/cardsfolder/c/crystal_barricade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crystal_barricade.txt
rename to forge-gui/res/cardsfolder/c/crystal_barricade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curator_of_destinies.txt b/forge-gui/res/cardsfolder/c/curator_of_destinies.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curator_of_destinies.txt
rename to forge-gui/res/cardsfolder/c/curator_of_destinies.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cynette_jelly_drover.txt b/forge-gui/res/cardsfolder/c/cynette_jelly_drover.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cynette_jelly_drover.txt
rename to forge-gui/res/cardsfolder/c/cynette_jelly_drover.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/daretti_rocketeer_engineer.txt b/forge-gui/res/cardsfolder/d/daretti_rocketeer_engineer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/daretti_rocketeer_engineer.txt
rename to forge-gui/res/cardsfolder/d/daretti_rocketeer_engineer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dauntless_veteran.txt b/forge-gui/res/cardsfolder/d/dauntless_veteran.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dauntless_veteran.txt
rename to forge-gui/res/cardsfolder/d/dauntless_veteran.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dawnwing_marshal.txt b/forge-gui/res/cardsfolder/d/dawnwing_marshal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dawnwing_marshal.txt
rename to forge-gui/res/cardsfolder/d/dawnwing_marshal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dazzling_angel.txt b/forge-gui/res/cardsfolder/d/dazzling_angel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dazzling_angel.txt
rename to forge-gui/res/cardsfolder/d/dazzling_angel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/delightful_discovery.txt b/forge-gui/res/cardsfolder/d/delightful_discovery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/delightful_discovery.txt
rename to forge-gui/res/cardsfolder/d/delightful_discovery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dionus_elvish_archdruid.txt b/forge-gui/res/cardsfolder/d/dionus_elvish_archdruid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dionus_elvish_archdruid.txt
rename to forge-gui/res/cardsfolder/d/dionus_elvish_archdruid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/divine_resilience.txt b/forge-gui/res/cardsfolder/d/divine_resilience.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/divine_resilience.txt
rename to forge-gui/res/cardsfolder/d/divine_resilience.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dragon_trainer.txt b/forge-gui/res/cardsfolder/d/dragon_trainer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dragon_trainer.txt
rename to forge-gui/res/cardsfolder/d/dragon_trainer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drake_hatcher.txt b/forge-gui/res/cardsfolder/d/drake_hatcher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drake_hatcher.txt
rename to forge-gui/res/cardsfolder/d/drake_hatcher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dreadwing_scavenger.txt b/forge-gui/res/cardsfolder/d/dreadwing_scavenger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dreadwing_scavenger.txt
rename to forge-gui/res/cardsfolder/d/dreadwing_scavenger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dropkick_bomber.txt b/forge-gui/res/cardsfolder/d/dropkick_bomber.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dropkick_bomber.txt
rename to forge-gui/res/cardsfolder/d/dropkick_bomber.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eager_flameguide.txt b/forge-gui/res/cardsfolder/e/eager_flameguide.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eager_flameguide.txt
rename to forge-gui/res/cardsfolder/e/eager_flameguide.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eager_trufflesnout.txt b/forge-gui/res/cardsfolder/e/eager_trufflesnout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eager_trufflesnout.txt
rename to forge-gui/res/cardsfolder/e/eager_trufflesnout.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/earthrumbler.txt b/forge-gui/res/cardsfolder/e/earthrumbler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/earthrumbler.txt
rename to forge-gui/res/cardsfolder/e/earthrumbler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/effie_fast_learner.txt b/forge-gui/res/cardsfolder/e/effie_fast_learner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/effie_fast_learner.txt
rename to forge-gui/res/cardsfolder/e/effie_fast_learner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eidolon_of_astral_winds.txt b/forge-gui/res/cardsfolder/e/eidolon_of_astral_winds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eidolon_of_astral_winds.txt
rename to forge-gui/res/cardsfolder/e/eidolon_of_astral_winds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/electroduplicate.txt b/forge-gui/res/cardsfolder/e/electroduplicate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/electroduplicate.txt
rename to forge-gui/res/cardsfolder/e/electroduplicate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elementalist_adept.txt b/forge-gui/res/cardsfolder/e/elementalist_adept.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elementalist_adept.txt
rename to forge-gui/res/cardsfolder/e/elementalist_adept.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elenda_saint_of_dusk.txt b/forge-gui/res/cardsfolder/e/elenda_saint_of_dusk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elenda_saint_of_dusk.txt
rename to forge-gui/res/cardsfolder/e/elenda_saint_of_dusk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elfsworn_giant.txt b/forge-gui/res/cardsfolder/e/elfsworn_giant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elfsworn_giant.txt
rename to forge-gui/res/cardsfolder/e/elfsworn_giant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elvish_regrower.txt b/forge-gui/res/cardsfolder/e/elvish_regrower.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elvish_regrower.txt
rename to forge-gui/res/cardsfolder/e/elvish_regrower.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/enduring_friendship.txt b/forge-gui/res/cardsfolder/e/enduring_friendship.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/enduring_friendship.txt
rename to forge-gui/res/cardsfolder/e/enduring_friendship.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/erudite_wizard.txt b/forge-gui/res/cardsfolder/e/erudite_wizard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/erudite_wizard.txt
rename to forge-gui/res/cardsfolder/e/erudite_wizard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ethrimik_imagined_fiend.txt b/forge-gui/res/cardsfolder/e/ethrimik_imagined_fiend.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ethrimik_imagined_fiend.txt
rename to forge-gui/res/cardsfolder/e/ethrimik_imagined_fiend.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/evereth_viceroy_of_plunder.txt b/forge-gui/res/cardsfolder/e/evereth_viceroy_of_plunder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/evereth_viceroy_of_plunder.txt
rename to forge-gui/res/cardsfolder/e/evereth_viceroy_of_plunder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/exemplar_of_light.txt b/forge-gui/res/cardsfolder/e/exemplar_of_light.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/exemplar_of_light.txt
rename to forge-gui/res/cardsfolder/e/exemplar_of_light.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/faebloom_trick.txt b/forge-gui/res/cardsfolder/f/faebloom_trick.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/faebloom_trick.txt
rename to forge-gui/res/cardsfolder/f/faebloom_trick.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/faithful_pikemaster.txt b/forge-gui/res/cardsfolder/f/faithful_pikemaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/faithful_pikemaster.txt
rename to forge-gui/res/cardsfolder/f/faithful_pikemaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_change.txt b/forge-gui/res/cardsfolder/f/fear_of_change.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fear_of_change.txt
rename to forge-gui/res/cardsfolder/f/fear_of_change.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_ridicule.txt b/forge-gui/res/cardsfolder/f/fear_of_ridicule.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fear_of_ridicule.txt
rename to forge-gui/res/cardsfolder/f/fear_of_ridicule.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/felling_blow.txt b/forge-gui/res/cardsfolder/f/felling_blow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/felling_blow.txt
rename to forge-gui/res/cardsfolder/f/felling_blow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fiendish_panda.txt b/forge-gui/res/cardsfolder/f/fiendish_panda.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fiendish_panda.txt
rename to forge-gui/res/cardsfolder/f/fiendish_panda.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fiery_annihilation.txt b/forge-gui/res/cardsfolder/f/fiery_annihilation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fiery_annihilation.txt
rename to forge-gui/res/cardsfolder/f/fiery_annihilation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/firespitter_whelp.txt b/forge-gui/res/cardsfolder/f/firespitter_whelp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/firespitter_whelp.txt
rename to forge-gui/res/cardsfolder/f/firespitter_whelp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fishing_pole.txt b/forge-gui/res/cardsfolder/f/fishing_pole.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fishing_pole.txt
rename to forge-gui/res/cardsfolder/f/fishing_pole.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fleeting_flight.txt b/forge-gui/res/cardsfolder/f/fleeting_flight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fleeting_flight.txt
rename to forge-gui/res/cardsfolder/f/fleeting_flight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frontline_heroism.txt b/forge-gui/res/cardsfolder/f/frontline_heroism.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frontline_heroism.txt
rename to forge-gui/res/cardsfolder/f/frontline_heroism.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fumulus_the_infestation.txt b/forge-gui/res/cardsfolder/f/fumulus_the_infestation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fumulus_the_infestation.txt
rename to forge-gui/res/cardsfolder/f/fumulus_the_infestation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/general_kreat_the_boltbringer.txt b/forge-gui/res/cardsfolder/g/general_kreat_the_boltbringer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/general_kreat_the_boltbringer.txt
rename to forge-gui/res/cardsfolder/g/general_kreat_the_boltbringer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/generous_pup.txt b/forge-gui/res/cardsfolder/g/generous_pup.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/generous_pup.txt
rename to forge-gui/res/cardsfolder/g/generous_pup.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gilded_scuttler.txt b/forge-gui/res/cardsfolder/g/gilded_scuttler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gilded_scuttler.txt
rename to forge-gui/res/cardsfolder/g/gilded_scuttler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glimmer_hoarder.txt b/forge-gui/res/cardsfolder/g/glimmer_hoarder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glimmer_hoarder.txt
rename to forge-gui/res/cardsfolder/g/glimmer_hoarder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/go_forth.txt b/forge-gui/res/cardsfolder/g/go_forth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/go_forth.txt
rename to forge-gui/res/cardsfolder/g/go_forth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_boarders.txt b/forge-gui/res/cardsfolder/g/goblin_boarders.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goblin_boarders.txt
rename to forge-gui/res/cardsfolder/g/goblin_boarders.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_negotiation.txt b/forge-gui/res/cardsfolder/g/goblin_negotiation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goblin_negotiation.txt
rename to forge-gui/res/cardsfolder/g/goblin_negotiation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_surprise.txt b/forge-gui/res/cardsfolder/g/goblin_surprise.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goblin_surprise.txt
rename to forge-gui/res/cardsfolder/g/goblin_surprise.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/golden_sidekick.txt b/forge-gui/res/cardsfolder/g/golden_sidekick.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/golden_sidekick.txt
rename to forge-gui/res/cardsfolder/g/golden_sidekick.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gorehorn_raider.txt b/forge-gui/res/cardsfolder/g/gorehorn_raider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gorehorn_raider.txt
rename to forge-gui/res/cardsfolder/g/gorehorn_raider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gornog_the_red_reaper.txt b/forge-gui/res/cardsfolder/g/gornog_the_red_reaper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gornog_the_red_reaper.txt
rename to forge-gui/res/cardsfolder/g/gornog_the_red_reaper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/grappling_kraken.txt b/forge-gui/res/cardsfolder/g/grappling_kraken.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/grappling_kraken.txt
rename to forge-gui/res/cardsfolder/g/grappling_kraken.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/guarded_heir.txt b/forge-gui/res/cardsfolder/g/guarded_heir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/guarded_heir.txt
rename to forge-gui/res/cardsfolder/g/guarded_heir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gutless_plunderer.txt b/forge-gui/res/cardsfolder/g/gutless_plunderer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gutless_plunderer.txt
rename to forge-gui/res/cardsfolder/g/gutless_plunderer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hare_apparent.txt b/forge-gui/res/cardsfolder/h/hare_apparent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hare_apparent.txt
rename to forge-gui/res/cardsfolder/h/hare_apparent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hearts_on_fire.txt b/forge-gui/res/cardsfolder/h/hearts_on_fire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hearts_on_fire.txt
rename to forge-gui/res/cardsfolder/h/hearts_on_fire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/herald_of_eternal_dawn.txt b/forge-gui/res/cardsfolder/h/herald_of_eternal_dawn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/herald_of_eternal_dawn.txt
rename to forge-gui/res/cardsfolder/h/herald_of_eternal_dawn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/high_fae_trickster.txt b/forge-gui/res/cardsfolder/h/high_fae_trickster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/high_fae_trickster.txt
rename to forge-gui/res/cardsfolder/h/high_fae_trickster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/high_society_hunter.txt b/forge-gui/res/cardsfolder/h/high_society_hunter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/high_society_hunter.txt
rename to forge-gui/res/cardsfolder/h/high_society_hunter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hinterland_sanctifier.txt b/forge-gui/res/cardsfolder/h/hinterland_sanctifier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hinterland_sanctifier.txt
rename to forge-gui/res/cardsfolder/h/hinterland_sanctifier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/homunculus_horde.txt b/forge-gui/res/cardsfolder/h/homunculus_horde.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/homunculus_horde.txt
rename to forge-gui/res/cardsfolder/h/homunculus_horde.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/housemeld.txt b/forge-gui/res/cardsfolder/h/housemeld.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/housemeld.txt
rename to forge-gui/res/cardsfolder/h/housemeld.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hungry_ghoul.txt b/forge-gui/res/cardsfolder/h/hungry_ghoul.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hungry_ghoul.txt
rename to forge-gui/res/cardsfolder/h/hungry_ghoul.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hungry_megasloth.txt b/forge-gui/res/cardsfolder/h/hungry_megasloth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hungry_megasloth.txt
rename to forge-gui/res/cardsfolder/h/hungry_megasloth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hurska_sweet_tooth.txt b/forge-gui/res/cardsfolder/h/hurska_sweet_tooth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hurska_sweet_tooth.txt
rename to forge-gui/res/cardsfolder/h/hurska_sweet_tooth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/icewind_elemental.txt b/forge-gui/res/cardsfolder/i/icewind_elemental.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/icewind_elemental.txt
rename to forge-gui/res/cardsfolder/i/icewind_elemental.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/incinerating_blast.txt b/forge-gui/res/cardsfolder/i/incinerating_blast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/incinerating_blast.txt
rename to forge-gui/res/cardsfolder/i/incinerating_blast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/infernal_vessel.txt b/forge-gui/res/cardsfolder/i/infernal_vessel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/infernal_vessel.txt
rename to forge-gui/res/cardsfolder/i/infernal_vessel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/infestation_sage.txt b/forge-gui/res/cardsfolder/i/infestation_sage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/infestation_sage.txt
rename to forge-gui/res/cardsfolder/i/infestation_sage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/inspiration_from_beyond.txt b/forge-gui/res/cardsfolder/i/inspiration_from_beyond.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/inspiration_from_beyond.txt
rename to forge-gui/res/cardsfolder/i/inspiration_from_beyond.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/inspiring_paladin.txt b/forge-gui/res/cardsfolder/i/inspiring_paladin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/inspiring_paladin.txt
rename to forge-gui/res/cardsfolder/i/inspiring_paladin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/iron_man_titan_of_innovation.txt b/forge-gui/res/cardsfolder/i/iron_man_titan_of_innovation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/iron_man_titan_of_innovation.txt
rename to forge-gui/res/cardsfolder/i/iron_man_titan_of_innovation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ivora_insatiable_heir.txt b/forge-gui/res/cardsfolder/i/ivora_insatiable_heir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ivora_insatiable_heir.txt
rename to forge-gui/res/cardsfolder/i/ivora_insatiable_heir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/joust_through.txt b/forge-gui/res/cardsfolder/j/joust_through.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/joust_through.txt
rename to forge-gui/res/cardsfolder/j/joust_through.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kaito_cunning_infiltrator.txt b/forge-gui/res/cardsfolder/k/kaito_cunning_infiltrator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kaito_cunning_infiltrator.txt
rename to forge-gui/res/cardsfolder/k/kaito_cunning_infiltrator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kellan_planar_trailblazer.txt b/forge-gui/res/cardsfolder/k/kellan_planar_trailblazer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kellan_planar_trailblazer.txt
rename to forge-gui/res/cardsfolder/k/kellan_planar_trailblazer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kiora_the_rising_tide.txt b/forge-gui/res/cardsfolder/k/kiora_the_rising_tide.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kiora_the_rising_tide.txt
rename to forge-gui/res/cardsfolder/k/kiora_the_rising_tide.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/koma_world_eater.txt b/forge-gui/res/cardsfolder/k/koma_world_eater.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/koma_world_eater.txt
rename to forge-gui/res/cardsfolder/k/koma_world_eater.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kykar_zephyr_awakener.txt b/forge-gui/res/cardsfolder/k/kykar_zephyr_awakener.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kykar_zephyr_awakener.txt
rename to forge-gui/res/cardsfolder/k/kykar_zephyr_awakener.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/leyline_axe.txt b/forge-gui/res/cardsfolder/l/leyline_axe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/leyline_axe.txt
rename to forge-gui/res/cardsfolder/l/leyline_axe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/loot_exuberant_explorer.txt b/forge-gui/res/cardsfolder/l/loot_exuberant_explorer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/loot_exuberant_explorer.txt
rename to forge-gui/res/cardsfolder/l/loot_exuberant_explorer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/luminous_rebuke.txt b/forge-gui/res/cardsfolder/l/luminous_rebuke.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/luminous_rebuke.txt
rename to forge-gui/res/cardsfolder/l/luminous_rebuke.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lunar_insight.txt b/forge-gui/res/cardsfolder/l/lunar_insight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lunar_insight.txt
rename to forge-gui/res/cardsfolder/l/lunar_insight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mangled_soulrager.txt b/forge-gui/res/cardsfolder/m/mangled_soulrager.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mangled_soulrager.txt
rename to forge-gui/res/cardsfolder/m/mangled_soulrager.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/midnight_snack.txt b/forge-gui/res/cardsfolder/m/midnight_snack.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/midnight_snack.txt
rename to forge-gui/res/cardsfolder/m/midnight_snack.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mischievous_lookout.txt b/forge-gui/res/cardsfolder/m/mischievous_lookout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mischievous_lookout.txt
rename to forge-gui/res/cardsfolder/m/mischievous_lookout.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mischievous_mystic.txt b/forge-gui/res/cardsfolder/m/mischievous_mystic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mischievous_mystic.txt
rename to forge-gui/res/cardsfolder/m/mischievous_mystic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mossborn_hydra.txt b/forge-gui/res/cardsfolder/m/mossborn_hydra.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mossborn_hydra.txt
rename to forge-gui/res/cardsfolder/m/mossborn_hydra.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mothlight_processionist.txt b/forge-gui/res/cardsfolder/m/mothlight_processionist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mothlight_processionist.txt
rename to forge-gui/res/cardsfolder/m/mothlight_processionist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nazar_the_velvet_fang.txt b/forge-gui/res/cardsfolder/n/nazar_the_velvet_fang.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nazar_the_velvet_fang.txt
rename to forge-gui/res/cardsfolder/n/nazar_the_velvet_fang.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/needletooth_pack.txt b/forge-gui/res/cardsfolder/n/needletooth_pack.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/needletooth_pack.txt
rename to forge-gui/res/cardsfolder/n/needletooth_pack.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/neerdiv_devious_diver.txt b/forge-gui/res/cardsfolder/n/neerdiv_devious_diver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/neerdiv_devious_diver.txt
rename to forge-gui/res/cardsfolder/n/neerdiv_devious_diver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/niv_mizzet_visionary.txt b/forge-gui/res/cardsfolder/n/niv_mizzet_visionary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/niv_mizzet_visionary.txt
rename to forge-gui/res/cardsfolder/n/niv_mizzet_visionary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ozox_the_clattering_king.txt b/forge-gui/res/cardsfolder/o/ozox_the_clattering_king.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ozox_the_clattering_king.txt
rename to forge-gui/res/cardsfolder/o/ozox_the_clattering_king.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/perforating_artist.txt b/forge-gui/res/cardsfolder/p/perforating_artist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/perforating_artist.txt
rename to forge-gui/res/cardsfolder/p/perforating_artist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phantasmal_shieldback.txt b/forge-gui/res/cardsfolder/p/phantasmal_shieldback.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phantasmal_shieldback.txt
rename to forge-gui/res/cardsfolder/p/phantasmal_shieldback.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/plagon_lord_of_the_beach.txt b/forge-gui/res/cardsfolder/p/plagon_lord_of_the_beach.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/plagon_lord_of_the_beach.txt
rename to forge-gui/res/cardsfolder/p/plagon_lord_of_the_beach.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pol_jamaar_illusionist.txt b/forge-gui/res/cardsfolder/p/pol_jamaar_illusionist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pol_jamaar_illusionist.txt
rename to forge-gui/res/cardsfolder/p/pol_jamaar_illusionist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/polterheist.txt b/forge-gui/res/cardsfolder/p/polterheist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/polterheist.txt
rename to forge-gui/res/cardsfolder/p/polterheist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/preposterous_proportions.txt b/forge-gui/res/cardsfolder/p/preposterous_proportions.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/preposterous_proportions.txt
rename to forge-gui/res/cardsfolder/p/preposterous_proportions.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/psemilla_meletian_poet.txt b/forge-gui/res/cardsfolder/p/psemilla_meletian_poet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/psemilla_meletian_poet.txt
rename to forge-gui/res/cardsfolder/p/psemilla_meletian_poet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/qala_ajanis_pridemate.txt b/forge-gui/res/cardsfolder/q/qala_ajanis_pridemate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/qala_ajanis_pridemate.txt
rename to forge-gui/res/cardsfolder/q/qala_ajanis_pridemate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quakestrider_ceratops.txt b/forge-gui/res/cardsfolder/q/quakestrider_ceratops.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quakestrider_ceratops.txt
rename to forge-gui/res/cardsfolder/q/quakestrider_ceratops.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quick_draw_katana.txt b/forge-gui/res/cardsfolder/q/quick_draw_katana.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quick_draw_katana.txt
rename to forge-gui/res/cardsfolder/q/quick_draw_katana.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quilled_greatwurm.txt b/forge-gui/res/cardsfolder/q/quilled_greatwurm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quilled_greatwurm.txt
rename to forge-gui/res/cardsfolder/q/quilled_greatwurm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/raise_the_past.txt b/forge-gui/res/cardsfolder/r/raise_the_past.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raise_the_past.txt
rename to forge-gui/res/cardsfolder/r/raise_the_past.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ravenous_amulet.txt b/forge-gui/res/cardsfolder/r/ravenous_amulet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ravenous_amulet.txt
rename to forge-gui/res/cardsfolder/r/ravenous_amulet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/razor_demon.txt b/forge-gui/res/cardsfolder/r/razor_demon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/razor_demon.txt
rename to forge-gui/res/cardsfolder/r/razor_demon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/razorgrass_invoker.txt b/forge-gui/res/cardsfolder/r/razorgrass_invoker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/razorgrass_invoker.txt
rename to forge-gui/res/cardsfolder/r/razorgrass_invoker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/refute.txt b/forge-gui/res/cardsfolder/r/refute.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/refute.txt
rename to forge-gui/res/cardsfolder/r/refute.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/replicating_terror.txt b/forge-gui/res/cardsfolder/r/replicating_terror.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/replicating_terror.txt
rename to forge-gui/res/cardsfolder/r/replicating_terror.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rev_tithe_extractor.txt b/forge-gui/res/cardsfolder/r/rev_tithe_extractor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rev_tithe_extractor.txt
rename to forge-gui/res/cardsfolder/r/rev_tithe_extractor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/revenge_of_the_rats.txt b/forge-gui/res/cardsfolder/r/revenge_of_the_rats.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/revenge_of_the_rats.txt
rename to forge-gui/res/cardsfolder/r/revenge_of_the_rats.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/revoke_demise.txt b/forge-gui/res/cardsfolder/r/revoke_demise.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/revoke_demise.txt
rename to forge-gui/res/cardsfolder/r/revoke_demise.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rite_of_the_dragoncaller.txt b/forge-gui/res/cardsfolder/r/rite_of_the_dragoncaller.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rite_of_the_dragoncaller.txt
rename to forge-gui/res/cardsfolder/r/rite_of_the_dragoncaller.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rune_sealed_wall.txt b/forge-gui/res/cardsfolder/r/rune_sealed_wall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rune_sealed_wall.txt
rename to forge-gui/res/cardsfolder/r/rune_sealed_wall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sandstorm_crasher.txt b/forge-gui/res/cardsfolder/s/sandstorm_crasher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sandstorm_crasher.txt
rename to forge-gui/res/cardsfolder/s/sandstorm_crasher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sanguine_syphoner.txt b/forge-gui/res/cardsfolder/s/sanguine_syphoner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sanguine_syphoner.txt
rename to forge-gui/res/cardsfolder/s/sanguine_syphoner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/saurian_symbiote.txt b/forge-gui/res/cardsfolder/s/saurian_symbiote.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/saurian_symbiote.txt
rename to forge-gui/res/cardsfolder/s/saurian_symbiote.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scholar_of_combustion.txt b/forge-gui/res/cardsfolder/s/scholar_of_combustion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scholar_of_combustion.txt
rename to forge-gui/res/cardsfolder/s/scholar_of_combustion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scourge_of_the_undercity.txt b/forge-gui/res/cardsfolder/s/scourge_of_the_undercity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scourge_of_the_undercity.txt
rename to forge-gui/res/cardsfolder/s/scourge_of_the_undercity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scrawling_crawler.txt b/forge-gui/res/cardsfolder/s/scrawling_crawler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scrawling_crawler.txt
rename to forge-gui/res/cardsfolder/s/scrawling_crawler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scythecat_cub.txt b/forge-gui/res/cardsfolder/s/scythecat_cub.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scythecat_cub.txt
rename to forge-gui/res/cardsfolder/s/scythecat_cub.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/searslicer_goblin.txt b/forge-gui/res/cardsfolder/s/searslicer_goblin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/searslicer_goblin.txt
rename to forge-gui/res/cardsfolder/s/searslicer_goblin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seekers_folly.txt b/forge-gui/res/cardsfolder/s/seekers_folly.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seekers_folly.txt
rename to forge-gui/res/cardsfolder/s/seekers_folly.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shardless_outlander.txt b/forge-gui/res/cardsfolder/s/shardless_outlander.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shardless_outlander.txt
rename to forge-gui/res/cardsfolder/s/shardless_outlander.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shroofus_sproutsire.txt b/forge-gui/res/cardsfolder/s/shroofus_sproutsire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shroofus_sproutsire.txt
rename to forge-gui/res/cardsfolder/s/shroofus_sproutsire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sire_of_seven_deaths.txt b/forge-gui/res/cardsfolder/s/sire_of_seven_deaths.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sire_of_seven_deaths.txt
rename to forge-gui/res/cardsfolder/s/sire_of_seven_deaths.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skyknight_squire.txt b/forge-gui/res/cardsfolder/s/skyknight_squire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skyknight_squire.txt
rename to forge-gui/res/cardsfolder/s/skyknight_squire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skyship_buccaneer.txt b/forge-gui/res/cardsfolder/s/skyship_buccaneer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skyship_buccaneer.txt
rename to forge-gui/res/cardsfolder/s/skyship_buccaneer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slimy_piper.txt b/forge-gui/res/cardsfolder/s/slimy_piper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slimy_piper.txt
rename to forge-gui/res/cardsfolder/s/slimy_piper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slinza_the_spiked_stampede.txt b/forge-gui/res/cardsfolder/s/slinza_the_spiked_stampede.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slinza_the_spiked_stampede.txt
rename to forge-gui/res/cardsfolder/s/slinza_the_spiked_stampede.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slumbering_cerberus.txt b/forge-gui/res/cardsfolder/s/slumbering_cerberus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slumbering_cerberus.txt
rename to forge-gui/res/cardsfolder/s/slumbering_cerberus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soul_shackled_zombie.txt b/forge-gui/res/cardsfolder/s/soul_shackled_zombie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soul_shackled_zombie.txt
rename to forge-gui/res/cardsfolder/s/soul_shackled_zombie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soul_shredder.txt b/forge-gui/res/cardsfolder/s/soul_shredder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soul_shredder.txt
rename to forge-gui/res/cardsfolder/s/soul_shredder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soulstone_sanctuary.txt b/forge-gui/res/cardsfolder/s/soulstone_sanctuary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soulstone_sanctuary.txt
rename to forge-gui/res/cardsfolder/s/soulstone_sanctuary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sower_of_chaos.txt b/forge-gui/res/cardsfolder/s/sower_of_chaos.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sower_of_chaos.txt
rename to forge-gui/res/cardsfolder/s/sower_of_chaos.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sphinx_of_forgotten_lore.txt b/forge-gui/res/cardsfolder/s/sphinx_of_forgotten_lore.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sphinx_of_forgotten_lore.txt
rename to forge-gui/res/cardsfolder/s/sphinx_of_forgotten_lore.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spined_tyrranax.txt b/forge-gui/res/cardsfolder/s/spined_tyrranax.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spined_tyrranax.txt
rename to forge-gui/res/cardsfolder/s/spined_tyrranax.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spinner_of_souls.txt b/forge-gui/res/cardsfolder/s/spinner_of_souls.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spinner_of_souls.txt
rename to forge-gui/res/cardsfolder/s/spinner_of_souls.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/squad_rallier.txt b/forge-gui/res/cardsfolder/s/squad_rallier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/squad_rallier.txt
rename to forge-gui/res/cardsfolder/s/squad_rallier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stab.txt b/forge-gui/res/cardsfolder/s/stab.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stab.txt
rename to forge-gui/res/cardsfolder/s/stab.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/starlight_snare.txt b/forge-gui/res/cardsfolder/s/starlight_snare.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/starlight_snare.txt
rename to forge-gui/res/cardsfolder/s/starlight_snare.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/starnheim_memento.txt b/forge-gui/res/cardsfolder/s/starnheim_memento.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/starnheim_memento.txt
rename to forge-gui/res/cardsfolder/s/starnheim_memento.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/storm_force_of_nature.txt b/forge-gui/res/cardsfolder/s/storm_force_of_nature.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/storm_force_of_nature.txt
rename to forge-gui/res/cardsfolder/s/storm_force_of_nature.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/strix_lookout.txt b/forge-gui/res/cardsfolder/s/strix_lookout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/strix_lookout.txt
rename to forge-gui/res/cardsfolder/s/strix_lookout.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/strongbox_raider.txt b/forge-gui/res/cardsfolder/s/strongbox_raider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/strongbox_raider.txt
rename to forge-gui/res/cardsfolder/s/strongbox_raider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sun_blessed_healer.txt b/forge-gui/res/cardsfolder/s/sun_blessed_healer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sun_blessed_healer.txt
rename to forge-gui/res/cardsfolder/s/sun_blessed_healer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sutina_speaker_of_the_tajuru.txt b/forge-gui/res/cardsfolder/s/sutina_speaker_of_the_tajuru.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sutina_speaker_of_the_tajuru.txt
rename to forge-gui/res/cardsfolder/s/sutina_speaker_of_the_tajuru.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sylvan_scavenging.txt b/forge-gui/res/cardsfolder/s/sylvan_scavenging.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sylvan_scavenging.txt
rename to forge-gui/res/cardsfolder/s/sylvan_scavenging.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/taeko_the_patient_avalanche.txt b/forge-gui/res/cardsfolder/t/taeko_the_patient_avalanche.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/taeko_the_patient_avalanche.txt
rename to forge-gui/res/cardsfolder/t/taeko_the_patient_avalanche.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thurid_mare_of_destiny.txt b/forge-gui/res/cardsfolder/t/thurid_mare_of_destiny.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thurid_mare_of_destiny.txt
rename to forge-gui/res/cardsfolder/t/thurid_mare_of_destiny.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tinybones_bauble_burglar.txt b/forge-gui/res/cardsfolder/t/tinybones_bauble_burglar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tinybones_bauble_burglar.txt
rename to forge-gui/res/cardsfolder/t/tinybones_bauble_burglar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tragic_banshee.txt b/forge-gui/res/cardsfolder/t/tragic_banshee.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tragic_banshee.txt
rename to forge-gui/res/cardsfolder/t/tragic_banshee.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/treetop_snarespinner.txt b/forge-gui/res/cardsfolder/t/treetop_snarespinner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/treetop_snarespinner.txt
rename to forge-gui/res/cardsfolder/t/treetop_snarespinner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/twinblade_blessing.txt b/forge-gui/res/cardsfolder/t/twinblade_blessing.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/twinblade_blessing.txt
rename to forge-gui/res/cardsfolder/t/twinblade_blessing.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/twinflame_tyrant.txt b/forge-gui/res/cardsfolder/t/twinflame_tyrant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/twinflame_tyrant.txt
rename to forge-gui/res/cardsfolder/t/twinflame_tyrant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/uncharted_voyage.txt b/forge-gui/res/cardsfolder/u/uncharted_voyage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/uncharted_voyage.txt
rename to forge-gui/res/cardsfolder/u/uncharted_voyage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unnatural_summons.txt b/forge-gui/res/cardsfolder/u/unnatural_summons.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unnatural_summons.txt
rename to forge-gui/res/cardsfolder/u/unnatural_summons.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/urdnan_dromoka_warrior.txt b/forge-gui/res/cardsfolder/u/urdnan_dromoka_warrior.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/urdnan_dromoka_warrior.txt
rename to forge-gui/res/cardsfolder/u/urdnan_dromoka_warrior.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/valkyries_call.txt b/forge-gui/res/cardsfolder/v/valkyries_call.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/valkyries_call.txt
rename to forge-gui/res/cardsfolder/v/valkyries_call.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vampire_gourmand.txt b/forge-gui/res/cardsfolder/v/vampire_gourmand.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vampire_gourmand.txt
rename to forge-gui/res/cardsfolder/v/vampire_gourmand.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vampire_soulcaller.txt b/forge-gui/res/cardsfolder/v/vampire_soulcaller.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vampire_soulcaller.txt
rename to forge-gui/res/cardsfolder/v/vampire_soulcaller.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vanguard_seraph.txt b/forge-gui/res/cardsfolder/v/vanguard_seraph.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vanguard_seraph.txt
rename to forge-gui/res/cardsfolder/v/vanguard_seraph.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/verdant_dread.txt b/forge-gui/res/cardsfolder/v/verdant_dread.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/verdant_dread.txt
rename to forge-gui/res/cardsfolder/v/verdant_dread.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wardens_of_the_cycle.txt b/forge-gui/res/cardsfolder/w/wardens_of_the_cycle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wardens_of_the_cycle.txt
rename to forge-gui/res/cardsfolder/w/wardens_of_the_cycle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wary_zone_guard.txt b/forge-gui/res/cardsfolder/w/wary_zone_guard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wary_zone_guard.txt
rename to forge-gui/res/cardsfolder/w/wary_zone_guard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/welcome_the_darkness.txt b/forge-gui/res/cardsfolder/w/welcome_the_darkness.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/welcome_the_darkness.txt
rename to forge-gui/res/cardsfolder/w/welcome_the_darkness.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wingbright_thief.txt b/forge-gui/res/cardsfolder/w/wingbright_thief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wingbright_thief.txt
rename to forge-gui/res/cardsfolder/w/wingbright_thief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wolverine_best_there_is.txt b/forge-gui/res/cardsfolder/w/wolverine_best_there_is.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wolverine_best_there_is.txt
rename to forge-gui/res/cardsfolder/w/wolverine_best_there_is.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/woodland_liege.txt b/forge-gui/res/cardsfolder/w/woodland_liege.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/woodland_liege.txt
rename to forge-gui/res/cardsfolder/w/woodland_liege.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wriggling_grub.txt b/forge-gui/res/cardsfolder/w/wriggling_grub.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wriggling_grub.txt
rename to forge-gui/res/cardsfolder/w/wriggling_grub.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zimone_paradox_sculptor.txt b/forge-gui/res/cardsfolder/z/zimone_paradox_sculptor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zimone_paradox_sculptor.txt
rename to forge-gui/res/cardsfolder/z/zimone_paradox_sculptor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zul_ashur_lich_lord.txt b/forge-gui/res/cardsfolder/z/zul_ashur_lich_lord.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zul_ashur_lich_lord.txt
rename to forge-gui/res/cardsfolder/z/zul_ashur_lich_lord.txt