diff --git a/forge-gui/res/cardsfolder/upcoming/abomination_of_llanowar.txt b/forge-gui/res/cardsfolder/a/abomination_of_llanowar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/abomination_of_llanowar.txt
rename to forge-gui/res/cardsfolder/a/abomination_of_llanowar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aesi_tyrant_of_gyre_strait.txt b/forge-gui/res/cardsfolder/a/aesi_tyrant_of_gyre_strait.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aesi_tyrant_of_gyre_strait.txt
rename to forge-gui/res/cardsfolder/a/aesi_tyrant_of_gyre_strait.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/akroma_vision_of_ixidor.txt b/forge-gui/res/cardsfolder/a/akroma_vision_of_ixidor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/akroma_vision_of_ixidor.txt
rename to forge-gui/res/cardsfolder/a/akroma_vision_of_ixidor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/akromas_will.txt b/forge-gui/res/cardsfolder/a/akromas_will.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/akromas_will.txt
rename to forge-gui/res/cardsfolder/a/akromas_will.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alena_kessig_trapper.txt b/forge-gui/res/cardsfolder/a/alena_kessig_trapper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alena_kessig_trapper.txt
rename to forge-gui/res/cardsfolder/a/alena_kessig_trapper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alharu_solemn_ritualist.txt b/forge-gui/res/cardsfolder/a/alharu_solemn_ritualist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alharu_solemn_ritualist.txt
rename to forge-gui/res/cardsfolder/a/alharu_solemn_ritualist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/amareth_the_lustrous.txt b/forge-gui/res/cardsfolder/a/amareth_the_lustrous.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/amareth_the_lustrous.txt
rename to forge-gui/res/cardsfolder/a/amareth_the_lustrous.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/amateur_auteur.txt b/forge-gui/res/cardsfolder/a/amateur_auteur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/amateur_auteur.txt
rename to forge-gui/res/cardsfolder/a/amateur_auteur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/amphin_mutineer.txt b/forge-gui/res/cardsfolder/a/amphin_mutineer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/amphin_mutineer.txt
rename to forge-gui/res/cardsfolder/a/amphin_mutineer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/anara_wolvid_familiar.txt b/forge-gui/res/cardsfolder/a/anara_wolvid_familiar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/anara_wolvid_familiar.txt
rename to forge-gui/res/cardsfolder/a/anara_wolvid_familiar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/annoyed_altisaur.txt b/forge-gui/res/cardsfolder/a/annoyed_altisaur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/annoyed_altisaur.txt
rename to forge-gui/res/cardsfolder/a/annoyed_altisaur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/anointer_of_valor.txt b/forge-gui/res/cardsfolder/a/anointer_of_valor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/anointer_of_valor.txt
rename to forge-gui/res/cardsfolder/a/anointer_of_valor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/apex_devastator.txt b/forge-gui/res/cardsfolder/a/apex_devastator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/apex_devastator.txt
rename to forge-gui/res/cardsfolder/a/apex_devastator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/araumi_of_the_dead_tide.txt b/forge-gui/res/cardsfolder/a/araumi_of_the_dead_tide.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/araumi_of_the_dead_tide.txt
rename to forge-gui/res/cardsfolder/a/araumi_of_the_dead_tide.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/archelos_lagoon_mystic.txt b/forge-gui/res/cardsfolder/a/archelos_lagoon_mystic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/archelos_lagoon_mystic.txt
rename to forge-gui/res/cardsfolder/a/archelos_lagoon_mystic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/archon_of_coronation.txt b/forge-gui/res/cardsfolder/a/archon_of_coronation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/archon_of_coronation.txt
rename to forge-gui/res/cardsfolder/a/archon_of_coronation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ardenn_intrepid_archaeologist.txt b/forge-gui/res/cardsfolder/a/ardenn_intrepid_archaeologist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ardenn_intrepid_archaeologist.txt
rename to forge-gui/res/cardsfolder/a/ardenn_intrepid_archaeologist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/armix_filigree_thrasher.txt b/forge-gui/res/cardsfolder/a/armix_filigree_thrasher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/armix_filigree_thrasher.txt
rename to forge-gui/res/cardsfolder/a/armix_filigree_thrasher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/armored_skyhunter.txt b/forge-gui/res/cardsfolder/a/armored_skyhunter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/armored_skyhunter.txt
rename to forge-gui/res/cardsfolder/a/armored_skyhunter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aurora_phoenix.txt b/forge-gui/res/cardsfolder/a/aurora_phoenix.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aurora_phoenix.txt
rename to forge-gui/res/cardsfolder/a/aurora_phoenix.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/averna_the_chaos_bloom.txt b/forge-gui/res/cardsfolder/a/averna_the_chaos_bloom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/averna_the_chaos_bloom.txt
rename to forge-gui/res/cardsfolder/a/averna_the_chaos_bloom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/azure_fleet_admiral.txt b/forge-gui/res/cardsfolder/a/azure_fleet_admiral.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/azure_fleet_admiral.txt
rename to forge-gui/res/cardsfolder/a/azure_fleet_admiral.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/beast_in_show.txt b/forge-gui/res/cardsfolder/b/beast_in_show.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/beast_in_show.txt
rename to forge-gui/res/cardsfolder/b/beast_in_show.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/belbe_corrupted_observer.txt b/forge-gui/res/cardsfolder/b/belbe_corrupted_observer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/belbe_corrupted_observer.txt
rename to forge-gui/res/cardsfolder/b/belbe_corrupted_observer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bell_borca_spectral_sergeant.txt b/forge-gui/res/cardsfolder/b/bell_borca_spectral_sergeant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bell_borca_spectral_sergeant.txt
rename to forge-gui/res/cardsfolder/b/bell_borca_spectral_sergeant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/benevolent_blessing.txt b/forge-gui/res/cardsfolder/b/benevolent_blessing.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/benevolent_blessing.txt
rename to forge-gui/res/cardsfolder/b/benevolent_blessing.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/biowaste_blob.txt b/forge-gui/res/cardsfolder/b/biowaste_blob.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/biowaste_blob.txt
rename to forge-gui/res/cardsfolder/b/biowaste_blob.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bladegriff_prototype.txt b/forge-gui/res/cardsfolder/b/bladegriff_prototype.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bladegriff_prototype.txt
rename to forge-gui/res/cardsfolder/b/bladegriff_prototype.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blast_from_the_past.txt b/forge-gui/res/cardsfolder/b/blast_from_the_past.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blast_from_the_past.txt
rename to forge-gui/res/cardsfolder/b/blast_from_the_past.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blazing_sunsteel.txt b/forge-gui/res/cardsfolder/b/blazing_sunsteel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blazing_sunsteel.txt
rename to forge-gui/res/cardsfolder/b/blazing_sunsteel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blim_comedic_genius.txt b/forge-gui/res/cardsfolder/b/blim_comedic_genius.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blim_comedic_genius.txt
rename to forge-gui/res/cardsfolder/b/blim_comedic_genius.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/boarding_party.txt b/forge-gui/res/cardsfolder/b/boarding_party.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/boarding_party.txt
rename to forge-gui/res/cardsfolder/b/boarding_party.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/body_of_knowledge.txt b/forge-gui/res/cardsfolder/b/body_of_knowledge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/body_of_knowledge.txt
rename to forge-gui/res/cardsfolder/b/body_of_knowledge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/breeches_brazen_plunderer.txt b/forge-gui/res/cardsfolder/b/breeches_brazen_plunderer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/breeches_brazen_plunderer.txt
rename to forge-gui/res/cardsfolder/b/breeches_brazen_plunderer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/briarblade_adept.txt b/forge-gui/res/cardsfolder/b/briarblade_adept.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/briarblade_adept.txt
rename to forge-gui/res/cardsfolder/b/briarblade_adept.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brinelin_the_moon_kraken.txt b/forge-gui/res/cardsfolder/b/brinelin_the_moon_kraken.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brinelin_the_moon_kraken.txt
rename to forge-gui/res/cardsfolder/b/brinelin_the_moon_kraken.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/captain_vargus_wrath.txt b/forge-gui/res/cardsfolder/c/captain_vargus_wrath.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/captain_vargus_wrath.txt
rename to forge-gui/res/cardsfolder/c/captain_vargus_wrath.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clambassadors.txt b/forge-gui/res/cardsfolder/c/clambassadors.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clambassadors.txt
rename to forge-gui/res/cardsfolder/c/clambassadors.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/coastline_marauders.txt b/forge-gui/res/cardsfolder/c/coastline_marauders.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/coastline_marauders.txt
rename to forge-gui/res/cardsfolder/c/coastline_marauders.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/coercive_recruiter.txt b/forge-gui/res/cardsfolder/c/coercive_recruiter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/coercive_recruiter.txt
rename to forge-gui/res/cardsfolder/c/coercive_recruiter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/colfenor_the_last_yew.txt b/forge-gui/res/cardsfolder/c/colfenor_the_last_yew.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/colfenor_the_last_yew.txt
rename to forge-gui/res/cardsfolder/c/colfenor_the_last_yew.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/commanders_plate.txt b/forge-gui/res/cardsfolder/c/commanders_plate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/commanders_plate.txt
rename to forge-gui/res/cardsfolder/c/commanders_plate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/court_of_ambition.txt b/forge-gui/res/cardsfolder/c/court_of_ambition.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/court_of_ambition.txt
rename to forge-gui/res/cardsfolder/c/court_of_ambition.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/court_of_bounty.txt b/forge-gui/res/cardsfolder/c/court_of_bounty.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/court_of_bounty.txt
rename to forge-gui/res/cardsfolder/c/court_of_bounty.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/court_of_cunning.txt b/forge-gui/res/cardsfolder/c/court_of_cunning.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/court_of_cunning.txt
rename to forge-gui/res/cardsfolder/c/court_of_cunning.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/court_of_grace.txt b/forge-gui/res/cardsfolder/c/court_of_grace.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/court_of_grace.txt
rename to forge-gui/res/cardsfolder/c/court_of_grace.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/court_of_ire.txt b/forge-gui/res/cardsfolder/c/court_of_ire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/court_of_ire.txt
rename to forge-gui/res/cardsfolder/c/court_of_ire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crimson_fleet_commodore.txt b/forge-gui/res/cardsfolder/c/crimson_fleet_commodore.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crimson_fleet_commodore.txt
rename to forge-gui/res/cardsfolder/c/crimson_fleet_commodore.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crow_storm.txt b/forge-gui/res/cardsfolder/c/crow_storm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crow_storm.txt
rename to forge-gui/res/cardsfolder/c/crow_storm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curious_killbot.txt b/forge-gui/res/cardsfolder/c/curious_killbot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curious_killbot.txt
rename to forge-gui/res/cardsfolder/c/curious_killbot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dargo_the_shipwrecker.txt b/forge-gui/res/cardsfolder/d/dargo_the_shipwrecker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dargo_the_shipwrecker.txt
rename to forge-gui/res/cardsfolder/d/dargo_the_shipwrecker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dawnblade_regent.txt b/forge-gui/res/cardsfolder/d/dawnblade_regent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dawnblade_regent.txt
rename to forge-gui/res/cardsfolder/d/dawnblade_regent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/delighted_killbot.txt b/forge-gui/res/cardsfolder/d/delighted_killbot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/delighted_killbot.txt
rename to forge-gui/res/cardsfolder/d/delighted_killbot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/demonic_lore.txt b/forge-gui/res/cardsfolder/d/demonic_lore.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/demonic_lore.txt
rename to forge-gui/res/cardsfolder/d/demonic_lore.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/despondent_killbot.txt b/forge-gui/res/cardsfolder/d/despondent_killbot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/despondent_killbot.txt
rename to forge-gui/res/cardsfolder/d/despondent_killbot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/distract.txt b/forge-gui/res/cardsfolder/d/distract.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/distract.txt
rename to forge-gui/res/cardsfolder/d/distract.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drake_stone.txt b/forge-gui/res/cardsfolder/d/drake_stone.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drake_stone.txt
rename to forge-gui/res/cardsfolder/d/drake_stone.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/earl_of_squirrel.txt b/forge-gui/res/cardsfolder/e/earl_of_squirrel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/earl_of_squirrel.txt
rename to forge-gui/res/cardsfolder/e/earl_of_squirrel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eligeth_crossroads_augur.txt b/forge-gui/res/cardsfolder/e/eligeth_crossroads_augur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eligeth_crossroads_augur.txt
rename to forge-gui/res/cardsfolder/e/eligeth_crossroads_augur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elvish_doomsayer.txt b/forge-gui/res/cardsfolder/e/elvish_doomsayer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elvish_doomsayer.txt
rename to forge-gui/res/cardsfolder/e/elvish_doomsayer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elvish_dreadlord.txt b/forge-gui/res/cardsfolder/e/elvish_dreadlord.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elvish_dreadlord.txt
rename to forge-gui/res/cardsfolder/e/elvish_dreadlord.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/emberwilde_captain.txt b/forge-gui/res/cardsfolder/e/emberwilde_captain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/emberwilde_captain.txt
rename to forge-gui/res/cardsfolder/e/emberwilde_captain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/enraged_killbot.txt b/forge-gui/res/cardsfolder/e/enraged_killbot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/enraged_killbot.txt
rename to forge-gui/res/cardsfolder/e/enraged_killbot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/enthrall.txt b/forge-gui/res/cardsfolder/e/enthrall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/enthrall.txt
rename to forge-gui/res/cardsfolder/e/enthrall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/esior_wardwing_familiar.txt b/forge-gui/res/cardsfolder/e/esior_wardwing_familiar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/esior_wardwing_familiar.txt
rename to forge-gui/res/cardsfolder/e/esior_wardwing_familiar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/explosion_of_riches.txt b/forge-gui/res/cardsfolder/e/explosion_of_riches.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/explosion_of_riches.txt
rename to forge-gui/res/cardsfolder/e/explosion_of_riches.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/exquisite_huntmaster.txt b/forge-gui/res/cardsfolder/e/exquisite_huntmaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/exquisite_huntmaster.txt
rename to forge-gui/res/cardsfolder/e/exquisite_huntmaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eyeblight_cullers.txt b/forge-gui/res/cardsfolder/e/eyeblight_cullers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eyeblight_cullers.txt
rename to forge-gui/res/cardsfolder/e/eyeblight_cullers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fall_from_favor.txt b/forge-gui/res/cardsfolder/f/fall_from_favor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fall_from_favor.txt
rename to forge-gui/res/cardsfolder/f/fall_from_favor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/falthis_shadowcat_familiar.txt b/forge-gui/res/cardsfolder/f/falthis_shadowcat_familiar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/falthis_shadowcat_familiar.txt
rename to forge-gui/res/cardsfolder/f/falthis_shadowcat_familiar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fathom_fleet_swordjack.txt b/forge-gui/res/cardsfolder/f/fathom_fleet_swordjack.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fathom_fleet_swordjack.txt
rename to forge-gui/res/cardsfolder/f/fathom_fleet_swordjack.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/feast_of_succession.txt b/forge-gui/res/cardsfolder/f/feast_of_succession.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/feast_of_succession.txt
rename to forge-gui/res/cardsfolder/f/feast_of_succession.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fin_clade_fugitives.txt b/forge-gui/res/cardsfolder/f/fin_clade_fugitives.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fin_clade_fugitives.txt
rename to forge-gui/res/cardsfolder/f/fin_clade_fugitives.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flamekin_herald.txt b/forge-gui/res/cardsfolder/f/flamekin_herald.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flamekin_herald.txt
rename to forge-gui/res/cardsfolder/f/flamekin_herald.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/forceful_denial.txt b/forge-gui/res/cardsfolder/f/forceful_denial.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/forceful_denial.txt
rename to forge-gui/res/cardsfolder/f/forceful_denial.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/form_of_the_squirrel.txt b/forge-gui/res/cardsfolder/f/form_of_the_squirrel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/form_of_the_squirrel.txt
rename to forge-gui/res/cardsfolder/f/form_of_the_squirrel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frenzied_saddlebrute.txt b/forge-gui/res/cardsfolder/f/frenzied_saddlebrute.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frenzied_saddlebrute.txt
rename to forge-gui/res/cardsfolder/f/frenzied_saddlebrute.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ghen_arcanum_weaver.txt b/forge-gui/res/cardsfolder/g/ghen_arcanum_weaver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ghen_arcanum_weaver.txt
rename to forge-gui/res/cardsfolder/g/ghen_arcanum_weaver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ghost_of_ramirez_depietro.txt b/forge-gui/res/cardsfolder/g/ghost_of_ramirez_depietro.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ghost_of_ramirez_depietro.txt
rename to forge-gui/res/cardsfolder/g/ghost_of_ramirez_depietro.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gilanra_caller_of_wirewood.txt b/forge-gui/res/cardsfolder/g/gilanra_caller_of_wirewood.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gilanra_caller_of_wirewood.txt
rename to forge-gui/res/cardsfolder/g/gilanra_caller_of_wirewood.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glacian_powerstone_engineer.txt b/forge-gui/res/cardsfolder/g/glacian_powerstone_engineer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glacian_powerstone_engineer.txt
rename to forge-gui/res/cardsfolder/g/glacian_powerstone_engineer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gnostro_voice_of_the_crags.txt b/forge-gui/res/cardsfolder/g/gnostro_voice_of_the_crags.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gnostro_voice_of_the_crags.txt
rename to forge-gui/res/cardsfolder/g/gnostro_voice_of_the_crags.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gor_muldrak_amphinologist.txt b/forge-gui/res/cardsfolder/g/gor_muldrak_amphinologist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gor_muldrak_amphinologist.txt
rename to forge-gui/res/cardsfolder/g/gor_muldrak_amphinologist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/guildless_commons.txt b/forge-gui/res/cardsfolder/g/guildless_commons.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/guildless_commons.txt
rename to forge-gui/res/cardsfolder/g/guildless_commons.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/halana_kessig_ranger.txt b/forge-gui/res/cardsfolder/h/halana_kessig_ranger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/halana_kessig_ranger.txt
rename to forge-gui/res/cardsfolder/h/halana_kessig_ranger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hamza_guardian_of_arashin.txt b/forge-gui/res/cardsfolder/h/hamza_guardian_of_arashin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hamza_guardian_of_arashin.txt
rename to forge-gui/res/cardsfolder/h/hamza_guardian_of_arashin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hans_eriksson.txt b/forge-gui/res/cardsfolder/h/hans_eriksson.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hans_eriksson.txt
rename to forge-gui/res/cardsfolder/h/hans_eriksson.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hellkite_courser.txt b/forge-gui/res/cardsfolder/h/hellkite_courser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hellkite_courser.txt
rename to forge-gui/res/cardsfolder/h/hellkite_courser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/horizon_stone.txt b/forge-gui/res/cardsfolder/h/horizon_stone.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/horizon_stone.txt
rename to forge-gui/res/cardsfolder/h/horizon_stone.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hullbreacher.txt b/forge-gui/res/cardsfolder/h/hullbreacher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hullbreacher.txt
rename to forge-gui/res/cardsfolder/h/hullbreacher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ich_tekik_salvage_splicer.txt b/forge-gui/res/cardsfolder/i/ich_tekik_salvage_splicer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ich_tekik_salvage_splicer.txt
rename to forge-gui/res/cardsfolder/i/ich_tekik_salvage_splicer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/imoti_celebrant_of_bounty.txt b/forge-gui/res/cardsfolder/i/imoti_celebrant_of_bounty.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/imoti_celebrant_of_bounty.txt
rename to forge-gui/res/cardsfolder/i/imoti_celebrant_of_bounty.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/impulsive_pilferer.txt b/forge-gui/res/cardsfolder/i/impulsive_pilferer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/impulsive_pilferer.txt
rename to forge-gui/res/cardsfolder/i/impulsive_pilferer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ingenuity_engine.txt b/forge-gui/res/cardsfolder/i/ingenuity_engine.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ingenuity_engine.txt
rename to forge-gui/res/cardsfolder/i/ingenuity_engine.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jackknight.txt b/forge-gui/res/cardsfolder/j/jackknight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jackknight.txt
rename to forge-gui/res/cardsfolder/j/jackknight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jared_carthalion_true_heir.txt b/forge-gui/res/cardsfolder/j/jared_carthalion_true_heir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jared_carthalion_true_heir.txt
rename to forge-gui/res/cardsfolder/j/jared_carthalion_true_heir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jeska_thrice_reborn.txt b/forge-gui/res/cardsfolder/j/jeska_thrice_reborn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jeska_thrice_reborn.txt
rename to forge-gui/res/cardsfolder/j/jeska_thrice_reborn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jeskas_will.txt b/forge-gui/res/cardsfolder/j/jeskas_will.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jeskas_will.txt
rename to forge-gui/res/cardsfolder/j/jeskas_will.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jeweled_lotus.txt b/forge-gui/res/cardsfolder/j/jeweled_lotus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jeweled_lotus.txt
rename to forge-gui/res/cardsfolder/j/jeweled_lotus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/juri_master_of_the_revue.txt b/forge-gui/res/cardsfolder/j/juri_master_of_the_revue.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/juri_master_of_the_revue.txt
rename to forge-gui/res/cardsfolder/j/juri_master_of_the_revue.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kamahl_heart_of_krosa.txt b/forge-gui/res/cardsfolder/k/kamahl_heart_of_krosa.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kamahl_heart_of_krosa.txt
rename to forge-gui/res/cardsfolder/k/kamahl_heart_of_krosa.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kamahls_will.txt b/forge-gui/res/cardsfolder/k/kamahls_will.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kamahls_will.txt
rename to forge-gui/res/cardsfolder/k/kamahls_will.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kangee_sky_warden.txt b/forge-gui/res/cardsfolder/k/kangee_sky_warden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kangee_sky_warden.txt
rename to forge-gui/res/cardsfolder/k/kangee_sky_warden.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kangees_lieutenant.txt b/forge-gui/res/cardsfolder/k/kangees_lieutenant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kangees_lieutenant.txt
rename to forge-gui/res/cardsfolder/k/kangees_lieutenant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kediss_emberclaw_familiar.txt b/forge-gui/res/cardsfolder/k/kediss_emberclaw_familiar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kediss_emberclaw_familiar.txt
rename to forge-gui/res/cardsfolder/k/kediss_emberclaw_familiar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/keeper_of_the_accord.txt b/forge-gui/res/cardsfolder/k/keeper_of_the_accord.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/keeper_of_the_accord.txt
rename to forge-gui/res/cardsfolder/k/keeper_of_the_accord.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/keleth_sunmane_familiar.txt b/forge-gui/res/cardsfolder/k/keleth_sunmane_familiar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/keleth_sunmane_familiar.txt
rename to forge-gui/res/cardsfolder/k/keleth_sunmane_familiar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/keskit_the_flesh_sculptor.txt b/forge-gui/res/cardsfolder/k/keskit_the_flesh_sculptor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/keskit_the_flesh_sculptor.txt
rename to forge-gui/res/cardsfolder/k/keskit_the_flesh_sculptor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kinsbaile_courier.txt b/forge-gui/res/cardsfolder/k/kinsbaile_courier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kinsbaile_courier.txt
rename to forge-gui/res/cardsfolder/k/kinsbaile_courier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kitesail_skirmisher.txt b/forge-gui/res/cardsfolder/k/kitesail_skirmisher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kitesail_skirmisher.txt
rename to forge-gui/res/cardsfolder/k/kitesail_skirmisher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kodama_of_the_east_tree.txt b/forge-gui/res/cardsfolder/k/kodama_of_the_east_tree.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kodama_of_the_east_tree.txt
rename to forge-gui/res/cardsfolder/k/kodama_of_the_east_tree.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/krark_the_thumbless.txt b/forge-gui/res/cardsfolder/k/krark_the_thumbless.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/krark_the_thumbless.txt
rename to forge-gui/res/cardsfolder/k/krark_the_thumbless.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kwain_itinerant_meddler.txt b/forge-gui/res/cardsfolder/k/kwain_itinerant_meddler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kwain_itinerant_meddler.txt
rename to forge-gui/res/cardsfolder/k/kwain_itinerant_meddler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/laboratory_drudge.txt b/forge-gui/res/cardsfolder/l/laboratory_drudge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/laboratory_drudge.txt
rename to forge-gui/res/cardsfolder/l/laboratory_drudge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lathiel_the_bounteous_dawn.txt b/forge-gui/res/cardsfolder/l/lathiel_the_bounteous_dawn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lathiel_the_bounteous_dawn.txt
rename to forge-gui/res/cardsfolder/l/lathiel_the_bounteous_dawn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/liesa_shroud_of_dusk.txt b/forge-gui/res/cardsfolder/l/liesa_shroud_of_dusk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/liesa_shroud_of_dusk.txt
rename to forge-gui/res/cardsfolder/l/liesa_shroud_of_dusk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/livio_oathsworn_sentinel.txt b/forge-gui/res/cardsfolder/l/livio_oathsworn_sentinel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/livio_oathsworn_sentinel.txt
rename to forge-gui/res/cardsfolder/l/livio_oathsworn_sentinel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/maelstrom_colossus.txt b/forge-gui/res/cardsfolder/m/maelstrom_colossus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/maelstrom_colossus.txt
rename to forge-gui/res/cardsfolder/m/maelstrom_colossus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/magus_of_the_order.txt b/forge-gui/res/cardsfolder/m/magus_of_the_order.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/magus_of_the_order.txt
rename to forge-gui/res/cardsfolder/m/magus_of_the_order.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/malcolm_keen-eyed_navigator.txt b/forge-gui/res/cardsfolder/m/malcolm_keen-eyed_navigator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/malcolm_keen-eyed_navigator.txt
rename to forge-gui/res/cardsfolder/m/malcolm_keen-eyed_navigator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/merchant_raiders.txt b/forge-gui/res/cardsfolder/m/merchant_raiders.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/merchant_raiders.txt
rename to forge-gui/res/cardsfolder/m/merchant_raiders.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/meteoric_mace.txt b/forge-gui/res/cardsfolder/m/meteoric_mace.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/meteoric_mace.txt
rename to forge-gui/res/cardsfolder/m/meteoric_mace.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/miara_thorn_of_the_glade.txt b/forge-gui/res/cardsfolder/m/miara_thorn_of_the_glade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/miara_thorn_of_the_glade.txt
rename to forge-gui/res/cardsfolder/m/miara_thorn_of_the_glade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mnemonic_deluge.txt b/forge-gui/res/cardsfolder/m/mnemonic_deluge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mnemonic_deluge.txt
rename to forge-gui/res/cardsfolder/m/mnemonic_deluge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nadier_agent_of_the_duskenel.txt b/forge-gui/res/cardsfolder/n/nadier_agent_of_the_duskenel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nadier_agent_of_the_duskenel.txt
rename to forge-gui/res/cardsfolder/n/nadier_agent_of_the_duskenel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nadiers_nightblade.txt b/forge-gui/res/cardsfolder/n/nadiers_nightblade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nadiers_nightblade.txt
rename to forge-gui/res/cardsfolder/n/nadiers_nightblade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/natural_reclamation.txt b/forge-gui/res/cardsfolder/n/natural_reclamation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/natural_reclamation.txt
rename to forge-gui/res/cardsfolder/n/natural_reclamation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/necrotic_hex.txt b/forge-gui/res/cardsfolder/n/necrotic_hex.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/necrotic_hex.txt
rename to forge-gui/res/cardsfolder/n/necrotic_hex.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nevinyrral_urborg_tyrant.txt b/forge-gui/res/cardsfolder/n/nevinyrral_urborg_tyrant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nevinyrral_urborg_tyrant.txt
rename to forge-gui/res/cardsfolder/n/nevinyrral_urborg_tyrant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nightshade_harvester.txt b/forge-gui/res/cardsfolder/n/nightshade_harvester.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nightshade_harvester.txt
rename to forge-gui/res/cardsfolder/n/nightshade_harvester.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/novellamental.txt b/forge-gui/res/cardsfolder/n/novellamental.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/novellamental.txt
rename to forge-gui/res/cardsfolder/n/novellamental.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/numa_joraga_chieftain.txt b/forge-gui/res/cardsfolder/n/numa_joraga_chieftain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/numa_joraga_chieftain.txt
rename to forge-gui/res/cardsfolder/n/numa_joraga_chieftain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nymris_oonas_trickster.txt b/forge-gui/res/cardsfolder/n/nymris_oonas_trickster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nymris_oonas_trickster.txt
rename to forge-gui/res/cardsfolder/n/nymris_oonas_trickster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/obeka_brute_chronologist.txt b/forge-gui/res/cardsfolder/o/obeka_brute_chronologist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/obeka_brute_chronologist.txt
rename to forge-gui/res/cardsfolder/o/obeka_brute_chronologist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/old_fogey.txt b/forge-gui/res/cardsfolder/o/old_fogey.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/old_fogey.txt
rename to forge-gui/res/cardsfolder/o/old_fogey.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/opposition_agent.txt b/forge-gui/res/cardsfolder/o/opposition_agent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/opposition_agent.txt
rename to forge-gui/res/cardsfolder/o/opposition_agent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phyrexian_triniform.txt b/forge-gui/res/cardsfolder/p/phyrexian_triniform.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phyrexian_triniform.txt
rename to forge-gui/res/cardsfolder/p/phyrexian_triniform.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/plague_reaver.txt b/forge-gui/res/cardsfolder/p/plague_reaver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/plague_reaver.txt
rename to forge-gui/res/cardsfolder/p/plague_reaver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/port_razer.txt b/forge-gui/res/cardsfolder/p/port_razer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/port_razer.txt
rename to forge-gui/res/cardsfolder/p/port_razer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prava_of_the_steel_legion.txt b/forge-gui/res/cardsfolder/p/prava_of_the_steel_legion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prava_of_the_steel_legion.txt
rename to forge-gui/res/cardsfolder/p/prava_of_the_steel_legion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pride_of_the_perfect.txt b/forge-gui/res/cardsfolder/p/pride_of_the_perfect.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pride_of_the_perfect.txt
rename to forge-gui/res/cardsfolder/p/pride_of_the_perfect.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/profane_transfusion.txt b/forge-gui/res/cardsfolder/p/profane_transfusion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/profane_transfusion.txt
rename to forge-gui/res/cardsfolder/p/profane_transfusion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/promise_of_tomorrow.txt b/forge-gui/res/cardsfolder/p/promise_of_tomorrow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/promise_of_tomorrow.txt
rename to forge-gui/res/cardsfolder/p/promise_of_tomorrow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/radiant_serra_archangel.txt b/forge-gui/res/cardsfolder/r/radiant_serra_archangel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/radiant_serra_archangel.txt
rename to forge-gui/res/cardsfolder/r/radiant_serra_archangel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rakshasa_debaser.txt b/forge-gui/res/cardsfolder/r/rakshasa_debaser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rakshasa_debaser.txt
rename to forge-gui/res/cardsfolder/r/rakshasa_debaser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rebbec_architect_of_ascension.txt b/forge-gui/res/cardsfolder/r/rebbec_architect_of_ascension.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rebbec_architect_of_ascension.txt
rename to forge-gui/res/cardsfolder/r/rebbec_architect_of_ascension.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rejuvenating_springs.txt b/forge-gui/res/cardsfolder/r/rejuvenating_springs.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rejuvenating_springs.txt
rename to forge-gui/res/cardsfolder/r/rejuvenating_springs.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reshape_the_earth.txt b/forge-gui/res/cardsfolder/r/reshape_the_earth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reshape_the_earth.txt
rename to forge-gui/res/cardsfolder/r/reshape_the_earth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reyav_master_smith.txt b/forge-gui/res/cardsfolder/r/reyav_master_smith.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reyav_master_smith.txt
rename to forge-gui/res/cardsfolder/r/reyav_master_smith.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rograkh_son_of_rohgahh.txt b/forge-gui/res/cardsfolder/r/rograkh_son_of_rohgahh.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rograkh_son_of_rohgahh.txt
rename to forge-gui/res/cardsfolder/r/rograkh_son_of_rohgahh.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rootweaver_druid.txt b/forge-gui/res/cardsfolder/r/rootweaver_druid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rootweaver_druid.txt
rename to forge-gui/res/cardsfolder/r/rootweaver_druid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sakashima_of_a_thousand_faces.txt b/forge-gui/res/cardsfolder/s/sakashima_of_a_thousand_faces.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sakashima_of_a_thousand_faces.txt
rename to forge-gui/res/cardsfolder/s/sakashima_of_a_thousand_faces.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sakashimas_protege.txt b/forge-gui/res/cardsfolder/s/sakashimas_protege.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sakashimas_protege.txt
rename to forge-gui/res/cardsfolder/s/sakashimas_protege.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sakashimas_will.txt b/forge-gui/res/cardsfolder/s/sakashimas_will.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sakashimas_will.txt
rename to forge-gui/res/cardsfolder/s/sakashimas_will.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sengir_the_dark_baron.txt b/forge-gui/res/cardsfolder/s/sengir_the_dark_baron.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sengir_the_dark_baron.txt
rename to forge-gui/res/cardsfolder/s/sengir_the_dark_baron.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seraphic_greatsword.txt b/forge-gui/res/cardsfolder/s/seraphic_greatsword.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seraphic_greatsword.txt
rename to forge-gui/res/cardsfolder/s/seraphic_greatsword.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/siani_eye_of_the_storm.txt b/forge-gui/res/cardsfolder/s/siani_eye_of_the_storm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/siani_eye_of_the_storm.txt
rename to forge-gui/res/cardsfolder/s/siani_eye_of_the_storm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slash_the_ranks.txt b/forge-gui/res/cardsfolder/s/slash_the_ranks.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slash_the_ranks.txt
rename to forge-gui/res/cardsfolder/s/slash_the_ranks.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slurrk_all_ingesting.txt b/forge-gui/res/cardsfolder/s/slurrk_all_ingesting.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slurrk_all_ingesting.txt
rename to forge-gui/res/cardsfolder/s/slurrk_all_ingesting.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soul_of_eternity.txt b/forge-gui/res/cardsfolder/s/soul_of_eternity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soul_of_eternity.txt
rename to forge-gui/res/cardsfolder/s/soul_of_eternity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soulfire_eruption.txt b/forge-gui/res/cardsfolder/s/soulfire_eruption.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soulfire_eruption.txt
rename to forge-gui/res/cardsfolder/s/soulfire_eruption.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spectator_seating.txt b/forge-gui/res/cardsfolder/s/spectator_seating.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spectator_seating.txt
rename to forge-gui/res/cardsfolder/s/spectator_seating.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sphinx_of_the_second_sun.txt b/forge-gui/res/cardsfolder/s/sphinx_of_the_second_sun.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sphinx_of_the_second_sun.txt
rename to forge-gui/res/cardsfolder/s/sphinx_of_the_second_sun.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/staunch_throneguard.txt b/forge-gui/res/cardsfolder/s/staunch_throneguard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/staunch_throneguard.txt
rename to forge-gui/res/cardsfolder/s/staunch_throneguard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stumpsquall_hydra.txt b/forge-gui/res/cardsfolder/s/stumpsquall_hydra.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stumpsquall_hydra.txt
rename to forge-gui/res/cardsfolder/s/stumpsquall_hydra.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sweet_gum_recluse.txt b/forge-gui/res/cardsfolder/s/sweet_gum_recluse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sweet_gum_recluse.txt
rename to forge-gui/res/cardsfolder/s/sweet_gum_recluse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/szats_will.txt b/forge-gui/res/cardsfolder/s/szats_will.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/szats_will.txt
rename to forge-gui/res/cardsfolder/s/szats_will.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/target_minotaur.txt b/forge-gui/res/cardsfolder/t/target_minotaur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/target_minotaur.txt
rename to forge-gui/res/cardsfolder/t/target_minotaur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tevesh_szat_doom_of_fools.txt b/forge-gui/res/cardsfolder/t/tevesh_szat_doom_of_fools.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tevesh_szat_doom_of_fools.txt
rename to forge-gui/res/cardsfolder/t/tevesh_szat_doom_of_fools.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thalisse_reverent_medium.txt b/forge-gui/res/cardsfolder/t/thalisse_reverent_medium.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thalisse_reverent_medium.txt
rename to forge-gui/res/cardsfolder/t/thalisse_reverent_medium.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_prismatic_piper.txt b/forge-gui/res/cardsfolder/t/the_prismatic_piper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_prismatic_piper.txt
rename to forge-gui/res/cardsfolder/t/the_prismatic_piper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/timely_ward.txt b/forge-gui/res/cardsfolder/t/timely_ward.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/timely_ward.txt
rename to forge-gui/res/cardsfolder/t/timely_ward.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/toggo_goblin_weaponsmith.txt b/forge-gui/res/cardsfolder/t/toggo_goblin_weaponsmith.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/toggo_goblin_weaponsmith.txt
rename to forge-gui/res/cardsfolder/t/toggo_goblin_weaponsmith.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tormod_the_desecrator.txt b/forge-gui/res/cardsfolder/t/tormod_the_desecrator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tormod_the_desecrator.txt
rename to forge-gui/res/cardsfolder/t/tormod_the_desecrator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/training_center.txt b/forge-gui/res/cardsfolder/t/training_center.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/training_center.txt
rename to forge-gui/res/cardsfolder/t/training_center.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/trench_behemoth.txt b/forge-gui/res/cardsfolder/t/trench_behemoth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/trench_behemoth.txt
rename to forge-gui/res/cardsfolder/t/trench_behemoth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/triumphant_reckoning.txt b/forge-gui/res/cardsfolder/t/triumphant_reckoning.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/triumphant_reckoning.txt
rename to forge-gui/res/cardsfolder/t/triumphant_reckoning.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/trove_tracker.txt b/forge-gui/res/cardsfolder/t/trove_tracker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/trove_tracker.txt
rename to forge-gui/res/cardsfolder/t/trove_tracker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tuya_bearclaw.txt b/forge-gui/res/cardsfolder/t/tuya_bearclaw.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tuya_bearclaw.txt
rename to forge-gui/res/cardsfolder/t/tuya_bearclaw.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/undergrowth_stadium.txt b/forge-gui/res/cardsfolder/u/undergrowth_stadium.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/undergrowth_stadium.txt
rename to forge-gui/res/cardsfolder/u/undergrowth_stadium.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vault_of_champions.txt b/forge-gui/res/cardsfolder/v/vault_of_champions.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vault_of_champions.txt
rename to forge-gui/res/cardsfolder/v/vault_of_champions.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/volcanic_torrent.txt b/forge-gui/res/cardsfolder/v/volcanic_torrent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/volcanic_torrent.txt
rename to forge-gui/res/cardsfolder/v/volcanic_torrent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/war_room.txt b/forge-gui/res/cardsfolder/w/war_room.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/war_room.txt
rename to forge-gui/res/cardsfolder/w/war_room.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wheel_of_misfortune.txt b/forge-gui/res/cardsfolder/w/wheel_of_misfortune.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wheel_of_misfortune.txt
rename to forge-gui/res/cardsfolder/w/wheel_of_misfortune.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wrong_turn.txt b/forge-gui/res/cardsfolder/w/wrong_turn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wrong_turn.txt
rename to forge-gui/res/cardsfolder/w/wrong_turn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wyleth_soul_of_steel.txt b/forge-gui/res/cardsfolder/w/wyleth_soul_of_steel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wyleth_soul_of_steel.txt
rename to forge-gui/res/cardsfolder/w/wyleth_soul_of_steel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yurlok_of_scorch_thrash.txt b/forge-gui/res/cardsfolder/y/yurlok_of_scorch_thrash.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yurlok_of_scorch_thrash.txt
rename to forge-gui/res/cardsfolder/y/yurlok_of_scorch_thrash.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zara_renegade_recruiter.txt b/forge-gui/res/cardsfolder/z/zara_renegade_recruiter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zara_renegade_recruiter.txt
rename to forge-gui/res/cardsfolder/z/zara_renegade_recruiter.txt