diff --git a/forge-gui/res/cardsfolder/upcoming/abraded_bluffs.txt b/forge-gui/res/cardsfolder/a/abraded_bluffs.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/abraded_bluffs.txt
rename to forge-gui/res/cardsfolder/a/abraded_bluffs.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/akul_the_unrepentant.txt b/forge-gui/res/cardsfolder/a/akul_the_unrepentant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/akul_the_unrepentant.txt
rename to forge-gui/res/cardsfolder/a/akul_the_unrepentant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aloe_alchemist.txt b/forge-gui/res/cardsfolder/a/aloe_alchemist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aloe_alchemist.txt
rename to forge-gui/res/cardsfolder/a/aloe_alchemist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ambush_gigapede.txt b/forge-gui/res/cardsfolder/a/ambush_gigapede.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ambush_gigapede.txt
rename to forge-gui/res/cardsfolder/a/ambush_gigapede.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ancient_cornucopia.txt b/forge-gui/res/cardsfolder/a/ancient_cornucopia.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ancient_cornucopia.txt
rename to forge-gui/res/cardsfolder/a/ancient_cornucopia.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/angel_of_indemnity.txt b/forge-gui/res/cardsfolder/a/angel_of_indemnity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/angel_of_indemnity.txt
rename to forge-gui/res/cardsfolder/a/angel_of_indemnity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/angelic_sell_sword.txt b/forge-gui/res/cardsfolder/a/angelic_sell_sword.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/angelic_sell_sword.txt
rename to forge-gui/res/cardsfolder/a/angelic_sell_sword.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ankle_biter.txt b/forge-gui/res/cardsfolder/a/ankle_biter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ankle_biter.txt
rename to forge-gui/res/cardsfolder/a/ankle_biter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/annie_flash_the_veteran.txt b/forge-gui/res/cardsfolder/a/annie_flash_the_veteran.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/annie_flash_the_veteran.txt
rename to forge-gui/res/cardsfolder/a/annie_flash_the_veteran.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/annie_joins_up.txt b/forge-gui/res/cardsfolder/a/annie_joins_up.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/annie_joins_up.txt
rename to forge-gui/res/cardsfolder/a/annie_joins_up.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/another_round.txt b/forge-gui/res/cardsfolder/a/another_round.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/another_round.txt
rename to forge-gui/res/cardsfolder/a/another_round.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arcane_heist.txt b/forge-gui/res/cardsfolder/a/arcane_heist.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/arcane_heist.txt
rename to forge-gui/res/cardsfolder/a/arcane_heist.txt
index b0ed61e041b..9983339ffb4 100644
--- a/forge-gui/res/cardsfolder/upcoming/arcane_heist.txt
+++ b/forge-gui/res/cardsfolder/a/arcane_heist.txt
@@ -1,6 +1,6 @@
-Name:Arcane Heist
-ManaCost:2 U U
-Types:Sorcery
-K:Cipher
-A:SP$ Play | TgtZone$ Graveyard | WithoutManaCost$ True | ValidTgts$ Instant.OppOwn,Sorcery.OppOwn | ValidSA$ Spell | TgtPrompt$ Choose target instant or sorcery card from an opponent's graveyard | Optional$ True | ReplaceGraveyard$ Exile | AILogic$ ReplaySpell
-Oracle:You may cast target instant or sorcery card from an opponent's graveyard without paying its mana cost. If that spell would be put into their graveyard, exile it instead.\nCipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
+Name:Arcane Heist
+ManaCost:2 U U
+Types:Sorcery
+K:Cipher
+A:SP$ Play | TgtZone$ Graveyard | WithoutManaCost$ True | ValidTgts$ Instant.OppOwn,Sorcery.OppOwn | ValidSA$ Spell | TgtPrompt$ Choose target instant or sorcery card from an opponent's graveyard | Optional$ True | ReplaceGraveyard$ Exile | AILogic$ ReplaySpell
+Oracle:You may cast target instant or sorcery card from an opponent's graveyard without paying its mana cost. If that spell would be put into their graveyard, exile it instead.\nCipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/upcoming/archmages_newt.txt b/forge-gui/res/cardsfolder/a/archmages_newt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/archmages_newt.txt
rename to forge-gui/res/cardsfolder/a/archmages_newt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arid_archway.txt b/forge-gui/res/cardsfolder/a/arid_archway.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arid_archway.txt
rename to forge-gui/res/cardsfolder/a/arid_archway.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/armored_armadillo.txt b/forge-gui/res/cardsfolder/a/armored_armadillo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/armored_armadillo.txt
rename to forge-gui/res/cardsfolder/a/armored_armadillo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/assimilation_aegis.txt b/forge-gui/res/cardsfolder/a/assimilation_aegis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/assimilation_aegis.txt
rename to forge-gui/res/cardsfolder/a/assimilation_aegis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/at_knifepoint.txt b/forge-gui/res/cardsfolder/a/at_knifepoint.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/at_knifepoint.txt
rename to forge-gui/res/cardsfolder/a/at_knifepoint.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aven_interrupter.txt b/forge-gui/res/cardsfolder/a/aven_interrupter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aven_interrupter.txt
rename to forge-gui/res/cardsfolder/a/aven_interrupter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/back_in_town.txt b/forge-gui/res/cardsfolder/b/back_in_town.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/back_in_town.txt
rename to forge-gui/res/cardsfolder/b/back_in_town.txt
index de15365f3a6..f740b5c5338 100644
--- a/forge-gui/res/cardsfolder/upcoming/back_in_town.txt
+++ b/forge-gui/res/cardsfolder/b/back_in_town.txt
@@ -1,7 +1,7 @@
-Name:Back in Town
-Types:Sorcery
-ManaCost:X 2 B
-A:SP$ ChangeZone | Cost$ X 2 B | TargetMin$ X | TargetMax$ X | ValidTgts$ Creature.YouOwn+Outlaw | TgtPrompt$ Select X target outlaw creatures in your graveyard | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Return X target outlaw creature cards from your graveyard to the battlefield.
-SVar:X:Count$xPaid
-DeckHints:Type$Assassin|Mercenary|Pirate|Rogue|Warlock
-Oracle:Return X target outlaw creature cards from your graveyard to the battlefield. (Assassins, Mercenaries, Pirates, Rogues, and Warlocks are outlaws.)
+Name:Back in Town
+Types:Sorcery
+ManaCost:X 2 B
+A:SP$ ChangeZone | Cost$ X 2 B | TargetMin$ X | TargetMax$ X | ValidTgts$ Creature.YouOwn+Outlaw | TgtPrompt$ Select X target outlaw creatures in your graveyard | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Return X target outlaw creature cards from your graveyard to the battlefield.
+SVar:X:Count$xPaid
+DeckHints:Type$Assassin|Mercenary|Pirate|Rogue|Warlock
+Oracle:Return X target outlaw creature cards from your graveyard to the battlefield. (Assassins, Mercenaries, Pirates, Rogues, and Warlocks are outlaws.)
diff --git a/forge-gui/res/cardsfolder/upcoming/badlands_revival.txt b/forge-gui/res/cardsfolder/b/badlands_revival.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/badlands_revival.txt
rename to forge-gui/res/cardsfolder/b/badlands_revival.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/baron_bertram_graywater.txt b/forge-gui/res/cardsfolder/b/baron_bertram_graywater.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/baron_bertram_graywater.txt
rename to forge-gui/res/cardsfolder/b/baron_bertram_graywater.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/beastbond_outcaster.txt b/forge-gui/res/cardsfolder/b/beastbond_outcaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/beastbond_outcaster.txt
rename to forge-gui/res/cardsfolder/b/beastbond_outcaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/betrayal_at_the_vault.txt b/forge-gui/res/cardsfolder/b/betrayal_at_the_vault.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/betrayal_at_the_vault.txt
rename to forge-gui/res/cardsfolder/b/betrayal_at_the_vault.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt b/forge-gui/res/cardsfolder/b/binding_negotiation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt
rename to forge-gui/res/cardsfolder/b/binding_negotiation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blacksnag_buzzard.txt b/forge-gui/res/cardsfolder/b/blacksnag_buzzard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blacksnag_buzzard.txt
rename to forge-gui/res/cardsfolder/b/blacksnag_buzzard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blood_hustler.txt b/forge-gui/res/cardsfolder/b/blood_hustler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blood_hustler.txt
rename to forge-gui/res/cardsfolder/b/blood_hustler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/boneyard_desecrator.txt b/forge-gui/res/cardsfolder/b/boneyard_desecrator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/boneyard_desecrator.txt
rename to forge-gui/res/cardsfolder/b/boneyard_desecrator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bonny_pall_clearcutter.txt b/forge-gui/res/cardsfolder/b/bonny_pall_clearcutter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bonny_pall_clearcutter.txt
rename to forge-gui/res/cardsfolder/b/bonny_pall_clearcutter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/boom_box.txt b/forge-gui/res/cardsfolder/b/boom_box.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/boom_box.txt
rename to forge-gui/res/cardsfolder/b/boom_box.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bounding_felidar.txt b/forge-gui/res/cardsfolder/b/bounding_felidar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bounding_felidar.txt
rename to forge-gui/res/cardsfolder/b/bounding_felidar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bounty_board.txt b/forge-gui/res/cardsfolder/b/bounty_board.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/bounty_board.txt
rename to forge-gui/res/cardsfolder/b/bounty_board.txt
index c2fb724daeb..ba464a7f9ba 100644
--- a/forge-gui/res/cardsfolder/upcoming/bounty_board.txt
+++ b/forge-gui/res/cardsfolder/b/bounty_board.txt
@@ -1,11 +1,11 @@
-Name:Bounty Board
-Types:Artifact
-ManaCost:3
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
-A:AB$ PutCounter | Cost$ 1 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ BOUNTY | CounterNum$ 1 | IsCurse$ True | SorcerySpeed$ True | SpellDescription$ Put a bounty counter on target creature.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.counters_GE1_BOUNTY | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature with a bounty counter on it dies, each of it's controller's opponents draws a card and gains 2 life.
-SVar:TrigGainLife:DB$ GainLife | Defined$ Player.OpponentOf TriggeredCardController | LifeAmount$ 2 | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | Defined$ Player.OpponentOf TriggeredCardController | NumCards$ 1
-DeckHints:Name$Bounty Hunter|Mathas, Fiend Seeker|Termination Facilitator|Chevill, Bane of Monsters
-DeckHints:Ability$LifeGain
-Oracle:{T}: Add one mana of any color.\n{1}, {T}: Put a bounty counter on target creature. Activate only as a sorcery.\nWhenever a creature with a bounty counter on it dies, each of its controller's opponents draws a card and gains 2 life.
+Name:Bounty Board
+Types:Artifact
+ManaCost:3
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
+A:AB$ PutCounter | Cost$ 1 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ BOUNTY | CounterNum$ 1 | IsCurse$ True | SorcerySpeed$ True | SpellDescription$ Put a bounty counter on target creature.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.counters_GE1_BOUNTY | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature with a bounty counter on it dies, each of it's controller's opponents draws a card and gains 2 life.
+SVar:TrigGainLife:DB$ GainLife | Defined$ Player.OpponentOf TriggeredCardController | LifeAmount$ 2 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | Defined$ Player.OpponentOf TriggeredCardController | NumCards$ 1
+DeckHints:Name$Bounty Hunter|Mathas, Fiend Seeker|Termination Facilitator|Chevill, Bane of Monsters
+DeckHints:Ability$LifeGain
+Oracle:{T}: Add one mana of any color.\n{1}, {T}: Put a bounty counter on target creature. Activate only as a sorcery.\nWhenever a creature with a bounty counter on it dies, each of its controller's opponents draws a card and gains 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/bovine_intervention.txt b/forge-gui/res/cardsfolder/b/bovine_intervention.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bovine_intervention.txt
rename to forge-gui/res/cardsfolder/b/bovine_intervention.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/breeches_the_blastmaker.txt b/forge-gui/res/cardsfolder/b/breeches_the_blastmaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/breeches_the_blastmaker.txt
rename to forge-gui/res/cardsfolder/b/breeches_the_blastmaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bridled_bighorn.txt b/forge-gui/res/cardsfolder/b/bridled_bighorn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bridled_bighorn.txt
rename to forge-gui/res/cardsfolder/b/bridled_bighorn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brimstone_roundup.txt b/forge-gui/res/cardsfolder/b/brimstone_roundup.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brimstone_roundup.txt
rename to forge-gui/res/cardsfolder/b/brimstone_roundup.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bristlebud_farmer.txt b/forge-gui/res/cardsfolder/b/bristlebud_farmer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bristlebud_farmer.txt
rename to forge-gui/res/cardsfolder/b/bristlebud_farmer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bristlepack_sentry.txt b/forge-gui/res/cardsfolder/b/bristlepack_sentry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bristlepack_sentry.txt
rename to forge-gui/res/cardsfolder/b/bristlepack_sentry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bristling_backwoods.txt b/forge-gui/res/cardsfolder/b/bristling_backwoods.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bristling_backwoods.txt
rename to forge-gui/res/cardsfolder/b/bristling_backwoods.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bristly_bill_spine_sower.txt b/forge-gui/res/cardsfolder/b/bristly_bill_spine_sower.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bristly_bill_spine_sower.txt
rename to forge-gui/res/cardsfolder/b/bristly_bill_spine_sower.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bruse_tarl_roving_rancher.txt b/forge-gui/res/cardsfolder/b/bruse_tarl_roving_rancher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bruse_tarl_roving_rancher.txt
rename to forge-gui/res/cardsfolder/b/bruse_tarl_roving_rancher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bucolic_ranch.txt b/forge-gui/res/cardsfolder/b/bucolic_ranch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bucolic_ranch.txt
rename to forge-gui/res/cardsfolder/b/bucolic_ranch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cackling_observer.txt b/forge-gui/res/cardsfolder/c/cackling_observer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cackling_observer.txt
rename to forge-gui/res/cardsfolder/c/cackling_observer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cactarantula.txt b/forge-gui/res/cardsfolder/c/cactarantula.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cactarantula.txt
rename to forge-gui/res/cardsfolder/c/cactarantula.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cactus_preserve.txt b/forge-gui/res/cardsfolder/c/cactus_preserve.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/cactus_preserve.txt
rename to forge-gui/res/cardsfolder/c/cactus_preserve.txt
index 934d29ad98c..ef0df82dbe0 100644
--- a/forge-gui/res/cardsfolder/upcoming/cactus_preserve.txt
+++ b/forge-gui/res/cardsfolder/c/cactus_preserve.txt
@@ -1,9 +1,9 @@
-Name:Cactus Preserve
-Types:Land Desert
-ManaCost:no cost
-K:CARDNAME enters the battlefield tapped.
-A:AB$ ManaReflected | Cost$ T | ColorOrType$ Type | Valid$ Land.YouCtrl | ReflectProperty$ Produce | SpellDescription$ Add one mana of any type that a land you control could produce.
-A:AB$ Animate | Cost$ 3 | Defined$ Self | Power$ X | Toughness$ X | Colors$ Green | OverwriteColors$ True | Types$ Creature,Plant | Keywords$ Reach | SpellDescription$ Until end of turn, CARDNAME becomes an X/X green Plant creature with reach, where X is the greatest mana value among your commanders. It's still a land.
-SVar:X:Count$ValidAll Card.IsCommander+YouOwn$GreatestCMC
-AI:RemoveDeck:NonCommander
-Oracle:Cactus Preserve enters the battlefield tapped.\n{T}: Add one mana of any type that a land you control could produce.\n{3}: Until end of turn, Cactus Preserve becomes an X/X green Plant creature with reach, where X is the greatest mana value among your commanders. It's still a land.
+Name:Cactus Preserve
+Types:Land Desert
+ManaCost:no cost
+K:CARDNAME enters the battlefield tapped.
+A:AB$ ManaReflected | Cost$ T | ColorOrType$ Type | Valid$ Land.YouCtrl | ReflectProperty$ Produce | SpellDescription$ Add one mana of any type that a land you control could produce.
+A:AB$ Animate | Cost$ 3 | Defined$ Self | Power$ X | Toughness$ X | Colors$ Green | OverwriteColors$ True | Types$ Creature,Plant | Keywords$ Reach | SpellDescription$ Until end of turn, CARDNAME becomes an X/X green Plant creature with reach, where X is the greatest mana value among your commanders. It's still a land.
+SVar:X:Count$ValidAll Card.IsCommander+YouOwn$GreatestCMC
+AI:RemoveDeck:NonCommander
+Oracle:Cactus Preserve enters the battlefield tapped.\n{T}: Add one mana of any type that a land you control could produce.\n{3}: Until end of turn, Cactus Preserve becomes an X/X green Plant creature with reach, where X is the greatest mana value among your commanders. It's still a land.
diff --git a/forge-gui/res/cardsfolder/upcoming/cactusfolk_sureshot.txt b/forge-gui/res/cardsfolder/c/cactusfolk_sureshot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cactusfolk_sureshot.txt
rename to forge-gui/res/cardsfolder/c/cactusfolk_sureshot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/calamity_galloping_inferno.txt b/forge-gui/res/cardsfolder/c/calamity_galloping_inferno.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/calamity_galloping_inferno.txt
rename to forge-gui/res/cardsfolder/c/calamity_galloping_inferno.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/canyon_crab.txt b/forge-gui/res/cardsfolder/c/canyon_crab.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/canyon_crab.txt
rename to forge-gui/res/cardsfolder/c/canyon_crab.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_lost_witness.txt b/forge-gui/res/cardsfolder/c/case_of_the_lost_witness.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_of_the_lost_witness.txt
rename to forge-gui/res/cardsfolder/c/case_of_the_lost_witness.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_market_melee.txt b/forge-gui/res/cardsfolder/c/case_of_the_market_melee.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_of_the_market_melee.txt
rename to forge-gui/res/cardsfolder/c/case_of_the_market_melee.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cataclysmic_prospecting.txt b/forge-gui/res/cardsfolder/c/cataclysmic_prospecting.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cataclysmic_prospecting.txt
rename to forge-gui/res/cardsfolder/c/cataclysmic_prospecting.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/caught_in_a_parallel_universe.txt b/forge-gui/res/cardsfolder/c/caught_in_a_parallel_universe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/caught_in_a_parallel_universe.txt
rename to forge-gui/res/cardsfolder/c/caught_in_a_parallel_universe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/caught_in_the_crossfire.txt b/forge-gui/res/cardsfolder/c/caught_in_the_crossfire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/caught_in_the_crossfire.txt
rename to forge-gui/res/cardsfolder/c/caught_in_the_crossfire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/caustic_bronco.txt b/forge-gui/res/cardsfolder/c/caustic_bronco.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/caustic_bronco.txt
rename to forge-gui/res/cardsfolder/c/caustic_bronco.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/charred_graverobber.txt b/forge-gui/res/cardsfolder/c/charred_graverobber.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/charred_graverobber.txt
rename to forge-gui/res/cardsfolder/c/charred_graverobber.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/claim_jumper.txt b/forge-gui/res/cardsfolder/c/claim_jumper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/claim_jumper.txt
rename to forge-gui/res/cardsfolder/c/claim_jumper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/collectors_cage.txt b/forge-gui/res/cardsfolder/c/collectors_cage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/collectors_cage.txt
rename to forge-gui/res/cardsfolder/c/collectors_cage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/colossal_rattlewurm.txt b/forge-gui/res/cardsfolder/c/colossal_rattlewurm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/colossal_rattlewurm.txt
rename to forge-gui/res/cardsfolder/c/colossal_rattlewurm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/conduit_pylons.txt b/forge-gui/res/cardsfolder/c/conduit_pylons.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/conduit_pylons.txt
rename to forge-gui/res/cardsfolder/c/conduit_pylons.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/congregation_gryff.txt b/forge-gui/res/cardsfolder/c/congregation_gryff.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/congregation_gryff.txt
rename to forge-gui/res/cardsfolder/c/congregation_gryff.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/construction_arsonist.txt b/forge-gui/res/cardsfolder/c/construction_arsonist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/construction_arsonist.txt
rename to forge-gui/res/cardsfolder/c/construction_arsonist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/consuming_ashes.txt b/forge-gui/res/cardsfolder/c/consuming_ashes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/consuming_ashes.txt
rename to forge-gui/res/cardsfolder/c/consuming_ashes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crackling_spellslinger.txt b/forge-gui/res/cardsfolder/c/crackling_spellslinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crackling_spellslinger.txt
rename to forge-gui/res/cardsfolder/c/crackling_spellslinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/creosote_heath.txt b/forge-gui/res/cardsfolder/c/creosote_heath.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/creosote_heath.txt
rename to forge-gui/res/cardsfolder/c/creosote_heath.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cunning_coyote.txt b/forge-gui/res/cardsfolder/c/cunning_coyote.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cunning_coyote.txt
rename to forge-gui/res/cardsfolder/c/cunning_coyote.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dance_of_the_tumbleweeds.txt b/forge-gui/res/cardsfolder/d/dance_of_the_tumbleweeds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dance_of_the_tumbleweeds.txt
rename to forge-gui/res/cardsfolder/d/dance_of_the_tumbleweeds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/daring_thunder_thief.txt b/forge-gui/res/cardsfolder/d/daring_thunder_thief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/daring_thunder_thief.txt
rename to forge-gui/res/cardsfolder/d/daring_thunder_thief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dead_before_sunrise.txt b/forge-gui/res/cardsfolder/d/dead_before_sunrise.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dead_before_sunrise.txt
rename to forge-gui/res/cardsfolder/d/dead_before_sunrise.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deadeye_duelist.txt b/forge-gui/res/cardsfolder/d/deadeye_duelist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deadeye_duelist.txt
rename to forge-gui/res/cardsfolder/d/deadeye_duelist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/demonic_ruckus.txt b/forge-gui/res/cardsfolder/d/demonic_ruckus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/demonic_ruckus.txt
rename to forge-gui/res/cardsfolder/d/demonic_ruckus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deserts_due.txt b/forge-gui/res/cardsfolder/d/deserts_due.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deserts_due.txt
rename to forge-gui/res/cardsfolder/d/deserts_due.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/desperate_bloodseeker.txt b/forge-gui/res/cardsfolder/d/desperate_bloodseeker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/desperate_bloodseeker.txt
rename to forge-gui/res/cardsfolder/d/desperate_bloodseeker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dimir_strandcatcher.txt b/forge-gui/res/cardsfolder/d/dimir_strandcatcher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dimir_strandcatcher.txt
rename to forge-gui/res/cardsfolder/d/dimir_strandcatcher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/discerning_peddler.txt b/forge-gui/res/cardsfolder/d/discerning_peddler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/discerning_peddler.txt
rename to forge-gui/res/cardsfolder/d/discerning_peddler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/discreet_retreat.txt b/forge-gui/res/cardsfolder/d/discreet_retreat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/discreet_retreat.txt
rename to forge-gui/res/cardsfolder/d/discreet_retreat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/djinn_of_fools_fall.txt b/forge-gui/res/cardsfolder/d/djinn_of_fools_fall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/djinn_of_fools_fall.txt
rename to forge-gui/res/cardsfolder/d/djinn_of_fools_fall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/doc_aurlock_grizzled_genius.txt b/forge-gui/res/cardsfolder/d/doc_aurlock_grizzled_genius.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/doc_aurlock_grizzled_genius.txt
rename to forge-gui/res/cardsfolder/d/doc_aurlock_grizzled_genius.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/double_down.txt b/forge-gui/res/cardsfolder/d/double_down.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/double_down.txt
rename to forge-gui/res/cardsfolder/d/double_down.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dream_thiefs_bandana.txt b/forge-gui/res/cardsfolder/d/dream_thiefs_bandana.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dream_thiefs_bandana.txt
rename to forge-gui/res/cardsfolder/d/dream_thiefs_bandana.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drover_grizzly.txt b/forge-gui/res/cardsfolder/d/drover_grizzly.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drover_grizzly.txt
rename to forge-gui/res/cardsfolder/d/drover_grizzly.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/duelist_of_the_mind.txt b/forge-gui/res/cardsfolder/d/duelist_of_the_mind.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/duelist_of_the_mind.txt
rename to forge-gui/res/cardsfolder/d/duelist_of_the_mind.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dune_chanter.txt b/forge-gui/res/cardsfolder/d/dune_chanter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dune_chanter.txt
rename to forge-gui/res/cardsfolder/d/dune_chanter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/duskana_the_rage_mother.txt b/forge-gui/res/cardsfolder/d/duskana_the_rage_mother.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/duskana_the_rage_mother.txt
rename to forge-gui/res/cardsfolder/d/duskana_the_rage_mother.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dust_animus.txt b/forge-gui/res/cardsfolder/d/dust_animus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dust_animus.txt
rename to forge-gui/res/cardsfolder/d/dust_animus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elemental_eruption.txt b/forge-gui/res/cardsfolder/e/elemental_eruption.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elemental_eruption.txt
rename to forge-gui/res/cardsfolder/e/elemental_eruption.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/embrace_the_unknown.txt b/forge-gui/res/cardsfolder/e/embrace_the_unknown.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/embrace_the_unknown.txt
rename to forge-gui/res/cardsfolder/e/embrace_the_unknown.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/emergent_haunting.txt b/forge-gui/res/cardsfolder/e/emergent_haunting.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/emergent_haunting.txt
rename to forge-gui/res/cardsfolder/e/emergent_haunting.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/emmara_voice_of_the_conclave.txt b/forge-gui/res/cardsfolder/e/emmara_voice_of_the_conclave.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/emmara_voice_of_the_conclave.txt
rename to forge-gui/res/cardsfolder/e/emmara_voice_of_the_conclave.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/emporium_thopterist.txt b/forge-gui/res/cardsfolder/e/emporium_thopterist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/emporium_thopterist.txt
rename to forge-gui/res/cardsfolder/e/emporium_thopterist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eriette_the_beguiler.txt b/forge-gui/res/cardsfolder/e/eriette_the_beguiler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eriette_the_beguiler.txt
rename to forge-gui/res/cardsfolder/e/eriette_the_beguiler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eriettes_lullaby.txt b/forge-gui/res/cardsfolder/e/eriettes_lullaby.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eriettes_lullaby.txt
rename to forge-gui/res/cardsfolder/e/eriettes_lullaby.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eris_roar_of_the_storm.txt b/forge-gui/res/cardsfolder/e/eris_roar_of_the_storm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eris_roar_of_the_storm.txt
rename to forge-gui/res/cardsfolder/e/eris_roar_of_the_storm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eroded_canyon.txt b/forge-gui/res/cardsfolder/e/eroded_canyon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eroded_canyon.txt
rename to forge-gui/res/cardsfolder/e/eroded_canyon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ertha_jo_frontier_mentor.txt b/forge-gui/res/cardsfolder/e/ertha_jo_frontier_mentor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ertha_jo_frontier_mentor.txt
rename to forge-gui/res/cardsfolder/e/ertha_jo_frontier_mentor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/esoteric_duplicator.txt b/forge-gui/res/cardsfolder/e/esoteric_duplicator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/esoteric_duplicator.txt
rename to forge-gui/res/cardsfolder/e/esoteric_duplicator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/excogitator_sphinx.txt b/forge-gui/res/cardsfolder/e/excogitator_sphinx.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/excogitator_sphinx.txt
rename to forge-gui/res/cardsfolder/e/excogitator_sphinx.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/experiment_twelve.txt b/forge-gui/res/cardsfolder/e/experiment_twelve.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/experiment_twelve.txt
rename to forge-gui/res/cardsfolder/e/experiment_twelve.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/explosive_derailment.txt b/forge-gui/res/cardsfolder/e/explosive_derailment.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/explosive_derailment.txt
rename to forge-gui/res/cardsfolder/e/explosive_derailment.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/failed_fording.txt b/forge-gui/res/cardsfolder/f/failed_fording.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/failed_fording.txt
rename to forge-gui/res/cardsfolder/f/failed_fording.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fblthp_lost_on_the_range.txt b/forge-gui/res/cardsfolder/f/fblthp_lost_on_the_range.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fblthp_lost_on_the_range.txt
rename to forge-gui/res/cardsfolder/f/fblthp_lost_on_the_range.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/felix_five_boots.txt b/forge-gui/res/cardsfolder/f/felix_five_boots.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/felix_five_boots.txt
rename to forge-gui/res/cardsfolder/f/felix_five_boots.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ferocification.txt b/forge-gui/res/cardsfolder/f/ferocification.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ferocification.txt
rename to forge-gui/res/cardsfolder/f/ferocification.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/festering_gulch.txt b/forge-gui/res/cardsfolder/f/festering_gulch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/festering_gulch.txt
rename to forge-gui/res/cardsfolder/f/festering_gulch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/final_showdown.txt b/forge-gui/res/cardsfolder/f/final_showdown.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/final_showdown.txt
rename to forge-gui/res/cardsfolder/f/final_showdown.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fleeting_reflection.txt b/forge-gui/res/cardsfolder/f/fleeting_reflection.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fleeting_reflection.txt
rename to forge-gui/res/cardsfolder/f/fleeting_reflection.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fomori_vault.txt b/forge-gui/res/cardsfolder/f/fomori_vault.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fomori_vault.txt
rename to forge-gui/res/cardsfolder/f/fomori_vault.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/forlorn_flats.txt b/forge-gui/res/cardsfolder/f/forlorn_flats.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/forlorn_flats.txt
rename to forge-gui/res/cardsfolder/f/forlorn_flats.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/form_a_posse.txt b/forge-gui/res/cardsfolder/f/form_a_posse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/form_a_posse.txt
rename to forge-gui/res/cardsfolder/f/form_a_posse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/forsaken_miner.txt b/forge-gui/res/cardsfolder/f/forsaken_miner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/forsaken_miner.txt
rename to forge-gui/res/cardsfolder/f/forsaken_miner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fortune_loyal_steed.txt b/forge-gui/res/cardsfolder/f/fortune_loyal_steed.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fortune_loyal_steed.txt
rename to forge-gui/res/cardsfolder/f/fortune_loyal_steed.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/freestrider_commando.txt b/forge-gui/res/cardsfolder/f/freestrider_commando.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/freestrider_commando.txt
rename to forge-gui/res/cardsfolder/f/freestrider_commando.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/freestrider_lookout.txt b/forge-gui/res/cardsfolder/f/freestrider_lookout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/freestrider_lookout.txt
rename to forge-gui/res/cardsfolder/f/freestrider_lookout.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frontier_seeker.txt b/forge-gui/res/cardsfolder/f/frontier_seeker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frontier_seeker.txt
rename to forge-gui/res/cardsfolder/f/frontier_seeker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/full_steam_ahead.txt b/forge-gui/res/cardsfolder/f/full_steam_ahead.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/full_steam_ahead.txt
rename to forge-gui/res/cardsfolder/f/full_steam_ahead.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/furgul_quag_nurturer.txt b/forge-gui/res/cardsfolder/f/furgul_quag_nurturer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/furgul_quag_nurturer.txt
rename to forge-gui/res/cardsfolder/f/furgul_quag_nurturer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/furious_spinesplitter.txt b/forge-gui/res/cardsfolder/f/furious_spinesplitter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/furious_spinesplitter.txt
rename to forge-gui/res/cardsfolder/f/furious_spinesplitter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/generous_plunderer.txt b/forge-gui/res/cardsfolder/g/generous_plunderer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/generous_plunderer.txt
rename to forge-gui/res/cardsfolder/g/generous_plunderer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/geralf_the_fleshwright.txt b/forge-gui/res/cardsfolder/g/geralf_the_fleshwright.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/geralf_the_fleshwright.txt
rename to forge-gui/res/cardsfolder/g/geralf_the_fleshwright.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/getaway_glamer.txt b/forge-gui/res/cardsfolder/g/getaway_glamer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/getaway_glamer.txt
rename to forge-gui/res/cardsfolder/g/getaway_glamer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/geyser_drake.txt b/forge-gui/res/cardsfolder/g/geyser_drake.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/geyser_drake.txt
rename to forge-gui/res/cardsfolder/g/geyser_drake.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ghired_mirror_of_the_wilds.txt b/forge-gui/res/cardsfolder/g/ghired_mirror_of_the_wilds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ghired_mirror_of_the_wilds.txt
rename to forge-gui/res/cardsfolder/g/ghired_mirror_of_the_wilds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/giant_beaver.txt b/forge-gui/res/cardsfolder/g/giant_beaver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/giant_beaver.txt
rename to forge-gui/res/cardsfolder/g/giant_beaver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gila_courser.txt b/forge-gui/res/cardsfolder/g/gila_courser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gila_courser.txt
rename to forge-gui/res/cardsfolder/g/gila_courser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gisa_the_hellraiser.txt b/forge-gui/res/cardsfolder/g/gisa_the_hellraiser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gisa_the_hellraiser.txt
rename to forge-gui/res/cardsfolder/g/gisa_the_hellraiser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glowing_one.txt b/forge-gui/res/cardsfolder/g/glowing_one.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glowing_one.txt
rename to forge-gui/res/cardsfolder/g/glowing_one.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gold_pan.txt b/forge-gui/res/cardsfolder/g/gold_pan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gold_pan.txt
rename to forge-gui/res/cardsfolder/g/gold_pan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gold_rush.txt b/forge-gui/res/cardsfolder/g/gold_rush.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gold_rush.txt
rename to forge-gui/res/cardsfolder/g/gold_rush.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goldvein_hydra.txt b/forge-gui/res/cardsfolder/g/goldvein_hydra.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goldvein_hydra.txt
rename to forge-gui/res/cardsfolder/g/goldvein_hydra.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gonti_canny_acquisitor.txt b/forge-gui/res/cardsfolder/g/gonti_canny_acquisitor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gonti_canny_acquisitor.txt
rename to forge-gui/res/cardsfolder/g/gonti_canny_acquisitor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/graywaters_fixer.txt b/forge-gui/res/cardsfolder/g/graywaters_fixer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/graywaters_fixer.txt
rename to forge-gui/res/cardsfolder/g/graywaters_fixer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/great_train_heist.txt b/forge-gui/res/cardsfolder/g/great_train_heist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/great_train_heist.txt
rename to forge-gui/res/cardsfolder/g/great_train_heist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/greeds_gambit.txt b/forge-gui/res/cardsfolder/g/greeds_gambit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/greeds_gambit.txt
rename to forge-gui/res/cardsfolder/g/greeds_gambit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hardbristle_bandit.txt b/forge-gui/res/cardsfolder/h/hardbristle_bandit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hardbristle_bandit.txt
rename to forge-gui/res/cardsfolder/h/hardbristle_bandit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/harrier_strix.txt b/forge-gui/res/cardsfolder/h/harrier_strix.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/harrier_strix.txt
rename to forge-gui/res/cardsfolder/h/harrier_strix.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/harvester_of_misery.txt b/forge-gui/res/cardsfolder/h/harvester_of_misery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/harvester_of_misery.txt
rename to forge-gui/res/cardsfolder/h/harvester_of_misery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/headliner_scarlett.txt b/forge-gui/res/cardsfolder/h/headliner_scarlett.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/headliner_scarlett.txt
rename to forge-gui/res/cardsfolder/h/headliner_scarlett.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/heartless_conscription.txt b/forge-gui/res/cardsfolder/h/heartless_conscription.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/heartless_conscription.txt
rename to forge-gui/res/cardsfolder/h/heartless_conscription.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hell_to_pay.txt b/forge-gui/res/cardsfolder/h/hell_to_pay.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hell_to_pay.txt
rename to forge-gui/res/cardsfolder/h/hell_to_pay.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hellspur_brute.txt b/forge-gui/res/cardsfolder/h/hellspur_brute.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hellspur_brute.txt
rename to forge-gui/res/cardsfolder/h/hellspur_brute.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hellspur_posse_boss.txt b/forge-gui/res/cardsfolder/h/hellspur_posse_boss.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hellspur_posse_boss.txt
rename to forge-gui/res/cardsfolder/h/hellspur_posse_boss.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/high_noon.txt b/forge-gui/res/cardsfolder/h/high_noon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/high_noon.txt
rename to forge-gui/res/cardsfolder/h/high_noon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/highway_robbery.txt b/forge-gui/res/cardsfolder/h/highway_robbery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/highway_robbery.txt
rename to forge-gui/res/cardsfolder/h/highway_robbery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hollow_marauder.txt b/forge-gui/res/cardsfolder/h/hollow_marauder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hollow_marauder.txt
rename to forge-gui/res/cardsfolder/h/hollow_marauder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/holy_cow.txt b/forge-gui/res/cardsfolder/h/holy_cow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/holy_cow.txt
rename to forge-gui/res/cardsfolder/h/holy_cow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/honest_rutstein.txt b/forge-gui/res/cardsfolder/h/honest_rutstein.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/honest_rutstein.txt
rename to forge-gui/res/cardsfolder/h/honest_rutstein.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hostile_investigator.txt b/forge-gui/res/cardsfolder/h/hostile_investigator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hostile_investigator.txt
rename to forge-gui/res/cardsfolder/h/hostile_investigator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/human_time_lord_meta_crisis.txt b/forge-gui/res/cardsfolder/h/human_time_lord_meta_crisis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/human_time_lord_meta_crisis.txt
rename to forge-gui/res/cardsfolder/h/human_time_lord_meta_crisis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/infesting_radroach.txt b/forge-gui/res/cardsfolder/i/infesting_radroach.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/infesting_radroach.txt
rename to forge-gui/res/cardsfolder/i/infesting_radroach.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/insatiable_avarice.txt b/forge-gui/res/cardsfolder/i/insatiable_avarice.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/insatiable_avarice.txt
rename to forge-gui/res/cardsfolder/i/insatiable_avarice.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/intimidation_campaign.txt b/forge-gui/res/cardsfolder/i/intimidation_campaign.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/intimidation_campaign.txt
rename to forge-gui/res/cardsfolder/i/intimidation_campaign.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/intrepid_stablemaster.txt b/forge-gui/res/cardsfolder/i/intrepid_stablemaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/intrepid_stablemaster.txt
rename to forge-gui/res/cardsfolder/i/intrepid_stablemaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/inventive_wingsmith.txt b/forge-gui/res/cardsfolder/i/inventive_wingsmith.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/inventive_wingsmith.txt
rename to forge-gui/res/cardsfolder/i/inventive_wingsmith.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/irascible_wolverine.txt b/forge-gui/res/cardsfolder/i/irascible_wolverine.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/irascible_wolverine.txt
rename to forge-gui/res/cardsfolder/i/irascible_wolverine.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/iron_fist_pulverizer.txt b/forge-gui/res/cardsfolder/i/iron_fist_pulverizer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/iron_fist_pulverizer.txt
rename to forge-gui/res/cardsfolder/i/iron_fist_pulverizer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/izzet_polarizer.txt b/forge-gui/res/cardsfolder/i/izzet_polarizer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/izzet_polarizer.txt
rename to forge-gui/res/cardsfolder/i/izzet_polarizer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jace_reawakened.txt b/forge-gui/res/cardsfolder/j/jace_reawakened.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jace_reawakened.txt
rename to forge-gui/res/cardsfolder/j/jace_reawakened.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jagged_barrens.txt b/forge-gui/res/cardsfolder/j/jagged_barrens.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jagged_barrens.txt
rename to forge-gui/res/cardsfolder/j/jagged_barrens.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jailbreak_scheme.txt b/forge-gui/res/cardsfolder/j/jailbreak_scheme.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jailbreak_scheme.txt
rename to forge-gui/res/cardsfolder/j/jailbreak_scheme.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jason_bright_glowing_prophet.txt b/forge-gui/res/cardsfolder/j/jason_bright_glowing_prophet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jason_bright_glowing_prophet.txt
rename to forge-gui/res/cardsfolder/j/jason_bright_glowing_prophet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jem_lightfoote_sky_explorer.txt b/forge-gui/res/cardsfolder/j/jem_lightfoote_sky_explorer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jem_lightfoote_sky_explorer.txt
rename to forge-gui/res/cardsfolder/j/jem_lightfoote_sky_explorer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jolene_plundering_pugilist.txt b/forge-gui/res/cardsfolder/j/jolene_plundering_pugilist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jolene_plundering_pugilist.txt
rename to forge-gui/res/cardsfolder/j/jolene_plundering_pugilist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/juggle_the_performance.txt b/forge-gui/res/cardsfolder/j/juggle_the_performance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/juggle_the_performance.txt
rename to forge-gui/res/cardsfolder/j/juggle_the_performance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/junk_jet.txt b/forge-gui/res/cardsfolder/j/junk_jet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/junk_jet.txt
rename to forge-gui/res/cardsfolder/j/junk_jet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kaervek_the_punisher.txt b/forge-gui/res/cardsfolder/k/kaervek_the_punisher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kaervek_the_punisher.txt
rename to forge-gui/res/cardsfolder/k/kaervek_the_punisher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kambal_profiteering_mayor.txt b/forge-gui/res/cardsfolder/k/kambal_profiteering_mayor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kambal_profiteering_mayor.txt
rename to forge-gui/res/cardsfolder/k/kambal_profiteering_mayor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kellan_joins_up.txt b/forge-gui/res/cardsfolder/k/kellan_joins_up.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kellan_joins_up.txt
rename to forge-gui/res/cardsfolder/k/kellan_joins_up.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kellan_the_kid.txt b/forge-gui/res/cardsfolder/k/kellan_the_kid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kellan_the_kid.txt
rename to forge-gui/res/cardsfolder/k/kellan_the_kid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kirri_talented_sprout.txt b/forge-gui/res/cardsfolder/k/kirri_talented_sprout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kirri_talented_sprout.txt
rename to forge-gui/res/cardsfolder/k/kirri_talented_sprout.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kraum_violent_cacophony.txt b/forge-gui/res/cardsfolder/k/kraum_violent_cacophony.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kraum_violent_cacophony.txt
rename to forge-gui/res/cardsfolder/k/kraum_violent_cacophony.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lassoed_by_the_law.txt b/forge-gui/res/cardsfolder/l/lassoed_by_the_law.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lassoed_by_the_law.txt
rename to forge-gui/res/cardsfolder/l/lassoed_by_the_law.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/laughing_jasper_flint.txt b/forge-gui/res/cardsfolder/l/laughing_jasper_flint.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/laughing_jasper_flint.txt
rename to forge-gui/res/cardsfolder/l/laughing_jasper_flint.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lavaspur_boots.txt b/forge-gui/res/cardsfolder/l/lavaspur_boots.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lavaspur_boots.txt
rename to forge-gui/res/cardsfolder/l/lavaspur_boots.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lazav_familiar_stranger.txt b/forge-gui/res/cardsfolder/l/lazav_familiar_stranger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lazav_familiar_stranger.txt
rename to forge-gui/res/cardsfolder/l/lazav_familiar_stranger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/legion_extruder.txt b/forge-gui/res/cardsfolder/l/legion_extruder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/legion_extruder.txt
rename to forge-gui/res/cardsfolder/l/legion_extruder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/leyline_dowser.txt b/forge-gui/res/cardsfolder/l/leyline_dowser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/leyline_dowser.txt
rename to forge-gui/res/cardsfolder/l/leyline_dowser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lilah_undefeated_slickshot.txt b/forge-gui/res/cardsfolder/l/lilah_undefeated_slickshot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lilah_undefeated_slickshot.txt
rename to forge-gui/res/cardsfolder/l/lilah_undefeated_slickshot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lively_dirge.txt b/forge-gui/res/cardsfolder/l/lively_dirge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lively_dirge.txt
rename to forge-gui/res/cardsfolder/l/lively_dirge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/loan_shark.txt b/forge-gui/res/cardsfolder/l/loan_shark.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/loan_shark.txt
rename to forge-gui/res/cardsfolder/l/loan_shark.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lock_and_load.txt b/forge-gui/res/cardsfolder/l/lock_and_load.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lock_and_load.txt
rename to forge-gui/res/cardsfolder/l/lock_and_load.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lonely_arroyo.txt b/forge-gui/res/cardsfolder/l/lonely_arroyo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lonely_arroyo.txt
rename to forge-gui/res/cardsfolder/l/lonely_arroyo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/longhorn_sharpshooter.txt b/forge-gui/res/cardsfolder/l/longhorn_sharpshooter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/longhorn_sharpshooter.txt
rename to forge-gui/res/cardsfolder/l/longhorn_sharpshooter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/loot_the_key_to_everything.txt b/forge-gui/res/cardsfolder/l/loot_the_key_to_everything.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/loot_the_key_to_everything.txt
rename to forge-gui/res/cardsfolder/l/loot_the_key_to_everything.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lost_jitte.txt b/forge-gui/res/cardsfolder/l/lost_jitte.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lost_jitte.txt
rename to forge-gui/res/cardsfolder/l/lost_jitte.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lotus_ring.txt b/forge-gui/res/cardsfolder/l/lotus_ring.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lotus_ring.txt
rename to forge-gui/res/cardsfolder/l/lotus_ring.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lurking_spinecrawler.txt b/forge-gui/res/cardsfolder/l/lurking_spinecrawler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lurking_spinecrawler.txt
rename to forge-gui/res/cardsfolder/l/lurking_spinecrawler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lush_oasis.txt b/forge-gui/res/cardsfolder/l/lush_oasis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lush_oasis.txt
rename to forge-gui/res/cardsfolder/l/lush_oasis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/luxurious_locomotive.txt b/forge-gui/res/cardsfolder/l/luxurious_locomotive.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/luxurious_locomotive.txt
rename to forge-gui/res/cardsfolder/l/luxurious_locomotive.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/magda_the_hoardmaster.txt b/forge-gui/res/cardsfolder/m/magda_the_hoardmaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/magda_the_hoardmaster.txt
rename to forge-gui/res/cardsfolder/m/magda_the_hoardmaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/magebane_lizard.txt b/forge-gui/res/cardsfolder/m/magebane_lizard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/magebane_lizard.txt
rename to forge-gui/res/cardsfolder/m/magebane_lizard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/make_your_own_luck.txt b/forge-gui/res/cardsfolder/m/make_your_own_luck.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/make_your_own_luck.txt
rename to forge-gui/res/cardsfolder/m/make_your_own_luck.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/malcolm_the_eyes.txt b/forge-gui/res/cardsfolder/m/malcolm_the_eyes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/malcolm_the_eyes.txt
rename to forge-gui/res/cardsfolder/m/malcolm_the_eyes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/map_the_frontier.txt b/forge-gui/res/cardsfolder/m/map_the_frontier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/map_the_frontier.txt
rename to forge-gui/res/cardsfolder/m/map_the_frontier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mapping_the_maze.txt b/forge-gui/res/cardsfolder/m/mapping_the_maze.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mapping_the_maze.txt
rename to forge-gui/res/cardsfolder/m/mapping_the_maze.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/marauding_sphinx.txt b/forge-gui/res/cardsfolder/m/marauding_sphinx.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/marauding_sphinx.txt
rename to forge-gui/res/cardsfolder/m/marauding_sphinx.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/marchesa_dealer_of_death.txt b/forge-gui/res/cardsfolder/m/marchesa_dealer_of_death.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/marchesa_dealer_of_death.txt
rename to forge-gui/res/cardsfolder/m/marchesa_dealer_of_death.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/memory_vampire.txt b/forge-gui/res/cardsfolder/m/memory_vampire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/memory_vampire.txt
rename to forge-gui/res/cardsfolder/m/memory_vampire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/memory_vessel.txt b/forge-gui/res/cardsfolder/m/memory_vessel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/memory_vessel.txt
rename to forge-gui/res/cardsfolder/m/memory_vessel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/metamorphic_blast.txt b/forge-gui/res/cardsfolder/m/metamorphic_blast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/metamorphic_blast.txt
rename to forge-gui/res/cardsfolder/m/metamorphic_blast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mine_raider.txt b/forge-gui/res/cardsfolder/m/mine_raider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mine_raider.txt
rename to forge-gui/res/cardsfolder/m/mine_raider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mirage_mesa.txt b/forge-gui/res/cardsfolder/m/mirage_mesa.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mirage_mesa.txt
rename to forge-gui/res/cardsfolder/m/mirage_mesa.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mirelurk_queen.txt b/forge-gui/res/cardsfolder/m/mirelurk_queen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mirelurk_queen.txt
rename to forge-gui/res/cardsfolder/m/mirelurk_queen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/miriam_herd_whisperer.txt b/forge-gui/res/cardsfolder/m/miriam_herd_whisperer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/miriam_herd_whisperer.txt
rename to forge-gui/res/cardsfolder/m/miriam_herd_whisperer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mob_verdict.txt b/forge-gui/res/cardsfolder/m/mob_verdict.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mob_verdict.txt
rename to forge-gui/res/cardsfolder/m/mob_verdict.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mobile_homestead.txt b/forge-gui/res/cardsfolder/m/mobile_homestead.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mobile_homestead.txt
rename to forge-gui/res/cardsfolder/m/mobile_homestead.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/molten_duplication.txt b/forge-gui/res/cardsfolder/m/molten_duplication.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/molten_duplication.txt
rename to forge-gui/res/cardsfolder/m/molten_duplication.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mourners_surprise.txt b/forge-gui/res/cardsfolder/m/mourners_surprise.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mourners_surprise.txt
rename to forge-gui/res/cardsfolder/m/mourners_surprise.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mysterious_stranger.txt b/forge-gui/res/cardsfolder/m/mysterious_stranger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mysterious_stranger.txt
rename to forge-gui/res/cardsfolder/m/mysterious_stranger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mystical_tether.txt b/forge-gui/res/cardsfolder/m/mystical_tether.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mystical_tether.txt
rename to forge-gui/res/cardsfolder/m/mystical_tether.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/neutralize_the_guards.txt b/forge-gui/res/cardsfolder/n/neutralize_the_guards.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/neutralize_the_guards.txt
rename to forge-gui/res/cardsfolder/n/neutralize_the_guards.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nezumi_linkbreaker.txt b/forge-gui/res/cardsfolder/n/nezumi_linkbreaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nezumi_linkbreaker.txt
rename to forge-gui/res/cardsfolder/n/nezumi_linkbreaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nick_valentine_private_eye.txt b/forge-gui/res/cardsfolder/n/nick_valentine_private_eye.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nick_valentine_private_eye.txt
rename to forge-gui/res/cardsfolder/n/nick_valentine_private_eye.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nightkin_ambusher.txt b/forge-gui/res/cardsfolder/n/nightkin_ambusher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nightkin_ambusher.txt
rename to forge-gui/res/cardsfolder/n/nightkin_ambusher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nimble_brigand.txt b/forge-gui/res/cardsfolder/n/nimble_brigand.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nimble_brigand.txt
rename to forge-gui/res/cardsfolder/n/nimble_brigand.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nuclear_fallout.txt b/forge-gui/res/cardsfolder/n/nuclear_fallout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nuclear_fallout.txt
rename to forge-gui/res/cardsfolder/n/nuclear_fallout.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nuka_nuke_launcher.txt b/forge-gui/res/cardsfolder/n/nuka_nuke_launcher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nuka_nuke_launcher.txt
rename to forge-gui/res/cardsfolder/n/nuka_nuke_launcher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nurturing_pixie.txt b/forge-gui/res/cardsfolder/n/nurturing_pixie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nurturing_pixie.txt
rename to forge-gui/res/cardsfolder/n/nurturing_pixie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/oasis_gardener.txt b/forge-gui/res/cardsfolder/o/oasis_gardener.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/oasis_gardener.txt
rename to forge-gui/res/cardsfolder/o/oasis_gardener.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/obeka_splitter_of_seconds.txt b/forge-gui/res/cardsfolder/o/obeka_splitter_of_seconds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/obeka_splitter_of_seconds.txt
rename to forge-gui/res/cardsfolder/o/obeka_splitter_of_seconds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/oko_the_ringleader.txt b/forge-gui/res/cardsfolder/o/oko_the_ringleader.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/oko_the_ringleader.txt
rename to forge-gui/res/cardsfolder/o/oko_the_ringleader.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/olivia_opulent_outlaw.txt b/forge-gui/res/cardsfolder/o/olivia_opulent_outlaw.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/olivia_opulent_outlaw.txt
rename to forge-gui/res/cardsfolder/o/olivia_opulent_outlaw.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/oltec_matterweaver.txt b/forge-gui/res/cardsfolder/o/oltec_matterweaver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/oltec_matterweaver.txt
rename to forge-gui/res/cardsfolder/o/oltec_matterweaver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/omenpath_journey.txt b/forge-gui/res/cardsfolder/o/omenpath_journey.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/omenpath_journey.txt
rename to forge-gui/res/cardsfolder/o/omenpath_journey.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/omenport_vigilante.txt b/forge-gui/res/cardsfolder/o/omenport_vigilante.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/omenport_vigilante.txt
rename to forge-gui/res/cardsfolder/o/omenport_vigilante.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ominous_lockbox.txt b/forge-gui/res/cardsfolder/o/ominous_lockbox.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ominous_lockbox.txt
rename to forge-gui/res/cardsfolder/o/ominous_lockbox.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/one_last_job.txt b/forge-gui/res/cardsfolder/o/one_last_job.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/one_last_job.txt
rename to forge-gui/res/cardsfolder/o/one_last_job.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ordruun_mentor.txt b/forge-gui/res/cardsfolder/o/ordruun_mentor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ordruun_mentor.txt
rename to forge-gui/res/cardsfolder/o/ordruun_mentor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ornery_tumblewagg.txt b/forge-gui/res/cardsfolder/o/ornery_tumblewagg.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ornery_tumblewagg.txt
rename to forge-gui/res/cardsfolder/o/ornery_tumblewagg.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/orochi_soul_reaver.txt b/forge-gui/res/cardsfolder/o/orochi_soul_reaver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/orochi_soul_reaver.txt
rename to forge-gui/res/cardsfolder/o/orochi_soul_reaver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/outcaster_greenblade.txt b/forge-gui/res/cardsfolder/o/outcaster_greenblade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/outcaster_greenblade.txt
rename to forge-gui/res/cardsfolder/o/outcaster_greenblade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/outlaw_medic.txt b/forge-gui/res/cardsfolder/o/outlaw_medic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/outlaw_medic.txt
rename to forge-gui/res/cardsfolder/o/outlaw_medic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/outlaw_stitcher.txt b/forge-gui/res/cardsfolder/o/outlaw_stitcher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/outlaw_stitcher.txt
rename to forge-gui/res/cardsfolder/o/outlaw_stitcher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/outlaws_fury.txt b/forge-gui/res/cardsfolder/o/outlaws_fury.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/outlaws_fury.txt
rename to forge-gui/res/cardsfolder/o/outlaws_fury.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/overzealous_muscle.txt b/forge-gui/res/cardsfolder/o/overzealous_muscle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/overzealous_muscle.txt
rename to forge-gui/res/cardsfolder/o/overzealous_muscle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/patient_naturalist.txt b/forge-gui/res/cardsfolder/p/patient_naturalist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/patient_naturalist.txt
rename to forge-gui/res/cardsfolder/p/patient_naturalist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/peerless_ropemaster.txt b/forge-gui/res/cardsfolder/p/peerless_ropemaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/peerless_ropemaster.txt
rename to forge-gui/res/cardsfolder/p/peerless_ropemaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/perforator_crocodile.txt b/forge-gui/res/cardsfolder/p/perforator_crocodile.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/perforator_crocodile.txt
rename to forge-gui/res/cardsfolder/p/perforator_crocodile.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pest_control.txt b/forge-gui/res/cardsfolder/p/pest_control.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pest_control.txt
rename to forge-gui/res/cardsfolder/p/pest_control.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phantom_interference.txt b/forge-gui/res/cardsfolder/p/phantom_interference.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phantom_interference.txt
rename to forge-gui/res/cardsfolder/p/phantom_interference.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pillage_the_bog.txt b/forge-gui/res/cardsfolder/p/pillage_the_bog.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/pillage_the_bog.txt
rename to forge-gui/res/cardsfolder/p/pillage_the_bog.txt
index 8ae1167d2dd..3b6d82c45b7 100644
--- a/forge-gui/res/cardsfolder/upcoming/pillage_the_bog.txt
+++ b/forge-gui/res/cardsfolder/p/pillage_the_bog.txt
@@ -1,7 +1,7 @@
-Name:Pillage The Bog
-ManaCost:B G
-Types:Sorcery
-A:SP$ Dig | DigNum$ X | ChangeNum$ 1 | RestRandomOrder$ True | SpellDescription$ Look at the top X cards of your library, where X is twice the number of lands you control. Put one of them into your hand and the rest on the bottom of your library in a random order.
-SVar:X:Count$Valid Land.YouCtrl/Twice
-K:Plot:1 B G
-Oracle:Look at the top X cards of your library, where X is twice the number of lands you control. Put one of them into your hand and the rest on the bottom of your library in a random order.\nPlot {1}{B}{G} (You may pay {1}{B}{G} and exile this card from your hand. Cast it as a sorcery on a later turn without paying its mana cost. Plot only as a sorcery.)
+Name:Pillage The Bog
+ManaCost:B G
+Types:Sorcery
+A:SP$ Dig | DigNum$ X | ChangeNum$ 1 | RestRandomOrder$ True | SpellDescription$ Look at the top X cards of your library, where X is twice the number of lands you control. Put one of them into your hand and the rest on the bottom of your library in a random order.
+SVar:X:Count$Valid Land.YouCtrl/Twice
+K:Plot:1 B G
+Oracle:Look at the top X cards of your library, where X is twice the number of lands you control. Put one of them into your hand and the rest on the bottom of your library in a random order.\nPlot {1}{B}{G} (You may pay {1}{B}{G} and exile this card from your hand. Cast it as a sorcery on a later turn without paying its mana cost. Plot only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/upcoming/pitiless_carnage.txt b/forge-gui/res/cardsfolder/p/pitiless_carnage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pitiless_carnage.txt
rename to forge-gui/res/cardsfolder/p/pitiless_carnage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/plan_the_heist.txt b/forge-gui/res/cardsfolder/p/plan_the_heist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/plan_the_heist.txt
rename to forge-gui/res/cardsfolder/p/plan_the_heist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/power_fist.txt b/forge-gui/res/cardsfolder/p/power_fist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/power_fist.txt
rename to forge-gui/res/cardsfolder/p/power_fist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prairie_dog.txt b/forge-gui/res/cardsfolder/p/prairie_dog.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prairie_dog.txt
rename to forge-gui/res/cardsfolder/p/prairie_dog.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prickly_pair.txt b/forge-gui/res/cardsfolder/p/prickly_pair.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prickly_pair.txt
rename to forge-gui/res/cardsfolder/p/prickly_pair.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/printlifter_ooze.txt b/forge-gui/res/cardsfolder/p/printlifter_ooze.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/printlifter_ooze.txt
rename to forge-gui/res/cardsfolder/p/printlifter_ooze.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prosperity_tycoon.txt b/forge-gui/res/cardsfolder/p/prosperity_tycoon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prosperity_tycoon.txt
rename to forge-gui/res/cardsfolder/p/prosperity_tycoon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pyretic_charge.txt b/forge-gui/res/cardsfolder/p/pyretic_charge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pyretic_charge.txt
rename to forge-gui/res/cardsfolder/p/pyretic_charge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quick_draw.txt b/forge-gui/res/cardsfolder/q/quick_draw.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quick_draw.txt
rename to forge-gui/res/cardsfolder/q/quick_draw.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quilled_charger.txt b/forge-gui/res/cardsfolder/q/quilled_charger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quilled_charger.txt
rename to forge-gui/res/cardsfolder/q/quilled_charger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/railway_brawler.txt b/forge-gui/res/cardsfolder/r/railway_brawler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/railway_brawler.txt
rename to forge-gui/res/cardsfolder/r/railway_brawler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rakdos_joins_up.txt b/forge-gui/res/cardsfolder/r/rakdos_joins_up.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rakdos_joins_up.txt
rename to forge-gui/res/cardsfolder/r/rakdos_joins_up.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rakdos_the_muscle.txt b/forge-gui/res/cardsfolder/r/rakdos_the_muscle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rakdos_the_muscle.txt
rename to forge-gui/res/cardsfolder/r/rakdos_the_muscle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rakish_crew.txt b/forge-gui/res/cardsfolder/r/rakish_crew.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rakish_crew.txt
rename to forge-gui/res/cardsfolder/r/rakish_crew.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rambling_possum.txt b/forge-gui/res/cardsfolder/r/rambling_possum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rambling_possum.txt
rename to forge-gui/res/cardsfolder/r/rambling_possum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rampaging_ursaguana.txt b/forge-gui/res/cardsfolder/r/rampaging_ursaguana.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rampaging_ursaguana.txt
rename to forge-gui/res/cardsfolder/r/rampaging_ursaguana.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rattleback_apothecary.txt b/forge-gui/res/cardsfolder/r/rattleback_apothecary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rattleback_apothecary.txt
rename to forge-gui/res/cardsfolder/r/rattleback_apothecary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/raucous_entertainer.txt b/forge-gui/res/cardsfolder/r/raucous_entertainer.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/raucous_entertainer.txt
rename to forge-gui/res/cardsfolder/r/raucous_entertainer.txt
index 57a1031b907..33d17e69b10 100644
--- a/forge-gui/res/cardsfolder/upcoming/raucous_entertainer.txt
+++ b/forge-gui/res/cardsfolder/r/raucous_entertainer.txt
@@ -1,6 +1,6 @@
-Name:Raucous Entertainer
-ManaCost:1 G
-Types:Creature Plant Bard
-PT:2/2
-A:AB$ PutCounterAll | Cost$ 1 T | ValidCards$ Creature.YouCtrl+ThisTurnEntered | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each creature you control that entered the battlefield this turn.
-Oracle:{1}, {T}: Put a +1/+1 counter on each creature you control that entered the battlefield this turn.
+Name:Raucous Entertainer
+ManaCost:1 G
+Types:Creature Plant Bard
+PT:2/2
+A:AB$ PutCounterAll | Cost$ 1 T | ValidCards$ Creature.YouCtrl+ThisTurnEntered | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each creature you control that entered the battlefield this turn.
+Oracle:{1}, {T}: Put a +1/+1 counter on each creature you control that entered the battlefield this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/raven_of_fell_omens.txt b/forge-gui/res/cardsfolder/r/raven_of_fell_omens.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raven_of_fell_omens.txt
rename to forge-gui/res/cardsfolder/r/raven_of_fell_omens.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/razzle_dazzler.txt b/forge-gui/res/cardsfolder/r/razzle_dazzler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/razzle_dazzler.txt
rename to forge-gui/res/cardsfolder/r/razzle_dazzler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reach_for_the_sky.txt b/forge-gui/res/cardsfolder/r/reach_for_the_sky.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/reach_for_the_sky.txt
rename to forge-gui/res/cardsfolder/r/reach_for_the_sky.txt
index c168db3b756..d771a62a3b8 100644
--- a/forge-gui/res/cardsfolder/upcoming/reach_for_the_sky.txt
+++ b/forge-gui/res/cardsfolder/r/reach_for_the_sky.txt
@@ -1,11 +1,11 @@
-Name:Reach for the Sky
-ManaCost:3 G
-Types:Enchantment Aura
-K:Flash
-K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 2 | AddKeyword$ Reach | Description$ Enchanted creature gets +3/+2 and has reach.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw a card.
-SVar:TrigDraw:DB$ Draw
-SVar:SacMe:2
-Oracle:Flash\nEnchant creature\nEnchanted creature gets +3/+2 and has reach.\nWhen Reach for the Sky is put into a graveyard from the battlefield, draw a card.
+Name:Reach for the Sky
+ManaCost:3 G
+Types:Enchantment Aura
+K:Flash
+K:Enchant creature
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 2 | AddKeyword$ Reach | Description$ Enchanted creature gets +3/+2 and has reach.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw a card.
+SVar:TrigDraw:DB$ Draw
+SVar:SacMe:2
+Oracle:Flash\nEnchant creature\nEnchanted creature gets +3/+2 and has reach.\nWhen Reach for the Sky is put into a graveyard from the battlefield, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/reckless_lackey.txt b/forge-gui/res/cardsfolder/r/reckless_lackey.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reckless_lackey.txt
rename to forge-gui/res/cardsfolder/r/reckless_lackey.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/recon_craft_theta.txt b/forge-gui/res/cardsfolder/r/recon_craft_theta.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/recon_craft_theta.txt
rename to forge-gui/res/cardsfolder/r/recon_craft_theta.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/red_death_shipwrecker.txt b/forge-gui/res/cardsfolder/r/red_death_shipwrecker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/red_death_shipwrecker.txt
rename to forge-gui/res/cardsfolder/r/red_death_shipwrecker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/redrock_sentinel.txt b/forge-gui/res/cardsfolder/r/redrock_sentinel.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/redrock_sentinel.txt
rename to forge-gui/res/cardsfolder/r/redrock_sentinel.txt
index 0bad78788dc..6a29c5d4f8d 100644
--- a/forge-gui/res/cardsfolder/upcoming/redrock_sentinel.txt
+++ b/forge-gui/res/cardsfolder/r/redrock_sentinel.txt
@@ -1,8 +1,8 @@
-Name:Redrock Sentinel
-ManaCost:3
-Types:Artifact Creature Golem
-K:Defender
-PT:2/4
-A:AB$ Draw | Cost$ 2 T Sac<1/Land> | NumCards$1 | SubAbility$ DBTreasure | SpellDescription$ Draw a card and create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
-SVar:DBTreasure:DB$ Token | TokenScript$ c_a_treasure_sac
-Oracle:Defender\n{2}, {T}, Sacrifice a land: Draw a card and create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+Name:Redrock Sentinel
+ManaCost:3
+Types:Artifact Creature Golem
+K:Defender
+PT:2/4
+A:AB$ Draw | Cost$ 2 T Sac<1/Land> | NumCards$1 | SubAbility$ DBTreasure | SpellDescription$ Draw a card and create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+SVar:DBTreasure:DB$ Token | TokenScript$ c_a_treasure_sac
+Oracle:Defender\n{2}, {T}, Sacrifice a land: Draw a card and create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
diff --git a/forge-gui/res/cardsfolder/upcoming/relics_of_the_rubblebelt.txt b/forge-gui/res/cardsfolder/r/relics_of_the_rubblebelt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/relics_of_the_rubblebelt.txt
rename to forge-gui/res/cardsfolder/r/relics_of_the_rubblebelt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/requisition_raid.txt b/forge-gui/res/cardsfolder/r/requisition_raid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/requisition_raid.txt
rename to forge-gui/res/cardsfolder/r/requisition_raid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/resilient_roadrunner.txt b/forge-gui/res/cardsfolder/r/resilient_roadrunner.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/resilient_roadrunner.txt
rename to forge-gui/res/cardsfolder/r/resilient_roadrunner.txt
index 8de06a48b94..df95932d6e7 100644
--- a/forge-gui/res/cardsfolder/upcoming/resilient_roadrunner.txt
+++ b/forge-gui/res/cardsfolder/r/resilient_roadrunner.txt
@@ -1,9 +1,9 @@
-Name:Resilient Roadrunner
-ManaCost:1 R
-Types:Creature Bird
-PT:2/2
-K:Haste
-K:Protection:Coyote
-A:AB$ Effect | Cost$ 3 | StaticAbilities$ KWPump | Duration$ UntilHostLeavesPlayOrEOT | SpellDescription$ CARDNAME can't be blocked this turn except by creatures with haste.
-SVar:KWPump:Mode$ CantBlockBy | ValidAttacker$ Creature.EffectSource | ValidBlocker$ Creature.withoutHaste | EffectZone$ Command | Description$ EFFECTSOURCE can't be blocked this turn except by creatures with haste.
-Oracle:Haste, protection from Coyotes\n{3}: Resilient Roadrunner can't be blocked this turn except by creatures with haste.
+Name:Resilient Roadrunner
+ManaCost:1 R
+Types:Creature Bird
+PT:2/2
+K:Haste
+K:Protection:Coyote
+A:AB$ Effect | Cost$ 3 | StaticAbilities$ KWPump | Duration$ UntilHostLeavesPlayOrEOT | SpellDescription$ CARDNAME can't be blocked this turn except by creatures with haste.
+SVar:KWPump:Mode$ CantBlockBy | ValidAttacker$ Creature.EffectSource | ValidBlocker$ Creature.withoutHaste | EffectZone$ Command | Description$ EFFECTSOURCE can't be blocked this turn except by creatures with haste.
+Oracle:Haste, protection from Coyotes\n{3}: Resilient Roadrunner can't be blocked this turn except by creatures with haste.
diff --git a/forge-gui/res/cardsfolder/upcoming/return_the_favor.txt b/forge-gui/res/cardsfolder/r/return_the_favor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/return_the_favor.txt
rename to forge-gui/res/cardsfolder/r/return_the_favor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rictus_robber.txt b/forge-gui/res/cardsfolder/r/rictus_robber.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rictus_robber.txt
rename to forge-gui/res/cardsfolder/r/rictus_robber.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/riku_of_many_paths.txt b/forge-gui/res/cardsfolder/r/riku_of_many_paths.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/riku_of_many_paths.txt
rename to forge-gui/res/cardsfolder/r/riku_of_many_paths.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rise_of_the_varmints.txt b/forge-gui/res/cardsfolder/r/rise_of_the_varmints.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rise_of_the_varmints.txt
rename to forge-gui/res/cardsfolder/r/rise_of_the_varmints.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/roalesk_prime_specimen.txt b/forge-gui/res/cardsfolder/r/roalesk_prime_specimen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/roalesk_prime_specimen.txt
rename to forge-gui/res/cardsfolder/r/roalesk_prime_specimen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rodeo_pyromancers.txt b/forge-gui/res/cardsfolder/r/rodeo_pyromancers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rodeo_pyromancers.txt
rename to forge-gui/res/cardsfolder/r/rodeo_pyromancers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rooftop_assassin.txt b/forge-gui/res/cardsfolder/r/rooftop_assassin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rooftop_assassin.txt
rename to forge-gui/res/cardsfolder/r/rooftop_assassin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rose_cutthroat_raider.txt b/forge-gui/res/cardsfolder/r/rose_cutthroat_raider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rose_cutthroat_raider.txt
rename to forge-gui/res/cardsfolder/r/rose_cutthroat_raider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/roxanne_starfall_savant.txt b/forge-gui/res/cardsfolder/r/roxanne_starfall_savant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/roxanne_starfall_savant.txt
rename to forge-gui/res/cardsfolder/r/roxanne_starfall_savant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rumbleweed.txt b/forge-gui/res/cardsfolder/r/rumbleweed.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rumbleweed.txt
rename to forge-gui/res/cardsfolder/r/rumbleweed.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rush_of_dread.txt b/forge-gui/res/cardsfolder/r/rush_of_dread.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rush_of_dread.txt
rename to forge-gui/res/cardsfolder/r/rush_of_dread.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rustler_rampage.txt b/forge-gui/res/cardsfolder/r/rustler_rampage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rustler_rampage.txt
rename to forge-gui/res/cardsfolder/r/rustler_rampage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ruthless_lawbringer.txt b/forge-gui/res/cardsfolder/r/ruthless_lawbringer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ruthless_lawbringer.txt
rename to forge-gui/res/cardsfolder/r/ruthless_lawbringer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sand_scout.txt b/forge-gui/res/cardsfolder/s/sand_scout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sand_scout.txt
rename to forge-gui/res/cardsfolder/s/sand_scout.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sandstorm_salvager.txt b/forge-gui/res/cardsfolder/s/sandstorm_salvager.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sandstorm_salvager.txt
rename to forge-gui/res/cardsfolder/s/sandstorm_salvager.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sandstorm_verge.txt b/forge-gui/res/cardsfolder/s/sandstorm_verge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sandstorm_verge.txt
rename to forge-gui/res/cardsfolder/s/sandstorm_verge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/satoru_the_infiltrator.txt b/forge-gui/res/cardsfolder/s/satoru_the_infiltrator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/satoru_the_infiltrator.txt
rename to forge-gui/res/cardsfolder/s/satoru_the_infiltrator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scalestorm_summoner.txt b/forge-gui/res/cardsfolder/s/scalestorm_summoner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scalestorm_summoner.txt
rename to forge-gui/res/cardsfolder/s/scalestorm_summoner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scorching_shot.txt b/forge-gui/res/cardsfolder/s/scorching_shot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scorching_shot.txt
rename to forge-gui/res/cardsfolder/s/scorching_shot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scour_the_scene.txt b/forge-gui/res/cardsfolder/s/scour_the_scene.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scour_the_scene.txt
rename to forge-gui/res/cardsfolder/s/scour_the_scene.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/screeching_scorchbeast.txt b/forge-gui/res/cardsfolder/s/screeching_scorchbeast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/screeching_scorchbeast.txt
rename to forge-gui/res/cardsfolder/s/screeching_scorchbeast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scrutiny_of_the_guildpact.txt b/forge-gui/res/cardsfolder/s/scrutiny_of_the_guildpact.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scrutiny_of_the_guildpact.txt
rename to forge-gui/res/cardsfolder/s/scrutiny_of_the_guildpact.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seize_the_secrets.txt b/forge-gui/res/cardsfolder/s/seize_the_secrets.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seize_the_secrets.txt
rename to forge-gui/res/cardsfolder/s/seize_the_secrets.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/selvala_eager_trailblazer.txt b/forge-gui/res/cardsfolder/s/selvala_eager_trailblazer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/selvala_eager_trailblazer.txt
rename to forge-gui/res/cardsfolder/s/selvala_eager_trailblazer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sentinel_sarah_lyons.txt b/forge-gui/res/cardsfolder/s/sentinel_sarah_lyons.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sentinel_sarah_lyons.txt
rename to forge-gui/res/cardsfolder/s/sentinel_sarah_lyons.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seraphic_steed.txt b/forge-gui/res/cardsfolder/s/seraphic_steed.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seraphic_steed.txt
rename to forge-gui/res/cardsfolder/s/seraphic_steed.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/servant_of_the_stinger.txt b/forge-gui/res/cardsfolder/s/servant_of_the_stinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/servant_of_the_stinger.txt
rename to forge-gui/res/cardsfolder/s/servant_of_the_stinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shackle_slinger.txt b/forge-gui/res/cardsfolder/s/shackle_slinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shackle_slinger.txt
rename to forge-gui/res/cardsfolder/s/shackle_slinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shaun_father_of_synths.txt b/forge-gui/res/cardsfolder/s/shaun_father_of_synths.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shaun_father_of_synths.txt
rename to forge-gui/res/cardsfolder/s/shaun_father_of_synths.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shepherd_of_the_clouds.txt b/forge-gui/res/cardsfolder/s/shepherd_of_the_clouds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shepherd_of_the_clouds.txt
rename to forge-gui/res/cardsfolder/s/shepherd_of_the_clouds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sheriff_of_safe_passage.txt b/forge-gui/res/cardsfolder/s/sheriff_of_safe_passage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sheriff_of_safe_passage.txt
rename to forge-gui/res/cardsfolder/s/sheriff_of_safe_passage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shifting_grift.txt b/forge-gui/res/cardsfolder/s/shifting_grift.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shifting_grift.txt
rename to forge-gui/res/cardsfolder/s/shifting_grift.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shoot_the_sheriff.txt b/forge-gui/res/cardsfolder/s/shoot_the_sheriff.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shoot_the_sheriff.txt
rename to forge-gui/res/cardsfolder/s/shoot_the_sheriff.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shove_aside.txt b/forge-gui/res/cardsfolder/s/shove_aside.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shove_aside.txt
rename to forge-gui/res/cardsfolder/s/shove_aside.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/showstopping_surprise.txt b/forge-gui/res/cardsfolder/s/showstopping_surprise.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/showstopping_surprise.txt
rename to forge-gui/res/cardsfolder/s/showstopping_surprise.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sierra_nukas_biggest_fan.txt b/forge-gui/res/cardsfolder/s/sierra_nukas_biggest_fan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sierra_nukas_biggest_fan.txt
rename to forge-gui/res/cardsfolder/s/sierra_nukas_biggest_fan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/silver_deputy.txt b/forge-gui/res/cardsfolder/s/silver_deputy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/silver_deputy.txt
rename to forge-gui/res/cardsfolder/s/silver_deputy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/silver_shroud_costume.txt b/forge-gui/res/cardsfolder/s/silver_shroud_costume.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/silver_shroud_costume.txt
rename to forge-gui/res/cardsfolder/s/silver_shroud_costume.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/simulacrum_synthesizer.txt b/forge-gui/res/cardsfolder/s/simulacrum_synthesizer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/simulacrum_synthesizer.txt
rename to forge-gui/res/cardsfolder/s/simulacrum_synthesizer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sleuth_instructor.txt b/forge-gui/res/cardsfolder/s/sleuth_instructor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sleuth_instructor.txt
rename to forge-gui/res/cardsfolder/s/sleuth_instructor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slick_sequence.txt b/forge-gui/res/cardsfolder/s/slick_sequence.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slick_sequence.txt
rename to forge-gui/res/cardsfolder/s/slick_sequence.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slickshot_lockpicker.txt b/forge-gui/res/cardsfolder/s/slickshot_lockpicker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slickshot_lockpicker.txt
rename to forge-gui/res/cardsfolder/s/slickshot_lockpicker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slickshot_show_off.txt b/forge-gui/res/cardsfolder/s/slickshot_show_off.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slickshot_show_off.txt
rename to forge-gui/res/cardsfolder/s/slickshot_show_off.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slickshot_vault_buster.txt b/forge-gui/res/cardsfolder/s/slickshot_vault_buster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slickshot_vault_buster.txt
rename to forge-gui/res/cardsfolder/s/slickshot_vault_buster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/smugglers_surprise.txt b/forge-gui/res/cardsfolder/s/smugglers_surprise.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/smugglers_surprise.txt
rename to forge-gui/res/cardsfolder/s/smugglers_surprise.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/snarlfang_vermin.txt b/forge-gui/res/cardsfolder/s/snarlfang_vermin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/snarlfang_vermin.txt
rename to forge-gui/res/cardsfolder/s/snarlfang_vermin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soured_springs.txt b/forge-gui/res/cardsfolder/s/soured_springs.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soured_springs.txt
rename to forge-gui/res/cardsfolder/s/soured_springs.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spinewoods_armadillo.txt b/forge-gui/res/cardsfolder/s/spinewoods_armadillo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spinewoods_armadillo.txt
rename to forge-gui/res/cardsfolder/s/spinewoods_armadillo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spinewoods_paladin.txt b/forge-gui/res/cardsfolder/s/spinewoods_paladin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spinewoods_paladin.txt
rename to forge-gui/res/cardsfolder/s/spinewoods_paladin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spotlight_falcon.txt b/forge-gui/res/cardsfolder/s/spotlight_falcon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spotlight_falcon.txt
rename to forge-gui/res/cardsfolder/s/spotlight_falcon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spring_splasher.txt b/forge-gui/res/cardsfolder/s/spring_splasher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spring_splasher.txt
rename to forge-gui/res/cardsfolder/s/spring_splasher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sproutwatch_dryad.txt b/forge-gui/res/cardsfolder/s/sproutwatch_dryad.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sproutwatch_dryad.txt
rename to forge-gui/res/cardsfolder/s/sproutwatch_dryad.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stagecoach_security.txt b/forge-gui/res/cardsfolder/s/stagecoach_security.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stagecoach_security.txt
rename to forge-gui/res/cardsfolder/s/stagecoach_security.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/steer_clear.txt b/forge-gui/res/cardsfolder/s/steer_clear.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/steer_clear.txt
rename to forge-gui/res/cardsfolder/s/steer_clear.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stella_lee_wild_card.txt b/forge-gui/res/cardsfolder/s/stella_lee_wild_card.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stella_lee_wild_card.txt
rename to forge-gui/res/cardsfolder/s/stella_lee_wild_card.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/step_between_worlds.txt b/forge-gui/res/cardsfolder/s/step_between_worlds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/step_between_worlds.txt
rename to forge-gui/res/cardsfolder/s/step_between_worlds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sterling_hound.txt b/forge-gui/res/cardsfolder/s/sterling_hound.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sterling_hound.txt
rename to forge-gui/res/cardsfolder/s/sterling_hound.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sterling_keykeeper.txt b/forge-gui/res/cardsfolder/s/sterling_keykeeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sterling_keykeeper.txt
rename to forge-gui/res/cardsfolder/s/sterling_keykeeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sterling_supplier.txt b/forge-gui/res/cardsfolder/s/sterling_supplier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sterling_supplier.txt
rename to forge-gui/res/cardsfolder/s/sterling_supplier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stingerback_terror.txt b/forge-gui/res/cardsfolder/s/stingerback_terror.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stingerback_terror.txt
rename to forge-gui/res/cardsfolder/s/stingerback_terror.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stoic_sphinx.txt b/forge-gui/res/cardsfolder/s/stoic_sphinx.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stoic_sphinx.txt
rename to forge-gui/res/cardsfolder/s/stoic_sphinx.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stop_cold.txt b/forge-gui/res/cardsfolder/s/stop_cold.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stop_cold.txt
rename to forge-gui/res/cardsfolder/s/stop_cold.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/strong_back.txt b/forge-gui/res/cardsfolder/s/strong_back.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/strong_back.txt
rename to forge-gui/res/cardsfolder/s/strong_back.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/strong_the_brutish_thespian.txt b/forge-gui/res/cardsfolder/s/strong_the_brutish_thespian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/strong_the_brutish_thespian.txt
rename to forge-gui/res/cardsfolder/s/strong_the_brutish_thespian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/struggle_for_project_purity.txt b/forge-gui/res/cardsfolder/s/struggle_for_project_purity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/struggle_for_project_purity.txt
rename to forge-gui/res/cardsfolder/s/struggle_for_project_purity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stubborn_burrowfiend.txt b/forge-gui/res/cardsfolder/s/stubborn_burrowfiend.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stubborn_burrowfiend.txt
rename to forge-gui/res/cardsfolder/s/stubborn_burrowfiend.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/suppressor_skyguard.txt b/forge-gui/res/cardsfolder/s/suppressor_skyguard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/suppressor_skyguard.txt
rename to forge-gui/res/cardsfolder/s/suppressor_skyguard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/survivors_med_kit.txt b/forge-gui/res/cardsfolder/s/survivors_med_kit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/survivors_med_kit.txt
rename to forge-gui/res/cardsfolder/s/survivors_med_kit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sword_of_wealth_and_power.txt b/forge-gui/res/cardsfolder/s/sword_of_wealth_and_power.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sword_of_wealth_and_power.txt
rename to forge-gui/res/cardsfolder/s/sword_of_wealth_and_power.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/t45_power_armor.txt b/forge-gui/res/cardsfolder/t/t45_power_armor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/t45_power_armor.txt
rename to forge-gui/res/cardsfolder/t/t45_power_armor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/taii_wakeen_perfect_shot.txt b/forge-gui/res/cardsfolder/t/taii_wakeen_perfect_shot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/taii_wakeen_perfect_shot.txt
rename to forge-gui/res/cardsfolder/t/taii_wakeen_perfect_shot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tajic_legions_valor.txt b/forge-gui/res/cardsfolder/t/tajic_legions_valor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tajic_legions_valor.txt
rename to forge-gui/res/cardsfolder/t/tajic_legions_valor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/take_for_a_ride.txt b/forge-gui/res/cardsfolder/t/take_for_a_ride.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/take_for_a_ride.txt
rename to forge-gui/res/cardsfolder/t/take_for_a_ride.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/take_the_fall.txt b/forge-gui/res/cardsfolder/t/take_the_fall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/take_the_fall.txt
rename to forge-gui/res/cardsfolder/t/take_the_fall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tarnation_vista.txt b/forge-gui/res/cardsfolder/t/tarnation_vista.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tarnation_vista.txt
rename to forge-gui/res/cardsfolder/t/tarnation_vista.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tato_farmer.txt b/forge-gui/res/cardsfolder/t/tato_farmer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tato_farmer.txt
rename to forge-gui/res/cardsfolder/t/tato_farmer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/territory_forge.txt b/forge-gui/res/cardsfolder/t/territory_forge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/territory_forge.txt
rename to forge-gui/res/cardsfolder/t/territory_forge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_gitrog_ravenous_ride.txt b/forge-gui/res/cardsfolder/t/the_gitrog_ravenous_ride.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_gitrog_ravenous_ride.txt
rename to forge-gui/res/cardsfolder/t/the_gitrog_ravenous_ride.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_key_to_the_vault.txt b/forge-gui/res/cardsfolder/t/the_key_to_the_vault.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_key_to_the_vault.txt
rename to forge-gui/res/cardsfolder/t/the_key_to_the_vault.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_motherlode_excavator.txt b/forge-gui/res/cardsfolder/t/the_motherlode_excavator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_motherlode_excavator.txt
rename to forge-gui/res/cardsfolder/t/the_motherlode_excavator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_nipton_lottery.txt b/forge-gui/res/cardsfolder/t/the_nipton_lottery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_nipton_lottery.txt
rename to forge-gui/res/cardsfolder/t/the_nipton_lottery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_prydwen_steel_flagship.txt b/forge-gui/res/cardsfolder/t/the_prydwen_steel_flagship.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_prydwen_steel_flagship.txt
rename to forge-gui/res/cardsfolder/t/the_prydwen_steel_flagship.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thieving_varmint.txt b/forge-gui/res/cardsfolder/t/thieving_varmint.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thieving_varmint.txt
rename to forge-gui/res/cardsfolder/t/thieving_varmint.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/this_town_aint_big_enough.txt b/forge-gui/res/cardsfolder/t/this_town_aint_big_enough.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/this_town_aint_big_enough.txt
rename to forge-gui/res/cardsfolder/t/this_town_aint_big_enough.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thought_string_analyst.txt b/forge-gui/res/cardsfolder/t/thought_string_analyst.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thought_string_analyst.txt
rename to forge-gui/res/cardsfolder/t/thought_string_analyst.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/three_dog_galaxy_news_dj.txt b/forge-gui/res/cardsfolder/t/three_dog_galaxy_news_dj.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/three_dog_galaxy_news_dj.txt
rename to forge-gui/res/cardsfolder/t/three_dog_galaxy_news_dj.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/three_steps_ahead.txt b/forge-gui/res/cardsfolder/t/three_steps_ahead.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/three_steps_ahead.txt
rename to forge-gui/res/cardsfolder/t/three_steps_ahead.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/throw_from_the_saddle.txt b/forge-gui/res/cardsfolder/t/throw_from_the_saddle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/throw_from_the_saddle.txt
rename to forge-gui/res/cardsfolder/t/throw_from_the_saddle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thunder_lasso.txt b/forge-gui/res/cardsfolder/t/thunder_lasso.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thunder_lasso.txt
rename to forge-gui/res/cardsfolder/t/thunder_lasso.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thunder_salvo.txt b/forge-gui/res/cardsfolder/t/thunder_salvo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thunder_salvo.txt
rename to forge-gui/res/cardsfolder/t/thunder_salvo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thunderclap_drake.txt b/forge-gui/res/cardsfolder/t/thunderclap_drake.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thunderclap_drake.txt
rename to forge-gui/res/cardsfolder/t/thunderclap_drake.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tinybones_joins_up.txt b/forge-gui/res/cardsfolder/t/tinybones_joins_up.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tinybones_joins_up.txt
rename to forge-gui/res/cardsfolder/t/tinybones_joins_up.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tinybones_the_pickpocket.txt b/forge-gui/res/cardsfolder/t/tinybones_the_pickpocket.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tinybones_the_pickpocket.txt
rename to forge-gui/res/cardsfolder/t/tinybones_the_pickpocket.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tomb_trawler.txt b/forge-gui/res/cardsfolder/t/tomb_trawler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tomb_trawler.txt
rename to forge-gui/res/cardsfolder/t/tomb_trawler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tower_winder.txt b/forge-gui/res/cardsfolder/t/tower_winder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tower_winder.txt
rename to forge-gui/res/cardsfolder/t/tower_winder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/trained_arynx.txt b/forge-gui/res/cardsfolder/t/trained_arynx.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/trained_arynx.txt
rename to forge-gui/res/cardsfolder/t/trained_arynx.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/trash_the_town.txt b/forge-gui/res/cardsfolder/t/trash_the_town.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/trash_the_town.txt
rename to forge-gui/res/cardsfolder/t/trash_the_town.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/treasure_dredger.txt b/forge-gui/res/cardsfolder/t/treasure_dredger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/treasure_dredger.txt
rename to forge-gui/res/cardsfolder/t/treasure_dredger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/trick_shot.txt b/forge-gui/res/cardsfolder/t/trick_shot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/trick_shot.txt
rename to forge-gui/res/cardsfolder/t/trick_shot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/true_identity.txt b/forge-gui/res/cardsfolder/t/true_identity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/true_identity.txt
rename to forge-gui/res/cardsfolder/t/true_identity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tumbleweed_rising.txt b/forge-gui/res/cardsfolder/t/tumbleweed_rising.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tumbleweed_rising.txt
rename to forge-gui/res/cardsfolder/t/tumbleweed_rising.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unexplained_absence.txt b/forge-gui/res/cardsfolder/u/unexplained_absence.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unexplained_absence.txt
rename to forge-gui/res/cardsfolder/u/unexplained_absence.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unfortunate_accident.txt b/forge-gui/res/cardsfolder/u/unfortunate_accident.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unfortunate_accident.txt
rename to forge-gui/res/cardsfolder/u/unfortunate_accident.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unscrupulous_contractor.txt b/forge-gui/res/cardsfolder/u/unscrupulous_contractor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unscrupulous_contractor.txt
rename to forge-gui/res/cardsfolder/u/unscrupulous_contractor.txt
diff --git a/forge-gui/res/cardsfolder/a/ajani_nacatl_pariah_ajani_nacatl_avenger.txt b/forge-gui/res/cardsfolder/upcoming/ajani_nacatl_pariah_ajani_nacatl_avenger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/a/ajani_nacatl_pariah_ajani_nacatl_avenger.txt
rename to forge-gui/res/cardsfolder/upcoming/ajani_nacatl_pariah_ajani_nacatl_avenger.txt
diff --git a/forge-gui/res/cardsfolder/f/flare_of_cultivation.txt b/forge-gui/res/cardsfolder/upcoming/flare_of_cultivation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/f/flare_of_cultivation.txt
rename to forge-gui/res/cardsfolder/upcoming/flare_of_cultivation.txt
diff --git a/forge-gui/res/cardsfolder/s/snow_covered_wastes.txt b/forge-gui/res/cardsfolder/upcoming/snow_covered_wastes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/s/snow_covered_wastes.txt
rename to forge-gui/res/cardsfolder/upcoming/snow_covered_wastes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vadmir_new_blood.txt b/forge-gui/res/cardsfolder/v/vadmir_new_blood.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vadmir_new_blood.txt
rename to forge-gui/res/cardsfolder/v/vadmir_new_blood.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vault_112_sadistic_simulation.txt b/forge-gui/res/cardsfolder/v/vault_112_sadistic_simulation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vault_112_sadistic_simulation.txt
rename to forge-gui/res/cardsfolder/v/vault_112_sadistic_simulation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vault_11_voters_dilemma.txt b/forge-gui/res/cardsfolder/v/vault_11_voters_dilemma.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vault_11_voters_dilemma.txt
rename to forge-gui/res/cardsfolder/v/vault_11_voters_dilemma.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vault_12_the_necropolis.txt b/forge-gui/res/cardsfolder/v/vault_12_the_necropolis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vault_12_the_necropolis.txt
rename to forge-gui/res/cardsfolder/v/vault_12_the_necropolis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vault_13_dwellers_journey.txt b/forge-gui/res/cardsfolder/v/vault_13_dwellers_journey.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vault_13_dwellers_journey.txt
rename to forge-gui/res/cardsfolder/v/vault_13_dwellers_journey.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vault_75_middle_school.txt b/forge-gui/res/cardsfolder/v/vault_75_middle_school.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vault_75_middle_school.txt
rename to forge-gui/res/cardsfolder/v/vault_75_middle_school.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vault_87_forced_evolution.txt b/forge-gui/res/cardsfolder/v/vault_87_forced_evolution.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vault_87_forced_evolution.txt
rename to forge-gui/res/cardsfolder/v/vault_87_forced_evolution.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vault_plunderer.txt b/forge-gui/res/cardsfolder/v/vault_plunderer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vault_plunderer.txt
rename to forge-gui/res/cardsfolder/v/vault_plunderer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vaultborn_tyrant.txt b/forge-gui/res/cardsfolder/v/vaultborn_tyrant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vaultborn_tyrant.txt
rename to forge-gui/res/cardsfolder/v/vaultborn_tyrant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/veiled_ascension.txt b/forge-gui/res/cardsfolder/v/veiled_ascension.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/veiled_ascension.txt
rename to forge-gui/res/cardsfolder/v/veiled_ascension.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/veko_deaths_doorkeeper.txt b/forge-gui/res/cardsfolder/v/veko_deaths_doorkeeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/veko_deaths_doorkeeper.txt
rename to forge-gui/res/cardsfolder/v/veko_deaths_doorkeeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vengeful_regrowth.txt b/forge-gui/res/cardsfolder/v/vengeful_regrowth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vengeful_regrowth.txt
rename to forge-gui/res/cardsfolder/v/vengeful_regrowth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vengeful_townsfolk.txt b/forge-gui/res/cardsfolder/v/vengeful_townsfolk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vengeful_townsfolk.txt
rename to forge-gui/res/cardsfolder/v/vengeful_townsfolk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/veronica_dissident_scribe.txt b/forge-gui/res/cardsfolder/v/veronica_dissident_scribe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/veronica_dissident_scribe.txt
rename to forge-gui/res/cardsfolder/v/veronica_dissident_scribe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vexing_radgull.txt b/forge-gui/res/cardsfolder/v/vexing_radgull.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vexing_radgull.txt
rename to forge-gui/res/cardsfolder/v/vexing_radgull.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vial_smasher_gleeful_grenadier.txt b/forge-gui/res/cardsfolder/v/vial_smasher_gleeful_grenadier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vial_smasher_gleeful_grenadier.txt
rename to forge-gui/res/cardsfolder/v/vial_smasher_gleeful_grenadier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vihaan_goldwaker.txt b/forge-gui/res/cardsfolder/v/vihaan_goldwaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vihaan_goldwaker.txt
rename to forge-gui/res/cardsfolder/v/vihaan_goldwaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/visage_bandit.txt b/forge-gui/res/cardsfolder/v/visage_bandit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/visage_bandit.txt
rename to forge-gui/res/cardsfolder/v/visage_bandit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/voracious_varmint.txt b/forge-gui/res/cardsfolder/v/voracious_varmint.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/voracious_varmint.txt
rename to forge-gui/res/cardsfolder/v/voracious_varmint.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vraska_joins_up.txt b/forge-gui/res/cardsfolder/v/vraska_joins_up.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vraska_joins_up.txt
rename to forge-gui/res/cardsfolder/v/vraska_joins_up.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vraska_the_silencer.txt b/forge-gui/res/cardsfolder/v/vraska_the_silencer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vraska_the_silencer.txt
rename to forge-gui/res/cardsfolder/v/vraska_the_silencer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wanted_griffin.txt b/forge-gui/res/cardsfolder/w/wanted_griffin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wanted_griffin.txt
rename to forge-gui/res/cardsfolder/w/wanted_griffin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wasteland_raider.txt b/forge-gui/res/cardsfolder/w/wasteland_raider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wasteland_raider.txt
rename to forge-gui/res/cardsfolder/w/wasteland_raider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/we_ride_at_dawn.txt b/forge-gui/res/cardsfolder/w/we_ride_at_dawn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/we_ride_at_dawn.txt
rename to forge-gui/res/cardsfolder/w/we_ride_at_dawn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/well_rested.txt b/forge-gui/res/cardsfolder/w/well_rested.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/well_rested.txt
rename to forge-gui/res/cardsfolder/w/well_rested.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/woodland_investigation.txt b/forge-gui/res/cardsfolder/w/woodland_investigation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/woodland_investigation.txt
rename to forge-gui/res/cardsfolder/w/woodland_investigation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/worldwalker_helm.txt b/forge-gui/res/cardsfolder/w/worldwalker_helm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/worldwalker_helm.txt
rename to forge-gui/res/cardsfolder/w/worldwalker_helm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wrangler_of_the_damned.txt b/forge-gui/res/cardsfolder/w/wrangler_of_the_damned.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wrangler_of_the_damned.txt
rename to forge-gui/res/cardsfolder/w/wrangler_of_the_damned.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wylie_duke_atiin_hero.txt b/forge-gui/res/cardsfolder/w/wylie_duke_atiin_hero.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wylie_duke_atiin_hero.txt
rename to forge-gui/res/cardsfolder/w/wylie_duke_atiin_hero.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yuma_proud_protector.txt b/forge-gui/res/cardsfolder/y/yuma_proud_protector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yuma_proud_protector.txt
rename to forge-gui/res/cardsfolder/y/yuma_proud_protector.txt