diff --git a/forge-gui/res/cardsfolder/upcoming/adaptive_sporesinger.txt b/forge-gui/res/cardsfolder/a/adaptive_sporesinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/adaptive_sporesinger.txt
rename to forge-gui/res/cardsfolder/a/adaptive_sporesinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/against_all_odds.txt b/forge-gui/res/cardsfolder/a/against_all_odds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/against_all_odds.txt
rename to forge-gui/res/cardsfolder/a/against_all_odds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/agrus_kos_eternal_soldier.txt b/forge-gui/res/cardsfolder/a/agrus_kos_eternal_soldier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/agrus_kos_eternal_soldier.txt
rename to forge-gui/res/cardsfolder/a/agrus_kos_eternal_soldier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aisha_of_sparks_and_smoke.txt b/forge-gui/res/cardsfolder/a/aisha_of_sparks_and_smoke.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aisha_of_sparks_and_smoke.txt
rename to forge-gui/res/cardsfolder/a/aisha_of_sparks_and_smoke.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/all_will_be_one.txt b/forge-gui/res/cardsfolder/a/all_will_be_one.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/all_will_be_one.txt
rename to forge-gui/res/cardsfolder/a/all_will_be_one.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ambulatory_edifice.txt b/forge-gui/res/cardsfolder/a/ambulatory_edifice.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ambulatory_edifice.txt
rename to forge-gui/res/cardsfolder/a/ambulatory_edifice.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/andrios_roaming_explorer.txt b/forge-gui/res/cardsfolder/a/andrios_roaming_explorer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/andrios_roaming_explorer.txt
rename to forge-gui/res/cardsfolder/a/andrios_roaming_explorer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/annex_sentry.txt b/forge-gui/res/cardsfolder/a/annex_sentry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/annex_sentry.txt
rename to forge-gui/res/cardsfolder/a/annex_sentry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/annihilating_glare.txt b/forge-gui/res/cardsfolder/a/annihilating_glare.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/annihilating_glare.txt
rename to forge-gui/res/cardsfolder/a/annihilating_glare.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/anoint_with_affliction.txt b/forge-gui/res/cardsfolder/a/anoint_with_affliction.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/anoint_with_affliction.txt
rename to forge-gui/res/cardsfolder/a/anoint_with_affliction.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/apostle_of_invasion.txt b/forge-gui/res/cardsfolder/a/apostle_of_invasion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/apostle_of_invasion.txt
rename to forge-gui/res/cardsfolder/a/apostle_of_invasion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt b/forge-gui/res/cardsfolder/a/archfiend_of_the_dross.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt
rename to forge-gui/res/cardsfolder/a/archfiend_of_the_dross.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/argentum_masticore.txt b/forge-gui/res/cardsfolder/a/argentum_masticore.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/argentum_masticore.txt
rename to forge-gui/res/cardsfolder/a/argentum_masticore.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/argivian_welcome.txt b/forge-gui/res/cardsfolder/a/argivian_welcome.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/argivian_welcome.txt
rename to forge-gui/res/cardsfolder/a/argivian_welcome.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/argothian_uprooting.txt b/forge-gui/res/cardsfolder/a/argothian_uprooting.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/argothian_uprooting.txt
rename to forge-gui/res/cardsfolder/a/argothian_uprooting.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/armored_scrapgorger.txt b/forge-gui/res/cardsfolder/a/armored_scrapgorger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/armored_scrapgorger.txt
rename to forge-gui/res/cardsfolder/a/armored_scrapgorger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arteeoh_dread_scavenger.txt b/forge-gui/res/cardsfolder/a/arteeoh_dread_scavenger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arteeoh_dread_scavenger.txt
rename to forge-gui/res/cardsfolder/a/arteeoh_dread_scavenger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aspirants_ascent.txt b/forge-gui/res/cardsfolder/a/aspirants_ascent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aspirants_ascent.txt
rename to forge-gui/res/cardsfolder/a/aspirants_ascent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/assemble_the_team.txt b/forge-gui/res/cardsfolder/a/assemble_the_team.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/assemble_the_team.txt
rename to forge-gui/res/cardsfolder/a/assemble_the_team.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/atmosphere_surgeon.txt b/forge-gui/res/cardsfolder/a/atmosphere_surgeon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/atmosphere_surgeon.txt
rename to forge-gui/res/cardsfolder/a/atmosphere_surgeon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/atraxa_grand_unifier.txt b/forge-gui/res/cardsfolder/a/atraxa_grand_unifier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/atraxa_grand_unifier.txt
rename to forge-gui/res/cardsfolder/a/atraxa_grand_unifier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/atraxas_skitterfang.txt b/forge-gui/res/cardsfolder/a/atraxas_skitterfang.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/atraxas_skitterfang.txt
rename to forge-gui/res/cardsfolder/a/atraxas_skitterfang.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/awaken_the_sleeper.txt b/forge-gui/res/cardsfolder/a/awaken_the_sleeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/awaken_the_sleeper.txt
rename to forge-gui/res/cardsfolder/a/awaken_the_sleeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/axiom_engraver.txt b/forge-gui/res/cardsfolder/a/axiom_engraver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/axiom_engraver.txt
rename to forge-gui/res/cardsfolder/a/axiom_engraver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/baldin_century_herdmaster.txt b/forge-gui/res/cardsfolder/b/baldin_century_herdmaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/baldin_century_herdmaster.txt
rename to forge-gui/res/cardsfolder/b/baldin_century_herdmaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/barbed_batterfist.txt b/forge-gui/res/cardsfolder/b/barbed_batterfist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/barbed_batterfist.txt
rename to forge-gui/res/cardsfolder/b/barbed_batterfist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/basilica_shepherd.txt b/forge-gui/res/cardsfolder/b/basilica_shepherd.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/basilica_shepherd.txt
rename to forge-gui/res/cardsfolder/b/basilica_shepherd.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/basilica_skullbomb.txt b/forge-gui/res/cardsfolder/b/basilica_skullbomb.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/basilica_skullbomb.txt
rename to forge-gui/res/cardsfolder/b/basilica_skullbomb.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bilious_skulldweller.txt b/forge-gui/res/cardsfolder/b/bilious_skulldweller.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bilious_skulldweller.txt
rename to forge-gui/res/cardsfolder/b/bilious_skulldweller.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt b/forge-gui/res/cardsfolder/b/black_suns_twilight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
rename to forge-gui/res/cardsfolder/b/black_suns_twilight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blade_of_shared_souls.txt b/forge-gui/res/cardsfolder/b/blade_of_shared_souls.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blade_of_shared_souls.txt
rename to forge-gui/res/cardsfolder/b/blade_of_shared_souls.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bladed_ambassador.txt b/forge-gui/res/cardsfolder/b/bladed_ambassador.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bladed_ambassador.txt
rename to forge-gui/res/cardsfolder/b/bladed_ambassador.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bladegraft_aspirant.txt b/forge-gui/res/cardsfolder/b/bladegraft_aspirant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bladegraft_aspirant.txt
rename to forge-gui/res/cardsfolder/b/bladegraft_aspirant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bladehold_war_whip.txt b/forge-gui/res/cardsfolder/b/bladehold_war_whip.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bladehold_war_whip.txt
rename to forge-gui/res/cardsfolder/b/bladehold_war_whip.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blazing_crescendo.txt b/forge-gui/res/cardsfolder/b/blazing_crescendo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blazing_crescendo.txt
rename to forge-gui/res/cardsfolder/b/blazing_crescendo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blightbelly_rat.txt b/forge-gui/res/cardsfolder/b/blightbelly_rat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blightbelly_rat.txt
rename to forge-gui/res/cardsfolder/b/blightbelly_rat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bloated_contaminator.txt b/forge-gui/res/cardsfolder/b/bloated_contaminator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bloated_contaminator.txt
rename to forge-gui/res/cardsfolder/b/bloated_contaminator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blue_suns_twilight.txt b/forge-gui/res/cardsfolder/b/blue_suns_twilight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blue_suns_twilight.txt
rename to forge-gui/res/cardsfolder/b/blue_suns_twilight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bonepicker_skirge.txt b/forge-gui/res/cardsfolder/b/bonepicker_skirge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bonepicker_skirge.txt
rename to forge-gui/res/cardsfolder/b/bonepicker_skirge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/branchblight_stalker.txt b/forge-gui/res/cardsfolder/b/branchblight_stalker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/branchblight_stalker.txt
rename to forge-gui/res/cardsfolder/b/branchblight_stalker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bring_the_ending.txt b/forge-gui/res/cardsfolder/b/bring_the_ending.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bring_the_ending.txt
rename to forge-gui/res/cardsfolder/b/bring_the_ending.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/by_elspeths_command.txt b/forge-gui/res/cardsfolder/b/by_elspeths_command.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/by_elspeths_command.txt
rename to forge-gui/res/cardsfolder/b/by_elspeths_command.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cacophony_scamp.txt b/forge-gui/res/cardsfolder/c/cacophony_scamp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cacophony_scamp.txt
rename to forge-gui/res/cardsfolder/c/cacophony_scamp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cankerbloom.txt b/forge-gui/res/cardsfolder/c/cankerbloom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cankerbloom.txt
rename to forge-gui/res/cardsfolder/c/cankerbloom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/capricious_hellraiser.txt b/forge-gui/res/cardsfolder/c/capricious_hellraiser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/capricious_hellraiser.txt
rename to forge-gui/res/cardsfolder/c/capricious_hellraiser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/carnivorous_canopy.txt b/forge-gui/res/cardsfolder/c/carnivorous_canopy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/carnivorous_canopy.txt
rename to forge-gui/res/cardsfolder/c/carnivorous_canopy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cephalopod_sentry.txt b/forge-gui/res/cardsfolder/c/cephalopod_sentry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cephalopod_sentry.txt
rename to forge-gui/res/cardsfolder/c/cephalopod_sentry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/charforger.txt b/forge-gui/res/cardsfolder/c/charforger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/charforger.txt
rename to forge-gui/res/cardsfolder/c/charforger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/charge_of_the_mites.txt b/forge-gui/res/cardsfolder/c/charge_of_the_mites.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/charge_of_the_mites.txt
rename to forge-gui/res/cardsfolder/c/charge_of_the_mites.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chimney_rabble.txt b/forge-gui/res/cardsfolder/c/chimney_rabble.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chimney_rabble.txt
rename to forge-gui/res/cardsfolder/c/chimney_rabble.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chiss_goria_forge_tyrant.txt b/forge-gui/res/cardsfolder/c/chiss_goria_forge_tyrant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chiss_goria_forge_tyrant.txt
rename to forge-gui/res/cardsfolder/c/chiss_goria_forge_tyrant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chittering_skitterling.txt b/forge-gui/res/cardsfolder/c/chittering_skitterling.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chittering_skitterling.txt
rename to forge-gui/res/cardsfolder/c/chittering_skitterling.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chrome_prowler.txt b/forge-gui/res/cardsfolder/c/chrome_prowler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chrome_prowler.txt
rename to forge-gui/res/cardsfolder/c/chrome_prowler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/churning_reservoir.txt b/forge-gui/res/cardsfolder/c/churning_reservoir.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/churning_reservoir.txt
rename to forge-gui/res/cardsfolder/c/churning_reservoir.txt
index ffa6c51c8b9..4ed1e07e357 100644
--- a/forge-gui/res/cardsfolder/upcoming/churning_reservoir.txt
+++ b/forge-gui/res/cardsfolder/c/churning_reservoir.txt
@@ -1,10 +1,10 @@
-Name:Churning Reservoir
-ManaCost:R
-Types:Artifact
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, put an oil counter on another target nontoken artifact or creature you control.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Artifact.nonToken+YouCtrl+Other,Creature.YouCtrl+Other+nonToken | CounterType$ OIL| CounterNum$ 1
-A:AB$ Token | Cost$ 2 T | TokenScript$ r_1_1_phyrexian_goblin | CheckSVar$ CountCountersRemoved | CheckSVarCompare$ GE1 | SpellDescription$ Create a 1/1 red Phyrexian Goblin creature token. Activate only if an oil counter was removed from a permanent you controlled this turn or a permanent with an oil counter on it was put into a graveyard this turn.
-SVar:CountCountersRemoved:Count$CountersRemovedThisTurn OIL Card.YouCtrl+inRealZoneBattlefield/Plus.X
-SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Permanent.YouCtrl+counters_GE1_OIL
-DeckHas:Ability$Token/Counters & Type$Goblin|Phyrexian
-Oracle:At the beginning of your upkeep, put an oil counter on another target nontoken artifact or creature you control.\n{2}, {T}: Create a 1/1 red Phyrexian Goblin creature token. Activate only if an oil counter was removed from a permanent you controlled this turn or a permanent with an oil counter on it was put into a graveyard this turn.
+Name:Churning Reservoir
+ManaCost:R
+Types:Artifact
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, put an oil counter on another target nontoken artifact or creature you control.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Artifact.nonToken+YouCtrl+Other,Creature.YouCtrl+Other+nonToken | CounterType$ OIL| CounterNum$ 1
+A:AB$ Token | Cost$ 2 T | TokenScript$ r_1_1_phyrexian_goblin | CheckSVar$ CountCountersRemoved | CheckSVarCompare$ GE1 | SpellDescription$ Create a 1/1 red Phyrexian Goblin creature token. Activate only if an oil counter was removed from a permanent you controlled this turn or a permanent with an oil counter on it was put into a graveyard this turn.
+SVar:CountCountersRemoved:Count$CountersRemovedThisTurn OIL Card.YouCtrl+inRealZoneBattlefield/Plus.X
+SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Permanent.YouCtrl+counters_GE1_OIL
+DeckHas:Ability$Token/Counters & Type$Goblin|Phyrexian
+Oracle:At the beginning of your upkeep, put an oil counter on another target nontoken artifact or creature you control.\n{2}, {T}: Create a 1/1 red Phyrexian Goblin creature token. Activate only if an oil counter was removed from a permanent you controlled this turn or a permanent with an oil counter on it was put into a graveyard this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/cinderslash_ravager.txt b/forge-gui/res/cardsfolder/c/cinderslash_ravager.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cinderslash_ravager.txt
rename to forge-gui/res/cardsfolder/c/cinderslash_ravager.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clever_concealment.txt b/forge-gui/res/cardsfolder/c/clever_concealment.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clever_concealment.txt
rename to forge-gui/res/cardsfolder/c/clever_concealment.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/compleat_devotion.txt b/forge-gui/res/cardsfolder/c/compleat_devotion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/compleat_devotion.txt
rename to forge-gui/res/cardsfolder/c/compleat_devotion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt b/forge-gui/res/cardsfolder/c/conduit_of_worlds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt
rename to forge-gui/res/cardsfolder/c/conduit_of_worlds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/contagious_vorrac.txt b/forge-gui/res/cardsfolder/c/contagious_vorrac.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/contagious_vorrac.txt
rename to forge-gui/res/cardsfolder/c/contagious_vorrac.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/contaminant_grafter.txt b/forge-gui/res/cardsfolder/c/contaminant_grafter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/contaminant_grafter.txt
rename to forge-gui/res/cardsfolder/c/contaminant_grafter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/copper_longlegs.txt b/forge-gui/res/cardsfolder/c/copper_longlegs.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/copper_longlegs.txt
rename to forge-gui/res/cardsfolder/c/copper_longlegs.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crawling_chorus.txt b/forge-gui/res/cardsfolder/c/crawling_chorus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crawling_chorus.txt
rename to forge-gui/res/cardsfolder/c/crawling_chorus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crucias_titan_of_the_waves.txt b/forge-gui/res/cardsfolder/c/crucias_titan_of_the_waves.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crucias_titan_of_the_waves.txt
rename to forge-gui/res/cardsfolder/c/crucias_titan_of_the_waves.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cruel_grimnarch.txt b/forge-gui/res/cardsfolder/c/cruel_grimnarch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cruel_grimnarch.txt
rename to forge-gui/res/cardsfolder/c/cruel_grimnarch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cutthroat_centurion.txt b/forge-gui/res/cardsfolder/c/cutthroat_centurion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cutthroat_centurion.txt
rename to forge-gui/res/cardsfolder/c/cutthroat_centurion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/distorted_curiosity.txt b/forge-gui/res/cardsfolder/d/distorted_curiosity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/distorted_curiosity.txt
rename to forge-gui/res/cardsfolder/d/distorted_curiosity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dragonwing_glider.txt b/forge-gui/res/cardsfolder/d/dragonwing_glider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dragonwing_glider.txt
rename to forge-gui/res/cardsfolder/d/dragonwing_glider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drivnod_carnage_dominus.txt b/forge-gui/res/cardsfolder/d/drivnod_carnage_dominus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drivnod_carnage_dominus.txt
rename to forge-gui/res/cardsfolder/d/drivnod_carnage_dominus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dross_skullbomb.txt b/forge-gui/res/cardsfolder/d/dross_skullbomb.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dross_skullbomb.txt
rename to forge-gui/res/cardsfolder/d/dross_skullbomb.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drown_in_ichor.txt b/forge-gui/res/cardsfolder/d/drown_in_ichor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drown_in_ichor.txt
rename to forge-gui/res/cardsfolder/d/drown_in_ichor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/duelist_of_deep_faith.txt b/forge-gui/res/cardsfolder/d/duelist_of_deep_faith.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/duelist_of_deep_faith.txt
rename to forge-gui/res/cardsfolder/d/duelist_of_deep_faith.txt
index c90b8a0a2df..f8eb6594831 100644
--- a/forge-gui/res/cardsfolder/upcoming/duelist_of_deep_faith.txt
+++ b/forge-gui/res/cardsfolder/d/duelist_of_deep_faith.txt
@@ -1,7 +1,7 @@
-Name:Duelist of Deep Faith
-ManaCost:1 W
-Types:Creature Phyrexian Soldier
-PT:2/2
-K:Toxic:1
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ First Strike | Condition$ PlayerTurn | Description$ As long as it's your turn, CARDNAME has first strike.
+Name:Duelist of Deep Faith
+ManaCost:1 W
+Types:Creature Phyrexian Soldier
+PT:2/2
+K:Toxic:1
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ First Strike | Condition$ PlayerTurn | Description$ As long as it's your turn, CARDNAME has first strike.
 Oracle:Toxic 1 (Players dealt combat damage by this creature also get a poison counter.)\nAs long as it's your turn, Duelist of Deep Faith has first strike.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/dune_mover.txt b/forge-gui/res/cardsfolder/d/dune_mover.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dune_mover.txt
