diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/acquisitions_expert.txt b/forge-gui/res/cardsfolder/a/acquisitions_expert.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/acquisitions_expert.txt
rename to forge-gui/res/cardsfolder/a/acquisitions_expert.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/adventure_awaits.txt b/forge-gui/res/cardsfolder/a/adventure_awaits.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/adventure_awaits.txt
rename to forge-gui/res/cardsfolder/a/adventure_awaits.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/agadeems_awakening_agadeem_the_undercrypt.txt b/forge-gui/res/cardsfolder/a/agadeems_awakening_agadeem_the_undercrypt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/agadeems_awakening_agadeem_the_undercrypt.txt
rename to forge-gui/res/cardsfolder/a/agadeems_awakening_agadeem_the_undercrypt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/akiri_fearless_voyager.txt b/forge-gui/res/cardsfolder/a/akiri_fearless_voyager.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/akiri_fearless_voyager.txt
rename to forge-gui/res/cardsfolder/a/akiri_fearless_voyager.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/akoum_hellhound.txt b/forge-gui/res/cardsfolder/a/akoum_hellhound.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/akoum_hellhound.txt
rename to forge-gui/res/cardsfolder/a/akoum_hellhound.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/akoum_warrior_akoum_teeth.txt b/forge-gui/res/cardsfolder/a/akoum_warrior_akoum_teeth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/akoum_warrior_akoum_teeth.txt
rename to forge-gui/res/cardsfolder/a/akoum_warrior_akoum_teeth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/allied_assault.txt b/forge-gui/res/cardsfolder/a/allied_assault.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/allied_assault.txt
rename to forge-gui/res/cardsfolder/a/allied_assault.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/ancient_greenwarden.txt b/forge-gui/res/cardsfolder/a/ancient_greenwarden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/ancient_greenwarden.txt
rename to forge-gui/res/cardsfolder/a/ancient_greenwarden.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/angel_of_destiny.txt b/forge-gui/res/cardsfolder/a/angel_of_destiny.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/angel_of_destiny.txt
rename to forge-gui/res/cardsfolder/a/angel_of_destiny.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/angelheart_protector.txt b/forge-gui/res/cardsfolder/a/angelheart_protector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/angelheart_protector.txt
rename to forge-gui/res/cardsfolder/a/angelheart_protector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNC/anowon_the_ruin_thief.txt b/forge-gui/res/cardsfolder/a/anowon_the_ruin_thief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNC/anowon_the_ruin_thief.txt
rename to forge-gui/res/cardsfolder/a/anowon_the_ruin_thief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/anticognition.txt b/forge-gui/res/cardsfolder/a/anticognition.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/anticognition.txt
rename to forge-gui/res/cardsfolder/a/anticognition.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/archon_of_emeria.txt b/forge-gui/res/cardsfolder/a/archon_of_emeria.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/archon_of_emeria.txt
rename to forge-gui/res/cardsfolder/a/archon_of_emeria.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/archpriest_of_iona.txt b/forge-gui/res/cardsfolder/a/archpriest_of_iona.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/archpriest_of_iona.txt
rename to forge-gui/res/cardsfolder/a/archpriest_of_iona.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/ardent_electromancer.txt b/forge-gui/res/cardsfolder/a/ardent_electromancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/ardent_electromancer.txt
rename to forge-gui/res/cardsfolder/a/ardent_electromancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/ashaya_soul_of_the_wild.txt b/forge-gui/res/cardsfolder/a/ashaya_soul_of_the_wild.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/ashaya_soul_of_the_wild.txt
rename to forge-gui/res/cardsfolder/a/ashaya_soul_of_the_wild.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/attended_healer.txt b/forge-gui/res/cardsfolder/a/attended_healer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/attended_healer.txt
rename to forge-gui/res/cardsfolder/a/attended_healer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/bala_ged_recovery_bala_ged_sanctuary.txt b/forge-gui/res/cardsfolder/b/bala_ged_recovery_bala_ged_sanctuary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/bala_ged_recovery_bala_ged_sanctuary.txt
rename to forge-gui/res/cardsfolder/b/bala_ged_recovery_bala_ged_sanctuary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/base_camp.txt b/forge-gui/res/cardsfolder/b/base_camp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/base_camp.txt
rename to forge-gui/res/cardsfolder/b/base_camp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/beyeen_veil_beyeen_coast.txt b/forge-gui/res/cardsfolder/b/beyeen_veil_beyeen_coast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/beyeen_veil_beyeen_coast.txt
rename to forge-gui/res/cardsfolder/b/beyeen_veil_beyeen_coast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/blackbloom_rogue_blackbloom_bog.txt b/forge-gui/res/cardsfolder/b/blackbloom_rogue_blackbloom_bog.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/blackbloom_rogue_blackbloom_bog.txt
rename to forge-gui/res/cardsfolder/b/blackbloom_rogue_blackbloom_bog.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/blood_beckoning.txt b/forge-gui/res/cardsfolder/b/blood_beckoning.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/blood_beckoning.txt
rename to forge-gui/res/cardsfolder/b/blood_beckoning.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/blood_price.txt b/forge-gui/res/cardsfolder/b/blood_price.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/blood_price.txt
rename to forge-gui/res/cardsfolder/b/blood_price.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/bloodchiefs_thirst.txt b/forge-gui/res/cardsfolder/b/bloodchiefs_thirst.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/bloodchiefs_thirst.txt
rename to forge-gui/res/cardsfolder/b/bloodchiefs_thirst.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/branchloft_pathway_boulderloft_pathway.txt b/forge-gui/res/cardsfolder/b/branchloft_pathway_boulderloft_pathway.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/branchloft_pathway_boulderloft_pathway.txt
rename to forge-gui/res/cardsfolder/b/branchloft_pathway_boulderloft_pathway.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/brightclimb_pathway_grimclimb_pathway.txt b/forge-gui/res/cardsfolder/b/brightclimb_pathway_grimclimb_pathway.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/brightclimb_pathway_grimclimb_pathway.txt
rename to forge-gui/res/cardsfolder/b/brightclimb_pathway_grimclimb_pathway.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/broken_wings.txt b/forge-gui/res/cardsfolder/b/broken_wings.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/broken_wings.txt
rename to forge-gui/res/cardsfolder/b/broken_wings.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/brushfire_elemental.txt b/forge-gui/res/cardsfolder/b/brushfire_elemental.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/brushfire_elemental.txt
rename to forge-gui/res/cardsfolder/b/brushfire_elemental.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/bubble_snare.txt b/forge-gui/res/cardsfolder/b/bubble_snare.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/bubble_snare.txt
rename to forge-gui/res/cardsfolder/b/bubble_snare.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/canopy_baloth.txt b/forge-gui/res/cardsfolder/c/canopy_baloth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/canopy_baloth.txt
rename to forge-gui/res/cardsfolder/c/canopy_baloth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/canyon_jerboa.txt b/forge-gui/res/cardsfolder/c/canyon_jerboa.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/canyon_jerboa.txt
rename to forge-gui/res/cardsfolder/c/canyon_jerboa.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/cascade_seer.txt b/forge-gui/res/cardsfolder/c/cascade_seer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/cascade_seer.txt
rename to forge-gui/res/cardsfolder/c/cascade_seer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/charix_the_raging_isle.txt b/forge-gui/res/cardsfolder/c/charix_the_raging_isle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/charix_the_raging_isle.txt
rename to forge-gui/res/cardsfolder/c/charix_the_raging_isle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/chilling_trap.txt b/forge-gui/res/cardsfolder/c/chilling_trap.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/chilling_trap.txt
rename to forge-gui/res/cardsfolder/c/chilling_trap.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/cinderclasm.txt b/forge-gui/res/cardsfolder/c/cinderclasm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/cinderclasm.txt
rename to forge-gui/res/cardsfolder/c/cinderclasm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/cleansing_wildfire.txt b/forge-gui/res/cardsfolder/c/cleansing_wildfire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/cleansing_wildfire.txt
rename to forge-gui/res/cardsfolder/c/cleansing_wildfire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/clearwater_pathway_murkwater_pathway.txt b/forge-gui/res/cardsfolder/c/clearwater_pathway_murkwater_pathway.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/clearwater_pathway_murkwater_pathway.txt
rename to forge-gui/res/cardsfolder/c/clearwater_pathway_murkwater_pathway.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/cleric_of_chill_depths.txt b/forge-gui/res/cardsfolder/c/cleric_of_chill_depths.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/cleric_of_chill_depths.txt
rename to forge-gui/res/cardsfolder/c/cleric_of_chill_depths.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/cleric_of_lifes_bond.txt b/forge-gui/res/cardsfolder/c/cleric_of_lifes_bond.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/cleric_of_lifes_bond.txt
rename to forge-gui/res/cardsfolder/c/cleric_of_lifes_bond.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/cliffhaven_kitesail.txt b/forge-gui/res/cardsfolder/c/cliffhaven_kitesail.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/cliffhaven_kitesail.txt
rename to forge-gui/res/cardsfolder/c/cliffhaven_kitesail.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/cliffhaven_sell_sword.txt b/forge-gui/res/cardsfolder/c/cliffhaven_sell_sword.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/cliffhaven_sell_sword.txt
rename to forge-gui/res/cardsfolder/c/cliffhaven_sell_sword.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/concerted_defense.txt b/forge-gui/res/cardsfolder/c/concerted_defense.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/concerted_defense.txt
rename to forge-gui/res/cardsfolder/c/concerted_defense.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/confounding_conundrum.txt b/forge-gui/res/cardsfolder/c/confounding_conundrum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/confounding_conundrum.txt
rename to forge-gui/res/cardsfolder/c/confounding_conundrum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/coralhelm_chronicler.txt b/forge-gui/res/cardsfolder/c/coralhelm_chronicler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/coralhelm_chronicler.txt
rename to forge-gui/res/cardsfolder/c/coralhelm_chronicler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/coveted_prize.txt b/forge-gui/res/cardsfolder/c/coveted_prize.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/coveted_prize.txt
rename to forge-gui/res/cardsfolder/c/coveted_prize.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/cragcrown_pathway_timbercrown_pathway.txt b/forge-gui/res/cardsfolder/c/cragcrown_pathway_timbercrown_pathway.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/cragcrown_pathway_timbercrown_pathway.txt
rename to forge-gui/res/cardsfolder/c/cragcrown_pathway_timbercrown_pathway.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/cragplate_baloth.txt b/forge-gui/res/cardsfolder/c/cragplate_baloth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/cragplate_baloth.txt
rename to forge-gui/res/cardsfolder/c/cragplate_baloth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/crawling_barrens.txt b/forge-gui/res/cardsfolder/c/crawling_barrens.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/crawling_barrens.txt
rename to forge-gui/res/cardsfolder/c/crawling_barrens.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/cunning_geysermage.txt b/forge-gui/res/cardsfolder/c/cunning_geysermage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/cunning_geysermage.txt
rename to forge-gui/res/cardsfolder/c/cunning_geysermage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/dauntless_survivor.txt b/forge-gui/res/cardsfolder/d/dauntless_survivor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/dauntless_survivor.txt
rename to forge-gui/res/cardsfolder/d/dauntless_survivor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/dauntless_unity.txt b/forge-gui/res/cardsfolder/d/dauntless_unity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/dauntless_unity.txt
rename to forge-gui/res/cardsfolder/d/dauntless_unity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/deadly_alliance.txt b/forge-gui/res/cardsfolder/d/deadly_alliance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/deadly_alliance.txt
rename to forge-gui/res/cardsfolder/d/deadly_alliance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/deliberate.txt b/forge-gui/res/cardsfolder/d/deliberate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/deliberate.txt
rename to forge-gui/res/cardsfolder/d/deliberate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/demons_disciple.txt b/forge-gui/res/cardsfolder/d/demons_disciple.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/demons_disciple.txt
rename to forge-gui/res/cardsfolder/d/demons_disciple.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/drana_the_last_bloodchief.txt b/forge-gui/res/cardsfolder/d/drana_the_last_bloodchief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/drana_the_last_bloodchief.txt
rename to forge-gui/res/cardsfolder/d/drana_the_last_bloodchief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/dranas_silencer.txt b/forge-gui/res/cardsfolder/d/dranas_silencer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/dranas_silencer.txt
rename to forge-gui/res/cardsfolder/d/dranas_silencer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/dreadwurm.txt b/forge-gui/res/cardsfolder/d/dreadwurm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/dreadwurm.txt
rename to forge-gui/res/cardsfolder/d/dreadwurm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/emeria_captain.txt b/forge-gui/res/cardsfolder/e/emeria_captain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/emeria_captain.txt
rename to forge-gui/res/cardsfolder/e/emeria_captain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/emerias_call_emeria_shattered_skyclave.txt b/forge-gui/res/cardsfolder/e/emerias_call_emeria_shattered_skyclave.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/emerias_call_emeria_shattered_skyclave.txt
rename to forge-gui/res/cardsfolder/e/emerias_call_emeria_shattered_skyclave.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNC/enigma_thief.txt b/forge-gui/res/cardsfolder/e/enigma_thief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNC/enigma_thief.txt
rename to forge-gui/res/cardsfolder/e/enigma_thief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/expedition_champion.txt b/forge-gui/res/cardsfolder/e/expedition_champion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/expedition_champion.txt
rename to forge-gui/res/cardsfolder/e/expedition_champion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/expedition_diviner.txt b/forge-gui/res/cardsfolder/e/expedition_diviner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/expedition_diviner.txt
rename to forge-gui/res/cardsfolder/e/expedition_diviner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/expedition_healer.txt b/forge-gui/res/cardsfolder/e/expedition_healer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/expedition_healer.txt
rename to forge-gui/res/cardsfolder/e/expedition_healer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/expedition_skulker.txt b/forge-gui/res/cardsfolder/e/expedition_skulker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/expedition_skulker.txt
rename to forge-gui/res/cardsfolder/e/expedition_skulker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/farsight_adept.txt b/forge-gui/res/cardsfolder/f/farsight_adept.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/farsight_adept.txt
rename to forge-gui/res/cardsfolder/f/farsight_adept.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/fearless_fledgling.txt b/forge-gui/res/cardsfolder/f/fearless_fledgling.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/fearless_fledgling.txt
rename to forge-gui/res/cardsfolder/f/fearless_fledgling.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/feed_the_swarm.txt b/forge-gui/res/cardsfolder/f/feed_the_swarm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/feed_the_swarm.txt
rename to forge-gui/res/cardsfolder/f/feed_the_swarm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/felidar_retreat.txt b/forge-gui/res/cardsfolder/f/felidar_retreat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/felidar_retreat.txt
rename to forge-gui/res/cardsfolder/f/felidar_retreat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/field_research.txt b/forge-gui/res/cardsfolder/f/field_research.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/field_research.txt
rename to forge-gui/res/cardsfolder/f/field_research.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/fireblade_charger.txt b/forge-gui/res/cardsfolder/f/fireblade_charger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/fireblade_charger.txt
rename to forge-gui/res/cardsfolder/f/fireblade_charger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/fissure_wizard.txt b/forge-gui/res/cardsfolder/f/fissure_wizard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/fissure_wizard.txt
rename to forge-gui/res/cardsfolder/f/fissure_wizard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/forsaken_monument.txt b/forge-gui/res/cardsfolder/f/forsaken_monument.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/forsaken_monument.txt
rename to forge-gui/res/cardsfolder/f/forsaken_monument.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNC/geode_rager.txt b/forge-gui/res/cardsfolder/g/geode_rager.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNC/geode_rager.txt
rename to forge-gui/res/cardsfolder/g/geode_rager.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/ghastly_gloomhunter.txt b/forge-gui/res/cardsfolder/g/ghastly_gloomhunter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/ghastly_gloomhunter.txt
rename to forge-gui/res/cardsfolder/g/ghastly_gloomhunter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/glacial_grasp.txt b/forge-gui/res/cardsfolder/g/glacial_grasp.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/glacial_grasp.txt
rename to forge-gui/res/cardsfolder/g/glacial_grasp.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/glasspool_mimic_glasspool_shore.txt b/forge-gui/res/cardsfolder/g/glasspool_mimic_glasspool_shore.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/glasspool_mimic_glasspool_shore.txt
rename to forge-gui/res/cardsfolder/g/glasspool_mimic_glasspool_shore.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/gnarlid_colony.txt b/forge-gui/res/cardsfolder/g/gnarlid_colony.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/gnarlid_colony.txt
rename to forge-gui/res/cardsfolder/g/gnarlid_colony.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/goma_fada_vanguard.txt b/forge-gui/res/cardsfolder/g/goma_fada_vanguard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/goma_fada_vanguard.txt
rename to forge-gui/res/cardsfolder/g/goma_fada_vanguard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/grakmaw_skyclave_ravager.txt b/forge-gui/res/cardsfolder/g/grakmaw_skyclave_ravager.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/grakmaw_skyclave_ravager.txt
rename to forge-gui/res/cardsfolder/g/grakmaw_skyclave_ravager.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/grotag_bug_catcher.txt b/forge-gui/res/cardsfolder/g/grotag_bug_catcher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/grotag_bug_catcher.txt
rename to forge-gui/res/cardsfolder/g/grotag_bug_catcher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/grotag_night_runner.txt b/forge-gui/res/cardsfolder/g/grotag_night_runner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/grotag_night_runner.txt
rename to forge-gui/res/cardsfolder/g/grotag_night_runner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/guul_draz_mucklord.txt b/forge-gui/res/cardsfolder/g/guul_draz_mucklord.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/guul_draz_mucklord.txt
rename to forge-gui/res/cardsfolder/g/guul_draz_mucklord.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/hagra_constrictor.txt b/forge-gui/res/cardsfolder/h/hagra_constrictor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/hagra_constrictor.txt
rename to forge-gui/res/cardsfolder/h/hagra_constrictor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/hagra_mauling_hagra_broodpit.txt b/forge-gui/res/cardsfolder/h/hagra_mauling_hagra_broodpit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/hagra_mauling_hagra_broodpit.txt
rename to forge-gui/res/cardsfolder/h/hagra_mauling_hagra_broodpit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/highborn_vampire.txt b/forge-gui/res/cardsfolder/h/highborn_vampire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/highborn_vampire.txt
rename to forge-gui/res/cardsfolder/h/highborn_vampire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/inordinate_rage.txt b/forge-gui/res/cardsfolder/i/inordinate_rage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/inordinate_rage.txt
rename to forge-gui/res/cardsfolder/i/inordinate_rage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/jace_mirror_mage.txt b/forge-gui/res/cardsfolder/j/jace_mirror_mage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/jace_mirror_mage.txt
rename to forge-gui/res/cardsfolder/j/jace_mirror_mage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/joraga_visionary.txt b/forge-gui/res/cardsfolder/j/joraga_visionary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/joraga_visionary.txt
rename to forge-gui/res/cardsfolder/j/joraga_visionary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/journey_to_oblivion.txt b/forge-gui/res/cardsfolder/j/journey_to_oblivion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/journey_to_oblivion.txt
rename to forge-gui/res/cardsfolder/j/journey_to_oblivion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/jwari_disruption_jwari_ruins.txt b/forge-gui/res/cardsfolder/j/jwari_disruption_jwari_ruins.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/jwari_disruption_jwari_ruins.txt
rename to forge-gui/res/cardsfolder/j/jwari_disruption_jwari_ruins.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/kabira_outrider.txt b/forge-gui/res/cardsfolder/k/kabira_outrider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/kabira_outrider.txt
rename to forge-gui/res/cardsfolder/k/kabira_outrider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/kabira_takedown_kabira_plateau.txt b/forge-gui/res/cardsfolder/k/kabira_takedown_kabira_plateau.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/kabira_takedown_kabira_plateau.txt
rename to forge-gui/res/cardsfolder/k/kabira_takedown_kabira_plateau.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/kargan_intimidator.txt b/forge-gui/res/cardsfolder/k/kargan_intimidator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/kargan_intimidator.txt
rename to forge-gui/res/cardsfolder/k/kargan_intimidator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/kargan_warleader.txt b/forge-gui/res/cardsfolder/k/kargan_warleader.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/kargan_warleader.txt
rename to forge-gui/res/cardsfolder/k/kargan_warleader.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/kaza_roil_chaser.txt b/forge-gui/res/cardsfolder/k/kaza_roil_chaser.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/kaza_roil_chaser.txt
rename to forge-gui/res/cardsfolder/k/kaza_roil_chaser.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/kazandu_mammoth_kazandu_valley.txt b/forge-gui/res/cardsfolder/k/kazandu_mammoth_kazandu_valley.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/kazandu_mammoth_kazandu_valley.txt
rename to forge-gui/res/cardsfolder/k/kazandu_mammoth_kazandu_valley.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/kazandu_nectarpot.txt b/forge-gui/res/cardsfolder/k/kazandu_nectarpot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/kazandu_nectarpot.txt
rename to forge-gui/res/cardsfolder/k/kazandu_nectarpot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/kazandu_stomper.txt b/forge-gui/res/cardsfolder/k/kazandu_stomper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/kazandu_stomper.txt
rename to forge-gui/res/cardsfolder/k/kazandu_stomper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/kazuuls_fury_kazuuls_cliffs.txt b/forge-gui/res/cardsfolder/k/kazuuls_fury_kazuuls_cliffs.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/kazuuls_fury_kazuuls_cliffs.txt
rename to forge-gui/res/cardsfolder/k/kazuuls_fury_kazuuls_cliffs.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/khalni_ambush_khalni_territory.txt b/forge-gui/res/cardsfolder/k/khalni_ambush_khalni_territory.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/khalni_ambush_khalni_territory.txt
rename to forge-gui/res/cardsfolder/k/khalni_ambush_khalni_territory.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/kitesail_cleric.txt b/forge-gui/res/cardsfolder/k/kitesail_cleric.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/kitesail_cleric.txt
rename to forge-gui/res/cardsfolder/k/kitesail_cleric.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/kor_blademaster.txt b/forge-gui/res/cardsfolder/k/kor_blademaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/kor_blademaster.txt
rename to forge-gui/res/cardsfolder/k/kor_blademaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/kor_celebrant.txt b/forge-gui/res/cardsfolder/k/kor_celebrant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/kor_celebrant.txt
rename to forge-gui/res/cardsfolder/k/kor_celebrant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/legion_angel.txt b/forge-gui/res/cardsfolder/l/legion_angel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/legion_angel.txt
rename to forge-gui/res/cardsfolder/l/legion_angel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/leyline_tyrant.txt b/forge-gui/res/cardsfolder/l/leyline_tyrant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/leyline_tyrant.txt
rename to forge-gui/res/cardsfolder/l/leyline_tyrant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/linvala_shield_of_sea_gate.txt b/forge-gui/res/cardsfolder/l/linvala_shield_of_sea_gate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/linvala_shield_of_sea_gate.txt
rename to forge-gui/res/cardsfolder/l/linvala_shield_of_sea_gate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/lithoform_blight.txt b/forge-gui/res/cardsfolder/l/lithoform_blight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/lithoform_blight.txt
rename to forge-gui/res/cardsfolder/l/lithoform_blight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/living_tempest.txt b/forge-gui/res/cardsfolder/l/living_tempest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/living_tempest.txt
rename to forge-gui/res/cardsfolder/l/living_tempest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/lullmages_domination.txt b/forge-gui/res/cardsfolder/l/lullmages_domination.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/lullmages_domination.txt
rename to forge-gui/res/cardsfolder/l/lullmages_domination.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/lullmages_familiar.txt b/forge-gui/res/cardsfolder/l/lullmages_familiar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/lullmages_familiar.txt
rename to forge-gui/res/cardsfolder/l/lullmages_familiar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/luminarch_aspirant.txt b/forge-gui/res/cardsfolder/l/luminarch_aspirant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/luminarch_aspirant.txt
rename to forge-gui/res/cardsfolder/l/luminarch_aspirant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/maddening_cacophony.txt b/forge-gui/res/cardsfolder/m/maddening_cacophony.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/maddening_cacophony.txt
rename to forge-gui/res/cardsfolder/m/maddening_cacophony.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/magmatic_channeler.txt b/forge-gui/res/cardsfolder/m/magmatic_channeler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/magmatic_channeler.txt
rename to forge-gui/res/cardsfolder/m/magmatic_channeler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/makindi_ox.txt b/forge-gui/res/cardsfolder/m/makindi_ox.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/makindi_ox.txt
rename to forge-gui/res/cardsfolder/m/makindi_ox.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/makindi_stampede_makindi_mesas.txt b/forge-gui/res/cardsfolder/m/makindi_stampede_makindi_mesas.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/makindi_stampede_makindi_mesas.txt
rename to forge-gui/res/cardsfolder/m/makindi_stampede_makindi_mesas.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/malakir_blood_priest.txt b/forge-gui/res/cardsfolder/m/malakir_blood_priest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/malakir_blood_priest.txt
rename to forge-gui/res/cardsfolder/m/malakir_blood_priest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/malakir_rebirth_malakir_mire.txt b/forge-gui/res/cardsfolder/m/malakir_rebirth_malakir_mire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/malakir_rebirth_malakir_mire.txt
rename to forge-gui/res/cardsfolder/m/malakir_rebirth_malakir_mire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/marauding_blight_priest.txt b/forge-gui/res/cardsfolder/m/marauding_blight_priest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/marauding_blight_priest.txt
rename to forge-gui/res/cardsfolder/m/marauding_blight_priest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/master_of_winds.txt b/forge-gui/res/cardsfolder/m/master_of_winds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/master_of_winds.txt
rename to forge-gui/res/cardsfolder/m/master_of_winds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/maul_of_the_skyclaves.txt b/forge-gui/res/cardsfolder/m/maul_of_the_skyclaves.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/maul_of_the_skyclaves.txt
rename to forge-gui/res/cardsfolder/m/maul_of_the_skyclaves.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/merfolk_falconer.txt b/forge-gui/res/cardsfolder/m/merfolk_falconer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/merfolk_falconer.txt
rename to forge-gui/res/cardsfolder/m/merfolk_falconer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/merfolk_windrobber.txt b/forge-gui/res/cardsfolder/m/merfolk_windrobber.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/merfolk_windrobber.txt
rename to forge-gui/res/cardsfolder/m/merfolk_windrobber.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/mesa_lynx.txt b/forge-gui/res/cardsfolder/m/mesa_lynx.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/mesa_lynx.txt
rename to forge-gui/res/cardsfolder/m/mesa_lynx.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/might_of_murasa.txt b/forge-gui/res/cardsfolder/m/might_of_murasa.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/might_of_murasa.txt
rename to forge-gui/res/cardsfolder/m/might_of_murasa.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/mind_carver.txt b/forge-gui/res/cardsfolder/m/mind_carver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/mind_carver.txt
rename to forge-gui/res/cardsfolder/m/mind_carver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/mind_drain.txt b/forge-gui/res/cardsfolder/m/mind_drain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/mind_drain.txt
rename to forge-gui/res/cardsfolder/m/mind_drain.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/molten_blast.txt b/forge-gui/res/cardsfolder/m/molten_blast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/molten_blast.txt
rename to forge-gui/res/cardsfolder/m/molten_blast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/moraug_fury_of_akoum.txt b/forge-gui/res/cardsfolder/m/moraug_fury_of_akoum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/moraug_fury_of_akoum.txt
rename to forge-gui/res/cardsfolder/m/moraug_fury_of_akoum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/moss_pit_skeleton.txt b/forge-gui/res/cardsfolder/m/moss_pit_skeleton.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/moss_pit_skeleton.txt
rename to forge-gui/res/cardsfolder/m/moss_pit_skeleton.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/murasa_brute.txt b/forge-gui/res/cardsfolder/m/murasa_brute.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/murasa_brute.txt
rename to forge-gui/res/cardsfolder/m/murasa_brute.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/murasa_rootgrazer.txt b/forge-gui/res/cardsfolder/m/murasa_rootgrazer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/murasa_rootgrazer.txt
rename to forge-gui/res/cardsfolder/m/murasa_rootgrazer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/murasa_sproutling.txt b/forge-gui/res/cardsfolder/m/murasa_sproutling.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/murasa_sproutling.txt
rename to forge-gui/res/cardsfolder/m/murasa_sproutling.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/myriad_construct.txt b/forge-gui/res/cardsfolder/m/myriad_construct.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/myriad_construct.txt
rename to forge-gui/res/cardsfolder/m/myriad_construct.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/nahiri_heir_of_the_ancients.txt b/forge-gui/res/cardsfolder/n/nahiri_heir_of_the_ancients.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/nahiri_heir_of_the_ancients.txt
rename to forge-gui/res/cardsfolder/n/nahiri_heir_of_the_ancients.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/nahiris_binding.txt b/forge-gui/res/cardsfolder/n/nahiris_binding.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/nahiris_binding.txt
rename to forge-gui/res/cardsfolder/n/nahiris_binding.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/nahiris_lithoforming.txt b/forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/nahiris_lithoforming.txt
rename to forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/needleverge_pathway_pillarverge_pathway.txt b/forge-gui/res/cardsfolder/n/needleverge_pathway_pillarverge_pathway.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/needleverge_pathway_pillarverge_pathway.txt
rename to forge-gui/res/cardsfolder/n/needleverge_pathway_pillarverge_pathway.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/nighthawk_scavenger.txt b/forge-gui/res/cardsfolder/n/nighthawk_scavenger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/nighthawk_scavenger.txt
rename to forge-gui/res/cardsfolder/n/nighthawk_scavenger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/nimana_skitter_sneak.txt b/forge-gui/res/cardsfolder/n/nimana_skitter_sneak.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/nimana_skitter_sneak.txt
rename to forge-gui/res/cardsfolder/n/nimana_skitter_sneak.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/nimana_skydancer.txt b/forge-gui/res/cardsfolder/n/nimana_skydancer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/nimana_skydancer.txt
rename to forge-gui/res/cardsfolder/n/nimana_skydancer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/nimble_trapfinder.txt b/forge-gui/res/cardsfolder/n/nimble_trapfinder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/nimble_trapfinder.txt
rename to forge-gui/res/cardsfolder/n/nimble_trapfinder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/nissa_of_shadowed_boughs.txt b/forge-gui/res/cardsfolder/n/nissa_of_shadowed_boughs.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/nissa_of_shadowed_boughs.txt
rename to forge-gui/res/cardsfolder/n/nissa_of_shadowed_boughs.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/nissas_zendikon.txt b/forge-gui/res/cardsfolder/n/nissas_zendikon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/nissas_zendikon.txt
rename to forge-gui/res/cardsfolder/n/nissas_zendikon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/nullpriest_of_oblivion.txt b/forge-gui/res/cardsfolder/n/nullpriest_of_oblivion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/nullpriest_of_oblivion.txt
rename to forge-gui/res/cardsfolder/n/nullpriest_of_oblivion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/oblivions_hunger.txt b/forge-gui/res/cardsfolder/o/oblivions_hunger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/oblivions_hunger.txt
rename to forge-gui/res/cardsfolder/o/oblivions_hunger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNC/obuun_mul_daya_ancestor.txt b/forge-gui/res/cardsfolder/o/obuun_mul_daya_ancestor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNC/obuun_mul_daya_ancestor.txt
rename to forge-gui/res/cardsfolder/o/obuun_mul_daya_ancestor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/omnath_locus_of_creation.txt b/forge-gui/res/cardsfolder/o/omnath_locus_of_creation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/omnath_locus_of_creation.txt
rename to forge-gui/res/cardsfolder/o/omnath_locus_of_creation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/ondu_inversion_ondu_skyruins.txt b/forge-gui/res/cardsfolder/o/ondu_inversion_ondu_skyruins.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/ondu_inversion_ondu_skyruins.txt
rename to forge-gui/res/cardsfolder/o/ondu_inversion_ondu_skyruins.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/orah_skyclave_hierophant.txt b/forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/orah_skyclave_hierophant.txt
rename to forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/oran_rief_ooze.txt b/forge-gui/res/cardsfolder/o/oran_rief_ooze.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/oran_rief_ooze.txt
rename to forge-gui/res/cardsfolder/o/oran_rief_ooze.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/paired_tactician.txt b/forge-gui/res/cardsfolder/p/paired_tactician.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/paired_tactician.txt
rename to forge-gui/res/cardsfolder/p/paired_tactician.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/pelakka_predation_pelakka_caverns.txt b/forge-gui/res/cardsfolder/p/pelakka_predation_pelakka_caverns.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/pelakka_predation_pelakka_caverns.txt
rename to forge-gui/res/cardsfolder/p/pelakka_predation_pelakka_caverns.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/phylath_world_sculptor.txt b/forge-gui/res/cardsfolder/p/phylath_world_sculptor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/phylath_world_sculptor.txt
rename to forge-gui/res/cardsfolder/p/phylath_world_sculptor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/practiced_tactics.txt b/forge-gui/res/cardsfolder/p/practiced_tactics.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/practiced_tactics.txt
rename to forge-gui/res/cardsfolder/p/practiced_tactics.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/prowling_felidar.txt b/forge-gui/res/cardsfolder/p/prowling_felidar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/prowling_felidar.txt
rename to forge-gui/res/cardsfolder/p/prowling_felidar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/pyroclastic_hellion.txt b/forge-gui/res/cardsfolder/p/pyroclastic_hellion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/pyroclastic_hellion.txt
rename to forge-gui/res/cardsfolder/p/pyroclastic_hellion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/ravagers_mace.txt b/forge-gui/res/cardsfolder/r/ravagers_mace.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/ravagers_mace.txt
rename to forge-gui/res/cardsfolder/r/ravagers_mace.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/reclaim_the_wastes.txt b/forge-gui/res/cardsfolder/r/reclaim_the_wastes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/reclaim_the_wastes.txt
rename to forge-gui/res/cardsfolder/r/reclaim_the_wastes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/relic_amulet.txt b/forge-gui/res/cardsfolder/r/relic_amulet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/relic_amulet.txt
rename to forge-gui/res/cardsfolder/r/relic_amulet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/relic_axe.txt b/forge-gui/res/cardsfolder/r/relic_axe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/relic_axe.txt
rename to forge-gui/res/cardsfolder/r/relic_axe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/relic_golem.txt b/forge-gui/res/cardsfolder/r/relic_golem.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/relic_golem.txt
rename to forge-gui/res/cardsfolder/r/relic_golem.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/relic_robber.txt b/forge-gui/res/cardsfolder/r/relic_robber.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/relic_robber.txt
rename to forge-gui/res/cardsfolder/r/relic_robber.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/relic_vial.txt b/forge-gui/res/cardsfolder/r/relic_vial.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/relic_vial.txt
rename to forge-gui/res/cardsfolder/r/relic_vial.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/resolute_strike.txt b/forge-gui/res/cardsfolder/r/resolute_strike.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/resolute_strike.txt
rename to forge-gui/res/cardsfolder/r/resolute_strike.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/risen_riptide.txt b/forge-gui/res/cardsfolder/r/risen_riptide.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/risen_riptide.txt
rename to forge-gui/res/cardsfolder/r/risen_riptide.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/riverglide_pathway_lavaglide_pathway.txt b/forge-gui/res/cardsfolder/r/riverglide_pathway_lavaglide_pathway.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/riverglide_pathway_lavaglide_pathway.txt
rename to forge-gui/res/cardsfolder/r/riverglide_pathway_lavaglide_pathway.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/rockslide_sorcerer.txt b/forge-gui/res/cardsfolder/r/rockslide_sorcerer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/rockslide_sorcerer.txt
rename to forge-gui/res/cardsfolder/r/rockslide_sorcerer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/roil_eruption.txt b/forge-gui/res/cardsfolder/r/roil_eruption.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/roil_eruption.txt
rename to forge-gui/res/cardsfolder/r/roil_eruption.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/roiling_regrowth.txt b/forge-gui/res/cardsfolder/r/roiling_regrowth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/roiling_regrowth.txt
rename to forge-gui/res/cardsfolder/r/roiling_regrowth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/roiling_vortex.txt b/forge-gui/res/cardsfolder/r/roiling_vortex.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/roiling_vortex.txt
rename to forge-gui/res/cardsfolder/r/roiling_vortex.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/roost_of_drakes.txt b/forge-gui/res/cardsfolder/r/roost_of_drakes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/roost_of_drakes.txt
rename to forge-gui/res/cardsfolder/r/roost_of_drakes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/ruin_crab.txt b/forge-gui/res/cardsfolder/r/ruin_crab.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/ruin_crab.txt
rename to forge-gui/res/cardsfolder/r/ruin_crab.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/scale_the_heights.txt b/forge-gui/res/cardsfolder/s/scale_the_heights.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/scale_the_heights.txt
rename to forge-gui/res/cardsfolder/s/scale_the_heights.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/scavenged_blade.txt b/forge-gui/res/cardsfolder/s/scavenged_blade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/scavenged_blade.txt
rename to forge-gui/res/cardsfolder/s/scavenged_blade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/scion_of_the_swarm.txt b/forge-gui/res/cardsfolder/s/scion_of_the_swarm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/scion_of_the_swarm.txt
rename to forge-gui/res/cardsfolder/s/scion_of_the_swarm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/scorch_rider.txt b/forge-gui/res/cardsfolder/s/scorch_rider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/scorch_rider.txt
rename to forge-gui/res/cardsfolder/s/scorch_rider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/scourge_of_the_skyclaves.txt b/forge-gui/res/cardsfolder/s/scourge_of_the_skyclaves.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/scourge_of_the_skyclaves.txt
rename to forge-gui/res/cardsfolder/s/scourge_of_the_skyclaves.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/scute_swarm.txt b/forge-gui/res/cardsfolder/s/scute_swarm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/scute_swarm.txt
rename to forge-gui/res/cardsfolder/s/scute_swarm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/sea_gate_banneret.txt b/forge-gui/res/cardsfolder/s/sea_gate_banneret.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/sea_gate_banneret.txt
rename to forge-gui/res/cardsfolder/s/sea_gate_banneret.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/sea_gate_colossus.txt b/forge-gui/res/cardsfolder/s/sea_gate_colossus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/sea_gate_colossus.txt
rename to forge-gui/res/cardsfolder/s/sea_gate_colossus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/sea_gate_restoration_sea_gate_reborn.txt b/forge-gui/res/cardsfolder/s/sea_gate_restoration_sea_gate_reborn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/sea_gate_restoration_sea_gate_reborn.txt
rename to forge-gui/res/cardsfolder/s/sea_gate_restoration_sea_gate_reborn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/sea_gate_stormcaller.txt b/forge-gui/res/cardsfolder/s/sea_gate_stormcaller.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/sea_gate_stormcaller.txt
rename to forge-gui/res/cardsfolder/s/sea_gate_stormcaller.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/seafloor_stalker.txt b/forge-gui/res/cardsfolder/s/seafloor_stalker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/seafloor_stalker.txt
rename to forge-gui/res/cardsfolder/s/seafloor_stalker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/sejiri_shelter_sejiri_glacier.txt b/forge-gui/res/cardsfolder/s/sejiri_shelter_sejiri_glacier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/sejiri_shelter_sejiri_glacier.txt
rename to forge-gui/res/cardsfolder/s/sejiri_shelter_sejiri_glacier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/shadow_stinger.txt b/forge-gui/res/cardsfolder/s/shadow_stinger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/shadow_stinger.txt
rename to forge-gui/res/cardsfolder/s/shadow_stinger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/shadows_verdict.txt b/forge-gui/res/cardsfolder/s/shadows_verdict.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/shadows_verdict.txt
rename to forge-gui/res/cardsfolder/s/shadows_verdict.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/shatterskull_charger.txt b/forge-gui/res/cardsfolder/s/shatterskull_charger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/shatterskull_charger.txt
rename to forge-gui/res/cardsfolder/s/shatterskull_charger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/shatterskull_minotaur.txt b/forge-gui/res/cardsfolder/s/shatterskull_minotaur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/shatterskull_minotaur.txt
rename to forge-gui/res/cardsfolder/s/shatterskull_minotaur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/shatterskull_smashing_shatterskull_the_hammer_pass.txt b/forge-gui/res/cardsfolder/s/shatterskull_smashing_shatterskull_the_hammer_pass.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/shatterskull_smashing_shatterskull_the_hammer_pass.txt
rename to forge-gui/res/cardsfolder/s/shatterskull_smashing_shatterskull_the_hammer_pass.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/shell_shield.txt b/forge-gui/res/cardsfolder/s/shell_shield.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/shell_shield.txt
rename to forge-gui/res/cardsfolder/s/shell_shield.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/shepherd_of_heroes.txt b/forge-gui/res/cardsfolder/s/shepherd_of_heroes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/shepherd_of_heroes.txt
rename to forge-gui/res/cardsfolder/s/shepherd_of_heroes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/silundi_vision_silundi_isle.txt b/forge-gui/res/cardsfolder/s/silundi_vision_silundi_isle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/silundi_vision_silundi_isle.txt
rename to forge-gui/res/cardsfolder/s/silundi_vision_silundi_isle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/sizzling_barrage.txt b/forge-gui/res/cardsfolder/s/sizzling_barrage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/sizzling_barrage.txt
rename to forge-gui/res/cardsfolder/s/sizzling_barrage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_apparition.txt b/forge-gui/res/cardsfolder/s/skyclave_apparition.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_apparition.txt
rename to forge-gui/res/cardsfolder/s/skyclave_apparition.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_cleric_skyclave_basilica.txt b/forge-gui/res/cardsfolder/s/skyclave_cleric_skyclave_basilica.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_cleric_skyclave_basilica.txt
rename to forge-gui/res/cardsfolder/s/skyclave_cleric_skyclave_basilica.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_geopede.txt b/forge-gui/res/cardsfolder/s/skyclave_geopede.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_geopede.txt
rename to forge-gui/res/cardsfolder/s/skyclave_geopede.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_pick_axe.txt b/forge-gui/res/cardsfolder/s/skyclave_pick_axe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_pick_axe.txt
rename to forge-gui/res/cardsfolder/s/skyclave_pick_axe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_plunder.txt b/forge-gui/res/cardsfolder/s/skyclave_plunder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_plunder.txt
rename to forge-gui/res/cardsfolder/s/skyclave_plunder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_relic.txt b/forge-gui/res/cardsfolder/s/skyclave_relic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_relic.txt
rename to forge-gui/res/cardsfolder/s/skyclave_relic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_sentinel.txt b/forge-gui/res/cardsfolder/s/skyclave_sentinel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_sentinel.txt
rename to forge-gui/res/cardsfolder/s/skyclave_sentinel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_shade.txt b/forge-gui/res/cardsfolder/s/skyclave_shade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_shade.txt
rename to forge-gui/res/cardsfolder/s/skyclave_shade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_shadowcat.txt b/forge-gui/res/cardsfolder/s/skyclave_shadowcat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_shadowcat.txt
rename to forge-gui/res/cardsfolder/s/skyclave_shadowcat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_squid.txt b/forge-gui/res/cardsfolder/s/skyclave_squid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/skyclave_squid.txt
rename to forge-gui/res/cardsfolder/s/skyclave_squid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/sneaking_guide.txt b/forge-gui/res/cardsfolder/s/sneaking_guide.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/sneaking_guide.txt
rename to forge-gui/res/cardsfolder/s/sneaking_guide.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/soaring_thought_thief.txt b/forge-gui/res/cardsfolder/s/soaring_thought_thief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/soaring_thought_thief.txt
rename to forge-gui/res/cardsfolder/s/soaring_thought_thief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/song_mad_treachery_song_mad_ruins.txt b/forge-gui/res/cardsfolder/s/song_mad_treachery_song_mad_ruins.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/song_mad_treachery_song_mad_ruins.txt
rename to forge-gui/res/cardsfolder/s/song_mad_treachery_song_mad_ruins.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/soul_shatter.txt b/forge-gui/res/cardsfolder/s/soul_shatter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/soul_shatter.txt
rename to forge-gui/res/cardsfolder/s/soul_shatter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/spare_supplies.txt b/forge-gui/res/cardsfolder/s/spare_supplies.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/spare_supplies.txt
rename to forge-gui/res/cardsfolder/s/spare_supplies.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/spikefield_hazard_spikefield_cave.txt b/forge-gui/res/cardsfolder/s/spikefield_hazard_spikefield_cave.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/spikefield_hazard_spikefield_cave.txt
rename to forge-gui/res/cardsfolder/s/spikefield_hazard_spikefield_cave.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/spitfire_lagac.txt b/forge-gui/res/cardsfolder/s/spitfire_lagac.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/spitfire_lagac.txt
rename to forge-gui/res/cardsfolder/s/spitfire_lagac.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/spoils_of_adventure.txt b/forge-gui/res/cardsfolder/s/spoils_of_adventure.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/spoils_of_adventure.txt
rename to forge-gui/res/cardsfolder/s/spoils_of_adventure.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/springmantle_cleric.txt b/forge-gui/res/cardsfolder/s/springmantle_cleric.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/springmantle_cleric.txt
rename to forge-gui/res/cardsfolder/s/springmantle_cleric.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/squad_commander.txt b/forge-gui/res/cardsfolder/s/squad_commander.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/squad_commander.txt
rename to forge-gui/res/cardsfolder/s/squad_commander.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/stonework_packbeast.txt b/forge-gui/res/cardsfolder/s/stonework_packbeast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/stonework_packbeast.txt
rename to forge-gui/res/cardsfolder/s/stonework_packbeast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/strength_of_solidarity.txt b/forge-gui/res/cardsfolder/s/strength_of_solidarity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/strength_of_solidarity.txt
rename to forge-gui/res/cardsfolder/s/strength_of_solidarity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/sure_footed_infiltrator.txt b/forge-gui/res/cardsfolder/s/sure_footed_infiltrator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/sure_footed_infiltrator.txt
rename to forge-gui/res/cardsfolder/s/sure_footed_infiltrator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/swarm_shambler.txt b/forge-gui/res/cardsfolder/s/swarm_shambler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/swarm_shambler.txt
rename to forge-gui/res/cardsfolder/s/swarm_shambler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/synchronized_spellcraft.txt b/forge-gui/res/cardsfolder/s/synchronized_spellcraft.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/synchronized_spellcraft.txt
rename to forge-gui/res/cardsfolder/s/synchronized_spellcraft.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/taborax_hopes_demise.txt b/forge-gui/res/cardsfolder/t/taborax_hopes_demise.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/taborax_hopes_demise.txt
rename to forge-gui/res/cardsfolder/t/taborax_hopes_demise.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/tajuru_blightblade.txt b/forge-gui/res/cardsfolder/t/tajuru_blightblade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/tajuru_blightblade.txt
rename to forge-gui/res/cardsfolder/t/tajuru_blightblade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/tajuru_paragon.txt b/forge-gui/res/cardsfolder/t/tajuru_paragon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/tajuru_paragon.txt
rename to forge-gui/res/cardsfolder/t/tajuru_paragon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/tajuru_snarecaster.txt b/forge-gui/res/cardsfolder/t/tajuru_snarecaster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/tajuru_snarecaster.txt
rename to forge-gui/res/cardsfolder/t/tajuru_snarecaster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/tangled_florahedron_tangled_vale.txt b/forge-gui/res/cardsfolder/t/tangled_florahedron_tangled_vale.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/tangled_florahedron_tangled_vale.txt
rename to forge-gui/res/cardsfolder/t/tangled_florahedron_tangled_vale.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/taunting_arbormage.txt b/forge-gui/res/cardsfolder/t/taunting_arbormage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/taunting_arbormage.txt
rename to forge-gui/res/cardsfolder/t/taunting_arbormage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/tazeem_raptor.txt b/forge-gui/res/cardsfolder/t/tazeem_raptor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/tazeem_raptor.txt
rename to forge-gui/res/cardsfolder/t/tazeem_raptor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/tazeem_roilmage.txt b/forge-gui/res/cardsfolder/t/tazeem_roilmage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/tazeem_roilmage.txt
rename to forge-gui/res/cardsfolder/t/tazeem_roilmage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/tazri_beacon_of_unity.txt b/forge-gui/res/cardsfolder/t/tazri_beacon_of_unity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/tazri_beacon_of_unity.txt
rename to forge-gui/res/cardsfolder/t/tazri_beacon_of_unity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/teeterpeak_ambusher.txt b/forge-gui/res/cardsfolder/t/teeterpeak_ambusher.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/teeterpeak_ambusher.txt
rename to forge-gui/res/cardsfolder/t/teeterpeak_ambusher.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/territorial_scythecat.txt b/forge-gui/res/cardsfolder/t/territorial_scythecat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/territorial_scythecat.txt
rename to forge-gui/res/cardsfolder/t/territorial_scythecat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/thieving_skydiver.txt b/forge-gui/res/cardsfolder/t/thieving_skydiver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/thieving_skydiver.txt
rename to forge-gui/res/cardsfolder/t/thieving_skydiver.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/throne_of_makindi.txt b/forge-gui/res/cardsfolder/t/throne_of_makindi.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/throne_of_makindi.txt
rename to forge-gui/res/cardsfolder/t/throne_of_makindi.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/thundering_rebuke.txt b/forge-gui/res/cardsfolder/t/thundering_rebuke.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/thundering_rebuke.txt
rename to forge-gui/res/cardsfolder/t/thundering_rebuke.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/thundering_sparkmage.txt b/forge-gui/res/cardsfolder/t/thundering_sparkmage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/thundering_sparkmage.txt
rename to forge-gui/res/cardsfolder/t/thundering_sparkmage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/thwart_the_grave.txt b/forge-gui/res/cardsfolder/t/thwart_the_grave.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/thwart_the_grave.txt
rename to forge-gui/res/cardsfolder/t/thwart_the_grave.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNC/trove_warden.txt b/forge-gui/res/cardsfolder/t/trove_warden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNC/trove_warden.txt
rename to forge-gui/res/cardsfolder/t/trove_warden.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/tuktuk_rubblefort.txt b/forge-gui/res/cardsfolder/t/tuktuk_rubblefort.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/tuktuk_rubblefort.txt
rename to forge-gui/res/cardsfolder/t/tuktuk_rubblefort.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/turntimber_ascetic.txt b/forge-gui/res/cardsfolder/t/turntimber_ascetic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/turntimber_ascetic.txt
rename to forge-gui/res/cardsfolder/t/turntimber_ascetic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/turntimber_symbiosis_turntimber_serpentine_wood.txt b/forge-gui/res/cardsfolder/t/turntimber_symbiosis_turntimber_serpentine_wood.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/turntimber_symbiosis_turntimber_serpentine_wood.txt
rename to forge-gui/res/cardsfolder/t/turntimber_symbiosis_turntimber_serpentine_wood.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/umara_mystic.txt b/forge-gui/res/cardsfolder/u/umara_mystic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/umara_mystic.txt
rename to forge-gui/res/cardsfolder/u/umara_mystic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/umara_wizard_umara_skyfalls.txt b/forge-gui/res/cardsfolder/u/umara_wizard_umara_skyfalls.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/umara_wizard_umara_skyfalls.txt
rename to forge-gui/res/cardsfolder/u/umara_wizard_umara_skyfalls.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/utility_knife.txt b/forge-gui/res/cardsfolder/u/utility_knife.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/utility_knife.txt
rename to forge-gui/res/cardsfolder/u/utility_knife.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/valakut_awakening_valakut_stoneforge.txt b/forge-gui/res/cardsfolder/v/valakut_awakening_valakut_stoneforge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/valakut_awakening_valakut_stoneforge.txt
rename to forge-gui/res/cardsfolder/v/valakut_awakening_valakut_stoneforge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/valakut_exploration.txt b/forge-gui/res/cardsfolder/v/valakut_exploration.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/valakut_exploration.txt
rename to forge-gui/res/cardsfolder/v/valakut_exploration.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/vastwood_fortification_vastwood_thicket.txt b/forge-gui/res/cardsfolder/v/vastwood_fortification_vastwood_thicket.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/vastwood_fortification_vastwood_thicket.txt
rename to forge-gui/res/cardsfolder/v/vastwood_fortification_vastwood_thicket.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/vastwood_surge.txt b/forge-gui/res/cardsfolder/v/vastwood_surge.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/vastwood_surge.txt
rename to forge-gui/res/cardsfolder/v/vastwood_surge.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/veteran_adventurer.txt b/forge-gui/res/cardsfolder/v/veteran_adventurer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/veteran_adventurer.txt
rename to forge-gui/res/cardsfolder/v/veteran_adventurer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/vine_gecko.txt b/forge-gui/res/cardsfolder/v/vine_gecko.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/vine_gecko.txt
rename to forge-gui/res/cardsfolder/v/vine_gecko.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/wayward_guide_beast.txt b/forge-gui/res/cardsfolder/w/wayward_guide_beast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/wayward_guide_beast.txt
rename to forge-gui/res/cardsfolder/w/wayward_guide_beast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNC/whispersteel_dagger.txt b/forge-gui/res/cardsfolder/w/whispersteel_dagger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNC/whispersteel_dagger.txt
rename to forge-gui/res/cardsfolder/w/whispersteel_dagger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/windrider_wizard.txt b/forge-gui/res/cardsfolder/w/windrider_wizard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/windrider_wizard.txt
rename to forge-gui/res/cardsfolder/w/windrider_wizard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/zagras_thief_of_heartbeats.txt b/forge-gui/res/cardsfolder/z/zagras_thief_of_heartbeats.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/zagras_thief_of_heartbeats.txt
rename to forge-gui/res/cardsfolder/z/zagras_thief_of_heartbeats.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/zareth_san_the_trickster.txt b/forge-gui/res/cardsfolder/z/zareth_san_the_trickster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/zareth_san_the_trickster.txt
rename to forge-gui/res/cardsfolder/z/zareth_san_the_trickster.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/zof_consumption_zof_bloodbog.txt b/forge-gui/res/cardsfolder/z/zof_consumption_zof_bloodbog.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/zof_consumption_zof_bloodbog.txt
rename to forge-gui/res/cardsfolder/z/zof_consumption_zof_bloodbog.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/zulaport_duelist.txt b/forge-gui/res/cardsfolder/z/zulaport_duelist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ZNR/zulaport_duelist.txt
rename to forge-gui/res/cardsfolder/z/zulaport_duelist.txt