diff --git a/forge-gui/res/cardsfolder/upcoming/a_killer_among_us.txt b/forge-gui/res/cardsfolder/a/a_killer_among_us.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/a_killer_among_us.txt
rename to forge-gui/res/cardsfolder/a/a_killer_among_us.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/absolving_lammasu.txt b/forge-gui/res/cardsfolder/a/absolving_lammasu.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/absolving_lammasu.txt
rename to forge-gui/res/cardsfolder/a/absolving_lammasu.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/acquired_mutation.txt b/forge-gui/res/cardsfolder/a/acquired_mutation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/acquired_mutation.txt
rename to forge-gui/res/cardsfolder/a/acquired_mutation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aegis_of_the_legion.txt b/forge-gui/res/cardsfolder/a/aegis_of_the_legion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aegis_of_the_legion.txt
rename to forge-gui/res/cardsfolder/a/aegis_of_the_legion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/afterlife_insurance.txt b/forge-gui/res/cardsfolder/a/afterlife_insurance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/afterlife_insurance.txt
rename to forge-gui/res/cardsfolder/a/afterlife_insurance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aftermath_analyst.txt b/forge-gui/res/cardsfolder/a/aftermath_analyst.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aftermath_analyst.txt
rename to forge-gui/res/cardsfolder/a/aftermath_analyst.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/agency_coroner.txt b/forge-gui/res/cardsfolder/a/agency_coroner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/agency_coroner.txt
rename to forge-gui/res/cardsfolder/a/agency_coroner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/agency_outfitter.txt b/forge-gui/res/cardsfolder/a/agency_outfitter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/agency_outfitter.txt
rename to forge-gui/res/cardsfolder/a/agency_outfitter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/agent_frank_horrigan.txt b/forge-gui/res/cardsfolder/a/agent_frank_horrigan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/agent_frank_horrigan.txt
rename to forge-gui/res/cardsfolder/a/agent_frank_horrigan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/agility_bobblehead.txt b/forge-gui/res/cardsfolder/a/agility_bobblehead.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/agility_bobblehead.txt
rename to forge-gui/res/cardsfolder/a/agility_bobblehead.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/agrus_kos_spirit_of_justice.txt b/forge-gui/res/cardsfolder/a/agrus_kos_spirit_of_justice.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/agrus_kos_spirit_of_justice.txt
rename to forge-gui/res/cardsfolder/a/agrus_kos_spirit_of_justice.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/airtight_alibi.txt b/forge-gui/res/cardsfolder/a/airtight_alibi.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/airtight_alibi.txt
rename to forge-gui/res/cardsfolder/a/airtight_alibi.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ajani_nacatl_pariah_ajani_nacatl_avenger.txt b/forge-gui/res/cardsfolder/a/ajani_nacatl_pariah_ajani_nacatl_avenger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ajani_nacatl_pariah_ajani_nacatl_avenger.txt
rename to forge-gui/res/cardsfolder/a/ajani_nacatl_pariah_ajani_nacatl_avenger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alley_assailant.txt b/forge-gui/res/cardsfolder/a/alley_assailant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alley_assailant.txt
rename to forge-gui/res/cardsfolder/a/alley_assailant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/almost_perfect.txt b/forge-gui/res/cardsfolder/a/almost_perfect.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/almost_perfect.txt
rename to forge-gui/res/cardsfolder/a/almost_perfect.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alpha_deathclaw.txt b/forge-gui/res/cardsfolder/a/alpha_deathclaw.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alpha_deathclaw.txt
rename to forge-gui/res/cardsfolder/a/alpha_deathclaw.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alquist_proft_master_sleuth.txt b/forge-gui/res/cardsfolder/a/alquist_proft_master_sleuth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alquist_proft_master_sleuth.txt
rename to forge-gui/res/cardsfolder/a/alquist_proft_master_sleuth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/amzu_swarms_hunger.txt b/forge-gui/res/cardsfolder/a/amzu_swarms_hunger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/amzu_swarms_hunger.txt
rename to forge-gui/res/cardsfolder/a/amzu_swarms_hunger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/analyze_the_pollen.txt b/forge-gui/res/cardsfolder/a/analyze_the_pollen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/analyze_the_pollen.txt
rename to forge-gui/res/cardsfolder/a/analyze_the_pollen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/animal_friend.txt b/forge-gui/res/cardsfolder/a/animal_friend.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/animal_friend.txt
rename to forge-gui/res/cardsfolder/a/animal_friend.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/anzrag_the_quake_mole.txt b/forge-gui/res/cardsfolder/a/anzrag_the_quake_mole.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/anzrag_the_quake_mole.txt
rename to forge-gui/res/cardsfolder/a/anzrag_the_quake_mole.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/anzrags_rampage.txt b/forge-gui/res/cardsfolder/a/anzrags_rampage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/anzrags_rampage.txt
rename to forge-gui/res/cardsfolder/a/anzrags_rampage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/apothecary_white.txt b/forge-gui/res/cardsfolder/a/apothecary_white.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/apothecary_white.txt
rename to forge-gui/res/cardsfolder/a/apothecary_white.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/arcade_gannon.txt b/forge-gui/res/cardsfolder/a/arcade_gannon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/arcade_gannon.txt
rename to forge-gui/res/cardsfolder/a/arcade_gannon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/archdruids_charm.txt b/forge-gui/res/cardsfolder/a/archdruids_charm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/archdruids_charm.txt
rename to forge-gui/res/cardsfolder/a/archdruids_charm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/armed_with_proof.txt b/forge-gui/res/cardsfolder/a/armed_with_proof.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/armed_with_proof.txt
rename to forge-gui/res/cardsfolder/a/armed_with_proof.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/armory_paladin.txt b/forge-gui/res/cardsfolder/a/armory_paladin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/armory_paladin.txt
rename to forge-gui/res/cardsfolder/a/armory_paladin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/assaultron_dominator.txt b/forge-gui/res/cardsfolder/a/assaultron_dominator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/assaultron_dominator.txt
rename to forge-gui/res/cardsfolder/a/assaultron_dominator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/assemble_the_players.txt b/forge-gui/res/cardsfolder/a/assemble_the_players.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/assemble_the_players.txt
rename to forge-gui/res/cardsfolder/a/assemble_the_players.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/atomize.txt b/forge-gui/res/cardsfolder/a/atomize.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/atomize.txt
rename to forge-gui/res/cardsfolder/a/atomize.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/audience_with_trostani.txt b/forge-gui/res/cardsfolder/a/audience_with_trostani.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/audience_with_trostani.txt
rename to forge-gui/res/cardsfolder/a/audience_with_trostani.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aurelia_the_law_above.txt b/forge-gui/res/cardsfolder/a/aurelia_the_law_above.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aurelia_the_law_above.txt
rename to forge-gui/res/cardsfolder/a/aurelia_the_law_above.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aurelias_vindicator.txt b/forge-gui/res/cardsfolder/a/aurelias_vindicator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aurelias_vindicator.txt
rename to forge-gui/res/cardsfolder/a/aurelias_vindicator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/auspicious_arrival.txt b/forge-gui/res/cardsfolder/a/auspicious_arrival.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/auspicious_arrival.txt
rename to forge-gui/res/cardsfolder/a/auspicious_arrival.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/automated_assembly_line.txt b/forge-gui/res/cardsfolder/a/automated_assembly_line.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/automated_assembly_line.txt
rename to forge-gui/res/cardsfolder/a/automated_assembly_line.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/axebane_ferox.txt b/forge-gui/res/cardsfolder/a/axebane_ferox.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/axebane_ferox.txt
rename to forge-gui/res/cardsfolder/a/axebane_ferox.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ballroom.txt b/forge-gui/res/cardsfolder/b/ballroom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ballroom.txt
rename to forge-gui/res/cardsfolder/b/ballroom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/barbara_wright.txt b/forge-gui/res/cardsfolder/b/barbara_wright.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/barbara_wright.txt
rename to forge-gui/res/cardsfolder/b/barbara_wright.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/barbed_servitor.txt b/forge-gui/res/cardsfolder/b/barbed_servitor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/barbed_servitor.txt
rename to forge-gui/res/cardsfolder/b/barbed_servitor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/basilica_stalker.txt b/forge-gui/res/cardsfolder/b/basilica_stalker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/basilica_stalker.txt
rename to forge-gui/res/cardsfolder/b/basilica_stalker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/battle_of_hoover_dam.txt b/forge-gui/res/cardsfolder/b/battle_of_hoover_dam.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/battle_of_hoover_dam.txt
rename to forge-gui/res/cardsfolder/b/battle_of_hoover_dam.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/behemoth_of_vault_0.txt b/forge-gui/res/cardsfolder/b/behemoth_of_vault_0.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/behemoth_of_vault_0.txt
rename to forge-gui/res/cardsfolder/b/behemoth_of_vault_0.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/behind_the_mask.txt b/forge-gui/res/cardsfolder/b/behind_the_mask.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/behind_the_mask.txt
rename to forge-gui/res/cardsfolder/b/behind_the_mask.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/benthic_criminologists.txt b/forge-gui/res/cardsfolder/b/benthic_criminologists.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/benthic_criminologists.txt
rename to forge-gui/res/cardsfolder/b/benthic_criminologists.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bighorner_rancher.txt b/forge-gui/res/cardsfolder/b/bighorner_rancher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bighorner_rancher.txt
rename to forge-gui/res/cardsfolder/b/bighorner_rancher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/billiard_room.txt b/forge-gui/res/cardsfolder/b/billiard_room.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/billiard_room.txt
rename to forge-gui/res/cardsfolder/b/billiard_room.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bite_down_on_crime.txt b/forge-gui/res/cardsfolder/b/bite_down_on_crime.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bite_down_on_crime.txt
rename to forge-gui/res/cardsfolder/b/bite_down_on_crime.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bloatfly_swarm.txt b/forge-gui/res/cardsfolder/b/bloatfly_swarm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bloatfly_swarm.txt
rename to forge-gui/res/cardsfolder/b/bloatfly_swarm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt b/forge-gui/res/cardsfolder/b/blood_spatter_analysis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt
rename to forge-gui/res/cardsfolder/b/blood_spatter_analysis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bolrac_clan_basher.txt b/forge-gui/res/cardsfolder/b/bolrac_clan_basher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bolrac_clan_basher.txt
rename to forge-gui/res/cardsfolder/b/bolrac_clan_basher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/boomer_scrapper.txt b/forge-gui/res/cardsfolder/b/boomer_scrapper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/boomer_scrapper.txt
rename to forge-gui/res/cardsfolder/b/boomer_scrapper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/boros_strike_captain.txt b/forge-gui/res/cardsfolder/b/boros_strike_captain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/boros_strike_captain.txt
rename to forge-gui/res/cardsfolder/b/boros_strike_captain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bottle_cap_blast.txt b/forge-gui/res/cardsfolder/b/bottle_cap_blast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bottle_cap_blast.txt
rename to forge-gui/res/cardsfolder/b/bottle_cap_blast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/branch_of_vitu_ghazi.txt b/forge-gui/res/cardsfolder/b/branch_of_vitu_ghazi.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/branch_of_vitu_ghazi.txt
rename to forge-gui/res/cardsfolder/b/branch_of_vitu_ghazi.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brazen_boarding.txt b/forge-gui/res/cardsfolder/b/brazen_boarding.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brazen_boarding.txt
rename to forge-gui/res/cardsfolder/b/brazen_boarding.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/break_down.txt b/forge-gui/res/cardsfolder/b/break_down.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/break_down.txt
rename to forge-gui/res/cardsfolder/b/break_down.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/break_out.txt b/forge-gui/res/cardsfolder/b/break_out.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/break_out.txt
rename to forge-gui/res/cardsfolder/b/break_out.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brotherhood_outcast.txt b/forge-gui/res/cardsfolder/b/brotherhood_outcast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brotherhood_outcast.txt
rename to forge-gui/res/cardsfolder/b/brotherhood_outcast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brotherhood_scribe.txt b/forge-gui/res/cardsfolder/b/brotherhood_scribe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brotherhood_scribe.txt
rename to forge-gui/res/cardsfolder/b/brotherhood_scribe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brotherhood_vertibird.txt b/forge-gui/res/cardsfolder/b/brotherhood_vertibird.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/brotherhood_vertibird.txt
rename to forge-gui/res/cardsfolder/b/brotherhood_vertibird.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bubble_smuggler.txt b/forge-gui/res/cardsfolder/b/bubble_smuggler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bubble_smuggler.txt
rename to forge-gui/res/cardsfolder/b/bubble_smuggler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/burden_of_proof.txt b/forge-gui/res/cardsfolder/b/burden_of_proof.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/burden_of_proof.txt
rename to forge-gui/res/cardsfolder/b/burden_of_proof.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/buried_in_the_garden.txt b/forge-gui/res/cardsfolder/b/buried_in_the_garden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/buried_in_the_garden.txt
rename to forge-gui/res/cardsfolder/b/buried_in_the_garden.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/butch_deLoria_tunnel_snake.txt b/forge-gui/res/cardsfolder/b/butch_deLoria_tunnel_snake.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/butch_deLoria_tunnel_snake.txt
rename to forge-gui/res/cardsfolder/b/butch_deLoria_tunnel_snake.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/caesar_legions_emperor.txt b/forge-gui/res/cardsfolder/c/caesar_legions_emperor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/caesar_legions_emperor.txt
rename to forge-gui/res/cardsfolder/c/caesar_legions_emperor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cait_cage_brawler.txt b/forge-gui/res/cardsfolder/c/cait_cage_brawler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cait_cage_brawler.txt
rename to forge-gui/res/cardsfolder/c/cait_cage_brawler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/caldera_breaker.txt b/forge-gui/res/cardsfolder/c/caldera_breaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/caldera_breaker.txt
rename to forge-gui/res/cardsfolder/c/caldera_breaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/call_a_surprise_witness.txt b/forge-gui/res/cardsfolder/c/call_a_surprise_witness.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/call_a_surprise_witness.txt
rename to forge-gui/res/cardsfolder/c/call_a_surprise_witness.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/candlestick.txt b/forge-gui/res/cardsfolder/c/candlestick.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/candlestick.txt
rename to forge-gui/res/cardsfolder/c/candlestick.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/carnage_interpreter.txt b/forge-gui/res/cardsfolder/c/carnage_interpreter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/carnage_interpreter.txt
rename to forge-gui/res/cardsfolder/c/carnage_interpreter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_file_auditor.txt b/forge-gui/res/cardsfolder/c/case_file_auditor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_file_auditor.txt
rename to forge-gui/res/cardsfolder/c/case_file_auditor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_burning_masks.txt b/forge-gui/res/cardsfolder/c/case_of_the_burning_masks.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_of_the_burning_masks.txt
rename to forge-gui/res/cardsfolder/c/case_of_the_burning_masks.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_crimson_pulse.txt b/forge-gui/res/cardsfolder/c/case_of_the_crimson_pulse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_of_the_crimson_pulse.txt
rename to forge-gui/res/cardsfolder/c/case_of_the_crimson_pulse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_filched_falcon.txt b/forge-gui/res/cardsfolder/c/case_of_the_filched_falcon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_of_the_filched_falcon.txt
rename to forge-gui/res/cardsfolder/c/case_of_the_filched_falcon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_gateway_express.txt b/forge-gui/res/cardsfolder/c/case_of_the_gateway_express.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_of_the_gateway_express.txt
rename to forge-gui/res/cardsfolder/c/case_of_the_gateway_express.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_gorgons_kiss.txt b/forge-gui/res/cardsfolder/c/case_of_the_gorgons_kiss.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_of_the_gorgons_kiss.txt
rename to forge-gui/res/cardsfolder/c/case_of_the_gorgons_kiss.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_locked_hothouse.txt b/forge-gui/res/cardsfolder/c/case_of_the_locked_hothouse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_of_the_locked_hothouse.txt
rename to forge-gui/res/cardsfolder/c/case_of_the_locked_hothouse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_pilfered_proof.txt b/forge-gui/res/cardsfolder/c/case_of_the_pilfered_proof.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_of_the_pilfered_proof.txt
rename to forge-gui/res/cardsfolder/c/case_of_the_pilfered_proof.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_ransacked_lab.txt b/forge-gui/res/cardsfolder/c/case_of_the_ransacked_lab.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_of_the_ransacked_lab.txt
rename to forge-gui/res/cardsfolder/c/case_of_the_ransacked_lab.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_shattered_pact.txt b/forge-gui/res/cardsfolder/c/case_of_the_shattered_pact.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_of_the_shattered_pact.txt
rename to forge-gui/res/cardsfolder/c/case_of_the_shattered_pact.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_stashed_skeleton.txt b/forge-gui/res/cardsfolder/c/case_of_the_stashed_skeleton.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_of_the_stashed_skeleton.txt
rename to forge-gui/res/cardsfolder/c/case_of_the_stashed_skeleton.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_trampled_garden.txt b/forge-gui/res/cardsfolder/c/case_of_the_trampled_garden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_of_the_trampled_garden.txt
rename to forge-gui/res/cardsfolder/c/case_of_the_trampled_garden.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_uneaten_feast.txt b/forge-gui/res/cardsfolder/c/case_of_the_uneaten_feast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/case_of_the_uneaten_feast.txt
rename to forge-gui/res/cardsfolder/c/case_of_the_uneaten_feast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cass_hand_of_vengeance.txt b/forge-gui/res/cardsfolder/c/cass_hand_of_vengeance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cass_hand_of_vengeance.txt
rename to forge-gui/res/cardsfolder/c/cass_hand_of_vengeance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cathedral_acolyte.txt b/forge-gui/res/cardsfolder/c/cathedral_acolyte.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cathedral_acolyte.txt
rename to forge-gui/res/cardsfolder/c/cathedral_acolyte.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/caught_red_handed.txt b/forge-gui/res/cardsfolder/c/caught_red_handed.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/caught_red_handed.txt
rename to forge-gui/res/cardsfolder/c/caught_red_handed.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cease_desist.txt b/forge-gui/res/cardsfolder/c/cease_desist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cease_desist.txt
rename to forge-gui/res/cardsfolder/c/cease_desist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cerebral_confiscation.txt b/forge-gui/res/cardsfolder/c/cerebral_confiscation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cerebral_confiscation.txt
rename to forge-gui/res/cardsfolder/c/cerebral_confiscation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chalk_outline.txt b/forge-gui/res/cardsfolder/c/chalk_outline.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chalk_outline.txt
rename to forge-gui/res/cardsfolder/c/chalk_outline.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/charisma_bobblehead.txt b/forge-gui/res/cardsfolder/c/charisma_bobblehead.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/charisma_bobblehead.txt
rename to forge-gui/res/cardsfolder/c/charisma_bobblehead.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/charnel_serenade.txt b/forge-gui/res/cardsfolder/c/charnel_serenade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/charnel_serenade.txt
rename to forge-gui/res/cardsfolder/c/charnel_serenade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chitinous_crawler.txt b/forge-gui/res/cardsfolder/c/chitinous_crawler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chitinous_crawler.txt
rename to forge-gui/res/cardsfolder/c/chitinous_crawler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clandestine_meddler.txt b/forge-gui/res/cardsfolder/c/clandestine_meddler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clandestine_meddler.txt
rename to forge-gui/res/cardsfolder/c/clandestine_meddler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/codsworth_handy_helper.txt b/forge-gui/res/cardsfolder/c/codsworth_handy_helper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/codsworth_handy_helper.txt
rename to forge-gui/res/cardsfolder/c/codsworth_handy_helper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/coerced_to_kill.txt b/forge-gui/res/cardsfolder/c/coerced_to_kill.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/coerced_to_kill.txt
rename to forge-gui/res/cardsfolder/c/coerced_to_kill.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cogwork_progenitor.txt b/forge-gui/res/cardsfolder/c/cogwork_progenitor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cogwork_progenitor.txt
rename to forge-gui/res/cardsfolder/c/cogwork_progenitor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cold_case_cracker.txt b/forge-gui/res/cardsfolder/c/cold_case_cracker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cold_case_cracker.txt
rename to forge-gui/res/cardsfolder/c/cold_case_cracker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/colonel_autumn.txt b/forge-gui/res/cardsfolder/c/colonel_autumn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/colonel_autumn.txt
rename to forge-gui/res/cardsfolder/c/colonel_autumn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/colossal_chorus.txt b/forge-gui/res/cardsfolder/c/colossal_chorus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/colossal_chorus.txt
rename to forge-gui/res/cardsfolder/c/colossal_chorus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/commander_mustard.txt b/forge-gui/res/cardsfolder/c/commander_mustard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/commander_mustard.txt
rename to forge-gui/res/cardsfolder/c/commander_mustard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/commander_sofia_daguerre.txt b/forge-gui/res/cardsfolder/c/commander_sofia_daguerre.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/commander_sofia_daguerre.txt
rename to forge-gui/res/cardsfolder/c/commander_sofia_daguerre.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/commercial_district.txt b/forge-gui/res/cardsfolder/c/commercial_district.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/commercial_district.txt
rename to forge-gui/res/cardsfolder/c/commercial_district.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/concealed_weapon.txt b/forge-gui/res/cardsfolder/c/concealed_weapon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/concealed_weapon.txt
rename to forge-gui/res/cardsfolder/c/concealed_weapon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/conclave_evangelist.txt b/forge-gui/res/cardsfolder/c/conclave_evangelist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/conclave_evangelist.txt
rename to forge-gui/res/cardsfolder/c/conclave_evangelist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/connecting_the_dots.txt b/forge-gui/res/cardsfolder/c/connecting_the_dots.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/connecting_the_dots.txt
rename to forge-gui/res/cardsfolder/c/connecting_the_dots.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/conservatory.txt b/forge-gui/res/cardsfolder/c/conservatory.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/conservatory.txt
rename to forge-gui/res/cardsfolder/c/conservatory.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/conspiracy_unraveler.txt b/forge-gui/res/cardsfolder/c/conspiracy_unraveler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/conspiracy_unraveler.txt
rename to forge-gui/res/cardsfolder/c/conspiracy_unraveler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/contaminated_drink.txt b/forge-gui/res/cardsfolder/c/contaminated_drink.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/contaminated_drink.txt
rename to forge-gui/res/cardsfolder/c/contaminated_drink.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/convenient_target.txt b/forge-gui/res/cardsfolder/c/convenient_target.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/convenient_target.txt
rename to forge-gui/res/cardsfolder/c/convenient_target.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/copy_catchers.txt b/forge-gui/res/cardsfolder/c/copy_catchers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/copy_catchers.txt
rename to forge-gui/res/cardsfolder/c/copy_catchers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cornered_crook.txt b/forge-gui/res/cardsfolder/c/cornered_crook.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cornered_crook.txt
rename to forge-gui/res/cardsfolder/c/cornered_crook.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/corporeal_projection.txt b/forge-gui/res/cardsfolder/c/corporeal_projection.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/corporeal_projection.txt
rename to forge-gui/res/cardsfolder/c/corporeal_projection.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/counterpoint.txt b/forge-gui/res/cardsfolder/c/counterpoint.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/counterpoint.txt
rename to forge-gui/res/cardsfolder/c/counterpoint.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/coveted_falcon.txt b/forge-gui/res/cardsfolder/c/coveted_falcon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/coveted_falcon.txt
rename to forge-gui/res/cardsfolder/c/coveted_falcon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/covetous_elegy.txt b/forge-gui/res/cardsfolder/c/covetous_elegy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/covetous_elegy.txt
rename to forge-gui/res/cardsfolder/c/covetous_elegy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/craig_boone_novac_guard.txt b/forge-gui/res/cardsfolder/c/craig_boone_novac_guard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/craig_boone_novac_guard.txt
rename to forge-gui/res/cardsfolder/c/craig_boone_novac_guard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crime_novelist.txt b/forge-gui/res/cardsfolder/c/crime_novelist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crime_novelist.txt
rename to forge-gui/res/cardsfolder/c/crime_novelist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crimestopper_sprite.txt b/forge-gui/res/cardsfolder/c/crimestopper_sprite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crimestopper_sprite.txt
rename to forge-gui/res/cardsfolder/c/crimestopper_sprite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crimson_caravaneer.txt b/forge-gui/res/cardsfolder/c/crimson_caravaneer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crimson_caravaneer.txt
rename to forge-gui/res/cardsfolder/c/crimson_caravaneer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crowd_control_warden.txt b/forge-gui/res/cardsfolder/c/crowd_control_warden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crowd_control_warden.txt
rename to forge-gui/res/cardsfolder/c/crowd_control_warden.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cryptex.txt b/forge-gui/res/cardsfolder/c/cryptex.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cryptex.txt
rename to forge-gui/res/cardsfolder/c/cryptex.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cryptic_coat.txt b/forge-gui/res/cardsfolder/c/cryptic_coat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cryptic_coat.txt
rename to forge-gui/res/cardsfolder/c/cryptic_coat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/culvert_ambusher.txt b/forge-gui/res/cardsfolder/c/culvert_ambusher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/culvert_ambusher.txt
rename to forge-gui/res/cardsfolder/c/culvert_ambusher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curie_emergent_intelligence.txt b/forge-gui/res/cardsfolder/c/curie_emergent_intelligence.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curie_emergent_intelligence.txt
rename to forge-gui/res/cardsfolder/c/curie_emergent_intelligence.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curious_cadaver.txt b/forge-gui/res/cardsfolder/c/curious_cadaver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curious_cadaver.txt
rename to forge-gui/res/cardsfolder/c/curious_cadaver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/curious_inquiry.txt b/forge-gui/res/cardsfolder/c/curious_inquiry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/curious_inquiry.txt
rename to forge-gui/res/cardsfolder/c/curious_inquiry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deadly_complication.txt b/forge-gui/res/cardsfolder/d/deadly_complication.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deadly_complication.txt
rename to forge-gui/res/cardsfolder/d/deadly_complication.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deadly_cover_up.txt b/forge-gui/res/cardsfolder/d/deadly_cover_up.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deadly_cover_up.txt
rename to forge-gui/res/cardsfolder/d/deadly_cover_up.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deduce.txt b/forge-gui/res/cardsfolder/d/deduce.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deduce.txt
rename to forge-gui/res/cardsfolder/d/deduce.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/defenestrated_phantom.txt b/forge-gui/res/cardsfolder/d/defenestrated_phantom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/defenestrated_phantom.txt
rename to forge-gui/res/cardsfolder/d/defenestrated_phantom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/delney_streetwise_lookout.txt b/forge-gui/res/cardsfolder/d/delney_streetwise_lookout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/delney_streetwise_lookout.txt
rename to forge-gui/res/cardsfolder/d/delney_streetwise_lookout.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/demand_answers.txt b/forge-gui/res/cardsfolder/d/demand_answers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/demand_answers.txt
rename to forge-gui/res/cardsfolder/d/demand_answers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/desdemona_freedoms_edge.txt b/forge-gui/res/cardsfolder/d/desdemona_freedoms_edge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/desdemona_freedoms_edge.txt
rename to forge-gui/res/cardsfolder/d/desdemona_freedoms_edge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/desolate_mire.txt b/forge-gui/res/cardsfolder/d/desolate_mire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/desolate_mire.txt
rename to forge-gui/res/cardsfolder/d/desolate_mire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/detective_of_the_month.txt b/forge-gui/res/cardsfolder/d/detective_of_the_month.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/detective_of_the_month.txt
rename to forge-gui/res/cardsfolder/d/detective_of_the_month.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/detectives_satchel.txt b/forge-gui/res/cardsfolder/d/detectives_satchel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/detectives_satchel.txt
rename to forge-gui/res/cardsfolder/d/detectives_satchel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/diamond_city.txt b/forge-gui/res/cardsfolder/d/diamond_city.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/diamond_city.txt
rename to forge-gui/res/cardsfolder/d/diamond_city.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dining_room.txt b/forge-gui/res/cardsfolder/d/dining_room.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dining_room.txt
rename to forge-gui/res/cardsfolder/d/dining_room.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dog_walker.txt b/forge-gui/res/cardsfolder/d/dog_walker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dog_walker.txt
rename to forge-gui/res/cardsfolder/d/dog_walker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dogmeat_ever_loyal.txt b/forge-gui/res/cardsfolder/d/dogmeat_ever_loyal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dogmeat_ever_loyal.txt
rename to forge-gui/res/cardsfolder/d/dogmeat_ever_loyal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/doorkeeper_thrull.txt b/forge-gui/res/cardsfolder/d/doorkeeper_thrull.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/doorkeeper_thrull.txt
rename to forge-gui/res/cardsfolder/d/doorkeeper_thrull.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/doppelgang.txt b/forge-gui/res/cardsfolder/d/doppelgang.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/doppelgang.txt
rename to forge-gui/res/cardsfolder/d/doppelgang.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dr_madison_li.txt b/forge-gui/res/cardsfolder/d/dr_madison_li.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dr_madison_li.txt
rename to forge-gui/res/cardsfolder/d/dr_madison_li.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/drag_the_canal.txt b/forge-gui/res/cardsfolder/d/drag_the_canal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/drag_the_canal.txt
rename to forge-gui/res/cardsfolder/d/drag_the_canal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dramatic_accusation.txt b/forge-gui/res/cardsfolder/d/dramatic_accusation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dramatic_accusation.txt
rename to forge-gui/res/cardsfolder/d/dramatic_accusation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/duchess_wayward_tavernkeep.txt b/forge-gui/res/cardsfolder/d/duchess_wayward_tavernkeep.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/duchess_wayward_tavernkeep.txt
rename to forge-gui/res/cardsfolder/d/duchess_wayward_tavernkeep.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/due_diligence.txt b/forge-gui/res/cardsfolder/d/due_diligence.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/due_diligence.txt
rename to forge-gui/res/cardsfolder/d/due_diligence.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dusks_landing.txt b/forge-gui/res/cardsfolder/d/dusks_landing.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dusks_landing.txt
rename to forge-gui/res/cardsfolder/d/dusks_landing.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ecstatic_electromancer.txt b/forge-gui/res/cardsfolder/e/ecstatic_electromancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ecstatic_electromancer.txt
rename to forge-gui/res/cardsfolder/e/ecstatic_electromancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ed_e_lonesome_eyebot.txt b/forge-gui/res/cardsfolder/e/ed_e_lonesome_eyebot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ed_e_lonesome_eyebot.txt
rename to forge-gui/res/cardsfolder/e/ed_e_lonesome_eyebot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elder_arthur_maxson.txt b/forge-gui/res/cardsfolder/e/elder_arthur_maxson.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elder_arthur_maxson.txt
rename to forge-gui/res/cardsfolder/e/elder_arthur_maxson.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elder_owyn_lyons.txt b/forge-gui/res/cardsfolder/e/elder_owyn_lyons.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elder_owyn_lyons.txt
rename to forge-gui/res/cardsfolder/e/elder_owyn_lyons.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/electrosiphon.txt b/forge-gui/res/cardsfolder/e/electrosiphon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/electrosiphon.txt
rename to forge-gui/res/cardsfolder/e/electrosiphon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elegant_parlor.txt b/forge-gui/res/cardsfolder/e/elegant_parlor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elegant_parlor.txt
rename to forge-gui/res/cardsfolder/e/elegant_parlor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eliminate_the_impossible.txt b/forge-gui/res/cardsfolder/e/eliminate_the_impossible.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eliminate_the_impossible.txt
rename to forge-gui/res/cardsfolder/e/eliminate_the_impossible.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/emissary_green.txt b/forge-gui/res/cardsfolder/e/emissary_green.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/emissary_green.txt
rename to forge-gui/res/cardsfolder/e/emissary_green.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/endurance_bobblehead.txt b/forge-gui/res/cardsfolder/e/endurance_bobblehead.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/endurance_bobblehead.txt
rename to forge-gui/res/cardsfolder/e/endurance_bobblehead.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/escape_tunnel.txt b/forge-gui/res/cardsfolder/e/escape_tunnel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/escape_tunnel.txt
rename to forge-gui/res/cardsfolder/e/escape_tunnel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/essence_of_antiquity.txt b/forge-gui/res/cardsfolder/e/essence_of_antiquity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/essence_of_antiquity.txt
rename to forge-gui/res/cardsfolder/e/essence_of_antiquity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/etrata_deadly_fugitive.txt b/forge-gui/res/cardsfolder/e/etrata_deadly_fugitive.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/etrata_deadly_fugitive.txt
rename to forge-gui/res/cardsfolder/e/etrata_deadly_fugitive.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/evidence_examiner.txt b/forge-gui/res/cardsfolder/e/evidence_examiner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/evidence_examiner.txt
rename to forge-gui/res/cardsfolder/e/evidence_examiner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/exit_specialist.txt b/forge-gui/res/cardsfolder/e/exit_specialist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/exit_specialist.txt
rename to forge-gui/res/cardsfolder/e/exit_specialist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/expedited_inheritance.txt b/forge-gui/res/cardsfolder/e/expedited_inheritance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/expedited_inheritance.txt
rename to forge-gui/res/cardsfolder/e/expedited_inheritance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/expose_the_culprit.txt b/forge-gui/res/cardsfolder/e/expose_the_culprit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/expose_the_culprit.txt
rename to forge-gui/res/cardsfolder/e/expose_the_culprit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/extract_a_confession.txt b/forge-gui/res/cardsfolder/e/extract_a_confession.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/extract_a_confession.txt
rename to forge-gui/res/cardsfolder/e/extract_a_confession.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eye_of_duskmantle.txt b/forge-gui/res/cardsfolder/e/eye_of_duskmantle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eye_of_duskmantle.txt
rename to forge-gui/res/cardsfolder/e/eye_of_duskmantle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt b/forge-gui/res/cardsfolder/e/ezrim_agency_chief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt
rename to forge-gui/res/cardsfolder/e/ezrim_agency_chief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fae_flight.txt b/forge-gui/res/cardsfolder/f/fae_flight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fae_flight.txt
rename to forge-gui/res/cardsfolder/f/fae_flight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/faerie_snoop.txt b/forge-gui/res/cardsfolder/f/faerie_snoop.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/faerie_snoop.txt
rename to forge-gui/res/cardsfolder/f/faerie_snoop.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fanatical_strenght.txt b/forge-gui/res/cardsfolder/f/fanatical_strenght.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fanatical_strenght.txt
rename to forge-gui/res/cardsfolder/f/fanatical_strenght.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/felonious_rage.txt b/forge-gui/res/cardsfolder/f/felonious_rage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/felonious_rage.txt
rename to forge-gui/res/cardsfolder/f/felonious_rage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/feral_ghoul.txt b/forge-gui/res/cardsfolder/f/feral_ghoul.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/feral_ghoul.txt
rename to forge-gui/res/cardsfolder/f/feral_ghoul.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ferrous_lake.txt b/forge-gui/res/cardsfolder/f/ferrous_lake.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ferrous_lake.txt
rename to forge-gui/res/cardsfolder/f/ferrous_lake.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/festerleech.txt b/forge-gui/res/cardsfolder/f/festerleech.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/festerleech.txt
rename to forge-gui/res/cardsfolder/f/festerleech.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/final_word_phantom.txt b/forge-gui/res/cardsfolder/f/final_word_phantom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/final_word_phantom.txt
rename to forge-gui/res/cardsfolder/f/final_word_phantom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flare_of_cultivation.txt b/forge-gui/res/cardsfolder/f/flare_of_cultivation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flare_of_cultivation.txt
rename to forge-gui/res/cardsfolder/f/flare_of_cultivation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flotsam_jetsam.txt b/forge-gui/res/cardsfolder/f/flotsam_jetsam.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flotsam_jetsam.txt
rename to forge-gui/res/cardsfolder/f/flotsam_jetsam.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flourishing_bloom_kin.txt b/forge-gui/res/cardsfolder/f/flourishing_bloom_kin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flourishing_bloom_kin.txt
rename to forge-gui/res/cardsfolder/f/flourishing_bloom_kin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/follow_the_bodies.txt b/forge-gui/res/cardsfolder/f/follow_the_bodies.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/follow_the_bodies.txt
rename to forge-gui/res/cardsfolder/f/follow_the_bodies.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/foreboding_steamboat.txt b/forge-gui/res/cardsfolder/f/foreboding_steamboat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/foreboding_steamboat.txt
rename to forge-gui/res/cardsfolder/f/foreboding_steamboat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/forensic_gadgeteer.txt b/forge-gui/res/cardsfolder/f/forensic_gadgeteer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/forensic_gadgeteer.txt
rename to forge-gui/res/cardsfolder/f/forensic_gadgeteer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/forensic_researcher.txt b/forge-gui/res/cardsfolder/f/forensic_researcher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/forensic_researcher.txt
rename to forge-gui/res/cardsfolder/f/forensic_researcher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/forum_familiar.txt b/forge-gui/res/cardsfolder/f/forum_familiar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/forum_familiar.txt
rename to forge-gui/res/cardsfolder/f/forum_familiar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frantic_scapegoat.txt b/forge-gui/res/cardsfolder/f/frantic_scapegoat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frantic_scapegoat.txt
rename to forge-gui/res/cardsfolder/f/frantic_scapegoat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frenzied_gorespawn.txt b/forge-gui/res/cardsfolder/f/frenzied_gorespawn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frenzied_gorespawn.txt
rename to forge-gui/res/cardsfolder/f/frenzied_gorespawn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fugitive_codebreaker.txt b/forge-gui/res/cardsfolder/f/fugitive_codebreaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fugitive_codebreaker.txt
rename to forge-gui/res/cardsfolder/f/fugitive_codebreaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/furtive_courier.txt b/forge-gui/res/cardsfolder/f/furtive_courier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/furtive_courier.txt
rename to forge-gui/res/cardsfolder/f/furtive_courier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fuss_bother.txt b/forge-gui/res/cardsfolder/f/fuss_bother.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fuss_bother.txt
rename to forge-gui/res/cardsfolder/f/fuss_bother.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gadget_technician.txt b/forge-gui/res/cardsfolder/g/gadget_technician.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gadget_technician.txt
rename to forge-gui/res/cardsfolder/g/gadget_technician.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/galvanize.txt b/forge-gui/res/cardsfolder/g/galvanize.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/galvanize.txt
rename to forge-gui/res/cardsfolder/g/galvanize.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gary_clone.txt b/forge-gui/res/cardsfolder/g/gary_clone.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gary_clone.txt
rename to forge-gui/res/cardsfolder/g/gary_clone.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gearbane_orangutan.txt b/forge-gui/res/cardsfolder/g/gearbane_orangutan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gearbane_orangutan.txt
rename to forge-gui/res/cardsfolder/g/gearbane_orangutan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/get_a_leg_up.txt b/forge-gui/res/cardsfolder/g/get_a_leg_up.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/get_a_leg_up.txt
rename to forge-gui/res/cardsfolder/g/get_a_leg_up.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gleaming_geardrake.txt b/forge-gui/res/cardsfolder/g/gleaming_geardrake.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gleaming_geardrake.txt
rename to forge-gui/res/cardsfolder/g/gleaming_geardrake.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/glint_weaver.txt b/forge-gui/res/cardsfolder/g/glint_weaver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glint_weaver.txt
rename to forge-gui/res/cardsfolder/g/glint_weaver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_maskmaker.txt b/forge-gui/res/cardsfolder/g/goblin_maskmaker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goblin_maskmaker.txt
rename to forge-gui/res/cardsfolder/g/goblin_maskmaker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/granite_witness.txt b/forge-gui/res/cardsfolder/g/granite_witness.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/granite_witness.txt
rename to forge-gui/res/cardsfolder/g/granite_witness.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gravestone_strider.txt b/forge-gui/res/cardsfolder/g/gravestone_strider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gravestone_strider.txt
rename to forge-gui/res/cardsfolder/g/gravestone_strider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/greenbelt_radical.txt b/forge-gui/res/cardsfolder/g/greenbelt_radical.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/greenbelt_radical.txt
rename to forge-gui/res/cardsfolder/g/greenbelt_radical.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/griffnaut_tracker.txt b/forge-gui/res/cardsfolder/g/griffnaut_tracker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/griffnaut_tracker.txt
rename to forge-gui/res/cardsfolder/g/griffnaut_tracker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/grim_reapers_sprint.txt b/forge-gui/res/cardsfolder/g/grim_reapers_sprint.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/grim_reapers_sprint.txt
rename to forge-gui/res/cardsfolder/g/grim_reapers_sprint.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/guildpact_greenwalker.txt b/forge-gui/res/cardsfolder/g/guildpact_greenwalker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/guildpact_greenwalker.txt
rename to forge-gui/res/cardsfolder/g/guildpact_greenwalker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gunner_conscript.txt b/forge-gui/res/cardsfolder/g/gunner_conscript.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gunner_conscript.txt
rename to forge-gui/res/cardsfolder/g/gunner_conscript.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/haazda_vigilante.txt b/forge-gui/res/cardsfolder/h/haazda_vigilante.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/haazda_vigilante.txt
rename to forge-gui/res/cardsfolder/h/haazda_vigilante.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hall.txt b/forge-gui/res/cardsfolder/h/hall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hall.txt
rename to forge-gui/res/cardsfolder/h/hall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hancock_ghoulish_mayor.txt b/forge-gui/res/cardsfolder/h/hancock_ghoulish_mayor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hancock_ghoulish_mayor.txt
rename to forge-gui/res/cardsfolder/h/hancock_ghoulish_mayor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hard_hitting_question.txt b/forge-gui/res/cardsfolder/h/hard_hitting_question.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hard_hitting_question.txt
rename to forge-gui/res/cardsfolder/h/hard_hitting_question.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/harried_dronesmith.txt b/forge-gui/res/cardsfolder/h/harried_dronesmith.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/harried_dronesmith.txt
rename to forge-gui/res/cardsfolder/h/harried_dronesmith.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/havoc_eater.txt b/forge-gui/res/cardsfolder/h/havoc_eater.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/havoc_eater.txt
rename to forge-gui/res/cardsfolder/h/havoc_eater.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hedge_maze.txt b/forge-gui/res/cardsfolder/h/hedge_maze.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hedge_maze.txt
rename to forge-gui/res/cardsfolder/h/hedge_maze.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hedge_whisperer.txt b/forge-gui/res/cardsfolder/h/hedge_whisperer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hedge_whisperer.txt
rename to forge-gui/res/cardsfolder/h/hedge_whisperer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/helios_one.txt b/forge-gui/res/cardsfolder/h/helios_one.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/helios_one.txt
rename to forge-gui/res/cardsfolder/h/helios_one.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/herald_of_ilharg.txt b/forge-gui/res/cardsfolder/h/herald_of_ilharg.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/herald_of_ilharg.txt
rename to forge-gui/res/cardsfolder/h/herald_of_ilharg.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/heralds_reveille.txt b/forge-gui/res/cardsfolder/h/heralds_reveille.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/heralds_reveille.txt
rename to forge-gui/res/cardsfolder/h/heralds_reveille.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hide_in_plain_sight.txt b/forge-gui/res/cardsfolder/h/hide_in_plain_sight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hide_in_plain_sight.txt
rename to forge-gui/res/cardsfolder/h/hide_in_plain_sight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/high_marshal_arguel.txt b/forge-gui/res/cardsfolder/h/high_marshal_arguel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/high_marshal_arguel.txt
rename to forge-gui/res/cardsfolder/h/high_marshal_arguel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/homicide_investigator.txt b/forge-gui/res/cardsfolder/h/homicide_investigator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/homicide_investigator.txt
rename to forge-gui/res/cardsfolder/h/homicide_investigator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hot_pursuit.txt b/forge-gui/res/cardsfolder/h/hot_pursuit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hot_pursuit.txt
rename to forge-gui/res/cardsfolder/h/hot_pursuit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hotshot_investigators.txt b/forge-gui/res/cardsfolder/h/hotshot_investigators.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hotshot_investigators.txt
rename to forge-gui/res/cardsfolder/h/hotshot_investigators.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hunted_bonebrute.txt b/forge-gui/res/cardsfolder/h/hunted_bonebrute.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hunted_bonebrute.txt
rename to forge-gui/res/cardsfolder/h/hunted_bonebrute.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hustle_bustle.txt b/forge-gui/res/cardsfolder/h/hustle_bustle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hustle_bustle.txt
rename to forge-gui/res/cardsfolder/h/hustle_bustle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hymn_to_the_ages.txt b/forge-gui/res/cardsfolder/h/hymn_to_the_ages.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hymn_to_the_ages.txt
rename to forge-gui/res/cardsfolder/h/hymn_to_the_ages.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ian_the_reckless.txt b/forge-gui/res/cardsfolder/i/ian_the_reckless.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ian_the_reckless.txt
rename to forge-gui/res/cardsfolder/i/ian_the_reckless.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/idolized.txt b/forge-gui/res/cardsfolder/i/idolized.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/idolized.txt
rename to forge-gui/res/cardsfolder/i/idolized.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ill_timed_explosion.txt b/forge-gui/res/cardsfolder/i/ill_timed_explosion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ill_timed_explosion.txt
rename to forge-gui/res/cardsfolder/i/ill_timed_explosion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/illicit_masquerade.txt b/forge-gui/res/cardsfolder/i/illicit_masquerade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/illicit_masquerade.txt
rename to forge-gui/res/cardsfolder/i/illicit_masquerade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/immortal_obligation.txt b/forge-gui/res/cardsfolder/i/immortal_obligation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/immortal_obligation.txt
rename to forge-gui/res/cardsfolder/i/immortal_obligation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/incinerator_of_the_guilty.txt b/forge-gui/res/cardsfolder/i/incinerator_of_the_guilty.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/incinerator_of_the_guilty.txt
rename to forge-gui/res/cardsfolder/i/incinerator_of_the_guilty.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/incriminating_impetus.txt b/forge-gui/res/cardsfolder/i/incriminating_impetus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/incriminating_impetus.txt
rename to forge-gui/res/cardsfolder/i/incriminating_impetus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/innocent_bystander.txt b/forge-gui/res/cardsfolder/i/innocent_bystander.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/innocent_bystander.txt
rename to forge-gui/res/cardsfolder/i/innocent_bystander.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/innocuous_researcher.txt b/forge-gui/res/cardsfolder/i/innocuous_researcher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/innocuous_researcher.txt
rename to forge-gui/res/cardsfolder/i/innocuous_researcher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/inside_source.txt b/forge-gui/res/cardsfolder/i/inside_source.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/inside_source.txt
rename to forge-gui/res/cardsfolder/i/inside_source.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/insidious_roots.txt b/forge-gui/res/cardsfolder/i/insidious_roots.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/insidious_roots.txt
rename to forge-gui/res/cardsfolder/i/insidious_roots.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/intelligence_bobblehead.txt b/forge-gui/res/cardsfolder/i/intelligence_bobblehead.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/intelligence_bobblehead.txt
rename to forge-gui/res/cardsfolder/i/intelligence_bobblehead.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/intrude_on_the_mind.txt b/forge-gui/res/cardsfolder/i/intrude_on_the_mind.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/intrude_on_the_mind.txt
rename to forge-gui/res/cardsfolder/i/intrude_on_the_mind.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/inventory_management.txt b/forge-gui/res/cardsfolder/i/inventory_management.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/inventory_management.txt
rename to forge-gui/res/cardsfolder/i/inventory_management.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/it_doesnt_add_up.txt b/forge-gui/res/cardsfolder/i/it_doesnt_add_up.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/it_doesnt_add_up.txt
rename to forge-gui/res/cardsfolder/i/it_doesnt_add_up.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/izoni_center_of_the_web.txt b/forge-gui/res/cardsfolder/i/izoni_center_of_the_web.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/izoni_center_of_the_web.txt
rename to forge-gui/res/cardsfolder/i/izoni_center_of_the_web.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jaded_analyst.txt b/forge-gui/res/cardsfolder/j/jaded_analyst.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jaded_analyst.txt
rename to forge-gui/res/cardsfolder/j/jaded_analyst.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/james_wandering_dad_follow_him.txt b/forge-gui/res/cardsfolder/j/james_wandering_dad_follow_him.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/james_wandering_dad_follow_him.txt
rename to forge-gui/res/cardsfolder/j/james_wandering_dad_follow_him.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/judith_carnage_connoisseur.txt b/forge-gui/res/cardsfolder/j/judith_carnage_connoisseur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/judith_carnage_connoisseur.txt
rename to forge-gui/res/cardsfolder/j/judith_carnage_connoisseur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/junktown.txt b/forge-gui/res/cardsfolder/j/junktown.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/junktown.txt
rename to forge-gui/res/cardsfolder/j/junktown.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kamachal_ships_mascot.txt b/forge-gui/res/cardsfolder/k/kamachal_ships_mascot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kamachal_ships_mascot.txt
rename to forge-gui/res/cardsfolder/k/kamachal_ships_mascot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/karlov_watchdog.txt b/forge-gui/res/cardsfolder/k/karlov_watchdog.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/karlov_watchdog.txt
rename to forge-gui/res/cardsfolder/k/karlov_watchdog.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kaust_eyes_of_the_glade.txt b/forge-gui/res/cardsfolder/k/kaust_eyes_of_the_glade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kaust_eyes_of_the_glade.txt
rename to forge-gui/res/cardsfolder/k/kaust_eyes_of_the_glade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kaya_spirits_justice.txt b/forge-gui/res/cardsfolder/k/kaya_spirits_justice.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kaya_spirits_justice.txt
rename to forge-gui/res/cardsfolder/k/kaya_spirits_justice.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kellan_inquisitive_prodigy_tail_the_suspect.txt b/forge-gui/res/cardsfolder/k/kellan_inquisitive_prodigy_tail_the_suspect.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kellan_inquisitive_prodigy_tail_the_suspect.txt
rename to forge-gui/res/cardsfolder/k/kellan_inquisitive_prodigy_tail_the_suspect.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kellogg_dangerous_mind.txt b/forge-gui/res/cardsfolder/k/kellogg_dangerous_mind.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kellogg_dangerous_mind.txt
rename to forge-gui/res/cardsfolder/k/kellogg_dangerous_mind.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kitchen.txt b/forge-gui/res/cardsfolder/k/kitchen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kitchen.txt
rename to forge-gui/res/cardsfolder/k/kitchen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/knife.txt b/forge-gui/res/cardsfolder/k/knife.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/knife.txt
rename to forge-gui/res/cardsfolder/k/knife.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/knowledge_is_power.txt b/forge-gui/res/cardsfolder/k/knowledge_is_power.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/knowledge_is_power.txt
rename to forge-gui/res/cardsfolder/k/knowledge_is_power.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kraul_whipcracker.txt b/forge-gui/res/cardsfolder/k/kraul_whipcracker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kraul_whipcracker.txt
rename to forge-gui/res/cardsfolder/k/kraul_whipcracker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/krenko_baron_of_tin_street.txt b/forge-gui/res/cardsfolder/k/krenko_baron_of_tin_street.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/krenko_baron_of_tin_street.txt
rename to forge-gui/res/cardsfolder/k/krenko_baron_of_tin_street.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/krenkos_buzzcrusher.txt b/forge-gui/res/cardsfolder/k/krenkos_buzzcrusher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/krenkos_buzzcrusher.txt
rename to forge-gui/res/cardsfolder/k/krenkos_buzzcrusher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/krovod_haunch.txt b/forge-gui/res/cardsfolder/k/krovod_haunch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/krovod_haunch.txt
rename to forge-gui/res/cardsfolder/k/krovod_haunch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kylox_visionary_inventor.txt b/forge-gui/res/cardsfolder/k/kylox_visionary_inventor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kylox_visionary_inventor.txt
rename to forge-gui/res/cardsfolder/k/kylox_visionary_inventor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kyloxs_voltstrider.txt b/forge-gui/res/cardsfolder/k/kyloxs_voltstrider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kyloxs_voltstrider.txt
rename to forge-gui/res/cardsfolder/k/kyloxs_voltstrider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lamplight_phoenix.txt b/forge-gui/res/cardsfolder/l/lamplight_phoenix.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lamplight_phoenix.txt
rename to forge-gui/res/cardsfolder/l/lamplight_phoenix.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/landlore_navigator.txt b/forge-gui/res/cardsfolder/l/landlore_navigator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/landlore_navigator.txt
rename to forge-gui/res/cardsfolder/l/landlore_navigator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lavinia_foil_to_conspiracy.txt b/forge-gui/res/cardsfolder/l/lavinia_foil_to_conspiracy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lavinia_foil_to_conspiracy.txt
rename to forge-gui/res/cardsfolder/l/lavinia_foil_to_conspiracy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lazav_wearer_of_faces.txt b/forge-gui/res/cardsfolder/l/lazav_wearer_of_faces.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lazav_wearer_of_faces.txt
rename to forge-gui/res/cardsfolder/l/lazav_wearer_of_faces.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lead_pipe.txt b/forge-gui/res/cardsfolder/l/lead_pipe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lead_pipe.txt
rename to forge-gui/res/cardsfolder/l/lead_pipe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/leering_onlooker.txt b/forge-gui/res/cardsfolder/l/leering_onlooker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/leering_onlooker.txt
rename to forge-gui/res/cardsfolder/l/leering_onlooker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/legate_lanius_caesars_ace.txt b/forge-gui/res/cardsfolder/l/legate_lanius_caesars_ace.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/legate_lanius_caesars_ace.txt
rename to forge-gui/res/cardsfolder/l/legate_lanius_caesars_ace.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/legion_reconsecrator.txt b/forge-gui/res/cardsfolder/l/legion_reconsecrator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/legion_reconsecrator.txt
rename to forge-gui/res/cardsfolder/l/legion_reconsecrator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/legions_chant.txt b/forge-gui/res/cardsfolder/l/legions_chant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/legions_chant.txt
rename to forge-gui/res/cardsfolder/l/legions_chant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/leyline_of_the_guildpact.txt b/forge-gui/res/cardsfolder/l/leyline_of_the_guildpact.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/leyline_of_the_guildpact.txt
rename to forge-gui/res/cardsfolder/l/leyline_of_the_guildpact.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/liberty_prime_recharged.txt b/forge-gui/res/cardsfolder/l/liberty_prime_recharged.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/liberty_prime_recharged.txt
rename to forge-gui/res/cardsfolder/l/liberty_prime_recharged.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/library.txt b/forge-gui/res/cardsfolder/l/library.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/library.txt
rename to forge-gui/res/cardsfolder/l/library.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lily_bowen_raging_grandma.txt b/forge-gui/res/cardsfolder/l/lily_bowen_raging_grandma.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lily_bowen_raging_grandma.txt
rename to forge-gui/res/cardsfolder/l/lily_bowen_raging_grandma.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/living_conundrum.txt b/forge-gui/res/cardsfolder/l/living_conundrum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/living_conundrum.txt
rename to forge-gui/res/cardsfolder/l/living_conundrum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/long_goodbye.txt b/forge-gui/res/cardsfolder/l/long_goodbye.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/long_goodbye.txt
rename to forge-gui/res/cardsfolder/l/long_goodbye.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lonis_genetics_expert.txt b/forge-gui/res/cardsfolder/l/lonis_genetics_expert.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lonis_genetics_expert.txt
rename to forge-gui/res/cardsfolder/l/lonis_genetics_expert.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt b/forge-gui/res/cardsfolder/l/lost_in_the_maze.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt
rename to forge-gui/res/cardsfolder/l/lost_in_the_maze.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lounge.txt b/forge-gui/res/cardsfolder/l/lounge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lounge.txt
rename to forge-gui/res/cardsfolder/l/lounge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/loxodon_eavesdropper.txt b/forge-gui/res/cardsfolder/l/loxodon_eavesdropper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/loxodon_eavesdropper.txt
rename to forge-gui/res/cardsfolder/l/loxodon_eavesdropper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lumbering_laundry.txt b/forge-gui/res/cardsfolder/l/lumbering_laundry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lumbering_laundry.txt
rename to forge-gui/res/cardsfolder/l/lumbering_laundry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lumbering_megasloth.txt b/forge-gui/res/cardsfolder/l/lumbering_megasloth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lumbering_megasloth.txt
rename to forge-gui/res/cardsfolder/l/lumbering_megasloth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lush_portico.txt b/forge-gui/res/cardsfolder/l/lush_portico.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lush_portico.txt
rename to forge-gui/res/cardsfolder/l/lush_portico.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/macabre_reconstruction.txt b/forge-gui/res/cardsfolder/m/macabre_reconstruction.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/macabre_reconstruction.txt
rename to forge-gui/res/cardsfolder/m/macabre_reconstruction.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/maccready_lamplight_mayor.txt b/forge-gui/res/cardsfolder/m/maccready_lamplight_mayor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/maccready_lamplight_mayor.txt
rename to forge-gui/res/cardsfolder/m/maccready_lamplight_mayor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/magnetic_snuffler.txt b/forge-gui/res/cardsfolder/m/magnetic_snuffler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/magnetic_snuffler.txt
rename to forge-gui/res/cardsfolder/m/magnetic_snuffler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/make_your_move.txt b/forge-gui/res/cardsfolder/m/make_your_move.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/make_your_move.txt
rename to forge-gui/res/cardsfolder/m/make_your_move.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/makeshift_binding.txt b/forge-gui/res/cardsfolder/m/makeshift_binding.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/makeshift_binding.txt
rename to forge-gui/res/cardsfolder/m/makeshift_binding.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/marcus_mutant_mayor.txt b/forge-gui/res/cardsfolder/m/marcus_mutant_mayor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/marcus_mutant_mayor.txt
rename to forge-gui/res/cardsfolder/m/marcus_mutant_mayor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mariposa_military_base.txt b/forge-gui/res/cardsfolder/m/mariposa_military_base.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mariposa_military_base.txt
rename to forge-gui/res/cardsfolder/m/mariposa_military_base.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/marketwatch_phantom.txt b/forge-gui/res/cardsfolder/m/marketwatch_phantom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/marketwatch_phantom.txt
rename to forge-gui/res/cardsfolder/m/marketwatch_phantom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/marvo_deep_operative.txt b/forge-gui/res/cardsfolder/m/marvo_deep_operative.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/marvo_deep_operative.txt
rename to forge-gui/res/cardsfolder/m/marvo_deep_operative.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/massacre_girl_known_killer.txt b/forge-gui/res/cardsfolder/m/massacre_girl_known_killer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/massacre_girl_known_killer.txt
rename to forge-gui/res/cardsfolder/m/massacre_girl_known_killer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mastermind_plum.txt b/forge-gui/res/cardsfolder/m/mastermind_plum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mastermind_plum.txt
rename to forge-gui/res/cardsfolder/m/mastermind_plum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/meddling_youths.txt b/forge-gui/res/cardsfolder/m/meddling_youths.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/meddling_youths.txt
rename to forge-gui/res/cardsfolder/m/meddling_youths.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/melek_reforged_researcher.txt b/forge-gui/res/cardsfolder/m/melek_reforged_researcher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/melek_reforged_researcher.txt
rename to forge-gui/res/cardsfolder/m/melek_reforged_researcher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/merchant_of_truth.txt b/forge-gui/res/cardsfolder/m/merchant_of_truth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/merchant_of_truth.txt
rename to forge-gui/res/cardsfolder/m/merchant_of_truth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/merfolk_tunnel_guide.txt b/forge-gui/res/cardsfolder/m/merfolk_tunnel_guide.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/merfolk_tunnel_guide.txt
rename to forge-gui/res/cardsfolder/m/merfolk_tunnel_guide.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/meticulous_archive.txt b/forge-gui/res/cardsfolder/m/meticulous_archive.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/meticulous_archive.txt
rename to forge-gui/res/cardsfolder/m/meticulous_archive.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mirko_obsessive_theorist.txt b/forge-gui/res/cardsfolder/m/mirko_obsessive_theorist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mirko_obsessive_theorist.txt
rename to forge-gui/res/cardsfolder/m/mirko_obsessive_theorist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mistway_spy.txt b/forge-gui/res/cardsfolder/m/mistway_spy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mistway_spy.txt
rename to forge-gui/res/cardsfolder/m/mistway_spy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/morska_undersea_sleuth.txt b/forge-gui/res/cardsfolder/m/morska_undersea_sleuth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/morska_undersea_sleuth.txt
rename to forge-gui/res/cardsfolder/m/morska_undersea_sleuth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mr_house_president_and_ceo.txt b/forge-gui/res/cardsfolder/m/mr_house_president_and_ceo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mr_house_president_and_ceo.txt
rename to forge-gui/res/cardsfolder/m/mr_house_president_and_ceo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/museum_nightwatch.txt b/forge-gui/res/cardsfolder/m/museum_nightwatch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/museum_nightwatch.txt
rename to forge-gui/res/cardsfolder/m/museum_nightwatch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mycelic_ballad.txt b/forge-gui/res/cardsfolder/m/mycelic_ballad.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mycelic_ballad.txt
rename to forge-gui/res/cardsfolder/m/mycelic_ballad.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mycoid_resurrection.txt b/forge-gui/res/cardsfolder/m/mycoid_resurrection.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mycoid_resurrection.txt
rename to forge-gui/res/cardsfolder/m/mycoid_resurrection.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mythweaver_poq.txt b/forge-gui/res/cardsfolder/m/mythweaver_poq.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mythweaver_poq.txt
rename to forge-gui/res/cardsfolder/m/mythweaver_poq.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/neighborhood_guardian.txt b/forge-gui/res/cardsfolder/n/neighborhood_guardian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/neighborhood_guardian.txt
rename to forge-gui/res/cardsfolder/n/neighborhood_guardian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nelly_borca_impulsive_accuser.txt b/forge-gui/res/cardsfolder/n/nelly_borca_impulsive_accuser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nelly_borca_impulsive_accuser.txt
rename to forge-gui/res/cardsfolder/n/nelly_borca_impulsive_accuser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nervous_gardener.txt b/forge-gui/res/cardsfolder/n/nervous_gardener.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nervous_gardener.txt
rename to forge-gui/res/cardsfolder/n/nervous_gardener.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nightdrinker_moroii.txt b/forge-gui/res/cardsfolder/n/nightdrinker_moroii.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nightdrinker_moroii.txt
rename to forge-gui/res/cardsfolder/n/nightdrinker_moroii.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/niv_mizzet_guildpact.txt b/forge-gui/res/cardsfolder/n/niv_mizzet_guildpact.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/niv_mizzet_guildpact.txt
rename to forge-gui/res/cardsfolder/n/niv_mizzet_guildpact.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/no_more_lies.txt b/forge-gui/res/cardsfolder/n/no_more_lies.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/no_more_lies.txt
rename to forge-gui/res/cardsfolder/n/no_more_lies.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/no_witnesses.txt b/forge-gui/res/cardsfolder/n/no_witnesses.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/no_witnesses.txt
rename to forge-gui/res/cardsfolder/n/no_witnesses.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/not_on_my_watch.txt b/forge-gui/res/cardsfolder/n/not_on_my_watch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/not_on_my_watch.txt
rename to forge-gui/res/cardsfolder/n/not_on_my_watch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/novice_inspector.txt b/forge-gui/res/cardsfolder/n/novice_inspector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/novice_inspector.txt
rename to forge-gui/res/cardsfolder/n/novice_inspector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nuka_cola_vending_machine.txt b/forge-gui/res/cardsfolder/n/nuka_cola_vending_machine.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nuka_cola_vending_machine.txt
rename to forge-gui/res/cardsfolder/n/nuka_cola_vending_machine.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/offender_at_large.txt b/forge-gui/res/cardsfolder/o/offender_at_large.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/offender_at_large.txt
rename to forge-gui/res/cardsfolder/o/offender_at_large.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/officious_interrogation.txt b/forge-gui/res/cardsfolder/o/officious_interrogation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/officious_interrogation.txt
rename to forge-gui/res/cardsfolder/o/officious_interrogation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/on_the_job.txt b/forge-gui/res/cardsfolder/o/on_the_job.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/on_the_job.txt
rename to forge-gui/res/cardsfolder/o/on_the_job.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/on_the_trail.txt b/forge-gui/res/cardsfolder/o/on_the_trail.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/on_the_trail.txt
rename to forge-gui/res/cardsfolder/o/on_the_trail.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ood_sphere.txt b/forge-gui/res/cardsfolder/o/ood_sphere.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ood_sphere.txt
rename to forge-gui/res/cardsfolder/o/ood_sphere.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/out_cold.txt b/forge-gui/res/cardsfolder/o/out_cold.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/out_cold.txt
rename to forge-gui/res/cardsfolder/o/out_cold.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/outrageous_robbery.txt b/forge-gui/res/cardsfolder/o/outrageous_robbery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/outrageous_robbery.txt
rename to forge-gui/res/cardsfolder/o/outrageous_robbery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/overencumbered.txt b/forge-gui/res/cardsfolder/o/overencumbered.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/overencumbered.txt
rename to forge-gui/res/cardsfolder/o/overencumbered.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/overflowing_basin.txt b/forge-gui/res/cardsfolder/o/overflowing_basin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/overflowing_basin.txt
rename to forge-gui/res/cardsfolder/o/overflowing_basin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/panoptic_projektor.txt b/forge-gui/res/cardsfolder/p/panoptic_projektor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/panoptic_projektor.txt
rename to forge-gui/res/cardsfolder/p/panoptic_projektor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/perception_bobblehead.txt b/forge-gui/res/cardsfolder/p/perception_bobblehead.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/perception_bobblehead.txt
rename to forge-gui/res/cardsfolder/p/perception_bobblehead.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/perimeter_enforcer.txt b/forge-gui/res/cardsfolder/p/perimeter_enforcer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/perimeter_enforcer.txt
rename to forge-gui/res/cardsfolder/p/perimeter_enforcer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/person_of_interest.txt b/forge-gui/res/cardsfolder/p/person_of_interest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/person_of_interest.txt
rename to forge-gui/res/cardsfolder/p/person_of_interest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/persuasive_interrogators.txt b/forge-gui/res/cardsfolder/p/persuasive_interrogators.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/persuasive_interrogators.txt
rename to forge-gui/res/cardsfolder/p/persuasive_interrogators.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phantasmal_extraction.txt b/forge-gui/res/cardsfolder/p/phantasmal_extraction.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phantasmal_extraction.txt
rename to forge-gui/res/cardsfolder/p/phantasmal_extraction.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pick_your_poison.txt b/forge-gui/res/cardsfolder/p/pick_your_poison.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pick_your_poison.txt
rename to forge-gui/res/cardsfolder/p/pick_your_poison.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pirates_landing.txt b/forge-gui/res/cardsfolder/p/pirates_landing.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pirates_landing.txt
rename to forge-gui/res/cardsfolder/p/pirates_landing.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/plasma_caster.txt b/forge-gui/res/cardsfolder/p/plasma_caster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/plasma_caster.txt
rename to forge-gui/res/cardsfolder/p/plasma_caster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/plunderers_prize.txt b/forge-gui/res/cardsfolder/p/plunderers_prize.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/plunderers_prize.txt
rename to forge-gui/res/cardsfolder/p/plunderers_prize.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/polygraph_orb.txt b/forge-gui/res/cardsfolder/p/polygraph_orb.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/polygraph_orb.txt
rename to forge-gui/res/cardsfolder/p/polygraph_orb.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pompous_gadabout.txt b/forge-gui/res/cardsfolder/p/pompous_gadabout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pompous_gadabout.txt
rename to forge-gui/res/cardsfolder/p/pompous_gadabout.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/portal_manipulator.txt b/forge-gui/res/cardsfolder/p/portal_manipulator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/portal_manipulator.txt
rename to forge-gui/res/cardsfolder/p/portal_manipulator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/powder_ganger.txt b/forge-gui/res/cardsfolder/p/powder_ganger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/powder_ganger.txt
rename to forge-gui/res/cardsfolder/p/powder_ganger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/preston_garvey_minuteman.txt b/forge-gui/res/cardsfolder/p/preston_garvey_minuteman.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/preston_garvey_minuteman.txt
rename to forge-gui/res/cardsfolder/p/preston_garvey_minuteman.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/presumed_dead.txt b/forge-gui/res/cardsfolder/p/presumed_dead.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/presumed_dead.txt
rename to forge-gui/res/cardsfolder/p/presumed_dead.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/private_eye.txt b/forge-gui/res/cardsfolder/p/private_eye.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/private_eye.txt
rename to forge-gui/res/cardsfolder/p/private_eye.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/profts_eidetic_memory.txt b/forge-gui/res/cardsfolder/p/profts_eidetic_memory.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/profts_eidetic_memory.txt
rename to forge-gui/res/cardsfolder/p/profts_eidetic_memory.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/projektor_inspector.txt b/forge-gui/res/cardsfolder/p/projektor_inspector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/projektor_inspector.txt
rename to forge-gui/res/cardsfolder/p/projektor_inspector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/propagator_primordium.txt b/forge-gui/res/cardsfolder/p/propagator_primordium.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/propagator_primordium.txt
rename to forge-gui/res/cardsfolder/p/propagator_primordium.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/public_thoroughfare.txt b/forge-gui/res/cardsfolder/p/public_thoroughfare.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/public_thoroughfare.txt
rename to forge-gui/res/cardsfolder/p/public_thoroughfare.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/push_pull.txt b/forge-gui/res/cardsfolder/p/push_pull.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/push_pull.txt
rename to forge-gui/res/cardsfolder/p/push_pull.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pyrotechnic_performer.txt b/forge-gui/res/cardsfolder/p/pyrotechnic_performer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pyrotechnic_performer.txt
rename to forge-gui/res/cardsfolder/p/pyrotechnic_performer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/radiant_smite.txt b/forge-gui/res/cardsfolder/r/radiant_smite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/radiant_smite.txt
rename to forge-gui/res/cardsfolder/r/radiant_smite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/radstorm.txt b/forge-gui/res/cardsfolder/r/radstorm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/radstorm.txt
rename to forge-gui/res/cardsfolder/r/radstorm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rakdos_patron_of_chaos.txt b/forge-gui/res/cardsfolder/r/rakdos_patron_of_chaos.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rakdos_patron_of_chaos.txt
rename to forge-gui/res/cardsfolder/r/rakdos_patron_of_chaos.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rakish_scoundrel.txt b/forge-gui/res/cardsfolder/r/rakish_scoundrel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rakish_scoundrel.txt
rename to forge-gui/res/cardsfolder/r/rakish_scoundrel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ransom_note.txt b/forge-gui/res/cardsfolder/r/ransom_note.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ransom_note.txt
rename to forge-gui/res/cardsfolder/r/ransom_note.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/raucous_theater.txt b/forge-gui/res/cardsfolder/r/raucous_theater.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raucous_theater.txt
rename to forge-gui/res/cardsfolder/r/raucous_theater.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reasonable_doubt.txt b/forge-gui/res/cardsfolder/r/reasonable_doubt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reasonable_doubt.txt
rename to forge-gui/res/cardsfolder/r/reasonable_doubt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reckless_detective.txt b/forge-gui/res/cardsfolder/r/reckless_detective.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reckless_detective.txt
rename to forge-gui/res/cardsfolder/r/reckless_detective.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/red_herring.txt b/forge-gui/res/cardsfolder/r/red_herring.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/red_herring.txt
rename to forge-gui/res/cardsfolder/r/red_herring.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/redemption_arc.txt b/forge-gui/res/cardsfolder/r/redemption_arc.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/redemption_arc.txt
rename to forge-gui/res/cardsfolder/r/redemption_arc.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reenact_the_crime.txt b/forge-gui/res/cardsfolder/r/reenact_the_crime.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reenact_the_crime.txt
rename to forge-gui/res/cardsfolder/r/reenact_the_crime.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reflection_net.txt b/forge-gui/res/cardsfolder/r/reflection_net.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reflection_net.txt
rename to forge-gui/res/cardsfolder/r/reflection_net.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/relive_the_past.txt b/forge-gui/res/cardsfolder/r/relive_the_past.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/relive_the_past.txt
rename to forge-gui/res/cardsfolder/r/relive_the_past.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/repeat_offender.txt b/forge-gui/res/cardsfolder/r/repeat_offender.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/repeat_offender.txt
rename to forge-gui/res/cardsfolder/r/repeat_offender.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/repulsive_mutation.txt b/forge-gui/res/cardsfolder/r/repulsive_mutation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/repulsive_mutation.txt
rename to forge-gui/res/cardsfolder/r/repulsive_mutation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/resonance_technician.txt b/forge-gui/res/cardsfolder/r/resonance_technician.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/resonance_technician.txt
rename to forge-gui/res/cardsfolder/r/resonance_technician.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rex_cyber_hound.txt b/forge-gui/res/cardsfolder/r/rex_cyber_hound.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rex_cyber_hound.txt
rename to forge-gui/res/cardsfolder/r/rex_cyber_hound.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ribald_shanty.txt b/forge-gui/res/cardsfolder/r/ribald_shanty.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ribald_shanty.txt
rename to forge-gui/res/cardsfolder/r/ribald_shanty.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/riftburst_hellion.txt b/forge-gui/res/cardsfolder/r/riftburst_hellion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/riftburst_hellion.txt
rename to forge-gui/res/cardsfolder/r/riftburst_hellion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/robobrain_war_mind.txt b/forge-gui/res/cardsfolder/r/robobrain_war_mind.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/robobrain_war_mind.txt
rename to forge-gui/res/cardsfolder/r/robobrain_war_mind.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rope.txt b/forge-gui/res/cardsfolder/r/rope.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rope.txt
rename to forge-gui/res/cardsfolder/r/rope.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rose_noble.txt b/forge-gui/res/cardsfolder/r/rose_noble.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rose_noble.txt
rename to forge-gui/res/cardsfolder/r/rose_noble.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rot_farm_mortipede.txt b/forge-gui/res/cardsfolder/r/rot_farm_mortipede.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rot_farm_mortipede.txt
rename to forge-gui/res/cardsfolder/r/rot_farm_mortipede.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rubblebelt_braggart.txt b/forge-gui/res/cardsfolder/r/rubblebelt_braggart.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rubblebelt_braggart.txt
rename to forge-gui/res/cardsfolder/r/rubblebelt_braggart.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rubblebelt_maverick.txt b/forge-gui/res/cardsfolder/r/rubblebelt_maverick.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rubblebelt_maverick.txt
rename to forge-gui/res/cardsfolder/r/rubblebelt_maverick.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rune_brand_juggler.txt b/forge-gui/res/cardsfolder/r/rune_brand_juggler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rune_brand_juggler.txt
rename to forge-gui/res/cardsfolder/r/rune_brand_juggler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ruthless_radrat.txt b/forge-gui/res/cardsfolder/r/ruthless_radrat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ruthless_radrat.txt
rename to forge-gui/res/cardsfolder/r/ruthless_radrat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sample_collector.txt b/forge-gui/res/cardsfolder/s/sample_collector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sample_collector.txt
rename to forge-gui/res/cardsfolder/s/sample_collector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sanctuary_wall.txt b/forge-gui/res/cardsfolder/s/sanctuary_wall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sanctuary_wall.txt
rename to forge-gui/res/cardsfolder/s/sanctuary_wall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sanguine_savior.txt b/forge-gui/res/cardsfolder/s/sanguine_savior.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sanguine_savior.txt
rename to forge-gui/res/cardsfolder/s/sanguine_savior.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sanitation_automaton.txt b/forge-gui/res/cardsfolder/s/sanitation_automaton.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sanitation_automaton.txt
rename to forge-gui/res/cardsfolder/s/sanitation_automaton.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scalesoul_gnome.txt b/forge-gui/res/cardsfolder/s/scalesoul_gnome.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scalesoul_gnome.txt
rename to forge-gui/res/cardsfolder/s/scalesoul_gnome.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scalespeaker_shepherd.txt b/forge-gui/res/cardsfolder/s/scalespeaker_shepherd.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scalespeaker_shepherd.txt
rename to forge-gui/res/cardsfolder/s/scalespeaker_shepherd.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scene_of_the_crime.txt b/forge-gui/res/cardsfolder/s/scene_of_the_crime.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scene_of_the_crime.txt
rename to forge-gui/res/cardsfolder/s/scene_of_the_crime.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scuttling_sentinel.txt b/forge-gui/res/cardsfolder/s/scuttling_sentinel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scuttling_sentinel.txt
rename to forge-gui/res/cardsfolder/s/scuttling_sentinel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seasoned_consultant.txt b/forge-gui/res/cardsfolder/s/seasoned_consultant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seasoned_consultant.txt
rename to forge-gui/res/cardsfolder/s/seasoned_consultant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/secret_passage.txt b/forge-gui/res/cardsfolder/s/secret_passage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/secret_passage.txt
rename to forge-gui/res/cardsfolder/s/secret_passage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/securitron_squadron.txt b/forge-gui/res/cardsfolder/s/securitron_squadron.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/securitron_squadron.txt
rename to forge-gui/res/cardsfolder/s/securitron_squadron.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/senator_peacock.txt b/forge-gui/res/cardsfolder/s/senator_peacock.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/senator_peacock.txt
rename to forge-gui/res/cardsfolder/s/senator_peacock.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sentry_bot.txt b/forge-gui/res/cardsfolder/s/sentry_bot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sentry_bot.txt
rename to forge-gui/res/cardsfolder/s/sentry_bot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/serene_sleuth.txt b/forge-gui/res/cardsfolder/s/serene_sleuth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/serene_sleuth.txt
rename to forge-gui/res/cardsfolder/s/serene_sleuth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shadowy_backstreet.txt b/forge-gui/res/cardsfolder/s/shadowy_backstreet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shadowy_backstreet.txt
rename to forge-gui/res/cardsfolder/s/shadowy_backstreet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shady_informant.txt b/forge-gui/res/cardsfolder/s/shady_informant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shady_informant.txt
rename to forge-gui/res/cardsfolder/s/shady_informant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sharp_eyed_rookie.txt b/forge-gui/res/cardsfolder/s/sharp_eyed_rookie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sharp_eyed_rookie.txt
rename to forge-gui/res/cardsfolder/s/sharp_eyed_rookie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slice_from_the_shadows.txt b/forge-gui/res/cardsfolder/s/slice_from_the_shadows.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slice_from_the_shadows.txt
rename to forge-gui/res/cardsfolder/s/slice_from_the_shadows.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slime_against_humanity.txt b/forge-gui/res/cardsfolder/s/slime_against_humanity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slime_against_humanity.txt
rename to forge-gui/res/cardsfolder/s/slime_against_humanity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slimy_dualleech.txt b/forge-gui/res/cardsfolder/s/slimy_dualleech.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slimy_dualleech.txt
rename to forge-gui/res/cardsfolder/s/slimy_dualleech.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sludge_titan.txt b/forge-gui/res/cardsfolder/s/sludge_titan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sludge_titan.txt
rename to forge-gui/res/cardsfolder/s/sludge_titan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/snarling_gorehound.txt b/forge-gui/res/cardsfolder/s/snarling_gorehound.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/snarling_gorehound.txt
rename to forge-gui/res/cardsfolder/s/snarling_gorehound.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/snow_covered_wastes.txt b/forge-gui/res/cardsfolder/s/snow_covered_wastes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/snow_covered_wastes.txt
rename to forge-gui/res/cardsfolder/s/snow_covered_wastes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sophia_dogged_detective.txt b/forge-gui/res/cardsfolder/s/sophia_dogged_detective.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sophia_dogged_detective.txt
rename to forge-gui/res/cardsfolder/s/sophia_dogged_detective.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soul_enervation.txt b/forge-gui/res/cardsfolder/s/soul_enervation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soul_enervation.txt
rename to forge-gui/res/cardsfolder/s/soul_enervation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soul_search.txt b/forge-gui/res/cardsfolder/s/soul_search.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soul_search.txt
rename to forge-gui/res/cardsfolder/s/soul_search.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stalwart_speartail.txt b/forge-gui/res/cardsfolder/s/stalwart_speartail.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stalwart_speartail.txt
rename to forge-gui/res/cardsfolder/s/stalwart_speartail.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stampede_surfer.txt b/forge-gui/res/cardsfolder/s/stampede_surfer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stampede_surfer.txt
rename to forge-gui/res/cardsfolder/s/stampede_surfer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/steamcore_scholar.txt b/forge-gui/res/cardsfolder/s/steamcore_scholar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/steamcore_scholar.txt
rename to forge-gui/res/cardsfolder/s/steamcore_scholar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/strength_bobblehead.txt b/forge-gui/res/cardsfolder/s/strength_bobblehead.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/strength_bobblehead.txt
rename to forge-gui/res/cardsfolder/s/strength_bobblehead.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/study.txt b/forge-gui/res/cardsfolder/s/study.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/study.txt
rename to forge-gui/res/cardsfolder/s/study.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sudden_setback.txt b/forge-gui/res/cardsfolder/s/sudden_setback.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sudden_setback.txt
rename to forge-gui/res/cardsfolder/s/sudden_setback.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sumala_rumblers.txt b/forge-gui/res/cardsfolder/s/sumala_rumblers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sumala_rumblers.txt
rename to forge-gui/res/cardsfolder/s/sumala_rumblers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sumala_sentry.txt b/forge-gui/res/cardsfolder/s/sumala_sentry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sumala_sentry.txt
rename to forge-gui/res/cardsfolder/s/sumala_sentry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sunscorched_divide.txt b/forge-gui/res/cardsfolder/s/sunscorched_divide.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sunscorched_divide.txt
rename to forge-gui/res/cardsfolder/s/sunscorched_divide.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/surveillance_monitor.txt b/forge-gui/res/cardsfolder/s/surveillance_monitor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/surveillance_monitor.txt
rename to forge-gui/res/cardsfolder/s/surveillance_monitor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/suspicious_detonation.txt b/forge-gui/res/cardsfolder/s/suspicious_detonation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/suspicious_detonation.txt
rename to forge-gui/res/cardsfolder/s/suspicious_detonation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/syndicate_heavy.txt b/forge-gui/res/cardsfolder/s/syndicate_heavy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/syndicate_heavy.txt
rename to forge-gui/res/cardsfolder/s/syndicate_heavy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/synth_infiltrator.txt b/forge-gui/res/cardsfolder/s/synth_infiltrator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/synth_infiltrator.txt
rename to forge-gui/res/cardsfolder/s/synth_infiltrator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/take_the_bait.txt b/forge-gui/res/cardsfolder/t/take_the_bait.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/take_the_bait.txt
rename to forge-gui/res/cardsfolder/t/take_the_bait.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tan_jolom_the_worldwalker.txt b/forge-gui/res/cardsfolder/t/tan_jolom_the_worldwalker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tan_jolom_the_worldwalker.txt
rename to forge-gui/res/cardsfolder/t/tan_jolom_the_worldwalker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tangletrove_kelp.txt b/forge-gui/res/cardsfolder/t/tangletrove_kelp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tangletrove_kelp.txt
rename to forge-gui/res/cardsfolder/t/tangletrove_kelp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tenth_district_hero.txt b/forge-gui/res/cardsfolder/t/tenth_district_hero.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tenth_district_hero.txt
rename to forge-gui/res/cardsfolder/t/tenth_district_hero.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tesak_judiths_hellhound.txt b/forge-gui/res/cardsfolder/t/tesak_judiths_hellhound.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tesak_judiths_hellhound.txt
rename to forge-gui/res/cardsfolder/t/tesak_judiths_hellhound.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/teysa_opulent_oligarch.txt b/forge-gui/res/cardsfolder/t/teysa_opulent_oligarch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/teysa_opulent_oligarch.txt
rename to forge-gui/res/cardsfolder/t/teysa_opulent_oligarch.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_chase_is_on.txt b/forge-gui/res/cardsfolder/t/the_chase_is_on.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_chase_is_on.txt
rename to forge-gui/res/cardsfolder/t/the_chase_is_on.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_fifteenth_doctor.txt b/forge-gui/res/cardsfolder/t/the_fifteenth_doctor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_fifteenth_doctor.txt
rename to forge-gui/res/cardsfolder/t/the_fifteenth_doctor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_fourteenth_doctor.txt b/forge-gui/res/cardsfolder/t/the_fourteenth_doctor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_fourteenth_doctor.txt
rename to forge-gui/res/cardsfolder/t/the_fourteenth_doctor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_master_multiplied.txt b/forge-gui/res/cardsfolder/t/the_master_multiplied.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_master_multiplied.txt
rename to forge-gui/res/cardsfolder/t/the_master_multiplied.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_meep.txt b/forge-gui/res/cardsfolder/t/the_meep.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_meep.txt
rename to forge-gui/res/cardsfolder/t/the_meep.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_pride_of_hull_clade.txt b/forge-gui/res/cardsfolder/t/the_pride_of_hull_clade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_pride_of_hull_clade.txt
rename to forge-gui/res/cardsfolder/t/the_pride_of_hull_clade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_toymakers_trap.txt b/forge-gui/res/cardsfolder/t/the_toymakers_trap.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_toymakers_trap.txt
rename to forge-gui/res/cardsfolder/t/the_toymakers_trap.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_wise_mothman.txt b/forge-gui/res/cardsfolder/t/the_wise_mothman.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_wise_mothman.txt
rename to forge-gui/res/cardsfolder/t/the_wise_mothman.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/they_went_this_way.txt b/forge-gui/res/cardsfolder/t/they_went_this_way.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/they_went_this_way.txt
rename to forge-gui/res/cardsfolder/t/they_went_this_way.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thinking_cap.txt b/forge-gui/res/cardsfolder/t/thinking_cap.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thinking_cap.txt
rename to forge-gui/res/cardsfolder/t/thinking_cap.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thundering_falls.txt b/forge-gui/res/cardsfolder/t/thundering_falls.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thundering_falls.txt
rename to forge-gui/res/cardsfolder/t/thundering_falls.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tin_street_gossip.txt b/forge-gui/res/cardsfolder/t/tin_street_gossip.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tin_street_gossip.txt
rename to forge-gui/res/cardsfolder/t/tin_street_gossip.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tolsimir_midnights_light.txt b/forge-gui/res/cardsfolder/t/tolsimir_midnights_light.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tolsimir_midnights_light.txt
rename to forge-gui/res/cardsfolder/t/tolsimir_midnights_light.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tomik_wielder_of_law.txt b/forge-gui/res/cardsfolder/t/tomik_wielder_of_law.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tomik_wielder_of_law.txt
rename to forge-gui/res/cardsfolder/t/tomik_wielder_of_law.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/topiary_panther.txt b/forge-gui/res/cardsfolder/t/topiary_panther.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/topiary_panther.txt
rename to forge-gui/res/cardsfolder/t/topiary_panther.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/torch_the_witness.txt b/forge-gui/res/cardsfolder/t/torch_the_witness.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/torch_the_witness.txt
rename to forge-gui/res/cardsfolder/t/torch_the_witness.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/toxin_analysis.txt b/forge-gui/res/cardsfolder/t/toxin_analysis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/toxin_analysis.txt
rename to forge-gui/res/cardsfolder/t/toxin_analysis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt b/forge-gui/res/cardsfolder/t/treacherous_greed.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt
rename to forge-gui/res/cardsfolder/t/treacherous_greed.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tribune_of_rot.txt b/forge-gui/res/cardsfolder/t/tribune_of_rot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tribune_of_rot.txt
rename to forge-gui/res/cardsfolder/t/tribune_of_rot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/trostani_three_whispers.txt b/forge-gui/res/cardsfolder/t/trostani_three_whispers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/trostani_three_whispers.txt
rename to forge-gui/res/cardsfolder/t/trostani_three_whispers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/trouble_in_pairs.txt b/forge-gui/res/cardsfolder/t/trouble_in_pairs.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/trouble_in_pairs.txt
rename to forge-gui/res/cardsfolder/t/trouble_in_pairs.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tunnel_tipster.txt b/forge-gui/res/cardsfolder/t/tunnel_tipster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tunnel_tipster.txt
rename to forge-gui/res/cardsfolder/t/tunnel_tipster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unauthorized_exit.txt b/forge-gui/res/cardsfolder/u/unauthorized_exit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unauthorized_exit.txt
rename to forge-gui/res/cardsfolder/u/unauthorized_exit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/undercity_eliminator.txt b/forge-gui/res/cardsfolder/u/undercity_eliminator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/undercity_eliminator.txt
rename to forge-gui/res/cardsfolder/u/undercity_eliminator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/undercity_sewers.txt b/forge-gui/res/cardsfolder/u/undercity_sewers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/undercity_sewers.txt
rename to forge-gui/res/cardsfolder/u/undercity_sewers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/undercover_crocodelf.txt b/forge-gui/res/cardsfolder/u/undercover_crocodelf.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/undercover_crocodelf.txt
rename to forge-gui/res/cardsfolder/u/undercover_crocodelf.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/underground_mortuary.txt b/forge-gui/res/cardsfolder/u/underground_mortuary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/underground_mortuary.txt
rename to forge-gui/res/cardsfolder/u/underground_mortuary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/undergrowth_recon.txt b/forge-gui/res/cardsfolder/u/undergrowth_recon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/undergrowth_recon.txt
rename to forge-gui/res/cardsfolder/u/undergrowth_recon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unscrupulous_agent.txt b/forge-gui/res/cardsfolder/u/unscrupulous_agent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unscrupulous_agent.txt
rename to forge-gui/res/cardsfolder/u/unscrupulous_agent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unshakable_tail.txt b/forge-gui/res/cardsfolder/u/unshakable_tail.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unshakable_tail.txt
rename to forge-gui/res/cardsfolder/u/unshakable_tail.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unyielding_gatekeeper.txt b/forge-gui/res/cardsfolder/u/unyielding_gatekeeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unyielding_gatekeeper.txt
rename to forge-gui/res/cardsfolder/u/unyielding_gatekeeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/urgent_necropsy.txt b/forge-gui/res/cardsfolder/u/urgent_necropsy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/urgent_necropsy.txt
rename to forge-gui/res/cardsfolder/u/urgent_necropsy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/valiant_batrider.txt b/forge-gui/res/cardsfolder/v/valiant_batrider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/valiant_batrider.txt
rename to forge-gui/res/cardsfolder/v/valiant_batrider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vannifar_evolved_enigma.txt b/forge-gui/res/cardsfolder/v/vannifar_evolved_enigma.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vannifar_evolved_enigma.txt
rename to forge-gui/res/cardsfolder/v/vannifar_evolved_enigma.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vats.txt b/forge-gui/res/cardsfolder/v/vats.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vats.txt
rename to forge-gui/res/cardsfolder/v/vats.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vault_101_birthday_party.txt b/forge-gui/res/cardsfolder/v/vault_101_birthday_party.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vault_101_birthday_party.txt
rename to forge-gui/res/cardsfolder/v/vault_101_birthday_party.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vein_ripper.txt b/forge-gui/res/cardsfolder/v/vein_ripper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vein_ripper.txt
rename to forge-gui/res/cardsfolder/v/vein_ripper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vengeful_creeper.txt b/forge-gui/res/cardsfolder/v/vengeful_creeper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vengeful_creeper.txt
rename to forge-gui/res/cardsfolder/v/vengeful_creeper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vengeful_tracker.txt b/forge-gui/res/cardsfolder/v/vengeful_tracker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vengeful_tracker.txt
rename to forge-gui/res/cardsfolder/v/vengeful_tracker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/viridescent_bog.txt b/forge-gui/res/cardsfolder/v/viridescent_bog.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/viridescent_bog.txt
rename to forge-gui/res/cardsfolder/v/viridescent_bog.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vitu_ghazi_inspector.txt b/forge-gui/res/cardsfolder/v/vitu_ghazi_inspector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vitu_ghazi_inspector.txt
rename to forge-gui/res/cardsfolder/v/vitu_ghazi_inspector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/voja_jaws_of_the_conclave.txt b/forge-gui/res/cardsfolder/v/voja_jaws_of_the_conclave.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/voja_jaws_of_the_conclave.txt
rename to forge-gui/res/cardsfolder/v/voja_jaws_of_the_conclave.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/warleaders_call.txt b/forge-gui/res/cardsfolder/w/warleaders_call.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/warleaders_call.txt
rename to forge-gui/res/cardsfolder/w/warleaders_call.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/watcher_of_hours.txt b/forge-gui/res/cardsfolder/w/watcher_of_hours.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/watcher_of_hours.txt
rename to forge-gui/res/cardsfolder/w/watcher_of_hours.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/watchful_radstag.txt b/forge-gui/res/cardsfolder/w/watchful_radstag.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/watchful_radstag.txt
rename to forge-gui/res/cardsfolder/w/watchful_radstag.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/white_glove_gourmand.txt b/forge-gui/res/cardsfolder/w/white_glove_gourmand.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/white_glove_gourmand.txt
rename to forge-gui/res/cardsfolder/w/white_glove_gourmand.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wild_wasteland.txt b/forge-gui/res/cardsfolder/w/wild_wasteland.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wild_wasteland.txt
rename to forge-gui/res/cardsfolder/w/wild_wasteland.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wingbane_vantasaur.txt b/forge-gui/res/cardsfolder/w/wingbane_vantasaur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wingbane_vantasaur.txt
rename to forge-gui/res/cardsfolder/w/wingbane_vantasaur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wispdrinker_vampire.txt b/forge-gui/res/cardsfolder/w/wispdrinker_vampire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wispdrinker_vampire.txt
rename to forge-gui/res/cardsfolder/w/wispdrinker_vampire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wojek_investigator.txt b/forge-gui/res/cardsfolder/w/wojek_investigator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wojek_investigator.txt
rename to forge-gui/res/cardsfolder/w/wojek_investigator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/worldsouls_rage.txt b/forge-gui/res/cardsfolder/w/worldsouls_rage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/worldsouls_rage.txt
rename to forge-gui/res/cardsfolder/w/worldsouls_rage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wrench.txt b/forge-gui/res/cardsfolder/w/wrench.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wrench.txt
rename to forge-gui/res/cardsfolder/w/wrench.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yarus_roar_of_the_old_gods.txt b/forge-gui/res/cardsfolder/y/yarus_roar_of_the_old_gods.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yarus_roar_of_the_old_gods.txt
rename to forge-gui/res/cardsfolder/y/yarus_roar_of_the_old_gods.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yes_man_personal_securitron.txt b/forge-gui/res/cardsfolder/y/yes_man_personal_securitron.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yes_man_personal_securitron.txt
rename to forge-gui/res/cardsfolder/y/yes_man_personal_securitron.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/young_deathclaws.txt b/forge-gui/res/cardsfolder/y/young_deathclaws.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/young_deathclaws.txt
rename to forge-gui/res/cardsfolder/y/young_deathclaws.txt