diff --git a/forge-gui/res/cardsfolder/upcoming/abandon_the_post.txt b/forge-gui/res/cardsfolder/a/abandon_the_post.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/abandon_the_post.txt
rename to forge-gui/res/cardsfolder/a/abandon_the_post.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/adeline_resplendent_cathar.txt b/forge-gui/res/cardsfolder/a/adeline_resplendent_cathar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/adeline_resplendent_cathar.txt
rename to forge-gui/res/cardsfolder/a/adeline_resplendent_cathar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ambitious_farmhand_seasoned_cathar.txt b/forge-gui/res/cardsfolder/a/ambitious_farmhand_seasoned_cathar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ambitious_farmhand_seasoned_cathar.txt
rename to forge-gui/res/cardsfolder/a/ambitious_farmhand_seasoned_cathar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/angelfire_ignition.txt b/forge-gui/res/cardsfolder/a/angelfire_ignition.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/angelfire_ignition.txt
rename to forge-gui/res/cardsfolder/a/angelfire_ignition.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arcane_infusion.txt b/forge-gui/res/cardsfolder/a/arcane_infusion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arcane_infusion.txt
rename to forge-gui/res/cardsfolder/a/arcane_infusion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ardent_elementalist.txt b/forge-gui/res/cardsfolder/a/ardent_elementalist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ardent_elementalist.txt
rename to forge-gui/res/cardsfolder/a/ardent_elementalist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arlinn_the_packs_hope_arlinn_the_moons_fury.txt b/forge-gui/res/cardsfolder/a/arlinn_the_packs_hope_arlinn_the_moons_fury.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arlinn_the_packs_hope_arlinn_the_moons_fury.txt
rename to forge-gui/res/cardsfolder/a/arlinn_the_packs_hope_arlinn_the_moons_fury.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arrogant_outlaw.txt b/forge-gui/res/cardsfolder/a/arrogant_outlaw.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arrogant_outlaw.txt
rename to forge-gui/res/cardsfolder/a/arrogant_outlaw.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/augur_of_autumn.txt b/forge-gui/res/cardsfolder/a/augur_of_autumn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/augur_of_autumn.txt
rename to forge-gui/res/cardsfolder/a/augur_of_autumn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/avacyns_memorial.txt b/forge-gui/res/cardsfolder/a/avacyns_memorial.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/avacyns_memorial.txt
rename to forge-gui/res/cardsfolder/a/avacyns_memorial.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/baithook_angler_hook_haunt_drifter.txt b/forge-gui/res/cardsfolder/b/baithook_angler_hook_haunt_drifter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/baithook_angler_hook_haunt_drifter.txt
rename to forge-gui/res/cardsfolder/b/baithook_angler_hook_haunt_drifter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/baneblade_scoundrel_baneclaw_marauder.txt b/forge-gui/res/cardsfolder/b/baneblade_scoundrel_baneclaw_marauder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/baneblade_scoundrel_baneclaw_marauder.txt
rename to forge-gui/res/cardsfolder/b/baneblade_scoundrel_baneclaw_marauder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bat_whisperer.txt b/forge-gui/res/cardsfolder/b/bat_whisperer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bat_whisperer.txt
rename to forge-gui/res/cardsfolder/b/bat_whisperer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/beloved_beggar_generous_soul.txt b/forge-gui/res/cardsfolder/b/beloved_beggar_generous_soul.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/beloved_beggar_generous_soul.txt
rename to forge-gui/res/cardsfolder/b/beloved_beggar_generous_soul.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bereaved_survivor_dauntless_avenger.txt b/forge-gui/res/cardsfolder/b/bereaved_survivor_dauntless_avenger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bereaved_survivor_dauntless_avenger.txt
rename to forge-gui/res/cardsfolder/b/bereaved_survivor_dauntless_avenger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bird_admirer_wing_shredder.txt b/forge-gui/res/cardsfolder/b/bird_admirer_wing_shredder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bird_admirer_wing_shredder.txt
rename to forge-gui/res/cardsfolder/b/bird_admirer_wing_shredder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bladestitched_skaab.txt b/forge-gui/res/cardsfolder/b/bladestitched_skaab.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bladestitched_skaab.txt
rename to forge-gui/res/cardsfolder/b/bladestitched_skaab.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blessed_defiance.txt b/forge-gui/res/cardsfolder/b/blessed_defiance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blessed_defiance.txt
rename to forge-gui/res/cardsfolder/b/blessed_defiance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blood_pact.txt b/forge-gui/res/cardsfolder/b/blood_pact.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blood_pact.txt
rename to forge-gui/res/cardsfolder/b/blood_pact.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bloodline_culling.txt b/forge-gui/res/cardsfolder/b/bloodline_culling.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bloodline_culling.txt
rename to forge-gui/res/cardsfolder/b/bloodline_culling.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bloodthirsty_adversary.txt b/forge-gui/res/cardsfolder/b/bloodthirsty_adversary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bloodthirsty_adversary.txt
rename to forge-gui/res/cardsfolder/b/bloodthirsty_adversary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bloodtithe_collector.txt b/forge-gui/res/cardsfolder/b/bloodtithe_collector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bloodtithe_collector.txt
rename to forge-gui/res/cardsfolder/b/bloodtithe_collector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/borrowed_time.txt b/forge-gui/res/cardsfolder/b/borrowed_time.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/borrowed_time.txt
rename to forge-gui/res/cardsfolder/b/borrowed_time.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bounding_wolf.txt b/forge-gui/res/cardsfolder/b/bounding_wolf.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bounding_wolf.txt
rename to forge-gui/res/cardsfolder/b/bounding_wolf.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bramble_armor.txt b/forge-gui/res/cardsfolder/b/bramble_armor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bramble_armor.txt
rename to forge-gui/res/cardsfolder/b/bramble_armor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/briarbridge_tracker.txt b/forge-gui/res/cardsfolder/b/briarbridge_tracker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/briarbridge_tracker.txt
rename to forge-gui/res/cardsfolder/b/briarbridge_tracker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brimstone_vandal.txt b/forge-gui/res/cardsfolder/b/brimstone_vandal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brimstone_vandal.txt
rename to forge-gui/res/cardsfolder/b/brimstone_vandal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brood_weaver.txt b/forge-gui/res/cardsfolder/b/brood_weaver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brood_weaver.txt
rename to forge-gui/res/cardsfolder/b/brood_weaver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brutal_cathar_moonrage_brute.txt b/forge-gui/res/cardsfolder/b/brutal_cathar_moonrage_brute.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brutal_cathar_moonrage_brute.txt
rename to forge-gui/res/cardsfolder/b/brutal_cathar_moonrage_brute.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/burly_breaker_dire_strain_demolisher.txt b/forge-gui/res/cardsfolder/b/burly_breaker_dire_strain_demolisher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/burly_breaker_dire_strain_demolisher.txt
rename to forge-gui/res/cardsfolder/b/burly_breaker_dire_strain_demolisher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/burn_down_the_house.txt b/forge-gui/res/cardsfolder/b/burn_down_the_house.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/burn_down_the_house.txt
rename to forge-gui/res/cardsfolder/b/burn_down_the_house.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/burn_the_accursed.txt b/forge-gui/res/cardsfolder/b/burn_the_accursed.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/burn_the_accursed.txt
rename to forge-gui/res/cardsfolder/b/burn_the_accursed.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/candlegrove_witch.txt b/forge-gui/res/cardsfolder/c/candlegrove_witch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/candlegrove_witch.txt
rename to forge-gui/res/cardsfolder/c/candlegrove_witch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/candlelit_cavalry.txt b/forge-gui/res/cardsfolder/c/candlelit_cavalry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/candlelit_cavalry.txt
rename to forge-gui/res/cardsfolder/c/candlelit_cavalry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/candletrap.txt b/forge-gui/res/cardsfolder/c/candletrap.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/candletrap.txt
rename to forge-gui/res/cardsfolder/c/candletrap.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cant_stay_away.txt b/forge-gui/res/cardsfolder/c/cant_stay_away.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cant_stay_away.txt
rename to forge-gui/res/cardsfolder/c/cant_stay_away.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cathar_commando.txt b/forge-gui/res/cardsfolder/c/cathar_commando.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cathar_commando.txt
rename to forge-gui/res/cardsfolder/c/cathar_commando.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cathars_call.txt b/forge-gui/res/cardsfolder/c/cathars_call.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cathars_call.txt
rename to forge-gui/res/cardsfolder/c/cathars_call.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cathartic_pyre.txt b/forge-gui/res/cardsfolder/c/cathartic_pyre.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cathartic_pyre.txt
rename to forge-gui/res/cardsfolder/c/cathartic_pyre.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/celebrate_the_harvest.txt b/forge-gui/res/cardsfolder/c/celebrate_the_harvest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/celebrate_the_harvest.txt
rename to forge-gui/res/cardsfolder/c/celebrate_the_harvest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/celestial_judgment.txt b/forge-gui/res/cardsfolder/c/celestial_judgment.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/celestial_judgment.txt
rename to forge-gui/res/cardsfolder/c/celestial_judgment.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/celestus_sanctifier.txt b/forge-gui/res/cardsfolder/c/celestus_sanctifier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/celestus_sanctifier.txt
rename to forge-gui/res/cardsfolder/c/celestus_sanctifier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/champion_of_the_perished.txt b/forge-gui/res/cardsfolder/c/champion_of_the_perished.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/champion_of_the_perished.txt
rename to forge-gui/res/cardsfolder/c/champion_of_the_perished.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chaplain_of_alms_chapel_shieldgeist.txt b/forge-gui/res/cardsfolder/c/chaplain_of_alms_chapel_shieldgeist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chaplain_of_alms_chapel_shieldgeist.txt
rename to forge-gui/res/cardsfolder/c/chaplain_of_alms_chapel_shieldgeist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clarion_cathars.txt b/forge-gui/res/cardsfolder/c/clarion_cathars.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clarion_cathars.txt
rename to forge-gui/res/cardsfolder/c/clarion_cathars.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cleaver_skaab.txt b/forge-gui/res/cardsfolder/c/cleaver_skaab.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cleaver_skaab.txt
rename to forge-gui/res/cardsfolder/c/cleaver_skaab.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/component_collector.txt b/forge-gui/res/cardsfolder/c/component_collector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/component_collector.txt
rename to forge-gui/res/cardsfolder/c/component_collector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/consider.txt b/forge-gui/res/cardsfolder/c/consider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/consider.txt
rename to forge-gui/res/cardsfolder/c/consider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/consuming_blob.txt b/forge-gui/res/cardsfolder/c/consuming_blob.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/consuming_blob.txt
rename to forge-gui/res/cardsfolder/c/consuming_blob.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/contortionist_troupe.txt b/forge-gui/res/cardsfolder/c/contortionist_troupe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/contortionist_troupe.txt
rename to forge-gui/res/cardsfolder/c/contortionist_troupe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/corpse_cobble.txt b/forge-gui/res/cardsfolder/c/corpse_cobble.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/corpse_cobble.txt
rename to forge-gui/res/cardsfolder/c/corpse_cobble.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/covert_cutpurse_covetous_geist.txt b/forge-gui/res/cardsfolder/c/covert_cutpurse_covetous_geist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/covert_cutpurse_covetous_geist.txt
rename to forge-gui/res/cardsfolder/c/covert_cutpurse_covetous_geist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/covetous_castaway_ghostly_castigator.txt b/forge-gui/res/cardsfolder/c/covetous_castaway_ghostly_castigator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/covetous_castaway_ghostly_castigator.txt
rename to forge-gui/res/cardsfolder/c/covetous_castaway_ghostly_castigator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crawl_from_the_cellar.txt b/forge-gui/res/cardsfolder/c/crawl_from_the_cellar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crawl_from_the_cellar.txt
rename to forge-gui/res/cardsfolder/c/crawl_from_the_cellar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/croaking_counterpart.txt b/forge-gui/res/cardsfolder/c/croaking_counterpart.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/croaking_counterpart.txt
rename to forge-gui/res/cardsfolder/c/croaking_counterpart.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crossroads_candleguide.txt b/forge-gui/res/cardsfolder/c/crossroads_candleguide.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crossroads_candleguide.txt
rename to forge-gui/res/cardsfolder/c/crossroads_candleguide.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crowded_crypt.txt b/forge-gui/res/cardsfolder/c/crowded_crypt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crowded_crypt.txt
rename to forge-gui/res/cardsfolder/c/crowded_crypt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curse_of_clinging_webs.txt b/forge-gui/res/cardsfolder/c/curse_of_clinging_webs.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curse_of_clinging_webs.txt
rename to forge-gui/res/cardsfolder/c/curse_of_clinging_webs.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curse_of_conformity.txt b/forge-gui/res/cardsfolder/c/curse_of_conformity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curse_of_conformity.txt
rename to forge-gui/res/cardsfolder/c/curse_of_conformity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curse_of_leeches_leeching_lurker.txt b/forge-gui/res/cardsfolder/c/curse_of_leeches_leeching_lurker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curse_of_leeches_leeching_lurker.txt
rename to forge-gui/res/cardsfolder/c/curse_of_leeches_leeching_lurker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curse_of_obsession.txt b/forge-gui/res/cardsfolder/c/curse_of_obsession.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curse_of_obsession.txt
rename to forge-gui/res/cardsfolder/c/curse_of_obsession.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curse_of_shaken_faith.txt b/forge-gui/res/cardsfolder/c/curse_of_shaken_faith.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curse_of_shaken_faith.txt
rename to forge-gui/res/cardsfolder/c/curse_of_shaken_faith.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curse_of_silence.txt b/forge-gui/res/cardsfolder/c/curse_of_silence.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curse_of_silence.txt
rename to forge-gui/res/cardsfolder/c/curse_of_silence.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curse_of_surveillance.txt b/forge-gui/res/cardsfolder/c/curse_of_surveillance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curse_of_surveillance.txt
rename to forge-gui/res/cardsfolder/c/curse_of_surveillance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curse_of_the_restless_dead.txt b/forge-gui/res/cardsfolder/c/curse_of_the_restless_dead.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curse_of_the_restless_dead.txt
rename to forge-gui/res/cardsfolder/c/curse_of_the_restless_dead.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curse_of_unbinding.txt b/forge-gui/res/cardsfolder/c/curse_of_unbinding.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curse_of_unbinding.txt
rename to forge-gui/res/cardsfolder/c/curse_of_unbinding.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dawnhart_mentor.txt b/forge-gui/res/cardsfolder/d/dawnhart_mentor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dawnhart_mentor.txt
rename to forge-gui/res/cardsfolder/d/dawnhart_mentor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dawnhart_rejuvenator.txt b/forge-gui/res/cardsfolder/d/dawnhart_rejuvenator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dawnhart_rejuvenator.txt
rename to forge-gui/res/cardsfolder/d/dawnhart_rejuvenator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dawnhart_wardens.txt b/forge-gui/res/cardsfolder/d/dawnhart_wardens.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dawnhart_wardens.txt
rename to forge-gui/res/cardsfolder/d/dawnhart_wardens.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deathbonnet_sprout_deathbonnet_hulk.txt b/forge-gui/res/cardsfolder/d/deathbonnet_sprout_deathbonnet_hulk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deathbonnet_sprout_deathbonnet_hulk.txt
rename to forge-gui/res/cardsfolder/d/deathbonnet_sprout_deathbonnet_hulk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/defend_the_celestus.txt b/forge-gui/res/cardsfolder/d/defend_the_celestus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/defend_the_celestus.txt
rename to forge-gui/res/cardsfolder/d/defend_the_celestus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/defenestrate.txt b/forge-gui/res/cardsfolder/d/defenestrate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/defenestrate.txt
rename to forge-gui/res/cardsfolder/d/defenestrate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dennick_pious_apprentice_dennick_pious_apparition.txt b/forge-gui/res/cardsfolder/d/dennick_pious_apprentice_dennick_pious_apparition.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dennick_pious_apprentice_dennick_pious_apparition.txt
rename to forge-gui/res/cardsfolder/d/dennick_pious_apprentice_dennick_pious_apparition.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deserted_beach.txt b/forge-gui/res/cardsfolder/d/deserted_beach.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deserted_beach.txt
rename to forge-gui/res/cardsfolder/d/deserted_beach.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/devoted_grafkeeper_departed_soulkeeper.txt b/forge-gui/res/cardsfolder/d/devoted_grafkeeper_departed_soulkeeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/devoted_grafkeeper_departed_soulkeeper.txt
rename to forge-gui/res/cardsfolder/d/devoted_grafkeeper_departed_soulkeeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dire_strain_rampage.txt b/forge-gui/res/cardsfolder/d/dire_strain_rampage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dire_strain_rampage.txt
rename to forge-gui/res/cardsfolder/d/dire_strain_rampage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/diregraf_horde.txt b/forge-gui/res/cardsfolder/d/diregraf_horde.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/diregraf_horde.txt
rename to forge-gui/res/cardsfolder/d/diregraf_horde.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/diregraf_rebirth.txt b/forge-gui/res/cardsfolder/d/diregraf_rebirth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/diregraf_rebirth.txt
rename to forge-gui/res/cardsfolder/d/diregraf_rebirth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dreadhound.txt b/forge-gui/res/cardsfolder/d/dreadhound.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dreadhound.txt
rename to forge-gui/res/cardsfolder/d/dreadhound.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drown_in_dreams.txt b/forge-gui/res/cardsfolder/d/drown_in_dreams.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drown_in_dreams.txt
rename to forge-gui/res/cardsfolder/d/drown_in_dreams.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drownyard_amalgam.txt b/forge-gui/res/cardsfolder/d/drownyard_amalgam.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drownyard_amalgam.txt
rename to forge-gui/res/cardsfolder/d/drownyard_amalgam.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dryads_revival.txt b/forge-gui/res/cardsfolder/d/dryads_revival.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dryads_revival.txt
rename to forge-gui/res/cardsfolder/d/dryads_revival.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/duel_for_dominance.txt b/forge-gui/res/cardsfolder/d/duel_for_dominance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/duel_for_dominance.txt
rename to forge-gui/res/cardsfolder/d/duel_for_dominance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/duelcraft_trainer.txt b/forge-gui/res/cardsfolder/d/duelcraft_trainer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/duelcraft_trainer.txt
rename to forge-gui/res/cardsfolder/d/duelcraft_trainer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eaten_alive.txt b/forge-gui/res/cardsfolder/e/eaten_alive.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eaten_alive.txt
rename to forge-gui/res/cardsfolder/e/eaten_alive.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eccentric_farmer.txt b/forge-gui/res/cardsfolder/e/eccentric_farmer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eccentric_farmer.txt
rename to forge-gui/res/cardsfolder/e/eccentric_farmer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ecstatic_awakener_awoken_demon.txt b/forge-gui/res/cardsfolder/e/ecstatic_awakener_awoken_demon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ecstatic_awakener_awoken_demon.txt
rename to forge-gui/res/cardsfolder/e/ecstatic_awakener_awoken_demon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/electric_revelation.txt b/forge-gui/res/cardsfolder/e/electric_revelation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/electric_revelation.txt
rename to forge-gui/res/cardsfolder/e/electric_revelation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eloise_nephalia_sleuth.txt b/forge-gui/res/cardsfolder/e/eloise_nephalia_sleuth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eloise_nephalia_sleuth.txt
rename to forge-gui/res/cardsfolder/e/eloise_nephalia_sleuth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/empty_the_laboratory.txt b/forge-gui/res/cardsfolder/e/empty_the_laboratory.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/empty_the_laboratory.txt
rename to forge-gui/res/cardsfolder/e/empty_the_laboratory.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/enduring_angel_angelic_enforcer.txt b/forge-gui/res/cardsfolder/e/enduring_angel_angelic_enforcer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/enduring_angel_angelic_enforcer.txt
rename to forge-gui/res/cardsfolder/e/enduring_angel_angelic_enforcer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fading_hope.txt b/forge-gui/res/cardsfolder/f/fading_hope.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fading_hope.txt
rename to forge-gui/res/cardsfolder/f/fading_hope.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/faithful_mending.txt b/forge-gui/res/cardsfolder/f/faithful_mending.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/faithful_mending.txt
rename to forge-gui/res/cardsfolder/f/faithful_mending.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/falcon_abomination.txt b/forge-gui/res/cardsfolder/f/falcon_abomination.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/falcon_abomination.txt
rename to forge-gui/res/cardsfolder/f/falcon_abomination.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/falkenrath_perforator.txt b/forge-gui/res/cardsfolder/f/falkenrath_perforator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/falkenrath_perforator.txt
rename to forge-gui/res/cardsfolder/f/falkenrath_perforator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/falkenrath_pit_fighter.txt b/forge-gui/res/cardsfolder/f/falkenrath_pit_fighter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/falkenrath_pit_fighter.txt
rename to forge-gui/res/cardsfolder/f/falkenrath_pit_fighter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/famished_foragers.txt b/forge-gui/res/cardsfolder/f/famished_foragers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/famished_foragers.txt
rename to forge-gui/res/cardsfolder/f/famished_foragers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fangblade_brigand_fangblade_eviscerator.txt b/forge-gui/res/cardsfolder/f/fangblade_brigand_fangblade_eviscerator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fangblade_brigand_fangblade_eviscerator.txt
rename to forge-gui/res/cardsfolder/f/fangblade_brigand_fangblade_eviscerator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fateful_absence.txt b/forge-gui/res/cardsfolder/f/fateful_absence.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fateful_absence.txt
rename to forge-gui/res/cardsfolder/f/fateful_absence.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/festival_crasher.txt b/forge-gui/res/cardsfolder/f/festival_crasher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/festival_crasher.txt
rename to forge-gui/res/cardsfolder/f/festival_crasher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/firmament_sage.txt b/forge-gui/res/cardsfolder/f/firmament_sage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/firmament_sage.txt
rename to forge-gui/res/cardsfolder/f/firmament_sage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flame_channeler_embodiment_of_flame.txt b/forge-gui/res/cardsfolder/f/flame_channeler_embodiment_of_flame.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flame_channeler_embodiment_of_flame.txt
rename to forge-gui/res/cardsfolder/f/flame_channeler_embodiment_of_flame.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flare_of_faith.txt b/forge-gui/res/cardsfolder/f/flare_of_faith.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flare_of_faith.txt
rename to forge-gui/res/cardsfolder/f/flare_of_faith.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fleshtaker.txt b/forge-gui/res/cardsfolder/f/fleshtaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fleshtaker.txt
rename to forge-gui/res/cardsfolder/f/fleshtaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flip_the_switch.txt b/forge-gui/res/cardsfolder/f/flip_the_switch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flip_the_switch.txt
rename to forge-gui/res/cardsfolder/f/flip_the_switch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/florian_voldaren_scion.txt b/forge-gui/res/cardsfolder/f/florian_voldaren_scion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/florian_voldaren_scion.txt
rename to forge-gui/res/cardsfolder/f/florian_voldaren_scion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/foul_play.txt b/forge-gui/res/cardsfolder/f/foul_play.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/foul_play.txt
rename to forge-gui/res/cardsfolder/f/foul_play.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/galedrifter_waildrifter.txt b/forge-gui/res/cardsfolder/g/galedrifter_waildrifter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/galedrifter_waildrifter.txt
rename to forge-gui/res/cardsfolder/g/galedrifter_waildrifter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/galvanic_iteration.txt b/forge-gui/res/cardsfolder/g/galvanic_iteration.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/galvanic_iteration.txt
rename to forge-gui/res/cardsfolder/g/galvanic_iteration.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gavony_dawnguard.txt b/forge-gui/res/cardsfolder/g/gavony_dawnguard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gavony_dawnguard.txt
rename to forge-gui/res/cardsfolder/g/gavony_dawnguard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gavony_silversmith.txt b/forge-gui/res/cardsfolder/g/gavony_silversmith.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gavony_silversmith.txt
rename to forge-gui/res/cardsfolder/g/gavony_silversmith.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gavony_trapper.txt b/forge-gui/res/cardsfolder/g/gavony_trapper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gavony_trapper.txt
rename to forge-gui/res/cardsfolder/g/gavony_trapper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/geistflame_reservoir.txt b/forge-gui/res/cardsfolder/g/geistflame_reservoir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/geistflame_reservoir.txt
rename to forge-gui/res/cardsfolder/g/geistflame_reservoir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/geistwave.txt b/forge-gui/res/cardsfolder/g/geistwave.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/geistwave.txt
rename to forge-gui/res/cardsfolder/g/geistwave.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ghoulcallers_harvest.txt b/forge-gui/res/cardsfolder/g/ghoulcallers_harvest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ghoulcallers_harvest.txt
rename to forge-gui/res/cardsfolder/g/ghoulcallers_harvest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ghoulish_procession.txt b/forge-gui/res/cardsfolder/g/ghoulish_procession.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ghoulish_procession.txt
rename to forge-gui/res/cardsfolder/g/ghoulish_procession.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ghouls_night_out.txt b/forge-gui/res/cardsfolder/g/ghouls_night_out.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ghouls_night_out.txt
rename to forge-gui/res/cardsfolder/g/ghouls_night_out.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gisa_glorious_resurrector.txt b/forge-gui/res/cardsfolder/g/gisa_glorious_resurrector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gisa_glorious_resurrector.txt
rename to forge-gui/res/cardsfolder/g/gisa_glorious_resurrector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gorex_the_tombshell.txt b/forge-gui/res/cardsfolder/g/gorex_the_tombshell.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gorex_the_tombshell.txt
rename to forge-gui/res/cardsfolder/g/gorex_the_tombshell.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/grafted_identity.txt b/forge-gui/res/cardsfolder/g/grafted_identity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/grafted_identity.txt
rename to forge-gui/res/cardsfolder/g/grafted_identity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/graveyard_trespasser_graveyard_glutton.txt b/forge-gui/res/cardsfolder/g/graveyard_trespasser_graveyard_glutton.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/graveyard_trespasser_graveyard_glutton.txt
rename to forge-gui/res/cardsfolder/g/graveyard_trespasser_graveyard_glutton.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/grizzly_ghoul.txt b/forge-gui/res/cardsfolder/g/grizzly_ghoul.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/grizzly_ghoul.txt
rename to forge-gui/res/cardsfolder/g/grizzly_ghoul.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hallowed_respite.txt b/forge-gui/res/cardsfolder/h/hallowed_respite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hallowed_respite.txt
rename to forge-gui/res/cardsfolder/h/hallowed_respite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/harvesttide_infiltrator_harvesttide_assailant.txt b/forge-gui/res/cardsfolder/h/harvesttide_infiltrator_harvesttide_assailant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/harvesttide_infiltrator_harvesttide_assailant.txt
rename to forge-gui/res/cardsfolder/h/harvesttide_infiltrator_harvesttide_assailant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/harvesttide_sentry.txt b/forge-gui/res/cardsfolder/h/harvesttide_sentry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/harvesttide_sentry.txt
rename to forge-gui/res/cardsfolder/h/harvesttide_sentry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/haunted_ridge.txt b/forge-gui/res/cardsfolder/h/haunted_ridge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/haunted_ridge.txt
rename to forge-gui/res/cardsfolder/h/haunted_ridge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hedgewitchs_mask.txt b/forge-gui/res/cardsfolder/h/hedgewitchs_mask.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hedgewitchs_mask.txt
rename to forge-gui/res/cardsfolder/h/hedgewitchs_mask.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/heirloom_mirror_inherited_fiend.txt b/forge-gui/res/cardsfolder/h/heirloom_mirror_inherited_fiend.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/heirloom_mirror_inherited_fiend.txt
rename to forge-gui/res/cardsfolder/h/heirloom_mirror_inherited_fiend.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/heronblade_elite.txt b/forge-gui/res/cardsfolder/h/heronblade_elite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/heronblade_elite.txt
rename to forge-gui/res/cardsfolder/h/heronblade_elite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hobbling_zombie.txt b/forge-gui/res/cardsfolder/h/hobbling_zombie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hobbling_zombie.txt
rename to forge-gui/res/cardsfolder/h/hobbling_zombie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/homestead_courage.txt b/forge-gui/res/cardsfolder/h/homestead_courage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/homestead_courage.txt
rename to forge-gui/res/cardsfolder/h/homestead_courage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hordewing_skaab.txt b/forge-gui/res/cardsfolder/h/hordewing_skaab.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hordewing_skaab.txt
rename to forge-gui/res/cardsfolder/h/hordewing_skaab.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hostile_hostel_creeping_inn.txt b/forge-gui/res/cardsfolder/h/hostile_hostel_creeping_inn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hostile_hostel_creeping_inn.txt
rename to forge-gui/res/cardsfolder/h/hostile_hostel_creeping_inn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hound_tamer_untamed_pup.txt b/forge-gui/res/cardsfolder/h/hound_tamer_untamed_pup.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hound_tamer_untamed_pup.txt
rename to forge-gui/res/cardsfolder/h/hound_tamer_untamed_pup.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/howl_of_the_hunt.txt b/forge-gui/res/cardsfolder/h/howl_of_the_hunt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/howl_of_the_hunt.txt
rename to forge-gui/res/cardsfolder/h/howl_of_the_hunt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hungry_for_more.txt b/forge-gui/res/cardsfolder/h/hungry_for_more.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hungry_for_more.txt
rename to forge-gui/res/cardsfolder/h/hungry_for_more.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/infernal_grasp.txt b/forge-gui/res/cardsfolder/i/infernal_grasp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/infernal_grasp.txt
rename to forge-gui/res/cardsfolder/i/infernal_grasp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/intrepid_adversary.txt b/forge-gui/res/cardsfolder/i/intrepid_adversary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/intrepid_adversary.txt
rename to forge-gui/res/cardsfolder/i/intrepid_adversary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jack_o_lantern.txt b/forge-gui/res/cardsfolder/j/jack_o_lantern.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jack_o_lantern.txt
rename to forge-gui/res/cardsfolder/j/jack_o_lantern.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jadar_ghoulcaller_of_nephalia.txt b/forge-gui/res/cardsfolder/j/jadar_ghoulcaller_of_nephalia.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jadar_ghoulcaller_of_nephalia.txt
rename to forge-gui/res/cardsfolder/j/jadar_ghoulcaller_of_nephalia.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jerren_corrupted_bishop_ormendahl_the_corruptor.txt b/forge-gui/res/cardsfolder/j/jerren_corrupted_bishop_ormendahl_the_corruptor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jerren_corrupted_bishop_ormendahl_the_corruptor.txt
rename to forge-gui/res/cardsfolder/j/jerren_corrupted_bishop_ormendahl_the_corruptor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/join_the_dance.txt b/forge-gui/res/cardsfolder/j/join_the_dance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/join_the_dance.txt
rename to forge-gui/res/cardsfolder/j/join_the_dance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/katilda_dawnhart_prime.txt b/forge-gui/res/cardsfolder/k/katilda_dawnhart_prime.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/katilda_dawnhart_prime.txt
rename to forge-gui/res/cardsfolder/k/katilda_dawnhart_prime.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kessig_naturalist_lord_of_the_ulvenwald.txt b/forge-gui/res/cardsfolder/k/kessig_naturalist_lord_of_the_ulvenwald.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kessig_naturalist_lord_of_the_ulvenwald.txt
rename to forge-gui/res/cardsfolder/k/kessig_naturalist_lord_of_the_ulvenwald.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kurbis_harvest_celebrant.txt b/forge-gui/res/cardsfolder/k/kurbis_harvest_celebrant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kurbis_harvest_celebrant.txt
rename to forge-gui/res/cardsfolder/k/kurbis_harvest_celebrant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kyler_sigardian_emissary.txt b/forge-gui/res/cardsfolder/k/kyler_sigardian_emissary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kyler_sigardian_emissary.txt
rename to forge-gui/res/cardsfolder/k/kyler_sigardian_emissary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lambholt_harrier.txt b/forge-gui/res/cardsfolder/l/lambholt_harrier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lambholt_harrier.txt
rename to forge-gui/res/cardsfolder/l/lambholt_harrier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/larder_zombie.txt b/forge-gui/res/cardsfolder/l/larder_zombie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/larder_zombie.txt
rename to forge-gui/res/cardsfolder/l/larder_zombie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/leinore_autumn_sovereign.txt b/forge-gui/res/cardsfolder/l/leinore_autumn_sovereign.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/leinore_autumn_sovereign.txt
rename to forge-gui/res/cardsfolder/l/leinore_autumn_sovereign.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lier_disciple_of_the_drowned.txt b/forge-gui/res/cardsfolder/l/lier_disciple_of_the_drowned.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lier_disciple_of_the_drowned.txt
rename to forge-gui/res/cardsfolder/l/lier_disciple_of_the_drowned.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/liesa_forgotten_archangel.txt b/forge-gui/res/cardsfolder/l/liesa_forgotten_archangel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/liesa_forgotten_archangel.txt
rename to forge-gui/res/cardsfolder/l/liesa_forgotten_archangel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/light_up_the_night.txt b/forge-gui/res/cardsfolder/l/light_up_the_night.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/light_up_the_night.txt
rename to forge-gui/res/cardsfolder/l/light_up_the_night.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/locked_in_the_cemetery.txt b/forge-gui/res/cardsfolder/l/locked_in_the_cemetery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/locked_in_the_cemetery.txt
rename to forge-gui/res/cardsfolder/l/locked_in_the_cemetery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lord_of_the_forsaken.txt b/forge-gui/res/cardsfolder/l/lord_of_the_forsaken.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lord_of_the_forsaken.txt
rename to forge-gui/res/cardsfolder/l/lord_of_the_forsaken.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/loyal_gryff.txt b/forge-gui/res/cardsfolder/l/loyal_gryff.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/loyal_gryff.txt
rename to forge-gui/res/cardsfolder/l/loyal_gryff.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ludevic_necrogenius_olag_ludevics_hubris.txt b/forge-gui/res/cardsfolder/l/ludevic_necrogenius_olag_ludevics_hubris.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ludevic_necrogenius_olag_ludevics_hubris.txt
rename to forge-gui/res/cardsfolder/l/ludevic_necrogenius_olag_ludevics_hubris.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lunar_frenzy.txt b/forge-gui/res/cardsfolder/l/lunar_frenzy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lunar_frenzy.txt
rename to forge-gui/res/cardsfolder/l/lunar_frenzy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lunarch_veteran_luminous_phantom.txt b/forge-gui/res/cardsfolder/l/lunarch_veteran_luminous_phantom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lunarch_veteran_luminous_phantom.txt
rename to forge-gui/res/cardsfolder/l/lunarch_veteran_luminous_phantom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lynde_cheerful_tormentor.txt b/forge-gui/res/cardsfolder/l/lynde_cheerful_tormentor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lynde_cheerful_tormentor.txt
rename to forge-gui/res/cardsfolder/l/lynde_cheerful_tormentor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/malevolent_hermit_benevolent_geist.txt b/forge-gui/res/cardsfolder/m/malevolent_hermit_benevolent_geist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/malevolent_hermit_benevolent_geist.txt
rename to forge-gui/res/cardsfolder/m/malevolent_hermit_benevolent_geist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mask_of_griselbrand.txt b/forge-gui/res/cardsfolder/m/mask_of_griselbrand.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mask_of_griselbrand.txt
rename to forge-gui/res/cardsfolder/m/mask_of_griselbrand.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/memory_deluge.txt b/forge-gui/res/cardsfolder/m/memory_deluge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/memory_deluge.txt
rename to forge-gui/res/cardsfolder/m/memory_deluge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/might_of_the_old_ways.txt b/forge-gui/res/cardsfolder/m/might_of_the_old_ways.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/might_of_the_old_ways.txt
rename to forge-gui/res/cardsfolder/m/might_of_the_old_ways.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/moonragers_slash.txt b/forge-gui/res/cardsfolder/m/moonragers_slash.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/moonragers_slash.txt
rename to forge-gui/res/cardsfolder/m/moonragers_slash.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/moonsilver_key.txt b/forge-gui/res/cardsfolder/m/moonsilver_key.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/moonsilver_key.txt
rename to forge-gui/res/cardsfolder/m/moonsilver_key.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/moonveil_regent.txt b/forge-gui/res/cardsfolder/m/moonveil_regent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/moonveil_regent.txt
rename to forge-gui/res/cardsfolder/m/moonveil_regent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/moorland_rescuer.txt b/forge-gui/res/cardsfolder/m/moorland_rescuer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/moorland_rescuer.txt
rename to forge-gui/res/cardsfolder/m/moorland_rescuer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/morbid_opportunist.txt b/forge-gui/res/cardsfolder/m/morbid_opportunist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/morbid_opportunist.txt
rename to forge-gui/res/cardsfolder/m/morbid_opportunist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/morkrut_behemoth.txt b/forge-gui/res/cardsfolder/m/morkrut_behemoth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/morkrut_behemoth.txt
rename to forge-gui/res/cardsfolder/m/morkrut_behemoth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mounted_dreadknight.txt b/forge-gui/res/cardsfolder/m/mounted_dreadknight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mounted_dreadknight.txt
rename to forge-gui/res/cardsfolder/m/mounted_dreadknight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mourning_patrol_morning_apparition.txt b/forge-gui/res/cardsfolder/m/mourning_patrol_morning_apparition.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mourning_patrol_morning_apparition.txt
rename to forge-gui/res/cardsfolder/m/mourning_patrol_morning_apparition.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mysterious_tome_chilling_chronicle.txt b/forge-gui/res/cardsfolder/m/mysterious_tome_chilling_chronicle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mysterious_tome_chilling_chronicle.txt
rename to forge-gui/res/cardsfolder/m/mysterious_tome_chilling_chronicle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mystic_skull_mystic_monstrosity.txt b/forge-gui/res/cardsfolder/m/mystic_skull_mystic_monstrosity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mystic_skull_mystic_monstrosity.txt
rename to forge-gui/res/cardsfolder/m/mystic_skull_mystic_monstrosity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nebelgast_intruder.txt b/forge-gui/res/cardsfolder/n/nebelgast_intruder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nebelgast_intruder.txt
rename to forge-gui/res/cardsfolder/n/nebelgast_intruder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/necrosynthesis.txt b/forge-gui/res/cardsfolder/n/necrosynthesis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/necrosynthesis.txt
rename to forge-gui/res/cardsfolder/n/necrosynthesis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/neonates_rush.txt b/forge-gui/res/cardsfolder/n/neonates_rush.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/neonates_rush.txt
rename to forge-gui/res/cardsfolder/n/neonates_rush.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/no_way_out.txt b/forge-gui/res/cardsfolder/n/no_way_out.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/no_way_out.txt
rename to forge-gui/res/cardsfolder/n/no_way_out.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/novice_occultist.txt b/forge-gui/res/cardsfolder/n/novice_occultist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/novice_occultist.txt
rename to forge-gui/res/cardsfolder/n/novice_occultist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/obsessive_astronomer.txt b/forge-gui/res/cardsfolder/o/obsessive_astronomer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/obsessive_astronomer.txt
rename to forge-gui/res/cardsfolder/o/obsessive_astronomer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/odrics_outrider.txt b/forge-gui/res/cardsfolder/o/odrics_outrider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/odrics_outrider.txt
rename to forge-gui/res/cardsfolder/o/odrics_outrider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/old_stickfingers.txt b/forge-gui/res/cardsfolder/o/old_stickfingers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/old_stickfingers.txt
rename to forge-gui/res/cardsfolder/o/old_stickfingers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/olivias_midnight_ambush.txt b/forge-gui/res/cardsfolder/o/olivias_midnight_ambush.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/olivias_midnight_ambush.txt
rename to forge-gui/res/cardsfolder/o/olivias_midnight_ambush.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ominous_roost.txt b/forge-gui/res/cardsfolder/o/ominous_roost.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ominous_roost.txt
rename to forge-gui/res/cardsfolder/o/ominous_roost.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/organ_hoarder.txt b/forge-gui/res/cardsfolder/o/organ_hoarder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/organ_hoarder.txt
rename to forge-gui/res/cardsfolder/o/organ_hoarder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/otherworldly_gaze.txt b/forge-gui/res/cardsfolder/o/otherworldly_gaze.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/otherworldly_gaze.txt
rename to forge-gui/res/cardsfolder/o/otherworldly_gaze.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/outland_liberator_frenzied_trapbreaker.txt b/forge-gui/res/cardsfolder/o/outland_liberator_frenzied_trapbreaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/outland_liberator_frenzied_trapbreaker.txt
rename to forge-gui/res/cardsfolder/o/outland_liberator_frenzied_trapbreaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/overgrown_farmland.txt b/forge-gui/res/cardsfolder/o/overgrown_farmland.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/overgrown_farmland.txt
rename to forge-gui/res/cardsfolder/o/overgrown_farmland.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/overwhelmed_archivist_archive_haunt.txt b/forge-gui/res/cardsfolder/o/overwhelmed_archivist_archive_haunt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/overwhelmed_archivist_archive_haunt.txt
rename to forge-gui/res/cardsfolder/o/overwhelmed_archivist_archive_haunt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/packs_betrayal.txt b/forge-gui/res/cardsfolder/p/packs_betrayal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/packs_betrayal.txt
rename to forge-gui/res/cardsfolder/p/packs_betrayal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/path_to_the_festival.txt b/forge-gui/res/cardsfolder/p/path_to_the_festival.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/path_to_the_festival.txt
rename to forge-gui/res/cardsfolder/p/path_to_the_festival.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/patrician_geist.txt b/forge-gui/res/cardsfolder/p/patrician_geist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/patrician_geist.txt
rename to forge-gui/res/cardsfolder/p/patrician_geist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pestilent_wolf.txt b/forge-gui/res/cardsfolder/p/pestilent_wolf.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pestilent_wolf.txt
rename to forge-gui/res/cardsfolder/p/pestilent_wolf.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phantom_carriage.txt b/forge-gui/res/cardsfolder/p/phantom_carriage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phantom_carriage.txt
rename to forge-gui/res/cardsfolder/p/phantom_carriage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/play_with_fire.txt b/forge-gui/res/cardsfolder/p/play_with_fire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/play_with_fire.txt
rename to forge-gui/res/cardsfolder/p/play_with_fire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/poppet_stitcher_poppet_factory.txt b/forge-gui/res/cardsfolder/p/poppet_stitcher_poppet_factory.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/poppet_stitcher_poppet_factory.txt
rename to forge-gui/res/cardsfolder/p/poppet_stitcher_poppet_factory.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/primal_adversary.txt b/forge-gui/res/cardsfolder/p/primal_adversary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/primal_adversary.txt
rename to forge-gui/res/cardsfolder/p/primal_adversary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prowling_geistcatcher.txt b/forge-gui/res/cardsfolder/p/prowling_geistcatcher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prowling_geistcatcher.txt
rename to forge-gui/res/cardsfolder/p/prowling_geistcatcher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/purifying_dragon.txt b/forge-gui/res/cardsfolder/p/purifying_dragon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/purifying_dragon.txt
rename to forge-gui/res/cardsfolder/p/purifying_dragon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ravenous_rotbelly.txt b/forge-gui/res/cardsfolder/r/ravenous_rotbelly.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ravenous_rotbelly.txt
rename to forge-gui/res/cardsfolder/r/ravenous_rotbelly.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/raze_the_effigy.txt b/forge-gui/res/cardsfolder/r/raze_the_effigy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raze_the_effigy.txt
rename to forge-gui/res/cardsfolder/r/raze_the_effigy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reckless_stormseeker_storm_charged_slasher.txt b/forge-gui/res/cardsfolder/r/reckless_stormseeker_storm_charged_slasher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reckless_stormseeker_storm_charged_slasher.txt
rename to forge-gui/res/cardsfolder/r/reckless_stormseeker_storm_charged_slasher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rem_karolus_stalwart_slayer.txt b/forge-gui/res/cardsfolder/r/rem_karolus_stalwart_slayer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rem_karolus_stalwart_slayer.txt
rename to forge-gui/res/cardsfolder/r/rem_karolus_stalwart_slayer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/revenge_of_the_drowned.txt b/forge-gui/res/cardsfolder/r/revenge_of_the_drowned.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/revenge_of_the_drowned.txt
rename to forge-gui/res/cardsfolder/r/revenge_of_the_drowned.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rise_of_the_ants.txt b/forge-gui/res/cardsfolder/r/rise_of_the_ants.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rise_of_the_ants.txt
rename to forge-gui/res/cardsfolder/r/rise_of_the_ants.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rite_of_harmony.txt b/forge-gui/res/cardsfolder/r/rite_of_harmony.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rite_of_harmony.txt
rename to forge-gui/res/cardsfolder/r/rite_of_harmony.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rite_of_oblivion.txt b/forge-gui/res/cardsfolder/r/rite_of_oblivion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rite_of_oblivion.txt
rename to forge-gui/res/cardsfolder/r/rite_of_oblivion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ritual_guardian.txt b/forge-gui/res/cardsfolder/r/ritual_guardian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ritual_guardian.txt
rename to forge-gui/res/cardsfolder/r/ritual_guardian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ritual_of_hope.txt b/forge-gui/res/cardsfolder/r/ritual_of_hope.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ritual_of_hope.txt
rename to forge-gui/res/cardsfolder/r/ritual_of_hope.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rockfall_vale.txt b/forge-gui/res/cardsfolder/r/rockfall_vale.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rockfall_vale.txt
rename to forge-gui/res/cardsfolder/r/rockfall_vale.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rootcoil_creeper.txt b/forge-gui/res/cardsfolder/r/rootcoil_creeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rootcoil_creeper.txt
rename to forge-gui/res/cardsfolder/r/rootcoil_creeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rotten_reunion.txt b/forge-gui/res/cardsfolder/r/rotten_reunion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rotten_reunion.txt
rename to forge-gui/res/cardsfolder/r/rotten_reunion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ruinous_intrusion.txt b/forge-gui/res/cardsfolder/r/ruinous_intrusion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ruinous_intrusion.txt
rename to forge-gui/res/cardsfolder/r/ruinous_intrusion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sacred_fire.txt b/forge-gui/res/cardsfolder/s/sacred_fire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sacred_fire.txt
rename to forge-gui/res/cardsfolder/s/sacred_fire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/saryth_the_vipers_fang.txt b/forge-gui/res/cardsfolder/s/saryth_the_vipers_fang.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/saryth_the_vipers_fang.txt
rename to forge-gui/res/cardsfolder/s/saryth_the_vipers_fang.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/search_party_captain.txt b/forge-gui/res/cardsfolder/s/search_party_captain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/search_party_captain.txt
rename to forge-gui/res/cardsfolder/s/search_party_captain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/secrets_of_the_key.txt b/forge-gui/res/cardsfolder/s/secrets_of_the_key.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/secrets_of_the_key.txt
rename to forge-gui/res/cardsfolder/s/secrets_of_the_key.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seize_the_storm.txt b/forge-gui/res/cardsfolder/s/seize_the_storm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seize_the_storm.txt
rename to forge-gui/res/cardsfolder/s/seize_the_storm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shadow_kin.txt b/forge-gui/res/cardsfolder/s/shadow_kin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shadow_kin.txt
rename to forge-gui/res/cardsfolder/s/shadow_kin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shadowbeast_sighting.txt b/forge-gui/res/cardsfolder/s/shadowbeast_sighting.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shadowbeast_sighting.txt
rename to forge-gui/res/cardsfolder/s/shadowbeast_sighting.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shady_traveler_stalking_predator.txt b/forge-gui/res/cardsfolder/s/shady_traveler_stalking_predator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shady_traveler_stalking_predator.txt
rename to forge-gui/res/cardsfolder/s/shady_traveler_stalking_predator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shipwreck_marsh.txt b/forge-gui/res/cardsfolder/s/shipwreck_marsh.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shipwreck_marsh.txt
rename to forge-gui/res/cardsfolder/s/shipwreck_marsh.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shipwreck_sifters.txt b/forge-gui/res/cardsfolder/s/shipwreck_sifters.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shipwreck_sifters.txt
rename to forge-gui/res/cardsfolder/s/shipwreck_sifters.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/siege_zombie.txt b/forge-gui/res/cardsfolder/s/siege_zombie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/siege_zombie.txt
rename to forge-gui/res/cardsfolder/s/siege_zombie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sigarda_champion_of_light.txt b/forge-gui/res/cardsfolder/s/sigarda_champion_of_light.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sigarda_champion_of_light.txt
rename to forge-gui/res/cardsfolder/s/sigarda_champion_of_light.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sigardas_splendor.txt b/forge-gui/res/cardsfolder/s/sigardas_splendor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sigardas_splendor.txt
rename to forge-gui/res/cardsfolder/s/sigardas_splendor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sigardas_vanguard.txt b/forge-gui/res/cardsfolder/s/sigardas_vanguard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sigardas_vanguard.txt
rename to forge-gui/res/cardsfolder/s/sigardas_vanguard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sigardian_savior.txt b/forge-gui/res/cardsfolder/s/sigardian_savior.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sigardian_savior.txt
rename to forge-gui/res/cardsfolder/s/sigardian_savior.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sigardian_zealot.txt b/forge-gui/res/cardsfolder/s/sigardian_zealot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sigardian_zealot.txt
rename to forge-gui/res/cardsfolder/s/sigardian_zealot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/silver_bolt.txt b/forge-gui/res/cardsfolder/s/silver_bolt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/silver_bolt.txt
rename to forge-gui/res/cardsfolder/s/silver_bolt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/siphon_insight.txt b/forge-gui/res/cardsfolder/s/siphon_insight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/siphon_insight.txt
rename to forge-gui/res/cardsfolder/s/siphon_insight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skaab_wrangler.txt b/forge-gui/res/cardsfolder/s/skaab_wrangler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skaab_wrangler.txt
rename to forge-gui/res/cardsfolder/s/skaab_wrangler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slaughter_specialist.txt b/forge-gui/res/cardsfolder/s/slaughter_specialist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slaughter_specialist.txt
rename to forge-gui/res/cardsfolder/s/slaughter_specialist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slogurk_the_overslime.txt b/forge-gui/res/cardsfolder/s/slogurk_the_overslime.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slogurk_the_overslime.txt
rename to forge-gui/res/cardsfolder/s/slogurk_the_overslime.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sludge_monster.txt b/forge-gui/res/cardsfolder/s/sludge_monster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sludge_monster.txt
rename to forge-gui/res/cardsfolder/s/sludge_monster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/smoldering_egg_ashmouth_dragon.txt b/forge-gui/res/cardsfolder/s/smoldering_egg_ashmouth_dragon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/smoldering_egg_ashmouth_dragon.txt
rename to forge-gui/res/cardsfolder/s/smoldering_egg_ashmouth_dragon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/snarling_wolf.txt b/forge-gui/res/cardsfolder/s/snarling_wolf.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/snarling_wolf.txt
rename to forge-gui/res/cardsfolder/s/snarling_wolf.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/somberwald_beastmaster.txt b/forge-gui/res/cardsfolder/s/somberwald_beastmaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/somberwald_beastmaster.txt
rename to forge-gui/res/cardsfolder/s/somberwald_beastmaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soul_guide_gryff.txt b/forge-gui/res/cardsfolder/s/soul_guide_gryff.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soul_guide_gryff.txt
rename to forge-gui/res/cardsfolder/s/soul_guide_gryff.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spectral_adversary.txt b/forge-gui/res/cardsfolder/s/spectral_adversary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spectral_adversary.txt
rename to forge-gui/res/cardsfolder/s/spectral_adversary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spellrune_painter_spellrune_howler.txt b/forge-gui/res/cardsfolder/s/spellrune_painter_spellrune_howler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spellrune_painter_spellrune_howler.txt
rename to forge-gui/res/cardsfolder/s/spellrune_painter_spellrune_howler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stalwart_pathlighter.txt b/forge-gui/res/cardsfolder/s/stalwart_pathlighter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stalwart_pathlighter.txt
rename to forge-gui/res/cardsfolder/s/stalwart_pathlighter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/startle.txt b/forge-gui/res/cardsfolder/s/startle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/startle.txt
rename to forge-gui/res/cardsfolder/s/startle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stolen_vitality.txt b/forge-gui/res/cardsfolder/s/stolen_vitality.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stolen_vitality.txt
rename to forge-gui/res/cardsfolder/s/stolen_vitality.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/storm_skreelix.txt b/forge-gui/res/cardsfolder/s/storm_skreelix.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/storm_skreelix.txt
rename to forge-gui/res/cardsfolder/s/storm_skreelix.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/storm_the_festival.txt b/forge-gui/res/cardsfolder/s/storm_the_festival.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/storm_the_festival.txt
rename to forge-gui/res/cardsfolder/s/storm_the_festival.txt
diff --git a/forge-gui/res/cardsfolder/s/stormrider_spirit.txt b/forge-gui/res/cardsfolder/s/stormrider_spirit.txt
index a21069aba21..ab426453cfb 100644
--- a/forge-gui/res/cardsfolder/s/stormrider_spirit.txt
+++ b/forge-gui/res/cardsfolder/s/stormrider_spirit.txt
@@ -4,5 +4,4 @@ Types:Creature Spirit
 PT:3/3
 K:Flash
 K:Flying
