diff --git a/forge-gui/res/cardsfolder/upcoming/aeromunculus.txt b/forge-gui/res/cardsfolder/a/aeromunculus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aeromunculus.txt
rename to forge-gui/res/cardsfolder/a/aeromunculus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/amplifire.txt b/forge-gui/res/cardsfolder/a/amplifire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/amplifire.txt
rename to forge-gui/res/cardsfolder/a/amplifire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/angel_of_grace.txt b/forge-gui/res/cardsfolder/a/angel_of_grace.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/angel_of_grace.txt
rename to forge-gui/res/cardsfolder/a/angel_of_grace.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/angelic_exaltation.txt b/forge-gui/res/cardsfolder/a/angelic_exaltation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/angelic_exaltation.txt
rename to forge-gui/res/cardsfolder/a/angelic_exaltation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/applied_biomancy.txt b/forge-gui/res/cardsfolder/a/applied_biomancy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/applied_biomancy.txt
rename to forge-gui/res/cardsfolder/a/applied_biomancy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/archway_angel.txt b/forge-gui/res/cardsfolder/a/archway_angel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/archway_angel.txt
rename to forge-gui/res/cardsfolder/a/archway_angel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arresters_admonition.txt b/forge-gui/res/cardsfolder/a/arresters_admonition.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arresters_admonition.txt
rename to forge-gui/res/cardsfolder/a/arresters_admonition.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arresters_zeal.txt b/forge-gui/res/cardsfolder/a/arresters_zeal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arresters_zeal.txt
rename to forge-gui/res/cardsfolder/a/arresters_zeal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/awaken_the_erstwhile.txt b/forge-gui/res/cardsfolder/a/awaken_the_erstwhile.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/awaken_the_erstwhile.txt
rename to forge-gui/res/cardsfolder/a/awaken_the_erstwhile.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/axebane_beast.txt b/forge-gui/res/cardsfolder/a/axebane_beast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/axebane_beast.txt
rename to forge-gui/res/cardsfolder/a/axebane_beast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/azorius_knight_arbiter.txt b/forge-gui/res/cardsfolder/a/azorius_knight_arbiter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/azorius_knight_arbiter.txt
rename to forge-gui/res/cardsfolder/a/azorius_knight_arbiter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/azorius_locket.txt b/forge-gui/res/cardsfolder/a/azorius_locket.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/azorius_locket.txt
rename to forge-gui/res/cardsfolder/a/azorius_locket.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/azorius_skyguard.txt b/forge-gui/res/cardsfolder/a/azorius_skyguard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/azorius_skyguard.txt
rename to forge-gui/res/cardsfolder/a/azorius_skyguard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bankrupt_in_blood.txt b/forge-gui/res/cardsfolder/b/bankrupt_in_blood.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bankrupt_in_blood.txt
rename to forge-gui/res/cardsfolder/b/bankrupt_in_blood.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/basilica_bell_haunt.txt b/forge-gui/res/cardsfolder/b/basilica_bell_haunt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/basilica_bell_haunt.txt
rename to forge-gui/res/cardsfolder/b/basilica_bell_haunt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bedeck_bedazzle.txt b/forge-gui/res/cardsfolder/b/bedeck_bedazzle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bedeck_bedazzle.txt
rename to forge-gui/res/cardsfolder/b/bedeck_bedazzle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bedevil.txt b/forge-gui/res/cardsfolder/b/bedevil.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bedevil.txt
rename to forge-gui/res/cardsfolder/b/bedevil.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/benthic_biomancer.txt b/forge-gui/res/cardsfolder/b/benthic_biomancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/benthic_biomancer.txt
rename to forge-gui/res/cardsfolder/b/benthic_biomancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/biogenic_ooze.txt b/forge-gui/res/cardsfolder/b/biogenic_ooze.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/biogenic_ooze.txt
rename to forge-gui/res/cardsfolder/b/biogenic_ooze.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/biogenic_upgrade.txt b/forge-gui/res/cardsfolder/b/biogenic_upgrade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/biogenic_upgrade.txt
rename to forge-gui/res/cardsfolder/b/biogenic_upgrade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/biomancers_familiar.txt b/forge-gui/res/cardsfolder/b/biomancers_familiar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/biomancers_familiar.txt
rename to forge-gui/res/cardsfolder/b/biomancers_familiar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blade_juggler.txt b/forge-gui/res/cardsfolder/b/blade_juggler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blade_juggler.txt
rename to forge-gui/res/cardsfolder/b/blade_juggler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bladebrand.txt b/forge-gui/res/cardsfolder/b/bladebrand.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bladebrand.txt
rename to forge-gui/res/cardsfolder/b/bladebrand.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bloodmist_infiltrator.txt b/forge-gui/res/cardsfolder/b/bloodmist_infiltrator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bloodmist_infiltrator.txt
rename to forge-gui/res/cardsfolder/b/bloodmist_infiltrator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bolrac_clan_crusher.txt b/forge-gui/res/cardsfolder/b/bolrac_clan_crusher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bolrac_clan_crusher.txt
rename to forge-gui/res/cardsfolder/b/bolrac_clan_crusher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bring_to_trial.txt b/forge-gui/res/cardsfolder/b/bring_to_trial.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bring_to_trial.txt
rename to forge-gui/res/cardsfolder/b/bring_to_trial.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/burn_bright.txt b/forge-gui/res/cardsfolder/b/burn_bright.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/burn_bright.txt
rename to forge-gui/res/cardsfolder/b/burn_bright.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/burning_tree_vandal.txt b/forge-gui/res/cardsfolder/b/burning_tree_vandal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/burning_tree_vandal.txt
rename to forge-gui/res/cardsfolder/b/burning_tree_vandal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/captive_audience.txt b/forge-gui/res/cardsfolder/c/captive_audience.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/captive_audience.txt
rename to forge-gui/res/cardsfolder/c/captive_audience.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/carnival_carnage.txt b/forge-gui/res/cardsfolder/c/carnival_carnage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/carnival_carnage.txt
rename to forge-gui/res/cardsfolder/c/carnival_carnage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/carrion_imp.txt b/forge-gui/res/cardsfolder/c/carrion_imp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/carrion_imp.txt
rename to forge-gui/res/cardsfolder/c/carrion_imp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/catacomb_crocodile.txt b/forge-gui/res/cardsfolder/c/catacomb_crocodile.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/catacomb_crocodile.txt
rename to forge-gui/res/cardsfolder/c/catacomb_crocodile.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cavalcade_of_calamity.txt b/forge-gui/res/cardsfolder/c/cavalcade_of_calamity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cavalcade_of_calamity.txt
rename to forge-gui/res/cardsfolder/c/cavalcade_of_calamity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/charging_war_boar.txt b/forge-gui/res/cardsfolder/c/charging_war_boar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/charging_war_boar.txt
rename to forge-gui/res/cardsfolder/c/charging_war_boar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chillbringer.txt b/forge-gui/res/cardsfolder/c/chillbringer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chillbringer.txt
rename to forge-gui/res/cardsfolder/c/chillbringer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cindervines.txt b/forge-gui/res/cardsfolder/c/cindervines.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cindervines.txt
rename to forge-gui/res/cardsfolder/c/cindervines.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/civic_stalwart.txt b/forge-gui/res/cardsfolder/c/civic_stalwart.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/civic_stalwart.txt
rename to forge-gui/res/cardsfolder/c/civic_stalwart.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clamor_shaman.txt b/forge-gui/res/cardsfolder/c/clamor_shaman.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clamor_shaman.txt
rename to forge-gui/res/cardsfolder/c/clamor_shaman.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clan_guildmage.txt b/forge-gui/res/cardsfolder/c/clan_guildmage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clan_guildmage.txt
rename to forge-gui/res/cardsfolder/c/clan_guildmage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clear_the_mind.txt b/forge-gui/res/cardsfolder/c/clear_the_mind.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clear_the_mind.txt
rename to forge-gui/res/cardsfolder/c/clear_the_mind.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clear_the_stage.txt b/forge-gui/res/cardsfolder/c/clear_the_stage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clear_the_stage.txt
rename to forge-gui/res/cardsfolder/c/clear_the_stage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/code_of_constraint.txt b/forge-gui/res/cardsfolder/c/code_of_constraint.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/code_of_constraint.txt
rename to forge-gui/res/cardsfolder/c/code_of_constraint.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/collision_colossus.txt b/forge-gui/res/cardsfolder/c/collision_colossus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/collision_colossus.txt
rename to forge-gui/res/cardsfolder/c/collision_colossus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/combine_guildmage.txt b/forge-gui/res/cardsfolder/c/combine_guildmage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/combine_guildmage.txt
rename to forge-gui/res/cardsfolder/c/combine_guildmage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/consecrate_consume.txt b/forge-gui/res/cardsfolder/c/consecrate_consume.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/consecrate_consume.txt
rename to forge-gui/res/cardsfolder/c/consecrate_consume.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/consign_to_the_pit.txt b/forge-gui/res/cardsfolder/c/consign_to_the_pit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/consign_to_the_pit.txt
rename to forge-gui/res/cardsfolder/c/consign_to_the_pit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/coral_commando.txt b/forge-gui/res/cardsfolder/c/coral_commando.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/coral_commando.txt
rename to forge-gui/res/cardsfolder/c/coral_commando.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cry_of_the_carnarium.txt b/forge-gui/res/cardsfolder/c/cry_of_the_carnarium.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cry_of_the_carnarium.txt
rename to forge-gui/res/cardsfolder/c/cry_of_the_carnarium.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cult_guildmage.txt b/forge-gui/res/cardsfolder/c/cult_guildmage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cult_guildmage.txt
rename to forge-gui/res/cardsfolder/c/cult_guildmage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dagger_caster.txt b/forge-gui/res/cardsfolder/d/dagger_caster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dagger_caster.txt
rename to forge-gui/res/cardsfolder/d/dagger_caster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dead_revels.txt b/forge-gui/res/cardsfolder/d/dead_revels.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dead_revels.txt
rename to forge-gui/res/cardsfolder/d/dead_revels.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/debtors_transport.txt b/forge-gui/res/cardsfolder/d/debtors_transport.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/debtors_transport.txt
rename to forge-gui/res/cardsfolder/d/debtors_transport.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deface.txt b/forge-gui/res/cardsfolder/d/deface.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deface.txt
rename to forge-gui/res/cardsfolder/d/deface.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/depose_deploy.txt b/forge-gui/res/cardsfolder/d/depose_deploy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/depose_deploy.txt
rename to forge-gui/res/cardsfolder/d/depose_deploy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deputy_of_detention.txt b/forge-gui/res/cardsfolder/d/deputy_of_detention.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deputy_of_detention.txt
rename to forge-gui/res/cardsfolder/d/deputy_of_detention.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/domri_chaos_bringer.txt b/forge-gui/res/cardsfolder/d/domri_chaos_bringer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/domri_chaos_bringer.txt
rename to forge-gui/res/cardsfolder/d/domri_chaos_bringer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/domri_city_smasher.txt b/forge-gui/res/cardsfolder/d/domri_city_smasher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/domri_city_smasher.txt
rename to forge-gui/res/cardsfolder/d/domri_city_smasher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/domris_nodorog.txt b/forge-gui/res/cardsfolder/d/domris_nodorog.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/domris_nodorog.txt
rename to forge-gui/res/cardsfolder/d/domris_nodorog.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dovin_architect_of_law.txt b/forge-gui/res/cardsfolder/d/dovin_architect_of_law.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dovin_architect_of_law.txt
rename to forge-gui/res/cardsfolder/d/dovin_architect_of_law.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dovin_grand_arbiter.txt b/forge-gui/res/cardsfolder/d/dovin_grand_arbiter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dovin_grand_arbiter.txt
rename to forge-gui/res/cardsfolder/d/dovin_grand_arbiter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dovins_acuity.txt b/forge-gui/res/cardsfolder/d/dovins_acuity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dovins_acuity.txt
rename to forge-gui/res/cardsfolder/d/dovins_acuity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dovins_automaton.txt b/forge-gui/res/cardsfolder/d/dovins_automaton.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dovins_automaton.txt
rename to forge-gui/res/cardsfolder/d/dovins_automaton.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dovins_dismissal.txt b/forge-gui/res/cardsfolder/d/dovins_dismissal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dovins_dismissal.txt
rename to forge-gui/res/cardsfolder/d/dovins_dismissal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drill_bit.txt b/forge-gui/res/cardsfolder/d/drill_bit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drill_bit.txt
rename to forge-gui/res/cardsfolder/d/drill_bit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/electrodominance.txt b/forge-gui/res/cardsfolder/e/electrodominance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/electrodominance.txt
rename to forge-gui/res/cardsfolder/e/electrodominance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elite_arrester.txt b/forge-gui/res/cardsfolder/e/elite_arrester.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elite_arrester.txt
rename to forge-gui/res/cardsfolder/e/elite_arrester.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/emergency_powers.txt b/forge-gui/res/cardsfolder/e/emergency_powers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/emergency_powers.txt
rename to forge-gui/res/cardsfolder/e/emergency_powers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/end_raze_forerunners.txt b/forge-gui/res/cardsfolder/e/end_raze_forerunners.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/end_raze_forerunners.txt
rename to forge-gui/res/cardsfolder/e/end_raze_forerunners.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/enraged_ceratok.txt b/forge-gui/res/cardsfolder/e/enraged_ceratok.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/enraged_ceratok.txt
rename to forge-gui/res/cardsfolder/e/enraged_ceratok.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/essence_capture.txt b/forge-gui/res/cardsfolder/e/essence_capture.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/essence_capture.txt
rename to forge-gui/res/cardsfolder/e/essence_capture.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ethereal_absolution.txt b/forge-gui/res/cardsfolder/e/ethereal_absolution.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ethereal_absolution.txt
rename to forge-gui/res/cardsfolder/e/ethereal_absolution.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/expose_to_daylight.txt b/forge-gui/res/cardsfolder/e/expose_to_daylight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/expose_to_daylight.txt
rename to forge-gui/res/cardsfolder/e/expose_to_daylight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eyes_everywhere.txt b/forge-gui/res/cardsfolder/e/eyes_everywhere.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eyes_everywhere.txt
rename to forge-gui/res/cardsfolder/e/eyes_everywhere.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/faerie_duelist.txt b/forge-gui/res/cardsfolder/f/faerie_duelist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/faerie_duelist.txt
rename to forge-gui/res/cardsfolder/f/faerie_duelist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/feral_maaka.txt b/forge-gui/res/cardsfolder/f/feral_maaka.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/feral_maaka.txt
rename to forge-gui/res/cardsfolder/f/feral_maaka.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/final_payment.txt b/forge-gui/res/cardsfolder/f/final_payment.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/final_payment.txt
rename to forge-gui/res/cardsfolder/f/final_payment.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fireblade_artist.txt b/forge-gui/res/cardsfolder/f/fireblade_artist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fireblade_artist.txt
rename to forge-gui/res/cardsfolder/f/fireblade_artist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flames_of_the_raze_boar.txt b/forge-gui/res/cardsfolder/f/flames_of_the_raze_boar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flames_of_the_raze_boar.txt
rename to forge-gui/res/cardsfolder/f/flames_of_the_raze_boar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/font_of_agonies.txt b/forge-gui/res/cardsfolder/f/font_of_agonies.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/font_of_agonies.txt
rename to forge-gui/res/cardsfolder/f/font_of_agonies.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/footlight_fiend.txt b/forge-gui/res/cardsfolder/f/footlight_fiend.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/footlight_fiend.txt
rename to forge-gui/res/cardsfolder/f/footlight_fiend.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/forbidding_spirit.txt b/forge-gui/res/cardsfolder/f/forbidding_spirit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/forbidding_spirit.txt
rename to forge-gui/res/cardsfolder/f/forbidding_spirit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frenzied_arynx.txt b/forge-gui/res/cardsfolder/f/frenzied_arynx.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frenzied_arynx.txt
rename to forge-gui/res/cardsfolder/f/frenzied_arynx.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frilled_mystic.txt b/forge-gui/res/cardsfolder/f/frilled_mystic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frilled_mystic.txt
rename to forge-gui/res/cardsfolder/f/frilled_mystic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/galloping_lizrog.txt b/forge-gui/res/cardsfolder/g/galloping_lizrog.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/galloping_lizrog.txt
rename to forge-gui/res/cardsfolder/g/galloping_lizrog.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gate_colossus.txt b/forge-gui/res/cardsfolder/g/gate_colossus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gate_colossus.txt
rename to forge-gui/res/cardsfolder/g/gate_colossus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gatebreaker_ram.txt b/forge-gui/res/cardsfolder/g/gatebreaker_ram.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gatebreaker_ram.txt
rename to forge-gui/res/cardsfolder/g/gatebreaker_ram.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gates_ablaze.txt b/forge-gui/res/cardsfolder/g/gates_ablaze.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gates_ablaze.txt
rename to forge-gui/res/cardsfolder/g/gates_ablaze.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gateway_sneak.txt b/forge-gui/res/cardsfolder/g/gateway_sneak.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gateway_sneak.txt
rename to forge-gui/res/cardsfolder/g/gateway_sneak.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/get_the_point.txt b/forge-gui/res/cardsfolder/g/get_the_point.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/get_the_point.txt
rename to forge-gui/res/cardsfolder/g/get_the_point.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ghor_clan_wrecker.txt b/forge-gui/res/cardsfolder/g/ghor_clan_wrecker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ghor_clan_wrecker.txt
rename to forge-gui/res/cardsfolder/g/ghor_clan_wrecker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glass_of_the_guildpact.txt b/forge-gui/res/cardsfolder/g/glass_of_the_guildpact.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glass_of_the_guildpact.txt
rename to forge-gui/res/cardsfolder/g/glass_of_the_guildpact.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_gathering.txt b/forge-gui/res/cardsfolder/g/goblin_gathering.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goblin_gathering.txt
rename to forge-gui/res/cardsfolder/g/goblin_gathering.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/grasping_thrull.txt b/forge-gui/res/cardsfolder/g/grasping_thrull.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/grasping_thrull.txt
rename to forge-gui/res/cardsfolder/g/grasping_thrull.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gravel_hide_goblin.txt b/forge-gui/res/cardsfolder/g/gravel_hide_goblin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gravel_hide_goblin.txt
rename to forge-gui/res/cardsfolder/g/gravel_hide_goblin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/grotesque_demise.txt b/forge-gui/res/cardsfolder/g/grotesque_demise.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/grotesque_demise.txt
rename to forge-gui/res/cardsfolder/g/grotesque_demise.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/growth_chamber_guardian.txt b/forge-gui/res/cardsfolder/g/growth_chamber_guardian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/growth_chamber_guardian.txt
rename to forge-gui/res/cardsfolder/g/growth_chamber_guardian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/growth_spiral.txt b/forge-gui/res/cardsfolder/g/growth_spiral.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/growth_spiral.txt
rename to forge-gui/res/cardsfolder/g/growth_spiral.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gruul_beastmaster.txt b/forge-gui/res/cardsfolder/g/gruul_beastmaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gruul_beastmaster.txt
rename to forge-gui/res/cardsfolder/g/gruul_beastmaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gruul_locket.txt b/forge-gui/res/cardsfolder/g/gruul_locket.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gruul_locket.txt
rename to forge-gui/res/cardsfolder/g/gruul_locket.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gruul_spellbreaker.txt b/forge-gui/res/cardsfolder/g/gruul_spellbreaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gruul_spellbreaker.txt
rename to forge-gui/res/cardsfolder/g/gruul_spellbreaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/guardian_project.txt b/forge-gui/res/cardsfolder/g/guardian_project.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/guardian_project.txt
rename to forge-gui/res/cardsfolder/g/guardian_project.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gutterbones.txt b/forge-gui/res/cardsfolder/g/gutterbones.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gutterbones.txt
rename to forge-gui/res/cardsfolder/g/gutterbones.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gyre_engineer.txt b/forge-gui/res/cardsfolder/g/gyre_engineer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gyre_engineer.txt
rename to forge-gui/res/cardsfolder/g/gyre_engineer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/haazda_officer.txt b/forge-gui/res/cardsfolder/h/haazda_officer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/haazda_officer.txt
rename to forge-gui/res/cardsfolder/h/haazda_officer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hackrobat.txt b/forge-gui/res/cardsfolder/h/hackrobat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hackrobat.txt
rename to forge-gui/res/cardsfolder/h/hackrobat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hero_of_precinct_one.txt b/forge-gui/res/cardsfolder/h/hero_of_precinct_one.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hero_of_precinct_one.txt
rename to forge-gui/res/cardsfolder/h/hero_of_precinct_one.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/high_alert.txt b/forge-gui/res/cardsfolder/h/high_alert.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/high_alert.txt
rename to forge-gui/res/cardsfolder/h/high_alert.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/humongulus.txt b/forge-gui/res/cardsfolder/h/humongulus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/humongulus.txt
rename to forge-gui/res/cardsfolder/h/humongulus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hydroid_krasis.txt b/forge-gui/res/cardsfolder/h/hydroid_krasis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hydroid_krasis.txt
rename to forge-gui/res/cardsfolder/h/hydroid_krasis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ill_gotten_inheritance.txt b/forge-gui/res/cardsfolder/i/ill_gotten_inheritance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ill_gotten_inheritance.txt
rename to forge-gui/res/cardsfolder/i/ill_gotten_inheritance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/immolation_shaman.txt b/forge-gui/res/cardsfolder/i/immolation_shaman.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/immolation_shaman.txt
rename to forge-gui/res/cardsfolder/i/immolation_shaman.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/impassioned_orator.txt b/forge-gui/res/cardsfolder/i/impassioned_orator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/impassioned_orator.txt
rename to forge-gui/res/cardsfolder/i/impassioned_orator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/imperious_oligarch.txt b/forge-gui/res/cardsfolder/i/imperious_oligarch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/imperious_oligarch.txt
rename to forge-gui/res/cardsfolder/i/imperious_oligarch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/incubation_druid.txt b/forge-gui/res/cardsfolder/i/incubation_druid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/incubation_druid.txt
rename to forge-gui/res/cardsfolder/i/incubation_druid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/incubation_incongruity.txt b/forge-gui/res/cardsfolder/i/incubation_incongruity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/incubation_incongruity.txt
rename to forge-gui/res/cardsfolder/i/incubation_incongruity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/judith_the_scourge_diva.txt b/forge-gui/res/cardsfolder/j/judith_the_scourge_diva.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/judith_the_scourge_diva.txt
rename to forge-gui/res/cardsfolder/j/judith_the_scourge_diva.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/justiciars_portal.txt b/forge-gui/res/cardsfolder/j/justiciars_portal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/justiciars_portal.txt
rename to forge-gui/res/cardsfolder/j/justiciars_portal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kaya_orzhov_usurper.txt b/forge-gui/res/cardsfolder/k/kaya_orzhov_usurper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kaya_orzhov_usurper.txt
rename to forge-gui/res/cardsfolder/k/kaya_orzhov_usurper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kayas_wrath.txt b/forge-gui/res/cardsfolder/k/kayas_wrath.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kayas_wrath.txt
rename to forge-gui/res/cardsfolder/k/kayas_wrath.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_sorrows.txt b/forge-gui/res/cardsfolder/k/knight_of_sorrows.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/knight_of_sorrows.txt
rename to forge-gui/res/cardsfolder/k/knight_of_sorrows.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_the_last_breath.txt b/forge-gui/res/cardsfolder/k/knight_of_the_last_breath.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/knight_of_the_last_breath.txt
rename to forge-gui/res/cardsfolder/k/knight_of_the_last_breath.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lavinia_azorius_renegade.txt b/forge-gui/res/cardsfolder/l/lavinia_azorius_renegade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lavinia_azorius_renegade.txt
rename to forge-gui/res/cardsfolder/l/lavinia_azorius_renegade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lawmages_binding.txt b/forge-gui/res/cardsfolder/l/lawmages_binding.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lawmages_binding.txt
rename to forge-gui/res/cardsfolder/l/lawmages_binding.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/light_up_the_stage.txt b/forge-gui/res/cardsfolder/l/light_up_the_stage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/light_up_the_stage.txt
rename to forge-gui/res/cardsfolder/l/light_up_the_stage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lumbering_battlement.txt b/forge-gui/res/cardsfolder/l/lumbering_battlement.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lumbering_battlement.txt
rename to forge-gui/res/cardsfolder/l/lumbering_battlement.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/macabre_mockery.txt b/forge-gui/res/cardsfolder/m/macabre_mockery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/macabre_mockery.txt
rename to forge-gui/res/cardsfolder/m/macabre_mockery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mass_manipulation.txt b/forge-gui/res/cardsfolder/m/mass_manipulation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mass_manipulation.txt
rename to forge-gui/res/cardsfolder/m/mass_manipulation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mesmerizing_benthid.txt b/forge-gui/res/cardsfolder/m/mesmerizing_benthid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mesmerizing_benthid.txt
rename to forge-gui/res/cardsfolder/m/mesmerizing_benthid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ministrant_of_obligation.txt b/forge-gui/res/cardsfolder/m/ministrant_of_obligation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ministrant_of_obligation.txt
rename to forge-gui/res/cardsfolder/m/ministrant_of_obligation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mirror_march.txt b/forge-gui/res/cardsfolder/m/mirror_march.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mirror_march.txt
rename to forge-gui/res/cardsfolder/m/mirror_march.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nikya_of_the_old_ways.txt b/forge-gui/res/cardsfolder/n/nikya_of_the_old_ways.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nikya_of_the_old_ways.txt
rename to forge-gui/res/cardsfolder/n/nikya_of_the_old_ways.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/noxious_groodion.txt b/forge-gui/res/cardsfolder/n/noxious_groodion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/noxious_groodion.txt
rename to forge-gui/res/cardsfolder/n/noxious_groodion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/open_the_gates.txt b/forge-gui/res/cardsfolder/o/open_the_gates.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/open_the_gates.txt
rename to forge-gui/res/cardsfolder/o/open_the_gates.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/orzhov_enforcer.txt b/forge-gui/res/cardsfolder/o/orzhov_enforcer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/orzhov_enforcer.txt
rename to forge-gui/res/cardsfolder/o/orzhov_enforcer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/orzhov_locket.txt b/forge-gui/res/cardsfolder/o/orzhov_locket.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/orzhov_locket.txt
rename to forge-gui/res/cardsfolder/o/orzhov_locket.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/orzhov_racketeers.txt b/forge-gui/res/cardsfolder/o/orzhov_racketeers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/orzhov_racketeers.txt
rename to forge-gui/res/cardsfolder/o/orzhov_racketeers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/persistent_petitioners.txt b/forge-gui/res/cardsfolder/p/persistent_petitioners.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/persistent_petitioners.txt
rename to forge-gui/res/cardsfolder/p/persistent_petitioners.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pestilent_spirit.txt b/forge-gui/res/cardsfolder/p/pestilent_spirit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pestilent_spirit.txt
rename to forge-gui/res/cardsfolder/p/pestilent_spirit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pitiless_pontiff.txt b/forge-gui/res/cardsfolder/p/pitiless_pontiff.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pitiless_pontiff.txt
rename to forge-gui/res/cardsfolder/p/pitiless_pontiff.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/plague_wight.txt b/forge-gui/res/cardsfolder/p/plague_wight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/plague_wight.txt
rename to forge-gui/res/cardsfolder/p/plague_wight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/plaza_of_harmony.txt b/forge-gui/res/cardsfolder/p/plaza_of_harmony.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/plaza_of_harmony.txt
rename to forge-gui/res/cardsfolder/p/plaza_of_harmony.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/precognitive_perception.txt b/forge-gui/res/cardsfolder/p/precognitive_perception.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/precognitive_perception.txt
rename to forge-gui/res/cardsfolder/p/precognitive_perception.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/priest_of_forgotten_gods.txt b/forge-gui/res/cardsfolder/p/priest_of_forgotten_gods.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/priest_of_forgotten_gods.txt
rename to forge-gui/res/cardsfolder/p/priest_of_forgotten_gods.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prime_speaker_vannifar.txt b/forge-gui/res/cardsfolder/p/prime_speaker_vannifar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prime_speaker_vannifar.txt
rename to forge-gui/res/cardsfolder/p/prime_speaker_vannifar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prowling_caracal.txt b/forge-gui/res/cardsfolder/p/prowling_caracal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prowling_caracal.txt
rename to forge-gui/res/cardsfolder/p/prowling_caracal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prying_eyes.txt b/forge-gui/res/cardsfolder/p/prying_eyes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prying_eyes.txt
rename to forge-gui/res/cardsfolder/p/prying_eyes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pteramander.txt b/forge-gui/res/cardsfolder/p/pteramander.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pteramander.txt
rename to forge-gui/res/cardsfolder/p/pteramander.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quench.txt b/forge-gui/res/cardsfolder/q/quench.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quench.txt
rename to forge-gui/res/cardsfolder/q/quench.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rafter_demon.txt b/forge-gui/res/cardsfolder/r/rafter_demon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rafter_demon.txt
rename to forge-gui/res/cardsfolder/r/rafter_demon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ragefire.txt b/forge-gui/res/cardsfolder/r/ragefire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ragefire.txt
rename to forge-gui/res/cardsfolder/r/ragefire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rakdos_firewheeler.txt b/forge-gui/res/cardsfolder/r/rakdos_firewheeler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rakdos_firewheeler.txt
rename to forge-gui/res/cardsfolder/r/rakdos_firewheeler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rakdos_locket.txt b/forge-gui/res/cardsfolder/r/rakdos_locket.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rakdos_locket.txt
rename to forge-gui/res/cardsfolder/r/rakdos_locket.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rakdos_roustabout.txt b/forge-gui/res/cardsfolder/r/rakdos_roustabout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rakdos_roustabout.txt
rename to forge-gui/res/cardsfolder/r/rakdos_roustabout.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rakdos_the_showstopper.txt b/forge-gui/res/cardsfolder/r/rakdos_the_showstopper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rakdos_the_showstopper.txt
rename to forge-gui/res/cardsfolder/r/rakdos_the_showstopper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rakdos_trumpeter.txt b/forge-gui/res/cardsfolder/r/rakdos_trumpeter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rakdos_trumpeter.txt
rename to forge-gui/res/cardsfolder/r/rakdos_trumpeter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rally_to_battle.txt b/forge-gui/res/cardsfolder/r/rally_to_battle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rally_to_battle.txt
rename to forge-gui/res/cardsfolder/r/rally_to_battle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rampage_of_the_clans.txt b/forge-gui/res/cardsfolder/r/rampage_of_the_clans.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rampage_of_the_clans.txt
rename to forge-gui/res/cardsfolder/r/rampage_of_the_clans.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rampaging_rendhorn.txt b/forge-gui/res/cardsfolder/r/rampaging_rendhorn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rampaging_rendhorn.txt
rename to forge-gui/res/cardsfolder/r/rampaging_rendhorn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ravager_wurm.txt b/forge-gui/res/cardsfolder/r/ravager_wurm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ravager_wurm.txt
rename to forge-gui/res/cardsfolder/r/ravager_wurm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/regenesis.txt b/forge-gui/res/cardsfolder/r/regenesis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/regenesis.txt
rename to forge-gui/res/cardsfolder/r/regenesis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/repudiate_replicate.txt b/forge-gui/res/cardsfolder/r/repudiate_replicate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/repudiate_replicate.txt
rename to forge-gui/res/cardsfolder/r/repudiate_replicate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/resolute_watchdog.txt b/forge-gui/res/cardsfolder/r/resolute_watchdog.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/resolute_watchdog.txt
rename to forge-gui/res/cardsfolder/r/resolute_watchdog.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/revival_revenge.txt b/forge-gui/res/cardsfolder/r/revival_revenge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/revival_revenge.txt
rename to forge-gui/res/cardsfolder/r/revival_revenge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rhythm_of_the_wild.txt b/forge-gui/res/cardsfolder/r/rhythm_of_the_wild.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rhythm_of_the_wild.txt
rename to forge-gui/res/cardsfolder/r/rhythm_of_the_wild.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rix_maadi_reveler.txt b/forge-gui/res/cardsfolder/r/rix_maadi_reveler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rix_maadi_reveler.txt
rename to forge-gui/res/cardsfolder/r/rix_maadi_reveler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rubble_reading.txt b/forge-gui/res/cardsfolder/r/rubble_reading.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rubble_reading.txt
rename to forge-gui/res/cardsfolder/r/rubble_reading.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rubble_slinger.txt b/forge-gui/res/cardsfolder/r/rubble_slinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rubble_slinger.txt
rename to forge-gui/res/cardsfolder/r/rubble_slinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rubblebelt_recluse.txt b/forge-gui/res/cardsfolder/r/rubblebelt_recluse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rubblebelt_recluse.txt
rename to forge-gui/res/cardsfolder/r/rubblebelt_recluse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rubblebelt_runner.txt b/forge-gui/res/cardsfolder/r/rubblebelt_runner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rubblebelt_runner.txt
rename to forge-gui/res/cardsfolder/r/rubblebelt_runner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rumbling_ruin.txt b/forge-gui/res/cardsfolder/r/rumbling_ruin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rumbling_ruin.txt
rename to forge-gui/res/cardsfolder/r/rumbling_ruin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sages_row_savant.txt b/forge-gui/res/cardsfolder/s/sages_row_savant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sages_row_savant.txt
rename to forge-gui/res/cardsfolder/s/sages_row_savant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sagittars_volley.txt b/forge-gui/res/cardsfolder/s/sagittars_volley.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sagittars_volley.txt
rename to forge-gui/res/cardsfolder/s/sagittars_volley.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/saruli_caretaker.txt b/forge-gui/res/cardsfolder/s/saruli_caretaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/saruli_caretaker.txt
rename to forge-gui/res/cardsfolder/s/saruli_caretaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sauroform_hybrid.txt b/forge-gui/res/cardsfolder/s/sauroform_hybrid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sauroform_hybrid.txt
rename to forge-gui/res/cardsfolder/s/sauroform_hybrid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/savage_smash.txt b/forge-gui/res/cardsfolder/s/savage_smash.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/savage_smash.txt
rename to forge-gui/res/cardsfolder/s/savage_smash.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scorchmark.txt b/forge-gui/res/cardsfolder/s/scorchmark.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scorchmark.txt
rename to forge-gui/res/cardsfolder/s/scorchmark.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/screaming_shield.txt b/forge-gui/res/cardsfolder/s/screaming_shield.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/screaming_shield.txt
rename to forge-gui/res/cardsfolder/s/screaming_shield.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scuttlegator.txt b/forge-gui/res/cardsfolder/s/scuttlegator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scuttlegator.txt
rename to forge-gui/res/cardsfolder/s/scuttlegator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/senate_courier.txt b/forge-gui/res/cardsfolder/s/senate_courier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/senate_courier.txt
rename to forge-gui/res/cardsfolder/s/senate_courier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/senate_griffin.txt b/forge-gui/res/cardsfolder/s/senate_griffin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/senate_griffin.txt
rename to forge-gui/res/cardsfolder/s/senate_griffin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/senate_guildmage.txt b/forge-gui/res/cardsfolder/s/senate_guildmage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/senate_guildmage.txt
rename to forge-gui/res/cardsfolder/s/senate_guildmage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sentinels_mark.txt b/forge-gui/res/cardsfolder/s/sentinels_mark.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sentinels_mark.txt
rename to forge-gui/res/cardsfolder/s/sentinels_mark.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seraph_of_the_scales.txt b/forge-gui/res/cardsfolder/s/seraph_of_the_scales.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seraph_of_the_scales.txt
rename to forge-gui/res/cardsfolder/s/seraph_of_the_scales.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sharktocrab.txt b/forge-gui/res/cardsfolder/s/sharktocrab.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sharktocrab.txt
rename to forge-gui/res/cardsfolder/s/sharktocrab.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shimmer_of_possibility.txt b/forge-gui/res/cardsfolder/s/shimmer_of_possibility.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shimmer_of_possibility.txt
rename to forge-gui/res/cardsfolder/s/shimmer_of_possibility.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/silhana_wayfinder.txt b/forge-gui/res/cardsfolder/s/silhana_wayfinder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/silhana_wayfinder.txt
rename to forge-gui/res/cardsfolder/s/silhana_wayfinder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/simic_ascendancy.txt b/forge-gui/res/cardsfolder/s/simic_ascendancy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/simic_ascendancy.txt
rename to forge-gui/res/cardsfolder/s/simic_ascendancy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/simic_locket.txt b/forge-gui/res/cardsfolder/s/simic_locket.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/simic_locket.txt
rename to forge-gui/res/cardsfolder/s/simic_locket.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skarrgan_hellkite.txt b/forge-gui/res/cardsfolder/s/skarrgan_hellkite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skarrgan_hellkite.txt
rename to forge-gui/res/cardsfolder/s/skarrgan_hellkite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skatewing_spy.txt b/forge-gui/res/cardsfolder/s/skatewing_spy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skatewing_spy.txt
rename to forge-gui/res/cardsfolder/s/skatewing_spy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skewer_the_critics.txt b/forge-gui/res/cardsfolder/s/skewer_the_critics.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skewer_the_critics.txt
rename to forge-gui/res/cardsfolder/s/skewer_the_critics.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skitter_eel.txt b/forge-gui/res/cardsfolder/s/skitter_eel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skitter_eel.txt
rename to forge-gui/res/cardsfolder/s/skitter_eel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sky_tether.txt b/forge-gui/res/cardsfolder/s/sky_tether.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sky_tether.txt
rename to forge-gui/res/cardsfolder/s/sky_tether.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slimebind.txt b/forge-gui/res/cardsfolder/s/slimebind.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slimebind.txt
rename to forge-gui/res/cardsfolder/s/slimebind.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/smelt_ward_ignus.txt b/forge-gui/res/cardsfolder/s/smelt_ward_ignus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/smelt_ward_ignus.txt
rename to forge-gui/res/cardsfolder/s/smelt_ward_ignus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/smothering_tithe.txt b/forge-gui/res/cardsfolder/s/smothering_tithe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/smothering_tithe.txt
rename to forge-gui/res/cardsfolder/s/smothering_tithe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spawn_of_mayhem.txt b/forge-gui/res/cardsfolder/s/spawn_of_mayhem.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spawn_of_mayhem.txt
rename to forge-gui/res/cardsfolder/s/spawn_of_mayhem.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spear_spewer.txt b/forge-gui/res/cardsfolder/s/spear_spewer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spear_spewer.txt
rename to forge-gui/res/cardsfolder/s/spear_spewer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sphinx_of_foresight.txt b/forge-gui/res/cardsfolder/s/sphinx_of_foresight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sphinx_of_foresight.txt
rename to forge-gui/res/cardsfolder/s/sphinx_of_foresight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sphinx_of_new_prahv.txt b/forge-gui/res/cardsfolder/s/sphinx_of_new_prahv.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sphinx_of_new_prahv.txt
rename to forge-gui/res/cardsfolder/s/sphinx_of_new_prahv.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sphinx_of_the_guildpact.txt b/forge-gui/res/cardsfolder/s/sphinx_of_the_guildpact.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sphinx_of_the_guildpact.txt
rename to forge-gui/res/cardsfolder/s/sphinx_of_the_guildpact.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sphinxs_insight.txt b/forge-gui/res/cardsfolder/s/sphinxs_insight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sphinxs_insight.txt
rename to forge-gui/res/cardsfolder/s/sphinxs_insight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spikewheel_acrobat.txt b/forge-gui/res/cardsfolder/s/spikewheel_acrobat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spikewheel_acrobat.txt
rename to forge-gui/res/cardsfolder/s/spikewheel_acrobat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spire_mangler.txt b/forge-gui/res/cardsfolder/s/spire_mangler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spire_mangler.txt
rename to forge-gui/res/cardsfolder/s/spire_mangler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spirit_of_the_spires.txt b/forge-gui/res/cardsfolder/s/spirit_of_the_spires.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spirit_of_the_spires.txt
rename to forge-gui/res/cardsfolder/s/spirit_of_the_spires.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/steeple_creeper.txt b/forge-gui/res/cardsfolder/s/steeple_creeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/steeple_creeper.txt
rename to forge-gui/res/cardsfolder/s/steeple_creeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stony_strength.txt b/forge-gui/res/cardsfolder/s/stony_strength.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stony_strength.txt
rename to forge-gui/res/cardsfolder/s/stony_strength.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/storm_strike.txt b/forge-gui/res/cardsfolder/s/storm_strike.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/storm_strike.txt
rename to forge-gui/res/cardsfolder/s/storm_strike.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summary_judgment.txt b/forge-gui/res/cardsfolder/s/summary_judgment.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summary_judgment.txt
rename to forge-gui/res/cardsfolder/s/summary_judgment.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sunder_shaman.txt b/forge-gui/res/cardsfolder/s/sunder_shaman.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sunder_shaman.txt
rename to forge-gui/res/cardsfolder/s/sunder_shaman.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/swirling_torrent.txt b/forge-gui/res/cardsfolder/s/swirling_torrent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/swirling_torrent.txt
rename to forge-gui/res/cardsfolder/s/swirling_torrent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sylvan_brushstrider.txt b/forge-gui/res/cardsfolder/s/sylvan_brushstrider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sylvan_brushstrider.txt
rename to forge-gui/res/cardsfolder/s/sylvan_brushstrider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/syndicate_guildmage.txt b/forge-gui/res/cardsfolder/s/syndicate_guildmage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/syndicate_guildmage.txt
rename to forge-gui/res/cardsfolder/s/syndicate_guildmage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/syndicate_messenger.txt b/forge-gui/res/cardsfolder/s/syndicate_messenger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/syndicate_messenger.txt
rename to forge-gui/res/cardsfolder/s/syndicate_messenger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tenth_district_veteran.txt b/forge-gui/res/cardsfolder/t/tenth_district_veteran.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tenth_district_veteran.txt
rename to forge-gui/res/cardsfolder/t/tenth_district_veteran.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/territorial_boar.txt b/forge-gui/res/cardsfolder/t/territorial_boar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/territorial_boar.txt
rename to forge-gui/res/cardsfolder/t/territorial_boar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/teysa_karlov.txt b/forge-gui/res/cardsfolder/t/teysa_karlov.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/teysa_karlov.txt
rename to forge-gui/res/cardsfolder/t/teysa_karlov.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_haunt_of_hightower.txt b/forge-gui/res/cardsfolder/t/the_haunt_of_hightower.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_haunt_of_hightower.txt
rename to forge-gui/res/cardsfolder/t/the_haunt_of_hightower.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/theater_of_horrors.txt b/forge-gui/res/cardsfolder/t/theater_of_horrors.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/theater_of_horrors.txt
rename to forge-gui/res/cardsfolder/t/theater_of_horrors.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thirsting_shade.txt b/forge-gui/res/cardsfolder/t/thirsting_shade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thirsting_shade.txt
rename to forge-gui/res/cardsfolder/t/thirsting_shade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thought_collapse.txt b/forge-gui/res/cardsfolder/t/thought_collapse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thought_collapse.txt
rename to forge-gui/res/cardsfolder/t/thought_collapse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thrash_threat.txt b/forge-gui/res/cardsfolder/t/thrash_threat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thrash_threat.txt
rename to forge-gui/res/cardsfolder/t/thrash_threat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tin_street_dodger.txt b/forge-gui/res/cardsfolder/t/tin_street_dodger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tin_street_dodger.txt
rename to forge-gui/res/cardsfolder/t/tin_street_dodger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/titanic_brawl.txt b/forge-gui/res/cardsfolder/t/titanic_brawl.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/titanic_brawl.txt
rename to forge-gui/res/cardsfolder/t/titanic_brawl.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tithe_taker.txt b/forge-gui/res/cardsfolder/t/tithe_taker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tithe_taker.txt
rename to forge-gui/res/cardsfolder/t/tithe_taker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tome_of_the_guildpact.txt b/forge-gui/res/cardsfolder/t/tome_of_the_guildpact.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tome_of_the_guildpact.txt
rename to forge-gui/res/cardsfolder/t/tome_of_the_guildpact.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/trollbred_guardian.txt b/forge-gui/res/cardsfolder/t/trollbred_guardian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/trollbred_guardian.txt
rename to forge-gui/res/cardsfolder/t/trollbred_guardian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/twilight_panther.txt b/forge-gui/res/cardsfolder/t/twilight_panther.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/twilight_panther.txt
rename to forge-gui/res/cardsfolder/t/twilight_panther.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unbreakable_formation.txt b/forge-gui/res/cardsfolder/u/unbreakable_formation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unbreakable_formation.txt
rename to forge-gui/res/cardsfolder/u/unbreakable_formation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/undercity_scavenger.txt b/forge-gui/res/cardsfolder/u/undercity_scavenger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/undercity_scavenger.txt
rename to forge-gui/res/cardsfolder/u/undercity_scavenger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/undercitys_embrace.txt b/forge-gui/res/cardsfolder/u/undercitys_embrace.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/undercitys_embrace.txt
rename to forge-gui/res/cardsfolder/u/undercitys_embrace.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/verity_circle.txt b/forge-gui/res/cardsfolder/v/verity_circle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/verity_circle.txt
rename to forge-gui/res/cardsfolder/v/verity_circle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vindictive_vampire.txt b/forge-gui/res/cardsfolder/v/vindictive_vampire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vindictive_vampire.txt
rename to forge-gui/res/cardsfolder/v/vindictive_vampire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vizkopa_vampire.txt b/forge-gui/res/cardsfolder/v/vizkopa_vampire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vizkopa_vampire.txt
rename to forge-gui/res/cardsfolder/v/vizkopa_vampire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wall_of_lost_thoughts.txt b/forge-gui/res/cardsfolder/w/wall_of_lost_thoughts.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wall_of_lost_thoughts.txt
rename to forge-gui/res/cardsfolder/w/wall_of_lost_thoughts.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/warrant_warden.txt b/forge-gui/res/cardsfolder/w/warrant_warden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/warrant_warden.txt
rename to forge-gui/res/cardsfolder/w/warrant_warden.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/watchful_giant.txt b/forge-gui/res/cardsfolder/w/watchful_giant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/watchful_giant.txt
rename to forge-gui/res/cardsfolder/w/watchful_giant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wilderness_reclamation.txt b/forge-gui/res/cardsfolder/w/wilderness_reclamation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wilderness_reclamation.txt
rename to forge-gui/res/cardsfolder/w/wilderness_reclamation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/windstorm_drake.txt b/forge-gui/res/cardsfolder/w/windstorm_drake.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/windstorm_drake.txt
rename to forge-gui/res/cardsfolder/w/windstorm_drake.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wrecking_beast.txt b/forge-gui/res/cardsfolder/w/wrecking_beast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wrecking_beast.txt
rename to forge-gui/res/cardsfolder/w/wrecking_beast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zegana_utopian_speaker.txt b/forge-gui/res/cardsfolder/z/zegana_utopian_speaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zegana_utopian_speaker.txt
rename to forge-gui/res/cardsfolder/z/zegana_utopian_speaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zhur_taa_goblin.txt b/forge-gui/res/cardsfolder/z/zhur_taa_goblin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zhur_taa_goblin.txt
rename to forge-gui/res/cardsfolder/z/zhur_taa_goblin.txt