diff --git a/forge-gui/res/cardsfolder/upcoming/abominable_treefolk.txt b/forge-gui/res/cardsfolder/a/abominable_treefolk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/abominable_treefolk.txt
rename to forge-gui/res/cardsfolder/a/abominable_treefolk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alpine_guide.txt b/forge-gui/res/cardsfolder/a/alpine_guide.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alpine_guide.txt
rename to forge-gui/res/cardsfolder/a/alpine_guide.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/amorphous_axe.txt b/forge-gui/res/cardsfolder/a/amorphous_axe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/amorphous_axe.txt
rename to forge-gui/res/cardsfolder/a/amorphous_axe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/answered_prayers.txt b/forge-gui/res/cardsfolder/a/answered_prayers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/answered_prayers.txt
rename to forge-gui/res/cardsfolder/a/answered_prayers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/archmages_charm.txt b/forge-gui/res/cardsfolder/a/archmages_charm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/archmages_charm.txt
rename to forge-gui/res/cardsfolder/a/archmages_charm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arcums_astrolabe.txt b/forge-gui/res/cardsfolder/a/arcums_astrolabe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arcums_astrolabe.txt
rename to forge-gui/res/cardsfolder/a/arcums_astrolabe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aria_of_flame.txt b/forge-gui/res/cardsfolder/a/aria_of_flame.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aria_of_flame.txt
rename to forge-gui/res/cardsfolder/a/aria_of_flame.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/astral_drift.txt b/forge-gui/res/cardsfolder/a/astral_drift.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/astral_drift.txt
rename to forge-gui/res/cardsfolder/a/astral_drift.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ayula_queen_among_bears.txt b/forge-gui/res/cardsfolder/a/ayula_queen_among_bears.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ayula_queen_among_bears.txt
rename to forge-gui/res/cardsfolder/a/ayula_queen_among_bears.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ayulas_influence.txt b/forge-gui/res/cardsfolder/a/ayulas_influence.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ayulas_influence.txt
rename to forge-gui/res/cardsfolder/a/ayulas_influence.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/azra_smokeshaper.txt b/forge-gui/res/cardsfolder/a/azra_smokeshaper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/azra_smokeshaper.txt
rename to forge-gui/res/cardsfolder/a/azra_smokeshaper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bazaar_trademage.txt b/forge-gui/res/cardsfolder/b/bazaar_trademage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bazaar_trademage.txt
rename to forge-gui/res/cardsfolder/b/bazaar_trademage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bellowing_elk.txt b/forge-gui/res/cardsfolder/b/bellowing_elk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bellowing_elk.txt
rename to forge-gui/res/cardsfolder/b/bellowing_elk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/birthing_boughs.txt b/forge-gui/res/cardsfolder/b/birthing_boughs.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/birthing_boughs.txt
rename to forge-gui/res/cardsfolder/b/birthing_boughs.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bladeback_sliver.txt b/forge-gui/res/cardsfolder/b/bladeback_sliver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bladeback_sliver.txt
rename to forge-gui/res/cardsfolder/b/bladeback_sliver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blizzard_strix.txt b/forge-gui/res/cardsfolder/b/blizzard_strix.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blizzard_strix.txt
rename to forge-gui/res/cardsfolder/b/blizzard_strix.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bogardan_dragonheart.txt b/forge-gui/res/cardsfolder/b/bogardan_dragonheart.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bogardan_dragonheart.txt
rename to forge-gui/res/cardsfolder/b/bogardan_dragonheart.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cabal_therapist.txt b/forge-gui/res/cardsfolder/c/cabal_therapist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cabal_therapist.txt
rename to forge-gui/res/cardsfolder/c/cabal_therapist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cave_of_temptation.txt b/forge-gui/res/cardsfolder/c/cave_of_temptation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cave_of_temptation.txt
rename to forge-gui/res/cardsfolder/c/cave_of_temptation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/changeling_outcast.txt b/forge-gui/res/cardsfolder/c/changeling_outcast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/changeling_outcast.txt
rename to forge-gui/res/cardsfolder/c/changeling_outcast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chillerpillar.txt b/forge-gui/res/cardsfolder/c/chillerpillar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chillerpillar.txt
rename to forge-gui/res/cardsfolder/c/chillerpillar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cleaving_sliver.txt b/forge-gui/res/cardsfolder/c/cleaving_sliver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cleaving_sliver.txt
rename to forge-gui/res/cardsfolder/c/cleaving_sliver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cloudshredder_sliver.txt b/forge-gui/res/cardsfolder/c/cloudshredder_sliver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cloudshredder_sliver.txt
rename to forge-gui/res/cardsfolder/c/cloudshredder_sliver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/collected_conjuring.txt b/forge-gui/res/cardsfolder/c/collected_conjuring.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/collected_conjuring.txt
rename to forge-gui/res/cardsfolder/c/collected_conjuring.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/collector_ouphe.txt b/forge-gui/res/cardsfolder/c/collector_ouphe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/collector_ouphe.txt
rename to forge-gui/res/cardsfolder/c/collector_ouphe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/conifer_wurm.txt b/forge-gui/res/cardsfolder/c/conifer_wurm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/conifer_wurm.txt
rename to forge-gui/res/cardsfolder/c/conifer_wurm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cordial_vampire.txt b/forge-gui/res/cardsfolder/c/cordial_vampire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cordial_vampire.txt
rename to forge-gui/res/cardsfolder/c/cordial_vampire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crashing_footfalls.txt b/forge-gui/res/cardsfolder/c/crashing_footfalls.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crashing_footfalls.txt
rename to forge-gui/res/cardsfolder/c/crashing_footfalls.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cunning_evasion.txt b/forge-gui/res/cardsfolder/c/cunning_evasion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cunning_evasion.txt
rename to forge-gui/res/cardsfolder/c/cunning_evasion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dead_of_winter.txt b/forge-gui/res/cardsfolder/d/dead_of_winter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dead_of_winter.txt
rename to forge-gui/res/cardsfolder/d/dead_of_winter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deep_forest_hermit.txt b/forge-gui/res/cardsfolder/d/deep_forest_hermit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deep_forest_hermit.txt
rename to forge-gui/res/cardsfolder/d/deep_forest_hermit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/defile.txt b/forge-gui/res/cardsfolder/d/defile.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/defile.txt
rename to forge-gui/res/cardsfolder/d/defile.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dregscape_sliver.txt b/forge-gui/res/cardsfolder/d/dregscape_sliver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dregscape_sliver.txt
rename to forge-gui/res/cardsfolder/d/dregscape_sliver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/echo_of_eons.txt b/forge-gui/res/cardsfolder/e/echo_of_eons.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/echo_of_eons.txt
rename to forge-gui/res/cardsfolder/e/echo_of_eons.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/endling.txt b/forge-gui/res/cardsfolder/e/endling.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/endling.txt
rename to forge-gui/res/cardsfolder/e/endling.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/enduring_sliver.txt b/forge-gui/res/cardsfolder/e/enduring_sliver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/enduring_sliver.txt
rename to forge-gui/res/cardsfolder/e/enduring_sliver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ephemerate.txt b/forge-gui/res/cardsfolder/e/ephemerate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ephemerate.txt
rename to forge-gui/res/cardsfolder/e/ephemerate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/etchings_of_the_chosen.txt b/forge-gui/res/cardsfolder/e/etchings_of_the_chosen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/etchings_of_the_chosen.txt
rename to forge-gui/res/cardsfolder/e/etchings_of_the_chosen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/everdream.txt b/forge-gui/res/cardsfolder/e/everdream.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/everdream.txt
rename to forge-gui/res/cardsfolder/e/everdream.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/excavating_anurid.txt b/forge-gui/res/cardsfolder/e/excavating_anurid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/excavating_anurid.txt
rename to forge-gui/res/cardsfolder/e/excavating_anurid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eyekite.txt b/forge-gui/res/cardsfolder/e/eyekite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eyekite.txt
rename to forge-gui/res/cardsfolder/e/eyekite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/face_of_divinity.txt b/forge-gui/res/cardsfolder/f/face_of_divinity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/face_of_divinity.txt
rename to forge-gui/res/cardsfolder/f/face_of_divinity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/faerie_seer.txt b/forge-gui/res/cardsfolder/f/faerie_seer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/faerie_seer.txt
rename to forge-gui/res/cardsfolder/f/faerie_seer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fallen_shinobi.txt b/forge-gui/res/cardsfolder/f/fallen_shinobi.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fallen_shinobi.txt
rename to forge-gui/res/cardsfolder/f/fallen_shinobi.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/farmstead_gleaner.txt b/forge-gui/res/cardsfolder/f/farmstead_gleaner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/farmstead_gleaner.txt
rename to forge-gui/res/cardsfolder/f/farmstead_gleaner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/feaster_of_fools.txt b/forge-gui/res/cardsfolder/f/feaster_of_fools.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/feaster_of_fools.txt
rename to forge-gui/res/cardsfolder/f/feaster_of_fools.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fiery_islet.txt b/forge-gui/res/cardsfolder/f/fiery_islet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fiery_islet.txt
rename to forge-gui/res/cardsfolder/f/fiery_islet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/first_slivers_chosen.txt b/forge-gui/res/cardsfolder/f/first_slivers_chosen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/first_slivers_chosen.txt
rename to forge-gui/res/cardsfolder/f/first_slivers_chosen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/first_sphere_gargantua.txt b/forge-gui/res/cardsfolder/f/first_sphere_gargantua.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/first_sphere_gargantua.txt
rename to forge-gui/res/cardsfolder/f/first_sphere_gargantua.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fists_of_flame.txt b/forge-gui/res/cardsfolder/f/fists_of_flame.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fists_of_flame.txt
rename to forge-gui/res/cardsfolder/f/fists_of_flame.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/force_of_despair.txt b/forge-gui/res/cardsfolder/f/force_of_despair.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/force_of_despair.txt
rename to forge-gui/res/cardsfolder/f/force_of_despair.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/force_of_negation.txt b/forge-gui/res/cardsfolder/f/force_of_negation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/force_of_negation.txt
rename to forge-gui/res/cardsfolder/f/force_of_negation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/force_of_rage.txt b/forge-gui/res/cardsfolder/f/force_of_rage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/force_of_rage.txt
rename to forge-gui/res/cardsfolder/f/force_of_rage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/force_of_vigor.txt b/forge-gui/res/cardsfolder/f/force_of_vigor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/force_of_vigor.txt
rename to forge-gui/res/cardsfolder/f/force_of_vigor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/force_of_virtue.txt b/forge-gui/res/cardsfolder/f/force_of_virtue.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/force_of_virtue.txt
rename to forge-gui/res/cardsfolder/f/force_of_virtue.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fountain_of_ichor.txt b/forge-gui/res/cardsfolder/f/fountain_of_ichor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fountain_of_ichor.txt
rename to forge-gui/res/cardsfolder/f/fountain_of_ichor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frostwalk_bastion.txt b/forge-gui/res/cardsfolder/f/frostwalk_bastion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frostwalk_bastion.txt
rename to forge-gui/res/cardsfolder/f/frostwalk_bastion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frostwalla.txt b/forge-gui/res/cardsfolder/f/frostwalla.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frostwalla.txt
rename to forge-gui/res/cardsfolder/f/frostwalla.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/generous_gift.txt b/forge-gui/res/cardsfolder/g/generous_gift.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/generous_gift.txt
rename to forge-gui/res/cardsfolder/g/generous_gift.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/geomancers_gambit.txt b/forge-gui/res/cardsfolder/g/geomancers_gambit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/geomancers_gambit.txt
rename to forge-gui/res/cardsfolder/g/geomancers_gambit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/giver_of_runes.txt b/forge-gui/res/cardsfolder/g/giver_of_runes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/giver_of_runes.txt
rename to forge-gui/res/cardsfolder/g/giver_of_runes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glacial_revelation.txt b/forge-gui/res/cardsfolder/g/glacial_revelation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glacial_revelation.txt
rename to forge-gui/res/cardsfolder/g/glacial_revelation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gluttonous_slug.txt b/forge-gui/res/cardsfolder/g/gluttonous_slug.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gluttonous_slug.txt
rename to forge-gui/res/cardsfolder/g/gluttonous_slug.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goatnap.txt b/forge-gui/res/cardsfolder/g/goatnap.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goatnap.txt
rename to forge-gui/res/cardsfolder/g/goatnap.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_champion.txt b/forge-gui/res/cardsfolder/g/goblin_champion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goblin_champion.txt
rename to forge-gui/res/cardsfolder/g/goblin_champion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_engineer.txt b/forge-gui/res/cardsfolder/g/goblin_engineer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goblin_engineer.txt
rename to forge-gui/res/cardsfolder/g/goblin_engineer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_oriflamme.txt b/forge-gui/res/cardsfolder/g/goblin_oriflamme.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goblin_oriflamme.txt
rename to forge-gui/res/cardsfolder/g/goblin_oriflamme.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_war_party.txt b/forge-gui/res/cardsfolder/g/goblin_war_party.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goblin_war_party.txt
rename to forge-gui/res/cardsfolder/g/goblin_war_party.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/good_fortune_unicorn.txt b/forge-gui/res/cardsfolder/g/good_fortune_unicorn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/good_fortune_unicorn.txt
rename to forge-gui/res/cardsfolder/g/good_fortune_unicorn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/graveshifter.txt b/forge-gui/res/cardsfolder/g/graveshifter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/graveshifter.txt
rename to forge-gui/res/cardsfolder/g/graveshifter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hall_of_heliods_generosity.txt b/forge-gui/res/cardsfolder/h/hall_of_heliods_generosity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hall_of_heliods_generosity.txt
rename to forge-gui/res/cardsfolder/h/hall_of_heliods_generosity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/headless_specter.txt b/forge-gui/res/cardsfolder/h/headless_specter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/headless_specter.txt
rename to forge-gui/res/cardsfolder/h/headless_specter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hexdrinker.txt b/forge-gui/res/cardsfolder/h/hexdrinker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hexdrinker.txt
rename to forge-gui/res/cardsfolder/h/hexdrinker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hogaak_arisen_necropolis.txt b/forge-gui/res/cardsfolder/h/hogaak_arisen_necropolis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hogaak_arisen_necropolis.txt
rename to forge-gui/res/cardsfolder/h/hogaak_arisen_necropolis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hollowhead_sliver.txt b/forge-gui/res/cardsfolder/h/hollowhead_sliver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hollowhead_sliver.txt
rename to forge-gui/res/cardsfolder/h/hollowhead_sliver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ice_fang_coatl.txt b/forge-gui/res/cardsfolder/i/ice_fang_coatl.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ice_fang_coatl.txt
rename to forge-gui/res/cardsfolder/i/ice_fang_coatl.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/iceberg_cancrix.txt b/forge-gui/res/cardsfolder/i/iceberg_cancrix.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/iceberg_cancrix.txt
rename to forge-gui/res/cardsfolder/i/iceberg_cancrix.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/icehide_golem.txt b/forge-gui/res/cardsfolder/i/icehide_golem.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/icehide_golem.txt
rename to forge-gui/res/cardsfolder/i/icehide_golem.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/igneous_elemental.txt b/forge-gui/res/cardsfolder/i/igneous_elemental.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/igneous_elemental.txt
rename to forge-gui/res/cardsfolder/i/igneous_elemental.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/impostor_of_the_sixth_pride.txt b/forge-gui/res/cardsfolder/i/impostor_of_the_sixth_pride.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/impostor_of_the_sixth_pride.txt
rename to forge-gui/res/cardsfolder/i/impostor_of_the_sixth_pride.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ingenious_infiltrator.txt b/forge-gui/res/cardsfolder/i/ingenious_infiltrator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ingenious_infiltrator.txt
rename to forge-gui/res/cardsfolder/i/ingenious_infiltrator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/irregular_cohort.txt b/forge-gui/res/cardsfolder/i/irregular_cohort.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/irregular_cohort.txt
rename to forge-gui/res/cardsfolder/i/irregular_cohort.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kayas_guile.txt b/forge-gui/res/cardsfolder/k/kayas_guile.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kayas_guile.txt
rename to forge-gui/res/cardsfolder/k/kayas_guile.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/king_of_the_pride.txt b/forge-gui/res/cardsfolder/k/king_of_the_pride.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/king_of_the_pride.txt
rename to forge-gui/res/cardsfolder/k/king_of_the_pride.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_old_benalia.txt b/forge-gui/res/cardsfolder/k/knight_of_old_benalia.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/knight_of_old_benalia.txt
rename to forge-gui/res/cardsfolder/k/knight_of_old_benalia.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lancer_sliver.txt b/forge-gui/res/cardsfolder/l/lancer_sliver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lancer_sliver.txt
rename to forge-gui/res/cardsfolder/l/lancer_sliver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lavabelly_sliver.txt b/forge-gui/res/cardsfolder/l/lavabelly_sliver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lavabelly_sliver.txt
rename to forge-gui/res/cardsfolder/l/lavabelly_sliver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lesser_masticore.txt b/forge-gui/res/cardsfolder/l/lesser_masticore.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lesser_masticore.txt
rename to forge-gui/res/cardsfolder/l/lesser_masticore.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lightning_skelemental.txt b/forge-gui/res/cardsfolder/l/lightning_skelemental.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lightning_skelemental.txt
rename to forge-gui/res/cardsfolder/l/lightning_skelemental.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/llanowar_tribe.txt b/forge-gui/res/cardsfolder/l/llanowar_tribe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/llanowar_tribe.txt
rename to forge-gui/res/cardsfolder/l/llanowar_tribe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/magmatic_sinkhole.txt b/forge-gui/res/cardsfolder/m/magmatic_sinkhole.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/magmatic_sinkhole.txt
rename to forge-gui/res/cardsfolder/m/magmatic_sinkhole.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/marit_lages_slumber.txt b/forge-gui/res/cardsfolder/m/marit_lages_slumber.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/marit_lages_slumber.txt
rename to forge-gui/res/cardsfolder/m/marit_lages_slumber.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/martyrs_soul.txt b/forge-gui/res/cardsfolder/m/martyrs_soul.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/martyrs_soul.txt
rename to forge-gui/res/cardsfolder/m/martyrs_soul.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mind_rake.txt b/forge-gui/res/cardsfolder/m/mind_rake.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mind_rake.txt
rename to forge-gui/res/cardsfolder/m/mind_rake.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mirrodin_besieged.txt b/forge-gui/res/cardsfolder/m/mirrodin_besieged.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mirrodin_besieged.txt
rename to forge-gui/res/cardsfolder/m/mirrodin_besieged.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mist_syndicate_naga.txt b/forge-gui/res/cardsfolder/m/mist_syndicate_naga.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mist_syndicate_naga.txt
rename to forge-gui/res/cardsfolder/m/mist_syndicate_naga.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mob.txt b/forge-gui/res/cardsfolder/m/mob.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mob.txt
rename to forge-gui/res/cardsfolder/m/mob.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/moonblade_shinobi.txt b/forge-gui/res/cardsfolder/m/moonblade_shinobi.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/moonblade_shinobi.txt
rename to forge-gui/res/cardsfolder/m/moonblade_shinobi.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/morophon_the_boundless.txt b/forge-gui/res/cardsfolder/m/morophon_the_boundless.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/morophon_the_boundless.txt
rename to forge-gui/res/cardsfolder/m/morophon_the_boundless.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mother_bear.txt b/forge-gui/res/cardsfolder/m/mother_bear.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mother_bear.txt
rename to forge-gui/res/cardsfolder/m/mother_bear.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mox_tantalite.txt b/forge-gui/res/cardsfolder/m/mox_tantalite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mox_tantalite.txt
rename to forge-gui/res/cardsfolder/m/mox_tantalite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/munitions_expert.txt b/forge-gui/res/cardsfolder/m/munitions_expert.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/munitions_expert.txt
rename to forge-gui/res/cardsfolder/m/munitions_expert.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/murasa_behemoth.txt b/forge-gui/res/cardsfolder/m/murasa_behemoth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/murasa_behemoth.txt
rename to forge-gui/res/cardsfolder/m/murasa_behemoth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/natures_chant.txt b/forge-gui/res/cardsfolder/n/natures_chant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/natures_chant.txt
rename to forge-gui/res/cardsfolder/n/natures_chant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ninja_of_the_new_moon.txt b/forge-gui/res/cardsfolder/n/ninja_of_the_new_moon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ninja_of_the_new_moon.txt
rename to forge-gui/res/cardsfolder/n/ninja_of_the_new_moon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nurturing_peatland.txt b/forge-gui/res/cardsfolder/n/nurturing_peatland.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nurturing_peatland.txt
rename to forge-gui/res/cardsfolder/n/nurturing_peatland.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/on_thin_ice.txt b/forge-gui/res/cardsfolder/o/on_thin_ice.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/on_thin_ice.txt
rename to forge-gui/res/cardsfolder/o/on_thin_ice.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/oneirophage.txt b/forge-gui/res/cardsfolder/o/oneirophage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/oneirophage.txt
rename to forge-gui/res/cardsfolder/o/oneirophage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/orcish_hellraiser.txt b/forge-gui/res/cardsfolder/o/orcish_hellraiser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/orcish_hellraiser.txt
rename to forge-gui/res/cardsfolder/o/orcish_hellraiser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ore_scale_guardian.txt b/forge-gui/res/cardsfolder/o/ore_scale_guardian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ore_scale_guardian.txt
rename to forge-gui/res/cardsfolder/o/ore_scale_guardian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pashalik_mons.txt b/forge-gui/res/cardsfolder/p/pashalik_mons.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pashalik_mons.txt
rename to forge-gui/res/cardsfolder/p/pashalik_mons.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phantasmal_form.txt b/forge-gui/res/cardsfolder/p/phantasmal_form.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phantasmal_form.txt
rename to forge-gui/res/cardsfolder/p/phantasmal_form.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phantom_ninja.txt b/forge-gui/res/cardsfolder/p/phantom_ninja.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phantom_ninja.txt
rename to forge-gui/res/cardsfolder/p/phantom_ninja.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/plague_engineer.txt b/forge-gui/res/cardsfolder/p/plague_engineer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/plague_engineer.txt
rename to forge-gui/res/cardsfolder/p/plague_engineer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/planebound_accomplice.txt b/forge-gui/res/cardsfolder/p/planebound_accomplice.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/planebound_accomplice.txt
rename to forge-gui/res/cardsfolder/p/planebound_accomplice.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pondering_mage.txt b/forge-gui/res/cardsfolder/p/pondering_mage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pondering_mage.txt
rename to forge-gui/res/cardsfolder/p/pondering_mage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prismatic_vista.txt b/forge-gui/res/cardsfolder/p/prismatic_vista.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prismatic_vista.txt
rename to forge-gui/res/cardsfolder/p/prismatic_vista.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/putrid_goblin.txt b/forge-gui/res/cardsfolder/p/putrid_goblin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/putrid_goblin.txt
rename to forge-gui/res/cardsfolder/p/putrid_goblin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pyrophobia.txt b/forge-gui/res/cardsfolder/p/pyrophobia.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pyrophobia.txt
rename to forge-gui/res/cardsfolder/p/pyrophobia.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quakefoot_cyclops.txt b/forge-gui/res/cardsfolder/q/quakefoot_cyclops.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quakefoot_cyclops.txt
rename to forge-gui/res/cardsfolder/q/quakefoot_cyclops.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rain_of_revelation.txt b/forge-gui/res/cardsfolder/r/rain_of_revelation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rain_of_revelation.txt
rename to forge-gui/res/cardsfolder/r/rain_of_revelation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ranger_captain_of_eos.txt b/forge-gui/res/cardsfolder/r/ranger_captain_of_eos.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ranger_captain_of_eos.txt
rename to forge-gui/res/cardsfolder/r/ranger_captain_of_eos.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rank_officer.txt b/forge-gui/res/cardsfolder/r/rank_officer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rank_officer.txt
rename to forge-gui/res/cardsfolder/r/rank_officer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ransack_the_lab.txt b/forge-gui/res/cardsfolder/r/ransack_the_lab.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ransack_the_lab.txt
rename to forge-gui/res/cardsfolder/r/ransack_the_lab.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ravenous_giant.txt b/forge-gui/res/cardsfolder/r/ravenous_giant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ravenous_giant.txt
rename to forge-gui/res/cardsfolder/r/ravenous_giant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reap_the_past.txt b/forge-gui/res/cardsfolder/r/reap_the_past.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reap_the_past.txt
rename to forge-gui/res/cardsfolder/r/reap_the_past.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/recruit_the_worthy.txt b/forge-gui/res/cardsfolder/r/recruit_the_worthy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/recruit_the_worthy.txt
rename to forge-gui/res/cardsfolder/r/recruit_the_worthy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reprobation.txt b/forge-gui/res/cardsfolder/r/reprobation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reprobation.txt
rename to forge-gui/res/cardsfolder/r/reprobation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/return_from_extinction.txt b/forge-gui/res/cardsfolder/r/return_from_extinction.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/return_from_extinction.txt
rename to forge-gui/res/cardsfolder/r/return_from_extinction.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rhox_veteran.txt b/forge-gui/res/cardsfolder/r/rhox_veteran.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rhox_veteran.txt
rename to forge-gui/res/cardsfolder/r/rhox_veteran.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rime_tender.txt b/forge-gui/res/cardsfolder/r/rime_tender.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rime_tender.txt
rename to forge-gui/res/cardsfolder/r/rime_tender.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rotwidow_pack.txt b/forge-gui/res/cardsfolder/r/rotwidow_pack.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rotwidow_pack.txt
rename to forge-gui/res/cardsfolder/r/rotwidow_pack.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ruination_rioter.txt b/forge-gui/res/cardsfolder/r/ruination_rioter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ruination_rioter.txt
rename to forge-gui/res/cardsfolder/r/ruination_rioter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/saddled_rimestag.txt b/forge-gui/res/cardsfolder/s/saddled_rimestag.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/saddled_rimestag.txt
rename to forge-gui/res/cardsfolder/s/saddled_rimestag.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sadistic_obsession.txt b/forge-gui/res/cardsfolder/s/sadistic_obsession.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sadistic_obsession.txt
rename to forge-gui/res/cardsfolder/s/sadistic_obsession.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/savage_swipe.txt b/forge-gui/res/cardsfolder/s/savage_swipe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/savage_swipe.txt
rename to forge-gui/res/cardsfolder/s/savage_swipe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scale_up.txt b/forge-gui/res/cardsfolder/s/scale_up.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scale_up.txt
rename to forge-gui/res/cardsfolder/s/scale_up.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scour_all_possibilities.txt b/forge-gui/res/cardsfolder/s/scour_all_possibilities.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scour_all_possibilities.txt
rename to forge-gui/res/cardsfolder/s/scour_all_possibilities.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scrapyard_recombiner.txt b/forge-gui/res/cardsfolder/s/scrapyard_recombiner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scrapyard_recombiner.txt
rename to forge-gui/res/cardsfolder/s/scrapyard_recombiner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scuttling_sliver.txt b/forge-gui/res/cardsfolder/s/scuttling_sliver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scuttling_sliver.txt
rename to forge-gui/res/cardsfolder/s/scuttling_sliver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seasoned_pyromancer.txt b/forge-gui/res/cardsfolder/s/seasoned_pyromancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seasoned_pyromancer.txt
rename to forge-gui/res/cardsfolder/s/seasoned_pyromancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/segovian_angel.txt b/forge-gui/res/cardsfolder/s/segovian_angel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/segovian_angel.txt
rename to forge-gui/res/cardsfolder/s/segovian_angel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/serra_the_benevolent.txt b/forge-gui/res/cardsfolder/s/serra_the_benevolent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/serra_the_benevolent.txt
rename to forge-gui/res/cardsfolder/s/serra_the_benevolent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/settle_beyond_reality.txt b/forge-gui/res/cardsfolder/s/settle_beyond_reality.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/settle_beyond_reality.txt
rename to forge-gui/res/cardsfolder/s/settle_beyond_reality.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shatter_assumptions.txt b/forge-gui/res/cardsfolder/s/shatter_assumptions.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shatter_assumptions.txt
rename to forge-gui/res/cardsfolder/s/shatter_assumptions.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shenanigans.txt b/forge-gui/res/cardsfolder/s/shenanigans.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shenanigans.txt
rename to forge-gui/res/cardsfolder/s/shenanigans.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/silent_clearing.txt b/forge-gui/res/cardsfolder/s/silent_clearing.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/silent_clearing.txt
rename to forge-gui/res/cardsfolder/s/silent_clearing.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/silumgar_scavenger.txt b/forge-gui/res/cardsfolder/s/silumgar_scavenger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/silumgar_scavenger.txt
rename to forge-gui/res/cardsfolder/s/silumgar_scavenger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sisay_weatherlight_captain.txt b/forge-gui/res/cardsfolder/s/sisay_weatherlight_captain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sisay_weatherlight_captain.txt
rename to forge-gui/res/cardsfolder/s/sisay_weatherlight_captain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sling_gang_lieutenant.txt b/forge-gui/res/cardsfolder/s/sling_gang_lieutenant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sling_gang_lieutenant.txt
rename to forge-gui/res/cardsfolder/s/sling_gang_lieutenant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/smiting_helix.txt b/forge-gui/res/cardsfolder/s/smiting_helix.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/smiting_helix.txt
rename to forge-gui/res/cardsfolder/s/smiting_helix.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/smoke_shroud.txt b/forge-gui/res/cardsfolder/s/smoke_shroud.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/smoke_shroud.txt
rename to forge-gui/res/cardsfolder/s/smoke_shroud.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soul_strike_technique.txt b/forge-gui/res/cardsfolder/s/soul_strike_technique.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soul_strike_technique.txt
rename to forge-gui/res/cardsfolder/s/soul_strike_technique.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soulherder.txt b/forge-gui/res/cardsfolder/s/soulherder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soulherder.txt
rename to forge-gui/res/cardsfolder/s/soulherder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spell_snuff.txt b/forge-gui/res/cardsfolder/s/spell_snuff.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spell_snuff.txt
rename to forge-gui/res/cardsfolder/s/spell_snuff.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spinehorn_minotaur.txt b/forge-gui/res/cardsfolder/s/spinehorn_minotaur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spinehorn_minotaur.txt
rename to forge-gui/res/cardsfolder/s/spinehorn_minotaur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spiteful_sliver.txt b/forge-gui/res/cardsfolder/s/spiteful_sliver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spiteful_sliver.txt
rename to forge-gui/res/cardsfolder/s/spiteful_sliver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/splicers_skill.txt b/forge-gui/res/cardsfolder/s/splicers_skill.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/splicers_skill.txt
rename to forge-gui/res/cardsfolder/s/splicers_skill.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/springbloom_druid.txt b/forge-gui/res/cardsfolder/s/springbloom_druid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/springbloom_druid.txt
rename to forge-gui/res/cardsfolder/s/springbloom_druid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stirring_address.txt b/forge-gui/res/cardsfolder/s/stirring_address.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stirring_address.txt
rename to forge-gui/res/cardsfolder/s/stirring_address.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stream_of_thought.txt b/forge-gui/res/cardsfolder/s/stream_of_thought.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stream_of_thought.txt
rename to forge-gui/res/cardsfolder/s/stream_of_thought.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/string_of_disappearances.txt b/forge-gui/res/cardsfolder/s/string_of_disappearances.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/string_of_disappearances.txt
rename to forge-gui/res/cardsfolder/s/string_of_disappearances.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sunbaked_canyon.txt b/forge-gui/res/cardsfolder/s/sunbaked_canyon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sunbaked_canyon.txt
rename to forge-gui/res/cardsfolder/s/sunbaked_canyon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sword_of_sinew_and_steel.txt b/forge-gui/res/cardsfolder/s/sword_of_sinew_and_steel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sword_of_sinew_and_steel.txt
rename to forge-gui/res/cardsfolder/s/sword_of_sinew_and_steel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sword_of_truth_and_justice.txt b/forge-gui/res/cardsfolder/s/sword_of_truth_and_justice.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sword_of_truth_and_justice.txt
rename to forge-gui/res/cardsfolder/s/sword_of_truth_and_justice.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/talisman_of_conviction.txt b/forge-gui/res/cardsfolder/t/talisman_of_conviction.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/talisman_of_conviction.txt
rename to forge-gui/res/cardsfolder/t/talisman_of_conviction.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/talisman_of_creativity.txt b/forge-gui/res/cardsfolder/t/talisman_of_creativity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/talisman_of_creativity.txt
rename to forge-gui/res/cardsfolder/t/talisman_of_creativity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/talisman_of_curiosity.txt b/forge-gui/res/cardsfolder/t/talisman_of_curiosity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/talisman_of_curiosity.txt
rename to forge-gui/res/cardsfolder/t/talisman_of_curiosity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/talisman_of_hierarchy.txt b/forge-gui/res/cardsfolder/t/talisman_of_hierarchy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/talisman_of_hierarchy.txt
rename to forge-gui/res/cardsfolder/t/talisman_of_hierarchy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/talisman_of_resilience.txt b/forge-gui/res/cardsfolder/t/talisman_of_resilience.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/talisman_of_resilience.txt
rename to forge-gui/res/cardsfolder/t/talisman_of_resilience.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tectonic_reformation.txt b/forge-gui/res/cardsfolder/t/tectonic_reformation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tectonic_reformation.txt
rename to forge-gui/res/cardsfolder/t/tectonic_reformation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tempered_sliver.txt b/forge-gui/res/cardsfolder/t/tempered_sliver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tempered_sliver.txt
rename to forge-gui/res/cardsfolder/t/tempered_sliver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_first_sliver.txt b/forge-gui/res/cardsfolder/t/the_first_sliver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_first_sliver.txt
rename to forge-gui/res/cardsfolder/t/the_first_sliver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thornado.txt b/forge-gui/res/cardsfolder/t/thornado.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thornado.txt
rename to forge-gui/res/cardsfolder/t/thornado.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/throatseeker.txt b/forge-gui/res/cardsfolder/t/throatseeker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/throatseeker.txt
rename to forge-gui/res/cardsfolder/t/throatseeker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/throes_of_chaos.txt b/forge-gui/res/cardsfolder/t/throes_of_chaos.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/throes_of_chaos.txt
rename to forge-gui/res/cardsfolder/t/throes_of_chaos.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thundering_djinn.txt b/forge-gui/res/cardsfolder/t/thundering_djinn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thundering_djinn.txt
rename to forge-gui/res/cardsfolder/t/thundering_djinn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/treefolk_umbra.txt b/forge-gui/res/cardsfolder/t/treefolk_umbra.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/treefolk_umbra.txt
rename to forge-gui/res/cardsfolder/t/treefolk_umbra.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/treetop_ambusher.txt b/forge-gui/res/cardsfolder/t/treetop_ambusher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/treetop_ambusher.txt
rename to forge-gui/res/cardsfolder/t/treetop_ambusher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tribute_mage.txt b/forge-gui/res/cardsfolder/t/tribute_mage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tribute_mage.txt
rename to forge-gui/res/cardsfolder/t/tribute_mage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/trumpeting_herd.txt b/forge-gui/res/cardsfolder/t/trumpeting_herd.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/trumpeting_herd.txt
rename to forge-gui/res/cardsfolder/t/trumpeting_herd.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/trustworthy_scout.txt b/forge-gui/res/cardsfolder/t/trustworthy_scout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/trustworthy_scout.txt
rename to forge-gui/res/cardsfolder/t/trustworthy_scout.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/twin_silk_spider.txt b/forge-gui/res/cardsfolder/t/twin_silk_spider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/twin_silk_spider.txt
rename to forge-gui/res/cardsfolder/t/twin_silk_spider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/twisted_reflection.txt b/forge-gui/res/cardsfolder/t/twisted_reflection.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/twisted_reflection.txt
rename to forge-gui/res/cardsfolder/t/twisted_reflection.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/umezawas_charm.txt b/forge-gui/res/cardsfolder/u/umezawas_charm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/umezawas_charm.txt
rename to forge-gui/res/cardsfolder/u/umezawas_charm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unbound_flourishing.txt b/forge-gui/res/cardsfolder/u/unbound_flourishing.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unbound_flourishing.txt
rename to forge-gui/res/cardsfolder/u/unbound_flourishing.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/undead_augur.txt b/forge-gui/res/cardsfolder/u/undead_augur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/undead_augur.txt
rename to forge-gui/res/cardsfolder/u/undead_augur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/universal_automaton.txt b/forge-gui/res/cardsfolder/u/universal_automaton.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/universal_automaton.txt
rename to forge-gui/res/cardsfolder/u/universal_automaton.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unsettled_mariner.txt b/forge-gui/res/cardsfolder/u/unsettled_mariner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unsettled_mariner.txt
rename to forge-gui/res/cardsfolder/u/unsettled_mariner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/urza_lord_high_artificer.txt b/forge-gui/res/cardsfolder/u/urza_lord_high_artificer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/urza_lord_high_artificer.txt
rename to forge-gui/res/cardsfolder/u/urza_lord_high_artificer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/valiant_changeling.txt b/forge-gui/res/cardsfolder/v/valiant_changeling.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/valiant_changeling.txt
rename to forge-gui/res/cardsfolder/v/valiant_changeling.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vengeful_devil.txt b/forge-gui/res/cardsfolder/v/vengeful_devil.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vengeful_devil.txt
rename to forge-gui/res/cardsfolder/v/vengeful_devil.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/venomous_changeling.txt b/forge-gui/res/cardsfolder/v/venomous_changeling.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/venomous_changeling.txt
rename to forge-gui/res/cardsfolder/v/venomous_changeling.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vesperlark.txt b/forge-gui/res/cardsfolder/v/vesperlark.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vesperlark.txt
rename to forge-gui/res/cardsfolder/v/vesperlark.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/viashino_sandsprinter.txt b/forge-gui/res/cardsfolder/v/viashino_sandsprinter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/viashino_sandsprinter.txt
rename to forge-gui/res/cardsfolder/v/viashino_sandsprinter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/volatile_claws.txt b/forge-gui/res/cardsfolder/v/volatile_claws.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/volatile_claws.txt
rename to forge-gui/res/cardsfolder/v/volatile_claws.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wall_of_one_thousand_cuts.txt b/forge-gui/res/cardsfolder/w/wall_of_one_thousand_cuts.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wall_of_one_thousand_cuts.txt
rename to forge-gui/res/cardsfolder/w/wall_of_one_thousand_cuts.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/warteye_witch.txt b/forge-gui/res/cardsfolder/w/warteye_witch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/warteye_witch.txt
rename to forge-gui/res/cardsfolder/w/warteye_witch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/watcher_for_tomorrow.txt b/forge-gui/res/cardsfolder/w/watcher_for_tomorrow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/watcher_for_tomorrow.txt
rename to forge-gui/res/cardsfolder/w/watcher_for_tomorrow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/waterlogged_grove.txt b/forge-gui/res/cardsfolder/w/waterlogged_grove.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/waterlogged_grove.txt
rename to forge-gui/res/cardsfolder/w/waterlogged_grove.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/weather_the_storm.txt b/forge-gui/res/cardsfolder/w/weather_the_storm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/weather_the_storm.txt
rename to forge-gui/res/cardsfolder/w/weather_the_storm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/webweaver_changeling.txt b/forge-gui/res/cardsfolder/w/webweaver_changeling.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/webweaver_changeling.txt
rename to forge-gui/res/cardsfolder/w/webweaver_changeling.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/windcaller_aven.txt b/forge-gui/res/cardsfolder/w/windcaller_aven.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/windcaller_aven.txt
rename to forge-gui/res/cardsfolder/w/windcaller_aven.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/winding_way.txt b/forge-gui/res/cardsfolder/w/winding_way.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/winding_way.txt
rename to forge-gui/res/cardsfolder/w/winding_way.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/winds_of_abandon.txt b/forge-gui/res/cardsfolder/w/winds_of_abandon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/winds_of_abandon.txt
rename to forge-gui/res/cardsfolder/w/winds_of_abandon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/winters_rest.txt b/forge-gui/res/cardsfolder/w/winters_rest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/winters_rest.txt
rename to forge-gui/res/cardsfolder/w/winters_rest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wrenn_and_six.txt b/forge-gui/res/cardsfolder/w/wrenn_and_six.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wrenn_and_six.txt
rename to forge-gui/res/cardsfolder/w/wrenn_and_six.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yawgmoth_thran_physician.txt b/forge-gui/res/cardsfolder/y/yawgmoth_thran_physician.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yawgmoth_thran_physician.txt
rename to forge-gui/res/cardsfolder/y/yawgmoth_thran_physician.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zhalfirin_decoy.txt b/forge-gui/res/cardsfolder/z/zhalfirin_decoy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zhalfirin_decoy.txt
rename to forge-gui/res/cardsfolder/z/zhalfirin_decoy.txt