diff --git a/forge-gui/res/cardsfolder/upcoming/aerial_boost.txt b/forge-gui/res/cardsfolder/a/aerial_boost.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/aerial_boost.txt
rename to forge-gui/res/cardsfolder/a/aerial_boost.txt
index 513e5a88c87..634c4bf08da 100644
--- a/forge-gui/res/cardsfolder/upcoming/aerial_boost.txt
+++ b/forge-gui/res/cardsfolder/a/aerial_boost.txt
@@ -1,6 +1,6 @@
-Name:Aerial Boost
-ManaCost:1 W
-Types:Instant
-K:Convoke
-A:SP$ Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | KW$ Flying | SpellDescription$ Target creature gets +2/+2 and gains flying until end of turn.
-Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nTarget creature gets +2/+2 and gains flying until end of turn.
+Name:Aerial Boost
+ManaCost:1 W
+Types:Instant
+K:Convoke
+A:SP$ Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | KW$ Flying | SpellDescription$ Target creature gets +2/+2 and gains flying until end of turn.
+Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nTarget creature gets +2/+2 and gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/aetherblade_agent_gitaxian_minsdstinger.txt b/forge-gui/res/cardsfolder/a/aetherblade_agent_gitaxian_minsdstinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aetherblade_agent_gitaxian_minsdstinger.txt
rename to forge-gui/res/cardsfolder/a/aetherblade_agent_gitaxian_minsdstinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/akki_scrapchomper.txt b/forge-gui/res/cardsfolder/a/akki_scrapchomper.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/akki_scrapchomper.txt
rename to forge-gui/res/cardsfolder/a/akki_scrapchomper.txt
index cc9585dd099..30c884495ff 100644
--- a/forge-gui/res/cardsfolder/upcoming/akki_scrapchomper.txt
+++ b/forge-gui/res/cardsfolder/a/akki_scrapchomper.txt
@@ -1,8 +1,8 @@
-Name:Akki Scrapchomper
-ManaCost:R
-Types:Creature Phyrexian Goblin
-PT:1/1
-A:AB$ Draw | Cost$ 1 R T Sac<1/Artifact;Land/artifact or land> | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:AIPreference:SacCost$Artifact.token+nonCreature,Artifact.token+powerLE1,Artifact.cmcEQ1,Artifact.cmcEQ2
-AI:RemoveDeck:Random
-Oracle:{1}{R}, {T}, Sacrifice an artifact or land: Draw a card.
+Name:Akki Scrapchomper
+ManaCost:R
+Types:Creature Phyrexian Goblin
+PT:1/1
+A:AB$ Draw | Cost$ 1 R T Sac<1/Artifact;Land/artifact or land> | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:AIPreference:SacCost$Artifact.token+nonCreature,Artifact.token+powerLE1,Artifact.cmcEQ1,Artifact.cmcEQ2
+AI:RemoveDeck:Random
+Oracle:{1}{R}, {T}, Sacrifice an artifact or land: Draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/alabaster_host_intercessor.txt b/forge-gui/res/cardsfolder/a/alabaster_host_intercessor.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/alabaster_host_intercessor.txt
rename to forge-gui/res/cardsfolder/a/alabaster_host_intercessor.txt
index cec431a878e..5d9f08ff7ca 100644
--- a/forge-gui/res/cardsfolder/upcoming/alabaster_host_intercessor.txt
+++ b/forge-gui/res/cardsfolder/a/alabaster_host_intercessor.txt
@@ -1,10 +1,10 @@
-Name:Alabaster Host Intercessor
-ManaCost:5 W
-Types:Creature Phyrexian Samurai
-PT:3/4
-K:TypeCycling:Plains:2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile target creature an opponent controls until CARDNAME leaves the battlefield.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | Duration$ UntilHostLeavesPlay
-SVar:PlayMain1:TRUE
-DeckHas:Ability$Discard
-Oracle:When Alabaster Host Intercessor enters the battlefield, exile target creature an opponent controls until Alabaster Host Intercessor leaves the battlefield.\nPlainscycling {2} ({2}, Discard this card: Search your library for a Plains card, reveal it, put it into your hand, then shuffe.)
+Name:Alabaster Host Intercessor
+ManaCost:5 W
+Types:Creature Phyrexian Samurai
+PT:3/4
+K:TypeCycling:Plains:2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile target creature an opponent controls until CARDNAME leaves the battlefield.
+SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | Duration$ UntilHostLeavesPlay
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Discard
+Oracle:When Alabaster Host Intercessor enters the battlefield, exile target creature an opponent controls until Alabaster Host Intercessor leaves the battlefield.\nPlainscycling {2} ({2}, Discard this card: Search your library for a Plains card, reveal it, put it into your hand, then shuffe.)
diff --git a/forge-gui/res/cardsfolder/upcoming/alabaster_host_sanctifier.txt b/forge-gui/res/cardsfolder/a/alabaster_host_sanctifier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alabaster_host_sanctifier.txt
rename to forge-gui/res/cardsfolder/a/alabaster_host_sanctifier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ancient_imperiosaur.txt b/forge-gui/res/cardsfolder/a/ancient_imperiosaur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ancient_imperiosaur.txt
rename to forge-gui/res/cardsfolder/a/ancient_imperiosaur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/angelic_intervention.txt b/forge-gui/res/cardsfolder/a/angelic_intervention.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/angelic_intervention.txt
rename to forge-gui/res/cardsfolder/a/angelic_intervention.txt
index c3d88ac2986..acc5ca59244 100644
--- a/forge-gui/res/cardsfolder/upcoming/angelic_intervention.txt
+++ b/forge-gui/res/cardsfolder/a/angelic_intervention.txt
@@ -1,7 +1,7 @@
-Name:Angelic Intervention
-ManaCost:1 W
-Types:Instant
-A:SP$ Protection | ValidTgts$ Creature.YouCtrl,Planeswalker.YouCtrl | TgtPrompt$ Select target creature or planeswalker you control | SubAbility$ DBCounter | Gains$ Choice | Choices$ AnyColor,colorless | SpellDescription$ Target creature or planeswalker you control gains protection from colorless or from the color of your choice until end of turn. If it's a creature, put a +1/+1 counter on it. (It can't be blocked, targeted, dealt damage, enchanted, or equipped by anything with that quality.)
-SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 1 | ConditionDefined$ Targeted | ConditionPresent$ Card.Creature
-DeckHas:Ability$Counters
+Name:Angelic Intervention
+ManaCost:1 W
+Types:Instant
+A:SP$ Protection | ValidTgts$ Creature.YouCtrl,Planeswalker.YouCtrl | TgtPrompt$ Select target creature or planeswalker you control | SubAbility$ DBCounter | Gains$ Choice | Choices$ AnyColor,colorless | SpellDescription$ Target creature or planeswalker you control gains protection from colorless or from the color of your choice until end of turn. If it's a creature, put a +1/+1 counter on it. (It can't be blocked, targeted, dealt damage, enchanted, or equipped by anything with that quality.)
+SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 1 | ConditionDefined$ Targeted | ConditionPresent$ Card.Creature
+DeckHas:Ability$Counters
 Oracle:Target creature or planeswalker you control gains protection from colorless or from the color of your choice until end of turn. If it's a creature, put a +1/+1 counter on it. (It can't be blocked, targeted, dealt damage, enchanted, or equipped by anything with that quality.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/animists_might.txt b/forge-gui/res/cardsfolder/a/animists_might.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/animists_might.txt
rename to forge-gui/res/cardsfolder/a/animists_might.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arachnoid_adaptation.txt b/forge-gui/res/cardsfolder/a/arachnoid_adaptation.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/arachnoid_adaptation.txt
rename to forge-gui/res/cardsfolder/a/arachnoid_adaptation.txt
index 253f8149b52..55dd9da0484 100644
--- a/forge-gui/res/cardsfolder/upcoming/arachnoid_adaptation.txt
+++ b/forge-gui/res/cardsfolder/a/arachnoid_adaptation.txt
@@ -1,6 +1,6 @@
-Name:Arachnoid Adaptation
-ManaCost:G
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | KW$ Reach | SubAbility$ DBUntap | SpellDescription$ Target creature gets +2/+2 and gains reach until end of turn. Untap it.
-SVar:DBUntap:DB$ Untap | Defined$ Targeted
-Oracle:Target creature gets +2/+2 and gains reach until end of turn. Untap it.
+Name:Arachnoid Adaptation
+ManaCost:G
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | KW$ Reach | SubAbility$ DBUntap | SpellDescription$ Target creature gets +2/+2 and gains reach until end of turn. Untap it.
+SVar:DBUntap:DB$ Untap | Defined$ Targeted
+Oracle:Target creature gets +2/+2 and gains reach until end of turn. Untap it.
diff --git a/forge-gui/res/cardsfolder/upcoming/archangel_elspeth.txt b/forge-gui/res/cardsfolder/a/archangel_elspeth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/archangel_elspeth.txt
rename to forge-gui/res/cardsfolder/a/archangel_elspeth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/archpriest_of_shadows.txt b/forge-gui/res/cardsfolder/a/archpriest_of_shadows.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/archpriest_of_shadows.txt
rename to forge-gui/res/cardsfolder/a/archpriest_of_shadows.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arek_false_goldwarden.txt b/forge-gui/res/cardsfolder/a/arek_false_goldwarden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arek_false_goldwarden.txt
rename to forge-gui/res/cardsfolder/a/arek_false_goldwarden.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arni_metalbrow.txt b/forge-gui/res/cardsfolder/a/arni_metalbrow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arni_metalbrow.txt
rename to forge-gui/res/cardsfolder/a/arni_metalbrow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/artistic_refusal.txt b/forge-gui/res/cardsfolder/a/artistic_refusal.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/artistic_refusal.txt
rename to forge-gui/res/cardsfolder/a/artistic_refusal.txt
index 97fb80c1642..1b079f4f214 100644
--- a/forge-gui/res/cardsfolder/upcoming/artistic_refusal.txt
+++ b/forge-gui/res/cardsfolder/a/artistic_refusal.txt
@@ -1,10 +1,10 @@
-Name:Artistic Refusal
-ManaCost:4 U U
-Types:Instant
-K:Convoke
-A:SP$ Charm | Choices$ DBCounter,DBDraw | MinCharmNum$ 1 | CharmNum$ 2
-SVar:DBCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 2 | SubAbility$ DBDiscard | SpellDescription$ Draw two cards, then discard a card.
-SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose
-DeckHas:Ability$Discard
+Name:Artistic Refusal
+ManaCost:4 U U
+Types:Instant
+K:Convoke
+A:SP$ Charm | Choices$ DBCounter,DBDraw | MinCharmNum$ 1 | CharmNum$ 2
+SVar:DBCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 2 | SubAbility$ DBDiscard | SpellDescription$ Draw two cards, then discard a card.
+SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose
+DeckHas:Ability$Discard
 Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nChoose one or both —\n• Counter target spell.\n•Draw two cards, then discard a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/assimilate_essence.txt b/forge-gui/res/cardsfolder/a/assimilate_essence.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/assimilate_essence.txt
