diff --git a/forge-gui/res/cardsfolder/upcoming/aeon_engine.txt b/forge-gui/res/cardsfolder/a/aeon_engine.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aeon_engine.txt
rename to forge-gui/res/cardsfolder/a/aeon_engine.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/anje_falkenrath.txt b/forge-gui/res/cardsfolder/a/anje_falkenrath.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/anje_falkenrath.txt
rename to forge-gui/res/cardsfolder/a/anje_falkenrath.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/anjes_ravager.txt b/forge-gui/res/cardsfolder/a/anjes_ravager.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/anjes_ravager.txt
rename to forge-gui/res/cardsfolder/a/anjes_ravager.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/apex_altisaur.txt b/forge-gui/res/cardsfolder/a/apex_altisaur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/apex_altisaur.txt
rename to forge-gui/res/cardsfolder/a/apex_altisaur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/archfiend_of_spite.txt b/forge-gui/res/cardsfolder/a/archfiend_of_spite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/archfiend_of_spite.txt
rename to forge-gui/res/cardsfolder/a/archfiend_of_spite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/atla_palani_nest_tender.txt b/forge-gui/res/cardsfolder/a/atla_palani_nest_tender.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/atla_palani_nest_tender.txt
rename to forge-gui/res/cardsfolder/a/atla_palani_nest_tender.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/backdraft_hellkite.txt b/forge-gui/res/cardsfolder/b/backdraft_hellkite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/backdraft_hellkite.txt
rename to forge-gui/res/cardsfolder/b/backdraft_hellkite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bloodthirsty_blade.txt b/forge-gui/res/cardsfolder/b/bloodthirsty_blade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bloodthirsty_blade.txt
rename to forge-gui/res/cardsfolder/b/bloodthirsty_blade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bone_miser.txt b/forge-gui/res/cardsfolder/b/bone_miser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bone_miser.txt
rename to forge-gui/res/cardsfolder/b/bone_miser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chainer_nightmare_adept.txt b/forge-gui/res/cardsfolder/c/chainer_nightmare_adept.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chainer_nightmare_adept.txt
rename to forge-gui/res/cardsfolder/c/chainer_nightmare_adept.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cliffside_rescuer.txt b/forge-gui/res/cardsfolder/c/cliffside_rescuer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cliffside_rescuer.txt
rename to forge-gui/res/cardsfolder/c/cliffside_rescuer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/commanders_insignia.txt b/forge-gui/res/cardsfolder/c/commanders_insignia.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/commanders_insignia.txt
rename to forge-gui/res/cardsfolder/c/commanders_insignia.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curse_of_fools_wisdom.txt b/forge-gui/res/cardsfolder/c/curse_of_fools_wisdom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curse_of_fools_wisdom.txt
rename to forge-gui/res/cardsfolder/c/curse_of_fools_wisdom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dockside_extortionist.txt b/forge-gui/res/cardsfolder/d/dockside_extortionist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dockside_extortionist.txt
rename to forge-gui/res/cardsfolder/d/dockside_extortionist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/doomed_artisan.txt b/forge-gui/res/cardsfolder/d/doomed_artisan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/doomed_artisan.txt
rename to forge-gui/res/cardsfolder/d/doomed_artisan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elsha_of_the_infinite.txt b/forge-gui/res/cardsfolder/e/elsha_of_the_infinite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elsha_of_the_infinite.txt
rename to forge-gui/res/cardsfolder/e/elsha_of_the_infinite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/empowered_autogenerator.txt b/forge-gui/res/cardsfolder/e/empowered_autogenerator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/empowered_autogenerator.txt
rename to forge-gui/res/cardsfolder/e/empowered_autogenerator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/full_flowering.txt b/forge-gui/res/cardsfolder/f/full_flowering.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/full_flowering.txt
rename to forge-gui/res/cardsfolder/f/full_flowering.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gerrard_weatherlight_hero.txt b/forge-gui/res/cardsfolder/g/gerrard_weatherlight_hero.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gerrard_weatherlight_hero.txt
rename to forge-gui/res/cardsfolder/g/gerrard_weatherlight_hero.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ghired_conclave_exile.txt b/forge-gui/res/cardsfolder/g/ghired_conclave_exile.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ghired_conclave_exile.txt
rename to forge-gui/res/cardsfolder/g/ghired_conclave_exile.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ghireds_belligerence.txt b/forge-gui/res/cardsfolder/g/ghireds_belligerence.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ghireds_belligerence.txt
rename to forge-gui/res/cardsfolder/g/ghireds_belligerence.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gift_of_doom.txt b/forge-gui/res/cardsfolder/g/gift_of_doom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gift_of_doom.txt
rename to forge-gui/res/cardsfolder/g/gift_of_doom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/greven_predator_captain.txt b/forge-gui/res/cardsfolder/g/greven_predator_captain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/greven_predator_captain.txt
rename to forge-gui/res/cardsfolder/g/greven_predator_captain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/grismold_the_dreadsower.txt b/forge-gui/res/cardsfolder/g/grismold_the_dreadsower.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/grismold_the_dreadsower.txt
rename to forge-gui/res/cardsfolder/g/grismold_the_dreadsower.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hate_mirage.txt b/forge-gui/res/cardsfolder/h/hate_mirage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hate_mirage.txt
rename to forge-gui/res/cardsfolder/h/hate_mirage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/idol_of_oblivion.txt b/forge-gui/res/cardsfolder/i/idol_of_oblivion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/idol_of_oblivion.txt
rename to forge-gui/res/cardsfolder/i/idol_of_oblivion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ignite_the_future.txt b/forge-gui/res/cardsfolder/i/ignite_the_future.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ignite_the_future.txt
rename to forge-gui/res/cardsfolder/i/ignite_the_future.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kadena_slinking_sorcerer.txt b/forge-gui/res/cardsfolder/k/kadena_slinking_sorcerer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kadena_slinking_sorcerer.txt
rename to forge-gui/res/cardsfolder/k/kadena_slinking_sorcerer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kadenas_silencer.txt b/forge-gui/res/cardsfolder/k/kadenas_silencer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kadenas_silencer.txt
rename to forge-gui/res/cardsfolder/k/kadenas_silencer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/krrik_son_of_yawgmoth.txt b/forge-gui/res/cardsfolder/k/krrik_son_of_yawgmoth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/krrik_son_of_yawgmoth.txt
rename to forge-gui/res/cardsfolder/k/krrik_son_of_yawgmoth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/leadership_vacuum.txt b/forge-gui/res/cardsfolder/l/leadership_vacuum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/leadership_vacuum.txt
rename to forge-gui/res/cardsfolder/l/leadership_vacuum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mandate_of_peace.txt b/forge-gui/res/cardsfolder/m/mandate_of_peace.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mandate_of_peace.txt
rename to forge-gui/res/cardsfolder/m/mandate_of_peace.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/marisi_breaker_of_the_coil.txt b/forge-gui/res/cardsfolder/m/marisi_breaker_of_the_coil.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/marisi_breaker_of_the_coil.txt
rename to forge-gui/res/cardsfolder/m/marisi_breaker_of_the_coil.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mass_diminish.txt b/forge-gui/res/cardsfolder/m/mass_diminish.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mass_diminish.txt
rename to forge-gui/res/cardsfolder/m/mass_diminish.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mire_in_misery.txt b/forge-gui/res/cardsfolder/m/mire_in_misery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mire_in_misery.txt
rename to forge-gui/res/cardsfolder/m/mire_in_misery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nightmare_unmaking.txt b/forge-gui/res/cardsfolder/n/nightmare_unmaking.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nightmare_unmaking.txt
rename to forge-gui/res/cardsfolder/n/nightmare_unmaking.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ohran_frostfang.txt b/forge-gui/res/cardsfolder/o/ohran_frostfang.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ohran_frostfang.txt
rename to forge-gui/res/cardsfolder/o/ohran_frostfang.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pendant_of_prosperity.txt b/forge-gui/res/cardsfolder/p/pendant_of_prosperity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pendant_of_prosperity.txt
rename to forge-gui/res/cardsfolder/p/pendant_of_prosperity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pramikon_sky_rampart.txt b/forge-gui/res/cardsfolder/p/pramikon_sky_rampart.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pramikon_sky_rampart.txt
rename to forge-gui/res/cardsfolder/p/pramikon_sky_rampart.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rayami_first_of_the_fallen.txt b/forge-gui/res/cardsfolder/r/rayami_first_of_the_fallen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rayami_first_of_the_fallen.txt
rename to forge-gui/res/cardsfolder/r/rayami_first_of_the_fallen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/road_of_return.txt b/forge-gui/res/cardsfolder/r/road_of_return.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/road_of_return.txt
rename to forge-gui/res/cardsfolder/r/road_of_return.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sanctum_of_eternity.txt b/forge-gui/res/cardsfolder/s/sanctum_of_eternity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sanctum_of_eternity.txt
rename to forge-gui/res/cardsfolder/s/sanctum_of_eternity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scaretiller.txt b/forge-gui/res/cardsfolder/s/scaretiller.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scaretiller.txt
rename to forge-gui/res/cardsfolder/s/scaretiller.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scroll_of_fate.txt b/forge-gui/res/cardsfolder/s/scroll_of_fate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scroll_of_fate.txt
rename to forge-gui/res/cardsfolder/s/scroll_of_fate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/selesnya_eulogist.txt b/forge-gui/res/cardsfolder/s/selesnya_eulogist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/selesnya_eulogist.txt
rename to forge-gui/res/cardsfolder/s/selesnya_eulogist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sevinne_the_chronoclasm.txt b/forge-gui/res/cardsfolder/s/sevinne_the_chronoclasm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sevinne_the_chronoclasm.txt
rename to forge-gui/res/cardsfolder/s/sevinne_the_chronoclasm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sevinnes_reclamation.txt b/forge-gui/res/cardsfolder/s/sevinnes_reclamation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sevinnes_reclamation.txt
rename to forge-gui/res/cardsfolder/s/sevinnes_reclamation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skyfire_phoenix.txt b/forge-gui/res/cardsfolder/s/skyfire_phoenix.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skyfire_phoenix.txt
rename to forge-gui/res/cardsfolder/s/skyfire_phoenix.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/song_of_the_worldsoul.txt b/forge-gui/res/cardsfolder/s/song_of_the_worldsoul.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/song_of_the_worldsoul.txt
rename to forge-gui/res/cardsfolder/s/song_of_the_worldsoul.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tahngarth_first_mate.txt b/forge-gui/res/cardsfolder/t/tahngarth_first_mate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tahngarth_first_mate.txt
rename to forge-gui/res/cardsfolder/t/tahngarth_first_mate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tectonic_hellion.txt b/forge-gui/res/cardsfolder/t/tectonic_hellion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tectonic_hellion.txt
rename to forge-gui/res/cardsfolder/t/tectonic_hellion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thalias_geistcaller.txt b/forge-gui/res/cardsfolder/t/thalias_geistcaller.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thalias_geistcaller.txt
rename to forge-gui/res/cardsfolder/t/thalias_geistcaller.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thieving_amalgam.txt b/forge-gui/res/cardsfolder/t/thieving_amalgam.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thieving_amalgam.txt
rename to forge-gui/res/cardsfolder/t/thieving_amalgam.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thought_sponge.txt b/forge-gui/res/cardsfolder/t/thought_sponge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thought_sponge.txt
rename to forge-gui/res/cardsfolder/t/thought_sponge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/voice_of_many.txt b/forge-gui/res/cardsfolder/v/voice_of_many.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/voice_of_many.txt
rename to forge-gui/res/cardsfolder/v/voice_of_many.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/volrath_the_shapestealer.txt b/forge-gui/res/cardsfolder/v/volrath_the_shapestealer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/volrath_the_shapestealer.txt
rename to forge-gui/res/cardsfolder/v/volrath_the_shapestealer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wall_of_stolen_identity.txt b/forge-gui/res/cardsfolder/w/wall_of_stolen_identity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wall_of_stolen_identity.txt
rename to forge-gui/res/cardsfolder/w/wall_of_stolen_identity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wildfire_devils.txt b/forge-gui/res/cardsfolder/w/wildfire_devils.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wildfire_devils.txt
rename to forge-gui/res/cardsfolder/w/wildfire_devils.txt