rename to forge-gui/res/cardsfolder/d/dune_mover.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elesh_norn_mother_of_machines.txt b/forge-gui/res/cardsfolder/e/elesh_norn_mother_of_machines.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elesh_norn_mother_of_machines.txt
rename to forge-gui/res/cardsfolder/e/elesh_norn_mother_of_machines.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/encroaching_mycosynth.txt b/forge-gui/res/cardsfolder/e/encroaching_mycosynth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/encroaching_mycosynth.txt
rename to forge-gui/res/cardsfolder/e/encroaching_mycosynth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/escaped_experiment.txt b/forge-gui/res/cardsfolder/e/escaped_experiment.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/escaped_experiment.txt
rename to forge-gui/res/cardsfolder/e/escaped_experiment.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/estra_friend_to_all.txt b/forge-gui/res/cardsfolder/e/estra_friend_to_all.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/estra_friend_to_all.txt
rename to forge-gui/res/cardsfolder/e/estra_friend_to_all.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/evolved_spinoderm.txt b/forge-gui/res/cardsfolder/e/evolved_spinoderm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/evolved_spinoderm.txt
rename to forge-gui/res/cardsfolder/e/evolved_spinoderm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/evolving_adaptive.txt b/forge-gui/res/cardsfolder/e/evolving_adaptive.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/evolving_adaptive.txt
rename to forge-gui/res/cardsfolder/e/evolving_adaptive.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/expand_the_sphere.txt b/forge-gui/res/cardsfolder/e/expand_the_sphere.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/expand_the_sphere.txt
rename to forge-gui/res/cardsfolder/e/expand_the_sphere.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/experimental_augury.txt b/forge-gui/res/cardsfolder/e/experimental_augury.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/experimental_augury.txt
rename to forge-gui/res/cardsfolder/e/experimental_augury.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/exuberant_fuseling.txt b/forge-gui/res/cardsfolder/e/exuberant_fuseling.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/exuberant_fuseling.txt
rename to forge-gui/res/cardsfolder/e/exuberant_fuseling.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eye_of_malcator.txt b/forge-gui/res/cardsfolder/e/eye_of_malcator.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/eye_of_malcator.txt
rename to forge-gui/res/cardsfolder/e/eye_of_malcator.txt
index c954c78bd47..8ecf415218e 100644
--- a/forge-gui/res/cardsfolder/upcoming/eye_of_malcator.txt
+++ b/forge-gui/res/cardsfolder/e/eye_of_malcator.txt
@@ -1,9 +1,9 @@
-Name:Eye of Malcator
-ManaCost:2 U
-Types:Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom and the rest on top in any order.)
-SVar:TrigScry:DB$ Scry | ScryNum$ 2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ Whenever another artifact enters the battlefield under your control, CARDNAME becomes a 4/4 Phyrexian Eye artifact creature until end of turn.
-SVar:TrigAnimate:DB$ Animate | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Phyrexian,Eye
-DeckHas:Type$Eye|Phryexian
-Oracle:When Eye of Malcator enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom and the rest on top in any order.)\nWhenever another artifact enters the battlefield under your control, Eye of Malcator becomes a 4/4 Phyrexian Eye artifact creature until end of turn.
+Name:Eye of Malcator
+ManaCost:2 U
+Types:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom and the rest on top in any order.)
+SVar:TrigScry:DB$ Scry | ScryNum$ 2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ Whenever another artifact enters the battlefield under your control, CARDNAME becomes a 4/4 Phyrexian Eye artifact creature until end of turn.
+SVar:TrigAnimate:DB$ Animate | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Phyrexian,Eye
+DeckHas:Type$Eye|Phryexian
+Oracle:When Eye of Malcator enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom and the rest on top in any order.)\nWhenever another artifact enters the battlefield under your control, Eye of Malcator becomes a 4/4 Phyrexian Eye artifact creature until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/ezuri_stalker_of_spheres.txt b/forge-gui/res/cardsfolder/e/ezuri_stalker_of_spheres.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ezuri_stalker_of_spheres.txt
rename to forge-gui/res/cardsfolder/e/ezuri_stalker_of_spheres.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fallaji_antiquarian.txt b/forge-gui/res/cardsfolder/f/fallaji_antiquarian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fallaji_antiquarian.txt
rename to forge-gui/res/cardsfolder/f/fallaji_antiquarian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/feed_the_infection.txt b/forge-gui/res/cardsfolder/f/feed_the_infection.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/feed_the_infection.txt
rename to forge-gui/res/cardsfolder/f/feed_the_infection.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flensing_raptor.txt b/forge-gui/res/cardsfolder/f/flensing_raptor.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/flensing_raptor.txt
rename to forge-gui/res/cardsfolder/f/flensing_raptor.txt
index 8a043123c87..c7a56b00ab1 100644
--- a/forge-gui/res/cardsfolder/upcoming/flensing_raptor.txt
+++ b/forge-gui/res/cardsfolder/f/flensing_raptor.txt
@@ -1,10 +1,10 @@
-Name:Flensing Raptor
-ManaCost:2 W
-Types:Creature Phyrexian Bird
-PT:2/2
-K:Flying
-K:Toxic:1
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, another target creature you control with toxic gets +1/+1 and gains flying until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl+withToxic+Other | NumAtt$ 1 | NumDef$ 1 | KW$ Flying
-DeckHints:Keyword$Toxic
+Name:Flensing Raptor
+ManaCost:2 W
+Types:Creature Phyrexian Bird
+PT:2/2
+K:Flying
+K:Toxic:1
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, another target creature you control with toxic gets +1/+1 and gains flying until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl+withToxic+Other | NumAtt$ 1 | NumDef$ 1 | KW$ Flying
+DeckHints:Keyword$Toxic
 Oracle:Flying\nToxic 1 (Players dealt combat damage by this creature also get a poison counter.)\nWhen Flensing Raptor enters the battlefield, another target creature you control with toxic gets +1/+1 and gains flying until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/fleshless_gladiator.txt b/forge-gui/res/cardsfolder/f/fleshless_gladiator.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/fleshless_gladiator.txt
rename to forge-gui/res/cardsfolder/f/fleshless_gladiator.txt
index 302f89d8967..08485e8f02f 100644
--- a/forge-gui/res/cardsfolder/upcoming/fleshless_gladiator.txt
+++ b/forge-gui/res/cardsfolder/f/fleshless_gladiator.txt
@@ -1,10 +1,10 @@
-Name:Fleshless Gladiator
-ManaCost:1 B
-Types:Creature Phyrexian Skeleton
-PT:2/2
-A:AB$ ChangeZone | Cost$ 2 B | Defined$ Self | ActivationZone$ Graveyard | Origin$ Graveyard | Destination$ Battlefield | CheckSVar$ X | SVarCompare$ GE3 | PrecostDesc$ Corrupted - | Tapped$ True | SubAbility$ DBLoseLife | SpellDescription$ Return CARDNAME from your graveyard to the battlefield tapped. You lose 1 life. Activate only if an opponent has three or more poison counters.
-SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
-SVar:X:PlayerCountOpponents$HighestPoisonCounters
-DeckHas:Ability$Graveyard
-DeckHints:Keyword$Toxic|Infect
+Name:Fleshless Gladiator
+ManaCost:1 B
+Types:Creature Phyrexian Skeleton
+PT:2/2
+A:AB$ ChangeZone | Cost$ 2 B | Defined$ Self | ActivationZone$ Graveyard | Origin$ Graveyard | Destination$ Battlefield | CheckSVar$ X | SVarCompare$ GE3 | PrecostDesc$ Corrupted - | Tapped$ True | SubAbility$ DBLoseLife | SpellDescription$ Return CARDNAME from your graveyard to the battlefield tapped. You lose 1 life. Activate only if an opponent has three or more poison counters.
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
+SVar:X:PlayerCountOpponents$HighestPoisonCounters
+DeckHas:Ability$Graveyard
+DeckHints:Keyword$Toxic|Infect
 Oracle:Corrupted — {2}{B}: Return Fleshless Gladiator from your graveyard to the battlefield tapped. You lose 1 life. Activate only if an opponent has three or more poison counters.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/font_of_progress.txt b/forge-gui/res/cardsfolder/f/font_of_progress.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/font_of_progress.txt
rename to forge-gui/res/cardsfolder/f/font_of_progress.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/forgefire_automaton.txt b/forge-gui/res/cardsfolder/f/forgefire_automaton.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/forgefire_automaton.txt
rename to forge-gui/res/cardsfolder/f/forgefire_automaton.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/forgehammer_centurion.txt b/forge-gui/res/cardsfolder/f/forgehammer_centurion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/forgehammer_centurion.txt
rename to forge-gui/res/cardsfolder/f/forgehammer_centurion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/foundry_groundbreaker.txt b/forge-gui/res/cardsfolder/f/foundry_groundbreaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/foundry_groundbreaker.txt
rename to forge-gui/res/cardsfolder/f/foundry_groundbreaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/free_from_flesh.txt b/forge-gui/res/cardsfolder/f/free_from_flesh.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/free_from_flesh.txt
rename to forge-gui/res/cardsfolder/f/free_from_flesh.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/furnace_punisher.txt b/forge-gui/res/cardsfolder/f/furnace_punisher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/furnace_punisher.txt
rename to forge-gui/res/cardsfolder/f/furnace_punisher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/furnace_skullbomb.txt b/forge-gui/res/cardsfolder/f/furnace_skullbomb.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/furnace_skullbomb.txt
rename to forge-gui/res/cardsfolder/f/furnace_skullbomb.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/furnace_strider.txt b/forge-gui/res/cardsfolder/f/furnace_strider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/furnace_strider.txt
rename to forge-gui/res/cardsfolder/f/furnace_strider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt b/forge-gui/res/cardsfolder/g/geth_thane_of_contracts.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt
rename to forge-gui/res/cardsfolder/g/geth_thane_of_contracts.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/geths_summons.txt b/forge-gui/res/cardsfolder/g/geths_summons.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/geths_summons.txt
rename to forge-gui/res/cardsfolder/g/geths_summons.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gitaxian_anatomist.txt b/forge-gui/res/cardsfolder/g/gitaxian_anatomist.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/gitaxian_anatomist.txt
rename to forge-gui/res/cardsfolder/g/gitaxian_anatomist.txt
index be5dc612291..c1e1c1fa22d 100644
--- a/forge-gui/res/cardsfolder/upcoming/gitaxian_anatomist.txt
+++ b/forge-gui/res/cardsfolder/g/gitaxian_anatomist.txt
@@ -1,8 +1,8 @@
-Name:Gitaxian Anatomist
-ManaCost:3 U
-Types:Creature Phyrexian Wizard
-PT:2/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigProliferate | TriggerDescription$ When CARDNAME enters the battlefield, you may tap it. If you do, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
-SVar:TrigProliferate:AB$ Proliferate | Cost$ tapXType<1/Card.Self/CARDNAME>
-DeckHas:Ability$Proliferate
+Name:Gitaxian Anatomist
+ManaCost:3 U
+Types:Creature Phyrexian Wizard
+PT:2/5
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigProliferate | TriggerDescription$ When CARDNAME enters the battlefield, you may tap it. If you do, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
+SVar:TrigProliferate:AB$ Proliferate | Cost$ tapXType<1/Card.Self/CARDNAME>
+DeckHas:Ability$Proliferate
 Oracle:When Gitaxian Anatomist enters the battlefield, you may tap it. If you do, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/gitaxian_raptor.txt b/forge-gui/res/cardsfolder/g/gitaxian_raptor.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/gitaxian_raptor.txt
rename to forge-gui/res/cardsfolder/g/gitaxian_raptor.txt
index c319489999f..67f3abdd16d 100644
--- a/forge-gui/res/cardsfolder/upcoming/gitaxian_raptor.txt
+++ b/forge-gui/res/cardsfolder/g/gitaxian_raptor.txt
@@ -1,9 +1,9 @@
-Name:Gitaxian Raptor
-ManaCost:2 U
-Types:Creature Phyrexian Bird
-PT:1/4
-K:Flying
-K:etbCounter:OIL:3
-A:AB$ Pump | Cost$ SubCounter<1/OIL> | Defined$ Self | NumAtt$ 1 | NumDef$ -1 | SpellDescription$ CARDNAME gets +1/-1 until end of turn.
-DeckHas:Ability$Counters
+Name:Gitaxian Raptor
+ManaCost:2 U
+Types:Creature Phyrexian Bird
+PT:1/4
+K:Flying
+K:etbCounter:OIL:3
+A:AB$ Pump | Cost$ SubCounter<1/OIL> | Defined$ Self | NumAtt$ 1 | NumDef$ -1 | SpellDescription$ CARDNAME gets +1/-1 until end of turn.
+DeckHas:Ability$Counters
 Oracle:Flying\nGitaxian Raptor enters the battlefield with three oil counters on it.\nRemove an oil counter from Gitaxian Raptor: Gitaxian Raptor gets +1/-1 until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/gixian_recycler.txt b/forge-gui/res/cardsfolder/g/gixian_recycler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gixian_recycler.txt