rename to forge-gui/res/cardsfolder/a/assimilate_essence.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/astral_wingspan.txt b/forge-gui/res/cardsfolder/a/astral_wingspan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/astral_wingspan.txt
rename to forge-gui/res/cardsfolder/a/astral_wingspan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/atraxas_fall.txt b/forge-gui/res/cardsfolder/a/atraxas_fall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/atraxas_fall.txt
rename to forge-gui/res/cardsfolder/a/atraxas_fall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/attentive_skywarden.txt b/forge-gui/res/cardsfolder/a/attentive_skywarden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/attentive_skywarden.txt
rename to forge-gui/res/cardsfolder/a/attentive_skywarden.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/axgard_artisan.txt b/forge-gui/res/cardsfolder/a/axgard_artisan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/axgard_artisan.txt
rename to forge-gui/res/cardsfolder/a/axgard_artisan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ayara_widow_of_the_realm_ayara_furnace_queen.txt b/forge-gui/res/cardsfolder/a/ayara_widow_of_the_realm_ayara_furnace_queen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ayara_widow_of_the_realm_ayara_furnace_queen.txt
rename to forge-gui/res/cardsfolder/a/ayara_widow_of_the_realm_ayara_furnace_queen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ayaras_oathsworn.txt b/forge-gui/res/cardsfolder/a/ayaras_oathsworn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ayaras_oathsworn.txt
rename to forge-gui/res/cardsfolder/a/ayaras_oathsworn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/baral_and_kari_zev.txt b/forge-gui/res/cardsfolder/b/baral_and_kari_zev.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/baral_and_kari_zev.txt
rename to forge-gui/res/cardsfolder/b/baral_and_kari_zev.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/beamtown_beatstick.txt b/forge-gui/res/cardsfolder/b/beamtown_beatstick.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/beamtown_beatstick.txt
rename to forge-gui/res/cardsfolder/b/beamtown_beatstick.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/begin_the_invasion.txt b/forge-gui/res/cardsfolder/b/begin_the_invasion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/begin_the_invasion.txt
rename to forge-gui/res/cardsfolder/b/begin_the_invasion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bitterthorn_nissas_animus.txt b/forge-gui/res/cardsfolder/b/bitterthorn_nissas_animus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bitterthorn_nissas_animus.txt
rename to forge-gui/res/cardsfolder/b/bitterthorn_nissas_animus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bladed_battle_fan.txt b/forge-gui/res/cardsfolder/b/bladed_battle_fan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bladed_battle_fan.txt
rename to forge-gui/res/cardsfolder/b/bladed_battle_fan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bladehold_cleaver.txt b/forge-gui/res/cardsfolder/b/bladehold_cleaver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bladehold_cleaver.txt
rename to forge-gui/res/cardsfolder/b/bladehold_cleaver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blight_titan.txt b/forge-gui/res/cardsfolder/b/blight_titan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blight_titan.txt
rename to forge-gui/res/cardsfolder/b/blight_titan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blighted_burgeoning.txt b/forge-gui/res/cardsfolder/b/blighted_burgeoning.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/blighted_burgeoning.txt
rename to forge-gui/res/cardsfolder/b/blighted_burgeoning.txt
index 81021f1e2b5..3f3d26d10bf 100644
--- a/forge-gui/res/cardsfolder/upcoming/blighted_burgeoning.txt
+++ b/forge-gui/res/cardsfolder/b/blighted_burgeoning.txt
@@ -1,12 +1,12 @@
-Name:Blighted Burgeoning
-ManaCost:2 G
-Types:Enchantment Aura
-K:Enchant land
-A:SP$ Attach | Cost$ 2 G | ValidTgts$ Land | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigIncubate | TriggerDescription$ When CARDNAME enters the battlefield, incubate 2. (Create an Incubator token with two +1/+1 counters on it and "2: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
-SVar:TrigIncubate:DB$ Incubate | Amount$ 2
-T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds an additional one mana of any color.
-SVar:TrigMana:DB$ Mana | Produced$ Any | Amount$ 1 | Defined$ TriggeredCardController
-DeckHas:Ability$Counters|Token
-AI:RemoveDeck:All
+Name:Blighted Burgeoning
+ManaCost:2 G
+Types:Enchantment Aura
+K:Enchant land
+A:SP$ Attach | Cost$ 2 G | ValidTgts$ Land | AILogic$ Pump
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigIncubate | TriggerDescription$ When CARDNAME enters the battlefield, incubate 2. (Create an Incubator token with two +1/+1 counters on it and "2: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
+SVar:TrigIncubate:DB$ Incubate | Amount$ 2
+T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds an additional one mana of any color.
+SVar:TrigMana:DB$ Mana | Produced$ Any | Amount$ 1 | Defined$ TriggeredCardController
+DeckHas:Ability$Counters|Token
+AI:RemoveDeck:All
 Oracle:Enchant land\nWhen Blighted Burgeoning enters the battlefield, incubate 2. (Create an Incubator token with two +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)\nWhenever enchanted land is tapped for mana, its controller adds an additional one mana of any color.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/blightreaper_thallid_blightsower_thallid.txt b/forge-gui/res/cardsfolder/b/blightreaper_thallid_blightsower_thallid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blightreaper_thallid_blightsower_thallid.txt
rename to forge-gui/res/cardsfolder/b/blightreaper_thallid_blightsower_thallid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blightwing_whelp.txt b/forge-gui/res/cardsfolder/b/blightwing_whelp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blightwing_whelp.txt
rename to forge-gui/res/cardsfolder/b/blightwing_whelp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bloated_processor.txt b/forge-gui/res/cardsfolder/b/bloated_processor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bloated_processor.txt
rename to forge-gui/res/cardsfolder/b/bloated_processor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bloodfeather_phoenix.txt b/forge-gui/res/cardsfolder/b/bloodfeather_phoenix.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bloodfeather_phoenix.txt
rename to forge-gui/res/cardsfolder/b/bloodfeather_phoenix.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blot_out.txt b/forge-gui/res/cardsfolder/b/blot_out.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blot_out.txt
rename to forge-gui/res/cardsfolder/b/blot_out.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bola_slinger.txt b/forge-gui/res/cardsfolder/b/bola_slinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bola_slinger.txt
rename to forge-gui/res/cardsfolder/b/bola_slinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bonded_herdbeast_plated_kilnbeast.txt b/forge-gui/res/cardsfolder/b/bonded_herdbeast_plated_kilnbeast.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/bonded_herdbeast_plated_kilnbeast.txt
rename to forge-gui/res/cardsfolder/b/bonded_herdbeast_plated_kilnbeast.txt
index a329e08193d..0489f02681b 100644
--- a/forge-gui/res/cardsfolder/upcoming/bonded_herdbeast_plated_kilnbeast.txt
+++ b/forge-gui/res/cardsfolder/b/bonded_herdbeast_plated_kilnbeast.txt
@@ -1,18 +1,18 @@
-Name:Bonded Herdbeast
-ManaCost:4 G
-Types:Creature Beast
-PT:4/5
-A:AB$ SetState | Cost$ 4 RP | Defined$ Self | Mode$ Transform | SorcerySpeed$ True | AILogic$ Always | SpellDescription$ Transform CARDNAME. Activate only as a sorcery. ({R/P} can be paid with either {R} or 2 life.)
-AlternateMode:DoubleFaced
-DeckHints:Color$Red
-Oracle:{4}{R/P}: Transform Bonded Herdbeast. Activate only as a sorcery. ({R/P} can be paid with either {R} or 2 life.)
-
-ALTERNATE
-
-Name:Plated Kilnbeast
-ManaCost:no cost
-Colors:red,green
-Types:Creature Phyrexian Beast
-PT:7/5
-K:Menace
-Oracle:Menace (This creature can't be blocked except by two or more creatures.)
+Name:Bonded Herdbeast
+ManaCost:4 G
+Types:Creature Beast
+PT:4/5
+A:AB$ SetState | Cost$ 4 RP | Defined$ Self | Mode$ Transform | SorcerySpeed$ True | AILogic$ Always | SpellDescription$ Transform CARDNAME. Activate only as a sorcery. ({R/P} can be paid with either {R} or 2 life.)
+AlternateMode:DoubleFaced
+DeckHints:Color$Red
+Oracle:{4}{R/P}: Transform Bonded Herdbeast. Activate only as a sorcery. ({R/P} can be paid with either {R} or 2 life.)
+
+ALTERNATE
+
+Name:Plated Kilnbeast
+ManaCost:no cost
+Colors:red,green
+Types:Creature Phyrexian Beast
+PT:7/5
+K:Menace
+Oracle:Menace (This creature can't be blocked except by two or more creatures.)
diff --git a/forge-gui/res/cardsfolder/upcoming/boon_bringer_valkyrie.txt b/forge-gui/res/cardsfolder/b/boon_bringer_valkyrie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/boon_bringer_valkyrie.txt
rename to forge-gui/res/cardsfolder/b/boon_bringer_valkyrie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/borborygmos_and_fblthp.txt b/forge-gui/res/cardsfolder/b/borborygmos_and_fblthp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/borborygmos_and_fblthp.txt
rename to forge-gui/res/cardsfolder/b/borborygmos_and_fblthp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/botanical_brawler.txt b/forge-gui/res/cardsfolder/b/botanical_brawler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/botanical_brawler.txt
rename to forge-gui/res/cardsfolder/b/botanical_brawler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/breach_the_multiverse.txt b/forge-gui/res/cardsfolder/b/breach_the_multiverse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/breach_the_multiverse.txt
rename to forge-gui/res/cardsfolder/b/breach_the_multiverse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bright_palm_soul_awakener.txt b/forge-gui/res/cardsfolder/b/bright_palm_soul_awakener.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bright_palm_soul_awakener.txt
rename to forge-gui/res/cardsfolder/b/bright_palm_soul_awakener.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brimaz_blight_of_oreskos.txt b/forge-gui/res/cardsfolder/b/brimaz_blight_of_oreskos.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brimaz_blight_of_oreskos.txt
rename to forge-gui/res/cardsfolder/b/brimaz_blight_of_oreskos.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/burning_suns_fury.txt b/forge-gui/res/cardsfolder/b/burning_suns_fury.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/burning_suns_fury.txt
rename to forge-gui/res/cardsfolder/b/burning_suns_fury.txt
index e5a2abaad7e..a0186f5d48a 100644
--- a/forge-gui/res/cardsfolder/upcoming/burning_suns_fury.txt
+++ b/forge-gui/res/cardsfolder/b/burning_suns_fury.txt
@@ -1,6 +1,6 @@
-Name:Burning Sun's Fury
-ManaCost:1 R
-Types:Instant
-K:Convoke
-A:SP$ Pump | TargetMin$ 0 | TargetMax$ 2 | NumAtt$ +2 | KW$ Haste | ValidTgts$ Creature | TgtPrompt$ Select up to two target creatures | SpellDescription$ Up to two target creatures each get +2/+0 and gain haste until end of turn.
+Name:Burning Sun's Fury
+ManaCost:1 R
+Types:Instant
+K:Convoke
+A:SP$ Pump | TargetMin$ 0 | TargetMax$ 2 | NumAtt$ +2 | KW$ Haste | ValidTgts$ Creature | TgtPrompt$ Select up to two target creatures | SpellDescription$ Up to two target creatures each get +2/+0 and gain haste until end of turn.
 Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for 1 or one mana of that creature's color.)\nUp to two target creatures each get +2/+0 and gain haste until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/calix_guided_by_fate.txt b/forge-gui/res/cardsfolder/c/calix_guided_by_fate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/calix_guided_by_fate.txt
rename to forge-gui/res/cardsfolder/c/calix_guided_by_fate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/campus_renovation.txt b/forge-gui/res/cardsfolder/c/campus_renovation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/campus_renovation.txt
rename to forge-gui/res/cardsfolder/c/campus_renovation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/captive_weird_completed_conjurer.txt b/forge-gui/res/cardsfolder/c/captive_weird_completed_conjurer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/captive_weird_completed_conjurer.txt
rename to forge-gui/res/cardsfolder/c/captive_weird_completed_conjurer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chandra_hopes_beacon.txt b/forge-gui/res/cardsfolder/c/chandra_hopes_beacon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chandra_hopes_beacon.txt
rename to forge-gui/res/cardsfolder/c/chandra_hopes_beacon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/change_the_equation.txt b/forge-gui/res/cardsfolder/c/change_the_equation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/change_the_equation.txt
rename to forge-gui/res/cardsfolder/c/change_the_equation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chivalric_alliance.txt b/forge-gui/res/cardsfolder/c/chivalric_alliance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chivalric_alliance.txt
rename to forge-gui/res/cardsfolder/c/chivalric_alliance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chomping_kavu.txt b/forge-gui/res/cardsfolder/c/chomping_kavu.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chomping_kavu.txt
rename to forge-gui/res/cardsfolder/c/chomping_kavu.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chrome_host_seedshark.txt b/forge-gui/res/cardsfolder/c/chrome_host_seedshark.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chrome_host_seedshark.txt
rename to forge-gui/res/cardsfolder/c/chrome_host_seedshark.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/city_on_fire.txt b/forge-gui/res/cardsfolder/c/city_on_fire.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/city_on_fire.txt
rename to forge-gui/res/cardsfolder/c/city_on_fire.txt
index 36810086b46..e67e1ea4017 100644
--- a/forge-gui/res/cardsfolder/upcoming/city_on_fire.txt
+++ b/forge-gui/res/cardsfolder/c/city_on_fire.txt
@@ -1,8 +1,8 @@
-Name:City on Fire
-ManaCost:5 R R R
-Types:Enchantment
-K:Convoke
-R:Event$ DamageDone | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ActiveZones$ Battlefield | ValidTarget$ Player,Permanent | ReplaceWith$ DmgTriple | Description$ If a source you control would deal damage to a permanent or player, it deals triple that damage instead.
-SVar:DmgTriple:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ Z
-SVar:Z:ReplaceCount$DamageAmount/Thrice
-Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nIf a source you control would deal damage to a permanent or player, it deals triple that damage instead.
+Name:City on Fire
+ManaCost:5 R R R
+Types:Enchantment
+K:Convoke
+R:Event$ DamageDone | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ActiveZones$ Battlefield | ValidTarget$ Player,Permanent | ReplaceWith$ DmgTriple | Description$ If a source you control would deal damage to a permanent or player, it deals triple that damage instead.
+SVar:DmgTriple:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ Z
+SVar:Z:ReplaceCount$DamageAmount/Thrice
+Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nIf a source you control would deal damage to a permanent or player, it deals triple that damage instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/collective_nightmare.txt b/forge-gui/res/cardsfolder/c/collective_nightmare.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/collective_nightmare.txt
rename to forge-gui/res/cardsfolder/c/collective_nightmare.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/coming_in_hot.txt b/forge-gui/res/cardsfolder/c/coming_in_hot.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/coming_in_hot.txt
rename to forge-gui/res/cardsfolder/c/coming_in_hot.txt
index 9c4a65424c6..7126b7ec510 100644
--- a/forge-gui/res/cardsfolder/upcoming/coming_in_hot.txt
+++ b/forge-gui/res/cardsfolder/c/coming_in_hot.txt
@@ -1,7 +1,7 @@
-Name:Coming in Hot
-ManaCost:R
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | KW$ First Strike | SubAbility$ DBScry | SpellDescription$ Target creature gets +1/+0 and gains first strike until end of turn. Scry 1.
-SVar:DBScry:DB$ Scry | ScryNum$ 1
-SVar:PlayMain1:TRUE
-Oracle:Target creature gets +1/+0 and gains first strike until end of turn. Scry 1.
+Name:Coming in Hot
+ManaCost:R
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | KW$ First Strike | SubAbility$ DBScry | SpellDescription$ Target creature gets +1/+0 and gains first strike until end of turn. Scry 1.
+SVar:DBScry:DB$ Scry | ScryNum$ 1
+SVar:PlayMain1:TRUE
+Oracle:Target creature gets +1/+0 and gains first strike until end of turn. Scry 1.
diff --git a/forge-gui/res/cardsfolder/upcoming/compleated_huntmaster.txt b/forge-gui/res/cardsfolder/c/compleated_huntmaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/compleated_huntmaster.txt
rename to forge-gui/res/cardsfolder/c/compleated_huntmaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/complete_the_circuit.txt b/forge-gui/res/cardsfolder/c/complete_the_circuit.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/complete_the_circuit.txt
rename to forge-gui/res/cardsfolder/c/complete_the_circuit.txt
index df49c6de586..6f45d3d52d8 100644
--- a/forge-gui/res/cardsfolder/upcoming/complete_the_circuit.txt
+++ b/forge-gui/res/cardsfolder/c/complete_the_circuit.txt
@@ -1,10 +1,10 @@
-Name:Complete the Circuit
-ManaCost:5 U
-Types:Instant
-K:Convoke
-A:SP$ Effect | StaticAbilities$ STPlay | SubAbility$ DBDelayTrig | SpellDescription$ You may cast sorcery spells this turn as though they had flash.
-SVar:STPlay:Mode$ CastWithFlash | ValidCard$ Sorcery | ValidSA$ Spell | EffectZone$ Command | Caster$ You | Description$ You may cast sorcery spells this turn as though they had flash.
-SVar:DBDelayTrig:DB$ DelayedTrigger | AILogic$ SpellCopy | Execute$ EffTrigCopy | ThisTurn$ True | Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | SpellDescription$ When you next cast an instant or sorcery spell this turn, copy that spell twice. You may choose new targets for the copies.
-SVar:EffTrigCopy:DB$ CopySpellAbility | Amount$ 2 | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
-DeckHints:Type$Instant|Sorcery
+Name:Complete the Circuit
+ManaCost:5 U
+Types:Instant
+K:Convoke
+A:SP$ Effect | StaticAbilities$ STPlay | SubAbility$ DBDelayTrig | SpellDescription$ You may cast sorcery spells this turn as though they had flash.
+SVar:STPlay:Mode$ CastWithFlash | ValidCard$ Sorcery | ValidSA$ Spell | EffectZone$ Command | Caster$ You | Description$ You may cast sorcery spells this turn as though they had flash.
+SVar:DBDelayTrig:DB$ DelayedTrigger | AILogic$ SpellCopy | Execute$ EffTrigCopy | ThisTurn$ True | Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | SpellDescription$ When you next cast an instant or sorcery spell this turn, copy that spell twice. You may choose new targets for the copies.
+SVar:EffTrigCopy:DB$ CopySpellAbility | Amount$ 2 | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
+DeckHints:Type$Instant|Sorcery
 Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nYou may cast sorcery spells this turn as though they had flash.\nWhen you next cast an instant or sorcery spell this turn, copy that spell twice. You may choose new targets for the copies.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/conclave_sledge_captain.txt b/forge-gui/res/cardsfolder/c/conclave_sledge_captain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/conclave_sledge_captain.txt
rename to forge-gui/res/cardsfolder/c/conclave_sledge_captain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/conjurers_mantle.txt b/forge-gui/res/cardsfolder/c/conjurers_mantle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/conjurers_mantle.txt
rename to forge-gui/res/cardsfolder/c/conjurers_mantle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/consuming_aetherborn.txt b/forge-gui/res/cardsfolder/c/consuming_aetherborn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/consuming_aetherborn.txt
rename to forge-gui/res/cardsfolder/c/consuming_aetherborn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/contagion_dispenser.txt b/forge-gui/res/cardsfolder/c/contagion_dispenser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/contagion_dispenser.txt
rename to forge-gui/res/cardsfolder/c/contagion_dispenser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/converter_beast.txt b/forge-gui/res/cardsfolder/c/converter_beast.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/converter_beast.txt
rename to forge-gui/res/cardsfolder/c/converter_beast.txt
index 9e9e2bfc6dd..1c12652a723 100644
--- a/forge-gui/res/cardsfolder/upcoming/converter_beast.txt
+++ b/forge-gui/res/cardsfolder/c/converter_beast.txt
@@ -1,8 +1,8 @@
-Name:Converter Beast
-ManaCost:3 G
-Types:Creature Phyrexian Beast
-PT:0/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigIncubate | TriggerDescription$ When CARDNAME enters the battlefield, incubate 5. (Create an Incubator token with five +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
-SVar:TrigIncubate:DB$ Incubate | Amount$ 5
-DeckHas:Ability$Counters|Token & Type$Incubator|Artifact
-Oracle:When Converter Beast enters the battlefield, incubate 5. (Create an Incubator token with five +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
+Name:Converter Beast
+ManaCost:3 G
+Types:Creature Phyrexian Beast
+PT:0/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigIncubate | TriggerDescription$ When CARDNAME enters the battlefield, incubate 5. (Create an Incubator token with five +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
+SVar:TrigIncubate:DB$ Incubate | Amount$ 5
+DeckHas:Ability$Counters|Token & Type$Incubator|Artifact
+Oracle:When Converter Beast enters the battlefield, incubate 5. (Create an Incubator token with five +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
diff --git a/forge-gui/res/cardsfolder/upcoming/copper_host_crusher.txt b/forge-gui/res/cardsfolder/c/copper_host_crusher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/copper_host_crusher.txt
rename to forge-gui/res/cardsfolder/c/copper_host_crusher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/coppercoat_vanguard.txt b/forge-gui/res/cardsfolder/c/coppercoat_vanguard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/coppercoat_vanguard.txt
rename to forge-gui/res/cardsfolder/c/coppercoat_vanguard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/corrupted_conviction.txt b/forge-gui/res/cardsfolder/c/corrupted_conviction.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/corrupted_conviction.txt
rename to forge-gui/res/cardsfolder/c/corrupted_conviction.txt
index 88045a16d49..5bf45c04fa4 100644
--- a/forge-gui/res/cardsfolder/upcoming/corrupted_conviction.txt
+++ b/forge-gui/res/cardsfolder/c/corrupted_conviction.txt
@@ -1,6 +1,6 @@
-Name:Corrupted Conviction
-ManaCost:B
-Types:Instant
-A:SP$ Draw | Cost$ B Sac<1/Creature> | NumCards$ 2 | SpellDescription$ Draw two cards.
-DeckHas:Ability$Sacrifice
-Oracle:As an additional cost to cast this spell, sacrifice a creature.\nDraw two cards.
+Name:Corrupted Conviction
+ManaCost:B
+Types:Instant
+A:SP$ Draw | Cost$ B Sac<1/Creature> | NumCards$ 2 | SpellDescription$ Draw two cards.
+DeckHas:Ability$Sacrifice
+Oracle:As an additional cost to cast this spell, sacrifice a creature.\nDraw two cards.
diff --git a/forge-gui/res/cardsfolder/upcoming/corruption_of_towashi.txt b/forge-gui/res/cardsfolder/c/corruption_of_towashi.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/corruption_of_towashi.txt
rename to forge-gui/res/cardsfolder/c/corruption_of_towashi.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cosmic_hunger.txt b/forge-gui/res/cardsfolder/c/cosmic_hunger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cosmic_hunger.txt
rename to forge-gui/res/cardsfolder/c/cosmic_hunger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cosmic_rebirth.txt b/forge-gui/res/cardsfolder/c/cosmic_rebirth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cosmic_rebirth.txt
rename to forge-gui/res/cardsfolder/c/cosmic_rebirth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cragsmasher_yeti.txt b/forge-gui/res/cardsfolder/c/cragsmasher_yeti.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cragsmasher_yeti.txt
rename to forge-gui/res/cardsfolder/c/cragsmasher_yeti.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crystal_carapace.txt b/forge-gui/res/cardsfolder/c/crystal_carapace.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/crystal_carapace.txt
rename to forge-gui/res/cardsfolder/c/crystal_carapace.txt
index d37ace361f4..93e735d2efc 100644
--- a/forge-gui/res/cardsfolder/upcoming/crystal_carapace.txt
+++ b/forge-gui/res/cardsfolder/c/crystal_carapace.txt
@@ -1,9 +1,9 @@
-Name:Crystal Carapace
-ManaCost:3 G
-Types:Enchantment Aura
-K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | AddKeyword$ Ward:2 | Description$ Enchanted creature gets +3/+3 and has ward {2}.
-K:Cycling:2
-DeckHas:Ability$Discard
+Name:Crystal Carapace
+ManaCost:3 G
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | AddKeyword$ Ward:2 | Description$ Enchanted creature gets +3/+3 and has ward {2}.
+K:Cycling:2
+DeckHas:Ability$Discard
 Oracle:Enchant creature\nEnchanted creature gets +3/+3 and has ward {2}.\nCycling {2} ({2}, Discard this card: Draw a card.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/cut_short.txt b/forge-gui/res/cardsfolder/c/cut_short.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cut_short.txt
rename to forge-gui/res/cardsfolder/c/cut_short.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cutthroat_negotiator.txt b/forge-gui/res/cardsfolder/c/cutthroat_negotiator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cutthroat_negotiator.txt
rename to forge-gui/res/cardsfolder/c/cutthroat_negotiator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dance_with_calamity.txt b/forge-gui/res/cardsfolder/d/dance_with_calamity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dance_with_calamity.txt
rename to forge-gui/res/cardsfolder/d/dance_with_calamity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/danitha_new_benalias_light.txt b/forge-gui/res/cardsfolder/d/danitha_new_benalias_light.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/danitha_new_benalias_light.txt
rename to forge-gui/res/cardsfolder/d/danitha_new_benalias_light.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/darksteel_hydra.txt b/forge-gui/res/cardsfolder/d/darksteel_hydra.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/darksteel_hydra.txt
rename to forge-gui/res/cardsfolder/d/darksteel_hydra.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/darksteel_splicer.txt b/forge-gui/res/cardsfolder/d/darksteel_splicer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/darksteel_splicer.txt
rename to forge-gui/res/cardsfolder/d/darksteel_splicer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deadly_derision.txt b/forge-gui/res/cardsfolder/d/deadly_derision.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/deadly_derision.txt
rename to forge-gui/res/cardsfolder/d/deadly_derision.txt
index c4157b7d048..49ccf51613d 100644
--- a/forge-gui/res/cardsfolder/upcoming/deadly_derision.txt
+++ b/forge-gui/res/cardsfolder/d/deadly_derision.txt
@@ -1,7 +1,7 @@
-Name:Deadly Derision
-ManaCost:2 B B
-Types:Instant
-A:SP$ Destroy | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | SubAbility$ DBToken | SpellDescription$ Destroy target creature or planeswalker.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SpellDescription$ Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
-DeckHas:Ability$Token|Sacrifice & Type$Treasure|Artifact
-Oracle:Destroy target creature or planeswalker. Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+Name:Deadly Derision
+ManaCost:2 B B
+Types:Instant
+A:SP$ Destroy | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | SubAbility$ DBToken | SpellDescription$ Destroy target creature or planeswalker.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SpellDescription$ Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+DeckHas:Ability$Token|Sacrifice & Type$Treasure|Artifact
+Oracle:Destroy target creature or planeswalker. 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/death_greeters_champion.txt b/forge-gui/res/cardsfolder/d/death_greeters_champion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/death_greeters_champion.txt
rename to forge-gui/res/cardsfolder/d/death_greeters_champion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/death_rattle_oni.txt b/forge-gui/res/cardsfolder/d/death_rattle_oni.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/death_rattle_oni.txt
rename to forge-gui/res/cardsfolder/d/death_rattle_oni.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deeproot_wayfinder.txt b/forge-gui/res/cardsfolder/d/deeproot_wayfinder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deeproot_wayfinder.txt
rename to forge-gui/res/cardsfolder/d/deeproot_wayfinder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deification.txt b/forge-gui/res/cardsfolder/d/deification.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deification.txt
rename to forge-gui/res/cardsfolder/d/deification.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deluxe_dragster.txt b/forge-gui/res/cardsfolder/d/deluxe_dragster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deluxe_dragster.txt
rename to forge-gui/res/cardsfolder/d/deluxe_dragster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/disturbing_conversion.txt b/forge-gui/res/cardsfolder/d/disturbing_conversion.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/disturbing_conversion.txt
rename to forge-gui/res/cardsfolder/d/disturbing_conversion.txt
index 8a4e9421b28..cda6109bdcd 100644
--- a/forge-gui/res/cardsfolder/upcoming/disturbing_conversion.txt
+++ b/forge-gui/res/cardsfolder/d/disturbing_conversion.txt
@@ -1,12 +1,12 @@
-Name:Disturbing Conversion
-ManaCost:1 U
-Types:Enchantment Aura
-K:Flash
-K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -X | Description$ Enchanted creature gets -X/-0, where X is the number of cards in its controller's graveyard.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, each player mills two cards.
-SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ Player
-SVar:X:Count$ValidGraveyard Card.EnchantedControllerCtrl
-DeckHints:Ability$Graveyard|Mill
+Name:Disturbing Conversion
+ManaCost:1 U
+Types:Enchantment Aura
+K:Flash
+K:Enchant creature
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Curse
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -X | Description$ Enchanted creature gets -X/-0, where X is the number of cards in its controller's graveyard.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, each player mills two cards.
+SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ Player
+SVar:X:Count$ValidGraveyard Card.EnchantedControllerCtrl
+DeckHints:Ability$Graveyard|Mill
 Oracle:Flash\nEnchant creature\nWhen Disturbing Conversion enters the battlefield, each player mills two cards.\nEnchanted creature gets -X/-0, where X is the number of cards in its controller's graveyard.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/djeru_and_hazoret.txt b/forge-gui/res/cardsfolder/d/djeru_and_hazoret.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/djeru_and_hazoret.txt
rename to forge-gui/res/cardsfolder/d/djeru_and_hazoret.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/doomskar_warrior.txt b/forge-gui/res/cardsfolder/d/doomskar_warrior.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/doomskar_warrior.txt
rename to forge-gui/res/cardsfolder/d/doomskar_warrior.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/doric_natures_warden_doric_owlbear_avenger.txt b/forge-gui/res/cardsfolder/d/doric_natures_warden_doric_owlbear_avenger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/doric_natures_warden_doric_owlbear_avenger.txt
rename to forge-gui/res/cardsfolder/d/doric_natures_warden_doric_owlbear_avenger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drana_and_linvala.txt b/forge-gui/res/cardsfolder/d/drana_and_linvala.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/drana_and_linvala.txt
rename to forge-gui/res/cardsfolder/d/drana_and_linvala.txt
index dbbf4a48cbb..90670890a6e 100644
--- a/forge-gui/res/cardsfolder/upcoming/drana_and_linvala.txt
+++ b/forge-gui/res/cardsfolder/d/drana_and_linvala.txt
@@ -1,10 +1,10 @@
-Name:Drana and Linvala
-ManaCost:1 W W B
-Types:Legendary Creature Vampire Angel
-PT:3/4
-K:Flying
-K:Vigilance
-S:Mode$ CantBeActivated | Activator$ Opponent | AffectedZone$ Battlefield | ValidCard$ Creature | ValidSA$ Activated | Description$ Activated abilities of creatures your opponents control can't be activated.
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOf$ Creature.OppCtrl | GainsValidAbilities$ Activated | GainsAbilitiesActivateIgnoreColor$ AnyType->AnyColor | Description$ CARDNAME has all activated abilities of all creatures your opponents control. You may spend mana as though it were mana of any color to activate those abilities.
-SVar:PlayMain1:TRUE
-Oracle:Flying, vigilance\nActivated abilities of creatures your opponents control can't be activated.\nDrana and Linvala has all activated abilities of all creatures your opponents control. You may spend mana as though it were mana of any color to activate those abilities.
+Name:Drana and Linvala
+ManaCost:1 W W B
+Types:Legendary Creature Vampire Angel
+PT:3/4
+K:Flying
+K:Vigilance
+S:Mode$ CantBeActivated | Activator$ Opponent | AffectedZone$ Battlefield | ValidCard$ Creature | ValidSA$ Activated | Description$ Activated abilities of creatures your opponents control can't be activated.
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOf$ Creature.OppCtrl | GainsValidAbilities$ Activated | GainsAbilitiesActivateIgnoreColor$ AnyType->AnyColor | Description$ CARDNAME has all activated abilities of all creatures your opponents control. You may spend mana as though it were mana of any color to activate those abilities.
+SVar:PlayMain1:TRUE
+Oracle:Flying, vigilance\nActivated abilities of creatures your opponents control can't be activated.\nDrana and Linvala has all activated abilities of all creatures your opponents control. You may spend mana as though it were mana of any color to activate those abilities.
diff --git a/forge-gui/res/cardsfolder/upcoming/drannith_ruins.txt b/forge-gui/res/cardsfolder/d/drannith_ruins.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drannith_ruins.txt
rename to forge-gui/res/cardsfolder/d/drannith_ruins.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dreg_recycler.txt b/forge-gui/res/cardsfolder/d/dreg_recycler.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/dreg_recycler.txt
rename to forge-gui/res/cardsfolder/d/dreg_recycler.txt
index 6746b6b296d..4d8739614f7 100644
--- a/forge-gui/res/cardsfolder/upcoming/dreg_recycler.txt
+++ b/forge-gui/res/cardsfolder/d/dreg_recycler.txt
@@ -1,8 +1,8 @@
-Name:Dreg Recycler
-ManaCost:1 B
-Types:Creature Phyrexian Beast
-PT:2/2
-A:AB$ LoseLife | Cost$ T Sac<1/Creature;Artifact/creature or artifact> | Defined$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife | SpellDescription$ Each opponent loses 1 life and you gain 1 life.
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-DeckHas:Ability$LifeGain|Sacrifice
+Name:Dreg Recycler
+ManaCost:1 B
+Types:Creature Phyrexian Beast
+PT:2/2
+A:AB$ LoseLife | Cost$ T Sac<1/Creature;Artifact/creature or artifact> | Defined$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife | SpellDescription$ Each opponent loses 1 life and you gain 1 life.
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+DeckHas:Ability$LifeGain|Sacrifice
 Oracle:{T}, Sacrifice an artifact or creature: Each opponent loses 1 life and you gain 1 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/dusk_legion_duelist.txt b/forge-gui/res/cardsfolder/d/dusk_legion_duelist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dusk_legion_duelist.txt
rename to forge-gui/res/cardsfolder/d/dusk_legion_duelist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/edgin_larcenous_lutenist.txt b/forge-gui/res/cardsfolder/e/edgin_larcenous_lutenist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/edgin_larcenous_lutenist.txt
rename to forge-gui/res/cardsfolder/e/edgin_larcenous_lutenist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elenda_and_azor.txt b/forge-gui/res/cardsfolder/e/elenda_and_azor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elenda_and_azor.txt
rename to forge-gui/res/cardsfolder/e/elenda_and_azor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elesh_norn_the_argent_etchings.txt b/forge-gui/res/cardsfolder/e/elesh_norn_the_argent_etchings.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elesh_norn_the_argent_etchings.txt
rename to forge-gui/res/cardsfolder/e/elesh_norn_the_argent_etchings.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elspeths_smite.txt b/forge-gui/res/cardsfolder/e/elspeths_smite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elspeths_smite.txt
rename to forge-gui/res/cardsfolder/e/elspeths_smite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elspeths_talent.txt b/forge-gui/res/cardsfolder/e/elspeths_talent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elspeths_talent.txt
rename to forge-gui/res/cardsfolder/e/elspeths_talent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elvish_vatkeeper.txt b/forge-gui/res/cardsfolder/e/elvish_vatkeeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elvish_vatkeeper.txt
rename to forge-gui/res/cardsfolder/e/elvish_vatkeeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/emergent woodwurm.txt b/forge-gui/res/cardsfolder/e/emergent woodwurm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/emergent woodwurm.txt
rename to forge-gui/res/cardsfolder/e/emergent woodwurm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/enduring_bondwarden.txt b/forge-gui/res/cardsfolder/e/enduring_bondwarden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/enduring_bondwarden.txt
rename to forge-gui/res/cardsfolder/e/enduring_bondwarden.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/enigma_ridges.txt b/forge-gui/res/cardsfolder/e/enigma_ridges.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/enigma_ridges.txt
rename to forge-gui/res/cardsfolder/e/enigma_ridges.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/epharas_dispersal.txt b/forge-gui/res/cardsfolder/e/epharas_dispersal.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/epharas_dispersal.txt
rename to forge-gui/res/cardsfolder/e/epharas_dispersal.txt
index ccc9665fda6..83262d698b2 100644
--- a/forge-gui/res/cardsfolder/upcoming/epharas_dispersal.txt
+++ b/forge-gui/res/cardsfolder/e/epharas_dispersal.txt
@@ -1,8 +1,8 @@
-Name:Ephara's Dispersal
-ManaCost:2 U
-Types:Instant
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | ValidTarget$ Creature.attacking | EffectZone$ All | Description$ This spell costs {2} less to cast if it targets an attacking creature.
-A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature | SubAbility$ DBSurveil | SpellDescription$ Return target creature to its owner's hand. Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
-SVar:DBSurveil:DB$ Surveil | Amount$ 2
-DeckHas:Ability$Graveyard
-Oracle:This spell costs {2} less to cast if it targets an attacking creature.\nReturn target creature to its owner's hand. Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
+Name:Ephara's Dispersal
+ManaCost:2 U
+Types:Instant
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | ValidTarget$ Creature.attacking | EffectZone$ All | Description$ This spell costs {2} less to cast if it targets an attacking creature.
+A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature | SubAbility$ DBSurveil | SpellDescription$ Return target creature to its owner's hand. Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
+SVar:DBSurveil:DB$ Surveil | Amount$ 2
+DeckHas:Ability$Graveyard
+Oracle:This spell costs {2} less to cast if it targets an attacking creature.\nReturn target creature to its owner's hand. Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/upcoming/errant_and_giada.txt b/forge-gui/res/cardsfolder/e/errant_and_giada.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/errant_and_giada.txt
rename to forge-gui/res/cardsfolder/e/errant_and_giada.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/esper.txt b/forge-gui/res/cardsfolder/e/esper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/esper.txt
rename to forge-gui/res/cardsfolder/e/esper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/essence_of_orthodoxy.txt b/forge-gui/res/cardsfolder/e/essence_of_orthodoxy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/essence_of_orthodoxy.txt
rename to forge-gui/res/cardsfolder/e/essence_of_orthodoxy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/etali_primal_conqueror_etali_primal_sickness.txt b/forge-gui/res/cardsfolder/e/etali_primal_conqueror_etali_primal_sickness.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/etali_primal_conqueror_etali_primal_sickness.txt
rename to forge-gui/res/cardsfolder/e/etali_primal_conqueror_etali_primal_sickness.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/etched_familiar.txt b/forge-gui/res/cardsfolder/e/etched_familiar.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/etched_familiar.txt
rename to forge-gui/res/cardsfolder/e/etched_familiar.txt
index ce2bce5fafa..529ec3f9d4d 100644
--- a/forge-gui/res/cardsfolder/upcoming/etched_familiar.txt
+++ b/forge-gui/res/cardsfolder/e/etched_familiar.txt
@@ -1,9 +1,9 @@
-Name:Etched Familiar
-ManaCost:2 B
-Types:Artifact Creature Phyrexian Fox
-PT:3/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME dies, each opponent loses 2 life and you gain 2 life.
-SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredCardOpponent | LifeAmount$ 2 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ TriggeredCardController | LifeAmount$ 2
-DeckHas:Ability$LifeGain
+Name:Etched Familiar
+ManaCost:2 B
+Types:Artifact Creature Phyrexian Fox
+PT:3/2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME dies, each opponent loses 2 life and you gain 2 life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredCardOpponent | LifeAmount$ 2 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ TriggeredCardController | LifeAmount$ 2
+DeckHas:Ability$LifeGain
 Oracle:When Etched Familiar dies, each opponent loses 2 life and you gain 2 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/etched_host_doombringer.txt b/forge-gui/res/cardsfolder/e/etched_host_doombringer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/etched_host_doombringer.txt
rename to forge-gui/res/cardsfolder/e/etched_host_doombringer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/excise_the_imperfect.txt b/forge-gui/res/cardsfolder/e/excise_the_imperfect.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/excise_the_imperfect.txt
rename to forge-gui/res/cardsfolder/e/excise_the_imperfect.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/expedition_lookout.txt b/forge-gui/res/cardsfolder/e/expedition_lookout.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/expedition_lookout.txt
rename to forge-gui/res/cardsfolder/e/expedition_lookout.txt
index 61dc3f3f9a1..3859ec355bf 100644
--- a/forge-gui/res/cardsfolder/upcoming/expedition_lookout.txt
+++ b/forge-gui/res/cardsfolder/e/expedition_lookout.txt
@@ -1,10 +1,10 @@
-Name:Expedition Lookout
-ManaCost:1 U
-Types:Creature Merfolk Rogue
-PT:2/3
-K:Defender
-S:Mode$ CanAttackDefender | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ GE8 | Description$ As long as an opponent has eight or more cards in their graveyard, CARDNAME can attack as though it didn't have defender and it can't be blocked.
-S:Mode$ CantBlockBy | ValidAttacker$  Card.Self | CheckSVar$ X | SVarCompare$ GE8
-SVar:X:PlayerCountOpponents$HighestCardsInGraveyard
-DeckHints:Ability$Graveyard|Mill
+Name:Expedition Lookout
+ManaCost:1 U
+Types:Creature Merfolk Rogue
+PT:2/3
+K:Defender
+S:Mode$ CanAttackDefender | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ GE8 | Description$ As long as an opponent has eight or more cards in their graveyard, CARDNAME can attack as though it didn't have defender and it can't be blocked.
+S:Mode$ CantBlockBy | ValidAttacker$  Card.Self | CheckSVar$ X | SVarCompare$ GE8
+SVar:X:PlayerCountOpponents$HighestCardsInGraveyard
+DeckHints:Ability$Graveyard|Mill
 Oracle:Defender\nAs long as an opponent has eight or more cards in their graveyard, Expedition Lookout can attack as though it didn't have defender and it can't be blocked.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/exsanguinator_cavalry.txt b/forge-gui/res/cardsfolder/e/exsanguinator_cavalry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/exsanguinator_cavalry.txt
rename to forge-gui/res/cardsfolder/e/exsanguinator_cavalry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eyes_of_gitaxias.txt b/forge-gui/res/cardsfolder/e/eyes_of_gitaxias.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eyes_of_gitaxias.txt
rename to forge-gui/res/cardsfolder/e/eyes_of_gitaxias.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/faerie_mastermind.txt b/forge-gui/res/cardsfolder/f/faerie_mastermind.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/faerie_mastermind.txt
rename to forge-gui/res/cardsfolder/f/faerie_mastermind.txt
index 5838cc8b121..94d783afb3c 100644
--- a/forge-gui/res/cardsfolder/upcoming/faerie_mastermind.txt
+++ b/forge-gui/res/cardsfolder/f/faerie_mastermind.txt
@@ -1,10 +1,10 @@
-Name:Faerie Mastermind
-ManaCost:1 U
-Types:Creature Faerie Rogue
-PT:2/1
-K:Flash
-K:Flying
-T:Mode$ Drawn | ValidPlayer$ Opponent | Number$ 2 | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent draws their second card each turn, you draw a card.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
-A:AB$ Draw | Cost$ 3 U | Defined$ Player | SpellDescription$ Each player draws a card.
-Oracle:Flash\nFlying\nWhenever an opponent draws their second card each turn, you draw a card.\n{3}{U}: Each player draws a card.
+Name:Faerie Mastermind
+ManaCost:1 U
+Types:Creature Faerie Rogue
+PT:2/1
+K:Flash
+K:Flying
+T:Mode$ Drawn | ValidPlayer$ Opponent | Number$ 2 | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent draws their second card each turn, you draw a card.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
+A:AB$ Draw | Cost$ 3 U | Defined$ Player | SpellDescription$ Each player draws a card.
+Oracle:Flash\nFlying\nWhenever an opponent draws their second card each turn, you draw a card.\n{3}{U}: Each player draws a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/failed_conversion.txt b/forge-gui/res/cardsfolder/f/failed_conversion.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/failed_conversion.txt
rename to forge-gui/res/cardsfolder/f/failed_conversion.txt
index 3c80433c422..0c4a7daeca6 100644
--- a/forge-gui/res/cardsfolder/upcoming/failed_conversion.txt
+++ b/forge-gui/res/cardsfolder/f/failed_conversion.txt
@@ -1,9 +1,9 @@
-Name:Failed Conversion
-ManaCost:4 B
-Types:Enchantment Aura
-K:Enchant creature
-A:SP$ Attach | Cost$ 4 B | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -4 | AddToughness$ -4 | Description$ Enchanted creature gets -4/-4
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigSurveil | TriggerDescription$ When enchanted creature dies, surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
-SVar:TrigSurveil:DB$ Surveil | Amount$ 2
+Name:Failed Conversion
+ManaCost:4 B
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | Cost$ 4 B | ValidTgts$ Creature | AILogic$ Curse
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -4 | AddToughness$ -4 | Description$ Enchanted creature gets -4/-4
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigSurveil | TriggerDescription$ When enchanted creature dies, surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
+SVar:TrigSurveil:DB$ Surveil | Amount$ 2
 Oracle:Enchant creature\nEnchanted creature gets -4/-4.\nWhen enchanted creature dies, surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/fearless_skald.txt b/forge-gui/res/cardsfolder/f/fearless_skald.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fearless_skald.txt
rename to forge-gui/res/cardsfolder/f/fearless_skald.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/feast_of_the_victorious_dead.txt b/forge-gui/res/cardsfolder/f/feast_of_the_victorious_dead.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/feast_of_the_victorious_dead.txt
rename to forge-gui/res/cardsfolder/f/feast_of_the_victorious_dead.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fertilids_favor.txt b/forge-gui/res/cardsfolder/f/fertilids_favor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fertilids_favor.txt
rename to forge-gui/res/cardsfolder/f/fertilids_favor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/filigree_vector.txt b/forge-gui/res/cardsfolder/f/filigree_vector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/filigree_vector.txt
rename to forge-gui/res/cardsfolder/f/filigree_vector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/filter_out.txt b/forge-gui/res/cardsfolder/f/filter_out.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/filter_out.txt
rename to forge-gui/res/cardsfolder/f/filter_out.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/final_flourish.txt b/forge-gui/res/cardsfolder/f/final_flourish.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/final_flourish.txt
rename to forge-gui/res/cardsfolder/f/final_flourish.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/firemane_commando.txt b/forge-gui/res/cardsfolder/f/firemane_commando.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/firemane_commando.txt
rename to forge-gui/res/cardsfolder/f/firemane_commando.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flitting_guerrilla.txt b/forge-gui/res/cardsfolder/f/flitting_guerrilla.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flitting_guerrilla.txt
rename to forge-gui/res/cardsfolder/f/flitting_guerrilla.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flockchaser_phantom.txt b/forge-gui/res/cardsfolder/f/flockchaser_phantom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flockchaser_phantom.txt
rename to forge-gui/res/cardsfolder/f/flockchaser_phantom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flywheel_racer.txt b/forge-gui/res/cardsfolder/f/flywheel_racer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flywheel_racer.txt
rename to forge-gui/res/cardsfolder/f/flywheel_racer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/forge_neverwinter_charlatan.txt b/forge-gui/res/cardsfolder/f/forge_neverwinter_charlatan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/forge_neverwinter_charlatan.txt
rename to forge-gui/res/cardsfolder/f/forge_neverwinter_charlatan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/furnace_gremlin.txt b/forge-gui/res/cardsfolder/f/furnace_gremlin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/furnace_gremlin.txt
rename to forge-gui/res/cardsfolder/f/furnace_gremlin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/furnace_host_charger.txt b/forge-gui/res/cardsfolder/f/furnace_host_charger.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/furnace_host_charger.txt
rename to forge-gui/res/cardsfolder/f/furnace_host_charger.txt
index 212a0452180..3ce368a5566 100644
--- a/forge-gui/res/cardsfolder/upcoming/furnace_host_charger.txt
+++ b/forge-gui/res/cardsfolder/f/furnace_host_charger.txt
@@ -1,8 +1,8 @@
-Name:Furnace Host Charger
-ManaCost:5 R
-Types:Creature Phyrexian Giant
-PT:5/5
-K:TypeCycling:Mountain:2
-K:Haste
-DeckHas:Ability$Discard
+Name:Furnace Host Charger
+ManaCost:5 R
+Types:Creature Phyrexian Giant
+PT:5/5
+K:TypeCycling:Mountain:2
+K:Haste
+DeckHas:Ability$Discard
 Oracle:Haste\nMountaincycling {2} ({2}, Discard this card: Search your library for a Mountain card, reveal it, put it into your hand, then shuffle.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/furnace_reins.txt b/forge-gui/res/cardsfolder/f/furnace_reins.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/furnace_reins.txt
rename to forge-gui/res/cardsfolder/f/furnace_reins.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/furtive_analyst.txt b/forge-gui/res/cardsfolder/f/furtive_analyst.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/furtive_analyst.txt
rename to forge-gui/res/cardsfolder/f/furtive_analyst.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ghalma_the_shaper.txt b/forge-gui/res/cardsfolder/g/ghalma_the_shaper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ghalma_the_shaper.txt
rename to forge-gui/res/cardsfolder/g/ghalma_the_shaper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ghalta_and_mavren.txt b/forge-gui/res/cardsfolder/g/ghalta_and_mavren.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/ghalta_and_mavren.txt
rename to forge-gui/res/cardsfolder/g/ghalta_and_mavren.txt
index 73af64a85fc..12e6115b223 100644
--- a/forge-gui/res/cardsfolder/upcoming/ghalta_and_mavren.txt
+++ b/forge-gui/res/cardsfolder/g/ghalta_and_mavren.txt
@@ -1,13 +1,13 @@
-Name:Ghalta and Mavren
-ManaCost:3 G G W W
-Types:Legendary Creature Dinosaur Vampire
-PT:12/12
-K:Trample
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigCharm | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, ABILITY
-SVar:TrigCharm:DB$ Charm | CharmNum$ 1 | Choices$ DBDino,DBVampire
-SVar:DBDino:DB$ Token | TokenAmount$ 1 | TokenOwner$ You | TokenScript$ g_x_x_dinosaur_trample | TokenPower$ X | TokenToughness$ X | TokenTapped$ True | TokenAttacking$ True | TokenOwner$ You | SpellDescription$ Create a tapped and attacking X/X green Dinosaur creature token with trample, where X is the greatest power among other attacking creatures.
-SVar:DBVampire:DB$ Token | TokenAmount$ Y | TokenScript$ w_1_1_vampire_lifelink | TokenOwner$ You | SpellDescription$ Create X 1/1 white Vampire creature tokens with lifelink, where X is the number of other attacking creatures.
-SVar:X:Count$Valid Creature.YouCtrl+Other+attacking$GreatestPower
-SVar:Y:Count$Valid Creature.attacking+Other
-DeckHas:Ability$LifeGain|Token
-Oracle:Trample\nWhenever you attack, choose one —\n• Create a tapped and attacking X/X green Dinosaur creature token with trample, where X is the greatest power among other attacking creatures.\n• Create X 1/1 white Vampire creature tokens with lifelink, where X is the number of other attacking creatures.
+Name:Ghalta and Mavren
+ManaCost:3 G G W W
+Types:Legendary Creature Dinosaur Vampire
+PT:12/12
+K:Trample
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigCharm | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, ABILITY
+SVar:TrigCharm:DB$ Charm | CharmNum$ 1 | Choices$ DBDino,DBVampire
+SVar:DBDino:DB$ Token | TokenAmount$ 1 | TokenOwner$ You | TokenScript$ g_x_x_dinosaur_trample | TokenPower$ X | TokenToughness$ X | TokenTapped$ True | TokenAttacking$ True | TokenOwner$ You | SpellDescription$ Create a tapped and attacking X/X green Dinosaur creature token with trample, where X is the greatest power among other attacking creatures.
+SVar:DBVampire:DB$ Token | TokenAmount$ Y | TokenScript$ w_1_1_vampire_lifelink | TokenOwner$ You | SpellDescription$ Create X 1/1 white Vampire creature tokens with lifelink, where X is the number of other attacking creatures.
+SVar:X:Count$Valid Creature.YouCtrl+Other+attacking$GreatestPower
+SVar:Y:Count$Valid Creature.attacking+Other
+DeckHas:Ability$LifeGain|Token
+Oracle:Trample\nWhenever you attack, choose one —\n• Create a tapped and attacking X/X green Dinosaur creature token with trample, where X is the greatest power among other attacking creatures.\n• Create X 1/1 white Vampire creature tokens with lifelink, where X is the number of other attacking creatures.
diff --git a/forge-gui/res/cardsfolder/upcoming/ghirapur.txt b/forge-gui/res/cardsfolder/g/ghirapur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ghirapur.txt
rename to forge-gui/res/cardsfolder/g/ghirapur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gift_of_compleation.txt b/forge-gui/res/cardsfolder/g/gift_of_compleation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gift_of_compleation.txt
rename to forge-gui/res/cardsfolder/g/gift_of_compleation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gimbal_gremlin_prodigy.txt b/forge-gui/res/cardsfolder/g/gimbal_gremlin_prodigy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gimbal_gremlin_prodigy.txt
rename to forge-gui/res/cardsfolder/g/gimbal_gremlin_prodigy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glissa_herald_of_predation.txt b/forge-gui/res/cardsfolder/g/glissa_herald_of_predation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glissa_herald_of_predation.txt
rename to forge-gui/res/cardsfolder/g/glissa_herald_of_predation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glistening_dawn.txt b/forge-gui/res/cardsfolder/g/glistening_dawn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glistening_dawn.txt
rename to forge-gui/res/cardsfolder/g/glistening_dawn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glistening_deluge.txt b/forge-gui/res/cardsfolder/g/glistening_deluge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glistening_deluge.txt
rename to forge-gui/res/cardsfolder/g/glistening_deluge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glistening_extractor.txt b/forge-gui/res/cardsfolder/g/glistening_extractor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glistening_extractor.txt
rename to forge-gui/res/cardsfolder/g/glistening_extractor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gloomfang_mauler.txt b/forge-gui/res/cardsfolder/g/gloomfang_mauler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gloomfang_mauler.txt
rename to forge-gui/res/cardsfolder/g/gloomfang_mauler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gnottvold_hermit_chrome_host_hulk.txt b/forge-gui/res/cardsfolder/g/gnottvold_hermit_chrome_host_hulk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gnottvold_hermit_chrome_host_hulk.txt
rename to forge-gui/res/cardsfolder/g/gnottvold_hermit_chrome_host_hulk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gold_forged_thopteryx.txt b/forge-gui/res/cardsfolder/g/gold_forged_thopteryx.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gold_forged_thopteryx.txt
rename to forge-gui/res/cardsfolder/g/gold_forged_thopteryx.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/golden_scale_aeronaut.txt b/forge-gui/res/cardsfolder/g/golden_scale_aeronaut.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/golden_scale_aeronaut.txt
rename to forge-gui/res/cardsfolder/g/golden_scale_aeronaut.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goro_goro_and_satoru.txt b/forge-gui/res/cardsfolder/g/goro_goro_and_satoru.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/goro_goro_and_satoru.txt
rename to forge-gui/res/cardsfolder/g/goro_goro_and_satoru.txt
index c62ed069220..4d35de42fff 100644
--- a/forge-gui/res/cardsfolder/upcoming/goro_goro_and_satoru.txt
+++ b/forge-gui/res/cardsfolder/g/goro_goro_and_satoru.txt
@@ -1,10 +1,10 @@
-Name:Goro-Goro and Satoru
-ManaCost:U B R
-Types:Legendary Creature Goblin Human
-PT:3/4
-T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl+ThisTurnEntered  | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever one or more creatures you control that entered the battlefield this turn deal combat damage to a player, create a 5/5 red Dragon Spirit creature token with flying.
-SVar:TrigToken:DB$ Token | TokenScript$ r_5_5_dragon_spirit_flying
-A:AB$ PumpAll | Cost$ 1 R | ValidCards$ Creature.YouCtrl | KW$ Haste | SpellDescription$ Creatures you control gain haste until end of turn.
-DeckHas:Ability$Token & Type$Dragon|Spirit
-DeckHints:Type$Equipment|Aura & Ability$Counters
-Oracle:Whenever one or more creatures you control that entered the battlefield this turn deal combat damage to a player, create a 5/5 red Dragon Spirit creature token with flying.\n{1}{R}: Creatures you control gain haste until end of turn.
+Name:Goro-Goro and Satoru
+ManaCost:U B R
+Types:Legendary Creature Goblin Human
+PT:3/4
+T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl+ThisTurnEntered  | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever one or more creatures you control that entered the battlefield this turn deal combat damage to a player, create a 5/5 red Dragon Spirit creature token with flying.
+SVar:TrigToken:DB$ Token | TokenScript$ r_5_5_dragon_spirit_flying
+A:AB$ PumpAll | Cost$ 1 R | ValidCards$ Creature.YouCtrl | KW$ Haste | SpellDescription$ Creatures you control gain haste until end of turn.
+DeckHas:Ability$Token & Type$Dragon|Spirit
+DeckHints:Type$Equipment|Aura & Ability$Counters
+Oracle:Whenever one or more creatures you control that entered the battlefield this turn deal combat damage to a player, create a 5/5 red Dragon Spirit creature token with flying.\n{1}{R}: Creatures you control gain haste until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/grafted_butcher.txt b/forge-gui/res/cardsfolder/g/grafted_butcher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/grafted_butcher.txt
rename to forge-gui/res/cardsfolder/g/grafted_butcher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/guardian_of_ghirapur.txt b/forge-gui/res/cardsfolder/g/guardian_of_ghirapur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/guardian_of_ghirapur.txt
rename to forge-gui/res/cardsfolder/g/guardian_of_ghirapur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/guardian_scalelord.txt b/forge-gui/res/cardsfolder/g/guardian_scalelord.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/guardian_scalelord.txt
rename to forge-gui/res/cardsfolder/g/guardian_scalelord.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gyox_brutal_carnivora.txt b/forge-gui/res/cardsfolder/g/gyox_brutal_carnivora.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gyox_brutal_carnivora.txt
rename to forge-gui/res/cardsfolder/g/gyox_brutal_carnivora.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/halo_charged_skaab.txt b/forge-gui/res/cardsfolder/h/halo_charged_skaab.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/halo_charged_skaab.txt
rename to forge-gui/res/cardsfolder/h/halo_charged_skaab.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/halo_forager.txt b/forge-gui/res/cardsfolder/h/halo_forager.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/halo_forager.txt
rename to forge-gui/res/cardsfolder/h/halo_forager.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/halo_hopper.txt b/forge-gui/res/cardsfolder/h/halo_hopper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/halo_hopper.txt
rename to forge-gui/res/cardsfolder/h/halo_hopper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hangar_scrounger.txt b/forge-gui/res/cardsfolder/h/hangar_scrounger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hangar_scrounger.txt
rename to forge-gui/res/cardsfolder/h/hangar_scrounger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/harnessed_snubhorn.txt b/forge-gui/res/cardsfolder/h/harnessed_snubhorn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/harnessed_snubhorn.txt
rename to forge-gui/res/cardsfolder/h/harnessed_snubhorn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/harried_artisan_phyrexian_skyflayer.txt b/forge-gui/res/cardsfolder/h/harried_artisan_phyrexian_skyflayer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/harried_artisan_phyrexian_skyflayer.txt
rename to forge-gui/res/cardsfolder/h/harried_artisan_phyrexian_skyflayer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hedron_detonator.txt b/forge-gui/res/cardsfolder/h/hedron_detonator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hedron_detonator.txt
rename to forge-gui/res/cardsfolder/h/hedron_detonator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/heliod_the_radiant_dawn_heliod_the_warped_eclipse.txt b/forge-gui/res/cardsfolder/h/heliod_the_radiant_dawn_heliod_the_warped_eclipse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/heliod_the_radiant_dawn_heliod_the_warped_eclipse.txt
rename to forge-gui/res/cardsfolder/h/heliod_the_radiant_dawn_heliod_the_warped_eclipse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/herald_of_hoofbeats.txt b/forge-gui/res/cardsfolder/h/herald_of_hoofbeats.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/herald_of_hoofbeats.txt
rename to forge-gui/res/cardsfolder/h/herald_of_hoofbeats.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/herbology_instructor_malady_invoker.txt b/forge-gui/res/cardsfolder/h/herbology_instructor_malady_invoker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/herbology_instructor_malady_invoker.txt
rename to forge-gui/res/cardsfolder/h/herbology_instructor_malady_invoker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hexgold_sledge.txt b/forge-gui/res/cardsfolder/h/hexgold_sledge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hexgold_sledge.txt
rename to forge-gui/res/cardsfolder/h/hexgold_sledge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hidetsugu_and_kairi.txt b/forge-gui/res/cardsfolder/h/hidetsugu_and_kairi.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hidetsugu_and_kairi.txt
rename to forge-gui/res/cardsfolder/h/hidetsugu_and_kairi.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hoarding_broodlord.txt b/forge-gui/res/cardsfolder/h/hoarding_broodlord.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hoarding_broodlord.txt
rename to forge-gui/res/cardsfolder/h/hoarding_broodlord.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/holga_relentless_rager.txt b/forge-gui/res/cardsfolder/h/holga_relentless_rager.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/holga_relentless_rager.txt
rename to forge-gui/res/cardsfolder/h/holga_relentless_rager.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/Invasion_of_kamigawa_rooftop_saboteurs.txt b/forge-gui/res/cardsfolder/i/Invasion_of_kamigawa_rooftop_saboteurs.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/Invasion_of_kamigawa_rooftop_saboteurs.txt
rename to forge-gui/res/cardsfolder/i/Invasion_of_kamigawa_rooftop_saboteurs.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ichor_aberration.txt b/forge-gui/res/cardsfolder/i/ichor_aberration.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ichor_aberration.txt
rename to forge-gui/res/cardsfolder/i/ichor_aberration.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ichor_drinker.txt b/forge-gui/res/cardsfolder/i/ichor_drinker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ichor_drinker.txt
rename to forge-gui/res/cardsfolder/i/ichor_drinker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ichor_elixir.txt b/forge-gui/res/cardsfolder/i/ichor_elixir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ichor_elixir.txt
rename to forge-gui/res/cardsfolder/i/ichor_elixir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ichor_shade.txt b/forge-gui/res/cardsfolder/i/ichor_shade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ichor_shade.txt
rename to forge-gui/res/cardsfolder/i/ichor_shade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/infected_defector.txt b/forge-gui/res/cardsfolder/i/infected_defector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/infected_defector.txt
rename to forge-gui/res/cardsfolder/i/infected_defector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/infernal_sovereign.txt b/forge-gui/res/cardsfolder/i/infernal_sovereign.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/infernal_sovereign.txt
rename to forge-gui/res/cardsfolder/i/infernal_sovereign.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/inga_and_esika.txt b/forge-gui/res/cardsfolder/i/inga_and_esika.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/inga_and_esika.txt
rename to forge-gui/res/cardsfolder/i/inga_and_esika.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/injector_crocodile.txt b/forge-gui/res/cardsfolder/i/injector_crocodile.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/injector_crocodile.txt
rename to forge-gui/res/cardsfolder/i/injector_crocodile.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/innovative_metatect.txt b/forge-gui/res/cardsfolder/i/innovative_metatect.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/innovative_metatect.txt
rename to forge-gui/res/cardsfolder/i/innovative_metatect.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/interdisciplinary_mascot.txt b/forge-gui/res/cardsfolder/i/interdisciplinary_mascot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/interdisciplinary_mascot.txt
rename to forge-gui/res/cardsfolder/i/interdisciplinary_mascot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/into_the_fire.txt b/forge-gui/res/cardsfolder/i/into_the_fire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/into_the_fire.txt
rename to forge-gui/res/cardsfolder/i/into_the_fire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_alara_awaken_the_maelstrom.txt b/forge-gui/res/cardsfolder/i/invasion_of_alara_awaken_the_maelstrom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_alara_awaken_the_maelstrom.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_alara_awaken_the_maelstrom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_amonkhet_lazotep_convert.txt b/forge-gui/res/cardsfolder/i/invasion_of_amonkhet_lazotep_convert.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_amonkhet_lazotep_convert.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_amonkhet_lazotep_convert.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_arcavios_invocation_of_the_founders.txt b/forge-gui/res/cardsfolder/i/invasion_of_arcavios_invocation_of_the_founders.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_arcavios_invocation_of_the_founders.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_arcavios_invocation_of_the_founders.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_azgol_ashen_reaper.txt b/forge-gui/res/cardsfolder/i/invasion_of_azgol_ashen_reaper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_azgol_ashen_reaper.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_azgol_ashen_reaper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_belenon_belenon_war_anthem.txt b/forge-gui/res/cardsfolder/i/invasion_of_belenon_belenon_war_anthem.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_belenon_belenon_war_anthem.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_belenon_belenon_war_anthem.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_dominaria_serra_faithkeeper.txt b/forge-gui/res/cardsfolder/i/invasion_of_dominaria_serra_faithkeeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_dominaria_serra_faithkeeper.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_dominaria_serra_faithkeeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_eldraine_prickle_faeries.txt b/forge-gui/res/cardsfolder/i/invasion_of_eldraine_prickle_faeries.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_eldraine_prickle_faeries.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_eldraine_prickle_faeries.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_ergamon_truga_cliffcharger.txt b/forge-gui/res/cardsfolder/i/invasion_of_ergamon_truga_cliffcharger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_ergamon_truga_cliffcharger.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_ergamon_truga_cliffcharger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_fiora_marchesa_resolute_monarch.txt b/forge-gui/res/cardsfolder/i/invasion_of_fiora_marchesa_resolute_monarch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_fiora_marchesa_resolute_monarch.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_fiora_marchesa_resolute_monarch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_gobakhan_lightshield_array.txt b/forge-gui/res/cardsfolder/i/invasion_of_gobakhan_lightshield_array.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_gobakhan_lightshield_array.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_gobakhan_lightshield_array.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_ikoria_zilortha_apex_of_ikoria.txt b/forge-gui/res/cardsfolder/i/invasion_of_ikoria_zilortha_apex_of_ikoria.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_ikoria_zilortha_apex_of_ikoria.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_ikoria_zilortha_apex_of_ikoria.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_innistrad_deluge_of_the_dead.txt b/forge-gui/res/cardsfolder/i/invasion_of_innistrad_deluge_of_the_dead.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_innistrad_deluge_of_the_dead.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_innistrad_deluge_of_the_dead.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_ixalan_belligerent_regisaur.txt b/forge-gui/res/cardsfolder/i/invasion_of_ixalan_belligerent_regisaur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_ixalan_belligerent_regisaur.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_ixalan_belligerent_regisaur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_kaladesh_aetherwing_golden_scale_flagship.txt b/forge-gui/res/cardsfolder/i/invasion_of_kaladesh_aetherwing_golden_scale_flagship.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_kaladesh_aetherwing_golden_scale_flagship.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_kaladesh_aetherwing_golden_scale_flagship.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_kaldheim_pyre_of_the_world_tree.txt b/forge-gui/res/cardsfolder/i/invasion_of_kaldheim_pyre_of_the_world_tree.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_kaldheim_pyre_of_the_world_tree.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_kaldheim_pyre_of_the_world_tree.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_karsus_refraction_elemental.txt b/forge-gui/res/cardsfolder/i/invasion_of_karsus_refraction_elemental.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_karsus_refraction_elemental.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_karsus_refraction_elemental.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_kylem_valors_reach_tag_team.txt b/forge-gui/res/cardsfolder/i/invasion_of_kylem_valors_reach_tag_team.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_kylem_valors_reach_tag_team.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_kylem_valors_reach_tag_team.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_lorwyn_winnowing_forces.txt b/forge-gui/res/cardsfolder/i/invasion_of_lorwyn_winnowing_forces.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_lorwyn_winnowing_forces.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_lorwyn_winnowing_forces.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_mercadia_kyren_flamewright.txt b/forge-gui/res/cardsfolder/i/invasion_of_mercadia_kyren_flamewright.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_mercadia_kyren_flamewright.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_mercadia_kyren_flamewright.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_moag_bloomwielder_dryads.txt b/forge-gui/res/cardsfolder/i/invasion_of_moag_bloomwielder_dryads.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_moag_bloomwielder_dryads.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_moag_bloomwielder_dryads.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_muraganda_primordial_plasm.txt b/forge-gui/res/cardsfolder/i/invasion_of_muraganda_primordial_plasm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_muraganda_primordial_plasm.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_muraganda_primordial_plasm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_new_capenna_holy_frazzle_cannon.txt b/forge-gui/res/cardsfolder/i/invasion_of_new_capenna_holy_frazzle_cannon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_new_capenna_holy_frazzle_cannon.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_new_capenna_holy_frazzle_cannon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_new_phyrexia_teferi_akosa_of_zhalfir.txt b/forge-gui/res/cardsfolder/i/invasion_of_new_phyrexia_teferi_akosa_of_zhalfir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_new_phyrexia_teferi_akosa_of_zhalfir.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_new_phyrexia_teferi_akosa_of_zhalfir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_pyrulea_gargantuan_slabhorn.txt b/forge-gui/res/cardsfolder/i/invasion_of_pyrulea_gargantuan_slabhorn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_pyrulea_gargantuan_slabhorn.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_pyrulea_gargantuan_slabhorn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_ravnica_guildpact_paragon.txt b/forge-gui/res/cardsfolder/i/invasion_of_ravnica_guildpact_paragon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_ravnica_guildpact_paragon.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_ravnica_guildpact_paragon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_regatha_disciples_of_the_inferno.txt b/forge-gui/res/cardsfolder/i/invasion_of_regatha_disciples_of_the_inferno.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_regatha_disciples_of_the_inferno.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_regatha_disciples_of_the_inferno.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_segovia_caetus_sea_tyrant_of_segovia.txt b/forge-gui/res/cardsfolder/i/invasion_of_segovia_caetus_sea_tyrant_of_segovia.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_segovia_caetus_sea_tyrant_of_segovia.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_segovia_caetus_sea_tyrant_of_segovia.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_shandalar_leyline_surge.txt b/forge-gui/res/cardsfolder/i/invasion_of_shandalar_leyline_surge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_shandalar_leyline_surge.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_shandalar_leyline_surge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_tarkir_defiant_thundermaw.txt b/forge-gui/res/cardsfolder/i/invasion_of_tarkir_defiant_thundermaw.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_tarkir_defiant_thundermaw.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_tarkir_defiant_thundermaw.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_theros_ephara_ever_sheltering.txt b/forge-gui/res/cardsfolder/i/invasion_of_theros_ephara_ever_sheltering.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_theros_ephara_ever_sheltering.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_theros_ephara_ever_sheltering.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_tolvada_the_broken_sky.txt b/forge-gui/res/cardsfolder/i/invasion_of_tolvada_the_broken_sky.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_tolvada_the_broken_sky.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_tolvada_the_broken_sky.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_ulgrotha_grandmother_ravi_sengir.txt b/forge-gui/res/cardsfolder/i/invasion_of_ulgrotha_grandmother_ravi_sengir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_ulgrotha_grandmother_ravi_sengir.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_ulgrotha_grandmother_ravi_sengir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_vryn_overloaded_mage_ring.txt b/forge-gui/res/cardsfolder/i/invasion_of_vryn_overloaded_mage_ring.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_vryn_overloaded_mage_ring.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_vryn_overloaded_mage_ring.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_xerex_vertex_paladin.txt b/forge-gui/res/cardsfolder/i/invasion_of_xerex_vertex_paladin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_xerex_vertex_paladin.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_xerex_vertex_paladin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/invasion_of_zendikar_awakened_skyclave.txt b/forge-gui/res/cardsfolder/i/invasion_of_zendikar_awakened_skyclave.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/invasion_of_zendikar_awakened_skyclave.txt
rename to forge-gui/res/cardsfolder/i/invasion_of_zendikar_awakened_skyclave.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/inys_haen.txt b/forge-gui/res/cardsfolder/i/inys_haen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/inys_haen.txt
rename to forge-gui/res/cardsfolder/i/inys_haen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/iridescent_blademaster.txt b/forge-gui/res/cardsfolder/i/iridescent_blademaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/iridescent_blademaster.txt
rename to forge-gui/res/cardsfolder/i/iridescent_blademaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jin_gitaxias_the_great_synthesis.txt b/forge-gui/res/cardsfolder/j/jin_gitaxias_the_great_synthesis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jin_gitaxias_the_great_synthesis.txt
rename to forge-gui/res/cardsfolder/j/jin_gitaxias_the_great_synthesis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jirina_dauntless_general.txt b/forge-gui/res/cardsfolder/j/jirina_dauntless_general.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jirina_dauntless_general.txt
rename to forge-gui/res/cardsfolder/j/jirina_dauntless_general.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jolrael_voice_of_zhalfir.txt b/forge-gui/res/cardsfolder/j/jolrael_voice_of_zhalfir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jolrael_voice_of_zhalfir.txt
rename to forge-gui/res/cardsfolder/j/jolrael_voice_of_zhalfir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/joyful_stormsculptor.txt b/forge-gui/res/cardsfolder/j/joyful_stormsculptor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/joyful_stormsculptor.txt
rename to forge-gui/res/cardsfolder/j/joyful_stormsculptor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kami_of_whispered_hopes.txt b/forge-gui/res/cardsfolder/k/kami_of_whispered_hopes.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/kami_of_whispered_hopes.txt
rename to forge-gui/res/cardsfolder/k/kami_of_whispered_hopes.txt
index 7cc8289ab8a..686513c8345 100644
--- a/forge-gui/res/cardsfolder/upcoming/kami_of_whispered_hopes.txt
+++ b/forge-gui/res/cardsfolder/k/kami_of_whispered_hopes.txt
@@ -1,12 +1,12 @@
-Name:Kami of Whispered Hopes
-ManaCost:2 G
-Types:Creature Spirit
-PT:1/1
-R:Event$ AddCounter | ActiveZones$ Battlefield | ValidCard$ Permanent.YouCtrl+inZoneBattlefield | ValidCounterType$ P1P1 | ReplaceWith$ AddOneMoreCounters | Description$ If one or more +1/+1 counters would be put on a permanent you control, that many plus one +1/+1 counters are put on that permanent instead.
-SVar:AddOneMoreCounters:DB$ ReplaceCounter | ValidCounterType$ P1P1 | ChooseCounter$ True | Amount$ X
-SVar:X:ReplaceCount$CounterNum/Plus.1
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ Y | SpellDescription$ Add X mana of any one color, where X is CARDNAME's power.
-SVar:Y:Count$CardPower
-DeckHas:Ability$Counters
-DeckHints:Ability$Counters
+Name:Kami of Whispered Hopes
+ManaCost:2 G
+Types:Creature Spirit
+PT:1/1
+R:Event$ AddCounter | ActiveZones$ Battlefield | ValidCard$ Permanent.YouCtrl+inZoneBattlefield | ValidCounterType$ P1P1 | ReplaceWith$ AddOneMoreCounters | Description$ If one or more +1/+1 counters would be put on a permanent you control, that many plus one +1/+1 counters are put on that permanent instead.
+SVar:AddOneMoreCounters:DB$ ReplaceCounter | ValidCounterType$ P1P1 | ChooseCounter$ True | Amount$ X
+SVar:X:ReplaceCount$CounterNum/Plus.1
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ Y | SpellDescription$ Add X mana of any one color, where X is CARDNAME's power.
+SVar:Y:Count$CardPower
+DeckHas:Ability$Counters
+DeckHints:Ability$Counters
 Oracle:If one or more +1/+1 counters would be put on a permanent you control, that many plus one +1/+1 counters are put on that permanent instead.\n{T}: Add X mana of any one color, where X is Kami of Whispered Hopes's power.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/karn_legacy_reforged.txt b/forge-gui/res/cardsfolder/k/karn_legacy_reforged.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/karn_legacy_reforged.txt
rename to forge-gui/res/cardsfolder/k/karn_legacy_reforged.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/karsus_depthguard.txt b/forge-gui/res/cardsfolder/k/karsus_depthguard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/karsus_depthguard.txt
rename to forge-gui/res/cardsfolder/k/karsus_depthguard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kasla_the_broken_halo.txt b/forge-gui/res/cardsfolder/k/kasla_the_broken_halo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kasla_the_broken_halo.txt
rename to forge-gui/res/cardsfolder/k/kasla_the_broken_halo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/katilda_and_lier.txt b/forge-gui/res/cardsfolder/k/katilda_and_lier.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/katilda_and_lier.txt
rename to forge-gui/res/cardsfolder/k/katilda_and_lier.txt
index db6ea6617eb..0fa48a2c1f5 100644
--- a/forge-gui/res/cardsfolder/upcoming/katilda_and_lier.txt
+++ b/forge-gui/res/cardsfolder/k/katilda_and_lier.txt
@@ -1,10 +1,10 @@
-Name:Katilda and Lier
-ManaCost:G W U
-Types:Legendary Creature Human
-PT:3/3
-T:Mode$ SpellCast | ValidCard$ Human | ValidActivatingPlayer$ You | Execute$ TrigFlashback| TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a Human spell, target instant or sorcery card in your graveyard gains flashback until end of turn. The flashback cost is equal to its mana cost. (You may cast that card from your graveyard for its flashback cost. Then exile it.)
-SVar:TrigFlashback:DB$ Pump | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn | TgtZone$ Graveyard | TgtPrompt$ Select target instant or sorcery card in your graveyard | KW$ Flashback | PumpZone$ Graveyard | AILogic$ ReplaySpell
-DeckHas:Ability$Graveyard & Keyword$Flashback
-DeckNeeds:Type$Human
-DeckHints:Ability$Graveyard|Mill & Type$Instant|Sorcery
-Oracle:Whenever you cast a Human spell, target instant or sorcery card in your graveyard gains flashback until end of turn. The flashback cost is equal to its mana cost. (You may cast that card from your graveyard for its flashback cost. Then exile it.)
+Name:Katilda and Lier
+ManaCost:G W U
+Types:Legendary Creature Human
+PT:3/3
+T:Mode$ SpellCast | ValidCard$ Human | ValidActivatingPlayer$ You | Execute$ TrigFlashback| TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a Human spell, target instant or sorcery card in your graveyard gains flashback until end of turn. The flashback cost is equal to its mana cost. (You may cast that card from your graveyard for its flashback cost. Then exile it.)
+SVar:TrigFlashback:DB$ Pump | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn | TgtZone$ Graveyard | TgtPrompt$ Select target instant or sorcery card in your graveyard | KW$ Flashback | PumpZone$ Graveyard | AILogic$ ReplaySpell
+DeckHas:Ability$Graveyard & Keyword$Flashback
+DeckNeeds:Type$Human
+DeckHints:Ability$Graveyard|Mill & Type$Instant|Sorcery
+Oracle:Whenever you cast a Human spell, target instant or sorcery card in your graveyard gains flashback until end of turn. The flashback cost is equal to its mana cost. (You may cast that card from your graveyard for its flashback cost. Then exile it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/kembas_outfitter.txt b/forge-gui/res/cardsfolder/k/kembas_outfitter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kembas_outfitter.txt
rename to forge-gui/res/cardsfolder/k/kembas_outfitter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ketria.txt b/forge-gui/res/cardsfolder/k/ketria.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ketria.txt
rename to forge-gui/res/cardsfolder/k/ketria.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/khenra_spellspear_gitaxian_spellstalker.txt b/forge-gui/res/cardsfolder/k/khenra_spellspear_gitaxian_spellstalker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/khenra_spellspear_gitaxian_spellstalker.txt
rename to forge-gui/res/cardsfolder/k/khenra_spellspear_gitaxian_spellstalker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kiora_sovereign_of_the_deep.txt b/forge-gui/res/cardsfolder/k/kiora_sovereign_of_the_deep.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kiora_sovereign_of_the_deep.txt
rename to forge-gui/res/cardsfolder/k/kiora_sovereign_of_the_deep.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kithkin_billyrider.txt b/forge-gui/res/cardsfolder/k/kithkin_billyrider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kithkin_billyrider.txt
rename to forge-gui/res/cardsfolder/k/kithkin_billyrider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/knight_errant_of_eos.txt b/forge-gui/res/cardsfolder/k/knight_errant_of_eos.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/knight_errant_of_eos.txt
rename to forge-gui/res/cardsfolder/k/knight_errant_of_eos.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_the_new_coalition.txt b/forge-gui/res/cardsfolder/k/knight_of_the_new_coalition.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/knight_of_the_new_coalition.txt
rename to forge-gui/res/cardsfolder/k/knight_of_the_new_coalition.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kogla_and_yidaro.txt b/forge-gui/res/cardsfolder/k/kogla_and_yidaro.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kogla_and_yidaro.txt
rename to forge-gui/res/cardsfolder/k/kogla_and_yidaro.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kolaghan_warmonger.txt b/forge-gui/res/cardsfolder/k/kolaghan_warmonger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kolaghan_warmonger.txt
rename to forge-gui/res/cardsfolder/k/kolaghan_warmonger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kor_halberd.txt b/forge-gui/res/cardsfolder/k/kor_halberd.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kor_halberd.txt
rename to forge-gui/res/cardsfolder/k/kor_halberd.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kroxa_and_kunoros.txt b/forge-gui/res/cardsfolder/k/kroxa_and_kunoros.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kroxa_and_kunoros.txt
rename to forge-gui/res/cardsfolder/k/kroxa_and_kunoros.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/leyline_immersion.txt b/forge-gui/res/cardsfolder/l/leyline_immersion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/leyline_immersion.txt
rename to forge-gui/res/cardsfolder/l/leyline_immersion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lilianas_talent.txt b/forge-gui/res/cardsfolder/l/lilianas_talent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lilianas_talent.txt
rename to forge-gui/res/cardsfolder/l/lilianas_talent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lithomantic_barrage.txt b/forge-gui/res/cardsfolder/l/lithomantic_barrage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lithomantic_barrage.txt
rename to forge-gui/res/cardsfolder/l/lithomantic_barrage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/littjara.txt b/forge-gui/res/cardsfolder/l/littjara.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/littjara.txt
rename to forge-gui/res/cardsfolder/l/littjara.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/locthwain_lancer.txt b/forge-gui/res/cardsfolder/l/locthwain_lancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/locthwain_lancer.txt
rename to forge-gui/res/cardsfolder/l/locthwain_lancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/magmatic_scorchwing.txt b/forge-gui/res/cardsfolder/m/magmatic_scorchwing.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/magmatic_scorchwing.txt
rename to forge-gui/res/cardsfolder/m/magmatic_scorchwing.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/marauding_dreadship.txt b/forge-gui/res/cardsfolder/m/marauding_dreadship.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/marauding_dreadship.txt
rename to forge-gui/res/cardsfolder/m/marauding_dreadship.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/march_toward_perfection.txt b/forge-gui/res/cardsfolder/m/march_toward_perfection.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/march_toward_perfection.txt
rename to forge-gui/res/cardsfolder/m/march_toward_perfection.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/markov_baron.txt b/forge-gui/res/cardsfolder/m/markov_baron.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/markov_baron.txt
rename to forge-gui/res/cardsfolder/m/markov_baron.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/marshal_of_zhalfir.txt b/forge-gui/res/cardsfolder/m/marshal_of_zhalfir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/marshal_of_zhalfir.txt
rename to forge-gui/res/cardsfolder/m/marshal_of_zhalfir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/meeting_of_minds.txt b/forge-gui/res/cardsfolder/m/meeting_of_minds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/meeting_of_minds.txt
rename to forge-gui/res/cardsfolder/m/meeting_of_minds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/megaflora_jungle.txt b/forge-gui/res/cardsfolder/m/megaflora_jungle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/megaflora_jungle.txt
rename to forge-gui/res/cardsfolder/m/megaflora_jungle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mephidross_slime.txt b/forge-gui/res/cardsfolder/m/mephidross_slime.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mephidross_slime.txt
rename to forge-gui/res/cardsfolder/m/mephidross_slime.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/merciless_repurposing.txt b/forge-gui/res/cardsfolder/m/merciless_repurposing.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/merciless_repurposing.txt
rename to forge-gui/res/cardsfolder/m/merciless_repurposing.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/metropolis_reformer.txt b/forge-gui/res/cardsfolder/m/metropolis_reformer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/metropolis_reformer.txt
rename to forge-gui/res/cardsfolder/m/metropolis_reformer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mirran_banesplitter.txt b/forge-gui/res/cardsfolder/m/mirran_banesplitter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mirran_banesplitter.txt
rename to forge-gui/res/cardsfolder/m/mirran_banesplitter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mirrodin_avenged.txt b/forge-gui/res/cardsfolder/m/mirrodin_avenged.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/mirrodin_avenged.txt
rename to forge-gui/res/cardsfolder/m/mirrodin_avenged.txt
index 3c984c18b07..a52f834995c 100644
--- a/forge-gui/res/cardsfolder/upcoming/mirrodin_avenged.txt
+++ b/forge-gui/res/cardsfolder/m/mirrodin_avenged.txt
@@ -1,6 +1,6 @@
-Name:Mirrodin Avenged
-ManaCost:B
-Types:Instant
-A:SP$ Destroy | ValidTgts$ Creature.wasDealtDamageThisTurn | TgtPrompt$ Select target creature that was dealt damage this turn. | SubAbility$ DBDraw | SpellDescription$ Destroy target creature that was dealt damage this turn.
-SVar:DBDraw:DB$ Draw | SpellDescription$ Draw a card.
+Name:Mirrodin Avenged
+ManaCost:B
+Types:Instant
+A:SP$ Destroy | ValidTgts$ Creature.wasDealtDamageThisTurn | TgtPrompt$ Select target creature that was dealt damage this turn. | SubAbility$ DBDraw | SpellDescription$ Destroy target creature that was dealt damage this turn.
+SVar:DBDraw:DB$ Draw | SpellDescription$ Draw a card.
 Oracle:Destroy target creature that was dealt damage this turn.\nDraw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/mirror_shield_hoplite.txt b/forge-gui/res/cardsfolder/m/mirror_shield_hoplite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mirror_shield_hoplite.txt
rename to forge-gui/res/cardsfolder/m/mirror_shield_hoplite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mirror_style_master.txt b/forge-gui/res/cardsfolder/m/mirror_style_master.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mirror_style_master.txt
rename to forge-gui/res/cardsfolder/m/mirror_style_master.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mistmeadow_vanisher.txt b/forge-gui/res/cardsfolder/m/mistmeadow_vanisher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mistmeadow_vanisher.txt
rename to forge-gui/res/cardsfolder/m/mistmeadow_vanisher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/moira_and_teshar.txt b/forge-gui/res/cardsfolder/m/moira_and_teshar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/moira_and_teshar.txt
rename to forge-gui/res/cardsfolder/m/moira_and_teshar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/moment_of_truth.txt b/forge-gui/res/cardsfolder/m/moment_of_truth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/moment_of_truth.txt
rename to forge-gui/res/cardsfolder/m/moment_of_truth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mutagen_connoisseur.txt b/forge-gui/res/cardsfolder/m/mutagen_connoisseur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mutagen_connoisseur.txt
rename to forge-gui/res/cardsfolder/m/mutagen_connoisseur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nahiri_forged_in_fury.txt b/forge-gui/res/cardsfolder/n/nahiri_forged_in_fury.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nahiri_forged_in_fury.txt
rename to forge-gui/res/cardsfolder/n/nahiri_forged_in_fury.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nahiris_resolve.txt b/forge-gui/res/cardsfolder/n/nahiris_resolve.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nahiris_resolve.txt
rename to forge-gui/res/cardsfolder/n/nahiris_resolve.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nahiris_warcrafting.txt b/forge-gui/res/cardsfolder/n/nahiris_warcrafting.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nahiris_warcrafting.txt
rename to forge-gui/res/cardsfolder/n/nahiris_warcrafting.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/naktamun.txt b/forge-gui/res/cardsfolder/n/naktamun.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/naktamun.txt
rename to forge-gui/res/cardsfolder/n/naktamun.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/narset_enlightened_exile.txt b/forge-gui/res/cardsfolder/n/narset_enlightened_exile.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/narset_enlightened_exile.txt
rename to forge-gui/res/cardsfolder/n/narset_enlightened_exile.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nashi_moons_legacy.txt b/forge-gui/res/cardsfolder/n/nashi_moons_legacy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nashi_moons_legacy.txt
rename to forge-gui/res/cardsfolder/n/nashi_moons_legacy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nesting_dovehawk.txt b/forge-gui/res/cardsfolder/n/nesting_dovehawk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nesting_dovehawk.txt
rename to forge-gui/res/cardsfolder/n/nesting_dovehawk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nettling_host.txt b/forge-gui/res/cardsfolder/n/nettling_host.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nettling_host.txt
rename to forge-gui/res/cardsfolder/n/nettling_host.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/new_argive.txt b/forge-gui/res/cardsfolder/n/new_argive.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/new_argive.txt
rename to forge-gui/res/cardsfolder/n/new_argive.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nezumi_freewheeler_hideous_fleshwheeler.txt b/forge-gui/res/cardsfolder/n/nezumi_freewheeler_hideous_fleshwheeler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nezumi_freewheeler_hideous_fleshwheeler.txt
rename to forge-gui/res/cardsfolder/n/nezumi_freewheeler_hideous_fleshwheeler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nezumi_informant.txt b/forge-gui/res/cardsfolder/n/nezumi_informant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nezumi_informant.txt
rename to forge-gui/res/cardsfolder/n/nezumi_informant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nissa_resurgent_animist.txt b/forge-gui/res/cardsfolder/n/nissa_resurgent_animist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nissa_resurgent_animist.txt
rename to forge-gui/res/cardsfolder/n/nissa_resurgent_animist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/niv_mizzet_supreme.txt b/forge-gui/res/cardsfolder/n/niv_mizzet_supreme.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/niv_mizzet_supreme.txt
rename to forge-gui/res/cardsfolder/n/niv_mizzet_supreme.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/norns_fetchling.txt b/forge-gui/res/cardsfolder/n/norns_fetchling.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/norns_fetchling.txt
rename to forge-gui/res/cardsfolder/n/norns_fetchling.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/norns_inquisitor.txt b/forge-gui/res/cardsfolder/n/norns_inquisitor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/norns_inquisitor.txt
rename to forge-gui/res/cardsfolder/n/norns_inquisitor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/norns_seedcore.txt b/forge-gui/res/cardsfolder/n/norns_seedcore.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/norns_seedcore.txt
rename to forge-gui/res/cardsfolder/n/norns_seedcore.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nyx.txt b/forge-gui/res/cardsfolder/n/nyx.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nyx.txt
rename to forge-gui/res/cardsfolder/n/nyx.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/oculus_whelp.txt b/forge-gui/res/cardsfolder/o/oculus_whelp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/oculus_whelp.txt
rename to forge-gui/res/cardsfolder/o/oculus_whelp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/omen_hawker.txt b/forge-gui/res/cardsfolder/o/omen_hawker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/omen_hawker.txt
rename to forge-gui/res/cardsfolder/o/omen_hawker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/omnath_locus_of_all.txt b/forge-gui/res/cardsfolder/o/omnath_locus_of_all.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/omnath_locus_of_all.txt
rename to forge-gui/res/cardsfolder/o/omnath_locus_of_all.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/onakke_javelineer.txt b/forge-gui/res/cardsfolder/o/onakke_javelineer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/onakke_javelineer.txt
rename to forge-gui/res/cardsfolder/o/onakke_javelineer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/open_the_way.txt b/forge-gui/res/cardsfolder/o/open_the_way.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/open_the_way.txt
rename to forge-gui/res/cardsfolder/o/open_the_way.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/oracle_of_tragedy.txt b/forge-gui/res/cardsfolder/o/oracle_of_tragedy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/oracle_of_tragedy.txt
rename to forge-gui/res/cardsfolder/o/oracle_of_tragedy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/order_of_the_mirror_order_of_the_alabaster_host.txt b/forge-gui/res/cardsfolder/o/order_of_the_mirror_order_of_the_alabaster_host.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/order_of_the_mirror_order_of_the_alabaster_host.txt
rename to forge-gui/res/cardsfolder/o/order_of_the_mirror_order_of_the_alabaster_host.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/orthion_hero_of_lavabrink.txt b/forge-gui/res/cardsfolder/o/orthion_hero_of_lavabrink.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/orthion_hero_of_lavabrink.txt
rename to forge-gui/res/cardsfolder/o/orthion_hero_of_lavabrink.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/overgrown_pest.txt b/forge-gui/res/cardsfolder/o/overgrown_pest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/overgrown_pest.txt
rename to forge-gui/res/cardsfolder/o/overgrown_pest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ozolith_the_shattered_spire.txt b/forge-gui/res/cardsfolder/o/ozolith_the_shattered_spire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ozolith_the_shattered_spire.txt
rename to forge-gui/res/cardsfolder/o/ozolith_the_shattered_spire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pain_distributor.txt b/forge-gui/res/cardsfolder/p/pain_distributor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pain_distributor.txt
rename to forge-gui/res/cardsfolder/p/pain_distributor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/paliano.txt b/forge-gui/res/cardsfolder/p/paliano.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/paliano.txt
rename to forge-gui/res/cardsfolder/p/paliano.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/path_of_the_animist.txt b/forge-gui/res/cardsfolder/p/path_of_the_animist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/path_of_the_animist.txt
rename to forge-gui/res/cardsfolder/p/path_of_the_animist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/path_of_the_enigma.txt b/forge-gui/res/cardsfolder/p/path_of_the_enigma.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/path_of_the_enigma.txt
rename to forge-gui/res/cardsfolder/p/path_of_the_enigma.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/path_of_the_ghosthunter.txt b/forge-gui/res/cardsfolder/p/path_of_the_ghosthunter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/path_of_the_ghosthunter.txt
rename to forge-gui/res/cardsfolder/p/path_of_the_ghosthunter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/path_of_the_pyromancer.txt b/forge-gui/res/cardsfolder/p/path_of_the_pyromancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/path_of_the_pyromancer.txt
rename to forge-gui/res/cardsfolder/p/path_of_the_pyromancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/path_of_the_schemer.txt b/forge-gui/res/cardsfolder/p/path_of_the_schemer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/path_of_the_schemer.txt
rename to forge-gui/res/cardsfolder/p/path_of_the_schemer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phyresis_roach.txt b/forge-gui/res/cardsfolder/p/phyresis_roach.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyresis_roach.txt
rename to forge-gui/res/cardsfolder/p/phyresis_roach.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phyrexian_archivist.txt b/forge-gui/res/cardsfolder/p/phyrexian_archivist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyrexian_archivist.txt
rename to forge-gui/res/cardsfolder/p/phyrexian_archivist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phyrexian_awakening.txt b/forge-gui/res/cardsfolder/p/phyrexian_awakening.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyrexian_awakening.txt
rename to forge-gui/res/cardsfolder/p/phyrexian_awakening.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phyrexian_censor.txt b/forge-gui/res/cardsfolder/p/phyrexian_censor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyrexian_censor.txt
rename to forge-gui/res/cardsfolder/p/phyrexian_censor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phyrexian_harvester.txt b/forge-gui/res/cardsfolder/p/phyrexian_harvester.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyrexian_harvester.txt
rename to forge-gui/res/cardsfolder/p/phyrexian_harvester.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phyrexian_pegasus.txt b/forge-gui/res/cardsfolder/p/phyrexian_pegasus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyrexian_pegasus.txt
rename to forge-gui/res/cardsfolder/p/phyrexian_pegasus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phyrexian_scrapyard.txt b/forge-gui/res/cardsfolder/p/phyrexian_scrapyard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyrexian_scrapyard.txt
rename to forge-gui/res/cardsfolder/p/phyrexian_scrapyard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pia_nalaar_consul_of_revival.txt b/forge-gui/res/cardsfolder/p/pia_nalaar_consul_of_revival.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pia_nalaar_consul_of_revival.txt
rename to forge-gui/res/cardsfolder/p/pia_nalaar_consul_of_revival.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pile_on.txt b/forge-gui/res/cardsfolder/p/pile_on.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pile_on.txt
rename to forge-gui/res/cardsfolder/p/pile_on.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/placid_rottentail.txt b/forge-gui/res/cardsfolder/p/placid_rottentail.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/placid_rottentail.txt
rename to forge-gui/res/cardsfolder/p/placid_rottentail.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/plargg_and_nassari.txt b/forge-gui/res/cardsfolder/p/plargg_and_nassari.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/plargg_and_nassari.txt
rename to forge-gui/res/cardsfolder/p/plargg_and_nassari.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/polukranos_reborn_polukranos_engine_of_ruin.txt b/forge-gui/res/cardsfolder/p/polukranos_reborn_polukranos_engine_of_ruin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/polukranos_reborn_polukranos_engine_of_ruin.txt
rename to forge-gui/res/cardsfolder/p/polukranos_reborn_polukranos_engine_of_ruin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/portent_tracker.txt b/forge-gui/res/cardsfolder/p/portent_tracker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/portent_tracker.txt
rename to forge-gui/res/cardsfolder/p/portent_tracker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/preening_champion.txt b/forge-gui/res/cardsfolder/p/preening_champion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/preening_champion.txt
rename to forge-gui/res/cardsfolder/p/preening_champion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/progenitor_exarch.txt b/forge-gui/res/cardsfolder/p/progenitor_exarch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/progenitor_exarch.txt
rename to forge-gui/res/cardsfolder/p/progenitor_exarch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/protocol_knight.txt b/forge-gui/res/cardsfolder/p/protocol_knight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/protocol_knight.txt
rename to forge-gui/res/cardsfolder/p/protocol_knight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pyretic_prankster_glistening_goremonger.txt b/forge-gui/res/cardsfolder/p/pyretic_prankster_glistening_goremonger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pyretic_prankster_glistening_goremonger.txt
rename to forge-gui/res/cardsfolder/p/pyretic_prankster_glistening_goremonger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quicksilver_lapidary.txt b/forge-gui/res/cardsfolder/q/quicksilver_lapidary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quicksilver_lapidary.txt
rename to forge-gui/res/cardsfolder/q/quicksilver_lapidary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quicksilver_servitor.txt b/forge-gui/res/cardsfolder/q/quicksilver_servitor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quicksilver_servitor.txt
rename to forge-gui/res/cardsfolder/q/quicksilver_servitor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quintorius_loremaster.txt b/forge-gui/res/cardsfolder/q/quintorius_loremaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quintorius_loremaster.txt
rename to forge-gui/res/cardsfolder/q/quintorius_loremaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rals_reinforcements.txt b/forge-gui/res/cardsfolder/r/rals_reinforcements.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rals_reinforcements.txt
rename to forge-gui/res/cardsfolder/r/rals_reinforcements.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ramosian_greatsword.txt b/forge-gui/res/cardsfolder/r/ramosian_greatsword.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ramosian_greatsword.txt
rename to forge-gui/res/cardsfolder/r/ramosian_greatsword.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rampaging_geoderm.txt b/forge-gui/res/cardsfolder/r/rampaging_geoderm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rampaging_geoderm.txt
rename to forge-gui/res/cardsfolder/r/rampaging_geoderm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rampaging_raptor.txt b/forge-gui/res/cardsfolder/r/rampaging_raptor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rampaging_raptor.txt
rename to forge-gui/res/cardsfolder/r/rampaging_raptor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rankle_and_torbran.txt b/forge-gui/res/cardsfolder/r/rankle_and_torbran.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rankle_and_torbran.txt
rename to forge-gui/res/cardsfolder/r/rankle_and_torbran.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rashmi_and_ragavan.txt b/forge-gui/res/cardsfolder/r/rashmi_and_ragavan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rashmi_and_ragavan.txt
rename to forge-gui/res/cardsfolder/r/rashmi_and_ragavan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ravenous_sailback.txt b/forge-gui/res/cardsfolder/r/ravenous_sailback.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ravenous_sailback.txt
rename to forge-gui/res/cardsfolder/r/ravenous_sailback.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/realmbreaker_the_invasion_tree.txt b/forge-gui/res/cardsfolder/r/realmbreaker_the_invasion_tree.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/realmbreaker_the_invasion_tree.txt
rename to forge-gui/res/cardsfolder/r/realmbreaker_the_invasion_tree.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/realmbreakers_grasp.txt b/forge-gui/res/cardsfolder/r/realmbreakers_grasp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/realmbreakers_grasp.txt
rename to forge-gui/res/cardsfolder/r/realmbreakers_grasp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rebuild_the_city.txt b/forge-gui/res/cardsfolder/r/rebuild_the_city.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rebuild_the_city.txt
rename to forge-gui/res/cardsfolder/r/rebuild_the_city.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reckless_handling.txt b/forge-gui/res/cardsfolder/r/reckless_handling.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reckless_handling.txt
rename to forge-gui/res/cardsfolder/r/reckless_handling.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/redcap_heelslasher.txt b/forge-gui/res/cardsfolder/r/redcap_heelslasher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/redcap_heelslasher.txt
rename to forge-gui/res/cardsfolder/r/redcap_heelslasher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/referee_squad.txt b/forge-gui/res/cardsfolder/r/referee_squad.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/referee_squad.txt
rename to forge-gui/res/cardsfolder/r/referee_squad.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/render_inert.txt b/forge-gui/res/cardsfolder/r/render_inert.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/render_inert.txt
rename to forge-gui/res/cardsfolder/r/render_inert.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/riptide_island.txt b/forge-gui/res/cardsfolder/r/riptide_island.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/riptide_island.txt
rename to forge-gui/res/cardsfolder/r/riptide_island.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rocco_street_chef.txt b/forge-gui/res/cardsfolder/r/rocco_street_chef.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rocco_street_chef.txt
rename to forge-gui/res/cardsfolder/r/rocco_street_chef.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rona_herald_of_invasion_rona_tolarian_obliterator.txt b/forge-gui/res/cardsfolder/r/rona_herald_of_invasion_rona_tolarian_obliterator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rona_herald_of_invasion_rona_tolarian_obliterator.txt
rename to forge-gui/res/cardsfolder/r/rona_herald_of_invasion_rona_tolarian_obliterator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rothga_bonded_engulfer.txt b/forge-gui/res/cardsfolder/r/rothga_bonded_engulfer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rothga_bonded_engulfer.txt
rename to forge-gui/res/cardsfolder/r/rothga_bonded_engulfer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rowans_talent.txt b/forge-gui/res/cardsfolder/r/rowans_talent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rowans_talent.txt
rename to forge-gui/res/cardsfolder/r/rowans_talent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ruins_recluse.txt b/forge-gui/res/cardsfolder/r/ruins_recluse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ruins_recluse.txt
rename to forge-gui/res/cardsfolder/r/ruins_recluse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/saiba_cryptomancer.txt b/forge-gui/res/cardsfolder/s/saiba_cryptomancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/saiba_cryptomancer.txt
rename to forge-gui/res/cardsfolder/s/saiba_cryptomancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/saint_traft_and_rem_karolus.txt b/forge-gui/res/cardsfolder/s/saint_traft_and_rem_karolus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/saint_traft_and_rem_karolus.txt
rename to forge-gui/res/cardsfolder/s/saint_traft_and_rem_karolus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/samut_vizier_of_naktamun.txt b/forge-gui/res/cardsfolder/s/samut_vizier_of_naktamun.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/samut_vizier_of_naktamun.txt
rename to forge-gui/res/cardsfolder/s/samut_vizier_of_naktamun.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sandstalker_moloch.txt b/forge-gui/res/cardsfolder/s/sandstalker_moloch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sandstalker_moloch.txt
rename to forge-gui/res/cardsfolder/s/sandstalker_moloch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sandsteppe_war_riders.txt b/forge-gui/res/cardsfolder/s/sandsteppe_war_riders.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sandsteppe_war_riders.txt
rename to forge-gui/res/cardsfolder/s/sandsteppe_war_riders.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sarkhan_soul_aflame.txt b/forge-gui/res/cardsfolder/s/sarkhan_soul_aflame.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sarkhan_soul_aflame.txt
rename to forge-gui/res/cardsfolder/s/sarkhan_soul_aflame.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/schema_thief.txt b/forge-gui/res/cardsfolder/s/schema_thief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/schema_thief.txt
rename to forge-gui/res/cardsfolder/s/schema_thief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scorn_blade_berserker.txt b/forge-gui/res/cardsfolder/s/scorn_blade_berserker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scorn_blade_berserker.txt
rename to forge-gui/res/cardsfolder/s/scorn_blade_berserker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scrappy_bruiser.txt b/forge-gui/res/cardsfolder/s/scrappy_bruiser.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/scrappy_bruiser.txt
rename to forge-gui/res/cardsfolder/s/scrappy_bruiser.txt
index 43b9c90c36e..5ecf905c72d 100644
--- a/forge-gui/res/cardsfolder/upcoming/scrappy_bruiser.txt
+++ b/forge-gui/res/cardsfolder/s/scrappy_bruiser.txt
@@ -1,10 +1,10 @@
-Name:Scrappy Bruiser
-ManaCost:3 R
-Types:Creature Raccoon Warrior
-PT:3/4
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, up to one target attacking creature gets +2/+0 and gains trample until end of turn. Return that creature to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
-SVar:TrigPump:DB$ Pump | TargetMin$ 0 | TargetMax 1 | ValidTgts$ Creature.attacking | TgtPrompt$ Select up to one target attacking creature | KW$ Trample | NumAtt$ +2 | SubAbility$ DBReturn
-SVar:DBReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | RememberObjects$ Targeted | TriggerDescription$ Return that creature to its owner's hand at end of combat.
-SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ DelayTriggerRememberedLKI
-SVar:HasAttackEffect:TRUE
+Name:Scrappy Bruiser
+ManaCost:3 R
+Types:Creature Raccoon Warrior
+PT:3/4
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, up to one target attacking creature gets +2/+0 and gains trample until end of turn. Return that creature to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
+SVar:TrigPump:DB$ Pump | TargetMin$ 0 | TargetMax 1 | ValidTgts$ Creature.attacking | TgtPrompt$ Select up to one target attacking creature | KW$ Trample | NumAtt$ +2 | SubAbility$ DBReturn
+SVar:DBReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | RememberObjects$ Targeted | TriggerDescription$ Return that creature to its owner's hand at end of combat.
+SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ DelayTriggerRememberedLKI
+SVar:HasAttackEffect:TRUE
 Oracle:Whenever Scrappy Bruiser attacks, up to one target attacking creature gets +2/+0 and gains trample until end of turn. Return that creature to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/scrollshift.txt b/forge-gui/res/cardsfolder/s/scrollshift.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scrollshift.txt
rename to forge-gui/res/cardsfolder/s/scrollshift.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sculpted_perfection.txt b/forge-gui/res/cardsfolder/s/sculpted_perfection.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sculpted_perfection.txt
rename to forge-gui/res/cardsfolder/s/sculpted_perfection.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seal_from_existence.txt b/forge-gui/res/cardsfolder/s/seal_from_existence.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seal_from_existence.txt
rename to forge-gui/res/cardsfolder/s/seal_from_existence.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/searing_barb.txt b/forge-gui/res/cardsfolder/s/searing_barb.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/searing_barb.txt
rename to forge-gui/res/cardsfolder/s/searing_barb.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/see_double.txt b/forge-gui/res/cardsfolder/s/see_double.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/see_double.txt
rename to forge-gui/res/cardsfolder/s/see_double.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seed_of_hope.txt b/forge-gui/res/cardsfolder/s/seed_of_hope.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seed_of_hope.txt
rename to forge-gui/res/cardsfolder/s/seed_of_hope.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seedpod_caretaker.txt b/forge-gui/res/cardsfolder/s/seedpod_caretaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seedpod_caretaker.txt
rename to forge-gui/res/cardsfolder/s/seedpod_caretaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seer_of_stolen_sight.txt b/forge-gui/res/cardsfolder/s/seer_of_stolen_sight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seer_of_stolen_sight.txt
rename to forge-gui/res/cardsfolder/s/seer_of_stolen_sight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seething_skitter_priest.txt b/forge-gui/res/cardsfolder/s/seething_skitter_priest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seething_skitter_priest.txt
rename to forge-gui/res/cardsfolder/s/seething_skitter_priest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seraph_of_new_capenna_seraph_of_new_phyrexia.txt b/forge-gui/res/cardsfolder/s/seraph_of_new_capenna_seraph_of_new_phyrexia.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seraph_of_new_capenna_seraph_of_new_phyrexia.txt
rename to forge-gui/res/cardsfolder/s/seraph_of_new_capenna_seraph_of_new_phyrexia.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/serpent_blade_assailant.txt b/forge-gui/res/cardsfolder/s/serpent_blade_assailant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/serpent_blade_assailant.txt
rename to forge-gui/res/cardsfolder/s/serpent_blade_assailant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shalai_and_hallar.txt b/forge-gui/res/cardsfolder/s/shalai_and_hallar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shalai_and_hallar.txt
rename to forge-gui/res/cardsfolder/s/shalai_and_hallar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shatter_the_source.txt b/forge-gui/res/cardsfolder/s/shatter_the_source.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shatter_the_source.txt
rename to forge-gui/res/cardsfolder/s/shatter_the_source.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sheoldred_the_true_scriptures.txt b/forge-gui/res/cardsfolder/s/sheoldred_the_true_scriptures.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sheoldred_the_true_scriptures.txt
rename to forge-gui/res/cardsfolder/s/sheoldred_the_true_scriptures.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sheoldreds_assimilator.txt b/forge-gui/res/cardsfolder/s/sheoldreds_assimilator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sheoldreds_assimilator.txt
rename to forge-gui/res/cardsfolder/s/sheoldreds_assimilator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shivan_branch_burner.txt b/forge-gui/res/cardsfolder/s/shivan_branch_burner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shivan_branch_burner.txt
rename to forge-gui/res/cardsfolder/s/shivan_branch_burner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sidar_jabari_of_zhalfir.txt b/forge-gui/res/cardsfolder/s/sidar_jabari_of_zhalfir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sidar_jabari_of_zhalfir.txt
rename to forge-gui/res/cardsfolder/s/sidar_jabari_of_zhalfir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sigarda_font_of_blessings.txt b/forge-gui/res/cardsfolder/s/sigarda_font_of_blessings.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sigarda_font_of_blessings.txt
rename to forge-gui/res/cardsfolder/s/sigarda_font_of_blessings.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sigiled_sentinel.txt b/forge-gui/res/cardsfolder/s/sigiled_sentinel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sigiled_sentinel.txt
rename to forge-gui/res/cardsfolder/s/sigiled_sentinel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/simon_wild_magic_sorcerer.txt b/forge-gui/res/cardsfolder/s/simon_wild_magic_sorcerer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/simon_wild_magic_sorcerer.txt
rename to forge-gui/res/cardsfolder/s/simon_wild_magic_sorcerer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skullpiercer_gnat.txt b/forge-gui/res/cardsfolder/s/skullpiercer_gnat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skullpiercer_gnat.txt
rename to forge-gui/res/cardsfolder/s/skullpiercer_gnat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skyclave_aerialist_skyclave_invader.txt b/forge-gui/res/cardsfolder/s/skyclave_aerialist_skyclave_invader.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skyclave_aerialist_skyclave_invader.txt
rename to forge-gui/res/cardsfolder/s/skyclave_aerialist_skyclave_invader.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slimefoot_and_squee.txt b/forge-gui/res/cardsfolder/s/slimefoot_and_squee.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/slimefoot_and_squee.txt
rename to forge-gui/res/cardsfolder/s/slimefoot_and_squee.txt
index 7696ecf4889..9fe32755d54 100644
--- a/forge-gui/res/cardsfolder/upcoming/slimefoot_and_squee.txt
+++ b/forge-gui/res/cardsfolder/s/slimefoot_and_squee.txt
@@ -1,12 +1,12 @@
-Name:Slimefoot and Squee
-ManaCost:B R G
-Types:Legendary Creature Fungus Goblin
-PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, create a 1/1 green Saproling creature token.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, create a 1/1 green Saproling creature token.
-SVar:TrigToken:DB$ Token | TokenScript$ g_1_1_saproling
-A:AB$ ChangeZone | Cost$ 1 B R G Sac<1/Saproling> | ThisDefinedAndTgts$ Self | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | ValidTgts$ Creature.YouOwn+Other | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target other creature card in your graveyard | SorcerySpeed$ True | SpellDescription$ Return CARDNAME and up to one other target creature card from your graveyard to the battlefield. Activate only as a sorcery.
-SVar:HasAttackEffect:TRUE
-DeckHas:Ability$Token|Graveyard|Sacrifice & Type$Saproling
-DeckHints:Type$Fungus
-Oracle:Whenever Slimefoot and Squee enters the battlefield or attacks, create a 1/1 green Saproling creature token.\n{1}{B}{R}{G}, Sacrifice a Saproling: Return Slimefoot and Squee and up to one other target creature card from your graveyard to the battlefield. Activate only as a sorcery.
+Name:Slimefoot and Squee
+ManaCost:B R G
+Types:Legendary Creature Fungus Goblin
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, create a 1/1 green Saproling creature token.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, create a 1/1 green Saproling creature token.
+SVar:TrigToken:DB$ Token | TokenScript$ g_1_1_saproling
+A:AB$ ChangeZone | Cost$ 1 B R G Sac<1/Saproling> | ThisDefinedAndTgts$ Self | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | ValidTgts$ Creature.YouOwn+Other | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target other creature card in your graveyard | SorcerySpeed$ True | SpellDescription$ Return CARDNAME and up to one other target creature card from your graveyard to the battlefield. Activate only as a sorcery.
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Token|Graveyard|Sacrifice & Type$Saproling
+DeckHints:Type$Fungus
+Oracle:Whenever Slimefoot and Squee enters the battlefield or attacks, create a 1/1 green Saproling creature token.\n{1}{B}{R}{G}, Sacrifice a Saproling: Return Slimefoot and Squee and up to one other target creature card from your graveyard to the battlefield. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/spark_rupture.txt b/forge-gui/res/cardsfolder/s/spark_rupture.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spark_rupture.txt
rename to forge-gui/res/cardsfolder/s/spark_rupture.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spawning_pod.txt b/forge-gui/res/cardsfolder/s/spawning_pod.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spawning_pod.txt
rename to forge-gui/res/cardsfolder/s/spawning_pod.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stasis_field.txt b/forge-gui/res/cardsfolder/s/stasis_field.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stasis_field.txt
rename to forge-gui/res/cardsfolder/s/stasis_field.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/storm_the_seedcore.txt b/forge-gui/res/cardsfolder/s/storm_the_seedcore.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/storm_the_seedcore.txt
rename to forge-gui/res/cardsfolder/s/storm_the_seedcore.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stormclaw_rager.txt b/forge-gui/res/cardsfolder/s/stormclaw_rager.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stormclaw_rager.txt
rename to forge-gui/res/cardsfolder/s/stormclaw_rager.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/streetwise_negotiatior.txt b/forge-gui/res/cardsfolder/s/streetwise_negotiatior.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/streetwise_negotiatior.txt
rename to forge-gui/res/cardsfolder/s/streetwise_negotiatior.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/strixhaven.txt b/forge-gui/res/cardsfolder/s/strixhaven.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/strixhaven.txt
rename to forge-gui/res/cardsfolder/s/strixhaven.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sun_blessed_guardian_furnace_blessed_conqueror.txt b/forge-gui/res/cardsfolder/s/sun_blessed_guardian_furnace_blessed_conqueror.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sun_blessed_guardian_furnace_blessed_conqueror.txt
rename to forge-gui/res/cardsfolder/s/sun_blessed_guardian_furnace_blessed_conqueror.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sunder_the_gateway.txt b/forge-gui/res/cardsfolder/s/sunder_the_gateway.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sunder_the_gateway.txt
rename to forge-gui/res/cardsfolder/s/sunder_the_gateway.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sunfall.txt b/forge-gui/res/cardsfolder/s/sunfall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sunfall.txt
rename to forge-gui/res/cardsfolder/s/sunfall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/surge_of_salvation.txt b/forge-gui/res/cardsfolder/s/surge_of_salvation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/surge_of_salvation.txt
rename to forge-gui/res/cardsfolder/s/surge_of_salvation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/surgical_metamorph.txt b/forge-gui/res/cardsfolder/s/surgical_metamorph.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/surgical_metamorph.txt
rename to forge-gui/res/cardsfolder/s/surgical_metamorph.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/surrak_and_goreclaw.txt b/forge-gui/res/cardsfolder/s/surrak_and_goreclaw.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/surrak_and_goreclaw.txt
rename to forge-gui/res/cardsfolder/s/surrak_and_goreclaw.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sword_of_once_and_future.txt b/forge-gui/res/cardsfolder/s/sword_of_once_and_future.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sword_of_once_and_future.txt
rename to forge-gui/res/cardsfolder/s/sword_of_once_and_future.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/swordsworn_cavalier.txt b/forge-gui/res/cardsfolder/s/swordsworn_cavalier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/swordsworn_cavalier.txt
rename to forge-gui/res/cardsfolder/s/swordsworn_cavalier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tandem_takedown.txt b/forge-gui/res/cardsfolder/t/tandem_takedown.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tandem_takedown.txt
rename to forge-gui/res/cardsfolder/t/tandem_takedown.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tangled_skyline.txt b/forge-gui/res/cardsfolder/t/tangled_skyline.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tangled_skyline.txt
rename to forge-gui/res/cardsfolder/t/tangled_skyline.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tarkir_duneshaper_burnished_dunestomper.txt b/forge-gui/res/cardsfolder/t/tarkir_duneshaper_burnished_dunestomper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tarkir_duneshaper_burnished_dunestomper.txt
rename to forge-gui/res/cardsfolder/t/tarkir_duneshaper_burnished_dunestomper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tazri_stalwart_survivor.txt b/forge-gui/res/cardsfolder/t/tazri_stalwart_survivor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tazri_stalwart_survivor.txt
rename to forge-gui/res/cardsfolder/t/tazri_stalwart_survivor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/teferis_talent.txt b/forge-gui/res/cardsfolder/t/teferis_talent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/teferis_talent.txt
rename to forge-gui/res/cardsfolder/t/teferis_talent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/temporal_cleansing.txt b/forge-gui/res/cardsfolder/t/temporal_cleansing.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/temporal_cleansing.txt
rename to forge-gui/res/cardsfolder/t/temporal_cleansing.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ten_wizards_mountain.txt b/forge-gui/res/cardsfolder/t/ten_wizards_mountain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ten_wizards_mountain.txt
rename to forge-gui/res/cardsfolder/t/ten_wizards_mountain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tenured_oilcaster.txt b/forge-gui/res/cardsfolder/t/tenured_oilcaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tenured_oilcaster.txt
rename to forge-gui/res/cardsfolder/t/tenured_oilcaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/terror_of_towashi.txt b/forge-gui/res/cardsfolder/t/terror_of_towashi.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/terror_of_towashi.txt
rename to forge-gui/res/cardsfolder/t/terror_of_towashi.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tezzerets_reckoning.txt b/forge-gui/res/cardsfolder/t/tezzerets_reckoning.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tezzerets_reckoning.txt
rename to forge-gui/res/cardsfolder/t/tezzerets_reckoning.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thalia_and_the_gitrog_monster.txt b/forge-gui/res/cardsfolder/t/thalia_and_the_gitrog_monster.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/thalia_and_the_gitrog_monster.txt
rename to forge-gui/res/cardsfolder/t/thalia_and_the_gitrog_monster.txt
index 1df0970cfac..69b1df01a3e 100644
--- a/forge-gui/res/cardsfolder/upcoming/thalia_and_the_gitrog_monster.txt
+++ b/forge-gui/res/cardsfolder/t/thalia_and_the_gitrog_monster.txt
@@ -1,15 +1,15 @@
-Name:Thalia and The Gitrog Monster
-ManaCost:1 W B G
-Types:Legendary Creature Human Frog Horror
-PT:4/4
-K:First Strike
-K:Deathtouch
-S:Mode$ Continuous | Affected$ You | AdjustLandPlays$ 1 | Description$ You may play an additional land on each of your turns.
-R:Event$ Moved | ValidCard$ Creature.OppCtrl,Land.nonBasic+OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures and nonbasic lands your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME attacks, sacrifice a creature or land, then draw a card.
-SVar:TrigSac:DB$ Sacrifice | Defined$ You | SacValid$ Land,Creature | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw
-SVar:HasAttackEffect:TRUE
-DeckHas:Ability$Sacrifice
-Oracle:First strike, deathtouch\nYou may play an additional land on each of your turns.\nCreatures and nonbasic lands your opponents control enter the battlefield tapped.\nWhenever Thalia and The Gitrog Monster attacks, sacrifice a creature or land, then draw a card.
+Name:Thalia and The Gitrog Monster
+ManaCost:1 W B G
+Types:Legendary Creature Human Frog Horror
+PT:4/4
+K:First Strike
+K:Deathtouch
+S:Mode$ Continuous | Affected$ You | AdjustLandPlays$ 1 | Description$ You may play an additional land on each of your turns.
+R:Event$ Moved | ValidCard$ Creature.OppCtrl,Land.nonBasic+OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures and nonbasic lands your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME attacks, sacrifice a creature or land, then draw a card.
+SVar:TrigSac:DB$ Sacrifice | Defined$ You | SacValid$ Land,Creature | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Sacrifice
+Oracle:First strike, deathtouch\nYou may play an additional land on each of your turns.\nCreatures and nonbasic lands your opponents control enter the battlefield tapped.\nWhenever Thalia and The Gitrog Monster attacks, sacrifice a creature or land, then draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_caldaia.txt b/forge-gui/res/cardsfolder/t/the_caldaia.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_caldaia.txt
rename to forge-gui/res/cardsfolder/t/the_caldaia.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_fertile_lands_of_saulvinia.txt b/forge-gui/res/cardsfolder/t/the_fertile_lands_of_saulvinia.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_fertile_lands_of_saulvinia.txt
rename to forge-gui/res/cardsfolder/t/the_fertile_lands_of_saulvinia.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_golden_city_of_orazca.txt b/forge-gui/res/cardsfolder/t/the_golden_city_of_orazca.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_golden_city_of_orazca.txt
rename to forge-gui/res/cardsfolder/t/the_golden_city_of_orazca.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_great_aerie.txt b/forge-gui/res/cardsfolder/t/the_great_aerie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_great_aerie.txt
rename to forge-gui/res/cardsfolder/t/the_great_aerie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_kenriths_royal_funeral.txt b/forge-gui/res/cardsfolder/t/the_kenriths_royal_funeral.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/the_kenriths_royal_funeral.txt
rename to forge-gui/res/cardsfolder/t/the_kenriths_royal_funeral.txt
index c0b0c9ea8bf..f1bc9dd18bb 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_kenriths_royal_funeral.txt
+++ b/forge-gui/res/cardsfolder/t/the_kenriths_royal_funeral.txt
@@ -1,14 +1,14 @@
-Name:The Kenriths' Royal Funeral
-ManaCost:2 W B
-Types:Legendary Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile up to two target legendary creature cards from your graveyard. You draw X cards and you lose X life, where X is the greatest mana value among cards exiled this way.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature.Legendary+YouCtrl | SubAbility$ DBDraw | RememberChanged$ True | TgtPrompt$ Select up to two target legendary creature cards in your graveyard
-SVar:DBDraw:DB$ Draw | NumCards$ X | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$GreatestCMC
-S:Mode$ ReduceCost | ValidCard$ Legendary | Type$ Spell | Activator$ You | Amount$ Y | Description$ Legendary spells you cast cost {1} less to cast for each card exiled with CARDNAME.
-SVar:Y:Count$ValidExile Card.ExiledWithSource
-DeckHints:Ability$Graveyard
-DeckNeeds:Type$Legendary
+Name:The Kenriths' Royal Funeral
+ManaCost:2 W B
+Types:Legendary Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile up to two target legendary creature cards from your graveyard. You draw X cards and you lose X life, where X is the greatest mana value among cards exiled this way.
+SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature.Legendary+YouCtrl | SubAbility$ DBDraw | RememberChanged$ True | TgtPrompt$ Select up to two target legendary creature cards in your graveyard
+SVar:DBDraw:DB$ Draw | NumCards$ X | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Remembered$GreatestCMC
+S:Mode$ ReduceCost | ValidCard$ Legendary | Type$ Spell | Activator$ You | Amount$ Y | Description$ Legendary spells you cast cost {1} less to cast for each card exiled with CARDNAME.
+SVar:Y:Count$ValidExile Card.ExiledWithSource
+DeckHints:Ability$Graveyard
+DeckNeeds:Type$Legendary
 Oracle:When The Kenriths' Royal Funeral enters the battlefield, exile up to two target legendary creature cards from your graveyard. You draw X cards and you lose X life, where X is the greatest mana value among cards exiled this way.\nLegendary spells you cast cost {1} less to cast for each card exiled with The Kenriths' Royal Funeral.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/the_pit.txt b/forge-gui/res/cardsfolder/t/the_pit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_pit.txt
rename to forge-gui/res/cardsfolder/t/the_pit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_western_cloud.txt b/forge-gui/res/cardsfolder/t/the_western_cloud.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_western_cloud.txt
rename to forge-gui/res/cardsfolder/t/the_western_cloud.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_wilds.txt b/forge-gui/res/cardsfolder/t/the_wilds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_wilds.txt
rename to forge-gui/res/cardsfolder/t/the_wilds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/themberchaud.txt b/forge-gui/res/cardsfolder/t/themberchaud.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/themberchaud.txt
rename to forge-gui/res/cardsfolder/t/themberchaud.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thrashing_frontliner.txt b/forge-gui/res/cardsfolder/t/thrashing_frontliner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thrashing_frontliner.txt
rename to forge-gui/res/cardsfolder/t/thrashing_frontliner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thunderhead_squadron.txt b/forge-gui/res/cardsfolder/t/thunderhead_squadron.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thunderhead_squadron.txt
rename to forge-gui/res/cardsfolder/t/thunderhead_squadron.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tidal_terror.txt b/forge-gui/res/cardsfolder/t/tidal_terror.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tidal_terror.txt
rename to forge-gui/res/cardsfolder/t/tidal_terror.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tiller_of_flesh.txt b/forge-gui/res/cardsfolder/t/tiller_of_flesh.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tiller_of_flesh.txt
rename to forge-gui/res/cardsfolder/t/tiller_of_flesh.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/timberland_ancient.txt b/forge-gui/res/cardsfolder/t/timberland_ancient.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/timberland_ancient.txt
rename to forge-gui/res/cardsfolder/t/timberland_ancient.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tolarian_contempt.txt b/forge-gui/res/cardsfolder/t/tolarian_contempt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tolarian_contempt.txt
rename to forge-gui/res/cardsfolder/t/tolarian_contempt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/towashi.txt b/forge-gui/res/cardsfolder/t/towashi.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/towashi.txt
rename to forge-gui/res/cardsfolder/t/towashi.txt
index 05611d11fdc..21dfaa37793 100644
--- a/forge-gui/res/cardsfolder/upcoming/towashi.txt
+++ b/forge-gui/res/cardsfolder/t/towashi.txt
@@ -1,11 +1,11 @@
-Name:Towashi
-ManaCost:no cost
-Types:Plane Kamigawa
-S:Mode$ Continuous | Affected$ Creature.modified+YouCtrl | AddKeyword$ Trample | EffectZone$ Command | AddTrigger$ DrawTrig | Description$ Modified creatures you control have trample and "Whenever this creature deals combat damage to a player or planeswalker, draw a card." (Equipment, Auras you control, and counters are modifications.)
-SVar:DrawTrig:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player,Planeswalker | CombatDamage$ True | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever this creature deals combat damage to a player or planeswalker, draw a card.
-SVar:TrigDraw:DB$ Draw
-T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, distribute three +1/+1 counters among one, two, or three target creatures you control.
-SVar:RolledChaos:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 3 | TargetMin$ 1 | TargetMax$ 3 | DividedAsYouChoose$ 3
-DeckHas:Ability$Counters
-DeckHints:Type$Aura|Equipment & Ability$Counters
-Oracle:Modified creatures you control have trample and "Whenever this creature deals combat damage to a player or planeswalker, draw a card."(Equipment, Auras you control, and counters are modifications.)\nWhenever chaos ensues, distribute three +1/+1 counters among one, two, or three target creatures you control.
+Name:Towashi
+ManaCost:no cost
+Types:Plane Kamigawa
+S:Mode$ Continuous | Affected$ Creature.modified+YouCtrl | AddKeyword$ Trample | EffectZone$ Command | AddTrigger$ DrawTrig | Description$ Modified creatures you control have trample and "Whenever this creature deals combat damage to a player or planeswalker, draw a card." (Equipment, Auras you control, and counters are modifications.)
+SVar:DrawTrig:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player,Planeswalker | CombatDamage$ True | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever this creature deals combat damage to a player or planeswalker, draw a card.
+SVar:TrigDraw:DB$ Draw
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, distribute three +1/+1 counters among one, two, or three target creatures you control.
+SVar:RolledChaos:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 3 | TargetMin$ 1 | TargetMax$ 3 | DividedAsYouChoose$ 3
+DeckHas:Ability$Counters
+DeckHints:Type$Aura|Equipment & Ability$Counters
+Oracle:Modified creatures you control have trample and "Whenever this creature deals combat damage to a player or planeswalker, draw a card."(Equipment, Auras you control, and counters are modifications.)\nWhenever chaos ensues, distribute three +1/+1 counters among one, two, or three target creatures you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/trailblazing_historian.txt b/forge-gui/res/cardsfolder/t/trailblazing_historian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/trailblazing_historian.txt
rename to forge-gui/res/cardsfolder/t/trailblazing_historian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/transcendent_message.txt b/forge-gui/res/cardsfolder/t/transcendent_message.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/transcendent_message.txt
rename to forge-gui/res/cardsfolder/t/transcendent_message.txt
index 8c8730070b1..304f52d73aa 100644
--- a/forge-gui/res/cardsfolder/upcoming/transcendent_message.txt
+++ b/forge-gui/res/cardsfolder/t/transcendent_message.txt
@@ -1,7 +1,7 @@
-Name:Transcendent Message
-ManaCost:X U U U U
-Types:Instant
-K:Convoke
-SVar:X:Count$xPaid
-A:SP$ Draw | NumCards$ X | SpellDescription$ Draw X cards.
+Name:Transcendent Message
+ManaCost:X U U U U
+Types:Instant
+K:Convoke
+SVar:X:Count$xPaid
+A:SP$ Draw | NumCards$ X | SpellDescription$ Draw X cards.
 Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nDraw X cards.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/traumatic_revelation.txt b/forge-gui/res/cardsfolder/t/traumatic_revelation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/traumatic_revelation.txt
rename to forge-gui/res/cardsfolder/t/traumatic_revelation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tribute_to_the_world_tree.txt b/forge-gui/res/cardsfolder/t/tribute_to_the_world_tree.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/tribute_to_the_world_tree.txt
rename to forge-gui/res/cardsfolder/t/tribute_to_the_world_tree.txt
index bbbf58f1aed..8c882e0350f 100644
--- a/forge-gui/res/cardsfolder/upcoming/tribute_to_the_world_tree.txt
+++ b/forge-gui/res/cardsfolder/t/tribute_to_the_world_tree.txt
@@ -1,11 +1,11 @@
-Name:Tribute to the World Tree
-ManaCost:G G G
-Types:Enchantment
-DeckHas:Ability$Counters
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigBranch | TriggerDescription$ Whenever a creature enters the battlefield under your control, draw a card if its power is 3 or greater. Otherwise, put two +1/+1 counters on it.
-SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE3 | TrueSubAbility$ DBDraw | FalseSubAbility$ DBPutCounter
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
-SVar:DBPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 2
-SVar:X:TriggeredCard$CardPower
-DeckHas:Ability$Counters
+Name:Tribute to the World Tree
+ManaCost:G G G
+Types:Enchantment
+DeckHas:Ability$Counters
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigBranch | TriggerDescription$ Whenever a creature enters the battlefield under your control, draw a card if its power is 3 or greater. Otherwise, put two +1/+1 counters on it.
+SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE3 | TrueSubAbility$ DBDraw | FalseSubAbility$ DBPutCounter
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
+SVar:DBPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 2
+SVar:X:TriggeredCard$CardPower
+DeckHas:Ability$Counters
 Oracle:Whenever a creature enters the battlefield under your control, draw a card if its power is 3 or greater. Otherwise, put two +1/+1 counters on it.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/uncivil_arrest.txt b/forge-gui/res/cardsfolder/u/uncivil_arrest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/uncivil_arrest.txt
rename to forge-gui/res/cardsfolder/u/uncivil_arrest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/undercity_upheaval.txt b/forge-gui/res/cardsfolder/u/undercity_upheaval.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/undercity_upheaval.txt
rename to forge-gui/res/cardsfolder/u/undercity_upheaval.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unseal_the_necropolis.txt b/forge-gui/res/cardsfolder/u/unseal_the_necropolis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unseal_the_necropolis.txt
rename to forge-gui/res/cardsfolder/u/unseal_the_necropolis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unyaro.txt b/forge-gui/res/cardsfolder/u/unyaro.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unyaro.txt
rename to forge-gui/res/cardsfolder/u/unyaro.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/urabrask_the_great_work.txt b/forge-gui/res/cardsfolder/u/urabrask_the_great_work.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/urabrask_the_great_work.txt
rename to forge-gui/res/cardsfolder/u/urabrask_the_great_work.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/urborg_scavengers.txt b/forge-gui/res/cardsfolder/u/urborg_scavengers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/urborg_scavengers.txt
rename to forge-gui/res/cardsfolder/u/urborg_scavengers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/urn_of_godfire.txt b/forge-gui/res/cardsfolder/u/urn_of_godfire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/urn_of_godfire.txt
rename to forge-gui/res/cardsfolder/u/urn_of_godfire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/valors_reach.txt b/forge-gui/res/cardsfolder/v/valors_reach.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/valors_reach.txt
rename to forge-gui/res/cardsfolder/v/valors_reach.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vengeant_earth.txt b/forge-gui/res/cardsfolder/v/vengeant_earth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vengeant_earth.txt
rename to forge-gui/res/cardsfolder/v/vengeant_earth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vesuvan_drifter.txt b/forge-gui/res/cardsfolder/v/vesuvan_drifter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vesuvan_drifter.txt
rename to forge-gui/res/cardsfolder/v/vesuvan_drifter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vexyr_ich_tekiks_heir.txt b/forge-gui/res/cardsfolder/v/vexyr_ich_tekiks_heir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vexyr_ich_tekiks_heir.txt
rename to forge-gui/res/cardsfolder/v/vexyr_ich_tekiks_heir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/viviens_talent.txt b/forge-gui/res/cardsfolder/v/viviens_talent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/viviens_talent.txt
rename to forge-gui/res/cardsfolder/v/viviens_talent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vodalian_wave_knight.txt b/forge-gui/res/cardsfolder/v/vodalian_wave_knight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vodalian_wave_knight.txt
rename to forge-gui/res/cardsfolder/v/vodalian_wave_knight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/volcanic_spite.txt b/forge-gui/res/cardsfolder/v/volcanic_spite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/volcanic_spite.txt
rename to forge-gui/res/cardsfolder/v/volcanic_spite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/voldaren_thrilseeker.txt b/forge-gui/res/cardsfolder/v/voldaren_thrilseeker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/voldaren_thrilseeker.txt
rename to forge-gui/res/cardsfolder/v/voldaren_thrilseeker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vorinclex_the_grand_evolution.txt b/forge-gui/res/cardsfolder/v/vorinclex_the_grand_evolution.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vorinclex_the_grand_evolution.txt
rename to forge-gui/res/cardsfolder/v/vorinclex_the_grand_evolution.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vulpine_harvester.txt b/forge-gui/res/cardsfolder/v/vulpine_harvester.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vulpine_harvester.txt
rename to forge-gui/res/cardsfolder/v/vulpine_harvester.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wand_of_the_worldsoul.txt b/forge-gui/res/cardsfolder/w/wand_of_the_worldsoul.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wand_of_the_worldsoul.txt
rename to forge-gui/res/cardsfolder/w/wand_of_the_worldsoul.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/war_historian.txt b/forge-gui/res/cardsfolder/w/war_historian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/war_historian.txt
rename to forge-gui/res/cardsfolder/w/war_historian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/war_trained_slasher.txt b/forge-gui/res/cardsfolder/w/war_trained_slasher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/war_trained_slasher.txt
rename to forge-gui/res/cardsfolder/w/war_trained_slasher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wary_thespian.txt b/forge-gui/res/cardsfolder/w/wary_thespian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wary_thespian.txt
rename to forge-gui/res/cardsfolder/w/wary_thespian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wicked_slumber.txt b/forge-gui/res/cardsfolder/w/wicked_slumber.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wicked_slumber.txt
rename to forge-gui/res/cardsfolder/w/wicked_slumber.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wildfire_awakener.txt b/forge-gui/res/cardsfolder/w/wildfire_awakener.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wildfire_awakener.txt
rename to forge-gui/res/cardsfolder/w/wildfire_awakener.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wildwood_escort.txt b/forge-gui/res/cardsfolder/w/wildwood_escort.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wildwood_escort.txt
rename to forge-gui/res/cardsfolder/w/wildwood_escort.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wrenn_and_realmbreaker.txt b/forge-gui/res/cardsfolder/w/wrenn_and_realmbreaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wrenn_and_realmbreaker.txt
rename to forge-gui/res/cardsfolder/w/wrenn_and_realmbreaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wrenns_resolve.txt b/forge-gui/res/cardsfolder/w/wrenns_resolve.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wrenns_resolve.txt
rename to forge-gui/res/cardsfolder/w/wrenns_resolve.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/xenk_paladin_unbroken.txt b/forge-gui/res/cardsfolder/x/xenk_paladin_unbroken.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/xenk_paladin_unbroken.txt
rename to forge-gui/res/cardsfolder/x/xenk_paladin_unbroken.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/xerex_strobe_knight.txt b/forge-gui/res/cardsfolder/x/xerex_strobe_knight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/xerex_strobe_knight.txt
rename to forge-gui/res/cardsfolder/x/xerex_strobe_knight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yargle_and_multani.txt b/forge-gui/res/cardsfolder/y/yargle_and_multani.txt
similarity index 95%
rename from forge-gui/res/cardsfolder/upcoming/yargle_and_multani.txt
rename to forge-gui/res/cardsfolder/y/yargle_and_multani.txt
index 9c61de342b1..faf60fc932e 100644
--- a/forge-gui/res/cardsfolder/upcoming/yargle_and_multani.txt
+++ b/forge-gui/res/cardsfolder/y/yargle_and_multani.txt
@@ -1,5 +1,5 @@
-Name:Yargle and Multani
-ManaCost:3 B B G
-Types:Legendary Creature Frog Spirit Elemental
-PT:18/6
-Oracle:
+Name:Yargle and Multani
+ManaCost:3 B B G
+Types:Legendary Creature Frog Spirit Elemental
+PT:18/6
+Oracle:
diff --git a/forge-gui/res/cardsfolder/upcoming/zephyr_singer.txt b/forge-gui/res/cardsfolder/z/zephyr_singer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zephyr_singer.txt
rename to forge-gui/res/cardsfolder/z/zephyr_singer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zephyr_winder.txt b/forge-gui/res/cardsfolder/z/zephyr_winder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zephyr_winder.txt
rename to forge-gui/res/cardsfolder/z/zephyr_winder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zhalfirin_lancer.txt b/forge-gui/res/cardsfolder/z/zhalfirin_lancer.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/zhalfirin_lancer.txt
rename to forge-gui/res/cardsfolder/z/zhalfirin_lancer.txt
index f918e23c70b..404d72fb717 100644
--- a/forge-gui/res/cardsfolder/upcoming/zhalfirin_lancer.txt
+++ b/forge-gui/res/cardsfolder/z/zhalfirin_lancer.txt
@@ -1,8 +1,8 @@
-Name:Zhalfirin Lancer
-ManaCost:2 W
-Types:Creature Human Knight
-PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Knight.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another Knight enters the battlefield under your control, CARDNAME gets +1/+1 and gains vigilance until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ Vigilance
-DeckNeeds:Type$Knight
-Oracle:Whenever another Knight enters the battlefield under your control, Zhalfirin Lancer gets +1/+1 and gains vigilance until end of turn.
+Name:Zhalfirin Lancer
+ManaCost:2 W
+Types:Creature Human Knight
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Knight.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another Knight enters the battlefield under your control, CARDNAME gets +1/+1 and gains vigilance until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ Vigilance
+DeckNeeds:Type$Knight
+Oracle:Whenever another Knight enters the battlefield under your control, Zhalfirin Lancer gets +1/+1 and gains vigilance until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/zhalfirin_shapecraft.txt b/forge-gui/res/cardsfolder/z/zhalfirin_shapecraft.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zhalfirin_shapecraft.txt
rename to forge-gui/res/cardsfolder/z/zhalfirin_shapecraft.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zimone_and_dina.txt b/forge-gui/res/cardsfolder/z/zimone_and_dina.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zimone_and_dina.txt
rename to forge-gui/res/cardsfolder/z/zimone_and_dina.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zurgo_and_ojutai.txt b/forge-gui/res/cardsfolder/z/zurgo_and_ojutai.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zurgo_and_ojutai.txt
rename to forge-gui/res/cardsfolder/z/zurgo_and_ojutai.txt