-SVar:Picture:http://www.wizards.com/global/images/magic/general/stormrider_spirit.jpg
 Oracle:Flash (You may cast this spell any time you could cast an instant.)\nFlying
diff --git a/forge-gui/res/cardsfolder/upcoming/stromkirk_bloodthief.txt b/forge-gui/res/cardsfolder/s/stromkirk_bloodthief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stromkirk_bloodthief.txt
rename to forge-gui/res/cardsfolder/s/stromkirk_bloodthief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stuffed_bear.txt b/forge-gui/res/cardsfolder/s/stuffed_bear.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stuffed_bear.txt
rename to forge-gui/res/cardsfolder/s/stuffed_bear.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sungold_barrage.txt b/forge-gui/res/cardsfolder/s/sungold_barrage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sungold_barrage.txt
rename to forge-gui/res/cardsfolder/s/sungold_barrage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sungold_sentinel.txt b/forge-gui/res/cardsfolder/s/sungold_sentinel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sungold_sentinel.txt
rename to forge-gui/res/cardsfolder/s/sungold_sentinel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sunrise_cavalier.txt b/forge-gui/res/cardsfolder/s/sunrise_cavalier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sunrise_cavalier.txt
rename to forge-gui/res/cardsfolder/s/sunrise_cavalier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sunset_revelry.txt b/forge-gui/res/cardsfolder/s/sunset_revelry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sunset_revelry.txt
rename to forge-gui/res/cardsfolder/s/sunset_revelry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sunstreak_phoenix.txt b/forge-gui/res/cardsfolder/s/sunstreak_phoenix.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sunstreak_phoenix.txt
rename to forge-gui/res/cardsfolder/s/sunstreak_phoenix.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/suspicious_stowaway_seafaring_werewolf.txt b/forge-gui/res/cardsfolder/s/suspicious_stowaway_seafaring_werewolf.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/suspicious_stowaway_seafaring_werewolf.txt
rename to forge-gui/res/cardsfolder/s/suspicious_stowaway_seafaring_werewolf.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tainted_adversary.txt b/forge-gui/res/cardsfolder/t/tainted_adversary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tainted_adversary.txt
rename to forge-gui/res/cardsfolder/t/tainted_adversary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tapping_at_the_window.txt b/forge-gui/res/cardsfolder/t/tapping_at_the_window.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tapping_at_the_window.txt
rename to forge-gui/res/cardsfolder/t/tapping_at_the_window.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tavern_ruffian_tavern_smasher.txt b/forge-gui/res/cardsfolder/t/tavern_ruffian_tavern_smasher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tavern_ruffian_tavern_smasher.txt
rename to forge-gui/res/cardsfolder/t/tavern_ruffian_tavern_smasher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/teferi_who_slows_the_sunset.txt b/forge-gui/res/cardsfolder/t/teferi_who_slows_the_sunset.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/teferi_who_slows_the_sunset.txt
rename to forge-gui/res/cardsfolder/t/teferi_who_slows_the_sunset.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_celestus.txt b/forge-gui/res/cardsfolder/t/the_celestus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_celestus.txt
rename to forge-gui/res/cardsfolder/t/the_celestus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_meathook_massacre.txt b/forge-gui/res/cardsfolder/t/the_meathook_massacre.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_meathook_massacre.txt
rename to forge-gui/res/cardsfolder/t/the_meathook_massacre.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thraben_exorcism.txt b/forge-gui/res/cardsfolder/t/thraben_exorcism.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thraben_exorcism.txt
rename to forge-gui/res/cardsfolder/t/thraben_exorcism.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tireless_hauler_dire_strain_brawler.txt b/forge-gui/res/cardsfolder/t/tireless_hauler_dire_strain_brawler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tireless_hauler_dire_strain_brawler.txt
rename to forge-gui/res/cardsfolder/t/tireless_hauler_dire_strain_brawler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tomb_tyrant.txt b/forge-gui/res/cardsfolder/t/tomb_tyrant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tomb_tyrant.txt
rename to forge-gui/res/cardsfolder/t/tomb_tyrant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tovolar_dire_overlord_tovolar_the_midnight_scourge.txt b/forge-gui/res/cardsfolder/t/tovolar_dire_overlord_tovolar_the_midnight_scourge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tovolar_dire_overlord_tovolar_the_midnight_scourge.txt
rename to forge-gui/res/cardsfolder/t/tovolar_dire_overlord_tovolar_the_midnight_scourge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tovolars_huntmaster_tovolars_packleader.txt b/forge-gui/res/cardsfolder/t/tovolars_huntmaster_tovolars_packleader.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tovolars_huntmaster_tovolars_packleader.txt
rename to forge-gui/res/cardsfolder/t/tovolars_huntmaster_tovolars_packleader.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/triskaidekaphile.txt b/forge-gui/res/cardsfolder/t/triskaidekaphile.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/triskaidekaphile.txt
rename to forge-gui/res/cardsfolder/t/triskaidekaphile.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/turn_the_earth.txt b/forge-gui/res/cardsfolder/t/turn_the_earth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/turn_the_earth.txt
rename to forge-gui/res/cardsfolder/t/turn_the_earth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unblinking_observer.txt b/forge-gui/res/cardsfolder/u/unblinking_observer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unblinking_observer.txt
rename to forge-gui/res/cardsfolder/u/unblinking_observer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unnatural_growth.txt b/forge-gui/res/cardsfolder/u/unnatural_growth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unnatural_growth.txt
rename to forge-gui/res/cardsfolder/u/unnatural_growth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unnatural_moonrise.txt b/forge-gui/res/cardsfolder/u/unnatural_moonrise.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unnatural_moonrise.txt
rename to forge-gui/res/cardsfolder/u/unnatural_moonrise.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stormrider_spirit.txt b/forge-gui/res/cardsfolder/upcoming/stormrider_spirit.txt
deleted file mode 100644
index ab426453cfb..00000000000
--- a/forge-gui/res/cardsfolder/upcoming/stormrider_spirit.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Name:Stormrider Spirit
-ManaCost:4 U
-Types:Creature Spirit
-PT:3/3
-K:Flash
-K:Flying
-Oracle:Flash (You may cast this spell any time you could cast an instant.)\nFlying
diff --git a/forge-gui/res/cardsfolder/upcoming/vadrik_astral_archmage.txt b/forge-gui/res/cardsfolder/v/vadrik_astral_archmage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vadrik_astral_archmage.txt
rename to forge-gui/res/cardsfolder/v/vadrik_astral_archmage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vampire_socialite.txt b/forge-gui/res/cardsfolder/v/vampire_socialite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vampire_socialite.txt
rename to forge-gui/res/cardsfolder/v/vampire_socialite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vanquish_the_horde.txt b/forge-gui/res/cardsfolder/v/vanquish_the_horde.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vanquish_the_horde.txt
rename to forge-gui/res/cardsfolder/v/vanquish_the_horde.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vengeful_strangler_strangling_grasp.txt b/forge-gui/res/cardsfolder/v/vengeful_strangler_strangling_grasp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vengeful_strangler_strangling_grasp.txt
rename to forge-gui/res/cardsfolder/v/vengeful_strangler_strangling_grasp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/village_watcher_village_reavers.txt b/forge-gui/res/cardsfolder/v/village_watcher_village_reavers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/village_watcher_village_reavers.txt
rename to forge-gui/res/cardsfolder/v/village_watcher_village_reavers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/visions_of_dominance.txt b/forge-gui/res/cardsfolder/v/visions_of_dominance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/visions_of_dominance.txt
rename to forge-gui/res/cardsfolder/v/visions_of_dominance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/visions_of_dread.txt b/forge-gui/res/cardsfolder/v/visions_of_dread.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/visions_of_dread.txt
rename to forge-gui/res/cardsfolder/v/visions_of_dread.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/visions_of_duplicity.txt b/forge-gui/res/cardsfolder/v/visions_of_duplicity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/visions_of_duplicity.txt
rename to forge-gui/res/cardsfolder/v/visions_of_duplicity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/visions_of_glory.txt b/forge-gui/res/cardsfolder/v/visions_of_glory.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/visions_of_glory.txt
rename to forge-gui/res/cardsfolder/v/visions_of_glory.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/visions_of_ruin.txt b/forge-gui/res/cardsfolder/v/visions_of_ruin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/visions_of_ruin.txt
rename to forge-gui/res/cardsfolder/v/visions_of_ruin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/voldaren_ambusher.txt b/forge-gui/res/cardsfolder/v/voldaren_ambusher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/voldaren_ambusher.txt
rename to forge-gui/res/cardsfolder/v/voldaren_ambusher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/voldaren_stinger.txt b/forge-gui/res/cardsfolder/v/voldaren_stinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/voldaren_stinger.txt
rename to forge-gui/res/cardsfolder/v/voldaren_stinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wake_to_slaughter.txt b/forge-gui/res/cardsfolder/w/wake_to_slaughter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wake_to_slaughter.txt
rename to forge-gui/res/cardsfolder/w/wake_to_slaughter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wall_of_mourning.txt b/forge-gui/res/cardsfolder/w/wall_of_mourning.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wall_of_mourning.txt
rename to forge-gui/res/cardsfolder/w/wall_of_mourning.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wilhelt_the_rotcleaver.txt b/forge-gui/res/cardsfolder/w/wilhelt_the_rotcleaver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wilhelt_the_rotcleaver.txt
rename to forge-gui/res/cardsfolder/w/wilhelt_the_rotcleaver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/willow_geist.txt b/forge-gui/res/cardsfolder/w/willow_geist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/willow_geist.txt
rename to forge-gui/res/cardsfolder/w/willow_geist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/winterthorn_blessing.txt b/forge-gui/res/cardsfolder/w/winterthorn_blessing.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/winterthorn_blessing.txt
rename to forge-gui/res/cardsfolder/w/winterthorn_blessing.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wrenn_and_seven.txt b/forge-gui/res/cardsfolder/w/wrenn_and_seven.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wrenn_and_seven.txt
rename to forge-gui/res/cardsfolder/w/wrenn_and_seven.txt