rename to forge-gui/res/cardsfolder/g/gixian_recycler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gleeful_demolition.txt b/forge-gui/res/cardsfolder/g/gleeful_demolition.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gleeful_demolition.txt
rename to forge-gui/res/cardsfolder/g/gleeful_demolition.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glimmer_lens.txt b/forge-gui/res/cardsfolder/g/glimmer_lens.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glimmer_lens.txt
rename to forge-gui/res/cardsfolder/g/glimmer_lens.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glissa_sunslayer.txt b/forge-gui/res/cardsfolder/g/glissa_sunslayer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glissa_sunslayer.txt
rename to forge-gui/res/cardsfolder/g/glissa_sunslayer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glissas_retriever.txt b/forge-gui/res/cardsfolder/g/glissas_retriever.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glissas_retriever.txt
rename to forge-gui/res/cardsfolder/g/glissas_retriever.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glistener_seer.txt b/forge-gui/res/cardsfolder/g/glistener_seer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glistener_seer.txt
rename to forge-gui/res/cardsfolder/g/glistener_seer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glistening_sphere.txt b/forge-gui/res/cardsfolder/g/glistening_sphere.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glistening_sphere.txt
rename to forge-gui/res/cardsfolder/g/glistening_sphere.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goldwardens_gambit.txt b/forge-gui/res/cardsfolder/g/goldwardens_gambit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goldwardens_gambit.txt
rename to forge-gui/res/cardsfolder/g/goldwardens_gambit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goldwardens_helm.txt b/forge-gui/res/cardsfolder/g/goldwardens_helm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goldwardens_helm.txt
rename to forge-gui/res/cardsfolder/g/goldwardens_helm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goliath_hatchery.txt b/forge-gui/res/cardsfolder/g/goliath_hatchery.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/goliath_hatchery.txt
rename to forge-gui/res/cardsfolder/g/goliath_hatchery.txt
index 08aaa348bdf..de95e016c27 100644
--- a/forge-gui/res/cardsfolder/upcoming/goliath_hatchery.txt
+++ b/forge-gui/res/cardsfolder/g/goliath_hatchery.txt
@@ -1,14 +1,14 @@
-Name:Goliath Hatchery
-ManaCost:4 G G
-Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 3/3 green Phyrexian Beast creature tokens with toxic 1. (Players dealt combat damage by them also get a poison counter.)
-SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ g_3_3_phyrexian_beast_toxic
-T:Mode$ Phase | Phase$ Upkeep  | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigChooseCard | CheckSVar$ X | SVarCompare$ GE3 | TriggerDescription$ Corrupted — At the beginning of your upkeep, if an opponent has three or more poison counters, choose a creature you control, then draw cards equal to its total toxic value.
-SVar:TrigChooseCard:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.YouCtrl | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | NumCards$ AffectedX | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
-SVar:X:PlayerCountOpponents$HighestPoisonCounters
-SVar:AffectedX:Count$Valid Card.ChosenCard$TotalValue Toxic
-DeckHas:Ability$Token & Type$Beast|Phyrexian
-DeckHints:Keyword$Toxic|Infect
+Name:Goliath Hatchery
+ManaCost:4 G G
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 3/3 green Phyrexian Beast creature tokens with toxic 1. (Players dealt combat damage by them also get a poison counter.)
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ g_3_3_phyrexian_beast_toxic
+T:Mode$ Phase | Phase$ Upkeep  | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigChooseCard | CheckSVar$ X | SVarCompare$ GE3 | TriggerDescription$ Corrupted — At the beginning of your upkeep, if an opponent has three or more poison counters, choose a creature you control, then draw cards equal to its total toxic value.
+SVar:TrigChooseCard:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.YouCtrl | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | NumCards$ AffectedX | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
+SVar:X:PlayerCountOpponents$HighestPoisonCounters
+SVar:AffectedX:Count$Valid Card.ChosenCard$TotalValue Toxic
+DeckHas:Ability$Token & Type$Beast|Phyrexian
+DeckHints:Keyword$Toxic|Infect
 Oracle:When Goliath Hatchery enters the battlefield, create two 3/3 green Phyrexian Beast creature tokens with toxic 1. (Players dealt combat damage by them also get a poison counter.)\nCorrupted — At the beginning of your upkeep, if an opponent has three or more poison counters, choose a creature you control, then draw cards equal to its total toxic value.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/graaz_unstoppable_juggernaut.txt b/forge-gui/res/cardsfolder/g/graaz_unstoppable_juggernaut.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/graaz_unstoppable_juggernaut.txt
