diff --git a/forge-gui/res/cardsfolder/upcoming/absorb_identity.txt b/forge-gui/res/cardsfolder/a/absorb_identity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/absorb_identity.txt
rename to forge-gui/res/cardsfolder/a/absorb_identity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aegar_the_freezing_flame.txt b/forge-gui/res/cardsfolder/a/aegar_the_freezing_flame.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aegar_the_freezing_flame.txt
rename to forge-gui/res/cardsfolder/a/aegar_the_freezing_flame.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alpine_meadow.txt b/forge-gui/res/cardsfolder/a/alpine_meadow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alpine_meadow.txt
rename to forge-gui/res/cardsfolder/a/alpine_meadow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alrund_god_of_the_cosmos_hakka_whispering_raven.txt b/forge-gui/res/cardsfolder/a/alrund_god_of_the_cosmos_hakka_whispering_raven.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alrund_god_of_the_cosmos_hakka_whispering_raven.txt
rename to forge-gui/res/cardsfolder/a/alrund_god_of_the_cosmos_hakka_whispering_raven.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alrunds_epiphany.txt b/forge-gui/res/cardsfolder/a/alrunds_epiphany.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alrunds_epiphany.txt
rename to forge-gui/res/cardsfolder/a/alrunds_epiphany.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arachnoform.txt b/forge-gui/res/cardsfolder/a/arachnoform.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arachnoform.txt
rename to forge-gui/res/cardsfolder/a/arachnoform.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arctic_treeline.txt b/forge-gui/res/cardsfolder/a/arctic_treeline.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arctic_treeline.txt
rename to forge-gui/res/cardsfolder/a/arctic_treeline.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/armed_and_armored.txt b/forge-gui/res/cardsfolder/a/armed_and_armored.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/armed_and_armored.txt
rename to forge-gui/res/cardsfolder/a/armed_and_armored.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arni_brokenbrow.txt b/forge-gui/res/cardsfolder/a/arni_brokenbrow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arni_brokenbrow.txt
rename to forge-gui/res/cardsfolder/a/arni_brokenbrow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arni_slays_the_troll.txt b/forge-gui/res/cardsfolder/a/arni_slays_the_troll.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arni_slays_the_troll.txt
rename to forge-gui/res/cardsfolder/a/arni_slays_the_troll.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ascendant_spirit.txt b/forge-gui/res/cardsfolder/a/ascendant_spirit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ascendant_spirit.txt
rename to forge-gui/res/cardsfolder/a/ascendant_spirit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ascent_of_the_worthy.txt b/forge-gui/res/cardsfolder/a/ascent_of_the_worthy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ascent_of_the_worthy.txt
rename to forge-gui/res/cardsfolder/a/ascent_of_the_worthy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/augury_raven.txt b/forge-gui/res/cardsfolder/a/augury_raven.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/augury_raven.txt
rename to forge-gui/res/cardsfolder/a/augury_raven.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/avalanche_caller.txt b/forge-gui/res/cardsfolder/a/avalanche_caller.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/avalanche_caller.txt
rename to forge-gui/res/cardsfolder/a/avalanche_caller.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/axgard_armory.txt b/forge-gui/res/cardsfolder/a/axgard_armory.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/axgard_armory.txt
rename to forge-gui/res/cardsfolder/a/axgard_armory.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/axgard_braggart.txt b/forge-gui/res/cardsfolder/a/axgard_braggart.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/axgard_braggart.txt
rename to forge-gui/res/cardsfolder/a/axgard_braggart.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/axgard_cavalry.txt b/forge-gui/res/cardsfolder/a/axgard_cavalry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/axgard_cavalry.txt
rename to forge-gui/res/cardsfolder/a/axgard_cavalry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/barkchannel_pathway_tidechannel_pathway.txt b/forge-gui/res/cardsfolder/b/barkchannel_pathway_tidechannel_pathway.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/barkchannel_pathway_tidechannel_pathway.txt
rename to forge-gui/res/cardsfolder/b/barkchannel_pathway_tidechannel_pathway.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/basalt_ravager.txt b/forge-gui/res/cardsfolder/b/basalt_ravager.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/basalt_ravager.txt
rename to forge-gui/res/cardsfolder/b/basalt_ravager.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/battershield_warrior.txt b/forge-gui/res/cardsfolder/b/battershield_warrior.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/battershield_warrior.txt
rename to forge-gui/res/cardsfolder/b/battershield_warrior.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/battle_for_bretagard.txt b/forge-gui/res/cardsfolder/b/battle_for_bretagard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/battle_for_bretagard.txt
rename to forge-gui/res/cardsfolder/b/battle_for_bretagard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/battle_mammoth.txt b/forge-gui/res/cardsfolder/b/battle_mammoth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/battle_mammoth.txt
rename to forge-gui/res/cardsfolder/b/battle_mammoth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/battle_of_frost_and_fire.txt b/forge-gui/res/cardsfolder/b/battle_of_frost_and_fire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/battle_of_frost_and_fire.txt
rename to forge-gui/res/cardsfolder/b/battle_of_frost_and_fire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/battlefield_raptor.txt b/forge-gui/res/cardsfolder/b/battlefield_raptor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/battlefield_raptor.txt
rename to forge-gui/res/cardsfolder/b/battlefield_raptor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bearded_axe.txt b/forge-gui/res/cardsfolder/b/bearded_axe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bearded_axe.txt
rename to forge-gui/res/cardsfolder/b/bearded_axe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/behold_the_multiverse.txt b/forge-gui/res/cardsfolder/b/behold_the_multiverse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/behold_the_multiverse.txt
rename to forge-gui/res/cardsfolder/b/behold_the_multiverse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/berg_strider.txt b/forge-gui/res/cardsfolder/b/berg_strider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/berg_strider.txt
rename to forge-gui/res/cardsfolder/b/berg_strider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/beskir_shieldmate.txt b/forge-gui/res/cardsfolder/b/beskir_shieldmate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/beskir_shieldmate.txt
rename to forge-gui/res/cardsfolder/b/beskir_shieldmate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bind_the_monster.txt b/forge-gui/res/cardsfolder/b/bind_the_monster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bind_the_monster.txt
rename to forge-gui/res/cardsfolder/b/bind_the_monster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/binding_of_the_old_gods.txt b/forge-gui/res/cardsfolder/b/binding_of_the_old_gods.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/binding_of_the_old_gods.txt
rename to forge-gui/res/cardsfolder/b/binding_of_the_old_gods.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/birgi_god_of_storytelling_harnfel_horn_of_bounty.txt b/forge-gui/res/cardsfolder/b/birgi_god_of_storytelling_harnfel_horn_of_bounty.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/birgi_god_of_storytelling_harnfel_horn_of_bounty.txt
rename to forge-gui/res/cardsfolder/b/birgi_god_of_storytelling_harnfel_horn_of_bounty.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blessing_of_frost.txt b/forge-gui/res/cardsfolder/b/blessing_of_frost.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blessing_of_frost.txt
rename to forge-gui/res/cardsfolder/b/blessing_of_frost.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blightstep_pathway_searstep_pathway.txt b/forge-gui/res/cardsfolder/b/blightstep_pathway_searstep_pathway.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blightstep_pathway_searstep_pathway.txt
rename to forge-gui/res/cardsfolder/b/blightstep_pathway_searstep_pathway.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blizzard_brawl.txt b/forge-gui/res/cardsfolder/b/blizzard_brawl.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blizzard_brawl.txt
rename to forge-gui/res/cardsfolder/b/blizzard_brawl.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blood_on_the_snow.txt b/forge-gui/res/cardsfolder/b/blood_on_the_snow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blood_on_the_snow.txt
rename to forge-gui/res/cardsfolder/b/blood_on_the_snow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bloodline_pretender.txt b/forge-gui/res/cardsfolder/b/bloodline_pretender.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bloodline_pretender.txt
rename to forge-gui/res/cardsfolder/b/bloodline_pretender.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bloodsky_berserker.txt b/forge-gui/res/cardsfolder/b/bloodsky_berserker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bloodsky_berserker.txt
rename to forge-gui/res/cardsfolder/b/bloodsky_berserker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/boreal_outrider.txt b/forge-gui/res/cardsfolder/b/boreal_outrider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/boreal_outrider.txt
rename to forge-gui/res/cardsfolder/b/boreal_outrider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bound_in_gold.txt b/forge-gui/res/cardsfolder/b/bound_in_gold.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bound_in_gold.txt
rename to forge-gui/res/cardsfolder/b/bound_in_gold.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/breakneck_berserker.txt b/forge-gui/res/cardsfolder/b/breakneck_berserker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/breakneck_berserker.txt
rename to forge-gui/res/cardsfolder/b/breakneck_berserker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bretagard_stronghold.txt b/forge-gui/res/cardsfolder/b/bretagard_stronghold.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bretagard_stronghold.txt
rename to forge-gui/res/cardsfolder/b/bretagard_stronghold.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brinebarrow_intruder.txt b/forge-gui/res/cardsfolder/b/brinebarrow_intruder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brinebarrow_intruder.txt
rename to forge-gui/res/cardsfolder/b/brinebarrow_intruder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/burning_rune_demon.txt b/forge-gui/res/cardsfolder/b/burning_rune_demon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/burning_rune_demon.txt
rename to forge-gui/res/cardsfolder/b/burning_rune_demon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/calamity_bearer.txt b/forge-gui/res/cardsfolder/c/calamity_bearer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/calamity_bearer.txt
rename to forge-gui/res/cardsfolder/c/calamity_bearer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/canopy_tactician.txt b/forge-gui/res/cardsfolder/c/canopy_tactician.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/canopy_tactician.txt
rename to forge-gui/res/cardsfolder/c/canopy_tactician.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cinderheart_giant.txt b/forge-gui/res/cardsfolder/c/cinderheart_giant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cinderheart_giant.txt
rename to forge-gui/res/cardsfolder/c/cinderheart_giant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clarion_spirit.txt b/forge-gui/res/cardsfolder/c/clarion_spirit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clarion_spirit.txt
rename to forge-gui/res/cardsfolder/c/clarion_spirit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cleaving_reaper.txt b/forge-gui/res/cardsfolder/c/cleaving_reaper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cleaving_reaper.txt
rename to forge-gui/res/cardsfolder/c/cleaving_reaper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/codespell_cleric.txt b/forge-gui/res/cardsfolder/c/codespell_cleric.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/codespell_cleric.txt
rename to forge-gui/res/cardsfolder/c/codespell_cleric.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/colossal_plow.txt b/forge-gui/res/cardsfolder/c/colossal_plow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/colossal_plow.txt
rename to forge-gui/res/cardsfolder/c/colossal_plow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cosima_god_of_the_voyage_the_omenkeel.txt b/forge-gui/res/cardsfolder/c/cosima_god_of_the_voyage_the_omenkeel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cosima_god_of_the_voyage_the_omenkeel.txt
rename to forge-gui/res/cardsfolder/c/cosima_god_of_the_voyage_the_omenkeel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cosmic_intervention.txt b/forge-gui/res/cardsfolder/c/cosmic_intervention.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cosmic_intervention.txt
rename to forge-gui/res/cardsfolder/c/cosmic_intervention.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cosmos_charger.txt b/forge-gui/res/cardsfolder/c/cosmos_charger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cosmos_charger.txt
rename to forge-gui/res/cardsfolder/c/cosmos_charger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cosmos_elixir.txt b/forge-gui/res/cardsfolder/c/cosmos_elixir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cosmos_elixir.txt
rename to forge-gui/res/cardsfolder/c/cosmos_elixir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/craven_hulk.txt b/forge-gui/res/cardsfolder/c/craven_hulk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/craven_hulk.txt
rename to forge-gui/res/cardsfolder/c/craven_hulk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crippling_fear.txt b/forge-gui/res/cardsfolder/c/crippling_fear.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crippling_fear.txt
rename to forge-gui/res/cardsfolder/c/crippling_fear.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crown_of_skemfar.txt b/forge-gui/res/cardsfolder/c/crown_of_skemfar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crown_of_skemfar.txt
rename to forge-gui/res/cardsfolder/c/crown_of_skemfar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crush_the_weak.txt b/forge-gui/res/cardsfolder/c/crush_the_weak.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crush_the_weak.txt
rename to forge-gui/res/cardsfolder/c/crush_the_weak.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cyclone_summoner.txt b/forge-gui/res/cardsfolder/c/cyclone_summoner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cyclone_summoner.txt
rename to forge-gui/res/cardsfolder/c/cyclone_summoner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/darkbore_pathway_slitherbore_pathway.txt b/forge-gui/res/cardsfolder/d/darkbore_pathway_slitherbore_pathway.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/darkbore_pathway_slitherbore_pathway.txt
rename to forge-gui/res/cardsfolder/d/darkbore_pathway_slitherbore_pathway.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deathknell_berserker.txt b/forge-gui/res/cardsfolder/d/deathknell_berserker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deathknell_berserker.txt
rename to forge-gui/res/cardsfolder/d/deathknell_berserker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/demon_bolt.txt b/forge-gui/res/cardsfolder/d/demon_bolt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/demon_bolt.txt
rename to forge-gui/res/cardsfolder/d/demon_bolt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/demonic_gifts.txt b/forge-gui/res/cardsfolder/d/demonic_gifts.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/demonic_gifts.txt
rename to forge-gui/res/cardsfolder/d/demonic_gifts.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/depart_the_realm.txt b/forge-gui/res/cardsfolder/d/depart_the_realm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/depart_the_realm.txt
rename to forge-gui/res/cardsfolder/d/depart_the_realm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/divine_gambit.txt b/forge-gui/res/cardsfolder/d/divine_gambit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/divine_gambit.txt
rename to forge-gui/res/cardsfolder/d/divine_gambit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dogged_pursuit.txt b/forge-gui/res/cardsfolder/d/dogged_pursuit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dogged_pursuit.txt
rename to forge-gui/res/cardsfolder/d/dogged_pursuit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/doomskar.txt b/forge-gui/res/cardsfolder/d/doomskar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/doomskar.txt
rename to forge-gui/res/cardsfolder/d/doomskar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/doomskar_oracle.txt b/forge-gui/res/cardsfolder/d/doomskar_oracle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/doomskar_oracle.txt
rename to forge-gui/res/cardsfolder/d/doomskar_oracle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/doomskar_titan.txt b/forge-gui/res/cardsfolder/d/doomskar_titan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/doomskar_titan.txt
rename to forge-gui/res/cardsfolder/d/doomskar_titan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dragonkin_berserker.txt b/forge-gui/res/cardsfolder/d/dragonkin_berserker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dragonkin_berserker.txt
rename to forge-gui/res/cardsfolder/d/dragonkin_berserker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/draugr_necromancer.txt b/forge-gui/res/cardsfolder/d/draugr_necromancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/draugr_necromancer.txt
rename to forge-gui/res/cardsfolder/d/draugr_necromancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/draugr_recruiter.txt b/forge-gui/res/cardsfolder/d/draugr_recruiter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/draugr_recruiter.txt
rename to forge-gui/res/cardsfolder/d/draugr_recruiter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/draugr_thought-thief.txt b/forge-gui/res/cardsfolder/d/draugr_thought-thief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/draugr_thought-thief.txt
rename to forge-gui/res/cardsfolder/d/draugr_thought-thief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/draugrs_helm.txt b/forge-gui/res/cardsfolder/d/draugrs_helm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/draugrs_helm.txt
rename to forge-gui/res/cardsfolder/d/draugrs_helm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dread_rider.txt b/forge-gui/res/cardsfolder/d/dread_rider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dread_rider.txt
rename to forge-gui/res/cardsfolder/d/dread_rider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dream_devourer.txt b/forge-gui/res/cardsfolder/d/dream_devourer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dream_devourer.txt
rename to forge-gui/res/cardsfolder/d/dream_devourer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dual_strike.txt b/forge-gui/res/cardsfolder/d/dual_strike.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dual_strike.txt
rename to forge-gui/res/cardsfolder/d/dual_strike.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/duskwielder.txt b/forge-gui/res/cardsfolder/d/duskwielder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/duskwielder.txt
rename to forge-gui/res/cardsfolder/d/duskwielder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dwarven_hammer.txt b/forge-gui/res/cardsfolder/d/dwarven_hammer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dwarven_hammer.txt
rename to forge-gui/res/cardsfolder/d/dwarven_hammer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dwarven_reinforcements.txt b/forge-gui/res/cardsfolder/d/dwarven_reinforcements.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dwarven_reinforcements.txt
rename to forge-gui/res/cardsfolder/d/dwarven_reinforcements.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/egon_god_of_death_throne_of_death.txt b/forge-gui/res/cardsfolder/e/egon_god_of_death_throne_of_death.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/egon_god_of_death_throne_of_death.txt
rename to forge-gui/res/cardsfolder/e/egon_god_of_death_throne_of_death.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elderfang_disciple.txt b/forge-gui/res/cardsfolder/e/elderfang_disciple.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elderfang_disciple.txt
rename to forge-gui/res/cardsfolder/e/elderfang_disciple.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elderfang_ritualist.txt b/forge-gui/res/cardsfolder/e/elderfang_ritualist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elderfang_ritualist.txt
rename to forge-gui/res/cardsfolder/e/elderfang_ritualist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elderfang_venom.txt b/forge-gui/res/cardsfolder/e/elderfang_venom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elderfang_venom.txt
rename to forge-gui/res/cardsfolder/e/elderfang_venom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elderleaf_mentor.txt b/forge-gui/res/cardsfolder/e/elderleaf_mentor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elderleaf_mentor.txt
rename to forge-gui/res/cardsfolder/e/elderleaf_mentor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elven_ambush.txt b/forge-gui/res/cardsfolder/e/elven_ambush.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elven_ambush.txt
rename to forge-gui/res/cardsfolder/e/elven_ambush.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elven_bow.txt b/forge-gui/res/cardsfolder/e/elven_bow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elven_bow.txt
rename to forge-gui/res/cardsfolder/e/elven_bow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elvish_warmaster.txt b/forge-gui/res/cardsfolder/e/elvish_warmaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elvish_warmaster.txt
rename to forge-gui/res/cardsfolder/e/elvish_warmaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eradicator_valkyrie.txt b/forge-gui/res/cardsfolder/e/eradicator_valkyrie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eradicator_valkyrie.txt
rename to forge-gui/res/cardsfolder/e/eradicator_valkyrie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/esika_god_of_the_tree_the_prismatic_bridge.txt b/forge-gui/res/cardsfolder/e/esika_god_of_the_tree_the_prismatic_bridge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/esika_god_of_the_tree_the_prismatic_bridge.txt
rename to forge-gui/res/cardsfolder/e/esika_god_of_the_tree_the_prismatic_bridge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/esikas_charriot.txt b/forge-gui/res/cardsfolder/e/esikas_charriot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/esikas_charriot.txt
rename to forge-gui/res/cardsfolder/e/esikas_charriot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ethereal_valkyrie.txt b/forge-gui/res/cardsfolder/e/ethereal_valkyrie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ethereal_valkyrie.txt
rename to forge-gui/res/cardsfolder/e/ethereal_valkyrie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/faceless_haven.txt b/forge-gui/res/cardsfolder/f/faceless_haven.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/faceless_haven.txt
rename to forge-gui/res/cardsfolder/f/faceless_haven.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fall_of_the_impostor.txt b/forge-gui/res/cardsfolder/f/fall_of_the_impostor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fall_of_the_impostor.txt
rename to forge-gui/res/cardsfolder/f/fall_of_the_impostor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fearless_liberator.txt b/forge-gui/res/cardsfolder/f/fearless_liberator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fearless_liberator.txt
rename to forge-gui/res/cardsfolder/f/fearless_liberator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fearless_pup.txt b/forge-gui/res/cardsfolder/f/fearless_pup.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fearless_pup.txt
rename to forge-gui/res/cardsfolder/f/fearless_pup.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/feed_the_serpent.txt b/forge-gui/res/cardsfolder/f/feed_the_serpent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/feed_the_serpent.txt
rename to forge-gui/res/cardsfolder/f/feed_the_serpent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fire_giants_fury.txt b/forge-gui/res/cardsfolder/f/fire_giants_fury.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fire_giants_fury.txt
rename to forge-gui/res/cardsfolder/f/fire_giants_fury.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/firja_judge_of_valor.txt b/forge-gui/res/cardsfolder/f/firja_judge_of_valor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/firja_judge_of_valor.txt
rename to forge-gui/res/cardsfolder/f/firja_judge_of_valor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/firjas_retribution.txt b/forge-gui/res/cardsfolder/f/firjas_retribution.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/firjas_retribution.txt
rename to forge-gui/res/cardsfolder/f/firjas_retribution.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/forging_the_tyrite_sword.txt b/forge-gui/res/cardsfolder/f/forging_the_tyrite_sword.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/forging_the_tyrite_sword.txt
rename to forge-gui/res/cardsfolder/f/forging_the_tyrite_sword.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frenzied_raider.txt b/forge-gui/res/cardsfolder/f/frenzied_raider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frenzied_raider.txt
rename to forge-gui/res/cardsfolder/f/frenzied_raider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frost_augur.txt b/forge-gui/res/cardsfolder/f/frost_augur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frost_augur.txt
rename to forge-gui/res/cardsfolder/f/frost_augur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frost_bite.txt b/forge-gui/res/cardsfolder/f/frost_bite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frost_bite.txt
rename to forge-gui/res/cardsfolder/f/frost_bite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frostpeak_yeti.txt b/forge-gui/res/cardsfolder/f/frostpeak_yeti.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frostpeak_yeti.txt
rename to forge-gui/res/cardsfolder/f/frostpeak_yeti.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frostpyre_arcanist.txt b/forge-gui/res/cardsfolder/f/frostpyre_arcanist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frostpyre_arcanist.txt
rename to forge-gui/res/cardsfolder/f/frostpyre_arcanist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/funeral_longboat.txt b/forge-gui/res/cardsfolder/f/funeral_longboat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/funeral_longboat.txt
rename to forge-gui/res/cardsfolder/f/funeral_longboat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fynn_the_fangbearer.txt b/forge-gui/res/cardsfolder/f/fynn_the_fangbearer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fynn_the_fangbearer.txt
rename to forge-gui/res/cardsfolder/f/fynn_the_fangbearer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gates_of_istfell.txt b/forge-gui/res/cardsfolder/g/gates_of_istfell.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gates_of_istfell.txt
rename to forge-gui/res/cardsfolder/g/gates_of_istfell.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/giant_ox.txt b/forge-gui/res/cardsfolder/g/giant_ox.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/giant_ox.txt
rename to forge-gui/res/cardsfolder/g/giant_ox.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/giants_amulet.txt b/forge-gui/res/cardsfolder/g/giants_amulet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/giants_amulet.txt
rename to forge-gui/res/cardsfolder/g/giants_amulet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/giants_grasp.txt b/forge-gui/res/cardsfolder/g/giants_grasp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/giants_grasp.txt
rename to forge-gui/res/cardsfolder/g/giants_grasp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gilded_assault_cart.txt b/forge-gui/res/cardsfolder/g/gilded_assault_cart.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gilded_assault_cart.txt
rename to forge-gui/res/cardsfolder/g/gilded_assault_cart.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glacial_floodplain.txt b/forge-gui/res/cardsfolder/g/glacial_floodplain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glacial_floodplain.txt
rename to forge-gui/res/cardsfolder/g/glacial_floodplain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gladewalker_ritualist.txt b/forge-gui/res/cardsfolder/g/gladewalker_ritualist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gladewalker_ritualist.txt
rename to forge-gui/res/cardsfolder/g/gladewalker_ritualist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glimpse_the_cosmos.txt b/forge-gui/res/cardsfolder/g/glimpse_the_cosmos.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glimpse_the_cosmos.txt
rename to forge-gui/res/cardsfolder/g/glimpse_the_cosmos.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glittering_frost.txt b/forge-gui/res/cardsfolder/g/glittering_frost.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glittering_frost.txt
rename to forge-gui/res/cardsfolder/g/glittering_frost.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glorious_protector.txt b/forge-gui/res/cardsfolder/g/glorious_protector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glorious_protector.txt
rename to forge-gui/res/cardsfolder/g/glorious_protector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gnottvold_recluse.txt b/forge-gui/res/cardsfolder/g/gnottvold_recluse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gnottvold_recluse.txt
rename to forge-gui/res/cardsfolder/g/gnottvold_recluse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gnottvold_slumbermound.txt b/forge-gui/res/cardsfolder/g/gnottvold_slumbermound.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gnottvold_slumbermound.txt
rename to forge-gui/res/cardsfolder/g/gnottvold_slumbermound.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gods_hall_guardian.txt b/forge-gui/res/cardsfolder/g/gods_hall_guardian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gods_hall_guardian.txt
rename to forge-gui/res/cardsfolder/g/gods_hall_guardian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goldmaw_champion.txt b/forge-gui/res/cardsfolder/g/goldmaw_champion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goldmaw_champion.txt
rename to forge-gui/res/cardsfolder/g/goldmaw_champion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goldspan_dragon.txt b/forge-gui/res/cardsfolder/g/goldspan_dragon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goldspan_dragon.txt
rename to forge-gui/res/cardsfolder/g/goldspan_dragon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goldvein_pick.txt b/forge-gui/res/cardsfolder/g/goldvein_pick.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goldvein_pick.txt
rename to forge-gui/res/cardsfolder/g/goldvein_pick.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/graven_lore.txt b/forge-gui/res/cardsfolder/g/graven_lore.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/graven_lore.txt
rename to forge-gui/res/cardsfolder/g/graven_lore.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/great_hall_of_starnheim.txt b/forge-gui/res/cardsfolder/g/great_hall_of_starnheim.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/great_hall_of_starnheim.txt
rename to forge-gui/res/cardsfolder/g/great_hall_of_starnheim.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/grim_draugr.txt b/forge-gui/res/cardsfolder/g/grim_draugr.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/grim_draugr.txt
rename to forge-gui/res/cardsfolder/g/grim_draugr.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/grizzled_outrider.txt b/forge-gui/res/cardsfolder/g/grizzled_outrider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/grizzled_outrider.txt
rename to forge-gui/res/cardsfolder/g/grizzled_outrider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/guardian-gladewalker.txt b/forge-gui/res/cardsfolder/g/guardian-gladewalker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/guardian-gladewalker.txt
rename to forge-gui/res/cardsfolder/g/guardian-gladewalker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hagi_mob.txt b/forge-gui/res/cardsfolder/h/hagi_mob.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hagi_mob.txt
rename to forge-gui/res/cardsfolder/h/hagi_mob.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hailstorm_valkyrie.txt b/forge-gui/res/cardsfolder/h/hailstorm_valkyrie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hailstorm_valkyrie.txt
rename to forge-gui/res/cardsfolder/h/hailstorm_valkyrie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/halvar_god_of_battle_sword_of_the_realms.txt b/forge-gui/res/cardsfolder/h/halvar_god_of_battle_sword_of_the_realms.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/halvar_god_of_battle_sword_of_the_realms.txt
rename to forge-gui/res/cardsfolder/h/halvar_god_of_battle_sword_of_the_realms.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/harald_king_of_skemfar.txt b/forge-gui/res/cardsfolder/h/harald_king_of_skemfar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/harald_king_of_skemfar.txt
rename to forge-gui/res/cardsfolder/h/harald_king_of_skemfar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/harald_unites_the_elves.txt b/forge-gui/res/cardsfolder/h/harald_unites_the_elves.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/harald_unites_the_elves.txt
rename to forge-gui/res/cardsfolder/h/harald_unites_the_elves.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/haunting_voyage.txt b/forge-gui/res/cardsfolder/h/haunting_voyage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/haunting_voyage.txt
rename to forge-gui/res/cardsfolder/h/haunting_voyage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hengegate_pathway_mistgate_pathway.txt b/forge-gui/res/cardsfolder/h/hengegate_pathway_mistgate_pathway.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hengegate_pathway_mistgate_pathway.txt
rename to forge-gui/res/cardsfolder/h/hengegate_pathway_mistgate_pathway.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/highland_forest.txt b/forge-gui/res/cardsfolder/h/highland_forest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/highland_forest.txt
rename to forge-gui/res/cardsfolder/h/highland_forest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/horizon_seeker.txt b/forge-gui/res/cardsfolder/h/horizon_seeker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/horizon_seeker.txt
rename to forge-gui/res/cardsfolder/h/horizon_seeker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ice_tunnel.txt b/forge-gui/res/cardsfolder/i/ice_tunnel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ice_tunnel.txt
rename to forge-gui/res/cardsfolder/i/ice_tunnel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/icebind_pillar.txt b/forge-gui/res/cardsfolder/i/icebind_pillar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/icebind_pillar.txt
rename to forge-gui/res/cardsfolder/i/icebind_pillar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/icebreaker_kraken.txt b/forge-gui/res/cardsfolder/i/icebreaker_kraken.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/icebreaker_kraken.txt
rename to forge-gui/res/cardsfolder/i/icebreaker_kraken.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/icehide_troll.txt b/forge-gui/res/cardsfolder/i/icehide_troll.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/icehide_troll.txt
rename to forge-gui/res/cardsfolder/i/icehide_troll.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/immersturm_predator.txt b/forge-gui/res/cardsfolder/i/immersturm_predator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/immersturm_predator.txt
rename to forge-gui/res/cardsfolder/i/immersturm_predator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/immersturm_raider.txt b/forge-gui/res/cardsfolder/i/immersturm_raider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/immersturm_raider.txt
rename to forge-gui/res/cardsfolder/i/immersturm_raider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/immersturm_skullcairn.txt b/forge-gui/res/cardsfolder/i/immersturm_skullcairn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/immersturm_skullcairn.txt
rename to forge-gui/res/cardsfolder/i/immersturm_skullcairn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/in_search_of_greatness.txt b/forge-gui/res/cardsfolder/i/in_search_of_greatness.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/in_search_of_greatness.txt
rename to forge-gui/res/cardsfolder/i/in_search_of_greatness.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/infernal_pet.txt b/forge-gui/res/cardsfolder/i/infernal_pet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/infernal_pet.txt
rename to forge-gui/res/cardsfolder/i/infernal_pet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/inga_rune_eyes.txt b/forge-gui/res/cardsfolder/i/inga_rune_eyes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/inga_rune_eyes.txt
rename to forge-gui/res/cardsfolder/i/inga_rune_eyes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_the_giants.txt b/forge-gui/res/cardsfolder/i/invasion_of_the_giants.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_the_giants.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_the_giants.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/iron_verdict.txt b/forge-gui/res/cardsfolder/i/iron_verdict.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/iron_verdict.txt
rename to forge-gui/res/cardsfolder/i/iron_verdict.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jarl_of_the_forsaken.txt b/forge-gui/res/cardsfolder/j/jarl_of_the_forsaken.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jarl_of_the_forsaken.txt
rename to forge-gui/res/cardsfolder/j/jarl_of_the_forsaken.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jaspera_sentinel.txt b/forge-gui/res/cardsfolder/j/jaspera_sentinel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jaspera_sentinel.txt
rename to forge-gui/res/cardsfolder/j/jaspera_sentinel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jorn_god_of_winter_kaldring_the_rimestaff.txt b/forge-gui/res/cardsfolder/j/jorn_god_of_winter_kaldring_the_rimestaff.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jorn_god_of_winter_kaldring_the_rimestaff.txt
rename to forge-gui/res/cardsfolder/j/jorn_god_of_winter_kaldring_the_rimestaff.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kardur_doomscourge.txt b/forge-gui/res/cardsfolder/k/kardur_doomscourge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kardur_doomscourge.txt
rename to forge-gui/res/cardsfolder/k/kardur_doomscourge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kardurs_vicious_return.txt b/forge-gui/res/cardsfolder/k/kardurs_vicious_return.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kardurs_vicious_return.txt
rename to forge-gui/res/cardsfolder/k/kardurs_vicious_return.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/karfell_harbinger.txt b/forge-gui/res/cardsfolder/k/karfell_harbinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/karfell_harbinger.txt
rename to forge-gui/res/cardsfolder/k/karfell_harbinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/karfell_kennel_master.txt b/forge-gui/res/cardsfolder/k/karfell_kennel_master.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/karfell_kennel_master.txt
rename to forge-gui/res/cardsfolder/k/karfell_kennel_master.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kaya_the_inexorable.txt b/forge-gui/res/cardsfolder/k/kaya_the_inexorable.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kaya_the_inexorable.txt
rename to forge-gui/res/cardsfolder/k/kaya_the_inexorable.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kayas_onslaught.txt b/forge-gui/res/cardsfolder/k/kayas_onslaught.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kayas_onslaught.txt
rename to forge-gui/res/cardsfolder/k/kayas_onslaught.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/king_haralds_revenge.txt b/forge-gui/res/cardsfolder/k/king_haralds_revenge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/king_haralds_revenge.txt
rename to forge-gui/res/cardsfolder/k/king_haralds_revenge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/king_narfis_betrayal.txt b/forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/king_narfis_betrayal.txt
rename to forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/koll_the_forgemaster.txt b/forge-gui/res/cardsfolder/k/koll_the_forgemaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/koll_the_forgemaster.txt
rename to forge-gui/res/cardsfolder/k/koll_the_forgemaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kolvori_god_of_kinship_the_ringhart_crest.txt b/forge-gui/res/cardsfolder/k/kolvori_god_of_kinship_the_ringhart_crest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kolvori_god_of_kinship_the_ringhart_crest.txt
rename to forge-gui/res/cardsfolder/k/kolvori_god_of_kinship_the_ringhart_crest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/koma_cosmos_serpent.txt b/forge-gui/res/cardsfolder/k/koma_cosmos_serpent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/koma_cosmos_serpent.txt
rename to forge-gui/res/cardsfolder/k/koma_cosmos_serpent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/komas_faithful.txt b/forge-gui/res/cardsfolder/k/komas_faithful.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/komas_faithful.txt
rename to forge-gui/res/cardsfolder/k/komas_faithful.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/littjara_glade_warden.txt b/forge-gui/res/cardsfolder/l/littjara_glade_warden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/littjara_glade_warden.txt
rename to forge-gui/res/cardsfolder/l/littjara_glade_warden.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/littjara_kinseekers.txt b/forge-gui/res/cardsfolder/l/littjara_kinseekers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/littjara_kinseekers.txt
rename to forge-gui/res/cardsfolder/l/littjara_kinseekers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/littjara_mirrorlake.txt b/forge-gui/res/cardsfolder/l/littjara_mirrorlake.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/littjara_mirrorlake.txt
rename to forge-gui/res/cardsfolder/l/littjara_mirrorlake.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/magda_brazen_outlaw.txt b/forge-gui/res/cardsfolder/m/magda_brazen_outlaw.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/magda_brazen_outlaw.txt
rename to forge-gui/res/cardsfolder/m/magda_brazen_outlaw.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/maja_bretagard_protector.txt b/forge-gui/res/cardsfolder/m/maja_bretagard_protector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/maja_bretagard_protector.txt
rename to forge-gui/res/cardsfolder/m/maja_bretagard_protector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mammoth_growth.txt b/forge-gui/res/cardsfolder/m/mammoth_growth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mammoth_growth.txt
rename to forge-gui/res/cardsfolder/m/mammoth_growth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/masked_vandal.txt b/forge-gui/res/cardsfolder/m/masked_vandal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/masked_vandal.txt
rename to forge-gui/res/cardsfolder/m/masked_vandal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/maskwood_nexus.txt b/forge-gui/res/cardsfolder/m/maskwood_nexus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/maskwood_nexus.txt
rename to forge-gui/res/cardsfolder/m/maskwood_nexus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/master_skald.txt b/forge-gui/res/cardsfolder/m/master_skald.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/master_skald.txt
rename to forge-gui/res/cardsfolder/m/master_skald.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mists_of_littjara.txt b/forge-gui/res/cardsfolder/m/mists_of_littjara.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mists_of_littjara.txt
rename to forge-gui/res/cardsfolder/m/mists_of_littjara.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mistwalker.txt b/forge-gui/res/cardsfolder/m/mistwalker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mistwalker.txt
rename to forge-gui/res/cardsfolder/m/mistwalker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/moritte_of_the_frost.txt b/forge-gui/res/cardsfolder/m/moritte_of_the_frost.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/moritte_of_the_frost.txt
rename to forge-gui/res/cardsfolder/m/moritte_of_the_frost.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mystic_reflection.txt b/forge-gui/res/cardsfolder/m/mystic_reflection.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mystic_reflection.txt
rename to forge-gui/res/cardsfolder/m/mystic_reflection.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/narfi_betrayer_king.txt b/forge-gui/res/cardsfolder/n/narfi_betrayer_king.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/narfi_betrayer_king.txt
rename to forge-gui/res/cardsfolder/n/narfi_betrayer_king.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/niko_aris.txt b/forge-gui/res/cardsfolder/n/niko_aris.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/niko_aris.txt
rename to forge-gui/res/cardsfolder/n/niko_aris.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/niko_defies_destiny.txt b/forge-gui/res/cardsfolder/n/niko_defies_destiny.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/niko_defies_destiny.txt
rename to forge-gui/res/cardsfolder/n/niko_defies_destiny.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/old_growth_troll.txt b/forge-gui/res/cardsfolder/o/old_growth_troll.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/old_growth_troll.txt
rename to forge-gui/res/cardsfolder/o/old_growth_troll.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/open_the_omenpaths.txt b/forge-gui/res/cardsfolder/o/open_the_omenpaths.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/open_the_omenpaths.txt
rename to forge-gui/res/cardsfolder/o/open_the_omenpaths.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/orvar_the_all_form.txt b/forge-gui/res/cardsfolder/o/orvar_the_all_form.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/orvar_the_all_form.txt
rename to forge-gui/res/cardsfolder/o/orvar_the_all_form.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/path_to_the_world_tree.txt b/forge-gui/res/cardsfolder/p/path_to_the_world_tree.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/path_to_the_world_tree.txt
rename to forge-gui/res/cardsfolder/p/path_to_the_world_tree.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pilfering_hawk.txt b/forge-gui/res/cardsfolder/p/pilfering_hawk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pilfering_hawk.txt
rename to forge-gui/res/cardsfolder/p/pilfering_hawk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/poison_the_cup.txt b/forge-gui/res/cardsfolder/p/poison_the_cup.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/poison_the_cup.txt
rename to forge-gui/res/cardsfolder/p/poison_the_cup.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/port_of_karfell.txt b/forge-gui/res/cardsfolder/p/port_of_karfell.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/port_of_karfell.txt
rename to forge-gui/res/cardsfolder/p/port_of_karfell.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/priest_of_the_haunted_edge.txt b/forge-gui/res/cardsfolder/p/priest_of_the_haunted_edge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/priest_of_the_haunted_edge.txt
rename to forge-gui/res/cardsfolder/p/priest_of_the_haunted_edge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/provoke_the_trolls.txt b/forge-gui/res/cardsfolder/p/provoke_the_trolls.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/provoke_the_trolls.txt
rename to forge-gui/res/cardsfolder/p/provoke_the_trolls.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pyre_of_heroes.txt b/forge-gui/res/cardsfolder/p/pyre_of_heroes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pyre_of_heroes.txt
rename to forge-gui/res/cardsfolder/p/pyre_of_heroes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quakebringer.txt b/forge-gui/res/cardsfolder/q/quakebringer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quakebringer.txt
rename to forge-gui/res/cardsfolder/q/quakebringer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/raiders_karve.txt b/forge-gui/res/cardsfolder/r/raiders_karve.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raiders_karve.txt
rename to forge-gui/res/cardsfolder/r/raiders_karve.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/raise_the_draugr.txt b/forge-gui/res/cardsfolder/r/raise_the_draugr.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raise_the_draugr.txt
rename to forge-gui/res/cardsfolder/r/raise_the_draugr.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rally_the_ranks.txt b/forge-gui/res/cardsfolder/r/rally_the_ranks.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rally_the_ranks.txt
rename to forge-gui/res/cardsfolder/r/rally_the_ranks.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rampage_of_the_valkyries.txt b/forge-gui/res/cardsfolder/r/rampage_of_the_valkyries.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rampage_of_the_valkyries.txt
rename to forge-gui/res/cardsfolder/r/rampage_of_the_valkyries.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/raven_wings.txt b/forge-gui/res/cardsfolder/r/raven_wings.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raven_wings.txt
rename to forge-gui/res/cardsfolder/r/raven_wings.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ravenform.txt b/forge-gui/res/cardsfolder/r/ravenform.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ravenform.txt
rename to forge-gui/res/cardsfolder/r/ravenform.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ravenous_lindwurm.txt b/forge-gui/res/cardsfolder/r/ravenous_lindwurm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ravenous_lindwurm.txt
rename to forge-gui/res/cardsfolder/r/ravenous_lindwurm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/realmwalker.txt b/forge-gui/res/cardsfolder/r/realmwalker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/realmwalker.txt
rename to forge-gui/res/cardsfolder/r/realmwalker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reckless_crew.txt b/forge-gui/res/cardsfolder/r/reckless_crew.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reckless_crew.txt
rename to forge-gui/res/cardsfolder/r/reckless_crew.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reflections_of_littjara.txt b/forge-gui/res/cardsfolder/r/reflections_of_littjara.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reflections_of_littjara.txt
rename to forge-gui/res/cardsfolder/r/reflections_of_littjara.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reidane_god_of_the_worthy_valkmira_protectors_shield.txt b/forge-gui/res/cardsfolder/r/reidane_god_of_the_worthy_valkmira_protectors_shield.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reidane_god_of_the_worthy_valkmira_protectors_shield.txt
rename to forge-gui/res/cardsfolder/r/reidane_god_of_the_worthy_valkmira_protectors_shield.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/renegade_reaper.txt b/forge-gui/res/cardsfolder/r/renegade_reaper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/renegade_reaper.txt
rename to forge-gui/res/cardsfolder/r/renegade_reaper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/replicating_ring.txt b/forge-gui/res/cardsfolder/r/replicating_ring.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/replicating_ring.txt
rename to forge-gui/res/cardsfolder/r/replicating_ring.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/resplendent_marshal.txt b/forge-gui/res/cardsfolder/r/resplendent_marshal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/resplendent_marshal.txt
rename to forge-gui/res/cardsfolder/r/resplendent_marshal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/return_upon_the_tide.txt b/forge-gui/res/cardsfolder/r/return_upon_the_tide.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/return_upon_the_tide.txt
rename to forge-gui/res/cardsfolder/r/return_upon_the_tide.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/righteous_valkyrie.txt b/forge-gui/res/cardsfolder/r/righteous_valkyrie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/righteous_valkyrie.txt
rename to forge-gui/res/cardsfolder/r/righteous_valkyrie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rimewood_falls.txt b/forge-gui/res/cardsfolder/r/rimewood_falls.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rimewood_falls.txt
rename to forge-gui/res/cardsfolder/r/rimewood_falls.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rise_of_the_dread_marn.txt b/forge-gui/res/cardsfolder/r/rise_of_the_dread_marn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rise_of_the_dread_marn.txt
rename to forge-gui/res/cardsfolder/r/rise_of_the_dread_marn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rootless_yew.txt b/forge-gui/res/cardsfolder/r/rootless_yew.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rootless_yew.txt
rename to forge-gui/res/cardsfolder/r/rootless_yew.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/roots_of_wisdom.txt b/forge-gui/res/cardsfolder/r/roots_of_wisdom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/roots_of_wisdom.txt
rename to forge-gui/res/cardsfolder/r/roots_of_wisdom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/run_ashore.txt b/forge-gui/res/cardsfolder/r/run_ashore.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/run_ashore.txt
rename to forge-gui/res/cardsfolder/r/run_ashore.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rune_of_flight.txt b/forge-gui/res/cardsfolder/r/rune_of_flight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rune_of_flight.txt
rename to forge-gui/res/cardsfolder/r/rune_of_flight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rune_of_might.txt b/forge-gui/res/cardsfolder/r/rune_of_might.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rune_of_might.txt
rename to forge-gui/res/cardsfolder/r/rune_of_might.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rune_of_mortality.txt b/forge-gui/res/cardsfolder/r/rune_of_mortality.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rune_of_mortality.txt
rename to forge-gui/res/cardsfolder/r/rune_of_mortality.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rune_of_speed.txt b/forge-gui/res/cardsfolder/r/rune_of_speed.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rune_of_speed.txt
rename to forge-gui/res/cardsfolder/r/rune_of_speed.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rune_of_sustenance.txt b/forge-gui/res/cardsfolder/r/rune_of_sustenance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rune_of_sustenance.txt
rename to forge-gui/res/cardsfolder/r/rune_of_sustenance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/runed_crown.txt b/forge-gui/res/cardsfolder/r/runed_crown.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/runed_crown.txt
rename to forge-gui/res/cardsfolder/r/runed_crown.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/runeforge_champion.txt b/forge-gui/res/cardsfolder/r/runeforge_champion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/runeforge_champion.txt
rename to forge-gui/res/cardsfolder/r/runeforge_champion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ruthless_winnower.txt b/forge-gui/res/cardsfolder/r/ruthless_winnower.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ruthless_winnower.txt
rename to forge-gui/res/cardsfolder/r/ruthless_winnower.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sage_of_the_beyond.txt b/forge-gui/res/cardsfolder/s/sage_of_the_beyond.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sage_of_the_beyond.txt
rename to forge-gui/res/cardsfolder/s/sage_of_the_beyond.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sarulf_realm_eater.txt b/forge-gui/res/cardsfolder/s/sarulf_realm_eater.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sarulf_realm_eater.txt
rename to forge-gui/res/cardsfolder/s/sarulf_realm_eater.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sarulfs_packmate.txt b/forge-gui/res/cardsfolder/s/sarulfs_packmate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sarulfs_packmate.txt
rename to forge-gui/res/cardsfolder/s/sarulfs_packmate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/saw_it_coming.txt b/forge-gui/res/cardsfolder/s/saw_it_coming.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/saw_it_coming.txt
rename to forge-gui/res/cardsfolder/s/saw_it_coming.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scorn_effigy.txt b/forge-gui/res/cardsfolder/s/scorn_effigy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scorn_effigy.txt
rename to forge-gui/res/cardsfolder/s/scorn_effigy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sculptor_of_winter.txt b/forge-gui/res/cardsfolder/s/sculptor_of_winter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sculptor_of_winter.txt
rename to forge-gui/res/cardsfolder/s/sculptor_of_winter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/search_for_glory.txt b/forge-gui/res/cardsfolder/s/search_for_glory.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/search_for_glory.txt
rename to forge-gui/res/cardsfolder/s/search_for_glory.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seize_the_spoils.txt b/forge-gui/res/cardsfolder/s/seize_the_spoils.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seize_the_spoils.txt
rename to forge-gui/res/cardsfolder/s/seize_the_spoils.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shackles_of_treachery.txt b/forge-gui/res/cardsfolder/s/shackles_of_treachery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shackles_of_treachery.txt
rename to forge-gui/res/cardsfolder/s/shackles_of_treachery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shepherd_of_the_cosmos.txt b/forge-gui/res/cardsfolder/s/shepherd_of_the_cosmos.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shepherd_of_the_cosmos.txt
rename to forge-gui/res/cardsfolder/s/shepherd_of_the_cosmos.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shimmerdrift_vale.txt b/forge-gui/res/cardsfolder/s/shimmerdrift_vale.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shimmerdrift_vale.txt
rename to forge-gui/res/cardsfolder/s/shimmerdrift_vale.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/showdown_of_the_skalds.txt b/forge-gui/res/cardsfolder/s/showdown_of_the_skalds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/showdown_of_the_skalds.txt
rename to forge-gui/res/cardsfolder/s/showdown_of_the_skalds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sigrid_god_favored.txt b/forge-gui/res/cardsfolder/s/sigrid_god_favored.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sigrid_god_favored.txt
rename to forge-gui/res/cardsfolder/s/sigrid_god_favored.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skemfar_avenger.txt b/forge-gui/res/cardsfolder/s/skemfar_avenger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skemfar_avenger.txt
rename to forge-gui/res/cardsfolder/s/skemfar_avenger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skemfar_elderhall.txt b/forge-gui/res/cardsfolder/s/skemfar_elderhall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skemfar_elderhall.txt
rename to forge-gui/res/cardsfolder/s/skemfar_elderhall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skemfar_shadowsage.txt b/forge-gui/res/cardsfolder/s/skemfar_shadowsage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skemfar_shadowsage.txt
rename to forge-gui/res/cardsfolder/s/skemfar_shadowsage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skull_raid.txt b/forge-gui/res/cardsfolder/s/skull_raid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skull_raid.txt
rename to forge-gui/res/cardsfolder/s/skull_raid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/smashing_sucess.txt b/forge-gui/res/cardsfolder/s/smashing_sucess.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/smashing_sucess.txt
rename to forge-gui/res/cardsfolder/s/smashing_sucess.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/snakeskin_veil.txt b/forge-gui/res/cardsfolder/s/snakeskin_veil.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/snakeskin_veil.txt
rename to forge-gui/res/cardsfolder/s/snakeskin_veil.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/snowfield_sinkhole.txt b/forge-gui/res/cardsfolder/s/snowfield_sinkhole.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/snowfield_sinkhole.txt
rename to forge-gui/res/cardsfolder/s/snowfield_sinkhole.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spectral_deluge.txt b/forge-gui/res/cardsfolder/s/spectral_deluge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spectral_deluge.txt
rename to forge-gui/res/cardsfolder/s/spectral_deluge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spectral_steel.txt b/forge-gui/res/cardsfolder/s/spectral_steel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spectral_steel.txt
rename to forge-gui/res/cardsfolder/s/spectral_steel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spirit_of_the_aldergard.txt b/forge-gui/res/cardsfolder/s/spirit_of_the_aldergard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spirit_of_the_aldergard.txt
rename to forge-gui/res/cardsfolder/s/spirit_of_the_aldergard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/squash.txt b/forge-gui/res/cardsfolder/s/squash.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/squash.txt
rename to forge-gui/res/cardsfolder/s/squash.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stalwart_valkyrie.txt b/forge-gui/res/cardsfolder/s/stalwart_valkyrie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stalwart_valkyrie.txt
rename to forge-gui/res/cardsfolder/s/stalwart_valkyrie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/starnheim_aspirant.txt b/forge-gui/res/cardsfolder/s/starnheim_aspirant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/starnheim_aspirant.txt
rename to forge-gui/res/cardsfolder/s/starnheim_aspirant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/starnheim_courser.txt b/forge-gui/res/cardsfolder/s/starnheim_courser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/starnheim_courser.txt
rename to forge-gui/res/cardsfolder/s/starnheim_courser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/starnheim_unleashed.txt b/forge-gui/res/cardsfolder/s/starnheim_unleashed.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/starnheim_unleashed.txt
rename to forge-gui/res/cardsfolder/s/starnheim_unleashed.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stoic_farmer.txt b/forge-gui/res/cardsfolder/s/stoic_farmer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stoic_farmer.txt
rename to forge-gui/res/cardsfolder/s/stoic_farmer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/story_seeker.txt b/forge-gui/res/cardsfolder/s/story_seeker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/story_seeker.txt
rename to forge-gui/res/cardsfolder/s/story_seeker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/struggle_for_skemfar.txt b/forge-gui/res/cardsfolder/s/struggle_for_skemfar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/struggle_for_skemfar.txt
rename to forge-gui/res/cardsfolder/s/struggle_for_skemfar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sulfurous_mire.txt b/forge-gui/res/cardsfolder/s/sulfurous_mire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sulfurous_mire.txt
rename to forge-gui/res/cardsfolder/s/sulfurous_mire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/surtland_elementalist.txt b/forge-gui/res/cardsfolder/s/surtland_elementalist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/surtland_elementalist.txt
rename to forge-gui/res/cardsfolder/s/surtland_elementalist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/surtland_flinger.txt b/forge-gui/res/cardsfolder/s/surtland_flinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/surtland_flinger.txt
rename to forge-gui/res/cardsfolder/s/surtland_flinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/surtland_frostpyre.txt b/forge-gui/res/cardsfolder/s/surtland_frostpyre.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/surtland_frostpyre.txt
rename to forge-gui/res/cardsfolder/s/surtland_frostpyre.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/svella_ice_shaper.txt b/forge-gui/res/cardsfolder/s/svella_ice_shaper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/svella_ice_shaper.txt
rename to forge-gui/res/cardsfolder/s/svella_ice_shaper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tales_of_the_ancestors.txt b/forge-gui/res/cardsfolder/t/tales_of_the_ancestors.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tales_of_the_ancestors.txt
rename to forge-gui/res/cardsfolder/t/tales_of_the_ancestors.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tayam_luminous_enigma.txt b/forge-gui/res/cardsfolder/t/tayam_luminous_enigma.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tayam_luminous_enigma.txt
rename to forge-gui/res/cardsfolder/t/tayam_luminous_enigma.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tergrid_god_of_fear_tergrids_lantern.txt b/forge-gui/res/cardsfolder/t/tergrid_god_of_fear_tergrids_lantern.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tergrid_god_of_fear_tergrids_lantern.txt
rename to forge-gui/res/cardsfolder/t/tergrid_god_of_fear_tergrids_lantern.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tergrids_shadow.txt b/forge-gui/res/cardsfolder/t/tergrids_shadow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tergrids_shadow.txt
rename to forge-gui/res/cardsfolder/t/tergrids_shadow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_bears_of_littjara.txt b/forge-gui/res/cardsfolder/t/the_bears_of_littjara.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_bears_of_littjara.txt
rename to forge-gui/res/cardsfolder/t/the_bears_of_littjara.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_bloodsky_massacre.txt b/forge-gui/res/cardsfolder/t/the_bloodsky_massacre.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_bloodsky_massacre.txt
rename to forge-gui/res/cardsfolder/t/the_bloodsky_massacre.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_ravens_warning.txt b/forge-gui/res/cardsfolder/t/the_ravens_warning.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_ravens_warning.txt
rename to forge-gui/res/cardsfolder/t/the_ravens_warning.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_three_seasons.txt b/forge-gui/res/cardsfolder/t/the_three_seasons.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_three_seasons.txt
rename to forge-gui/res/cardsfolder/t/the_three_seasons.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_trickster_gods_heist.txt b/forge-gui/res/cardsfolder/t/the_trickster_gods_heist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_trickster_gods_heist.txt
rename to forge-gui/res/cardsfolder/t/the_trickster_gods_heist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_world_tree.txt b/forge-gui/res/cardsfolder/t/the_world_tree.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_world_tree.txt
rename to forge-gui/res/cardsfolder/t/the_world_tree.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thornmantle_striker.txt b/forge-gui/res/cardsfolder/t/thornmantle_striker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thornmantle_striker.txt
rename to forge-gui/res/cardsfolder/t/thornmantle_striker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tibalts_trickery.txt b/forge-gui/res/cardsfolder/t/tibalts_trickery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tibalts_trickery.txt
rename to forge-gui/res/cardsfolder/t/tibalts_trickery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/toralf_god_of_fury_toralfs_hammer.txt b/forge-gui/res/cardsfolder/t/toralf_god_of_fury_toralfs_hammer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/toralf_god_of_fury_toralfs_hammer.txt
rename to forge-gui/res/cardsfolder/t/toralf_god_of_fury_toralfs_hammer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tormentors_helm.txt b/forge-gui/res/cardsfolder/t/tormentors_helm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tormentors_helm.txt
rename to forge-gui/res/cardsfolder/t/tormentors_helm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/toski_bearer_of_secrets.txt b/forge-gui/res/cardsfolder/t/toski_bearer_of_secrets.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/toski_bearer_of_secrets.txt
rename to forge-gui/res/cardsfolder/t/toski_bearer_of_secrets.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tundra_fumarole.txt b/forge-gui/res/cardsfolder/t/tundra_fumarole.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tundra_fumarole.txt
rename to forge-gui/res/cardsfolder/t/tundra_fumarole.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tuskeri_firewalker.txt b/forge-gui/res/cardsfolder/t/tuskeri_firewalker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tuskeri_firewalker.txt
rename to forge-gui/res/cardsfolder/t/tuskeri_firewalker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tyrite_sanctum.txt b/forge-gui/res/cardsfolder/t/tyrite_sanctum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tyrite_sanctum.txt
rename to forge-gui/res/cardsfolder/t/tyrite_sanctum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tyvar_kell.txt b/forge-gui/res/cardsfolder/t/tyvar_kell.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tyvar_kell.txt
rename to forge-gui/res/cardsfolder/t/tyvar_kell.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/undersea_invader.txt b/forge-gui/res/cardsfolder/u/undersea_invader.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/undersea_invader.txt
rename to forge-gui/res/cardsfolder/u/undersea_invader.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/usher_of_the_fallen.txt b/forge-gui/res/cardsfolder/u/usher_of_the_fallen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/usher_of_the_fallen.txt
rename to forge-gui/res/cardsfolder/u/usher_of_the_fallen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/strategic_planning.txt b/forge-gui/res/cardsfolder/upcoming/strategic_planning.txt
deleted file mode 100644
index 994bef9b44e..00000000000
--- a/forge-gui/res/cardsfolder/upcoming/strategic_planning.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Name:Strategic Planning
-ManaCost:1 U
-Types:Sorcery
-A:SP$ Dig | Cost$ 1 U | DigNum$ 3 | DestinationZone2$ Graveyard | SpellDescription$ Look at the top three cards of your library. Put one of them into your hand and the rest into your graveyard.
-AI:RemoveDeck:Random
-Oracle:Look at the top three cards of your library. Put one of them into your hand and the rest into your graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/valki_god_of_lies_tibalt_cosmic_impostor.txt b/forge-gui/res/cardsfolder/v/valki_god_of_lies_tibalt_cosmic_impostor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/valki_god_of_lies_tibalt_cosmic_impostor.txt
rename to forge-gui/res/cardsfolder/v/valki_god_of_lies_tibalt_cosmic_impostor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/valkyrie_harbinger.txt b/forge-gui/res/cardsfolder/v/valkyrie_harbinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/valkyrie_harbinger.txt
rename to forge-gui/res/cardsfolder/v/valkyrie_harbinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/valkyries_sword.txt b/forge-gui/res/cardsfolder/v/valkyries_sword.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/valkyries_sword.txt
rename to forge-gui/res/cardsfolder/v/valkyries_sword.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/valor_of_the_worthy.txt b/forge-gui/res/cardsfolder/v/valor_of_the_worthy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/valor_of_the_worthy.txt
rename to forge-gui/res/cardsfolder/v/valor_of_the_worthy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/varragoth_bloodsky_sire.txt b/forge-gui/res/cardsfolder/v/varragoth_bloodsky_sire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/varragoth_bloodsky_sire.txt
rename to forge-gui/res/cardsfolder/v/varragoth_bloodsky_sire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vault_robber.txt b/forge-gui/res/cardsfolder/v/vault_robber.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vault_robber.txt
rename to forge-gui/res/cardsfolder/v/vault_robber.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vega_the_watcher.txt b/forge-gui/res/cardsfolder/v/vega_the_watcher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vega_the_watcher.txt
rename to forge-gui/res/cardsfolder/v/vega_the_watcher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vengeful_reaper.txt b/forge-gui/res/cardsfolder/v/vengeful_reaper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vengeful_reaper.txt
rename to forge-gui/res/cardsfolder/v/vengeful_reaper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/volatile_fjord.txt b/forge-gui/res/cardsfolder/v/volatile_fjord.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/volatile_fjord.txt
rename to forge-gui/res/cardsfolder/v/volatile_fjord.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vorinclex_monstrous_raider.txt b/forge-gui/res/cardsfolder/v/vorinclex_monstrous_raider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vorinclex_monstrous_raider.txt
rename to forge-gui/res/cardsfolder/v/vorinclex_monstrous_raider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/waking_the_trolls.txt b/forge-gui/res/cardsfolder/w/waking_the_trolls.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/waking_the_trolls.txt
rename to forge-gui/res/cardsfolder/w/waking_the_trolls.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/warchanter_skald.txt b/forge-gui/res/cardsfolder/w/warchanter_skald.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/warchanter_skald.txt
rename to forge-gui/res/cardsfolder/w/warchanter_skald.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/warhorn_blast.txt b/forge-gui/res/cardsfolder/w/warhorn_blast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/warhorn_blast.txt
rename to forge-gui/res/cardsfolder/w/warhorn_blast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/weathered_runestone.txt b/forge-gui/res/cardsfolder/w/weathered_runestone.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/weathered_runestone.txt
rename to forge-gui/res/cardsfolder/w/weathered_runestone.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/weigh_down.txt b/forge-gui/res/cardsfolder/w/weigh_down.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/weigh_down.txt
rename to forge-gui/res/cardsfolder/w/weigh_down.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wings_of_the_cosmos.txt b/forge-gui/res/cardsfolder/w/wings_of_the_cosmos.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wings_of_the_cosmos.txt
rename to forge-gui/res/cardsfolder/w/wings_of_the_cosmos.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/withercrown.txt b/forge-gui/res/cardsfolder/w/withercrown.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/withercrown.txt
rename to forge-gui/res/cardsfolder/w/withercrown.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wolverine_riders.txt b/forge-gui/res/cardsfolder/w/wolverine_riders.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wolverine_riders.txt
rename to forge-gui/res/cardsfolder/w/wolverine_riders.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/woodland_chasm.txt b/forge-gui/res/cardsfolder/w/woodland_chasm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/woodland_chasm.txt
rename to forge-gui/res/cardsfolder/w/woodland_chasm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/youthful_valkyrie.txt b/forge-gui/res/cardsfolder/y/youthful_valkyrie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/youthful_valkyrie.txt
rename to forge-gui/res/cardsfolder/y/youthful_valkyrie.txt