diff --git a/forge-gui/res/cardsfolder/upcoming/acclaimed_contender.txt b/forge-gui/res/cardsfolder/a/acclaimed_contender.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/acclaimed_contender.txt
rename to forge-gui/res/cardsfolder/a/acclaimed_contender.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alela_artful_provocateur.txt b/forge-gui/res/cardsfolder/a/alela_artful_provocateur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alela_artful_provocateur.txt
rename to forge-gui/res/cardsfolder/a/alela_artful_provocateur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/all_that_glitters.txt b/forge-gui/res/cardsfolder/a/all_that_glitters.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/all_that_glitters.txt
rename to forge-gui/res/cardsfolder/a/all_that_glitters.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/animating_faerie_bring_to_life.txt b/forge-gui/res/cardsfolder/a/animating_faerie_bring_to_life.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/animating_faerie_bring_to_life.txt
rename to forge-gui/res/cardsfolder/a/animating_faerie_bring_to_life.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arcane_signet.txt b/forge-gui/res/cardsfolder/a/arcane_signet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arcane_signet.txt
rename to forge-gui/res/cardsfolder/a/arcane_signet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arcanists_owl.txt b/forge-gui/res/cardsfolder/a/arcanists_owl.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arcanists_owl.txt
rename to forge-gui/res/cardsfolder/a/arcanists_owl.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/archon_of_absolution.txt b/forge-gui/res/cardsfolder/a/archon_of_absolution.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/archon_of_absolution.txt
rename to forge-gui/res/cardsfolder/a/archon_of_absolution.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ardenvale_paladin.txt b/forge-gui/res/cardsfolder/a/ardenvale_paladin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ardenvale_paladin.txt
rename to forge-gui/res/cardsfolder/a/ardenvale_paladin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ardenvale_tactician_dizzying_swoop.txt b/forge-gui/res/cardsfolder/a/ardenvale_tactician_dizzying_swoop.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ardenvale_tactician_dizzying_swoop.txt
rename to forge-gui/res/cardsfolder/a/ardenvale_tactician_dizzying_swoop.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ayara_first_of_locthwain.txt b/forge-gui/res/cardsfolder/a/ayara_first_of_locthwain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ayara_first_of_locthwain.txt
rename to forge-gui/res/cardsfolder/a/ayara_first_of_locthwain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bake_into_a_pie.txt b/forge-gui/res/cardsfolder/b/bake_into_a_pie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bake_into_a_pie.txt
rename to forge-gui/res/cardsfolder/b/bake_into_a_pie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/banish_into_fable.txt b/forge-gui/res/cardsfolder/b/banish_into_fable.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/banish_into_fable.txt
rename to forge-gui/res/cardsfolder/b/banish_into_fable.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/barge_in.txt b/forge-gui/res/cardsfolder/b/barge_in.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/barge_in.txt
rename to forge-gui/res/cardsfolder/b/barge_in.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/barrow_witches.txt b/forge-gui/res/cardsfolder/b/barrow_witches.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/barrow_witches.txt
rename to forge-gui/res/cardsfolder/b/barrow_witches.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bartered_cow.txt b/forge-gui/res/cardsfolder/b/bartered_cow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bartered_cow.txt
rename to forge-gui/res/cardsfolder/b/bartered_cow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/beanstalk_giant_fertile_footsteps.txt b/forge-gui/res/cardsfolder/b/beanstalk_giant_fertile_footsteps.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/beanstalk_giant_fertile_footsteps.txt
rename to forge-gui/res/cardsfolder/b/beanstalk_giant_fertile_footsteps.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/belle_of_the_brawl.txt b/forge-gui/res/cardsfolder/b/belle_of_the_brawl.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/belle_of_the_brawl.txt
rename to forge-gui/res/cardsfolder/b/belle_of_the_brawl.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/beloved_princess.txt b/forge-gui/res/cardsfolder/b/beloved_princess.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/beloved_princess.txt
rename to forge-gui/res/cardsfolder/b/beloved_princess.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blacklance_paragon.txt b/forge-gui/res/cardsfolder/b/blacklance_paragon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blacklance_paragon.txt
rename to forge-gui/res/cardsfolder/b/blacklance_paragon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bloodhaze_wolverine.txt b/forge-gui/res/cardsfolder/b/bloodhaze_wolverine.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bloodhaze_wolverine.txt
rename to forge-gui/res/cardsfolder/b/bloodhaze_wolverine.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blow_your_house_down.txt b/forge-gui/res/cardsfolder/b/blow_your_house_down.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blow_your_house_down.txt
rename to forge-gui/res/cardsfolder/b/blow_your_house_down.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bog_naughty.txt b/forge-gui/res/cardsfolder/b/bog_naughty.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bog_naughty.txt
rename to forge-gui/res/cardsfolder/b/bog_naughty.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bonecrusher_giant_stomp.txt b/forge-gui/res/cardsfolder/b/bonecrusher_giant_stomp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bonecrusher_giant_stomp.txt
rename to forge-gui/res/cardsfolder/b/bonecrusher_giant_stomp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bramblefort_fink.txt b/forge-gui/res/cardsfolder/b/bramblefort_fink.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bramblefort_fink.txt
rename to forge-gui/res/cardsfolder/b/bramblefort_fink.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brazen_borrower_petty_theft.txt b/forge-gui/res/cardsfolder/b/brazen_borrower_petty_theft.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brazen_borrower_petty_theft.txt
rename to forge-gui/res/cardsfolder/b/brazen_borrower_petty_theft.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brimstone_trebuchet.txt b/forge-gui/res/cardsfolder/b/brimstone_trebuchet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brimstone_trebuchet.txt
rename to forge-gui/res/cardsfolder/b/brimstone_trebuchet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/burning_yard_trainer.txt b/forge-gui/res/cardsfolder/b/burning_yard_trainer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/burning_yard_trainer.txt
rename to forge-gui/res/cardsfolder/b/burning_yard_trainer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/castle_ardenvale.txt b/forge-gui/res/cardsfolder/c/castle_ardenvale.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/castle_ardenvale.txt
rename to forge-gui/res/cardsfolder/c/castle_ardenvale.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/castle_embereth.txt b/forge-gui/res/cardsfolder/c/castle_embereth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/castle_embereth.txt
rename to forge-gui/res/cardsfolder/c/castle_embereth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/castle_garenbrig.txt b/forge-gui/res/cardsfolder/c/castle_garenbrig.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/castle_garenbrig.txt
rename to forge-gui/res/cardsfolder/c/castle_garenbrig.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/castle_locthwain.txt b/forge-gui/res/cardsfolder/c/castle_locthwain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/castle_locthwain.txt
rename to forge-gui/res/cardsfolder/c/castle_locthwain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/castle_vantress.txt b/forge-gui/res/cardsfolder/c/castle_vantress.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/castle_vantress.txt
rename to forge-gui/res/cardsfolder/c/castle_vantress.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cauldron_familiar.txt b/forge-gui/res/cardsfolder/c/cauldron_familiar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cauldron_familiar.txt
rename to forge-gui/res/cardsfolder/c/cauldron_familiar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cauldrons_gift.txt b/forge-gui/res/cardsfolder/c/cauldrons_gift.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cauldrons_gift.txt
rename to forge-gui/res/cardsfolder/c/cauldrons_gift.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/charmed_sleep.txt b/forge-gui/res/cardsfolder/c/charmed_sleep.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/charmed_sleep.txt
rename to forge-gui/res/cardsfolder/c/charmed_sleep.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/charming_prince.txt b/forge-gui/res/cardsfolder/c/charming_prince.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/charming_prince.txt
rename to forge-gui/res/cardsfolder/c/charming_prince.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chittering_witch.txt b/forge-gui/res/cardsfolder/c/chittering_witch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chittering_witch.txt
rename to forge-gui/res/cardsfolder/c/chittering_witch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chulane_teller_of_tales.txt b/forge-gui/res/cardsfolder/c/chulane_teller_of_tales.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chulane_teller_of_tales.txt
rename to forge-gui/res/cardsfolder/c/chulane_teller_of_tales.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clackbridge_troll.txt b/forge-gui/res/cardsfolder/c/clackbridge_troll.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clackbridge_troll.txt
rename to forge-gui/res/cardsfolder/c/clackbridge_troll.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/claim_the_firstborn.txt b/forge-gui/res/cardsfolder/c/claim_the_firstborn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/claim_the_firstborn.txt
rename to forge-gui/res/cardsfolder/c/claim_the_firstborn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clockwork_servant.txt b/forge-gui/res/cardsfolder/c/clockwork_servant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clockwork_servant.txt
rename to forge-gui/res/cardsfolder/c/clockwork_servant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/corridor_monitor.txt b/forge-gui/res/cardsfolder/c/corridor_monitor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/corridor_monitor.txt
rename to forge-gui/res/cardsfolder/c/corridor_monitor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/covetous_urge.txt b/forge-gui/res/cardsfolder/c/covetous_urge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/covetous_urge.txt
rename to forge-gui/res/cardsfolder/c/covetous_urge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crashing_drawbridge.txt b/forge-gui/res/cardsfolder/c/crashing_drawbridge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crashing_drawbridge.txt
rename to forge-gui/res/cardsfolder/c/crashing_drawbridge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crystal_slipper.txt b/forge-gui/res/cardsfolder/c/crystal_slipper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crystal_slipper.txt
rename to forge-gui/res/cardsfolder/c/crystal_slipper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curious_pair_treats_to_share.txt b/forge-gui/res/cardsfolder/c/curious_pair_treats_to_share.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curious_pair_treats_to_share.txt
rename to forge-gui/res/cardsfolder/c/curious_pair_treats_to_share.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dance_of_the_manse.txt b/forge-gui/res/cardsfolder/d/dance_of_the_manse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dance_of_the_manse.txt
rename to forge-gui/res/cardsfolder/d/dance_of_the_manse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deafening_silence.txt b/forge-gui/res/cardsfolder/d/deafening_silence.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deafening_silence.txt
rename to forge-gui/res/cardsfolder/d/deafening_silence.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deathless_knight.txt b/forge-gui/res/cardsfolder/d/deathless_knight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deathless_knight.txt
rename to forge-gui/res/cardsfolder/d/deathless_knight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/didnt_say_please.txt b/forge-gui/res/cardsfolder/d/didnt_say_please.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/didnt_say_please.txt
rename to forge-gui/res/cardsfolder/d/didnt_say_please.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/doom_foretold.txt b/forge-gui/res/cardsfolder/d/doom_foretold.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/doom_foretold.txt
rename to forge-gui/res/cardsfolder/d/doom_foretold.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drown_in_the_loch.txt b/forge-gui/res/cardsfolder/d/drown_in_the_loch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drown_in_the_loch.txt
rename to forge-gui/res/cardsfolder/d/drown_in_the_loch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dwarven_mine.txt b/forge-gui/res/cardsfolder/d/dwarven_mine.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dwarven_mine.txt
rename to forge-gui/res/cardsfolder/d/dwarven_mine.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/edgewall_innkeeper.txt b/forge-gui/res/cardsfolder/e/edgewall_innkeeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/edgewall_innkeeper.txt
rename to forge-gui/res/cardsfolder/e/edgewall_innkeeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elite_headhunter.txt b/forge-gui/res/cardsfolder/e/elite_headhunter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elite_headhunter.txt
rename to forge-gui/res/cardsfolder/e/elite_headhunter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/embercleave.txt b/forge-gui/res/cardsfolder/e/embercleave.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/embercleave.txt
rename to forge-gui/res/cardsfolder/e/embercleave.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/embereth_paladin.txt b/forge-gui/res/cardsfolder/e/embereth_paladin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/embereth_paladin.txt
rename to forge-gui/res/cardsfolder/e/embereth_paladin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/embereth_shieldbreaker_battle_display.txt b/forge-gui/res/cardsfolder/e/embereth_shieldbreaker_battle_display.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/embereth_shieldbreaker_battle_display.txt
rename to forge-gui/res/cardsfolder/e/embereth_shieldbreaker_battle_display.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/embereth_skyblazer.txt b/forge-gui/res/cardsfolder/e/embereth_skyblazer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/embereth_skyblazer.txt
rename to forge-gui/res/cardsfolder/e/embereth_skyblazer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/emry_lurker_of_the_loch.txt b/forge-gui/res/cardsfolder/e/emry_lurker_of_the_loch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/emry_lurker_of_the_loch.txt
rename to forge-gui/res/cardsfolder/e/emry_lurker_of_the_loch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/enchanted_carriage.txt b/forge-gui/res/cardsfolder/e/enchanted_carriage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/enchanted_carriage.txt
rename to forge-gui/res/cardsfolder/e/enchanted_carriage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/epic_downfall.txt b/forge-gui/res/cardsfolder/e/epic_downfall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/epic_downfall.txt
rename to forge-gui/res/cardsfolder/e/epic_downfall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/escape_to_the_wilds.txt b/forge-gui/res/cardsfolder/e/escape_to_the_wilds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/escape_to_the_wilds.txt
rename to forge-gui/res/cardsfolder/e/escape_to_the_wilds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eye_collector.txt b/forge-gui/res/cardsfolder/e/eye_collector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eye_collector.txt
rename to forge-gui/res/cardsfolder/e/eye_collector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fabled_passage.txt b/forge-gui/res/cardsfolder/f/fabled_passage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fabled_passage.txt
rename to forge-gui/res/cardsfolder/f/fabled_passage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fae_of_wishes_granted.txt b/forge-gui/res/cardsfolder/f/fae_of_wishes_granted.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fae_of_wishes_granted.txt
rename to forge-gui/res/cardsfolder/f/fae_of_wishes_granted.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/faeburrow_elder.txt b/forge-gui/res/cardsfolder/f/faeburrow_elder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/faeburrow_elder.txt
rename to forge-gui/res/cardsfolder/f/faeburrow_elder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/faerie_formation.txt b/forge-gui/res/cardsfolder/f/faerie_formation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/faerie_formation.txt
rename to forge-gui/res/cardsfolder/f/faerie_formation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/faerie_guidemother_gift_of_the_fae.txt b/forge-gui/res/cardsfolder/f/faerie_guidemother_gift_of_the_fae.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/faerie_guidemother_gift_of_the_fae.txt
rename to forge-gui/res/cardsfolder/f/faerie_guidemother_gift_of_the_fae.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/faerie_vandal.txt b/forge-gui/res/cardsfolder/f/faerie_vandal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/faerie_vandal.txt
rename to forge-gui/res/cardsfolder/f/faerie_vandal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/feasting_troll_king.txt b/forge-gui/res/cardsfolder/f/feasting_troll_king.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/feasting_troll_king.txt
rename to forge-gui/res/cardsfolder/f/feasting_troll_king.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fell_the_pheasant.txt b/forge-gui/res/cardsfolder/f/fell_the_pheasant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fell_the_pheasant.txt
rename to forge-gui/res/cardsfolder/f/fell_the_pheasant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ferocity_of_the_wilds.txt b/forge-gui/res/cardsfolder/f/ferocity_of_the_wilds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ferocity_of_the_wilds.txt
rename to forge-gui/res/cardsfolder/f/ferocity_of_the_wilds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fervent_champion.txt b/forge-gui/res/cardsfolder/f/fervent_champion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fervent_champion.txt
rename to forge-gui/res/cardsfolder/f/fervent_champion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/festive_funeral.txt b/forge-gui/res/cardsfolder/f/festive_funeral.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/festive_funeral.txt
rename to forge-gui/res/cardsfolder/f/festive_funeral.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fierce_witchstalker.txt b/forge-gui/res/cardsfolder/f/fierce_witchstalker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fierce_witchstalker.txt
rename to forge-gui/res/cardsfolder/f/fierce_witchstalker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fireborn_knight.txt b/forge-gui/res/cardsfolder/f/fireborn_knight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fireborn_knight.txt
rename to forge-gui/res/cardsfolder/f/fireborn_knight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fires_of_invention.txt b/forge-gui/res/cardsfolder/f/fires_of_invention.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fires_of_invention.txt
rename to forge-gui/res/cardsfolder/f/fires_of_invention.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flaxen_intruder_welcome_home.txt b/forge-gui/res/cardsfolder/f/flaxen_intruder_welcome_home.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flaxen_intruder_welcome_home.txt
rename to forge-gui/res/cardsfolder/f/flaxen_intruder_welcome_home.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flutterfox.txt b/forge-gui/res/cardsfolder/f/flutterfox.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flutterfox.txt
rename to forge-gui/res/cardsfolder/f/flutterfox.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/folio_of_fancies.txt b/forge-gui/res/cardsfolder/f/folio_of_fancies.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/folio_of_fancies.txt
rename to forge-gui/res/cardsfolder/f/folio_of_fancies.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/foreboding_fruit.txt b/forge-gui/res/cardsfolder/f/foreboding_fruit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/foreboding_fruit.txt
rename to forge-gui/res/cardsfolder/f/foreboding_fruit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/forever_young.txt b/forge-gui/res/cardsfolder/f/forever_young.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/forever_young.txt
rename to forge-gui/res/cardsfolder/f/forever_young.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fortifying_provisions.txt b/forge-gui/res/cardsfolder/f/fortifying_provisions.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fortifying_provisions.txt
rename to forge-gui/res/cardsfolder/f/fortifying_provisions.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/foulmire_knight_profane_insight.txt b/forge-gui/res/cardsfolder/f/foulmire_knight_profane_insight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/foulmire_knight_profane_insight.txt
rename to forge-gui/res/cardsfolder/f/foulmire_knight_profane_insight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frogify.txt b/forge-gui/res/cardsfolder/f/frogify.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frogify.txt
rename to forge-gui/res/cardsfolder/f/frogify.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gadwick_the_wizened.txt b/forge-gui/res/cardsfolder/g/gadwick_the_wizened.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gadwick_the_wizened.txt
rename to forge-gui/res/cardsfolder/g/gadwick_the_wizened.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/garenbrig_carver_shields_might.txt b/forge-gui/res/cardsfolder/g/garenbrig_carver_shields_might.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/garenbrig_carver_shields_might.txt
rename to forge-gui/res/cardsfolder/g/garenbrig_carver_shields_might.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/garenbrig_paladin.txt b/forge-gui/res/cardsfolder/g/garenbrig_paladin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/garenbrig_paladin.txt
rename to forge-gui/res/cardsfolder/g/garenbrig_paladin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/garenbrig_squire.txt b/forge-gui/res/cardsfolder/g/garenbrig_squire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/garenbrig_squire.txt
rename to forge-gui/res/cardsfolder/g/garenbrig_squire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/garrison_griffin.txt b/forge-gui/res/cardsfolder/g/garrison_griffin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/garrison_griffin.txt
rename to forge-gui/res/cardsfolder/g/garrison_griffin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/garruk_cursed_huntsman.txt b/forge-gui/res/cardsfolder/g/garruk_cursed_huntsman.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/garruk_cursed_huntsman.txt
rename to forge-gui/res/cardsfolder/g/garruk_cursed_huntsman.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/giant_killer_chop_down.txt b/forge-gui/res/cardsfolder/g/giant_killer_chop_down.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/giant_killer_chop_down.txt
rename to forge-gui/res/cardsfolder/g/giant_killer_chop_down.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/giant_opportunity.txt b/forge-gui/res/cardsfolder/g/giant_opportunity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/giant_opportunity.txt
rename to forge-gui/res/cardsfolder/g/giant_opportunity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/giants_skewer.txt b/forge-gui/res/cardsfolder/g/giants_skewer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/giants_skewer.txt
rename to forge-gui/res/cardsfolder/g/giants_skewer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gilded_goose.txt b/forge-gui/res/cardsfolder/g/gilded_goose.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gilded_goose.txt
rename to forge-gui/res/cardsfolder/g/gilded_goose.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gingerbread_cabin.txt b/forge-gui/res/cardsfolder/g/gingerbread_cabin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gingerbread_cabin.txt
rename to forge-gui/res/cardsfolder/g/gingerbread_cabin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gingerbrute.txt b/forge-gui/res/cardsfolder/g/gingerbrute.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gingerbrute.txt
rename to forge-gui/res/cardsfolder/g/gingerbrute.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glass_casket.txt b/forge-gui/res/cardsfolder/g/glass_casket.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glass_casket.txt
rename to forge-gui/res/cardsfolder/g/glass_casket.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gluttonous_troll.txt b/forge-gui/res/cardsfolder/g/gluttonous_troll.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gluttonous_troll.txt
rename to forge-gui/res/cardsfolder/g/gluttonous_troll.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/golden_egg.txt b/forge-gui/res/cardsfolder/g/golden_egg.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/golden_egg.txt
rename to forge-gui/res/cardsfolder/g/golden_egg.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/grumgully_the_generous.txt b/forge-gui/res/cardsfolder/g/grumgully_the_generous.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/grumgully_the_generous.txt
rename to forge-gui/res/cardsfolder/g/grumgully_the_generous.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/happily_ever_after.txt b/forge-gui/res/cardsfolder/h/happily_ever_after.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/happily_ever_after.txt
rename to forge-gui/res/cardsfolder/h/happily_ever_after.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/harmonious_archon.txt b/forge-gui/res/cardsfolder/h/harmonious_archon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/harmonious_archon.txt
rename to forge-gui/res/cardsfolder/h/harmonious_archon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/henge_walker.txt b/forge-gui/res/cardsfolder/h/henge_walker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/henge_walker.txt
rename to forge-gui/res/cardsfolder/h/henge_walker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/heraldic_banner.txt b/forge-gui/res/cardsfolder/h/heraldic_banner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/heraldic_banner.txt
rename to forge-gui/res/cardsfolder/h/heraldic_banner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hushbringer.txt b/forge-gui/res/cardsfolder/h/hushbringer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hushbringer.txt
rename to forge-gui/res/cardsfolder/h/hushbringer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hypnotic_sprite_mesmeric_glare.txt b/forge-gui/res/cardsfolder/h/hypnotic_sprite_mesmeric_glare.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hypnotic_sprite_mesmeric_glare.txt
rename to forge-gui/res/cardsfolder/h/hypnotic_sprite_mesmeric_glare.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/idyllic_grange.txt b/forge-gui/res/cardsfolder/i/idyllic_grange.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/idyllic_grange.txt
rename to forge-gui/res/cardsfolder/i/idyllic_grange.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/improbable_alliance.txt b/forge-gui/res/cardsfolder/i/improbable_alliance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/improbable_alliance.txt
rename to forge-gui/res/cardsfolder/i/improbable_alliance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/inquisitive_puppet.txt b/forge-gui/res/cardsfolder/i/inquisitive_puppet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/inquisitive_puppet.txt
rename to forge-gui/res/cardsfolder/i/inquisitive_puppet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/insatiable_appetite.txt b/forge-gui/res/cardsfolder/i/insatiable_appetite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/insatiable_appetite.txt
rename to forge-gui/res/cardsfolder/i/insatiable_appetite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/inspiring_veteran.txt b/forge-gui/res/cardsfolder/i/inspiring_veteran.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/inspiring_veteran.txt
rename to forge-gui/res/cardsfolder/i/inspiring_veteran.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/into_the_story.txt b/forge-gui/res/cardsfolder/i/into_the_story.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/into_the_story.txt
rename to forge-gui/res/cardsfolder/i/into_the_story.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/irencrag_feat.txt b/forge-gui/res/cardsfolder/i/irencrag_feat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/irencrag_feat.txt
rename to forge-gui/res/cardsfolder/i/irencrag_feat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/irencrag_pyromancer.txt b/forge-gui/res/cardsfolder/i/irencrag_pyromancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/irencrag_pyromancer.txt
rename to forge-gui/res/cardsfolder/i/irencrag_pyromancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/joust.txt b/forge-gui/res/cardsfolder/j/joust.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/joust.txt
rename to forge-gui/res/cardsfolder/j/joust.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jousting_dummy.txt b/forge-gui/res/cardsfolder/j/jousting_dummy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jousting_dummy.txt
rename to forge-gui/res/cardsfolder/j/jousting_dummy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/keeper_of_fables.txt b/forge-gui/res/cardsfolder/k/keeper_of_fables.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/keeper_of_fables.txt
rename to forge-gui/res/cardsfolder/k/keeper_of_fables.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kenrith_the_returned_king.txt b/forge-gui/res/cardsfolder/k/kenrith_the_returned_king.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kenrith_the_returned_king.txt
rename to forge-gui/res/cardsfolder/k/kenrith_the_returned_king.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kenriths_transformation.txt b/forge-gui/res/cardsfolder/k/kenriths_transformation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kenriths_transformation.txt
rename to forge-gui/res/cardsfolder/k/kenriths_transformation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_the_keep.txt b/forge-gui/res/cardsfolder/k/knight_of_the_keep.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/knight_of_the_keep.txt
rename to forge-gui/res/cardsfolder/k/knight_of_the_keep.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/knights_charge.txt b/forge-gui/res/cardsfolder/k/knights_charge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/knights_charge.txt
rename to forge-gui/res/cardsfolder/k/knights_charge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/korvold_fae_cursed_king.txt b/forge-gui/res/cardsfolder/k/korvold_fae_cursed_king.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/korvold_fae_cursed_king.txt
rename to forge-gui/res/cardsfolder/k/korvold_fae_cursed_king.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lash_of_thorns.txt b/forge-gui/res/cardsfolder/l/lash_of_thorns.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lash_of_thorns.txt
rename to forge-gui/res/cardsfolder/l/lash_of_thorns.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/linden_the_steadfast_queen.txt b/forge-gui/res/cardsfolder/l/linden_the_steadfast_queen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/linden_the_steadfast_queen.txt
rename to forge-gui/res/cardsfolder/l/linden_the_steadfast_queen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/loch_dragon.txt b/forge-gui/res/cardsfolder/l/loch_dragon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/loch_dragon.txt
rename to forge-gui/res/cardsfolder/l/loch_dragon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lochmere_serpent.txt b/forge-gui/res/cardsfolder/l/lochmere_serpent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lochmere_serpent.txt
rename to forge-gui/res/cardsfolder/l/lochmere_serpent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/locthwain_gargoyle.txt b/forge-gui/res/cardsfolder/l/locthwain_gargoyle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/locthwain_gargoyle.txt
rename to forge-gui/res/cardsfolder/l/locthwain_gargoyle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/locthwain_paladin.txt b/forge-gui/res/cardsfolder/l/locthwain_paladin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/locthwain_paladin.txt
rename to forge-gui/res/cardsfolder/l/locthwain_paladin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lonesome_unicorn_rider_in_need.txt b/forge-gui/res/cardsfolder/l/lonesome_unicorn_rider_in_need.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lonesome_unicorn_rider_in_need.txt
rename to forge-gui/res/cardsfolder/l/lonesome_unicorn_rider_in_need.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lost_legion.txt b/forge-gui/res/cardsfolder/l/lost_legion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lost_legion.txt
rename to forge-gui/res/cardsfolder/l/lost_legion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lovestruck_beast_hearts_desire.txt b/forge-gui/res/cardsfolder/l/lovestruck_beast_hearts_desire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lovestruck_beast_hearts_desire.txt
rename to forge-gui/res/cardsfolder/l/lovestruck_beast_hearts_desire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lucky_clover.txt b/forge-gui/res/cardsfolder/l/lucky_clover.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lucky_clover.txt
rename to forge-gui/res/cardsfolder/l/lucky_clover.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mace_of_the_valiant.txt b/forge-gui/res/cardsfolder/m/mace_of_the_valiant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mace_of_the_valiant.txt
rename to forge-gui/res/cardsfolder/m/mace_of_the_valiant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mad_ratter.txt b/forge-gui/res/cardsfolder/m/mad_ratter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mad_ratter.txt
rename to forge-gui/res/cardsfolder/m/mad_ratter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/malevolent_noble.txt b/forge-gui/res/cardsfolder/m/malevolent_noble.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/malevolent_noble.txt
rename to forge-gui/res/cardsfolder/m/malevolent_noble.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mantle_of_tides.txt b/forge-gui/res/cardsfolder/m/mantle_of_tides.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mantle_of_tides.txt
rename to forge-gui/res/cardsfolder/m/mantle_of_tides.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/maraleaf_pixie.txt b/forge-gui/res/cardsfolder/m/maraleaf_pixie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/maraleaf_pixie.txt
rename to forge-gui/res/cardsfolder/m/maraleaf_pixie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/maraleaf_rider.txt b/forge-gui/res/cardsfolder/m/maraleaf_rider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/maraleaf_rider.txt
rename to forge-gui/res/cardsfolder/m/maraleaf_rider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/memory_theft.txt b/forge-gui/res/cardsfolder/m/memory_theft.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/memory_theft.txt
rename to forge-gui/res/cardsfolder/m/memory_theft.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/merchant_of_the_vale_haggle.txt b/forge-gui/res/cardsfolder/m/merchant_of_the_vale_haggle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/merchant_of_the_vale_haggle.txt
rename to forge-gui/res/cardsfolder/m/merchant_of_the_vale_haggle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/merfolk_secretkeeper_venture_deeper.txt b/forge-gui/res/cardsfolder/m/merfolk_secretkeeper_venture_deeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/merfolk_secretkeeper_venture_deeper.txt
rename to forge-gui/res/cardsfolder/m/merfolk_secretkeeper_venture_deeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/midnight_clock.txt b/forge-gui/res/cardsfolder/m/midnight_clock.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/midnight_clock.txt
rename to forge-gui/res/cardsfolder/m/midnight_clock.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mirrormade.txt b/forge-gui/res/cardsfolder/m/mirrormade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mirrormade.txt
rename to forge-gui/res/cardsfolder/m/mirrormade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mistford_river_turtle.txt b/forge-gui/res/cardsfolder/m/mistford_river_turtle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mistford_river_turtle.txt
rename to forge-gui/res/cardsfolder/m/mistford_river_turtle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/moonlit_scavengers.txt b/forge-gui/res/cardsfolder/m/moonlit_scavengers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/moonlit_scavengers.txt
rename to forge-gui/res/cardsfolder/m/moonlit_scavengers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/murderous_rider_swift_end.txt b/forge-gui/res/cardsfolder/m/murderous_rider_swift_end.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/murderous_rider_swift_end.txt
rename to forge-gui/res/cardsfolder/m/murderous_rider_swift_end.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mysterious_pathlighter.txt b/forge-gui/res/cardsfolder/m/mysterious_pathlighter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mysterious_pathlighter.txt
rename to forge-gui/res/cardsfolder/m/mysterious_pathlighter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mystic_sanctuary.txt b/forge-gui/res/cardsfolder/m/mystic_sanctuary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mystic_sanctuary.txt
rename to forge-gui/res/cardsfolder/m/mystic_sanctuary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mystical_dispute.txt b/forge-gui/res/cardsfolder/m/mystical_dispute.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mystical_dispute.txt
rename to forge-gui/res/cardsfolder/m/mystical_dispute.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/oakhame_adversary.txt b/forge-gui/res/cardsfolder/o/oakhame_adversary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/oakhame_adversary.txt
rename to forge-gui/res/cardsfolder/o/oakhame_adversary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/oakhame_ranger_bring_back.txt b/forge-gui/res/cardsfolder/o/oakhame_ranger_bring_back.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/oakhame_ranger_bring_back.txt
rename to forge-gui/res/cardsfolder/o/oakhame_ranger_bring_back.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/oathsworn_knight.txt b/forge-gui/res/cardsfolder/o/oathsworn_knight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/oathsworn_knight.txt
rename to forge-gui/res/cardsfolder/o/oathsworn_knight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ogre_errant.txt b/forge-gui/res/cardsfolder/o/ogre_errant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ogre_errant.txt
rename to forge-gui/res/cardsfolder/o/ogre_errant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/oko_the_trickster.txt b/forge-gui/res/cardsfolder/o/oko_the_trickster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/oko_the_trickster.txt
rename to forge-gui/res/cardsfolder/o/oko_the_trickster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/oko_thief_of_crowns.txt b/forge-gui/res/cardsfolder/o/oko_thief_of_crowns.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/oko_thief_of_crowns.txt
rename to forge-gui/res/cardsfolder/o/oko_thief_of_crowns.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/okos_accomplices.txt b/forge-gui/res/cardsfolder/o/okos_accomplices.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/okos_accomplices.txt
rename to forge-gui/res/cardsfolder/o/okos_accomplices.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/okos_hospitality.txt b/forge-gui/res/cardsfolder/o/okos_hospitality.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/okos_hospitality.txt
rename to forge-gui/res/cardsfolder/o/okos_hospitality.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/once_and_future.txt b/forge-gui/res/cardsfolder/o/once_and_future.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/once_and_future.txt
rename to forge-gui/res/cardsfolder/o/once_and_future.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/once_upon_a_time.txt b/forge-gui/res/cardsfolder/o/once_upon_a_time.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/once_upon_a_time.txt
rename to forge-gui/res/cardsfolder/o/once_upon_a_time.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/opportunistic_dragon.txt b/forge-gui/res/cardsfolder/o/opportunistic_dragon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/opportunistic_dragon.txt
rename to forge-gui/res/cardsfolder/o/opportunistic_dragon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/order_of_midnight_alter_fate.txt b/forge-gui/res/cardsfolder/o/order_of_midnight_alter_fate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/order_of_midnight_alter_fate.txt
rename to forge-gui/res/cardsfolder/o/order_of_midnight_alter_fate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/outflank.txt b/forge-gui/res/cardsfolder/o/outflank.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/outflank.txt
rename to forge-gui/res/cardsfolder/o/outflank.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/outlaws_merriment.txt b/forge-gui/res/cardsfolder/o/outlaws_merriment.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/outlaws_merriment.txt
rename to forge-gui/res/cardsfolder/o/outlaws_merriment.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/outmuscle.txt b/forge-gui/res/cardsfolder/o/outmuscle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/outmuscle.txt
rename to forge-gui/res/cardsfolder/o/outmuscle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/overwhelmed_apprentice.txt b/forge-gui/res/cardsfolder/o/overwhelmed_apprentice.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/overwhelmed_apprentice.txt
rename to forge-gui/res/cardsfolder/o/overwhelmed_apprentice.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/piper_of_the_swarm.txt b/forge-gui/res/cardsfolder/p/piper_of_the_swarm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/piper_of_the_swarm.txt
rename to forge-gui/res/cardsfolder/p/piper_of_the_swarm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prized_griffin.txt b/forge-gui/res/cardsfolder/p/prized_griffin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prized_griffin.txt
rename to forge-gui/res/cardsfolder/p/prized_griffin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prophet_of_the_peak.txt b/forge-gui/res/cardsfolder/p/prophet_of_the_peak.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prophet_of_the_peak.txt
rename to forge-gui/res/cardsfolder/p/prophet_of_the_peak.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/queen_of_ice_rage_of_winter.txt b/forge-gui/res/cardsfolder/q/queen_of_ice_rage_of_winter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/queen_of_ice_rage_of_winter.txt
rename to forge-gui/res/cardsfolder/q/queen_of_ice_rage_of_winter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/raging_redcap.txt b/forge-gui/res/cardsfolder/r/raging_redcap.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raging_redcap.txt
rename to forge-gui/res/cardsfolder/r/raging_redcap.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rally_for_the_throne.txt b/forge-gui/res/cardsfolder/r/rally_for_the_throne.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rally_for_the_throne.txt
rename to forge-gui/res/cardsfolder/r/rally_for_the_throne.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rampart_smasher.txt b/forge-gui/res/cardsfolder/r/rampart_smasher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rampart_smasher.txt
rename to forge-gui/res/cardsfolder/r/rampart_smasher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rankle_master_of_pranks.txt b/forge-gui/res/cardsfolder/r/rankle_master_of_pranks.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rankle_master_of_pranks.txt
rename to forge-gui/res/cardsfolder/r/rankle_master_of_pranks.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/realm_cloaked_giant_cast_off.txt b/forge-gui/res/cardsfolder/r/realm_cloaked_giant_cast_off.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/realm_cloaked_giant_cast_off.txt
rename to forge-gui/res/cardsfolder/r/realm_cloaked_giant_cast_off.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reaper_of_night_harvest_fear.txt b/forge-gui/res/cardsfolder/r/reaper_of_night_harvest_fear.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reaper_of_night_harvest_fear.txt
rename to forge-gui/res/cardsfolder/r/reaper_of_night_harvest_fear.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/redcap_melee.txt b/forge-gui/res/cardsfolder/r/redcap_melee.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/redcap_melee.txt
rename to forge-gui/res/cardsfolder/r/redcap_melee.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/redcap_raiders.txt b/forge-gui/res/cardsfolder/r/redcap_raiders.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/redcap_raiders.txt
rename to forge-gui/res/cardsfolder/r/redcap_raiders.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/resolute_rider.txt b/forge-gui/res/cardsfolder/r/resolute_rider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/resolute_rider.txt
rename to forge-gui/res/cardsfolder/r/resolute_rider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/return_of_the_wildspeaker.txt b/forge-gui/res/cardsfolder/r/return_of_the_wildspeaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/return_of_the_wildspeaker.txt
rename to forge-gui/res/cardsfolder/r/return_of_the_wildspeaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/revenge_of_ravens.txt b/forge-gui/res/cardsfolder/r/revenge_of_ravens.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/revenge_of_ravens.txt
rename to forge-gui/res/cardsfolder/r/revenge_of_ravens.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rimrock_knight_boulder_rush.txt b/forge-gui/res/cardsfolder/r/rimrock_knight_boulder_rush.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rimrock_knight_boulder_rush.txt
rename to forge-gui/res/cardsfolder/r/rimrock_knight_boulder_rush.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/robber_of_the_rich.txt b/forge-gui/res/cardsfolder/r/robber_of_the_rich.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/robber_of_the_rich.txt
rename to forge-gui/res/cardsfolder/r/robber_of_the_rich.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rosethorn_acolyte_seasonal_ritual.txt b/forge-gui/res/cardsfolder/r/rosethorn_acolyte_seasonal_ritual.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rosethorn_acolyte_seasonal_ritual.txt
rename to forge-gui/res/cardsfolder/r/rosethorn_acolyte_seasonal_ritual.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rosethorn_halberd.txt b/forge-gui/res/cardsfolder/r/rosethorn_halberd.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rosethorn_halberd.txt
rename to forge-gui/res/cardsfolder/r/rosethorn_halberd.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/roving_keep.txt b/forge-gui/res/cardsfolder/r/roving_keep.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/roving_keep.txt
rename to forge-gui/res/cardsfolder/r/roving_keep.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rowan_fearless_sparkmage.txt b/forge-gui/res/cardsfolder/r/rowan_fearless_sparkmage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rowan_fearless_sparkmage.txt
rename to forge-gui/res/cardsfolder/r/rowan_fearless_sparkmage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rowans_battleguard.txt b/forge-gui/res/cardsfolder/r/rowans_battleguard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rowans_battleguard.txt
rename to forge-gui/res/cardsfolder/r/rowans_battleguard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rowans_stalwarts.txt b/forge-gui/res/cardsfolder/r/rowans_stalwarts.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rowans_stalwarts.txt
rename to forge-gui/res/cardsfolder/r/rowans_stalwarts.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/run_away_together.txt b/forge-gui/res/cardsfolder/r/run_away_together.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/run_away_together.txt
rename to forge-gui/res/cardsfolder/r/run_away_together.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sage_of_the_falls.txt b/forge-gui/res/cardsfolder/s/sage_of_the_falls.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sage_of_the_falls.txt
rename to forge-gui/res/cardsfolder/s/sage_of_the_falls.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/savvy_hunter.txt b/forge-gui/res/cardsfolder/s/savvy_hunter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/savvy_hunter.txt
rename to forge-gui/res/cardsfolder/s/savvy_hunter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scalding_cauldron.txt b/forge-gui/res/cardsfolder/s/scalding_cauldron.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scalding_cauldron.txt
rename to forge-gui/res/cardsfolder/s/scalding_cauldron.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scorching_dragonfire.txt b/forge-gui/res/cardsfolder/s/scorching_dragonfire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scorching_dragonfire.txt
rename to forge-gui/res/cardsfolder/s/scorching_dragonfire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/searing_barrage.txt b/forge-gui/res/cardsfolder/s/searing_barrage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/searing_barrage.txt
rename to forge-gui/res/cardsfolder/s/searing_barrage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shambling_suit.txt b/forge-gui/res/cardsfolder/s/shambling_suit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shambling_suit.txt
rename to forge-gui/res/cardsfolder/s/shambling_suit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shepherd_of_the_flock_usher_to_safety.txt b/forge-gui/res/cardsfolder/s/shepherd_of_the_flock_usher_to_safety.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shepherd_of_the_flock_usher_to_safety.txt
rename to forge-gui/res/cardsfolder/s/shepherd_of_the_flock_usher_to_safety.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shimmer_dragon.txt b/forge-gui/res/cardsfolder/s/shimmer_dragon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shimmer_dragon.txt
rename to forge-gui/res/cardsfolder/s/shimmer_dragon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shinechaser.txt b/forge-gui/res/cardsfolder/s/shinechaser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shinechaser.txt
rename to forge-gui/res/cardsfolder/s/shinechaser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shining_armor.txt b/forge-gui/res/cardsfolder/s/shining_armor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shining_armor.txt
rename to forge-gui/res/cardsfolder/s/shining_armor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/signpost_scarecrow.txt b/forge-gui/res/cardsfolder/s/signpost_scarecrow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/signpost_scarecrow.txt
rename to forge-gui/res/cardsfolder/s/signpost_scarecrow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/silverflame_ritual.txt b/forge-gui/res/cardsfolder/s/silverflame_ritual.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/silverflame_ritual.txt
rename to forge-gui/res/cardsfolder/s/silverflame_ritual.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/silverflame_squire_on_alert.txt b/forge-gui/res/cardsfolder/s/silverflame_squire_on_alert.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/silverflame_squire_on_alert.txt
rename to forge-gui/res/cardsfolder/s/silverflame_squire_on_alert.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/silverwing_squadron.txt b/forge-gui/res/cardsfolder/s/silverwing_squadron.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/silverwing_squadron.txt
rename to forge-gui/res/cardsfolder/s/silverwing_squadron.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/skullknocker_ogre.txt b/forge-gui/res/cardsfolder/s/skullknocker_ogre.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/skullknocker_ogre.txt
rename to forge-gui/res/cardsfolder/s/skullknocker_ogre.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slaying_fire.txt b/forge-gui/res/cardsfolder/s/slaying_fire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slaying_fire.txt
rename to forge-gui/res/cardsfolder/s/slaying_fire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/smitten_swordmaster_curry_favor.txt b/forge-gui/res/cardsfolder/s/smitten_swordmaster_curry_favor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/smitten_swordmaster_curry_favor.txt
rename to forge-gui/res/cardsfolder/s/smitten_swordmaster_curry_favor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/so_tiny.txt b/forge-gui/res/cardsfolder/s/so_tiny.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/so_tiny.txt
rename to forge-gui/res/cardsfolder/s/so_tiny.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sorcerers_broom.txt b/forge-gui/res/cardsfolder/s/sorcerers_broom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sorcerers_broom.txt
rename to forge-gui/res/cardsfolder/s/sorcerers_broom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/specters_shriek.txt b/forge-gui/res/cardsfolder/s/specters_shriek.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/specters_shriek.txt
rename to forge-gui/res/cardsfolder/s/specters_shriek.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spinning_wheel.txt b/forge-gui/res/cardsfolder/s/spinning_wheel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spinning_wheel.txt
rename to forge-gui/res/cardsfolder/s/spinning_wheel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/steelbane_hydra.txt b/forge-gui/res/cardsfolder/s/steelbane_hydra.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/steelbane_hydra.txt
rename to forge-gui/res/cardsfolder/s/steelbane_hydra.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/steelclaw_lance.txt b/forge-gui/res/cardsfolder/s/steelclaw_lance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/steelclaw_lance.txt
rename to forge-gui/res/cardsfolder/s/steelclaw_lance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/steelgaze_griffin.txt b/forge-gui/res/cardsfolder/s/steelgaze_griffin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/steelgaze_griffin.txt
rename to forge-gui/res/cardsfolder/s/steelgaze_griffin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stolen_by_the_fae.txt b/forge-gui/res/cardsfolder/s/stolen_by_the_fae.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stolen_by_the_fae.txt
rename to forge-gui/res/cardsfolder/s/stolen_by_the_fae.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stonecoil_serpent.txt b/forge-gui/res/cardsfolder/s/stonecoil_serpent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stonecoil_serpent.txt
rename to forge-gui/res/cardsfolder/s/stonecoil_serpent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stormfist_crusader.txt b/forge-gui/res/cardsfolder/s/stormfist_crusader.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stormfist_crusader.txt
rename to forge-gui/res/cardsfolder/s/stormfist_crusader.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sundering_stroke.txt b/forge-gui/res/cardsfolder/s/sundering_stroke.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sundering_stroke.txt
rename to forge-gui/res/cardsfolder/s/sundering_stroke.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/syr_alin_the_lions_claw.txt b/forge-gui/res/cardsfolder/s/syr_alin_the_lions_claw.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/syr_alin_the_lions_claw.txt
rename to forge-gui/res/cardsfolder/s/syr_alin_the_lions_claw.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/syr_carah_the_bold.txt b/forge-gui/res/cardsfolder/s/syr_carah_the_bold.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/syr_carah_the_bold.txt
rename to forge-gui/res/cardsfolder/s/syr_carah_the_bold.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/syr_elenora_the_discerning.txt b/forge-gui/res/cardsfolder/s/syr_elenora_the_discerning.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/syr_elenora_the_discerning.txt
rename to forge-gui/res/cardsfolder/s/syr_elenora_the_discerning.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/syr_faren_the_hengehammer.txt b/forge-gui/res/cardsfolder/s/syr_faren_the_hengehammer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/syr_faren_the_hengehammer.txt
rename to forge-gui/res/cardsfolder/s/syr_faren_the_hengehammer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/syr_gwyn_hero_of_ashvale.txt b/forge-gui/res/cardsfolder/s/syr_gwyn_hero_of_ashvale.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/syr_gwyn_hero_of_ashvale.txt
rename to forge-gui/res/cardsfolder/s/syr_gwyn_hero_of_ashvale.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/syr_konrad_the_grim.txt b/forge-gui/res/cardsfolder/s/syr_konrad_the_grim.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/syr_konrad_the_grim.txt
rename to forge-gui/res/cardsfolder/s/syr_konrad_the_grim.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tall_as_a_beanstalk.txt b/forge-gui/res/cardsfolder/t/tall_as_a_beanstalk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tall_as_a_beanstalk.txt
rename to forge-gui/res/cardsfolder/t/tall_as_a_beanstalk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/taste_of_death.txt b/forge-gui/res/cardsfolder/t/taste_of_death.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/taste_of_death.txt
rename to forge-gui/res/cardsfolder/t/taste_of_death.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tempting_witch.txt b/forge-gui/res/cardsfolder/t/tempting_witch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tempting_witch.txt
rename to forge-gui/res/cardsfolder/t/tempting_witch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_cauldron_of_eternity.txt b/forge-gui/res/cardsfolder/t/the_cauldron_of_eternity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_cauldron_of_eternity.txt
rename to forge-gui/res/cardsfolder/t/the_cauldron_of_eternity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_circle_of_loyalty.txt b/forge-gui/res/cardsfolder/t/the_circle_of_loyalty.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_circle_of_loyalty.txt
rename to forge-gui/res/cardsfolder/t/the_circle_of_loyalty.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_great_henge.txt b/forge-gui/res/cardsfolder/t/the_great_henge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_great_henge.txt
rename to forge-gui/res/cardsfolder/t/the_great_henge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_magic_mirror.txt b/forge-gui/res/cardsfolder/t/the_magic_mirror.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_magic_mirror.txt
rename to forge-gui/res/cardsfolder/t/the_magic_mirror.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_royal_scions.txt b/forge-gui/res/cardsfolder/t/the_royal_scions.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_royal_scions.txt
rename to forge-gui/res/cardsfolder/t/the_royal_scions.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thorn_mammoth.txt b/forge-gui/res/cardsfolder/t/thorn_mammoth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thorn_mammoth.txt
rename to forge-gui/res/cardsfolder/t/thorn_mammoth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thrill_of_possibility.txt b/forge-gui/res/cardsfolder/t/thrill_of_possibility.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thrill_of_possibility.txt
rename to forge-gui/res/cardsfolder/t/thrill_of_possibility.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thunderous_snapper.txt b/forge-gui/res/cardsfolder/t/thunderous_snapper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thunderous_snapper.txt
rename to forge-gui/res/cardsfolder/t/thunderous_snapper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tome_of_legends.txt b/forge-gui/res/cardsfolder/t/tome_of_legends.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tome_of_legends.txt
rename to forge-gui/res/cardsfolder/t/tome_of_legends.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tome_raider.txt b/forge-gui/res/cardsfolder/t/tome_raider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tome_raider.txt
rename to forge-gui/res/cardsfolder/t/tome_raider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/torbran_thane_of_red_fell.txt b/forge-gui/res/cardsfolder/t/torbran_thane_of_red_fell.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/torbran_thane_of_red_fell.txt
rename to forge-gui/res/cardsfolder/t/torbran_thane_of_red_fell.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tournament_grounds.txt b/forge-gui/res/cardsfolder/t/tournament_grounds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tournament_grounds.txt
rename to forge-gui/res/cardsfolder/t/tournament_grounds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/trail_of_crumbs.txt b/forge-gui/res/cardsfolder/t/trail_of_crumbs.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/trail_of_crumbs.txt
rename to forge-gui/res/cardsfolder/t/trail_of_crumbs.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/trapped_in_the_tower.txt b/forge-gui/res/cardsfolder/t/trapped_in_the_tower.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/trapped_in_the_tower.txt
rename to forge-gui/res/cardsfolder/t/trapped_in_the_tower.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/true_loves_kiss.txt b/forge-gui/res/cardsfolder/t/true_loves_kiss.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/true_loves_kiss.txt
rename to forge-gui/res/cardsfolder/t/true_loves_kiss.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tuinvale_treefolk_oaken_boon.txt b/forge-gui/res/cardsfolder/t/tuinvale_treefolk_oaken_boon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tuinvale_treefolk_oaken_boon.txt
rename to forge-gui/res/cardsfolder/t/tuinvale_treefolk_oaken_boon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/turn_into_a_pumpkin.txt b/forge-gui/res/cardsfolder/t/turn_into_a_pumpkin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/turn_into_a_pumpkin.txt
rename to forge-gui/res/cardsfolder/t/turn_into_a_pumpkin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unexplained_vision.txt b/forge-gui/res/cardsfolder/u/unexplained_vision.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unexplained_vision.txt
rename to forge-gui/res/cardsfolder/u/unexplained_vision.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vantress_gargoyle.txt b/forge-gui/res/cardsfolder/v/vantress_gargoyle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vantress_gargoyle.txt
rename to forge-gui/res/cardsfolder/v/vantress_gargoyle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vantress_paladin.txt b/forge-gui/res/cardsfolder/v/vantress_paladin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vantress_paladin.txt
rename to forge-gui/res/cardsfolder/v/vantress_paladin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/venerable_knight.txt b/forge-gui/res/cardsfolder/v/venerable_knight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/venerable_knight.txt
rename to forge-gui/res/cardsfolder/v/venerable_knight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wandermare.txt b/forge-gui/res/cardsfolder/w/wandermare.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wandermare.txt
rename to forge-gui/res/cardsfolder/w/wandermare.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/weapon_rack.txt b/forge-gui/res/cardsfolder/w/weapon_rack.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/weapon_rack.txt
rename to forge-gui/res/cardsfolder/w/weapon_rack.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/weaselback_redcap.txt b/forge-gui/res/cardsfolder/w/weaselback_redcap.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/weaselback_redcap.txt
rename to forge-gui/res/cardsfolder/w/weaselback_redcap.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wicked_guardian.txt b/forge-gui/res/cardsfolder/w/wicked_guardian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wicked_guardian.txt
rename to forge-gui/res/cardsfolder/w/wicked_guardian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wicked_wolf.txt b/forge-gui/res/cardsfolder/w/wicked_wolf.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wicked_wolf.txt
rename to forge-gui/res/cardsfolder/w/wicked_wolf.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wildborn_preserver.txt b/forge-gui/res/cardsfolder/w/wildborn_preserver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wildborn_preserver.txt
rename to forge-gui/res/cardsfolder/w/wildborn_preserver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wildwood_tracker.txt b/forge-gui/res/cardsfolder/w/wildwood_tracker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wildwood_tracker.txt
rename to forge-gui/res/cardsfolder/w/wildwood_tracker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wintermoor_commander.txt b/forge-gui/res/cardsfolder/w/wintermoor_commander.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wintermoor_commander.txt
rename to forge-gui/res/cardsfolder/w/wintermoor_commander.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wishclaw_talisman.txt b/forge-gui/res/cardsfolder/w/wishclaw_talisman.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wishclaw_talisman.txt
rename to forge-gui/res/cardsfolder/w/wishclaw_talisman.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wishful_merfolk.txt b/forge-gui/res/cardsfolder/w/wishful_merfolk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wishful_merfolk.txt
rename to forge-gui/res/cardsfolder/w/wishful_merfolk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/witching_well.txt b/forge-gui/res/cardsfolder/w/witching_well.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/witching_well.txt
rename to forge-gui/res/cardsfolder/w/witching_well.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/witchs_cottage.txt b/forge-gui/res/cardsfolder/w/witchs_cottage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/witchs_cottage.txt
rename to forge-gui/res/cardsfolder/w/witchs_cottage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/witchs_oven.txt b/forge-gui/res/cardsfolder/w/witchs_oven.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/witchs_oven.txt
rename to forge-gui/res/cardsfolder/w/witchs_oven.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/witchs_vengeance.txt b/forge-gui/res/cardsfolder/w/witchs_vengeance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/witchs_vengeance.txt
rename to forge-gui/res/cardsfolder/w/witchs_vengeance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wolfs_quarry.txt b/forge-gui/res/cardsfolder/w/wolfs_quarry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wolfs_quarry.txt
rename to forge-gui/res/cardsfolder/w/wolfs_quarry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/workshop_elders.txt b/forge-gui/res/cardsfolder/w/workshop_elders.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/workshop_elders.txt
rename to forge-gui/res/cardsfolder/w/workshop_elders.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/worthy_knight.txt b/forge-gui/res/cardsfolder/w/worthy_knight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/worthy_knight.txt
rename to forge-gui/res/cardsfolder/w/worthy_knight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yorvo_lord_of_garenbrig.txt b/forge-gui/res/cardsfolder/y/yorvo_lord_of_garenbrig.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yorvo_lord_of_garenbrig.txt
rename to forge-gui/res/cardsfolder/y/yorvo_lord_of_garenbrig.txt