rename to forge-gui/res/cardsfolder/g/graaz_unstoppable_juggernaut.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/great_desert_hellion.txt b/forge-gui/res/cardsfolder/g/great_desert_hellion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/great_desert_hellion.txt
rename to forge-gui/res/cardsfolder/g/great_desert_hellion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/green_suns_twilight.txt b/forge-gui/res/cardsfolder/g/green_suns_twilight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/green_suns_twilight.txt
rename to forge-gui/res/cardsfolder/g/green_suns_twilight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gulping_scraptrap.txt b/forge-gui/res/cardsfolder/g/gulping_scraptrap.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/gulping_scraptrap.txt
rename to forge-gui/res/cardsfolder/g/gulping_scraptrap.txt
index 1e2a8be9783..a0979203225 100644
--- a/forge-gui/res/cardsfolder/upcoming/gulping_scraptrap.txt
+++ b/forge-gui/res/cardsfolder/g/gulping_scraptrap.txt
@@ -1,9 +1,9 @@
-Name:Gulping Scraptrap
-ManaCost:4 B
-Types:Creature Phyrexian Horror
-PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigProliferate | TriggerDescription$ When CARDNAME enters the battlefield or dies, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigProliferate | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or dies, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
-SVar:TrigProliferate:DB$ Proliferate
-DeckHas:Ability$Proliferate
-Oracle:When Gulping Scraptrap enters the battlefield or dies, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
+Name:Gulping Scraptrap
+ManaCost:4 B
+Types:Creature Phyrexian Horror
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigProliferate | TriggerDescription$ When CARDNAME enters the battlefield or dies, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigProliferate | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or dies, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
+SVar:TrigProliferate:DB$ Proliferate
+DeckHas:Ability$Proliferate
+Oracle:When Gulping Scraptrap enters the battlefield or dies, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
diff --git a/forge-gui/res/cardsfolder/upcoming/hazardous_blast.txt b/forge-gui/res/cardsfolder/h/hazardous_blast.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/hazardous_blast.txt
rename to forge-gui/res/cardsfolder/h/hazardous_blast.txt
index a8ca415f885..48825b3d9e1 100644
--- a/forge-gui/res/cardsfolder/upcoming/hazardous_blast.txt
+++ b/forge-gui/res/cardsfolder/h/hazardous_blast.txt
@@ -1,7 +1,7 @@
-Name:Hazardous Blast
-ManaCost:3 R
-Types:Sorcery
-A:SP$ DamageAll | Cost$ 3 R | ValidCards$ Creature.OppCtrl | NumDmg$ 1 | SubAbility$ OppCantBlock | SpellDescription$ CARDNAME deals 1 damage to each creature your opponents control. Creatures your opponents control can't block this turn.
-SVar:OppCantBlock:DB$ Effect | Name$ Hazardous Blast Effect | StaticAbilities$ KWPump | SpellDescription$ Creatures your opponents control can't block this turn.
-SVar:KWPump:Mode$ CantBlockBy | ValidBlocker$ Creature.OppCtrl | Description$ Creatures your opponents control can't block this turn.
-Oracle:Hazardous Blast deals 1 damage to each creature your opponents control. Creatures your opponents control can't block this turn.
+Name:Hazardous Blast
+ManaCost:3 R
+Types:Sorcery
+A:SP$ DamageAll | Cost$ 3 R | ValidCards$ Creature.OppCtrl | NumDmg$ 1 | SubAbility$ OppCantBlock | SpellDescription$ CARDNAME deals 1 damage to each creature your opponents control. Creatures your opponents control can't block this turn.
+SVar:OppCantBlock:DB$ Effect | Name$ Hazardous Blast Effect | StaticAbilities$ KWPump | SpellDescription$ Creatures your opponents control can't block this turn.
+SVar:KWPump:Mode$ CantBlockBy | ValidBlocker$ Creature.OppCtrl | Description$ Creatures your opponents control can't block this turn.
+Oracle:Hazardous Blast deals 1 damage to each creature your opponents control. Creatures your opponents control can't block this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/hexgold_halberd.txt b/forge-gui/res/cardsfolder/h/hexgold_halberd.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hexgold_halberd.txt
rename to forge-gui/res/cardsfolder/h/hexgold_halberd.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hexgold_hoverwings.txt b/forge-gui/res/cardsfolder/h/hexgold_hoverwings.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hexgold_hoverwings.txt
rename to forge-gui/res/cardsfolder/h/hexgold_hoverwings.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hexgold_slash.txt b/forge-gui/res/cardsfolder/h/hexgold_slash.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hexgold_slash.txt
rename to forge-gui/res/cardsfolder/h/hexgold_slash.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hexplate_wallbreaker.txt b/forge-gui/res/cardsfolder/h/hexplate_wallbreaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hexplate_wallbreaker.txt
rename to forge-gui/res/cardsfolder/h/hexplate_wallbreaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hurkyls_prodigy.txt b/forge-gui/res/cardsfolder/h/hurkyls_prodigy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hurkyls_prodigy.txt
rename to forge-gui/res/cardsfolder/h/hurkyls_prodigy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ichor_synthesizer.txt b/forge-gui/res/cardsfolder/i/ichor_synthesizer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ichor_synthesizer.txt
rename to forge-gui/res/cardsfolder/i/ichor_synthesizer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ichormoon_gauntlet.txt b/forge-gui/res/cardsfolder/i/ichormoon_gauntlet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ichormoon_gauntlet.txt
rename to forge-gui/res/cardsfolder/i/ichormoon_gauntlet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ichorplate_golem.txt b/forge-gui/res/cardsfolder/i/ichorplate_golem.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ichorplate_golem.txt
rename to forge-gui/res/cardsfolder/i/ichorplate_golem.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ichorspit_basilisk.txt b/forge-gui/res/cardsfolder/i/ichorspit_basilisk.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/ichorspit_basilisk.txt
rename to forge-gui/res/cardsfolder/i/ichorspit_basilisk.txt
index 84173ebdbf5..e124e373893 100644
--- a/forge-gui/res/cardsfolder/upcoming/ichorspit_basilisk.txt
+++ b/forge-gui/res/cardsfolder/i/ichorspit_basilisk.txt
@@ -1,7 +1,7 @@
-Name:Ichorspit Basilisk
-ManaCost:2 G
-Types:Creature Phyrexian Basilisk
-PT:1/3
-K:Deathtouch
-K:Toxic:1
+Name:Ichorspit Basilisk
+ManaCost:2 G
+Types:Creature Phyrexian Basilisk
+PT:1/3
+K:Deathtouch
+K:Toxic:1
 Oracle:Deathtouch\nToxic 1 (Players dealt combat damage by this creature also get a poison counter.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/immard_the_stormcleaver.txt b/forge-gui/res/cardsfolder/i/immard_the_stormcleaver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/immard_the_stormcleaver.txt
rename to forge-gui/res/cardsfolder/i/immard_the_stormcleaver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/incisor_glider.txt b/forge-gui/res/cardsfolder/i/incisor_glider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/incisor_glider.txt
rename to forge-gui/res/cardsfolder/i/incisor_glider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/incubation_sac.txt b/forge-gui/res/cardsfolder/i/incubation_sac.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/incubation_sac.txt
rename to forge-gui/res/cardsfolder/i/incubation_sac.txt
index 9304bd2cabe..cc89cd459ee 100644
--- a/forge-gui/res/cardsfolder/upcoming/incubation_sac.txt
+++ b/forge-gui/res/cardsfolder/i/incubation_sac.txt
@@ -1,7 +1,7 @@
-Name:Incubation Sac
-ManaCost:G
-Types:Artifact
-K:etbCounter:OIL:3
-A:AB$ Token | Cost$ 4 T SubCounter<1/OIL> | TokenScript$ c_3_3_a_phyrexian_golem | SorcerySpeed$ True | SpellDescription$ Create a 3/3 colorless Phyrexian Golem artifact creature token. Activate only as a sorcery.
-DeckHas:Ability$Counters|Token & Type$Phyrexian|Golem
+Name:Incubation Sac
+ManaCost:G
+Types:Artifact
+K:etbCounter:OIL:3
+A:AB$ Token | Cost$ 4 T SubCounter<1/OIL> | TokenScript$ c_3_3_a_phyrexian_golem | SorcerySpeed$ True | SpellDescription$ Create a 3/3 colorless Phyrexian Golem artifact creature token. Activate only as a sorcery.
+DeckHas:Ability$Counters|Token & Type$Phyrexian|Golem
 Oracle:Incubation Sac enters the battlefield with three oil counters on it.\n{4}, {T}, Remove an oil counter from Incubation Sac: Create a 3/3 colorless Phyrexian Golem artifact creature token. Activate only as a sorcery.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/indoctrination_attendant.txt b/forge-gui/res/cardsfolder/i/indoctrination_attendant.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/indoctrination_attendant.txt
rename to forge-gui/res/cardsfolder/i/indoctrination_attendant.txt
index a8ce0343e67..510c311d16a 100644
--- a/forge-gui/res/cardsfolder/upcoming/indoctrination_attendant.txt
+++ b/forge-gui/res/cardsfolder/i/indoctrination_attendant.txt
@@ -1,9 +1,9 @@
-Name:Indoctrination Attendant
-ManaCost:3 W
-Types:Creature Phyrexian Cleric
-PT:3/4
-K:Toxic:1
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, you may return another permanent you control to its owner's hand. If you do, create a 1/1 colorless Phyrexian Mite artifact creature token with toxic 1 and "This creature can't block."
-SVar:TrigToken:AB$ Token | Cost$ Return<1/Permanent.Other/other permanent> | TokenScript$ c_1_1_a_phyrexian_mite_toxic_noblock
-DeckHas:Ability$Token & Type$Artifact|Mite
-Oracle:Toxic 1 (Players dealt combat damage by this creature also get a poison counter.)\nWhen Indoctrination Attendant enters the battlefield, you may return another permanent you control to its owner's hand. If you do, create a 1/1 colorless Phyrexian Mite artifact creature token with toxic 1 and "This creature can't block."
+Name:Indoctrination Attendant
+ManaCost:3 W
+Types:Creature Phyrexian Cleric
+PT:3/4
+K:Toxic:1
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, you may return another permanent you control to its owner's hand. If you do, create a 1/1 colorless Phyrexian Mite artifact creature token with toxic 1 and "This creature can't block."
+SVar:TrigToken:AB$ Token | Cost$ Return<1/Permanent.Other/other permanent> | TokenScript$ c_1_1_a_phyrexian_mite_toxic_noblock
+DeckHas:Ability$Token & Type$Artifact|Mite
+Oracle:Toxic 1 (Players dealt combat damage by this creature also get a poison counter.)\nWhen Indoctrination Attendant enters the battlefield, you may return another permanent you control to its owner's hand. If you do, create a 1/1 colorless Phyrexian Mite artifact creature token with toxic 1 and "This creature can't block."
diff --git a/forge-gui/res/cardsfolder/upcoming/infectious_bite.txt b/forge-gui/res/cardsfolder/i/infectious_bite.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/infectious_bite.txt
rename to forge-gui/res/cardsfolder/i/infectious_bite.txt
index a964c0b8daf..9b3880e04c0 100644
--- a/forge-gui/res/cardsfolder/upcoming/infectious_bite.txt
+++ b/forge-gui/res/cardsfolder/i/infectious_bite.txt
@@ -1,9 +1,9 @@
-Name:Infectious Bite
-ManaCost:1 G
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature you control | SubAbility$ DBFight | StackDescription$ Target creature you control [{c:ThisTargetedCard}] | SpellDescription$ Target creature you control deals damage equal to its power to target creature you don't control. Each opponent gets a poison counter.
-SVar:DBFight:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | DamageSource$ ParentTarget | TgtPrompt$ Choose target creature you don't control | NumDmg$ X | SubAbility$ DBPoison 
-SVar:DBPoison:DB$ Poison | Defined$ Player.Opponent | Num$ 1
-SVar:X:ParentTargeted$CardPower
-DeckHints:Ability$Proliferate a Keyword$Infect|Toxic
+Name:Infectious Bite
+ManaCost:1 G
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature you control | SubAbility$ DBFight | StackDescription$ Target creature you control [{c:ThisTargetedCard}] | SpellDescription$ Target creature you control deals damage equal to its power to target creature you don't control. Each opponent gets a poison counter.
+SVar:DBFight:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | DamageSource$ ParentTarget | TgtPrompt$ Choose target creature you don't control | NumDmg$ X | SubAbility$ DBPoison 
+SVar:DBPoison:DB$ Poison | Defined$ Player.Opponent | Num$ 1
+SVar:X:ParentTargeted$CardPower
+DeckHints:Ability$Proliferate a Keyword$Infect|Toxic
 Oracle:Target creature you control deals damage equal to its power to target creature you don't control. Each opponent gets a poison counter.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/infectious_inquiry.txt b/forge-gui/res/cardsfolder/i/infectious_inquiry.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/infectious_inquiry.txt
rename to forge-gui/res/cardsfolder/i/infectious_inquiry.txt
index f9ae8995009..3fc113f54c2 100644
--- a/forge-gui/res/cardsfolder/upcoming/infectious_inquiry.txt
+++ b/forge-gui/res/cardsfolder/i/infectious_inquiry.txt
@@ -1,8 +1,8 @@
-Name:Infectious Inquiry
-ManaCost:2 B
-Types:Sorcery
-A:SP$ Draw | NumCards$ 2 | SubAbility$ DBLoseLife | SpellDescription$ You draw two cards and you lose 2 life. Each opponent gets a poison counter.
-SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2 | SubAbility$ DBPoison
-SVar:DBPoison:DB$ Poison | Defined$ Player.Opponent | Num$ 1
-DeckHints:Ability$Proliferate a Keyword$Infect|Toxic
+Name:Infectious Inquiry
+ManaCost:2 B
+Types:Sorcery
+A:SP$ Draw | NumCards$ 2 | SubAbility$ DBLoseLife | SpellDescription$ You draw two cards and you lose 2 life. Each opponent gets a poison counter.
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2 | SubAbility$ DBPoison
+SVar:DBPoison:DB$ Poison | Defined$ Player.Opponent | Num$ 1
+DeckHints:Ability$Proliferate a Keyword$Infect|Toxic
 Oracle:You draw two cards and you lose 2 life. Each opponent gets a poison counter.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/infested_fleshcutter.txt b/forge-gui/res/cardsfolder/i/infested_fleshcutter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/infested_fleshcutter.txt
rename to forge-gui/res/cardsfolder/i/infested_fleshcutter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ixhel_scion_of_atraxa.txt b/forge-gui/res/cardsfolder/i/ixhel_scion_of_atraxa.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ixhel_scion_of_atraxa.txt
rename to forge-gui/res/cardsfolder/i/ixhel_scion_of_atraxa.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jace_the_perfected_mind.txt b/forge-gui/res/cardsfolder/j/jace_the_perfected_mind.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jace_the_perfected_mind.txt
rename to forge-gui/res/cardsfolder/j/jace_the_perfected_mind.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jarsyl_dark_age_scion.txt b/forge-gui/res/cardsfolder/j/jarsyl_dark_age_scion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jarsyl_dark_age_scion.txt
rename to forge-gui/res/cardsfolder/j/jarsyl_dark_age_scion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jawbone_duelist.txt b/forge-gui/res/cardsfolder/j/jawbone_duelist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jawbone_duelist.txt
rename to forge-gui/res/cardsfolder/j/jawbone_duelist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jor_kadeen_first_goldwarden.txt b/forge-gui/res/cardsfolder/j/jor_kadeen_first_goldwarden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jor_kadeen_first_goldwarden.txt
rename to forge-gui/res/cardsfolder/j/jor_kadeen_first_goldwarden.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kaito_dancing_shadow.txt b/forge-gui/res/cardsfolder/k/kaito_dancing_shadow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kaito_dancing_shadow.txt
rename to forge-gui/res/cardsfolder/k/kaito_dancing_shadow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/karumonix_the_rat_king.txt b/forge-gui/res/cardsfolder/k/karumonix_the_rat_king.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/karumonix_the_rat_king.txt
rename to forge-gui/res/cardsfolder/k/karumonix_the_rat_king.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kaya_intangible_slayer.txt b/forge-gui/res/cardsfolder/k/kaya_intangible_slayer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kaya_intangible_slayer.txt
rename to forge-gui/res/cardsfolder/k/kaya_intangible_slayer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kaylas_kindling.txt b/forge-gui/res/cardsfolder/k/kaylas_kindling.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kaylas_kindling.txt
rename to forge-gui/res/cardsfolder/k/kaylas_kindling.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kemba_kha_enduring.txt b/forge-gui/res/cardsfolder/k/kemba_kha_enduring.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kemba_kha_enduring.txt
rename to forge-gui/res/cardsfolder/k/kemba_kha_enduring.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kembas_banner.txt b/forge-gui/res/cardsfolder/k/kembas_banner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kembas_banner.txt
rename to forge-gui/res/cardsfolder/k/kembas_banner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kethek_crucible_goliath.txt b/forge-gui/res/cardsfolder/k/kethek_crucible_goliath.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kethek_crucible_goliath.txt
rename to forge-gui/res/cardsfolder/k/kethek_crucible_goliath.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kinzu_of_the_bleak_coven.txt b/forge-gui/res/cardsfolder/k/kinzu_of_the_bleak_coven.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kinzu_of_the_bleak_coven.txt
rename to forge-gui/res/cardsfolder/k/kinzu_of_the_bleak_coven.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/koth_fire_of_resistance.txt b/forge-gui/res/cardsfolder/k/koth_fire_of_resistance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/koth_fire_of_resistance.txt
rename to forge-gui/res/cardsfolder/k/koth_fire_of_resistance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kuldotha_cackler.txt b/forge-gui/res/cardsfolder/k/kuldotha_cackler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kuldotha_cackler.txt
rename to forge-gui/res/cardsfolder/k/kuldotha_cackler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lattice_blade_mantis.txt b/forge-gui/res/cardsfolder/l/lattice_blade_mantis.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/lattice_blade_mantis.txt
rename to forge-gui/res/cardsfolder/l/lattice_blade_mantis.txt
index 47f24693430..e415c631b98 100644
--- a/forge-gui/res/cardsfolder/upcoming/lattice_blade_mantis.txt
+++ b/forge-gui/res/cardsfolder/l/lattice_blade_mantis.txt
@@ -1,11 +1,11 @@
-Name:Lattice-Blade Mantis
-ManaCost:3 G
-Types:Creature Phyrexian Insect
-PT:4/3
-K:etbCounter:OIL:2
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME attacks, you may remove an oil counter from it. If you do, untap it and it gets +1/+1 until end of turn.
-SVar:TrigUntap:AB$ Untap | Defined$ Self | Cost$ SubCounter<1/OIL> | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1
-DeckHas:Ability$Counters
-SVar:HasAttackEffect:TRUE
+Name:Lattice-Blade Mantis
+ManaCost:3 G
+Types:Creature Phyrexian Insect
+PT:4/3
+K:etbCounter:OIL:2
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME attacks, you may remove an oil counter from it. If you do, untap it and it gets +1/+1 until end of turn.
+SVar:TrigUntap:AB$ Untap | Defined$ Self | Cost$ SubCounter<1/OIL> | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1
+DeckHas:Ability$Counters
+SVar:HasAttackEffect:TRUE
 Oracle:Lattice-Blade Mantis enters the battlefield with two oil counters on it.\nWhenever Lattice-Blade Mantis attacks, you may remove an oil counter from it. If you do, untap it and it gets +1/+1 until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/legion_of_clay.txt b/forge-gui/res/cardsfolder/l/legion_of_clay.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/legion_of_clay.txt
rename to forge-gui/res/cardsfolder/l/legion_of_clay.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/leonin_lightbringer.txt b/forge-gui/res/cardsfolder/l/leonin_lightbringer.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/leonin_lightbringer.txt
rename to forge-gui/res/cardsfolder/l/leonin_lightbringer.txt
index 1d9a0a748e3..172f5200724 100644
--- a/forge-gui/res/cardsfolder/upcoming/leonin_lightbringer.txt
+++ b/forge-gui/res/cardsfolder/l/leonin_lightbringer.txt
@@ -1,9 +1,9 @@
-Name:Leonin Lightbringer
-ManaCost:2 W
-Types:Creature Cat Rebel
-PT:3/2
-K:Ward:2
-S:Mode$ Continuous | Affected$ Card.Self+equipped | AddPower$ 1 | AddToughness$ 1 | Description$ As long as CARDNAME is equipped, it gets +1/+1.
-SVar:EquipMe:Once
-DeckHints:Type$Equipment
+Name:Leonin Lightbringer
+ManaCost:2 W
+Types:Creature Cat Rebel
+PT:3/2
+K:Ward:2
+S:Mode$ Continuous | Affected$ Card.Self+equipped | AddPower$ 1 | AddToughness$ 1 | Description$ As long as CARDNAME is equipped, it gets +1/+1.
+SVar:EquipMe:Once
+DeckHints:Type$Equipment
 Oracle:Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nAs long as Leonin Lightbringer is equipped, it gets +1/+1.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/lonely_end.txt b/forge-gui/res/cardsfolder/l/lonely_end.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lonely_end.txt
rename to forge-gui/res/cardsfolder/l/lonely_end.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lukka_bound_to_ruin.txt b/forge-gui/res/cardsfolder/l/lukka_bound_to_ruin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lukka_bound_to_ruin.txt
rename to forge-gui/res/cardsfolder/l/lukka_bound_to_ruin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lux_artillery.txt b/forge-gui/res/cardsfolder/l/lux_artillery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lux_artillery.txt
rename to forge-gui/res/cardsfolder/l/lux_artillery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/maarika_brutal_gladiator.txt b/forge-gui/res/cardsfolder/m/maarika_brutal_gladiator.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/maarika_brutal_gladiator.txt
rename to forge-gui/res/cardsfolder/m/maarika_brutal_gladiator.txt
index c858ccfc00e..ce4bddeaaad 100644
--- a/forge-gui/res/cardsfolder/upcoming/maarika_brutal_gladiator.txt
+++ b/forge-gui/res/cardsfolder/m/maarika_brutal_gladiator.txt
@@ -1,9 +1,9 @@
-Name:Maarika, Brutal Gladiator
-ManaCost:2 B R G
-Types:Legendary Creature Human Warrior
-PT:7/4
-K:CARDNAME must be blocked if able.
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Indestructible | Condition$ PlayerTurn | Description$ As long as it's your turn, NICKNAME has indestructible.
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature.wasDealtExcessDamageThisTurn | Execute$ TrigSac | TriggerDescription$ Whenever NICKNAME deals damage to a creature, if that creature was dealt excess damage this turn, that creature's controller sacrifices a noncreature, nonland permanent.
-SVar:TrigSac:DB$ Sacrifice | SacValid$ Permanent.nonCreature+nonLand | SacMessage$ noncreature, nonland permanent | Defined$ TriggeredTargetController
+Name:Maarika, Brutal Gladiator
+ManaCost:2 B R G
+Types:Legendary Creature Human Warrior
+PT:7/4
+K:CARDNAME must be blocked if able.
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Indestructible | Condition$ PlayerTurn | Description$ As long as it's your turn, NICKNAME has indestructible.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature.wasDealtExcessDamageThisTurn | Execute$ TrigSac | TriggerDescription$ Whenever NICKNAME deals damage to a creature, if that creature was dealt excess damage this turn, that creature's controller sacrifices a noncreature, nonland permanent.
+SVar:TrigSac:DB$ Sacrifice | SacValid$ Permanent.nonCreature+nonLand | SacMessage$ noncreature, nonland permanent | Defined$ TriggeredTargetController
 Oracle:Maarika, Brutal Gladiator must be blocked if able.\nAs long as it's your turn, Maarika has indestructible.\nWhenever Maarika deals damage to a creature, if that creature was dealt excess damage this turn, that creature's controller sacrifices a noncreature, nonland permanent.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/magmatic_sprinter.txt b/forge-gui/res/cardsfolder/m/magmatic_sprinter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/magmatic_sprinter.txt
rename to forge-gui/res/cardsfolder/m/magmatic_sprinter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/malcator_purity_overseer.txt b/forge-gui/res/cardsfolder/m/malcator_purity_overseer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/malcator_purity_overseer.txt
rename to forge-gui/res/cardsfolder/m/malcator_purity_overseer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/malcators_watcher.txt b/forge-gui/res/cardsfolder/m/malcators_watcher.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/malcators_watcher.txt
rename to forge-gui/res/cardsfolder/m/malcators_watcher.txt
index 16424c1017c..18bb6f851be 100644
--- a/forge-gui/res/cardsfolder/upcoming/malcators_watcher.txt
+++ b/forge-gui/res/cardsfolder/m/malcators_watcher.txt
@@ -1,9 +1,9 @@
-Name:Malcator's Watcher
-ManaCost:1 U
-Types:Artifact Creature Phyrexian Drone
-PT:1/1
-K:Flying
-K:Vigilance
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME dies, draw a card.
-SVar:TrigDraw:DB$ Draw
+Name:Malcator's Watcher
+ManaCost:1 U
+Types:Artifact Creature Phyrexian Drone
+PT:1/1
+K:Flying
+K:Vigilance
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME dies, draw a card.
+SVar:TrigDraw:DB$ Draw
 Oracle:Flying, vigilance\nWhen Malcator's Watcher dies, draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/mandible_justiciar.txt b/forge-gui/res/cardsfolder/m/mandible_justiciar.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/mandible_justiciar.txt
rename to forge-gui/res/cardsfolder/m/mandible_justiciar.txt
index 4922802b5d4..d5ad96591db 100644
--- a/forge-gui/res/cardsfolder/upcoming/mandible_justiciar.txt
+++ b/forge-gui/res/cardsfolder/m/mandible_justiciar.txt
@@ -1,10 +1,10 @@
-Name:Mandible Justiciar
-ManaCost:1 W
-Types:Artifact Creature Phyrexian Cleric
-PT:2/1
-K:Lifelink
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another artifact enters the battlefield under your control, CARDNAME gets +1/+1 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1
-DeckHints:Type$Artifact
-DeckHas:Ability$LifeGain
-Oracle:Lifelink\nWhenever another artifact enters the battlefield under your control, Mandible Justiciar gets +1/+1 until end of turn.
+Name:Mandible Justiciar
+ManaCost:1 W
+Types:Artifact Creature Phyrexian Cleric
+PT:2/1
+K:Lifelink
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another artifact enters the battlefield under your control, CARDNAME gets +1/+1 until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1
+DeckHints:Type$Artifact
+DeckHas:Ability$LifeGain
+Oracle:Lifelink\nWhenever another artifact enters the battlefield under your control, Mandible Justiciar gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/maze_skullbomb.txt b/forge-gui/res/cardsfolder/m/maze_skullbomb.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/maze_skullbomb.txt
rename to forge-gui/res/cardsfolder/m/maze_skullbomb.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mazes_mantle.txt b/forge-gui/res/cardsfolder/m/mazes_mantle.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/mazes_mantle.txt
rename to forge-gui/res/cardsfolder/m/mazes_mantle.txt
index 1740dbbc895..261f98d0637 100644
--- a/forge-gui/res/cardsfolder/upcoming/mazes_mantle.txt
+++ b/forge-gui/res/cardsfolder/m/mazes_mantle.txt
@@ -1,11 +1,11 @@
-Name:Maze's Mantle
-ManaCost:2 G
-Types:Enchantment Aura
-K:Flash
-K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | IsPresent$ Creature.EnchantedBy+withToxic | ValidCard$ Card.Self | Execute$ TrigHexproof | TriggerDescription$ When CARDNAME enters the battlefield, if enchanted creature has toxic, that creature gains hexproof until end of turn.
-SVar:TrigHexproof:DB$ Pump | Defined$ Enchanted | KW$ Hexproof
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | Description$ Enchanted creature gets +2/+2.
-DeckHints:Keyword$Toxic
+Name:Maze's Mantle
+ManaCost:2 G
+Types:Enchantment Aura
+K:Flash
+K:Enchant creature
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | IsPresent$ Creature.EnchantedBy+withToxic | ValidCard$ Card.Self | Execute$ TrigHexproof | TriggerDescription$ When CARDNAME enters the battlefield, if enchanted creature has toxic, that creature gains hexproof until end of turn.
+SVar:TrigHexproof:DB$ Pump | Defined$ Enchanted | KW$ Hexproof
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | Description$ Enchanted creature gets +2/+2.
+DeckHints:Keyword$Toxic
 Oracle:Flash\nEnchant creature\nWhen Maze's Mantle enters the battlefield, if enchanted creature has toxic, that creature gains hexproof until end of turn.\nEnchanted creature gets +2/+2.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/meldweb_curator.txt b/forge-gui/res/cardsfolder/m/meldweb_curator.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/meldweb_curator.txt
rename to forge-gui/res/cardsfolder/m/meldweb_curator.txt
index af7057033b4..18a5d43fd2b 100644
--- a/forge-gui/res/cardsfolder/upcoming/meldweb_curator.txt
+++ b/forge-gui/res/cardsfolder/m/meldweb_curator.txt
@@ -1,8 +1,8 @@
-Name:Meldweb Curator
-ManaCost:3 U
-Types:Creature Phyrexian Wizard
-PT:3/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLibrary | TriggerDescription$ When CARDNAME enters the battlefield, put up to one target instant or sorcery card from your graveyard on top of your library.
-SVar:TrigLibrary:DB$ ChangeZone | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn | TargetMin$ 0 | TargetMax$ 1 | TgtZone$ Graveyard | TgtPrompt$ Choose up to one target instant or sorcery card in your graveyard | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0
-DeckHas:Ability$Graveyard
+Name:Meldweb Curator
+ManaCost:3 U
+Types:Creature Phyrexian Wizard
+PT:3/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLibrary | TriggerDescription$ When CARDNAME enters the battlefield, put up to one target instant or sorcery card from your graveyard on top of your library.
+SVar:TrigLibrary:DB$ ChangeZone | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn | TargetMin$ 0 | TargetMax$ 1 | TgtZone$ Graveyard | TgtPrompt$ Choose up to one target instant or sorcery card in your graveyard | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0
+DeckHas:Ability$Graveyard
 Oracle:When Meldweb Curator enters the battlefield, put up to one target instant or sorcery card from your graveyard on top of your library.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/meldweb_strider.txt b/forge-gui/res/cardsfolder/m/meldweb_strider.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/meldweb_strider.txt
rename to forge-gui/res/cardsfolder/m/meldweb_strider.txt
index 814c9311a7d..96b6afdc7eb 100644
--- a/forge-gui/res/cardsfolder/upcoming/meldweb_strider.txt
+++ b/forge-gui/res/cardsfolder/m/meldweb_strider.txt
@@ -1,10 +1,10 @@
-Name:Meldweb Strider
-ManaCost:4 U
-Types:Artifact Vehicle
-PT:5/5
-K:Vigilance
-K:etbCounter:OIL:1
-A:AB$ Animate | Cost$ SubCounter<1/OIL> | Defined$ Self | Types$ Artifact,Creature | SpellDescription$ It becomes an artifact creature until end of turn.
-K:Crew:3
-DeckHas:Ability$Counters
+Name:Meldweb Strider
+ManaCost:4 U
+Types:Artifact Vehicle
+PT:5/5
+K:Vigilance
+K:etbCounter:OIL:1
+A:AB$ Animate | Cost$ SubCounter<1/OIL> | Defined$ Self | Types$ Artifact,Creature | SpellDescription$ It becomes an artifact creature until end of turn.
+K:Crew:3
+DeckHas:Ability$Counters
 Oracle:Vigilance\nMeldweb Strider enters the battlefield with an oil counter on it.\nRemove an oil counter from Meldweb Strider: It becomes an artifact creature until end of turn.\nCrew 3 (Tap any number of creatures you control with total power 3 or more: This Vehicle becomes an artifact creature until end of turn.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/melira_the_living_cure.txt b/forge-gui/res/cardsfolder/m/melira_the_living_cure.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/melira_the_living_cure.txt
rename to forge-gui/res/cardsfolder/m/melira_the_living_cure.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/melt_through.txt b/forge-gui/res/cardsfolder/m/melt_through.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/melt_through.txt
rename to forge-gui/res/cardsfolder/m/melt_through.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mercurial_spelldancer.txt b/forge-gui/res/cardsfolder/m/mercurial_spelldancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mercurial_spelldancer.txt
rename to forge-gui/res/cardsfolder/m/mercurial_spelldancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mesmerizing_dose.txt b/forge-gui/res/cardsfolder/m/mesmerizing_dose.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mesmerizing_dose.txt
rename to forge-gui/res/cardsfolder/m/mesmerizing_dose.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/migloz_maze_crusher.txt b/forge-gui/res/cardsfolder/m/migloz_maze_crusher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/migloz_maze_crusher.txt
rename to forge-gui/res/cardsfolder/m/migloz_maze_crusher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mindsplice_apparatus.txt b/forge-gui/res/cardsfolder/m/mindsplice_apparatus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mindsplice_apparatus.txt
rename to forge-gui/res/cardsfolder/m/mindsplice_apparatus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/minor_misstep.txt b/forge-gui/res/cardsfolder/m/minor_misstep.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/minor_misstep.txt
rename to forge-gui/res/cardsfolder/m/minor_misstep.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mirage_mockery.txt b/forge-gui/res/cardsfolder/m/mirage_mockery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mirage_mockery.txt
rename to forge-gui/res/cardsfolder/m/mirage_mockery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mirran_bardiche.txt b/forge-gui/res/cardsfolder/m/mirran_bardiche.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mirran_bardiche.txt
rename to forge-gui/res/cardsfolder/m/mirran_bardiche.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mirran_safehouse.txt b/forge-gui/res/cardsfolder/m/mirran_safehouse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mirran_safehouse.txt
rename to forge-gui/res/cardsfolder/m/mirran_safehouse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mirrex.txt b/forge-gui/res/cardsfolder/m/mirrex.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mirrex.txt
rename to forge-gui/res/cardsfolder/m/mirrex.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mite_overseer.txt b/forge-gui/res/cardsfolder/m/mite_overseer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mite_overseer.txt
rename to forge-gui/res/cardsfolder/m/mite_overseer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mizzix_replica_rider.txt b/forge-gui/res/cardsfolder/m/mizzix_replica_rider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mizzix_replica_rider.txt
rename to forge-gui/res/cardsfolder/m/mizzix_replica_rider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/molten_rebuke.txt b/forge-gui/res/cardsfolder/m/molten_rebuke.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/molten_rebuke.txt
rename to forge-gui/res/cardsfolder/m/molten_rebuke.txt
index 7eaaf969649..fa1af335644 100644
--- a/forge-gui/res/cardsfolder/upcoming/molten_rebuke.txt
+++ b/forge-gui/res/cardsfolder/m/molten_rebuke.txt
@@ -1,7 +1,7 @@
-Name:Molten Rebuke
-ManaCost:4 R
-Types:Sorcery
-A:SP$ Charm | MinCharmNum$ 1 | CharmNum$ 2 | Choices$ DBDamage,DBDestroy
-SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target creature or planeswalker.
-SVar:DBDestroy:DB$ Destroy | ValidTgts$ Equipment | TgtPrompt$ Select target equipment | SpellDescription$ Destroy target Equipment.
+Name:Molten Rebuke
+ManaCost:4 R
+Types:Sorcery
+A:SP$ Charm | MinCharmNum$ 1 | CharmNum$ 2 | Choices$ DBDamage,DBDestroy
+SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target creature or planeswalker.
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Equipment | TgtPrompt$ Select target equipment | SpellDescription$ Destroy target Equipment.
 Oracle:Choose one or both—\n• Molten Rebuke deals 5 damage to target creature or planeswalker.\n• Destroy target Equipment.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/mondrak_glory_dominus.txt b/forge-gui/res/cardsfolder/m/mondrak_glory_dominus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mondrak_glory_dominus.txt
rename to forge-gui/res/cardsfolder/m/mondrak_glory_dominus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/monument_to_perfection.txt b/forge-gui/res/cardsfolder/m/monument_to_perfection.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/monument_to_perfection.txt
rename to forge-gui/res/cardsfolder/m/monument_to_perfection.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/monumental_corruption.txt b/forge-gui/res/cardsfolder/m/monumental_corruption.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/monumental_corruption.txt
rename to forge-gui/res/cardsfolder/m/monumental_corruption.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/myr_convert.txt b/forge-gui/res/cardsfolder/m/myr_convert.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/myr_convert.txt
rename to forge-gui/res/cardsfolder/m/myr_convert.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/myr_custodian.txt b/forge-gui/res/cardsfolder/m/myr_custodian.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/myr_custodian.txt
rename to forge-gui/res/cardsfolder/m/myr_custodian.txt
index 405c9f632a9..ba2109712f2 100644
--- a/forge-gui/res/cardsfolder/upcoming/myr_custodian.txt
+++ b/forge-gui/res/cardsfolder/m/myr_custodian.txt
@@ -1,8 +1,8 @@
-Name:Myr Custodian
-ManaCost:3
-Types:Artifact Creature Myr
-PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 2. Then each opponent may scry 1. (To scry X, that player looks at the top X cards of their library, then put any number of them on the bottom and the rest on top in any order.)
-SVar:TrigScry:DB$ Scry | ScryNum$ 2 | SubAbility$ DBScry
-SVar:DBScry:DB$ Scry | ScryNum$ 1 | Defined$ Opponent | Optional$ True
-Oracle:When Myr Custodian enters the battlefield, scry 2. Then each opponent may scry 1. (To scry X, that player looks at the top X cards of their library, then put any number of them on the bottom and the rest on top in any order.)
+Name:Myr Custodian
+ManaCost:3
+Types:Artifact Creature Myr
+PT:2/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 2. Then each opponent may scry 1. (To scry X, that player looks at the top X cards of their library, then put any number of them on the bottom and the rest on top in any order.)
+SVar:TrigScry:DB$ Scry | ScryNum$ 2 | SubAbility$ DBScry
+SVar:DBScry:DB$ Scry | ScryNum$ 1 | Defined$ Opponent | Optional$ True
+Oracle:When Myr Custodian enters the battlefield, scry 2. Then each opponent may scry 1. (To scry X, that player looks at the top X cards of their library, then put any number of them on the bottom and the rest on top in any order.)
diff --git a/forge-gui/res/cardsfolder/upcoming/myr_kinsmith.txt b/forge-gui/res/cardsfolder/m/myr_kinsmith.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/myr_kinsmith.txt
rename to forge-gui/res/cardsfolder/m/myr_kinsmith.txt
index 2c7af88c645..050b5c07285 100644
--- a/forge-gui/res/cardsfolder/upcoming/myr_kinsmith.txt
+++ b/forge-gui/res/cardsfolder/m/myr_kinsmith.txt
@@ -1,8 +1,8 @@
-Name:Myr Kinsmith
-ManaCost:4
-Types:Artifact Creature Myr
-PT:3/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a Myr card, reveal it, put it into your hand, then shuffle.
-SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Myr | ChangeNum$ 1 | Shuffle$ True
-DeckHints:Type$Myr
+Name:Myr Kinsmith
+ManaCost:4
+Types:Artifact Creature Myr
+PT:3/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a Myr card, reveal it, put it into your hand, then shuffle.
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Myr | ChangeNum$ 1 | Shuffle$ True
+DeckHints:Type$Myr
 Oracle:When Myr Kinsmith enters the battlefield, you may search your library for a Myr card, reveal it, put it into your hand, then shuffle.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/nahiri_the_unforgiving.txt b/forge-gui/res/cardsfolder/n/nahiri_the_unforgiving.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nahiri_the_unforgiving.txt
rename to forge-gui/res/cardsfolder/n/nahiri_the_unforgiving.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nahiris_sacrifice.txt b/forge-gui/res/cardsfolder/n/nahiris_sacrifice.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nahiris_sacrifice.txt
rename to forge-gui/res/cardsfolder/n/nahiris_sacrifice.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/necrogen_communion.txt b/forge-gui/res/cardsfolder/n/necrogen_communion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/necrogen_communion.txt
rename to forge-gui/res/cardsfolder/n/necrogen_communion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/necrogen_rotpriest.txt b/forge-gui/res/cardsfolder/n/necrogen_rotpriest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/necrogen_rotpriest.txt
rename to forge-gui/res/cardsfolder/n/necrogen_rotpriest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/necrosquito.txt b/forge-gui/res/cardsfolder/n/necrosquito.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/necrosquito.txt
rename to forge-gui/res/cardsfolder/n/necrosquito.txt
index 9325d96f04e..bde6a85c181 100644
--- a/forge-gui/res/cardsfolder/upcoming/necrosquito.txt
+++ b/forge-gui/res/cardsfolder/n/necrosquito.txt
@@ -1,12 +1,12 @@
-Name:Necrosquito
-ManaCost:3 B
-Types:Creature Phyrexian Insect
-PT:0/0
-K:Flying
-K:etbCounter:OIL:2
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Description$ CARDNAME gets +1/+1 for each oil counter on it.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+Other,Artifact.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature or artifact you control is put into a graveyard from the battlefield, put an oil counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ OIL | CounterNum$ 1
-SVar:X:Count$CardCounters.OIL
-DeckHas:Ability$Counters
+Name:Necrosquito
+ManaCost:3 B
+Types:Creature Phyrexian Insect
+PT:0/0
+K:Flying
+K:etbCounter:OIL:2
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Description$ CARDNAME gets +1/+1 for each oil counter on it.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+Other,Artifact.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature or artifact you control is put into a graveyard from the battlefield, put an oil counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ OIL | CounterNum$ 1
+SVar:X:Count$CardCounters.OIL
+DeckHas:Ability$Counters
 Oracle:Flying\nNecrosquito enters the battlefield with two oil counters on it.\nNecrosquito gets +1/+1 for each oil counter on it.\nWhenever another creature or artifact you control is put into a graveyard from the battlefield, put an oil counter on Necrosquito.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/neyali_suns_vanguard.txt b/forge-gui/res/cardsfolder/n/neyali_suns_vanguard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/neyali_suns_vanguard.txt
rename to forge-gui/res/cardsfolder/n/neyali_suns_vanguard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nimraiser_paladin.txt b/forge-gui/res/cardsfolder/n/nimraiser_paladin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nimraiser_paladin.txt
rename to forge-gui/res/cardsfolder/n/nimraiser_paladin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nissa_ascended_animist.txt b/forge-gui/res/cardsfolder/n/nissa_ascended_animist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nissa_ascended_animist.txt
rename to forge-gui/res/cardsfolder/n/nissa_ascended_animist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/norns_choirmaster.txt b/forge-gui/res/cardsfolder/n/norns_choirmaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/norns_choirmaster.txt
rename to forge-gui/res/cardsfolder/n/norns_choirmaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/norns_decree.txt b/forge-gui/res/cardsfolder/n/norns_decree.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/norns_decree.txt
rename to forge-gui/res/cardsfolder/n/norns_decree.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/norns_disassembly.txt b/forge-gui/res/cardsfolder/n/norns_disassembly.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/norns_disassembly.txt
rename to forge-gui/res/cardsfolder/n/norns_disassembly.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/norns_wellspring.txt b/forge-gui/res/cardsfolder/n/norns_wellspring.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/norns_wellspring.txt
rename to forge-gui/res/cardsfolder/n/norns_wellspring.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/noxious_assault.txt b/forge-gui/res/cardsfolder/n/noxious_assault.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/noxious_assault.txt
rename to forge-gui/res/cardsfolder/n/noxious_assault.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/offer_immortality.txt b/forge-gui/res/cardsfolder/o/offer_immortality.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/offer_immortality.txt
rename to forge-gui/res/cardsfolder/o/offer_immortality.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ogre_battlecaster.txt b/forge-gui/res/cardsfolder/o/ogre_battlecaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ogre_battlecaster.txt
rename to forge-gui/res/cardsfolder/o/ogre_battlecaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/oil_gorger_troll.txt b/forge-gui/res/cardsfolder/o/oil_gorger_troll.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/oil_gorger_troll.txt
rename to forge-gui/res/cardsfolder/o/oil_gorger_troll.txt
index 3129652d954..fe4d3530f2c 100644
--- a/forge-gui/res/cardsfolder/upcoming/oil_gorger_troll.txt
+++ b/forge-gui/res/cardsfolder/o/oil_gorger_troll.txt
@@ -1,10 +1,10 @@
-Name:Oil-Gorger Troll
-ManaCost:3 G G
-Types:Creature Phyrexian Troll Warrior
-PT:3/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 3 life. 
-SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3 | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | ConditionPresent$ Permanent.YouCtrl+counters_GE1_OIL | SpellDescription$ Then if you control a permanent with an oil counter on it, draw a card.
-DeckHas:Ability$LifeGain
-DeckHints:Ability$Counters
+Name:Oil-Gorger Troll
+ManaCost:3 G G
+Types:Creature Phyrexian Troll Warrior
+PT:3/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 3 life. 
+SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | ConditionPresent$ Permanent.YouCtrl+counters_GE1_OIL | SpellDescription$ Then if you control a permanent with an oil counter on it, draw a card.
+DeckHas:Ability$LifeGain
+DeckHints:Ability$Counters
 Oracle:When Oil-Gorger Troll enters the battlefield, you gain 3 life. Then if you control a permanent with an oil counter on it, draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/orthodoxy_enforcer.txt b/forge-gui/res/cardsfolder/o/orthodoxy_enforcer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/orthodoxy_enforcer.txt
rename to forge-gui/res/cardsfolder/o/orthodoxy_enforcer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ossification.txt b/forge-gui/res/cardsfolder/o/ossification.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ossification.txt
rename to forge-gui/res/cardsfolder/o/ossification.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/otharri_suns_glory.txt b/forge-gui/res/cardsfolder/o/otharri_suns_glory.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/otharri_suns_glory.txt
rename to forge-gui/res/cardsfolder/o/otharri_suns_glory.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ovika_enigma_goliath.txt b/forge-gui/res/cardsfolder/o/ovika_enigma_goliath.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ovika_enigma_goliath.txt
rename to forge-gui/res/cardsfolder/o/ovika_enigma_goliath.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/oxidda_finisher.txt b/forge-gui/res/cardsfolder/o/oxidda_finisher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/oxidda_finisher.txt
rename to forge-gui/res/cardsfolder/o/oxidda_finisher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/paladin_of_predation.txt b/forge-gui/res/cardsfolder/p/paladin_of_predation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/paladin_of_predation.txt
rename to forge-gui/res/cardsfolder/p/paladin_of_predation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/patchplate_resolute.txt b/forge-gui/res/cardsfolder/p/patchplate_resolute.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/patchplate_resolute.txt
rename to forge-gui/res/cardsfolder/p/patchplate_resolute.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/penregon_besieged.txt b/forge-gui/res/cardsfolder/p/penregon_besieged.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/penregon_besieged.txt
rename to forge-gui/res/cardsfolder/p/penregon_besieged.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/perilous_iteration.txt b/forge-gui/res/cardsfolder/p/perilous_iteration.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/perilous_iteration.txt
rename to forge-gui/res/cardsfolder/p/perilous_iteration.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pestilent_syphoner.txt b/forge-gui/res/cardsfolder/p/pestilent_syphoner.txt
similarity index 96%
rename from forge-gui/res/cardsfolder/upcoming/pestilent_syphoner.txt
rename to forge-gui/res/cardsfolder/p/pestilent_syphoner.txt
index 69f4d87dade..4676d040140 100644
--- a/forge-gui/res/cardsfolder/upcoming/pestilent_syphoner.txt
+++ b/forge-gui/res/cardsfolder/p/pestilent_syphoner.txt
@@ -1,7 +1,7 @@
-Name:Pestilent Syphoner
-ManaCost:1 B
-Types:Creature Phyrexian Insect
-PT:1/1
-K:Flying
-K:Toxic:1
-Oracle:Flying\nToxic 1 (Players dealt combat damage by this creature also get a poison counter.)
+Name:Pestilent Syphoner
+ManaCost:1 B
+Types:Creature Phyrexian Insect
+PT:1/1
+K:Flying
+K:Toxic:1
+Oracle:Flying\nToxic 1 (Players dealt combat damage by this creature also get a poison counter.)
diff --git a/forge-gui/res/cardsfolder/upcoming/phyresis_outbreak.txt b/forge-gui/res/cardsfolder/p/phyresis_outbreak.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyresis_outbreak.txt
rename to forge-gui/res/cardsfolder/p/phyresis_outbreak.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phyrexian_atlas.txt b/forge-gui/res/cardsfolder/p/phyrexian_atlas.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyrexian_atlas.txt
rename to forge-gui/res/cardsfolder/p/phyrexian_atlas.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phyrexian_vindicator.txt b/forge-gui/res/cardsfolder/p/phyrexian_vindicator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyrexian_vindicator.txt
rename to forge-gui/res/cardsfolder/p/phyrexian_vindicator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/piece_it_together.txt b/forge-gui/res/cardsfolder/p/piece_it_together.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/piece_it_together.txt
rename to forge-gui/res/cardsfolder/p/piece_it_together.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/plague_nurse.txt b/forge-gui/res/cardsfolder/p/plague_nurse.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/plague_nurse.txt
rename to forge-gui/res/cardsfolder/p/plague_nurse.txt
index a629e716f9b..ec781eb9927 100644
--- a/forge-gui/res/cardsfolder/upcoming/plague_nurse.txt
+++ b/forge-gui/res/cardsfolder/p/plague_nurse.txt
@@ -1,8 +1,8 @@
-Name:Plague Nurse
-ManaCost:3 G
-Types:Creature Phyrexian Cleric
-PT:3/4
-K:Toxic:2
-A:AB$ PumpAll | Cost$ 2 G | KW$ Toxic:1 | ValidCards$ Creature.withToxic+Other+YouCtrl | ActivationLimit$ 1 | SpellDescription$ Each other creature you control with toxic gains toxic 1 until end of turn. Activate only once each turn. (A player dealt combat damage by a creature with toxic also gets poison counters equal to that creature's total toxic value.)
-DeckHints:Keyword$Toxic
+Name:Plague Nurse
+ManaCost:3 G
+Types:Creature Phyrexian Cleric
+PT:3/4
+K:Toxic:2
+A:AB$ PumpAll | Cost$ 2 G | KW$ Toxic:1 | ValidCards$ Creature.withToxic+Other+YouCtrl | ActivationLimit$ 1 | SpellDescription$ Each other creature you control with toxic gains toxic 1 until end of turn. Activate only once each turn. (A player dealt combat damage by a creature with toxic also gets poison counters equal to that creature's total toxic value.)
+DeckHints:Keyword$Toxic
 Oracle:Toxic 2\n{2}{G}: Each other creature you control with toxic gains toxic 1 until end of turn. Activate only once each turn. (A player dealt combat damage by a creature with toxic also gets poison counters equal to that creature's total toxic value.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/planar_disruption.txt b/forge-gui/res/cardsfolder/p/planar_disruption.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/planar_disruption.txt
rename to forge-gui/res/cardsfolder/p/planar_disruption.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/plated_onslaught.txt b/forge-gui/res/cardsfolder/p/plated_onslaught.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/plated_onslaught.txt
rename to forge-gui/res/cardsfolder/p/plated_onslaught.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/porcelain_zealot.txt b/forge-gui/res/cardsfolder/p/porcelain_zealot.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/porcelain_zealot.txt
rename to forge-gui/res/cardsfolder/p/porcelain_zealot.txt
index ab3900d56dc..e74760ddfce 100644
--- a/forge-gui/res/cardsfolder/upcoming/porcelain_zealot.txt
+++ b/forge-gui/res/cardsfolder/p/porcelain_zealot.txt
@@ -1,10 +1,10 @@
-Name:Porcelain Zealot
-ManaCost:3 W
-Types:Creature Phyrexian Soldier
-PT:2/3
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, target creature you control gets +1/+1 until end of turn. If that creature has toxic, instead it gets +2/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | NumAtt$ X | NumDef$ X 
-SVar:Y:Targeted$Valid Creature.withToxic
-SVar:X:Count$Compare Y GE1.2.1
-DeckHints:Keyword$Toxic
+Name:Porcelain Zealot
+ManaCost:3 W
+Types:Creature Phyrexian Soldier
+PT:2/3
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, target creature you control gets +1/+1 until end of turn. If that creature has toxic, instead it gets +2/+2 until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | NumAtt$ X | NumDef$ X 
+SVar:Y:Targeted$Valid Creature.withToxic
+SVar:X:Count$Compare Y GE1.2.1
+DeckHints:Keyword$Toxic
 Oracle:At the beginning of combat on your turn, target creature you control gets +1/+1 until end of turn. If that creature has toxic, instead it gets +2/+2 until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/predation_steward.txt b/forge-gui/res/cardsfolder/p/predation_steward.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/predation_steward.txt
rename to forge-gui/res/cardsfolder/p/predation_steward.txt
index 9f9c3de565b..abfb8741fa4 100644
--- a/forge-gui/res/cardsfolder/upcoming/predation_steward.txt
+++ b/forge-gui/res/cardsfolder/p/predation_steward.txt
@@ -1,8 +1,8 @@
-Name:Predation Steward
-ManaCost:1 G
-Types:Creature Phyrexian Elf Warrior
-PT:2/2
-K:etbCounter:OIL:2
-A:AB$ Pump | Cost$ 2 G T SubCounter<1/OIL> | ValidTgts$ Creature | SorcerySpeed$ True | NumAtt$ 2 | NumDef$ 2 | SpellDescription$ Target creature gets +2/+2 until end of turn. Activate only as a sorcery.
-DeckHas:Ability$Counter
+Name:Predation Steward
+ManaCost:1 G
+Types:Creature Phyrexian Elf Warrior
+PT:2/2
+K:etbCounter:OIL:2
+A:AB$ Pump | Cost$ 2 G T SubCounter<1/OIL> | ValidTgts$ Creature | SorcerySpeed$ True | NumAtt$ 2 | NumDef$ 2 | SpellDescription$ Target creature gets +2/+2 until end of turn. Activate only as a sorcery.
+DeckHas:Ability$Counter
 Oracle:Predation Steward enters the battlefield with two oil counters on it.\n{2}{G}, {T}, Remove an oil counter from Predation Steward: Target creature gets +2/+2 until end of turn. Activate only as a sorcery.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/prologue_to_phyresis.txt b/forge-gui/res/cardsfolder/p/prologue_to_phyresis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prologue_to_phyresis.txt
rename to forge-gui/res/cardsfolder/p/prologue_to_phyresis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prosthetic_injector.txt b/forge-gui/res/cardsfolder/p/prosthetic_injector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prosthetic_injector.txt
rename to forge-gui/res/cardsfolder/p/prosthetic_injector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quicksilver_fisher.txt b/forge-gui/res/cardsfolder/q/quicksilver_fisher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quicksilver_fisher.txt
rename to forge-gui/res/cardsfolder/q/quicksilver_fisher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/raddic_tal_zealot.txt b/forge-gui/res/cardsfolder/r/raddic_tal_zealot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raddic_tal_zealot.txt
rename to forge-gui/res/cardsfolder/r/raddic_tal_zealot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ravenous_necrotitan.txt b/forge-gui/res/cardsfolder/r/ravenous_necrotitan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ravenous_necrotitan.txt
rename to forge-gui/res/cardsfolder/r/ravenous_necrotitan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rebel_salvo.txt b/forge-gui/res/cardsfolder/r/rebel_salvo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rebel_salvo.txt
rename to forge-gui/res/cardsfolder/r/rebel_salvo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/red_suns_twilight.txt b/forge-gui/res/cardsfolder/r/red_suns_twilight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/red_suns_twilight.txt
rename to forge-gui/res/cardsfolder/r/red_suns_twilight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reject_imperfection.txt b/forge-gui/res/cardsfolder/r/reject_imperfection.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reject_imperfection.txt
rename to forge-gui/res/cardsfolder/r/reject_imperfection.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/resistance_reunited.txt b/forge-gui/res/cardsfolder/r/resistance_reunited.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/resistance_reunited.txt
rename to forge-gui/res/cardsfolder/r/resistance_reunited.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/resistance_skywarden.txt b/forge-gui/res/cardsfolder/r/resistance_skywarden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/resistance_skywarden.txt
rename to forge-gui/res/cardsfolder/r/resistance_skywarden.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rhuk_hexgold_nabber.txt b/forge-gui/res/cardsfolder/r/rhuk_hexgold_nabber.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rhuk_hexgold_nabber.txt
rename to forge-gui/res/cardsfolder/r/rhuk_hexgold_nabber.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ria_ivor_bane_of_bladehold.txt b/forge-gui/res/cardsfolder/r/ria_ivor_bane_of_bladehold.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ria_ivor_bane_of_bladehold.txt
rename to forge-gui/res/cardsfolder/r/ria_ivor_bane_of_bladehold.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ribskiff.txt b/forge-gui/res/cardsfolder/r/ribskiff.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ribskiff.txt
rename to forge-gui/res/cardsfolder/r/ribskiff.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/richlau_headmaster.txt b/forge-gui/res/cardsfolder/r/richlau_headmaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/richlau_headmaster.txt
rename to forge-gui/res/cardsfolder/r/richlau_headmaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/roar_of_resistance.txt b/forge-gui/res/cardsfolder/r/roar_of_resistance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/roar_of_resistance.txt
rename to forge-gui/res/cardsfolder/r/roar_of_resistance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rusko_clockmaker.txt b/forge-gui/res/cardsfolder/r/rusko_clockmaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rusko_clockmaker.txt
rename to forge-gui/res/cardsfolder/r/rusko_clockmaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rustvine_cultivator.txt b/forge-gui/res/cardsfolder/r/rustvine_cultivator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rustvine_cultivator.txt
rename to forge-gui/res/cardsfolder/r/rustvine_cultivator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ruthless_predation.txt b/forge-gui/res/cardsfolder/r/ruthless_predation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ruthless_predation.txt
rename to forge-gui/res/cardsfolder/r/ruthless_predation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sawblade_scamp.txt b/forge-gui/res/cardsfolder/s/sawblade_scamp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sawblade_scamp.txt
rename to forge-gui/res/cardsfolder/s/sawblade_scamp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scheming_aspirant.txt b/forge-gui/res/cardsfolder/s/scheming_aspirant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scheming_aspirant.txt
rename to forge-gui/res/cardsfolder/s/scheming_aspirant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/serum_core_chimera.txt b/forge-gui/res/cardsfolder/s/serum_core_chimera.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/serum_core_chimera.txt
rename to forge-gui/res/cardsfolder/s/serum_core_chimera.txt
index 4882026261c..22666759bf8 100644
--- a/forge-gui/res/cardsfolder/upcoming/serum_core_chimera.txt
+++ b/forge-gui/res/cardsfolder/s/serum_core_chimera.txt
@@ -1,14 +1,14 @@
-Name:Serum-Core Chimera
-ManaCost:2 U R
-Types:Creature Phyrexian Chimera
-PT:2/4
-K:Flying
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever you cast a noncreature spell, put an oil counter on CARDNAME.
-SVar:TrigCounter:DB$ PutCounter | Defined$ Self | CounterType$ OIL | CounterNum$ 1
-A:AB$ Draw | Cost$ SubCounter<3/OIL> | SorcerySpeed$ True | SubAbility$ DBDiscard | SpellDescription$ Draw a card. Then you may discard a nonland card. When you discard a card this way, CARDNAME deals 3 damage to target creature or planeswalker. Activate only as a sorcery.
-SVar:DBDiscard:DB$ Discard | NumCards$ 1 | DiscardValid$ Card.nonLand | Optional$ True | DiscardValidDesc$ Select up to one nonland card in your hand to discard | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBImmediateTrig
-SVar:DBImmediateTrig:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | Execute$ TrigDamage | SubAbility$ DBCleanup | TriggerDescription$  When you discard a card this way, CARDNAME deals 3 damage to target creature or planeswalker.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ 3
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Counters|Discard
-Oracle:Flying\nWhenever you cast a noncreature spell, put an oil counter on Serum-Core Chimera.\nRemove three oil counters from Serum-Core Chimera: Draw a card. Then you may discard a nonland card. When you discard a card this way, Serum-Core Chimera deals 3 damage to target creature or planeswalker. Activate only as a sorcery.
+Name:Serum-Core Chimera
+ManaCost:2 U R
+Types:Creature Phyrexian Chimera
+PT:2/4
+K:Flying
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever you cast a noncreature spell, put an oil counter on CARDNAME.
+SVar:TrigCounter:DB$ PutCounter | Defined$ Self | CounterType$ OIL | CounterNum$ 1
+A:AB$ Draw | Cost$ SubCounter<3/OIL> | SorcerySpeed$ True | SubAbility$ DBDiscard | SpellDescription$ Draw a card. Then you may discard a nonland card. When you discard a card this way, CARDNAME deals 3 damage to target creature or planeswalker. Activate only as a sorcery.
+SVar:DBDiscard:DB$ Discard | NumCards$ 1 | DiscardValid$ Card.nonLand | Optional$ True | DiscardValidDesc$ Select up to one nonland card in your hand to discard | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBImmediateTrig
+SVar:DBImmediateTrig:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | Execute$ TrigDamage | SubAbility$ DBCleanup | TriggerDescription$  When you discard a card this way, CARDNAME deals 3 damage to target creature or planeswalker.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ 3
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Counters|Discard
+Oracle:Flying\nWhenever you cast a noncreature spell, put an oil counter on Serum-Core Chimera.\nRemove three oil counters from Serum-Core Chimera: Draw a card. Then you may discard a nonland card. When you discard a card this way, Serum-Core Chimera deals 3 damage to target creature or planeswalker. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/serum_snare.txt b/forge-gui/res/cardsfolder/s/serum_snare.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/serum_snare.txt
rename to forge-gui/res/cardsfolder/s/serum_snare.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/serum_sovereign.txt b/forge-gui/res/cardsfolder/s/serum_sovereign.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/serum_sovereign.txt
rename to forge-gui/res/cardsfolder/s/serum_sovereign.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sheoldreds_edict.txt b/forge-gui/res/cardsfolder/s/sheoldreds_edict.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sheoldreds_edict.txt
rename to forge-gui/res/cardsfolder/s/sheoldreds_edict.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sheoldreds_headcleaver.txt b/forge-gui/res/cardsfolder/s/sheoldreds_headcleaver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sheoldreds_headcleaver.txt
rename to forge-gui/res/cardsfolder/s/sheoldreds_headcleaver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shrapnel_slinger.txt b/forge-gui/res/cardsfolder/s/shrapnel_slinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shrapnel_slinger.txt
rename to forge-gui/res/cardsfolder/s/shrapnel_slinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sinew_dancer.txt b/forge-gui/res/cardsfolder/s/sinew_dancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sinew_dancer.txt
rename to forge-gui/res/cardsfolder/s/sinew_dancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skrelv_defector_mite.txt b/forge-gui/res/cardsfolder/s/skrelv_defector_mite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skrelv_defector_mite.txt
rename to forge-gui/res/cardsfolder/s/skrelv_defector_mite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skrelvs_hive.txt b/forge-gui/res/cardsfolder/s/skrelvs_hive.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skrelvs_hive.txt
rename to forge-gui/res/cardsfolder/s/skrelvs_hive.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skyhunter_strike_force.txt b/forge-gui/res/cardsfolder/s/skyhunter_strike_force.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skyhunter_strike_force.txt
rename to forge-gui/res/cardsfolder/s/skyhunter_strike_force.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skyscythe_engulfer.txt b/forge-gui/res/cardsfolder/s/skyscythe_engulfer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skyscythe_engulfer.txt
rename to forge-gui/res/cardsfolder/s/skyscythe_engulfer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slaughter_singer.txt b/forge-gui/res/cardsfolder/s/slaughter_singer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slaughter_singer.txt
rename to forge-gui/res/cardsfolder/s/slaughter_singer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slobad_iron_goblin.txt b/forge-gui/res/cardsfolder/s/slobad_iron_goblin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slobad_iron_goblin.txt
rename to forge-gui/res/cardsfolder/s/slobad_iron_goblin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/solphim_mayhem_dominus.txt b/forge-gui/res/cardsfolder/s/solphim_mayhem_dominus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/solphim_mayhem_dominus.txt
rename to forge-gui/res/cardsfolder/s/solphim_mayhem_dominus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soulless_jailer.txt b/forge-gui/res/cardsfolder/s/soulless_jailer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soulless_jailer.txt
rename to forge-gui/res/cardsfolder/s/soulless_jailer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/staff_of_compleation.txt b/forge-gui/res/cardsfolder/s/staff_of_compleation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/staff_of_compleation.txt
rename to forge-gui/res/cardsfolder/s/staff_of_compleation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/staff_of_the_storyteller.txt b/forge-gui/res/cardsfolder/s/staff_of_the_storyteller.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/staff_of_the_storyteller.txt
rename to forge-gui/res/cardsfolder/s/staff_of_the_storyteller.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stinging_hivemaster.txt b/forge-gui/res/cardsfolder/s/stinging_hivemaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stinging_hivemaster.txt
rename to forge-gui/res/cardsfolder/s/stinging_hivemaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/surgical_skullbomb.txt b/forge-gui/res/cardsfolder/s/surgical_skullbomb.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/surgical_skullbomb.txt
rename to forge-gui/res/cardsfolder/s/surgical_skullbomb.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/swooping_lookout.txt b/forge-gui/res/cardsfolder/s/swooping_lookout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/swooping_lookout.txt
rename to forge-gui/res/cardsfolder/s/swooping_lookout.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sword_of_forge_and_frontier.txt b/forge-gui/res/cardsfolder/s/sword_of_forge_and_frontier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sword_of_forge_and_frontier.txt
rename to forge-gui/res/cardsfolder/s/sword_of_forge_and_frontier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sylvan_smite.txt b/forge-gui/res/cardsfolder/s/sylvan_smite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sylvan_smite.txt
rename to forge-gui/res/cardsfolder/s/sylvan_smite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sylvok_battle_chair.txt b/forge-gui/res/cardsfolder/s/sylvok_battle_chair.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sylvok_battle_chair.txt
rename to forge-gui/res/cardsfolder/s/sylvok_battle_chair.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/synthesis_pod.txt b/forge-gui/res/cardsfolder/s/synthesis_pod.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/synthesis_pod.txt
rename to forge-gui/res/cardsfolder/s/synthesis_pod.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tablet_of_compleation.txt b/forge-gui/res/cardsfolder/t/tablet_of_compleation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tablet_of_compleation.txt
rename to forge-gui/res/cardsfolder/t/tablet_of_compleation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tadeas_juniper_ascendant.txt b/forge-gui/res/cardsfolder/t/tadeas_juniper_ascendant.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/tadeas_juniper_ascendant.txt
rename to forge-gui/res/cardsfolder/t/tadeas_juniper_ascendant.txt
index f64cb7651ec..1928f1f5591 100644
--- a/forge-gui/res/cardsfolder/upcoming/tadeas_juniper_ascendant.txt
+++ b/forge-gui/res/cardsfolder/t/tadeas_juniper_ascendant.txt
@@ -1,15 +1,15 @@
-Name:Tadeas, Juniper Ascendant
-ManaCost:2 G W
-Types:Legendary Creature Human Monk
-PT:1/3
-K:Reach
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Hexproof | IsPresent$ Card.Self+notattacking | Description$ Teleport — CARDNAME has hexproof unless he's attacking.
-T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+withReach | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever a creature you control with reach attacks, untap it and it can't be blocked by creatures with greater power this combat.
-SVar:TrigUntap:DB$ Untap | Defined$ TriggeredAttackerLKICopy | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ TriggeredAttacker | StaticAbilities$ CantBeBlockedPow | ForgetOnMoved$ Battlefield | Duration$ UntilEndOfCombat
-SVar:CantBeBlockedPow:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | ValidBlocker$ Creature.powerGTX | Description$ CARDNAME can't be blocked by creatures with greater power this combat.
-SVar:X:Remembered$CardPower
-T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | Execute$ TrigDraw | TriggerDescription$ Whenever one or more creatures you control deal combat damage to a player, draw a card.
-SVar:TrigDraw:DB$ Draw
-DeckHints:Keyword$Reach
+Name:Tadeas, Juniper Ascendant
+ManaCost:2 G W
+Types:Legendary Creature Human Monk
+PT:1/3
+K:Reach
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Hexproof | IsPresent$ Card.Self+notattacking | Description$ Teleport — CARDNAME has hexproof unless he's attacking.
+T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+withReach | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever a creature you control with reach attacks, untap it and it can't be blocked by creatures with greater power this combat.
+SVar:TrigUntap:DB$ Untap | Defined$ TriggeredAttackerLKICopy | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ TriggeredAttacker | StaticAbilities$ CantBeBlockedPow | ForgetOnMoved$ Battlefield | Duration$ UntilEndOfCombat
+SVar:CantBeBlockedPow:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | ValidBlocker$ Creature.powerGTX | Description$ CARDNAME can't be blocked by creatures with greater power this combat.
+SVar:X:Remembered$CardPower
+T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | Execute$ TrigDraw | TriggerDescription$ Whenever one or more creatures you control deal combat damage to a player, draw a card.
+SVar:TrigDraw:DB$ Draw
+DeckHints:Keyword$Reach
 Oracle:Reach\nTadeas, Juniper Ascendant has hexproof unless he's attacking.\nWhenever a creature you control with reach attacks, untap it and it can't be blocked by creatures with greater power this combat.\nWhenever one or more creatures you control deal combat damage to a player, draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/tainted_observer.txt b/forge-gui/res/cardsfolder/t/tainted_observer.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/tainted_observer.txt
rename to forge-gui/res/cardsfolder/t/tainted_observer.txt
index 04980a97092..bbd7e5dca26 100644
--- a/forge-gui/res/cardsfolder/upcoming/tainted_observer.txt
+++ b/forge-gui/res/cardsfolder/t/tainted_observer.txt
@@ -1,10 +1,10 @@
-Name:Tainted Observer
-ManaCost:1 G U
-Types:Creature Phyrexian Bird
-PT:2/3
-K:Flying
-K:Toxic:1
-T:Mode$ ChangesZone | ValidCard$ Creature.Other+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigProliferate | TriggerDescription$ Whenever another creature enters the battlefield under your control, you may pay {2}. If you do, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
-SVar:TrigProliferate:AB$ Proliferate | Cost$ 2
-DeckHas:Ability$Proliferate
-Oracle:Flying\nToxic 1 (Players dealt combat damage by this creature also get a poison counter.)\nWhenever another creature enters the battlefield under your control, you may pay {2}. If you do, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
+Name:Tainted Observer
+ManaCost:1 G U
+Types:Creature Phyrexian Bird
+PT:2/3
+K:Flying
+K:Toxic:1
+T:Mode$ ChangesZone | ValidCard$ Creature.Other+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigProliferate | TriggerDescription$ Whenever another creature enters the battlefield under your control, you may pay {2}. If you do, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
+SVar:TrigProliferate:AB$ Proliferate | Cost$ 2
+DeckHas:Ability$Proliferate
+Oracle:Flying\nToxic 1 (Players dealt combat damage by this creature also get a poison counter.)\nWhenever another creature enters the battlefield under your control, you may pay {2}. If you do, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
diff --git a/forge-gui/res/cardsfolder/upcoming/tamiyos_immobilizer.txt b/forge-gui/res/cardsfolder/t/tamiyos_immobilizer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tamiyos_immobilizer.txt
rename to forge-gui/res/cardsfolder/t/tamiyos_immobilizer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tamiyos_logbook.txt b/forge-gui/res/cardsfolder/t/tamiyos_logbook.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tamiyos_logbook.txt
rename to forge-gui/res/cardsfolder/t/tamiyos_logbook.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tangleweave_armor.txt b/forge-gui/res/cardsfolder/t/tangleweave_armor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tangleweave_armor.txt
rename to forge-gui/res/cardsfolder/t/tangleweave_armor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tawnos_endures.txt b/forge-gui/res/cardsfolder/t/tawnos_endures.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tawnos_endures.txt
rename to forge-gui/res/cardsfolder/t/tawnos_endures.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tekuthal_inquiry_dominus.txt b/forge-gui/res/cardsfolder/t/tekuthal_inquiry_dominus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tekuthal_inquiry_dominus.txt
rename to forge-gui/res/cardsfolder/t/tekuthal_inquiry_dominus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/testament_bearer.txt b/forge-gui/res/cardsfolder/t/testament_bearer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/testament_bearer.txt
rename to forge-gui/res/cardsfolder/t/testament_bearer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_autonomous_furnace.txt b/forge-gui/res/cardsfolder/t/the_autonomous_furnace.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_autonomous_furnace.txt
rename to forge-gui/res/cardsfolder/t/the_autonomous_furnace.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_dross_pits.txt b/forge-gui/res/cardsfolder/t/the_dross_pits.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_dross_pits.txt
rename to forge-gui/res/cardsfolder/t/the_dross_pits.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_eternal_wanderer.txt b/forge-gui/res/cardsfolder/t/the_eternal_wanderer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_eternal_wanderer.txt
rename to forge-gui/res/cardsfolder/t/the_eternal_wanderer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_fair_basilica.txt b/forge-gui/res/cardsfolder/t/the_fair_basilica.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_fair_basilica.txt
rename to forge-gui/res/cardsfolder/t/the_fair_basilica.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_filigree_sylex.txt b/forge-gui/res/cardsfolder/t/the_filigree_sylex.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_filigree_sylex.txt
rename to forge-gui/res/cardsfolder/t/the_filigree_sylex.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_howling_abomination.txt b/forge-gui/res/cardsfolder/t/the_howling_abomination.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/the_howling_abomination.txt
rename to forge-gui/res/cardsfolder/t/the_howling_abomination.txt
index 4c6510b0124..7e6afc48e02 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_howling_abomination.txt
+++ b/forge-gui/res/cardsfolder/t/the_howling_abomination.txt
@@ -1,11 +1,11 @@
-Name:The Howling Abomination
-ManaCost:3 R G
-Types:Legendary Creature Human Beast Warrior
-PT:5/5
-K:Haste
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Trample | CheckSVar$ X | SVarCompare$ GE3 | Description$ CARDNAME has trample as long as you've cast three or more spells this turn.
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever NICKNAME becomes the target of a spell, he gets +2/+2 until end of turn and deals 2 damage to each opponent.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBDmg
-SVar:DBDmg:DB$ DealDamage | Defined$ Opponent | NumDmg$ 2
-SVar:X:Count$ThisTurnCast_Card.YouCtrl
+Name:The Howling Abomination
+ManaCost:3 R G
+Types:Legendary Creature Human Beast Warrior
+PT:5/5
+K:Haste
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Trample | CheckSVar$ X | SVarCompare$ GE3 | Description$ CARDNAME has trample as long as you've cast three or more spells this turn.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever NICKNAME becomes the target of a spell, he gets +2/+2 until end of turn and deals 2 damage to each opponent.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBDmg
+SVar:DBDmg:DB$ DealDamage | Defined$ Opponent | NumDmg$ 2
+SVar:X:Count$ThisTurnCast_Card.YouCtrl
 Oracle:Haste\nThe Howling Abomination has trample as long as you've cast three or more spells this turn.\nWhenever The Howling Abomination becomes the target of a spell, he gets +2/+2 until end of turn and deals 2 damage to each opponent.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/the_hunter_maze.txt b/forge-gui/res/cardsfolder/t/the_hunter_maze.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_hunter_maze.txt
rename to forge-gui/res/cardsfolder/t/the_hunter_maze.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_monumental_facade.txt b/forge-gui/res/cardsfolder/t/the_monumental_facade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_monumental_facade.txt
rename to forge-gui/res/cardsfolder/t/the_monumental_facade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_mycosynth_gardens.txt b/forge-gui/res/cardsfolder/t/the_mycosynth_gardens.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_mycosynth_gardens.txt
rename to forge-gui/res/cardsfolder/t/the_mycosynth_gardens.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_seedcore.txt b/forge-gui/res/cardsfolder/t/the_seedcore.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_seedcore.txt
rename to forge-gui/res/cardsfolder/t/the_seedcore.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_surgical_bay.txt b/forge-gui/res/cardsfolder/t/the_surgical_bay.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_surgical_bay.txt
rename to forge-gui/res/cardsfolder/t/the_surgical_bay.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thirsting_roots.txt b/forge-gui/res/cardsfolder/t/thirsting_roots.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thirsting_roots.txt
rename to forge-gui/res/cardsfolder/t/thirsting_roots.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thrun_breaker_of_silence.txt b/forge-gui/res/cardsfolder/t/thrun_breaker_of_silence.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thrun_breaker_of_silence.txt
rename to forge-gui/res/cardsfolder/t/thrun_breaker_of_silence.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tomakul_phoenix.txt b/forge-gui/res/cardsfolder/t/tomakul_phoenix.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tomakul_phoenix.txt
rename to forge-gui/res/cardsfolder/t/tomakul_phoenix.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/transplant_theorist.txt b/forge-gui/res/cardsfolder/t/transplant_theorist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/transplant_theorist.txt
rename to forge-gui/res/cardsfolder/t/transplant_theorist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/trawler_drake.txt b/forge-gui/res/cardsfolder/t/trawler_drake.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/trawler_drake.txt
rename to forge-gui/res/cardsfolder/t/trawler_drake.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tyrranax_atrocity.txt b/forge-gui/res/cardsfolder/t/tyrranax_atrocity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tyrranax_atrocity.txt
rename to forge-gui/res/cardsfolder/t/tyrranax_atrocity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tyrranax_rex.txt b/forge-gui/res/cardsfolder/t/tyrranax_rex.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tyrranax_rex.txt
rename to forge-gui/res/cardsfolder/t/tyrranax_rex.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tyvar_jubilant_brawler.txt b/forge-gui/res/cardsfolder/t/tyvar_jubilant_brawler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tyvar_jubilant_brawler.txt
rename to forge-gui/res/cardsfolder/t/tyvar_jubilant_brawler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tyvars_stand.txt b/forge-gui/res/cardsfolder/t/tyvars_stand.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tyvars_stand.txt
rename to forge-gui/res/cardsfolder/t/tyvars_stand.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unctus_grand_metatect.txt b/forge-gui/res/cardsfolder/u/unctus_grand_metatect.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unctus_grand_metatect.txt
rename to forge-gui/res/cardsfolder/u/unctus_grand_metatect.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unctuss_retrofitter.txt b/forge-gui/res/cardsfolder/u/unctuss_retrofitter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unctuss_retrofitter.txt
rename to forge-gui/res/cardsfolder/u/unctuss_retrofitter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unnatural_restoration.txt b/forge-gui/res/cardsfolder/u/unnatural_restoration.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unnatural_restoration.txt
rename to forge-gui/res/cardsfolder/u/unnatural_restoration.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/urabrasks_anointer.txt b/forge-gui/res/cardsfolder/u/urabrasks_anointer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/urabrasks_anointer.txt
rename to forge-gui/res/cardsfolder/u/urabrasks_anointer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/urabrasks_forge.txt b/forge-gui/res/cardsfolder/u/urabrasks_forge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/urabrasks_forge.txt
rename to forge-gui/res/cardsfolder/u/urabrasks_forge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/urtet_remnant_of_memnarch.txt b/forge-gui/res/cardsfolder/u/urtet_remnant_of_memnarch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/urtet_remnant_of_memnarch.txt
rename to forge-gui/res/cardsfolder/u/urtet_remnant_of_memnarch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/urzas_construction_drone.txt b/forge-gui/res/cardsfolder/u/urzas_construction_drone.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/urzas_construction_drone.txt
rename to forge-gui/res/cardsfolder/u/urzas_construction_drone.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vanish_into_eternity.txt b/forge-gui/res/cardsfolder/v/vanish_into_eternity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vanish_into_eternity.txt
rename to forge-gui/res/cardsfolder/v/vanish_into_eternity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vat_emergence.txt b/forge-gui/res/cardsfolder/v/vat_emergence.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vat_emergence.txt
rename to forge-gui/res/cardsfolder/v/vat_emergence.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vat_of_rebirth.txt b/forge-gui/res/cardsfolder/v/vat_of_rebirth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vat_of_rebirth.txt
rename to forge-gui/res/cardsfolder/v/vat_of_rebirth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/veil_of_assimilation.txt b/forge-gui/res/cardsfolder/v/veil_of_assimilation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/veil_of_assimilation.txt
rename to forge-gui/res/cardsfolder/v/veil_of_assimilation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/venerated_rotpriest.txt b/forge-gui/res/cardsfolder/v/venerated_rotpriest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/venerated_rotpriest.txt
rename to forge-gui/res/cardsfolder/v/venerated_rotpriest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/venomous_brutalizer.txt b/forge-gui/res/cardsfolder/v/venomous_brutalizer.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/venomous_brutalizer.txt
rename to forge-gui/res/cardsfolder/v/venomous_brutalizer.txt
index cdc26b0bb7b..5572c70eed0 100644
--- a/forge-gui/res/cardsfolder/upcoming/venomous_brutalizer.txt
+++ b/forge-gui/res/cardsfolder/v/venomous_brutalizer.txt
@@ -1,10 +1,10 @@
-Name:Venomous Brutalizer
-ManaCost:2 G G
-Types:Creature Phyrexian Knight
-PT:4/4
-K:Toxic:3
-Oracle:Toxic 3 (Players dealt combat damage by this creature also get three poison counters.)
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigProliferate | TriggerDescription$ When CARDNAME enters the battlefield, you may pay {1}{G}. If you do, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
-SVar:TrigProliferate:AB$ Proliferate | Cost$ 1 G
-DeckHas:Ability$Proliferate
+Name:Venomous Brutalizer
+ManaCost:2 G G
+Types:Creature Phyrexian Knight
+PT:4/4
+K:Toxic:3
+Oracle:Toxic 3 (Players dealt combat damage by this creature also get three poison counters.)
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigProliferate | TriggerDescription$ When CARDNAME enters the battlefield, you may pay {1}{G}. If you do, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
+SVar:TrigProliferate:AB$ Proliferate | Cost$ 1 G
+DeckHas:Ability$Proliferate
 Oracle:Toxic 3 (Players dealt combat damage by this creature also get three poison counters.)\nWhen Venomous Brutalizer enters the battlefield, you may pay {1}{G}. If you do, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/venser_corpse_puppet.txt b/forge-gui/res/cardsfolder/v/venser_corpse_puppet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/venser_corpse_puppet.txt
rename to forge-gui/res/cardsfolder/v/venser_corpse_puppet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vikya_scorching_stalwart.txt b/forge-gui/res/cardsfolder/v/vikya_scorching_stalwart.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/vikya_scorching_stalwart.txt
rename to forge-gui/res/cardsfolder/v/vikya_scorching_stalwart.txt
index ff8e82c921e..e023d7dd6c7 100644
--- a/forge-gui/res/cardsfolder/upcoming/vikya_scorching_stalwart.txt
+++ b/forge-gui/res/cardsfolder/v/vikya_scorching_stalwart.txt
@@ -1,10 +1,10 @@
-Name:Vikya, Scorching Stalwart
-ManaCost:2 W
-Types:Legendary Creature Human Warrior
-PT:2/4
-K:Training
-A:AB$ DealDamage | Cost$ 4 R Untap Discard<1/Card> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | AILogic$ PowerDmg | ExcessSVar$ Excess | SubAbility$ DBDraw | SpellDescription$ CARDNAME deals damage equal to his power to any target.
-SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ Excess | ConditionSVarCompare$ GE1 | ConditionDefined$ Targeted | ConditionPresent$ Creature | IfDesc$ True | SpellDescription$ If excess damage was dealt to a creature this way, draw a card. ({Q} is the untap symbol.)
-SVar:X:Count$CardPower
-DeckHas:Ability$Counters|Discard
+Name:Vikya, Scorching Stalwart
+ManaCost:2 W
+Types:Legendary Creature Human Warrior
+PT:2/4
+K:Training
+A:AB$ DealDamage | Cost$ 4 R Untap Discard<1/Card> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | AILogic$ PowerDmg | ExcessSVar$ Excess | SubAbility$ DBDraw | SpellDescription$ CARDNAME deals damage equal to his power to any target.
+SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ Excess | ConditionSVarCompare$ GE1 | ConditionDefined$ Targeted | ConditionPresent$ Creature | IfDesc$ True | SpellDescription$ If excess damage was dealt to a creature this way, draw a card. ({Q} is the untap symbol.)
+SVar:X:Count$CardPower
+DeckHas:Ability$Counters|Discard
 Oracle:Training (Whenever this creature attacks with another creature with greater power, put a +1/+1 counter on this creature.)\n{4}{R}, {Q}, Discard a card: Vikya, Scorching Stalwart deals damage equal to his power to any target. If excess damage was dealt to a creature this way, draw a card. ({Q} is the untap symbol.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/vindictive_flamestoker.txt b/forge-gui/res/cardsfolder/v/vindictive_flamestoker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vindictive_flamestoker.txt
rename to forge-gui/res/cardsfolder/v/vindictive_flamestoker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/viral_spawning.txt b/forge-gui/res/cardsfolder/v/viral_spawning.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/viral_spawning.txt
rename to forge-gui/res/cardsfolder/v/viral_spawning.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vishgraz_the_doomhive.txt b/forge-gui/res/cardsfolder/v/vishgraz_the_doomhive.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vishgraz_the_doomhive.txt
rename to forge-gui/res/cardsfolder/v/vishgraz_the_doomhive.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vivisection_evangelist.txt b/forge-gui/res/cardsfolder/v/vivisection_evangelist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vivisection_evangelist.txt
rename to forge-gui/res/cardsfolder/v/vivisection_evangelist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vivisurgeons_insight.txt b/forge-gui/res/cardsfolder/v/vivisurgeons_insight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vivisurgeons_insight.txt
rename to forge-gui/res/cardsfolder/v/vivisurgeons_insight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/voidwing_hybrid.txt b/forge-gui/res/cardsfolder/v/voidwing_hybrid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/voidwing_hybrid.txt
rename to forge-gui/res/cardsfolder/v/voidwing_hybrid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vraan_executioner_thane.txt b/forge-gui/res/cardsfolder/v/vraan_executioner_thane.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vraan_executioner_thane.txt
rename to forge-gui/res/cardsfolder/v/vraan_executioner_thane.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vraska_betrayals_sting.txt b/forge-gui/res/cardsfolder/v/vraska_betrayals_sting.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vraska_betrayals_sting.txt
rename to forge-gui/res/cardsfolder/v/vraska_betrayals_sting.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vraskas_fall.txt b/forge-gui/res/cardsfolder/v/vraskas_fall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vraskas_fall.txt
rename to forge-gui/res/cardsfolder/v/vraskas_fall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vulshok_factory.txt b/forge-gui/res/cardsfolder/v/vulshok_factory.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vulshok_factory.txt
rename to forge-gui/res/cardsfolder/v/vulshok_factory.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vulshok_splitter.txt b/forge-gui/res/cardsfolder/v/vulshok_splitter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vulshok_splitter.txt
rename to forge-gui/res/cardsfolder/v/vulshok_splitter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/warzone_duplicator.txt b/forge-gui/res/cardsfolder/w/warzone_duplicator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/warzone_duplicator.txt
rename to forge-gui/res/cardsfolder/w/warzone_duplicator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/watchful_blisterzoa.txt b/forge-gui/res/cardsfolder/w/watchful_blisterzoa.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/watchful_blisterzoa.txt
rename to forge-gui/res/cardsfolder/w/watchful_blisterzoa.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/whisper_of_the_dross.txt b/forge-gui/res/cardsfolder/w/whisper_of_the_dross.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/whisper_of_the_dross.txt
rename to forge-gui/res/cardsfolder/w/whisper_of_the_dross.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/white_suns_twilight.txt b/forge-gui/res/cardsfolder/w/white_suns_twilight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/white_suns_twilight.txt
rename to forge-gui/res/cardsfolder/w/white_suns_twilight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wurmquake.txt b/forge-gui/res/cardsfolder/w/wurmquake.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wurmquake.txt
rename to forge-gui/res/cardsfolder/w/wurmquake.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yotian_courier.txt b/forge-gui/res/cardsfolder/y/yotian_courier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yotian_courier.txt
rename to forge-gui/res/cardsfolder/y/yotian_courier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zealots_conviction.txt b/forge-gui/res/cardsfolder/z/zealots_conviction.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zealots_conviction.txt
rename to forge-gui/res/cardsfolder/z/zealots_conviction.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zenith_chronicler.txt b/forge-gui/res/cardsfolder/z/zenith_chronicler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zenith_chronicler.txt
rename to forge-gui/res/cardsfolder/z/zenith_chronicler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zethi_arcane_blademaster.txt b/forge-gui/res/cardsfolder/z/zethi_arcane_blademaster.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/zethi_arcane_blademaster.txt
rename to forge-gui/res/cardsfolder/z/zethi_arcane_blademaster.txt
index b62184e1ec8..1d22e90715f 100644
--- a/forge-gui/res/cardsfolder/upcoming/zethi_arcane_blademaster.txt
+++ b/forge-gui/res/cardsfolder/z/zethi_arcane_blademaster.txt
@@ -1,13 +1,13 @@
-Name:Zethi, Arcane Blademaster
-ManaCost:1 W U
-Types:Legendary Creature Human Soldier
-PT:3/3
-K:Multikicker:WU
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When NICKNAME enters the battlefield, exile up to X target instant cards from your graveyard, where X is the number of times NICKNAME was kicked. Put a kick counter on each of them.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | WithCountersType$ KICK | ValidTgts$ Instant.YouOwn | TargetMin$ 0 | TargetMax$ XKicked | TgtPrompt$ Select up to X target instant cards
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPlay | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME attacks, copy each exiled card you own with a kick counter on it. You may cast the copies.
-SVar:TrigPlay:DB$ Play | Valid$ Card.counters_GE1_KICK | ValidSA$ Spell | ValidZone$ Exile | Amount$ All | CopyCard$ True | Optional$ True
-SVar:XKicked:Count$TimesKicked
-DeckHints:Type$Instant & Ability$Discard
-DeckHas:Ability$Graveyard
+Name:Zethi, Arcane Blademaster
+ManaCost:1 W U
+Types:Legendary Creature Human Soldier
+PT:3/3
+K:Multikicker:WU
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When NICKNAME enters the battlefield, exile up to X target instant cards from your graveyard, where X is the number of times NICKNAME was kicked. Put a kick counter on each of them.
+SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | WithCountersType$ KICK | ValidTgts$ Instant.YouOwn | TargetMin$ 0 | TargetMax$ XKicked | TgtPrompt$ Select up to X target instant cards
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPlay | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME attacks, copy each exiled card you own with a kick counter on it. You may cast the copies.
+SVar:TrigPlay:DB$ Play | Valid$ Card.counters_GE1_KICK | ValidSA$ Spell | ValidZone$ Exile | Amount$ All | CopyCard$ True | Optional$ True
+SVar:XKicked:Count$TimesKicked
+DeckHints:Type$Instant & Ability$Discard
+DeckHas:Ability$Graveyard
 Oracle:Multikicker {W/U}\nWhen Zethi enters the battlefield, exile up to X target instant cards from your graveyard, where X is the number of times Zethi was kicked. Put a kick counter on each of them.\nWhenever Zethi attacks, copy each exiled card you own with a kick counter on it. You may cast the copies.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/zopandrel_hunger_dominus.txt b/forge-gui/res/cardsfolder/z/zopandrel_hunger_dominus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zopandrel_hunger_dominus.txt
rename to forge-gui/res/cardsfolder/z/zopandrel_hunger_dominus.txt