diff --git a/forge-gui/res/cardsfolder/upcoming/academy_loremaster.txt b/forge-gui/res/cardsfolder/a/academy_loremaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/academy_loremaster.txt
rename to forge-gui/res/cardsfolder/a/academy_loremaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/academy_wall.txt b/forge-gui/res/cardsfolder/a/academy_wall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/academy_wall.txt
rename to forge-gui/res/cardsfolder/a/academy_wall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/activated_sleeper.txt b/forge-gui/res/cardsfolder/a/activated_sleeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/activated_sleeper.txt
rename to forge-gui/res/cardsfolder/a/activated_sleeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aether_channeler.txt b/forge-gui/res/cardsfolder/a/aether_channeler.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/aether_channeler.txt
rename to forge-gui/res/cardsfolder/a/aether_channeler.txt
index e2999e4d8b6..4f998850911 100644
--- a/forge-gui/res/cardsfolder/upcoming/aether_channeler.txt
+++ b/forge-gui/res/cardsfolder/a/aether_channeler.txt
@@ -1,11 +1,11 @@
-Name:Aether Channeler
-ManaCost:2 U
-Types:Creature Human Wizard
-PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
-SVar:TrigCharm:DB$ Charm | Choices$ DBToken,DBBounce,DBDraw
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_bird_flying | TokenOwner$ You | SpellDescription$ Create a 1/1 white Bird creature token with flying.
-SVar:DBBounce:DB$ ChangeZone | ValidTgts$ Permanent.Other+nonLand | TgtPrompt$ Select another target nonland permanent | TgtZone$ Battlefield | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return another target nonland permanent to its owner's hand.
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SpellDescription$ Draw a card.
-DeckHas:Ability$Token
-Oracle:When Aether Channeler enters the battlefield, choose one —\n• Create a 1/1 white Bird creature token with flying.\n• Return another target nonland permanent to its owner's hand.\n• Draw a card.
+Name:Aether Channeler
+ManaCost:2 U
+Types:Creature Human Wizard
+PT:2/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
+SVar:TrigCharm:DB$ Charm | Choices$ DBToken,DBBounce,DBDraw
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_bird_flying | TokenOwner$ You | SpellDescription$ Create a 1/1 white Bird creature token with flying.
+SVar:DBBounce:DB$ ChangeZone | ValidTgts$ Permanent.Other+nonLand | TgtPrompt$ Select another target nonland permanent | TgtZone$ Battlefield | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return another target nonland permanent to its owner's hand.
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SpellDescription$ Draw a card.
+DeckHas:Ability$Token
+Oracle:When Aether Channeler enters the battlefield, choose one —\n• Create a 1/1 white Bird creature token with flying.\n• Return another target nonland permanent to its owner's hand.\n• Draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/aggressive_sabotage.txt b/forge-gui/res/cardsfolder/a/aggressive_sabotage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aggressive_sabotage.txt
rename to forge-gui/res/cardsfolder/a/aggressive_sabotage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ajani_sleeper_agent.txt b/forge-gui/res/cardsfolder/a/ajani_sleeper_agent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ajani_sleeper_agent.txt
rename to forge-gui/res/cardsfolder/a/ajani_sleeper_agent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alora_rogue_companion.txt b/forge-gui/res/cardsfolder/a/alora_rogue_companion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alora_rogue_companion.txt
rename to forge-gui/res/cardsfolder/a/alora_rogue_companion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ambergris_citadel_agent.txt b/forge-gui/res/cardsfolder/a/ambergris_citadel_agent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ambergris_citadel_agent.txt
rename to forge-gui/res/cardsfolder/a/ambergris_citadel_agent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/anointed_peacekeeper.txt b/forge-gui/res/cardsfolder/a/anointed_peacekeeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/anointed_peacekeeper.txt
rename to forge-gui/res/cardsfolder/a/anointed_peacekeeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arcane_archery.txt b/forge-gui/res/cardsfolder/a/arcane_archery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arcane_archery.txt
rename to forge-gui/res/cardsfolder/a/arcane_archery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/archangel_of_wrath.txt b/forge-gui/res/cardsfolder/a/archangel_of_wrath.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/archangel_of_wrath.txt
rename to forge-gui/res/cardsfolder/a/archangel_of_wrath.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/argivian_phalanx.txt b/forge-gui/res/cardsfolder/a/argivian_phalanx.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/argivian_phalanx.txt
rename to forge-gui/res/cardsfolder/a/argivian_phalanx.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aron_benalias_ruin.txt b/forge-gui/res/cardsfolder/a/aron_benalias_ruin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aron_benalias_ruin.txt
rename to forge-gui/res/cardsfolder/a/aron_benalias_ruin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/artillery_blast.txt b/forge-gui/res/cardsfolder/a/artillery_blast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/artillery_blast.txt
rename to forge-gui/res/cardsfolder/a/artillery_blast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/astor_bearer_of_blades.txt b/forge-gui/res/cardsfolder/a/astor_bearer_of_blades.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/astor_bearer_of_blades.txt
rename to forge-gui/res/cardsfolder/a/astor_bearer_of_blades.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/automatic_librarian.txt b/forge-gui/res/cardsfolder/a/automatic_librarian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/automatic_librarian.txt
rename to forge-gui/res/cardsfolder/a/automatic_librarian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ayesha_tanaka_armorer.txt b/forge-gui/res/cardsfolder/a/ayesha_tanaka_armorer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ayesha_tanaka_armorer.txt
rename to forge-gui/res/cardsfolder/a/ayesha_tanaka_armorer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/balduvian_atrocity.txt b/forge-gui/res/cardsfolder/b/balduvian_atrocity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/balduvian_atrocity.txt
rename to forge-gui/res/cardsfolder/b/balduvian_atrocity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/balmor_battlemage_captain.txt b/forge-gui/res/cardsfolder/b/balmor_battlemage_captain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/balmor_battlemage_captain.txt
rename to forge-gui/res/cardsfolder/b/balmor_battlemage_captain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/baru_wurmspeaker.txt b/forge-gui/res/cardsfolder/b/baru_wurmspeaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/baru_wurmspeaker.txt
rename to forge-gui/res/cardsfolder/b/baru_wurmspeaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/battle_rage_blessing.txt b/forge-gui/res/cardsfolder/b/battle-rage_blessing.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/battle_rage_blessing.txt
rename to forge-gui/res/cardsfolder/b/battle-rage_blessing.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/battlefly_swarm.txt b/forge-gui/res/cardsfolder/b/battlefly_swarm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/battlefly_swarm.txt
rename to forge-gui/res/cardsfolder/b/battlefly_swarm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/battlewing_mystic.txt b/forge-gui/res/cardsfolder/b/battlewing_mystic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/battlewing_mystic.txt
rename to forge-gui/res/cardsfolder/b/battlewing_mystic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/benalish_sleeper.txt b/forge-gui/res/cardsfolder/b/benalish_sleeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/benalish_sleeper.txt
rename to forge-gui/res/cardsfolder/b/benalish_sleeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bite_down.txt b/forge-gui/res/cardsfolder/b/bite_down.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bite_down.txt
rename to forge-gui/res/cardsfolder/b/bite_down.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bladewing_deathless_tyrant.txt b/forge-gui/res/cardsfolder/b/bladewing_deathless_tyrant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bladewing_deathless_tyrant.txt
rename to forge-gui/res/cardsfolder/b/bladewing_deathless_tyrant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blight_pile.txt b/forge-gui/res/cardsfolder/b/blight_pile.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blight_pile.txt
rename to forge-gui/res/cardsfolder/b/blight_pile.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/boareskyr_tollkeeper.txt b/forge-gui/res/cardsfolder/b/boareskyr_tollkeeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/boareskyr_tollkeeper.txt
rename to forge-gui/res/cardsfolder/b/boareskyr_tollkeeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bog_badger.txt b/forge-gui/res/cardsfolder/b/bog_badger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bog_badger.txt
rename to forge-gui/res/cardsfolder/b/bog_badger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bortuk_bonerattle.txt b/forge-gui/res/cardsfolder/b/bortuk_bonerattle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bortuk_bonerattle.txt
rename to forge-gui/res/cardsfolder/b/bortuk_bonerattle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/braids_arisen_nightmare.txt b/forge-gui/res/cardsfolder/b/braids_arisen_nightmare.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/braids_arisen_nightmare.txt
rename to forge-gui/res/cardsfolder/b/braids_arisen_nightmare.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/braidss_frightful_return.txt b/forge-gui/res/cardsfolder/b/braidss_frightful_return.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/braidss_frightful_return.txt
rename to forge-gui/res/cardsfolder/b/braidss_frightful_return.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/briar_hydra.txt b/forge-gui/res/cardsfolder/b/briar_hydra.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/briar_hydra.txt
rename to forge-gui/res/cardsfolder/b/briar_hydra.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cadric_soul_kindler.txt b/forge-gui/res/cardsfolder/c/cadric_soul_kindler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cadric_soul_kindler.txt
rename to forge-gui/res/cardsfolder/c/cadric_soul_kindler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/champions_of_tyr.txt b/forge-gui/res/cardsfolder/c/champions_of_tyr.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/champions_of_tyr.txt
rename to forge-gui/res/cardsfolder/c/champions_of_tyr.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/charismatic_vanguard.txt b/forge-gui/res/cardsfolder/c/charismatic_vanguard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/charismatic_vanguard.txt
rename to forge-gui/res/cardsfolder/c/charismatic_vanguard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/choking_miasma.txt b/forge-gui/res/cardsfolder/c/choking_miasma.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/choking_miasma.txt
rename to forge-gui/res/cardsfolder/c/choking_miasma.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/citizens_arrest.txt b/forge-gui/res/cardsfolder/c/citizens_arrest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/citizens_arrest.txt
rename to forge-gui/res/cardsfolder/c/citizens_arrest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cleaving_skyrider.txt b/forge-gui/res/cardsfolder/c/cleaving_skyrider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cleaving_skyrider.txt
rename to forge-gui/res/cardsfolder/c/cleaving_skyrider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clockwork_drawbridge.txt b/forge-gui/res/cardsfolder/c/clockwork_drawbridge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clockwork_drawbridge.txt
rename to forge-gui/res/cardsfolder/c/clockwork_drawbridge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/colossal_growth.txt b/forge-gui/res/cardsfolder/c/colossal_growth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/colossal_growth.txt
rename to forge-gui/res/cardsfolder/c/colossal_growth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/combat_research.txt b/forge-gui/res/cardsfolder/c/combat_research.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/combat_research.txt
rename to forge-gui/res/cardsfolder/c/combat_research.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/contaminated_aquifer.txt b/forge-gui/res/cardsfolder/c/contaminated_aquifer.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/contaminated_aquifer.txt
rename to forge-gui/res/cardsfolder/c/contaminated_aquifer.txt
index 5810a129cc9..10aebd4140f 100644
--- a/forge-gui/res/cardsfolder/upcoming/contaminated_aquifer.txt
+++ b/forge-gui/res/cardsfolder/c/contaminated_aquifer.txt
@@ -1,5 +1,5 @@
-Name:Contaminated Aquifer
-ManaCost:no cost
-Types:Land Island Swamp
-K:CARDNAME enters the battlefield tapped.
-Oracle:({T}: Add {U} or {B}.)\nContaminated Aquifer enters the battlefield tapped.
+Name:Contaminated Aquifer
+ManaCost:no cost
+Types:Land Island Swamp
+K:CARDNAME enters the battlefield tapped.
+Oracle:({T}: Add {U} or {B}.)\nContaminated Aquifer enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/coral_colony.txt b/forge-gui/res/cardsfolder/c/coral_colony.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/coral_colony.txt
rename to forge-gui/res/cardsfolder/c/coral_colony.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cosmic_epiphany.txt b/forge-gui/res/cardsfolder/c/cosmic_epiphany.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cosmic_epiphany.txt
rename to forge-gui/res/cardsfolder/c/cosmic_epiphany.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cryptic_spires.txt b/forge-gui/res/cardsfolder/c/cryptic_spires.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cryptic_spires.txt
rename to forge-gui/res/cardsfolder/c/cryptic_spires.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crystal_grotto.txt b/forge-gui/res/cardsfolder/c/crystal_grotto.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crystal_grotto.txt
rename to forge-gui/res/cardsfolder/c/crystal_grotto.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cult_conscript.txt b/forge-gui/res/cardsfolder/c/cult_conscript.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/cult_conscript.txt
rename to forge-gui/res/cardsfolder/c/cult_conscript.txt
index 206da245a69..34d4b143863 100644
--- a/forge-gui/res/cardsfolder/upcoming/cult_conscript.txt
+++ b/forge-gui/res/cardsfolder/c/cult_conscript.txt
@@ -1,10 +1,10 @@
-Name:Cult Conscript
-ManaCost:B
-Types:Creature Skeleton Warrior
-PT:2/1
-K:CARDNAME enters the battlefield tapped.
-A:AB$ ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | CheckSVar$ X | SVarCompare GT0 | SpellDescription$ Return CARDNAME from your graveyard to the battlefield. Activate only if a non-Skeleton creature died under your control this turn.
-SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouCtrl+nonSkeleton
-SVar:DiscardMe:1
-SVar:SacMe:1
-Oracle:Cult Conscript enters the battlefield tapped.\n{1}{B}: Return Cult Conscript from your graveyard to the battlefield. Activate only if a non-Skeleton creature died under your control this turn.
+Name:Cult Conscript
+ManaCost:B
+Types:Creature Skeleton Warrior
+PT:2/1
+K:CARDNAME enters the battlefield tapped.
+A:AB$ ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | CheckSVar$ X | SVarCompare GT0 | SpellDescription$ Return CARDNAME from your graveyard to the battlefield. Activate only if a non-Skeleton creature died under your control this turn.
+SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouCtrl+nonSkeleton
+SVar:DiscardMe:1
+SVar:SacMe:1
+Oracle:Cult Conscript enters the battlefield tapped.\n{1}{B}: Return Cult Conscript from your graveyard to the battlefield. Activate only if a non-Skeleton creature died under your control this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/cut_down.txt b/forge-gui/res/cardsfolder/c/cut_down.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cut_down.txt
rename to forge-gui/res/cardsfolder/c/cut_down.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/danitha_benalias_hope.txt b/forge-gui/res/cardsfolder/d/danitha_benalias_hope.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/danitha_benalias_hope.txt
rename to forge-gui/res/cardsfolder/d/danitha_benalias_hope.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deathbloom_gardener.txt b/forge-gui/res/cardsfolder/d/deathbloom_gardener.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deathbloom_gardener.txt
rename to forge-gui/res/cardsfolder/d/deathbloom_gardener.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/destroy_evil.txt b/forge-gui/res/cardsfolder/d/destroy_evil.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/destroy_evil.txt
rename to forge-gui/res/cardsfolder/d/destroy_evil.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dihada_binder_of_wills.txt b/forge-gui/res/cardsfolder/d/dihada_binder_of_wills.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dihada_binder_of_wills.txt
rename to forge-gui/res/cardsfolder/d/dihada_binder_of_wills.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/djinn_of_the_fountain.txt b/forge-gui/res/cardsfolder/d/djinn_of_the_fountain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/djinn_of_the_fountain.txt
rename to forge-gui/res/cardsfolder/d/djinn_of_the_fountain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drag_to_the_bottom.txt b/forge-gui/res/cardsfolder/d/drag_to_the_bottom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drag_to_the_bottom.txt
rename to forge-gui/res/cardsfolder/d/drag_to_the_bottom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dragonborn_immolator.txt b/forge-gui/res/cardsfolder/d/dragonborn_immolator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dragonborn_immolator.txt
rename to forge-gui/res/cardsfolder/d/dragonborn_immolator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eerie_soultender.txt b/forge-gui/res/cardsfolder/e/eerie_soultender.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eerie_soultender.txt
rename to forge-gui/res/cardsfolder/e/eerie_soultender.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elas_il_kor_sadistic_pilgrim.txt b/forge-gui/res/cardsfolder/e/elas_il_kor_sadistic_pilgrim.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elas_il_kor_sadistic_pilgrim.txt
rename to forge-gui/res/cardsfolder/e/elas_il_kor_sadistic_pilgrim.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/electrostatic_infantry.txt b/forge-gui/res/cardsfolder/e/electrostatic_infantry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/electrostatic_infantry.txt
rename to forge-gui/res/cardsfolder/e/electrostatic_infantry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elfhame_wurm.txt b/forge-gui/res/cardsfolder/e/elfhame_wurm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elfhame_wurm.txt
rename to forge-gui/res/cardsfolder/e/elfhame_wurm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elvish_hydromancer.txt b/forge-gui/res/cardsfolder/e/elvish_hydromancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elvish_hydromancer.txt
rename to forge-gui/res/cardsfolder/e/elvish_hydromancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/emperor_mihail_ii.txt b/forge-gui/res/cardsfolder/e/emperor_mihail_ii.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/emperor_mihail_ii.txt
rename to forge-gui/res/cardsfolder/e/emperor_mihail_ii.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ertai_resurrected.txt b/forge-gui/res/cardsfolder/e/ertai_resurrected.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ertai_resurrected.txt
rename to forge-gui/res/cardsfolder/e/ertai_resurrected.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ertais_scorn.txt b/forge-gui/res/cardsfolder/e/ertais_scorn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ertais_scorn.txt
rename to forge-gui/res/cardsfolder/e/ertais_scorn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/evolved_sleeper.txt b/forge-gui/res/cardsfolder/e/evolved_sleeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/evolved_sleeper.txt
rename to forge-gui/res/cardsfolder/e/evolved_sleeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/extinguish_the_light.txt b/forge-gui/res/cardsfolder/e/extinguish_the_light.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/extinguish_the_light.txt
rename to forge-gui/res/cardsfolder/e/extinguish_the_light.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fallaji_wayfarer.txt b/forge-gui/res/cardsfolder/f/fallaji_wayfarer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fallaji_wayfarer.txt
rename to forge-gui/res/cardsfolder/f/fallaji_wayfarer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/favored_enemy.txt b/forge-gui/res/cardsfolder/f/favored_enemy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/favored_enemy.txt
rename to forge-gui/res/cardsfolder/f/favored_enemy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fires_of_victory.txt b/forge-gui/res/cardsfolder/f/fires_of_victory.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fires_of_victory.txt
rename to forge-gui/res/cardsfolder/f/fires_of_victory.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flames_of_moradin.txt b/forge-gui/res/cardsfolder/f/flames_of_moradin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flames_of_moradin.txt
rename to forge-gui/res/cardsfolder/f/flames_of_moradin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flaming_fist_duskguard.txt b/forge-gui/res/cardsfolder/f/flaming_fist_duskguard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flaming_fist_duskguard.txt
rename to forge-gui/res/cardsfolder/f/flaming_fist_duskguard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/floriferous_vinewall.txt b/forge-gui/res/cardsfolder/f/floriferous_vinewall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/floriferous_vinewall.txt
rename to forge-gui/res/cardsfolder/f/floriferous_vinewall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flowstone_infusion.txt b/forge-gui/res/cardsfolder/f/flowstone_infusion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flowstone_infusion.txt
rename to forge-gui/res/cardsfolder/f/flowstone_infusion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flowstone_kavu.txt b/forge-gui/res/cardsfolder/f/flowstone_kavu.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flowstone_kavu.txt
rename to forge-gui/res/cardsfolder/f/flowstone_kavu.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/founding_the_third_path.txt b/forge-gui/res/cardsfolder/f/founding_the_third_path.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/founding_the_third_path.txt
rename to forge-gui/res/cardsfolder/f/founding_the_third_path.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frostfist_strider.txt b/forge-gui/res/cardsfolder/f/frostfist_strider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frostfist_strider.txt
rename to forge-gui/res/cardsfolder/f/frostfist_strider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/furious_bellow.txt b/forge-gui/res/cardsfolder/f/furious_bellow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/furious_bellow.txt
rename to forge-gui/res/cardsfolder/f/furious_bellow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gale_conduit.txt b/forge-gui/res/cardsfolder/g/gale_conduit_of_the_arcane.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gale_conduit.txt
rename to forge-gui/res/cardsfolder/g/gale_conduit_of_the_arcane.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/garna_bloodfist_of_keld.txt b/forge-gui/res/cardsfolder/g/garna_bloodfist_of_keld.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/garna_bloodfist_of_keld.txt
rename to forge-gui/res/cardsfolder/g/garna_bloodfist_of_keld.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/genasi_rabble_rouser.txt b/forge-gui/res/cardsfolder/g/genasi_rabble_rouser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/genasi_rabble_rouser.txt
rename to forge-gui/res/cardsfolder/g/genasi_rabble_rouser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/general_marhault_elsdragon.txt b/forge-gui/res/cardsfolder/g/general_marhault_elsdragon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/general_marhault_elsdragon.txt
rename to forge-gui/res/cardsfolder/g/general_marhault_elsdragon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/geothermal_bog.txt b/forge-gui/res/cardsfolder/g/geothermal_bog.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/geothermal_bog.txt
rename to forge-gui/res/cardsfolder/g/geothermal_bog.txt
index c058db87128..87bd51441d4 100644
--- a/forge-gui/res/cardsfolder/upcoming/geothermal_bog.txt
+++ b/forge-gui/res/cardsfolder/g/geothermal_bog.txt
@@ -1,5 +1,5 @@
-Name:Geothermal Bog
-ManaCost:no cost
-Types:Land Swamp Mountain
-K:CARDNAME enters the battlefield tapped.
-Oracle:({T}: Add {B} or {R}.)\nGeothermal Bog enters the battlefield tapped.
+Name:Geothermal Bog
+ManaCost:no cost
+Types:Land Swamp Mountain
+K:CARDNAME enters the battlefield tapped.
+Oracle:({T}: Add {B} or {R}.)\nGeothermal Bog enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/gerrards_hourglass_endant.txt b/forge-gui/res/cardsfolder/g/gerrards_hourglass_endant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gerrards_hourglass_endant.txt
rename to forge-gui/res/cardsfolder/g/gerrards_hourglass_endant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ghitu_amplifier.txt b/forge-gui/res/cardsfolder/g/ghitu_amplifier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ghitu_amplifier.txt
rename to forge-gui/res/cardsfolder/g/ghitu_amplifier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/giant_fire_beetles.txt b/forge-gui/res/cardsfolder/g/giant_fire_beetles.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/giant_fire_beetles.txt
rename to forge-gui/res/cardsfolder/g/giant_fire_beetles.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gibbering_barricade.txt b/forge-gui/res/cardsfolder/g/gibbering_barricade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gibbering_barricade.txt
rename to forge-gui/res/cardsfolder/g/gibbering_barricade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gnoll_hunting_party.txt b/forge-gui/res/cardsfolder/g/gnoll_hunting_party.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gnoll_hunting_party.txt
rename to forge-gui/res/cardsfolder/g/gnoll_hunting_party.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_picker.txt b/forge-gui/res/cardsfolder/g/goblin_picker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goblin_picker.txt
rename to forge-gui/res/cardsfolder/g/goblin_picker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_trapfinder.txt b/forge-gui/res/cardsfolder/g/goblin_trapfinder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goblin_trapfinder.txt
rename to forge-gui/res/cardsfolder/g/goblin_trapfinder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/golden_argosy.txt b/forge-gui/res/cardsfolder/g/golden_argosy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/golden_argosy.txt
rename to forge-gui/res/cardsfolder/g/golden_argosy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/greensleeves_maro-sorcerer.txt b/forge-gui/res/cardsfolder/g/greensleeves_maro-sorcerer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/greensleeves_maro-sorcerer.txt
rename to forge-gui/res/cardsfolder/g/greensleeves_maro-sorcerer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gut_fanatical_priestess.txt b/forge-gui/res/cardsfolder/g/gut_fanatical_priestess.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gut_fanatical_priestess.txt
rename to forge-gui/res/cardsfolder/g/gut_fanatical_priestess.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/haughty_djinn.txt b/forge-gui/res/cardsfolder/h/haughty_djinn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/haughty_djinn.txt
rename to forge-gui/res/cardsfolder/h/haughty_djinn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/haunted_mire.txt b/forge-gui/res/cardsfolder/h/haunted_mire.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/haunted_mire.txt
rename to forge-gui/res/cardsfolder/h/haunted_mire.txt
index 35f8031f8c7..b93244e0ceb 100644
--- a/forge-gui/res/cardsfolder/upcoming/haunted_mire.txt
+++ b/forge-gui/res/cardsfolder/h/haunted_mire.txt
@@ -1,5 +1,5 @@
-Name:Haunted Mire
-ManaCost:no cost
-Types:Land Swamp Forest
-K:CARDNAME enters the battlefield tapped.
-Oracle:({T}: Add {B} or {G}.)\nHaunted Mire enters the battlefield tapped.
+Name:Haunted Mire
+ManaCost:no cost
+Types:Land Swamp Forest
+K:CARDNAME enters the battlefield tapped.
+Oracle:({T}: Add {B} or {G}.)\nHaunted Mire enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/haunting_figment.txt b/forge-gui/res/cardsfolder/h/haunting_figment.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/haunting_figment.txt
rename to forge-gui/res/cardsfolder/h/haunting_figment.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hazezon_shaper_of_sand.txt b/forge-gui/res/cardsfolder/h/hazezon_shaper_of_sand.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hazezon_shaper_of_sand.txt
rename to forge-gui/res/cardsfolder/h/hazezon_shaper_of_sand.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/herd_migration.txt b/forge-gui/res/cardsfolder/h/herd_migration.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/herd_migration.txt
rename to forge-gui/res/cardsfolder/h/herd_migration.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/heroic_charge.txt b/forge-gui/res/cardsfolder/h/heroic_charge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/heroic_charge.txt
rename to forge-gui/res/cardsfolder/h/heroic_charge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/heros_heirloom.txt b/forge-gui/res/cardsfolder/h/heros_heirloom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/heros_heirloom.txt
rename to forge-gui/res/cardsfolder/h/heros_heirloom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/historians_boon.txt b/forge-gui/res/cardsfolder/h/historians_boon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/historians_boon.txt
rename to forge-gui/res/cardsfolder/h/historians_boon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hurler_cyclops.txt b/forge-gui/res/cardsfolder/h/hurler_cyclops.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hurler_cyclops.txt
rename to forge-gui/res/cardsfolder/h/hurler_cyclops.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hurloon_battle_hymn.txt b/forge-gui/res/cardsfolder/h/hurloon_battle_hymn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hurloon_battle_hymn.txt
rename to forge-gui/res/cardsfolder/h/hurloon_battle_hymn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hypnotic_pattern.txt b/forge-gui/res/cardsfolder/h/hypnotic_pattern.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/hypnotic_pattern.txt
rename to forge-gui/res/cardsfolder/h/hypnotic_pattern.txt
index d50b1362c5d..4be6cc29ce8 100644
--- a/forge-gui/res/cardsfolder/upcoming/hypnotic_pattern.txt
+++ b/forge-gui/res/cardsfolder/h/hypnotic_pattern.txt
@@ -1,8 +1,8 @@
-Name:Hypnotic Pattern
-ManaCost:U
-Types:Instant
-A:SP$ Effect | ValidTgts$ Creature | StaticAbilities$ PerpetualDebuff | RememberObjects$ Targeted | Name$ Hypnotic Pattern's Perpetual Effect | Duration$ Permanent | SubAbility$ DBPump | SpellDescription$ Target creature perpetually gets -2/-0.
-SVar:PerpetualDebuff:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ -2 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets -2/-0.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | ValidTgts$ Creature | NumAtt$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-0 until end of turn.
-Oracle:Target creature perpetually gets -2/-0.\nTarget creature gets -2/-0 until end of turn.
+Name:Hypnotic Pattern
+ManaCost:U
+Types:Instant
+A:SP$ Effect | ValidTgts$ Creature | StaticAbilities$ PerpetualDebuff | RememberObjects$ Targeted | Name$ Hypnotic Pattern's Perpetual Effect | Duration$ Permanent | SubAbility$ DBPump | SpellDescription$ Target creature perpetually gets -2/-0.
+SVar:PerpetualDebuff:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ -2 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets -2/-0.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | NumAtt$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-0 until end of turn.
+Oracle:Target creature perpetually gets -2/-0.\nTarget creature gets -2/-0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/idyllic_beachfront.txt b/forge-gui/res/cardsfolder/i/idyllic_beachfront.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/idyllic_beachfront.txt
rename to forge-gui/res/cardsfolder/i/idyllic_beachfront.txt
index 23ab599777d..064e5c05a35 100644
--- a/forge-gui/res/cardsfolder/upcoming/idyllic_beachfront.txt
+++ b/forge-gui/res/cardsfolder/i/idyllic_beachfront.txt
@@ -1,5 +1,5 @@
-Name:Idyllic Beachfront
-ManaCost:no cost
-Types:Land Plains Island
-K:CARDNAME enters the battlefield tapped.
-Oracle:({T}: Add {W} or {U}.)\nIdyllic Beachfront enters the battlefield tapped.
+Name:Idyllic Beachfront
+ManaCost:no cost
+Types:Land Plains Island
+K:CARDNAME enters the battlefield tapped.
+Oracle:({T}: Add {W} or {U}.)\nIdyllic Beachfront enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/imoen_trickster_friend.txt b/forge-gui/res/cardsfolder/i/imoen_trickster_friend.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/imoen_trickster_friend.txt
rename to forge-gui/res/cardsfolder/i/imoen_trickster_friend.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/impede_momentum.txt b/forge-gui/res/cardsfolder/i/impede_momentum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/impede_momentum.txt
rename to forge-gui/res/cardsfolder/i/impede_momentum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/in_thrall_to_the_pit.txt b/forge-gui/res/cardsfolder/i/in_thrall_to_the_pit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/in_thrall_to_the_pit.txt
rename to forge-gui/res/cardsfolder/i/in_thrall_to_the_pit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/inscribed_tablet.txt b/forge-gui/res/cardsfolder/i/inscribed_tablet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/inscribed_tablet.txt
rename to forge-gui/res/cardsfolder/i/inscribed_tablet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/iridian_maelstrom.txt b/forge-gui/res/cardsfolder/i/iridian_maelstrom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/iridian_maelstrom.txt
rename to forge-gui/res/cardsfolder/i/iridian_maelstrom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ivy_gleeful_spellthief.txt b/forge-gui/res/cardsfolder/i/ivy_gleeful_spellthief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ivy_gleeful_spellthief.txt
rename to forge-gui/res/cardsfolder/i/ivy_gleeful_spellthief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jaheira_harper_emissary.txt b/forge-gui/res/cardsfolder/j/jaheira_harper_emissary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jaheira_harper_emissary.txt
rename to forge-gui/res/cardsfolder/j/jaheira_harper_emissary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jared_carthalion.txt b/forge-gui/res/cardsfolder/j/jared_carthalion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jared_carthalion.txt
rename to forge-gui/res/cardsfolder/j/jared_carthalion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jasmine_boreal_of_the_seven.txt b/forge-gui/res/cardsfolder/j/jasmine_boreal_of_the_seven.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jasmine_boreal_of_the_seven.txt
rename to forge-gui/res/cardsfolder/j/jasmine_boreal_of_the_seven.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jaya_fiery_negotiator.txt b/forge-gui/res/cardsfolder/j/jaya_fiery_negotiator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jaya_fiery_negotiator.txt
rename to forge-gui/res/cardsfolder/j/jaya_fiery_negotiator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jayas_firenado.txt b/forge-gui/res/cardsfolder/j/jayas_firenado.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jayas_firenado.txt
rename to forge-gui/res/cardsfolder/j/jayas_firenado.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jedit_ojanen_mercenary.txt b/forge-gui/res/cardsfolder/j/jedit_ojanen_mercenary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jedit_ojanen_mercenary.txt
rename to forge-gui/res/cardsfolder/j/jedit_ojanen_mercenary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jenson_carthalion_druid_exile.txt b/forge-gui/res/cardsfolder/j/jenson_carthalion_druid_exile.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jenson_carthalion_druid_exile.txt
rename to forge-gui/res/cardsfolder/j/jenson_carthalion_druid_exile.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jhoira_ageless_innovator.txt b/forge-gui/res/cardsfolder/j/jhoira_ageless_innovator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jhoira_ageless_innovator.txt
rename to forge-gui/res/cardsfolder/j/jhoira_ageless_innovator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jodah_the_unifier.txt b/forge-gui/res/cardsfolder/j/jodah_the_unifier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jodah_the_unifier.txt
rename to forge-gui/res/cardsfolder/j/jodah_the_unifier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jodahs_codex.txt b/forge-gui/res/cardsfolder/j/jodahs_codex.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jodahs_codex.txt
rename to forge-gui/res/cardsfolder/j/jodahs_codex.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/join_forces.txt b/forge-gui/res/cardsfolder/j/join_forces.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/join_forces.txt
rename to forge-gui/res/cardsfolder/j/join_forces.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/joint_exploration.txt b/forge-gui/res/cardsfolder/j/joint_exploration.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/joint_exploration.txt
rename to forge-gui/res/cardsfolder/j/joint_exploration.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jon_irenicus_the_exile.txt b/forge-gui/res/cardsfolder/j/jon_irenicus_the_exile.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jon_irenicus_the_exile.txt
rename to forge-gui/res/cardsfolder/j/jon_irenicus_the_exile.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/juniper_order_rootweaver.txt b/forge-gui/res/cardsfolder/j/juniper_order_rootweaver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/juniper_order_rootweaver.txt
rename to forge-gui/res/cardsfolder/j/juniper_order_rootweaver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kardum_patron_of_flames.txt b/forge-gui/res/cardsfolder/k/kardum_patron_of_flames.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kardum_patron_of_flames.txt
rename to forge-gui/res/cardsfolder/k/kardum_patron_of_flames.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/karlach_raging_tiefling.txt b/forge-gui/res/cardsfolder/k/karlach_raging_tiefling.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/karlach_raging_tiefling.txt
rename to forge-gui/res/cardsfolder/k/karlach_raging_tiefling.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/karn_living_legacy.txt b/forge-gui/res/cardsfolder/k/karn_living_legacy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/karn_living_legacy.txt
rename to forge-gui/res/cardsfolder/k/karn_living_legacy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/karns_sylex.txt b/forge-gui/res/cardsfolder/k/karns_sylex.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/karns_sylex.txt
rename to forge-gui/res/cardsfolder/k/karns_sylex.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/keldon_strike_team.txt b/forge-gui/res/cardsfolder/k/keldon_strike_team.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/keldon_strike_team.txt
rename to forge-gui/res/cardsfolder/k/keldon_strike_team.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/king_darien_xlviii.txt b/forge-gui/res/cardsfolder/k/king_darien_xlviii.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/king_darien_xlviii.txt
rename to forge-gui/res/cardsfolder/k/king_darien_xlviii.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/klement_novice_acoltye.txt b/forge-gui/res/cardsfolder/k/klement_novice_acolyte.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/klement_novice_acoltye.txt
rename to forge-gui/res/cardsfolder/k/klement_novice_acolyte.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_dawns_light.txt b/forge-gui/res/cardsfolder/k/knight_of_dawns_light.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/knight_of_dawns_light.txt
rename to forge-gui/res/cardsfolder/k/knight_of_dawns_light.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_dusks_shadow.txt b/forge-gui/res/cardsfolder/k/knight_of_dusks_shadow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/knight_of_dusks_shadow.txt
rename to forge-gui/res/cardsfolder/k/knight_of_dusks_shadow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kobold_warcaller.txt b/forge-gui/res/cardsfolder/k/kobold_warcaller.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/kobold_warcaller.txt
rename to forge-gui/res/cardsfolder/k/kobold_warcaller.txt
index 25b044ea273..71aaa6da1af 100644
--- a/forge-gui/res/cardsfolder/upcoming/kobold_warcaller.txt
+++ b/forge-gui/res/cardsfolder/k/kobold_warcaller.txt
@@ -1,9 +1,9 @@
-Name:Kobold Warcaller
-ManaCost:R
-Types:Creature Kobold
-PT:1/1
-A:AB$ ChooseCard | Cost$ T | ChoiceZone$ Hand | Choices$ Creature.YouOwn | ChoiceTitle$ Choose a creature card in your hand | Amount$ 1 | SpellDescription$ Choose a creature card in your hand. It perpetually gains haste. | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualHaste | Name$ Kobold WarCaller's Perpetual Effect | Duration$ Permanent
-SVar:PerpetualHaste:Mode$ Continuous | Affected$ Card.ChosenCard | AddKeyword$ Haste | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gains haste.
-AI:RemoveDeck:Random 
-Oracle:{T}: Choose a creature card in your hand. It perpetually gains haste.
+Name:Kobold Warcaller
+ManaCost:R
+Types:Creature Kobold
+PT:1/1
+A:AB$ ChooseCard | Cost$ T | ChoiceZone$ Hand | Choices$ Creature.YouOwn | ChoiceTitle$ Choose a creature card in your hand | Amount$ 1 | SpellDescription$ Choose a creature card in your hand. It perpetually gains haste. | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualHaste | Name$ Kobold WarCaller's Perpetual Effect | Duration$ Permanent
+SVar:PerpetualHaste:Mode$ Continuous | Affected$ Card.ChosenCard | AddKeyword$ Haste | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gains haste.
+AI:RemoveDeck:Random 
+Oracle:{T}: Choose a creature card in your hand. It perpetually gains haste.
diff --git a/forge-gui/res/cardsfolder/upcoming/laezel_githyanki_warrior.txt b/forge-gui/res/cardsfolder/l/laezel_githyanki_warrior.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/laezel_githyanki_warrior.txt
rename to forge-gui/res/cardsfolder/l/laezel_githyanki_warrior.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lagomos_hand_of_hatred.txt b/forge-gui/res/cardsfolder/l/lagomos_hand_of_hatred.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lagomos_hand_of_hatred.txt
rename to forge-gui/res/cardsfolder/l/lagomos_hand_of_hatred.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/leaf-crowned_visionary.txt b/forge-gui/res/cardsfolder/l/leaf-crowned_visionary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/leaf-crowned_visionary.txt
rename to forge-gui/res/cardsfolder/l/leaf-crowned_visionary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/leyline_binding.txt b/forge-gui/res/cardsfolder/l/leyline_binding.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/leyline_binding.txt
rename to forge-gui/res/cardsfolder/l/leyline_binding.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/liara_of_the_flaming_fist.txt b/forge-gui/res/cardsfolder/l/liara_of_the_flaming_fist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/liara_of_the_flaming_fist.txt
rename to forge-gui/res/cardsfolder/l/liara_of_the_flaming_fist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lizardfolk_librarians.txt b/forge-gui/res/cardsfolder/l/lizardfolk_librarians.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lizardfolk_librarians.txt
rename to forge-gui/res/cardsfolder/l/lizardfolk_librarians.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/llanowar_greenwidow.txt b/forge-gui/res/cardsfolder/l/llanowar_greenwidow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/llanowar_greenwidow.txt
rename to forge-gui/res/cardsfolder/l/llanowar_greenwidow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/llanowar_loamspeaker.txt b/forge-gui/res/cardsfolder/l/llanowar_loamspeaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/llanowar_loamspeaker.txt
rename to forge-gui/res/cardsfolder/l/llanowar_loamspeaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/llanowar_stalker.txt b/forge-gui/res/cardsfolder/l/llanowar_stalker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/llanowar_stalker.txt
rename to forge-gui/res/cardsfolder/l/llanowar_stalker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/love_song_of_night_and_day.txt b/forge-gui/res/cardsfolder/l/love_song_of_night_and_day.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/love_song_of_night_and_day.txt
rename to forge-gui/res/cardsfolder/l/love_song_of_night_and_day.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lukamina_moon_druid.txt b/forge-gui/res/cardsfolder/l/lukamina_moon_druid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lukamina_moon_druid.txt
rename to forge-gui/res/cardsfolder/l/lukamina_moon_druid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lulu_forgetful_hollyphant.txt b/forge-gui/res/cardsfolder/l/lulu_forgetful_hollyphant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lulu_forgetful_hollyphant.txt
rename to forge-gui/res/cardsfolder/l/lulu_forgetful_hollyphant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mace_of_disruption.txt b/forge-gui/res/cardsfolder/m/mace_of_disruption.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mace_of_disruption.txt
rename to forge-gui/res/cardsfolder/m/mace_of_disruption.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/magnigoth_sentry.txt b/forge-gui/res/cardsfolder/m/magnigoth_sentry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/magnigoth_sentry.txt
rename to forge-gui/res/cardsfolder/m/magnigoth_sentry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mana_cannons.txt b/forge-gui/res/cardsfolder/m/mana_cannons.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mana_cannons.txt
rename to forge-gui/res/cardsfolder/m/mana_cannons.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mephits_enthusiasm.txt b/forge-gui/res/cardsfolder/m/mephits_enthusiasm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mephits_enthusiasm.txt
rename to forge-gui/res/cardsfolder/m/mephits_enthusiasm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/meria_ scholar_of antiquity.txt b/forge-gui/res/cardsfolder/m/meria_scholar_of_antiquity.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/meria_ scholar_of antiquity.txt
rename to forge-gui/res/cardsfolder/m/meria_scholar_of_antiquity.txt
index 8f6b27ccafa..c88b95a8d03 100644
--- a/forge-gui/res/cardsfolder/upcoming/meria_ scholar_of antiquity.txt	
+++ b/forge-gui/res/cardsfolder/m/meria_scholar_of_antiquity.txt
@@ -1,11 +1,11 @@
-Name:Meria, Scholar of Antiquity
-ManaCost:1 R G
-Types:Legendary Creature Elf Artificer
-PT:3/3
-A:AB$ Mana | Cost$ tapXType<1/Artifact.nonToken/nontoken artifact> | Produced$ G | SpellDescription$ Add {G}.
-A:AB$ Dig | Cost$ tapXType<2/Artifact.nonToken/nontoken artifact> | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | Defined$ You | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top card of your library. You may play it this turn.
-SVar:DBEffect:DB$ Effect | StaticAbilities$ EffSModeContinuous | ExileOnMoved$ Exile | RememberObjects$ Remembered | SubAbility$ DBCleanup
-SVar:EffSModeContinuous:Mode$ Continuous | EffectZone$ Command | Affected$ Card.IsRemembered | MayPlay$ True | AffectedZone$ Exile | Description$ You may play it this turn.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHints:Type$Artifact
-Oracle:Tap an untapped nontoken artifact you control: Add {G}.\nTap two untapped nontoken artifacts you control: Exile the top card of your library. You may play it this turn.
+Name:Meria, Scholar of Antiquity
+ManaCost:1 R G
+Types:Legendary Creature Elf Artificer
+PT:3/3
+A:AB$ Mana | Cost$ tapXType<1/Artifact.nonToken/nontoken artifact> | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Dig | Cost$ tapXType<2/Artifact.nonToken/nontoken artifact> | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | Defined$ You | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top card of your library. You may play it this turn.
+SVar:DBEffect:DB$ Effect | StaticAbilities$ EffSModeContinuous | ExileOnMoved$ Exile | RememberObjects$ Remembered | SubAbility$ DBCleanup
+SVar:EffSModeContinuous:Mode$ Continuous | EffectZone$ Command | Affected$ Card.IsRemembered | MayPlay$ True | AffectedZone$ Exile | Description$ You may play it this turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHints:Type$Artifact
+Oracle:Tap an untapped nontoken artifact you control: Add {G}.\nTap two untapped nontoken artifacts you control: Exile the top card of your library. You may play it this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/merias_outrider.txt b/forge-gui/res/cardsfolder/m/merias_outrider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/merias_outrider.txt
rename to forge-gui/res/cardsfolder/m/merias_outrider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mesa_cavalier.txt b/forge-gui/res/cardsfolder/m/mesa_cavalier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mesa_cavalier.txt
rename to forge-gui/res/cardsfolder/m/mesa_cavalier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/micromancer.txt b/forge-gui/res/cardsfolder/m/micromancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/micromancer.txt
rename to forge-gui/res/cardsfolder/m/micromancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mind_spike.txt b/forge-gui/res/cardsfolder/m/mind_spike.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/mind_spike.txt
rename to forge-gui/res/cardsfolder/m/mind_spike.txt
index 2c805966e9e..64fd71defd7 100644
--- a/forge-gui/res/cardsfolder/upcoming/mind_spike.txt
+++ b/forge-gui/res/cardsfolder/m/mind_spike.txt
@@ -1,8 +1,8 @@
-Name:Mind Spike
-ManaCost:B
-Types:Sorcery
-A:SP$ Reveal | ValidTgts$ Opponent | RevealAllValid$ Card.nonLand+nonCreature+TargetedPlayerCtrl | RememberRevealed$ True | SubAbility$ DBDiscard | StackDescription$ SpellDescription | SpellDescription$ Target opponent reveals each noncreature, nonland card in their hand. You choose a card revealed this way. That player discards that card. You lose 2 life. If they didn't reveal a card this way, you draw a card.
-SVar:DBDiscard:DB$ Discard | Defined$ Targeted | Mode$ YouChoose | NumCards$ 1 | DiscardValid$ Card.nonLand+nonCreature | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2 | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | NumCards$ 1 | Defined$ You | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 
-Oracle:Target opponent reveals each noncreature, nonland card in their hand. You choose a card revealed this way. That player discards that card. You lose 2 life. If they didn't reveal a card this way, you draw a card.
+Name:Mind Spike
+ManaCost:B
+Types:Sorcery
+A:SP$ Reveal | ValidTgts$ Opponent | RevealAllValid$ Card.nonLand+nonCreature+TargetedPlayerCtrl | RememberRevealed$ True | SubAbility$ DBDiscard | StackDescription$ SpellDescription | SpellDescription$ Target opponent reveals each noncreature, nonland card in their hand. You choose a card revealed this way. That player discards that card. You lose 2 life. If they didn't reveal a card this way, you draw a card.
+SVar:DBDiscard:DB$ Discard | Defined$ Targeted | Mode$ YouChoose | NumCards$ 1 | DiscardValid$ Card.nonLand+nonCreature | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | NumCards$ 1 | Defined$ You | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 
+Oracle:Target opponent reveals each noncreature, nonland card in their hand. You choose a card revealed this way. That player discards that card. You lose 2 life. If they didn't reveal a card this way, you draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/minthara_of_the_absolute.txt b/forge-gui/res/cardsfolder/m/minthara_of_the_absolute.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/minthara_of_the_absolute.txt
rename to forge-gui/res/cardsfolder/m/minthara_of_the_absolute.txt
index bb1a99a9da5..974b8e2fe2f 100644
--- a/forge-gui/res/cardsfolder/upcoming/minthara_of_the_absolute.txt
+++ b/forge-gui/res/cardsfolder/m/minthara_of_the_absolute.txt
@@ -1,12 +1,12 @@
-Name:Minthara of the Absolute
-ManaCost:2 W B
-Types:Legendary Creature Elf Cleric
-PT:2/4
-K:Starting intensity:0
-T:Mode$ ChangesZone | ValidCards$ Permanent.YouCtrl| Origin$ Battlefield | Destination$ Any | TriggerZones$ Battlefield | Execute$ TrigIntensify | ActivationLimit$ 1 | TriggerDescription$ Whenever one or more permanents you control leave the battlefield, perpetually increase NICKNAME's intensity and the intensity of cards named Minthara of the Absolute in your hand, graveyard, and library by 1. This ability triggers only once each turn.
-SVar:TrigIntensify:DB$ Intensify | AllDefined$ Card.Self,Card.inZoneGraveyard+namedMinthara of the Absolute+YouOwn,Card.inZoneHand+namedMinthara of the Absolute+YouOwn,Card.inZoneLibrary+namedMinthara of the Absolute+YouOwn
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ X | Description$ Creatures you control get +X/+0, where X is CARDNAME's intensity.
-SVar:X:Count$Intensity
-SVar:BuffedBy:Creature
-DeckHints:Ability$Token|Sacrifice
-Oracle:Starting intensity 0\nCreatures you control get +X/+0, where X is Minthara of the Absolute's intensity.\nWhenever one or more permanents you control leave the battlefield, perpetually increase Minthara's intensity and the intensity of cards named Minthara of the Absolute in your hand, graveyard, and library by 1. This ability triggers only once each turn.
+Name:Minthara of the Absolute
+ManaCost:2 W B
+Types:Legendary Creature Elf Cleric
+PT:2/4
+K:Starting intensity:0
+T:Mode$ ChangesZone | ValidCards$ Permanent.YouCtrl| Origin$ Battlefield | Destination$ Any | TriggerZones$ Battlefield | Execute$ TrigIntensify | ActivationLimit$ 1 | TriggerDescription$ Whenever one or more permanents you control leave the battlefield, perpetually increase NICKNAME's intensity and the intensity of cards named Minthara of the Absolute in your hand, graveyard, and library by 1. This ability triggers only once each turn.
+SVar:TrigIntensify:DB$ Intensify | AllDefined$ Card.Self,Card.inZoneGraveyard+namedMinthara of the Absolute+YouOwn,Card.inZoneHand+namedMinthara of the Absolute+YouOwn,Card.inZoneLibrary+namedMinthara of the Absolute+YouOwn
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ X | Description$ Creatures you control get +X/+0, where X is CARDNAME's intensity.
+SVar:X:Count$Intensity
+SVar:BuffedBy:Creature
+DeckHints:Ability$Token|Sacrifice
+Oracle:Starting intensity 0\nCreatures you control get +X/+0, where X is Minthara of the Absolute's intensity.\nWhenever one or more permanents you control leave the battlefield, perpetually increase Minthara's intensity and the intensity of cards named Minthara of the Absolute in your hand, graveyard, and library by 1. This ability triggers only once each turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/moira_urborg_haunt.txt b/forge-gui/res/cardsfolder/m/moira_urborg_haunt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/moira_urborg_haunt.txt
rename to forge-gui/res/cardsfolder/m/moira_urborg_haunt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/molten_monstrosity.txt b/forge-gui/res/cardsfolder/m/molten_monstrosity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/molten_monstrosity.txt
rename to forge-gui/res/cardsfolder/m/molten_monstrosity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/molten_tributary.txt b/forge-gui/res/cardsfolder/m/molten_tributary.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/molten_tributary.txt
rename to forge-gui/res/cardsfolder/m/molten_tributary.txt
index a20896f0d83..f282834c195 100644
--- a/forge-gui/res/cardsfolder/upcoming/molten_tributary.txt
+++ b/forge-gui/res/cardsfolder/m/molten_tributary.txt
@@ -1,5 +1,5 @@
-Name:Molten Tributary
-ManaCost:no cost
-Types:Land Island Mountain
-K:CARDNAME enters the battlefield tapped.
-Oracle:({T}: Add {U} or {R}.)\nMolten Tributary enters the battlefield tapped.
+Name:Molten Tributary
+ManaCost:no cost
+Types:Land Island Mountain
+K:CARDNAME enters the battlefield tapped.
+Oracle:({T}: Add {U} or {R}.)\nMolten Tributary enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/monstrous_war_leech.txt b/forge-gui/res/cardsfolder/m/monstrous_war-leech.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/monstrous_war_leech.txt
rename to forge-gui/res/cardsfolder/m/monstrous_war-leech.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/moradins_disciples.txt b/forge-gui/res/cardsfolder/m/moradins_disciples.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/moradins_disciples.txt
rename to forge-gui/res/cardsfolder/m/moradins_disciples.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mossbeard_ancient.txt b/forge-gui/res/cardsfolder/m/mossbeard_ancient.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mossbeard_ancient.txt
rename to forge-gui/res/cardsfolder/m/mossbeard_ancient.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nael_avizoa_aeronaut.txt b/forge-gui/res/cardsfolder/n/nael_avizoa_aeronaut.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nael_avizoa_aeronaut.txt
rename to forge-gui/res/cardsfolder/n/nael_avizoa_aeronaut.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/najal_the_storm_runner.txt b/forge-gui/res/cardsfolder/n/najal_the_storm_runner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/najal_the_storm_runner.txt
rename to forge-gui/res/cardsfolder/n/najal_the_storm_runner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nemata_primeval_warden.txt b/forge-gui/res/cardsfolder/n/nemata_primeval_warden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nemata_primeval_warden.txt
rename to forge-gui/res/cardsfolder/n/nemata_primeval_warden.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nishoba_brawler.txt b/forge-gui/res/cardsfolder/n/nishoba_brawler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nishoba_brawler.txt
rename to forge-gui/res/cardsfolder/n/nishoba_brawler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/obsidian_obelisk.txt b/forge-gui/res/cardsfolder/o/obsidian_obelisk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/obsidian_obelisk.txt
rename to forge-gui/res/cardsfolder/o/obsidian_obelisk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ohabi_caleria.txt b/forge-gui/res/cardsfolder/o/ohabi_caleria.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ohabi_caleria.txt
rename to forge-gui/res/cardsfolder/o/ohabi_caleria.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/orca_siege_demon.txt b/forge-gui/res/cardsfolder/o/orca_siege_demon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/orca_siege_demon.txt
rename to forge-gui/res/cardsfolder/o/orca_siege_demon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phoenix_chick.txt b/forge-gui/res/cardsfolder/p/phoenix_chick.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/phoenix_chick.txt
rename to forge-gui/res/cardsfolder/p/phoenix_chick.txt
index a5ad7e26ebd..20950b00849 100644
--- a/forge-gui/res/cardsfolder/upcoming/phoenix_chick.txt
+++ b/forge-gui/res/cardsfolder/p/phoenix_chick.txt
@@ -1,14 +1,14 @@
-Name:Phoenix Chick
-ManaCost:R
-Types:Creature Phoenix
-PT:1/1
-K:Flying
-K:Haste
-K:CARDNAME can't block.
-T:Mode$ AttackersDeclared | CheckSVar$ X | SVarCompare$ GE3 | Execute$ TrigReturn | NoResolvingCheck$ True | TriggerZones$ Graveyard | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with three or more creatures, you may pay {R}{R}. If you do, return Phoenix Chick from your graveyard to the battlefield tapped and attacking with a +1/+1 counter on it.
-SVar:TrigReturn:AB$ ChangeZone | Cost$ R R | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | Attacking$ True | WithCountersType$ P1P1 | WithCountersAmount$ 1
-SVar:X:Count$Valid Creature.attacking
-SVar:DiscardMe:1
-SVar:SacMe:1
-DeckHas:Ability$Counters|Graveyard
-Oracle:Flying, haste\nPhoenix Chick can't block.\nWhenever you attack with three or more creatures, you may pay {R}{R}. If you do, return Phoenix Chick from your graveyard to the battlefield tapped and attacking with a +1/+1 counter on it.
+Name:Phoenix Chick
+ManaCost:R
+Types:Creature Phoenix
+PT:1/1
+K:Flying
+K:Haste
+K:CARDNAME can't block.
+T:Mode$ AttackersDeclared | CheckSVar$ X | SVarCompare$ GE3 | Execute$ TrigReturn | NoResolvingCheck$ True | TriggerZones$ Graveyard | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with three or more creatures, you may pay {R}{R}. If you do, return Phoenix Chick from your graveyard to the battlefield tapped and attacking with a +1/+1 counter on it.
+SVar:TrigReturn:AB$ ChangeZone | Cost$ R R | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | Attacking$ True | WithCountersType$ P1P1 | WithCountersAmount$ 1
+SVar:X:Count$Valid Creature.attacking
+SVar:DiscardMe:1
+SVar:SacMe:1
+DeckHas:Ability$Counters|Graveyard
+Oracle:Flying, haste\nPhoenix Chick can't block.\nWhenever you attack with three or more creatures, you may pay {R}{R}. If you do, return Phoenix Chick from your graveyard to the battlefield tapped and attacking with a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/phyrexian_espionage.txt b/forge-gui/res/cardsfolder/p/phyrexian_espionage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyrexian_espionage.txt
rename to forge-gui/res/cardsfolder/p/phyrexian_espionage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phyrexian_missionary.txt b/forge-gui/res/cardsfolder/p/phyrexian_missionary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyrexian_missionary.txt
rename to forge-gui/res/cardsfolder/p/phyrexian_missionary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phyrexian_vivisector.txt b/forge-gui/res/cardsfolder/p/phyrexian_vivisector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyrexian_vivisector.txt
rename to forge-gui/res/cardsfolder/p/phyrexian_vivisector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phyrexian_warhorse.txt b/forge-gui/res/cardsfolder/p/phyrexian_warhorse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyrexian_warhorse.txt
rename to forge-gui/res/cardsfolder/p/phyrexian_warhorse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pilfer.txt b/forge-gui/res/cardsfolder/p/pilfer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pilfer.txt
rename to forge-gui/res/cardsfolder/p/pilfer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pixie_illusionist.txt b/forge-gui/res/cardsfolder/p/pixie_illusionist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pixie_illusionist.txt
rename to forge-gui/res/cardsfolder/p/pixie_illusionist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/plaza_of_heroes.txt b/forge-gui/res/cardsfolder/p/plaza_of_heroes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/plaza_of_heroes.txt
rename to forge-gui/res/cardsfolder/p/plaza_of_heroes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prayer_of_binding.txt b/forge-gui/res/cardsfolder/p/prayer_of_binding.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prayer_of_binding.txt
rename to forge-gui/res/cardsfolder/p/prayer_of_binding.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/primeval_spawn.txt b/forge-gui/res/cardsfolder/p/primeval_spawn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/primeval_spawn.txt
rename to forge-gui/res/cardsfolder/p/primeval_spawn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/protect_the_negotiators.txt b/forge-gui/res/cardsfolder/p/protect_the_negotiators.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/protect_the_negotiators.txt
rename to forge-gui/res/cardsfolder/p/protect_the_negotiators.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/queen_allenal_of_ruadach.txt b/forge-gui/res/cardsfolder/q/queen_allenal_of_ruadach.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/queen_allenal_of_ruadach.txt
rename to forge-gui/res/cardsfolder/q/queen_allenal_of_ruadach.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quirion_beastcaller.txt b/forge-gui/res/cardsfolder/q/quirion_beastcaller.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quirion_beastcaller.txt
rename to forge-gui/res/cardsfolder/q/quirion_beastcaller.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/radha_coalition_warlord.txt b/forge-gui/res/cardsfolder/r/radha_coalition_warlord.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/radha_coalition_warlord.txt
rename to forge-gui/res/cardsfolder/r/radha_coalition_warlord.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/radhas_firebrand.txt b/forge-gui/res/cardsfolder/r/radhas_firebrand.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/radhas_firebrand.txt
rename to forge-gui/res/cardsfolder/r/radhas_firebrand.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/radiant_grove.txt b/forge-gui/res/cardsfolder/r/radiant_grove.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/radiant_grove.txt
rename to forge-gui/res/cardsfolder/r/radiant_grove.txt
index 0225e9f05a2..c3d64c4fa19 100644
--- a/forge-gui/res/cardsfolder/upcoming/radiant_grove.txt
+++ b/forge-gui/res/cardsfolder/r/radiant_grove.txt
@@ -1,5 +1,5 @@
-Name:Radiant Grove
-ManaCost:no cost
-Types:Land Forest Plains
-K:CARDNAME enters the battlefield tapped.
-Oracle:({T}: Add {G} or {W}.)\nRadiant Grove enters the battlefield tapped.
+Name:Radiant Grove
+ManaCost:no cost
+Types:Land Forest Plains
+K:CARDNAME enters the battlefield tapped.
+Oracle:({T}: Add {G} or {W}.)\nRadiant Grove enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/raff_weatherlight_stalwart.txt b/forge-gui/res/cardsfolder/r/raff_weatherlight_stalwart.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raff_weatherlight_stalwart.txt
rename to forge-gui/res/cardsfolder/r/raff_weatherlight_stalwart.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ragefire_hellkite.txt b/forge-gui/res/cardsfolder/r/ragefire_hellkite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ragefire_hellkite.txt
rename to forge-gui/res/cardsfolder/r/ragefire_hellkite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ramirez_depietro_pillager.txt b/forge-gui/res/cardsfolder/r/ramirez_depietro_pillager.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ramirez_depietro_pillager.txt
rename to forge-gui/res/cardsfolder/r/ramirez_depietro_pillager.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ramses_assassin_lord.txt b/forge-gui/res/cardsfolder/r/ramses_assassin_lord.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ramses_assassin_lord.txt
rename to forge-gui/res/cardsfolder/r/ramses_assassin_lord.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ranger_squadron.txt b/forge-gui/res/cardsfolder/r/ranger_squadron.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ranger_squadron.txt
rename to forge-gui/res/cardsfolder/r/ranger_squadron.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rasaad_monk_of_selune.txt b/forge-gui/res/cardsfolder/r/rasaad_monk_of_selune.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rasaad_monk_of_selune.txt
rename to forge-gui/res/cardsfolder/r/rasaad_monk_of_selune.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rasputin_the_oneiromancer.txt b/forge-gui/res/cardsfolder/r/rasputin_the_oneiromancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rasputin_the_oneiromancer.txt
rename to forge-gui/res/cardsfolder/r/rasputin_the_oneiromancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ratadrabik_of_urborg.txt b/forge-gui/res/cardsfolder/r/ratadrabik_of_urborg.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ratadrabik_of_urborg.txt
rename to forge-gui/res/cardsfolder/r/ratadrabik_of_urborg.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/relic_of_legends.txt b/forge-gui/res/cardsfolder/r/relic_of_legends.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/relic_of_legends.txt
rename to forge-gui/res/cardsfolder/r/relic_of_legends.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/resolute_reinforcements.txt b/forge-gui/res/cardsfolder/r/resolute_reinforcements.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/resolute_reinforcements.txt
rename to forge-gui/res/cardsfolder/r/resolute_reinforcements.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rith_liberated_primeval.txt b/forge-gui/res/cardsfolder/r/rith_liberated_primeval.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rith_liberated_primeval.txt
rename to forge-gui/res/cardsfolder/r/rith_liberated_primeval.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rivaz_of_the_claw.txt b/forge-gui/res/cardsfolder/r/rivaz_of_the_claw.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rivaz_of_the_claw.txt
rename to forge-gui/res/cardsfolder/r/rivaz_of_the_claw.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/robaran_mercenaries.txt b/forge-gui/res/cardsfolder/r/robaran_mercenaries.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/robaran_mercenaries.txt
rename to forge-gui/res/cardsfolder/r/robaran_mercenaries.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rohgahh_kher_keep_overlord.txt b/forge-gui/res/cardsfolder/r/rohgahh_kher_keep_overlord.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rohgahh_kher_keep_overlord.txt
rename to forge-gui/res/cardsfolder/r/rohgahh_kher_keep_overlord.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rona_sheoldreds_faithful.txt b/forge-gui/res/cardsfolder/r/rona_sheoldreds_faithful.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rona_sheoldreds_faithful.txt
rename to forge-gui/res/cardsfolder/r/rona_sheoldreds_faithful.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ronas_vortex.txt b/forge-gui/res/cardsfolder/r/ronas_vortex.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ronas_vortex.txt
rename to forge-gui/res/cardsfolder/r/ronas_vortex.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rosnakht_heir_of_rohgahh.txt b/forge-gui/res/cardsfolder/r/rosnakht_heir_of_rohgahh.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rosnakht_heir_of_rohgahh.txt
rename to forge-gui/res/cardsfolder/r/rosnakht_heir_of_rohgahh.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rulik_mons_warren_chief.txt b/forge-gui/res/cardsfolder/r/rulik_mons_warren_chief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rulik_mons_warren_chief.txt
rename to forge-gui/res/cardsfolder/r/rulik_mons_warren_chief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rundvelt_hordemaster.txt b/forge-gui/res/cardsfolder/r/rundvelt_hordemaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rundvelt_hordemaster.txt
rename to forge-gui/res/cardsfolder/r/rundvelt_hordemaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/runic_shot.txt b/forge-gui/res/cardsfolder/r/runic_shot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/runic_shot.txt
rename to forge-gui/res/cardsfolder/r/runic_shot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sacred_peaks.txt b/forge-gui/res/cardsfolder/s/sacred_peaks.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/sacred_peaks.txt
rename to forge-gui/res/cardsfolder/s/sacred_peaks.txt
index d334cbf5545..82fe9ef53be 100644
--- a/forge-gui/res/cardsfolder/upcoming/sacred_peaks.txt
+++ b/forge-gui/res/cardsfolder/s/sacred_peaks.txt
@@ -1,5 +1,5 @@
-Name:Sacred Peaks
-ManaCost:no cost
-Types:Land Mountain Plains
-K:CARDNAME enters the battlefield tapped.
-Oracle:({T}: Add {R} or {W}.)\nSacred Peaks enters the battlefield tapped.
+Name:Sacred Peaks
+ManaCost:no cost
+Types:Land Mountain Plains
+K:CARDNAME enters the battlefield tapped.
+Oracle:({T}: Add {R} or {W}.)\nSacred Peaks enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/salvaged_manaworker.txt b/forge-gui/res/cardsfolder/s/salvaged_manaworker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/salvaged_manaworker.txt
rename to forge-gui/res/cardsfolder/s/salvaged_manaworker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/samite_herbalist.txt b/forge-gui/res/cardsfolder/s/samite_herbalist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/samite_herbalist.txt
rename to forge-gui/res/cardsfolder/s/samite_herbalist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sarevok_the_usurper.txt b/forge-gui/res/cardsfolder/s/sarevok_the_usurper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sarevok_the_usurper.txt
rename to forge-gui/res/cardsfolder/s/sarevok_the_usurper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scout_the_wilderness.txt b/forge-gui/res/cardsfolder/s/scout_the_wilderness.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scout_the_wilderness.txt
rename to forge-gui/res/cardsfolder/s/scout_the_wilderness.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seatower_imprisonment.txt b/forge-gui/res/cardsfolder/s/seatower_imprisonment.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seatower_imprisonment.txt
rename to forge-gui/res/cardsfolder/s/seatower_imprisonment.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sengir_connoisseur.txt b/forge-gui/res/cardsfolder/s/sengir_connoisseur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sengir_connoisseur.txt
rename to forge-gui/res/cardsfolder/s/sengir_connoisseur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/serra_paragon.txt b/forge-gui/res/cardsfolder/s/serra_paragon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/serra_paragon.txt
rename to forge-gui/res/cardsfolder/s/serra_paragon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/serra_redeemer.txt b/forge-gui/res/cardsfolder/s/serra_redeemer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/serra_redeemer.txt
rename to forge-gui/res/cardsfolder/s/serra_redeemer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sewer_plague.txt b/forge-gui/res/cardsfolder/s/sewer_plague.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sewer_plague.txt
rename to forge-gui/res/cardsfolder/s/sewer_plague.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shadow_rite_priest.txt b/forge-gui/res/cardsfolder/s/shadow-rite_priest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shadow_rite_priest.txt
rename to forge-gui/res/cardsfolder/s/shadow-rite_priest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shadow_prophecy.txt b/forge-gui/res/cardsfolder/s/shadow_prophecy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shadow_prophecy.txt
rename to forge-gui/res/cardsfolder/s/shadow_prophecy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shadowheart_sharran_cleric.txt b/forge-gui/res/cardsfolder/s/shadowheart_sharran_cleric.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shadowheart_sharran_cleric.txt
rename to forge-gui/res/cardsfolder/s/shadowheart_sharran_cleric.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shalais_acolyte.txt b/forge-gui/res/cardsfolder/s/shalais_acolyte.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shalais_acolyte.txt
rename to forge-gui/res/cardsfolder/s/shalais_acolyte.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shanid_sleepers_scourge.txt b/forge-gui/res/cardsfolder/s/shanid_sleepers_scourge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shanid_sleepers_scourge.txt
rename to forge-gui/res/cardsfolder/s/shanid_sleepers_scourge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shanna_purifying_blade.txt b/forge-gui/res/cardsfolder/s/shanna_purifying_blade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shanna_purifying_blade.txt
rename to forge-gui/res/cardsfolder/s/shanna_purifying_blade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sheoldred_the_apocalypse.txt b/forge-gui/res/cardsfolder/s/sheoldred_the_apocalypse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sheoldred_the_apocalypse.txt
rename to forge-gui/res/cardsfolder/s/sheoldred_the_apocalypse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt b/forge-gui/res/cardsfolder/s/sheoldreds_restoration.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt
rename to forge-gui/res/cardsfolder/s/sheoldreds_restoration.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt b/forge-gui/res/cardsfolder/s/shield-wall_sentinel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt
rename to forge-gui/res/cardsfolder/s/shield-wall_sentinel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shivan_devastator.txt b/forge-gui/res/cardsfolder/s/shivan_devastator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shivan_devastator.txt
rename to forge-gui/res/cardsfolder/s/shivan_devastator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shore_up.txt b/forge-gui/res/cardsfolder/s/shore_up.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shore_up.txt
rename to forge-gui/res/cardsfolder/s/shore_up.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/silver_scrutiny.txt b/forge-gui/res/cardsfolder/s/silver_scrutiny.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/silver_scrutiny.txt
rename to forge-gui/res/cardsfolder/s/silver_scrutiny.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/silverback_elder.txt b/forge-gui/res/cardsfolder/s/silverback_elder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/silverback_elder.txt
rename to forge-gui/res/cardsfolder/s/silverback_elder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sivitri_dragon_master.txt b/forge-gui/res/cardsfolder/s/sivitri_dragon_master.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sivitri_dragon_master.txt
rename to forge-gui/res/cardsfolder/s/sivitri_dragon_master.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skanos_dragon_vassal.txt b/forge-gui/res/cardsfolder/s/skanos_dragon_vassal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skanos_dragon_vassal.txt
rename to forge-gui/res/cardsfolder/s/skanos_dragon_vassal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slimefoots_survey.txt b/forge-gui/res/cardsfolder/s/slimefoots_survey.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slimefoots_survey.txt
rename to forge-gui/res/cardsfolder/s/slimefoots_survey.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/smash_to_dust.txt b/forge-gui/res/cardsfolder/s/smash_to_dust.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/smash_to_dust.txt
rename to forge-gui/res/cardsfolder/s/smash_to_dust.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soaring_drake.txt b/forge-gui/res/cardsfolder/s/soaring_drake.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soaring_drake.txt
rename to forge-gui/res/cardsfolder/s/soaring_drake.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soldiers_of_the_watch.txt b/forge-gui/res/cardsfolder/s/soldiers_of_the_watch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soldiers_of_the_watch.txt
rename to forge-gui/res/cardsfolder/s/soldiers_of_the_watch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/solkanar_the_tainted.txt b/forge-gui/res/cardsfolder/s/solkanar_the_tainted.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/solkanar_the_tainted.txt
rename to forge-gui/res/cardsfolder/s/solkanar_the_tainted.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt b/forge-gui/res/cardsfolder/s/soul_of_windgrace.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt
rename to forge-gui/res/cardsfolder/s/soul_of_windgrace.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sphinx_of_clear_skies.txt b/forge-gui/res/cardsfolder/s/sphinx_of_clear_skies.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sphinx_of_clear_skies.txt
rename to forge-gui/res/cardsfolder/s/sphinx_of_clear_skies.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/splatter_goblin.txt b/forge-gui/res/cardsfolder/s/splatter_goblin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/splatter_goblin.txt
rename to forge-gui/res/cardsfolder/s/splatter_goblin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sprouting_goblin.txt b/forge-gui/res/cardsfolder/s/sprouting_goblin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sprouting_goblin.txt
rename to forge-gui/res/cardsfolder/s/sprouting_goblin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/squee_dubious_monarch.txt b/forge-gui/res/cardsfolder/s/squee_dubious_monarch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/squee_dubious_monarch.txt
rename to forge-gui/res/cardsfolder/s/squee_dubious_monarch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stall_for_time.txt b/forge-gui/res/cardsfolder/s/stall_for_time.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stall_for_time.txt
rename to forge-gui/res/cardsfolder/s/stall_for_time.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stangg_echo_warrior.txt b/forge-gui/res/cardsfolder/s/stangg_echo_warrior.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stangg_echo_warrior.txt
rename to forge-gui/res/cardsfolder/s/stangg_echo_warrior.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stenn_paranoid_partisan.txt b/forge-gui/res/cardsfolder/s/stenn_paranoid_partisan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stenn_paranoid_partisan.txt
rename to forge-gui/res/cardsfolder/s/stenn_paranoid_partisan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/strength_of_the_coalition.txt b/forge-gui/res/cardsfolder/s/strength_of_the_coalition.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/strength_of_the_coalition.txt
rename to forge-gui/res/cardsfolder/s/strength_of_the_coalition.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stroke_of_luck.txt b/forge-gui/res/cardsfolder/s/stroke_of_luck.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stroke_of_luck.txt
rename to forge-gui/res/cardsfolder/s/stroke_of_luck.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stronghold_arena.txt b/forge-gui/res/cardsfolder/s/stronghold_arena.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stronghold_arena.txt
rename to forge-gui/res/cardsfolder/s/stronghold_arena.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sunbathing_rootwalla.txt b/forge-gui/res/cardsfolder/s/sunbathing_rootwalla.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sunbathing_rootwalla.txt
rename to forge-gui/res/cardsfolder/s/sunbathing_rootwalla.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sunlit_marsh.txt b/forge-gui/res/cardsfolder/s/sunlit_marsh.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/sunlit_marsh.txt
rename to forge-gui/res/cardsfolder/s/sunlit_marsh.txt
index 9bc6fa46d66..35acfad441d 100644
--- a/forge-gui/res/cardsfolder/upcoming/sunlit_marsh.txt
+++ b/forge-gui/res/cardsfolder/s/sunlit_marsh.txt
@@ -1,5 +1,5 @@
-Name:Sunlit Marsh
-ManaCost:no cost
-Types:Land Plains Swamp
-K:CARDNAME enters the battlefield tapped.
-Oracle:({T}: Add {W} or {B}.)\nSunlit Marsh enters the battlefield tapped.
+Name:Sunlit Marsh
+ManaCost:no cost
+Types:Land Plains Swamp
+K:CARDNAME enters the battlefield tapped.
+Oracle:({T}: Add {W} or {B}.)\nSunlit Marsh enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/sworn_to_the_legion.txt b/forge-gui/res/cardsfolder/s/sworn_to_the_legion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sworn_to_the_legion.txt
rename to forge-gui/res/cardsfolder/s/sworn_to_the_legion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tail_swipe.txt b/forge-gui/res/cardsfolder/t/tail_swipe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tail_swipe.txt
rename to forge-gui/res/cardsfolder/t/tail_swipe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/take_up_the_shield.txt b/forge-gui/res/cardsfolder/t/take_up_the_shield.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/take_up_the_shield.txt
rename to forge-gui/res/cardsfolder/t/take_up_the_shield.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/talas_lookout.txt b/forge-gui/res/cardsfolder/t/talas_lookout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/talas_lookout.txt
rename to forge-gui/res/cardsfolder/t/talas_lookout.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tangled_islet.txt b/forge-gui/res/cardsfolder/t/tangled_islet.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/tangled_islet.txt
rename to forge-gui/res/cardsfolder/t/tangled_islet.txt
index f28ba583a54..dd3206d84a0 100644
--- a/forge-gui/res/cardsfolder/upcoming/tangled_islet.txt
+++ b/forge-gui/res/cardsfolder/t/tangled_islet.txt
@@ -1,5 +1,5 @@
-Name:Tangled Islet
-ManaCost:no cost
-Types:Land Forest Island
-K:CARDNAME enters the battlefield tapped.
-Oracle:({T}: Add {G} or {U}.)\nTangled Islet enters the battlefield tapped.
+Name:Tangled Islet
+ManaCost:no cost
+Types:Land Forest Island
+K:CARDNAME enters the battlefield tapped.
+Oracle:({T}: Add {G} or {U}.)\nTangled Islet enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/tattered_apparition.txt b/forge-gui/res/cardsfolder/t/tattered_apparition.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tattered_apparition.txt
rename to forge-gui/res/cardsfolder/t/tattered_apparition.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tatyova_steward_of_tides.txt b/forge-gui/res/cardsfolder/t/tatyova_steward_of_tides.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tatyova_steward_of_tides.txt
rename to forge-gui/res/cardsfolder/t/tatyova_steward_of_tides.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tear_asunder.txt b/forge-gui/res/cardsfolder/t/tear_asunder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tear_asunder.txt
rename to forge-gui/res/cardsfolder/t/tear_asunder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/temporal_firestorm.txt b/forge-gui/res/cardsfolder/t/temporal_firestorm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/temporal_firestorm.txt
rename to forge-gui/res/cardsfolder/t/temporal_firestorm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/temporary_lockdown.txt b/forge-gui/res/cardsfolder/t/temporary_lockdown.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/temporary_lockdown.txt
rename to forge-gui/res/cardsfolder/t/temporary_lockdown.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/territorial_maro.txt b/forge-gui/res/cardsfolder/t/territorial_maro.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/territorial_maro.txt
rename to forge-gui/res/cardsfolder/t/territorial_maro.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tetsuo_imperial_champion.txt b/forge-gui/res/cardsfolder/t/tetsuo_imperial_champion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tetsuo_imperial_champion.txt
rename to forge-gui/res/cardsfolder/t/tetsuo_imperial_champion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thayan_evokers.txt b/forge-gui/res/cardsfolder/t/thayan_evokers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thayan_evokers.txt
rename to forge-gui/res/cardsfolder/t/thayan_evokers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_cruelty_of_gix.txt b/forge-gui/res/cardsfolder/t/the_cruelty_of_gix.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_cruelty_of_gix.txt
rename to forge-gui/res/cardsfolder/t/the_cruelty_of_gix.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_elder_dragon_war.txt b/forge-gui/res/cardsfolder/t/the_elder_dragon_war.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_elder_dragon_war.txt
rename to forge-gui/res/cardsfolder/t/the_elder_dragon_war.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_ever_changing_dane.txt b/forge-gui/res/cardsfolder/t/the_ever-changing_dane.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_ever_changing_dane.txt
rename to forge-gui/res/cardsfolder/t/the_ever-changing_dane.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_lady_of_otaria.txt b/forge-gui/res/cardsfolder/t/the_lady_of_otaria.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_lady_of_otaria.txt
rename to forge-gui/res/cardsfolder/t/the_lady_of_otaria.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_mana_rig.txt b/forge-gui/res/cardsfolder/t/the_mana_rig.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_mana_rig.txt
rename to forge-gui/res/cardsfolder/t/the_mana_rig.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_peregrine_dynamo.txt b/forge-gui/res/cardsfolder/t/the_peregrine_dynamo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_peregrine_dynamo.txt
rename to forge-gui/res/cardsfolder/t/the_peregrine_dynamo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_phasing_of_zhalfir.txt b/forge-gui/res/cardsfolder/t/the_phasing_of_zhalfir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_phasing_of_zhalfir.txt
rename to forge-gui/res/cardsfolder/t/the_phasing_of_zhalfir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_raven_man.txt b/forge-gui/res/cardsfolder/t/the_raven_man.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_raven_man.txt
rename to forge-gui/res/cardsfolder/t/the_raven_man.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_reaver_cleaver.txt b/forge-gui/res/cardsfolder/t/the_reaver_cleaver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_reaver_cleaver.txt
rename to forge-gui/res/cardsfolder/t/the_reaver_cleaver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_weatherseed_treaty.txt b/forge-gui/res/cardsfolder/t/the_weatherseed_treaty.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_weatherseed_treaty.txt
rename to forge-gui/res/cardsfolder/t/the_weatherseed_treaty.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_world_spell.txt b/forge-gui/res/cardsfolder/t/the_world_spell.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_world_spell.txt
rename to forge-gui/res/cardsfolder/t/the_world_spell.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thran_portal.txt b/forge-gui/res/cardsfolder/t/thran_portal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thran_portal.txt
rename to forge-gui/res/cardsfolder/t/thran_portal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/threats_undetected.txt b/forge-gui/res/cardsfolder/t/threats_undetected.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/threats_undetected.txt
rename to forge-gui/res/cardsfolder/t/threats_undetected.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tidepool_turtle.txt b/forge-gui/res/cardsfolder/t/tidepool_turtle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tidepool_turtle.txt
rename to forge-gui/res/cardsfolder/t/tidepool_turtle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tiefling_outcasts.txt b/forge-gui/res/cardsfolder/t/tiefling_outcasts.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tiefling_outcasts.txt
rename to forge-gui/res/cardsfolder/t/tiefling_outcasts.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tiller_engine.txt b/forge-gui/res/cardsfolder/t/tiller_engine.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tiller_engine.txt
rename to forge-gui/res/cardsfolder/t/tiller_engine.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/timeless_lotus.txt b/forge-gui/res/cardsfolder/t/timeless_lotus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/timeless_lotus.txt
rename to forge-gui/res/cardsfolder/t/timeless_lotus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/timely_interference.txt b/forge-gui/res/cardsfolder/t/timely_interference.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/timely_interference.txt
rename to forge-gui/res/cardsfolder/t/timely_interference.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tobias_conqueror_of_bad_luck.txt b/forge-gui/res/cardsfolder/t/tobias_doomed_conqueror.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tobias_conqueror_of_bad_luck.txt
rename to forge-gui/res/cardsfolder/t/tobias_doomed_conqueror.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tolarian_geyser.txt b/forge-gui/res/cardsfolder/t/tolarian_geyser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tolarian_geyser.txt
rename to forge-gui/res/cardsfolder/t/tolarian_geyser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tolarian_terror.txt b/forge-gui/res/cardsfolder/t/tolarian_terror.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tolarian_terror.txt
rename to forge-gui/res/cardsfolder/t/tolarian_terror.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tor_wauki_the_younger.txt b/forge-gui/res/cardsfolder/t/tor_wauki_the_younger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tor_wauki_the_younger.txt
rename to forge-gui/res/cardsfolder/t/tor_wauki_the_younger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tori_davenant_fury_rider.txt b/forge-gui/res/cardsfolder/t/tori_davenant_fury_rider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tori_davenant_fury_rider.txt
rename to forge-gui/res/cardsfolder/t/tori_davenant_fury_rider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/torsten_founder_of_benalia.txt b/forge-gui/res/cardsfolder/t/torsten_founder_of_benalia.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/torsten_founder_of_benalia.txt
rename to forge-gui/res/cardsfolder/t/torsten_founder_of_benalia.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/toxic_abomination.txt b/forge-gui/res/cardsfolder/t/toxic_abomination.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/toxic_abomination.txt
rename to forge-gui/res/cardsfolder/t/toxic_abomination.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tribute_to_urborg.txt b/forge-gui/res/cardsfolder/t/tribute_to_urborg.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tribute_to_urborg.txt
rename to forge-gui/res/cardsfolder/t/tribute_to_urborg.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tura_kennerud_skyknight.txt b/forge-gui/res/cardsfolder/t/tura_kennerud_skyknight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tura_kennerud_skyknight.txt
rename to forge-gui/res/cardsfolder/t/tura_kennerud_skyknight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/twinferno.txt b/forge-gui/res/cardsfolder/t/twinferno.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/twinferno.txt
rename to forge-gui/res/cardsfolder/t/twinferno.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/two_headed_hellkite.txt b/forge-gui/res/cardsfolder/t/two-headed_hellkite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/two_headed_hellkite.txt
rename to forge-gui/res/cardsfolder/t/two-headed_hellkite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tyrannical_pitlord.txt b/forge-gui/res/cardsfolder/t/tyrannical_pitlord.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tyrannical_pitlord.txt
rename to forge-gui/res/cardsfolder/t/tyrannical_pitlord.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ulder_ravengard_marshal.txt b/forge-gui/res/cardsfolder/u/ulder_ravengard_marshal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ulder_ravengard_marshal.txt
rename to forge-gui/res/cardsfolder/u/ulder_ravengard_marshal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/undersimplify.txt b/forge-gui/res/cardsfolder/u/undersimplify.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/undersimplify.txt
rename to forge-gui/res/cardsfolder/u/undersimplify.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unexpected_allies.txt b/forge-gui/res/cardsfolder/u/unexpected_allies.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unexpected_allies.txt
rename to forge-gui/res/cardsfolder/u/unexpected_allies.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unite_the_coalition.txt b/forge-gui/res/cardsfolder/u/unite_the_coalition.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unite_the_coalition.txt
rename to forge-gui/res/cardsfolder/u/unite_the_coalition.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/urborg_lhurgoyf.txt b/forge-gui/res/cardsfolder/u/urborg_lhurgoyf.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/urborg_lhurgoyf.txt
rename to forge-gui/res/cardsfolder/u/urborg_lhurgoyf.txt
index 6f216673478..7dc49ac29d5 100644
--- a/forge-gui/res/cardsfolder/upcoming/urborg_lhurgoyf.txt
+++ b/forge-gui/res/cardsfolder/u/urborg_lhurgoyf.txt
@@ -1,12 +1,12 @@
-Name:Urborg Lhurgoyf
-ManaCost:1 G
-Types:Creature Lhurgoyf
-PT:*/1+*
-K:Kicker:U:B
-K:ETBReplacement:Other:TrigMill
-SVar:TrigMill:DB$ Mill | NumCards$ Z | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, mill three cards for each time it was kicked.
-S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ Y | Description$ CARDNAME's power is equal to the number of creature cards in your graveyard and its toughness is equal to that number plus 1.
-SVar:X:Count$TypeInYourYard.Creature
-SVar:Y:SVar$X/Plus.1
-SVar:Z:Count$TimesKicked/Times.3
-Oracle:Kicker {U} and/or {B} (You may pay an additional {U} and/or {B} as you cast this spell.)\nAs Urborg Lhurgoyf enters the battlefield, mill three cards for each time it was kicked.\nUrborg Lhurgoyf's power is equal to the number of creature cards in your graveyard and its toughness is equal to that number plus 1.
+Name:Urborg Lhurgoyf
+ManaCost:1 G
+Types:Creature Lhurgoyf
+PT:*/1+*
+K:Kicker:U:B
+K:ETBReplacement:Other:TrigMill
+SVar:TrigMill:DB$ Mill | NumCards$ Z | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, mill three cards for each time it was kicked.
+S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ Y | Description$ CARDNAME's power is equal to the number of creature cards in your graveyard and its toughness is equal to that number plus 1.
+SVar:X:Count$TypeInYourYard.Creature
+SVar:Y:SVar$X/Plus.1
+SVar:Z:Count$TimesKicked/Times.3
+Oracle:Kicker {U} and/or {B} (You may pay an additional {U} and/or {B} as you cast this spell.)\nAs Urborg Lhurgoyf enters the battlefield, mill three cards for each time it was kicked.\nUrborg Lhurgoyf's power is equal to the number of creature cards in your graveyard and its toughness is equal to that number plus 1.
diff --git a/forge-gui/res/cardsfolder/upcoming/urborg_repossession.txt b/forge-gui/res/cardsfolder/u/urborg_repossession.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/urborg_repossession.txt
rename to forge-gui/res/cardsfolder/u/urborg_repossession.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/urza_assembles_the_titans.txt b/forge-gui/res/cardsfolder/u/urza_assembles_the_titans.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/urza_assembles_the_titans.txt
rename to forge-gui/res/cardsfolder/u/urza_assembles_the_titans.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/uurg_spawn_of_turg.txt b/forge-gui/res/cardsfolder/u/uurg_spawn_of_turg.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/uurg_spawn_of_turg.txt
rename to forge-gui/res/cardsfolder/u/uurg_spawn_of_turg.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/screamer_killer.txt b/forge-gui/res/cardsfolder/upcoming/screamer-killer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/screamer_killer.txt
rename to forge-gui/res/cardsfolder/upcoming/screamer-killer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sister_hostpitaller.txt b/forge-gui/res/cardsfolder/upcoming/sister_hospitaller.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sister_hostpitaller.txt
rename to forge-gui/res/cardsfolder/upcoming/sister_hospitaller.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/valiant_farewell.txt b/forge-gui/res/cardsfolder/v/valiant_farewell.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/valiant_farewell.txt
rename to forge-gui/res/cardsfolder/v/valiant_farewell.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/valiant_veteran.txt b/forge-gui/res/cardsfolder/v/valiant_veteran.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/valiant_veteran.txt
rename to forge-gui/res/cardsfolder/v/valiant_veteran.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vanquishers_axe.txt b/forge-gui/res/cardsfolder/v/vanquishers_axe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vanquishers_axe.txt
rename to forge-gui/res/cardsfolder/v/vanquishers_axe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vesuvan_duplimancy.txt b/forge-gui/res/cardsfolder/v/vesuvan_duplimancy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vesuvan_duplimancy.txt
rename to forge-gui/res/cardsfolder/v/vesuvan_duplimancy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vhal_eager_scholar.txt b/forge-gui/res/cardsfolder/v/vhal_eager_scholar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vhal_eager_scholar.txt
rename to forge-gui/res/cardsfolder/v/vhal_eager_scholar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/viashino_branchrider.txt b/forge-gui/res/cardsfolder/v/viashino_branchrider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/viashino_branchrider.txt
rename to forge-gui/res/cardsfolder/v/viashino_branchrider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/viconia_nightsingers_disciple.txt b/forge-gui/res/cardsfolder/v/viconia_nightsingers_disciple.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/viconia_nightsingers_disciple.txt
rename to forge-gui/res/cardsfolder/v/viconia_nightsingers_disciple.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vineshaper_prodigy.txt b/forge-gui/res/cardsfolder/v/vineshaper_prodigy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vineshaper_prodigy.txt
rename to forge-gui/res/cardsfolder/v/vineshaper_prodigy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/voda_sea_scavenger.txt b/forge-gui/res/cardsfolder/v/voda_sea_scavenger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/voda_sea_scavenger.txt
rename to forge-gui/res/cardsfolder/v/voda_sea_scavenger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vodalian_hexcatcher.txt b/forge-gui/res/cardsfolder/v/vodalian_hexcatcher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vodalian_hexcatcher.txt
rename to forge-gui/res/cardsfolder/v/vodalian_hexcatcher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vodalian_mindsinger.txt b/forge-gui/res/cardsfolder/v/vodalian_mindsinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vodalian_mindsinger.txt
rename to forge-gui/res/cardsfolder/v/vodalian_mindsinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vohar_vodalian_desecrator.txt b/forge-gui/res/cardsfolder/v/vohar_vodalian_desecrator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vohar_vodalian_desecrator.txt
rename to forge-gui/res/cardsfolder/v/vohar_vodalian_desecrator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/volshe_tideturner.txt b/forge-gui/res/cardsfolder/v/volshe_tideturner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/volshe_tideturner.txt
rename to forge-gui/res/cardsfolder/v/volshe_tideturner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/walking_bulwark.txt b/forge-gui/res/cardsfolder/w/walking_bulwark.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/walking_bulwark.txt
rename to forge-gui/res/cardsfolder/w/walking_bulwark.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/warhosts_frenzy.txt b/forge-gui/res/cardsfolder/w/warhosts_frenzy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/warhosts_frenzy.txt
rename to forge-gui/res/cardsfolder/w/warhosts_frenzy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/warriors_of_tiamat.txt b/forge-gui/res/cardsfolder/w/warriors_of_tiamat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/warriors_of_tiamat.txt
rename to forge-gui/res/cardsfolder/w/warriors_of_tiamat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/water_weird.txt b/forge-gui/res/cardsfolder/w/water_weird.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/water_weird.txt
rename to forge-gui/res/cardsfolder/w/water_weird.txt
index b8a4b1247c6..cd13631edbb 100644
--- a/forge-gui/res/cardsfolder/upcoming/water_weird.txt
+++ b/forge-gui/res/cardsfolder/w/water_weird.txt
@@ -1,12 +1,12 @@
-Name:Water Weird
-ManaCost:3 U
-Types:Creature Elemental Weird
-PT:3/4
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigReveal | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on CARDNAME if the top card of your library is a nonland card. Otherwise, you may mill a card.
-SVar:TrigReveal:DB$ PeekAndReveal | PeekAmount$ 1 | NoPeek$ True | NoReveal$ True | RememberPeeked$ True | SubAbility$ DBCounter
-SVar:DBCounter:DB$ PutCounter | CounterNum$ 1 | Defined$ Self | ConditionDefined$ Remembered | ConditionPresent$ Card.nonLand | ConditionCompare$ EQ1 | CounterType$ P1P1 | SubAbility$ DBMill
-SVar:DBMill:DB$ Mill | NumCards$ 1 | Optional$ True | ConditionDefined$ Remembered | ConditionPresent$ Card.Land | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
-A:AB$ Pump | Cost$ 1 U | NumAtt$ +1 | NumDef$ -1 | SpellDescription$ CARDNAME gets +1/-1 until end of turn. 
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Counters
-Oracle:Whenever Water Weird deals combat damage to a player, put a +1/+1 counter on Water Weird if the top card of your library is a nonland card. Otherwise, you may mill a card.\n{1}{U}: Water Weird gets +1/-1 until end of turn.
+Name:Water Weird
+ManaCost:3 U
+Types:Creature Elemental Weird
+PT:3/4
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigReveal | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on CARDNAME if the top card of your library is a nonland card. Otherwise, you may mill a card.
+SVar:TrigReveal:DB$ PeekAndReveal | PeekAmount$ 1 | NoPeek$ True | NoReveal$ True | RememberPeeked$ True | SubAbility$ DBCounter
+SVar:DBCounter:DB$ PutCounter | CounterNum$ 1 | Defined$ Self | ConditionDefined$ Remembered | ConditionPresent$ Card.nonLand | ConditionCompare$ EQ1 | CounterType$ P1P1 | SubAbility$ DBMill
+SVar:DBMill:DB$ Mill | NumCards$ 1 | Optional$ True | ConditionDefined$ Remembered | ConditionPresent$ Card.Land | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
+A:AB$ Pump | Cost$ 1 U | NumAtt$ +1 | NumDef$ -1 | SpellDescription$ CARDNAME gets +1/-1 until end of turn. 
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Counters
+Oracle:Whenever Water Weird deals combat damage to a player, put a +1/+1 counter on Water Weird if the top card of your library is a nonland card. Otherwise, you may mill a card.\n{1}{U}: Water Weird gets +1/-1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/weatherlight_compleated.txt b/forge-gui/res/cardsfolder/w/weatherlight_compleated.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/weatherlight_compleated.txt
rename to forge-gui/res/cardsfolder/w/weatherlight_compleated.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wilson_bear_comrade.txt b/forge-gui/res/cardsfolder/w/wilson_bear_comrade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wilson_bear_comrade.txt
rename to forge-gui/res/cardsfolder/w/wilson_bear_comrade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wingmantle_chaplain.txt b/forge-gui/res/cardsfolder/w/wingmantle_chaplain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wingmantle_chaplain.txt
rename to forge-gui/res/cardsfolder/w/wingmantle_chaplain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wooded_ridgeline.txt b/forge-gui/res/cardsfolder/w/wooded_ridgeline.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/wooded_ridgeline.txt
rename to forge-gui/res/cardsfolder/w/wooded_ridgeline.txt
index 85eb74cbd0d..6dc5ddb6ced 100644
--- a/forge-gui/res/cardsfolder/upcoming/wooded_ridgeline.txt
+++ b/forge-gui/res/cardsfolder/w/wooded_ridgeline.txt
@@ -1,5 +1,5 @@
-Name:Wooded Ridgeline
-ManaCost:no cost
-Types:Land Mountain Forest
-K:CARDNAME enters the battlefield tapped.
-Oracle:({T}: Add {R} or {G}.)\nWooded Ridgeline enters the battlefield tapped.
+Name:Wooded Ridgeline
+ManaCost:no cost
+Types:Land Mountain Forest
+K:CARDNAME enters the battlefield tapped.
+Oracle:({T}: Add {R} or {G}.)\nWooded Ridgeline enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/writhing_necromass.txt b/forge-gui/res/cardsfolder/w/writhing_necromass.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/writhing_necromass.txt
rename to forge-gui/res/cardsfolder/w/writhing_necromass.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wyll_pact_bound_duelist.txt b/forge-gui/res/cardsfolder/w/wyll_pact-bound_duelist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wyll_pact_bound_duelist.txt
rename to forge-gui/res/cardsfolder/w/wyll_pact-bound_duelist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/xira_the_golden_sting.txt b/forge-gui/res/cardsfolder/x/xira_the_golden_sting.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/xira_the_golden_sting.txt
rename to forge-gui/res/cardsfolder/x/xira_the_golden_sting.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yavimaya_iconoclast.txt b/forge-gui/res/cardsfolder/y/yavimaya_iconoclast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yavimaya_iconoclast.txt
rename to forge-gui/res/cardsfolder/y/yavimaya_iconoclast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yavimaya_sojourner.txt b/forge-gui/res/cardsfolder/y/yavimaya_sojourner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yavimaya_sojourner.txt
rename to forge-gui/res/cardsfolder/y/yavimaya_sojourner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yotia_declares_war.txt b/forge-gui/res/cardsfolder/y/yotia_declares_war.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yotia_declares_war.txt
rename to forge-gui/res/cardsfolder/y/yotia_declares_war.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yuan_ti_scaleshield.txt b/forge-gui/res/cardsfolder/y/yuan-ti_scaleshield.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/yuan_ti_scaleshield.txt
rename to forge-gui/res/cardsfolder/y/yuan-ti_scaleshield.txt
index 8e9e8007e51..77bea428e93 100644
--- a/forge-gui/res/cardsfolder/upcoming/yuan_ti_scaleshield.txt
+++ b/forge-gui/res/cardsfolder/y/yuan-ti_scaleshield.txt
@@ -1,7 +1,7 @@
-Name:Yuan-Ti Scaleshield
-ManaCost:2 G
-Types:Instant
-A:SP$ PumpAll | ValidCards$ Permanent.YouCtrl | KW$ Hexproof & Indestructible | SubAbility$ DBSeek | SpellDescription$ Permanents you control gain hexproof and indestructible until end of turn. Seek a creature card if an opponent has cast a spell with mana value 3 or less this turn.
-SVar:DBSeek:DB$ ChangeZone | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeType$ Card.Creature | ChangeNum$ 1 
-SVar:X:Count$ThisTurnCast_Card.cmcLE3+OppCtrl
-Oracle:Permanents you control gain hexproof and indestructible until end of turn.\nSeek a creature card if an opponent has cast a spell with mana value 3 or less this turn.
+Name:Yuan-Ti Scaleshield
+ManaCost:2 G
+Types:Instant
+A:SP$ PumpAll | ValidCards$ Permanent.YouCtrl | KW$ Hexproof & Indestructible | SubAbility$ DBSeek | SpellDescription$ Permanents you control gain hexproof and indestructible until end of turn. Seek a creature card if an opponent has cast a spell with mana value 3 or less this turn.
+SVar:DBSeek:DB$ ChangeZone | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeType$ Card.Creature | ChangeNum$ 1 
+SVar:X:Count$ThisTurnCast_Card.cmcLE3+OppCtrl
+Oracle:Permanents you control gain hexproof and indestructible until end of turn.\nSeek a creature card if an opponent has cast a spell with mana value 3 or less this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/zar_ojanen_scion_of_efrava.txt b/forge-gui/res/cardsfolder/z/zar_ojanen_scion_of_efrava.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zar_ojanen_scion_of_efrava.txt
rename to forge-gui/res/cardsfolder/z/zar_ojanen_scion_of_efrava.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zeriam_golden_wind.txt b/forge-gui/res/cardsfolder/z/zeriam_golden_wind.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zeriam_golden_wind.txt
rename to forge-gui/res/cardsfolder/z/zeriam_golden_wind.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zur_eternal_schemer.txt b/forge-gui/res/cardsfolder/z/zur_eternal_schemer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zur_eternal_schemer.txt
rename to forge-gui/res/cardsfolder/z/zur_eternal_schemer.txt