diff --git a/forge-gui/res/cardsfolder/upcoming/admirals_order.txt b/forge-gui/res/cardsfolder/a/admirals_order.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/admirals_order.txt rename to forge-gui/res/cardsfolder/a/admirals_order.txt diff --git a/forge-gui/res/cardsfolder/upcoming/angrath_minotaur_pirate.txt b/forge-gui/res/cardsfolder/a/angrath_minotaur_pirate.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/angrath_minotaur_pirate.txt rename to forge-gui/res/cardsfolder/a/angrath_minotaur_pirate.txt diff --git a/forge-gui/res/cardsfolder/upcoming/angrath_the_flame_chained.txt b/forge-gui/res/cardsfolder/a/angrath_the_flame_chained.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/angrath_the_flame_chained.txt rename to forge-gui/res/cardsfolder/a/angrath_the_flame_chained.txt diff --git a/forge-gui/res/cardsfolder/upcoming/angraths_ambusher.txt b/forge-gui/res/cardsfolder/a/angraths_ambusher.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/angraths_ambusher.txt rename to forge-gui/res/cardsfolder/a/angraths_ambusher.txt diff --git a/forge-gui/res/cardsfolder/upcoming/angraths_fury.txt b/forge-gui/res/cardsfolder/a/angraths_fury.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/angraths_fury.txt rename to forge-gui/res/cardsfolder/a/angraths_fury.txt diff --git a/forge-gui/res/cardsfolder/upcoming/aquatic_incursion.txt b/forge-gui/res/cardsfolder/a/aquatic_incursion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/aquatic_incursion.txt rename to forge-gui/res/cardsfolder/a/aquatic_incursion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/arch_of_orazca.txt b/forge-gui/res/cardsfolder/a/arch_of_orazca.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/arch_of_orazca.txt rename to forge-gui/res/cardsfolder/a/arch_of_orazca.txt diff --git a/forge-gui/res/cardsfolder/upcoming/arterial_flow.txt b/forge-gui/res/cardsfolder/a/arterial_flow.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/arterial_flow.txt rename to forge-gui/res/cardsfolder/a/arterial_flow.txt diff --git a/forge-gui/res/cardsfolder/upcoming/atzocan_seer.txt b/forge-gui/res/cardsfolder/a/atzocan_seer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/atzocan_seer.txt rename to forge-gui/res/cardsfolder/a/atzocan_seer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/awakened_amalgam.txt b/forge-gui/res/cardsfolder/a/awakened_amalgam.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/awakened_amalgam.txt rename to forge-gui/res/cardsfolder/a/awakened_amalgam.txt diff --git a/forge-gui/res/cardsfolder/upcoming/azor_the_lawbringer.txt b/forge-gui/res/cardsfolder/a/azor_the_lawbringer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/azor_the_lawbringer.txt rename to forge-gui/res/cardsfolder/a/azor_the_lawbringer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/azors_gateway_sanctum_of_the_sun.txt b/forge-gui/res/cardsfolder/a/azors_gateway_sanctum_of_the_sun.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/azors_gateway_sanctum_of_the_sun.txt rename to forge-gui/res/cardsfolder/a/azors_gateway_sanctum_of_the_sun.txt diff --git a/forge-gui/res/cardsfolder/upcoming/baffling_end.txt b/forge-gui/res/cardsfolder/b/baffling_end.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/baffling_end.txt rename to forge-gui/res/cardsfolder/b/baffling_end.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bishop_of_binding.txt b/forge-gui/res/cardsfolder/b/bishop_of_binding.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bishop_of_binding.txt rename to forge-gui/res/cardsfolder/b/bishop_of_binding.txt diff --git a/forge-gui/res/cardsfolder/upcoming/blazing_hope.txt b/forge-gui/res/cardsfolder/b/blazing_hope.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/blazing_hope.txt rename to forge-gui/res/cardsfolder/b/blazing_hope.txt diff --git a/forge-gui/res/cardsfolder/upcoming/blood_sun.txt b/forge-gui/res/cardsfolder/b/blood_sun.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/blood_sun.txt rename to forge-gui/res/cardsfolder/b/blood_sun.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bombard.txt b/forge-gui/res/cardsfolder/b/bombard.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bombard.txt rename to forge-gui/res/cardsfolder/b/bombard.txt diff --git a/forge-gui/res/cardsfolder/upcoming/brasss_bounty.txt b/forge-gui/res/cardsfolder/b/brasss_bounty.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/brasss_bounty.txt rename to forge-gui/res/cardsfolder/b/brasss_bounty.txt diff --git a/forge-gui/res/cardsfolder/upcoming/brazen_freebooter.txt b/forge-gui/res/cardsfolder/b/brazen_freebooter.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/brazen_freebooter.txt rename to forge-gui/res/cardsfolder/b/brazen_freebooter.txt diff --git a/forge-gui/res/cardsfolder/upcoming/buccaneers_bravado.txt b/forge-gui/res/cardsfolder/b/buccaneers_bravado.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/buccaneers_bravado.txt rename to forge-gui/res/cardsfolder/b/buccaneers_bravado.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cacophodon.txt b/forge-gui/res/cardsfolder/c/cacophodon.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cacophodon.txt rename to forge-gui/res/cardsfolder/c/cacophodon.txt diff --git a/forge-gui/res/cardsfolder/upcoming/canal_monitor.txt b/forge-gui/res/cardsfolder/c/canal_monitor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/canal_monitor.txt rename to forge-gui/res/cardsfolder/c/canal_monitor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/captains_hook.txt b/forge-gui/res/cardsfolder/c/captains_hook.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/captains_hook.txt rename to forge-gui/res/cardsfolder/c/captains_hook.txt diff --git a/forge-gui/res/cardsfolder/upcoming/champion_of_dusk.txt b/forge-gui/res/cardsfolder/c/champion_of_dusk.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/champion_of_dusk.txt rename to forge-gui/res/cardsfolder/c/champion_of_dusk.txt diff --git a/forge-gui/res/cardsfolder/upcoming/charging_tuskodon.txt b/forge-gui/res/cardsfolder/c/charging_tuskodon.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/charging_tuskodon.txt rename to forge-gui/res/cardsfolder/c/charging_tuskodon.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cherished_hatchling.txt b/forge-gui/res/cardsfolder/c/cherished_hatchling.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cherished_hatchling.txt rename to forge-gui/res/cardsfolder/c/cherished_hatchling.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cleansing_ray.txt b/forge-gui/res/cardsfolder/c/cleansing_ray.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cleansing_ray.txt rename to forge-gui/res/cardsfolder/c/cleansing_ray.txt diff --git a/forge-gui/res/cardsfolder/upcoming/crafty_cutpurse.txt b/forge-gui/res/cardsfolder/c/crafty_cutpurse.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/crafty_cutpurse.txt rename to forge-gui/res/cardsfolder/c/crafty_cutpurse.txt diff --git a/forge-gui/res/cardsfolder/upcoming/crashing_tide.txt b/forge-gui/res/cardsfolder/c/crashing_tide.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/crashing_tide.txt rename to forge-gui/res/cardsfolder/c/crashing_tide.txt diff --git a/forge-gui/res/cardsfolder/upcoming/crested_herdcaller.txt b/forge-gui/res/cardsfolder/c/crested_herdcaller.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/crested_herdcaller.txt rename to forge-gui/res/cardsfolder/c/crested_herdcaller.txt diff --git a/forge-gui/res/cardsfolder/upcoming/curious_obsession.txt b/forge-gui/res/cardsfolder/c/curious_obsession.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/curious_obsession.txt rename to forge-gui/res/cardsfolder/c/curious_obsession.txt diff --git a/forge-gui/res/cardsfolder/upcoming/daring_buccaneer.txt b/forge-gui/res/cardsfolder/d/daring_buccaneer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/daring_buccaneer.txt rename to forge-gui/res/cardsfolder/d/daring_buccaneer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dark_inquiry.txt b/forge-gui/res/cardsfolder/d/dark_inquiry.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dark_inquiry.txt rename to forge-gui/res/cardsfolder/d/dark_inquiry.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dead_mans_chest.txt b/forge-gui/res/cardsfolder/d/dead_mans_chest.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dead_mans_chest.txt rename to forge-gui/res/cardsfolder/d/dead_mans_chest.txt diff --git a/forge-gui/res/cardsfolder/upcoming/deadeye_brawler.txt b/forge-gui/res/cardsfolder/d/deadeye_brawler.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/deadeye_brawler.txt rename to forge-gui/res/cardsfolder/d/deadeye_brawler.txt diff --git a/forge-gui/res/cardsfolder/upcoming/deadeye_rig_hauler.txt b/forge-gui/res/cardsfolder/d/deadeye_rig_hauler.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/deadeye_rig_hauler.txt rename to forge-gui/res/cardsfolder/d/deadeye_rig_hauler.txt diff --git a/forge-gui/res/cardsfolder/upcoming/deeproot_elite.txt b/forge-gui/res/cardsfolder/d/deeproot_elite.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/deeproot_elite.txt rename to forge-gui/res/cardsfolder/d/deeproot_elite.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dinosaur_hunter.txt b/forge-gui/res/cardsfolder/d/dinosaur_hunter.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dinosaur_hunter.txt rename to forge-gui/res/cardsfolder/d/dinosaur_hunter.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dire_fleet_daredevil.txt b/forge-gui/res/cardsfolder/d/dire_fleet_daredevil.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dire_fleet_daredevil.txt rename to forge-gui/res/cardsfolder/d/dire_fleet_daredevil.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dire_fleet_neckbreaker.txt b/forge-gui/res/cardsfolder/d/dire_fleet_neckbreaker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dire_fleet_neckbreaker.txt rename to forge-gui/res/cardsfolder/d/dire_fleet_neckbreaker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dire_fleet_poisoner.txt b/forge-gui/res/cardsfolder/d/dire_fleet_poisoner.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dire_fleet_poisoner.txt rename to forge-gui/res/cardsfolder/d/dire_fleet_poisoner.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dusk_charger.txt b/forge-gui/res/cardsfolder/d/dusk_charger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dusk_charger.txt rename to forge-gui/res/cardsfolder/d/dusk_charger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dusk_legion_zealot.txt b/forge-gui/res/cardsfolder/d/dusk_legion_zealot.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dusk_legion_zealot.txt rename to forge-gui/res/cardsfolder/d/dusk_legion_zealot.txt diff --git a/forge-gui/res/cardsfolder/upcoming/elenda_the_dusk_rose.txt b/forge-gui/res/cardsfolder/e/elenda_the_dusk_rose.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/elenda_the_dusk_rose.txt rename to forge-gui/res/cardsfolder/e/elenda_the_dusk_rose.txt diff --git a/forge-gui/res/cardsfolder/upcoming/enter_the_unknown.txt b/forge-gui/res/cardsfolder/e/enter_the_unknown.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/enter_the_unknown.txt rename to forge-gui/res/cardsfolder/e/enter_the_unknown.txt diff --git a/forge-gui/res/cardsfolder/upcoming/etali_primal_storm.txt b/forge-gui/res/cardsfolder/e/etali_primal_storm.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/etali_primal_storm.txt rename to forge-gui/res/cardsfolder/e/etali_primal_storm.txt diff --git a/forge-gui/res/cardsfolder/upcoming/everdawn_champion.txt b/forge-gui/res/cardsfolder/e/everdawn_champion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/everdawn_champion.txt rename to forge-gui/res/cardsfolder/e/everdawn_champion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/expel_from_orazca.txt b/forge-gui/res/cardsfolder/e/expel_from_orazca.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/expel_from_orazca.txt rename to forge-gui/res/cardsfolder/e/expel_from_orazca.txt diff --git a/forge-gui/res/cardsfolder/upcoming/exultant_skymarcher.txt b/forge-gui/res/cardsfolder/e/exultant_skymarcher.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/exultant_skymarcher.txt rename to forge-gui/res/cardsfolder/e/exultant_skymarcher.txt diff --git a/forge-gui/res/cardsfolder/upcoming/famished_paladin.txt b/forge-gui/res/cardsfolder/f/famished_paladin.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/famished_paladin.txt rename to forge-gui/res/cardsfolder/f/famished_paladin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/fanatical_firebrand.txt b/forge-gui/res/cardsfolder/f/fanatical_firebrand.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/fanatical_firebrand.txt rename to forge-gui/res/cardsfolder/f/fanatical_firebrand.txt diff --git a/forge-gui/res/cardsfolder/upcoming/fathom_fleet_boarder.txt b/forge-gui/res/cardsfolder/f/fathom_fleet_boarder.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/fathom_fleet_boarder.txt rename to forge-gui/res/cardsfolder/f/fathom_fleet_boarder.txt diff --git a/forge-gui/res/cardsfolder/upcoming/flood_of_recollection.txt b/forge-gui/res/cardsfolder/f/flood_of_recollection.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/flood_of_recollection.txt rename to forge-gui/res/cardsfolder/f/flood_of_recollection.txt diff --git a/forge-gui/res/cardsfolder/upcoming/forerunner_of_the_coalition.txt b/forge-gui/res/cardsfolder/f/forerunner_of_the_coalition.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/forerunner_of_the_coalition.txt rename to forge-gui/res/cardsfolder/f/forerunner_of_the_coalition.txt diff --git a/forge-gui/res/cardsfolder/upcoming/forerunner_of_the_empire.txt b/forge-gui/res/cardsfolder/f/forerunner_of_the_empire.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/forerunner_of_the_empire.txt rename to forge-gui/res/cardsfolder/f/forerunner_of_the_empire.txt diff --git a/forge-gui/res/cardsfolder/upcoming/forerunner_of_the_heralds.txt b/forge-gui/res/cardsfolder/f/forerunner_of_the_heralds.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/forerunner_of_the_heralds.txt rename to forge-gui/res/cardsfolder/f/forerunner_of_the_heralds.txt diff --git a/forge-gui/res/cardsfolder/upcoming/forerunner_of_the_legion.txt b/forge-gui/res/cardsfolder/f/forerunner_of_the_legion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/forerunner_of_the_legion.txt rename to forge-gui/res/cardsfolder/f/forerunner_of_the_legion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/form_of_the_dinosaur.txt b/forge-gui/res/cardsfolder/f/form_of_the_dinosaur.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/form_of_the_dinosaur.txt rename to forge-gui/res/cardsfolder/f/form_of_the_dinosaur.txt diff --git a/forge-gui/res/cardsfolder/upcoming/frilled_deathspitter.txt b/forge-gui/res/cardsfolder/f/frilled_deathspitter.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/frilled_deathspitter.txt rename to forge-gui/res/cardsfolder/f/frilled_deathspitter.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ghalta_primal_hunger.txt b/forge-gui/res/cardsfolder/g/ghalta_primal_hunger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ghalta_primal_hunger.txt rename to forge-gui/res/cardsfolder/g/ghalta_primal_hunger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/giltgrove_stalker.txt b/forge-gui/res/cardsfolder/g/giltgrove_stalker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/giltgrove_stalker.txt rename to forge-gui/res/cardsfolder/g/giltgrove_stalker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gleaming_barrier.txt b/forge-gui/res/cardsfolder/g/gleaming_barrier.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gleaming_barrier.txt rename to forge-gui/res/cardsfolder/g/gleaming_barrier.txt diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_trailblazer.txt b/forge-gui/res/cardsfolder/g/goblin_trailblazer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/goblin_trailblazer.txt rename to forge-gui/res/cardsfolder/g/goblin_trailblazer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/golden_demise.txt b/forge-gui/res/cardsfolder/g/golden_demise.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/golden_demise.txt rename to forge-gui/res/cardsfolder/g/golden_demise.txt diff --git a/forge-gui/res/cardsfolder/upcoming/grasping_scoundrel.txt b/forge-gui/res/cardsfolder/g/grasping_scoundrel.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/grasping_scoundrel.txt rename to forge-gui/res/cardsfolder/g/grasping_scoundrel.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gruesome_fate.txt b/forge-gui/res/cardsfolder/g/gruesome_fate.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gruesome_fate.txt rename to forge-gui/res/cardsfolder/g/gruesome_fate.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hadanas_climb_winged_temple_of_orazca.txt b/forge-gui/res/cardsfolder/h/hadanas_climb_winged_temple_of_orazca.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hadanas_climb_winged_temple_of_orazca.txt rename to forge-gui/res/cardsfolder/h/hadanas_climb_winged_temple_of_orazca.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hardy_veteran.txt b/forge-gui/res/cardsfolder/h/hardy_veteran.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hardy_veteran.txt rename to forge-gui/res/cardsfolder/h/hardy_veteran.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hornswoggle.txt b/forge-gui/res/cardsfolder/h/hornswoggle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hornswoggle.txt rename to forge-gui/res/cardsfolder/h/hornswoggle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/huatli_radiant_champion.txt b/forge-gui/res/cardsfolder/h/huatli_radiant_champion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/huatli_radiant_champion.txt rename to forge-gui/res/cardsfolder/h/huatli_radiant_champion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/impale.txt b/forge-gui/res/cardsfolder/i/impale.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/impale.txt rename to forge-gui/res/cardsfolder/i/impale.txt diff --git a/forge-gui/res/cardsfolder/upcoming/imperial_ceratops.txt b/forge-gui/res/cardsfolder/i/imperial_ceratops.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/imperial_ceratops.txt rename to forge-gui/res/cardsfolder/i/imperial_ceratops.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jade_bearer.txt b/forge-gui/res/cardsfolder/j/jade_bearer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jade_bearer.txt rename to forge-gui/res/cardsfolder/j/jade_bearer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jadecraft_artisan.txt b/forge-gui/res/cardsfolder/j/jadecraft_artisan.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jadecraft_artisan.txt rename to forge-gui/res/cardsfolder/j/jadecraft_artisan.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jadelight_ranger.txt b/forge-gui/res/cardsfolder/j/jadelight_ranger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jadelight_ranger.txt rename to forge-gui/res/cardsfolder/j/jadelight_ranger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/journey_to_eternity_atzal_cave_of_eternity.txt b/forge-gui/res/cardsfolder/j/journey_to_eternity_atzal_cave_of_eternity.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/journey_to_eternity_atzal_cave_of_eternity.txt rename to forge-gui/res/cardsfolder/j/journey_to_eternity_atzal_cave_of_eternity.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jungle_creeper.txt b/forge-gui/res/cardsfolder/j/jungle_creeper.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jungle_creeper.txt rename to forge-gui/res/cardsfolder/j/jungle_creeper.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jungleborn_pioneer.txt b/forge-gui/res/cardsfolder/j/jungleborn_pioneer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jungleborn_pioneer.txt rename to forge-gui/res/cardsfolder/j/jungleborn_pioneer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kitesail_corsair.txt b/forge-gui/res/cardsfolder/k/kitesail_corsair.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kitesail_corsair.txt rename to forge-gui/res/cardsfolder/k/kitesail_corsair.txt diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_the_stampede.txt b/forge-gui/res/cardsfolder/k/knight_of_the_stampede.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/knight_of_the_stampede.txt rename to forge-gui/res/cardsfolder/k/knight_of_the_stampede.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kumena_tyrant_of_orazca.txt b/forge-gui/res/cardsfolder/k/kumena_tyrant_of_orazca.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kumena_tyrant_of_orazca.txt rename to forge-gui/res/cardsfolder/k/kumena_tyrant_of_orazca.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kumenas_awakening.txt b/forge-gui/res/cardsfolder/k/kumenas_awakening.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kumenas_awakening.txt rename to forge-gui/res/cardsfolder/k/kumenas_awakening.txt diff --git a/forge-gui/res/cardsfolder/upcoming/legion_lieutenant.txt b/forge-gui/res/cardsfolder/l/legion_lieutenant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/legion_lieutenant.txt rename to forge-gui/res/cardsfolder/l/legion_lieutenant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/luminous_bonds.txt b/forge-gui/res/cardsfolder/l/luminous_bonds.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/luminous_bonds.txt rename to forge-gui/res/cardsfolder/l/luminous_bonds.txt diff --git a/forge-gui/res/cardsfolder/upcoming/majestic_heliopterus.txt b/forge-gui/res/cardsfolder/m/majestic_heliopterus.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/majestic_heliopterus.txt rename to forge-gui/res/cardsfolder/m/majestic_heliopterus.txt diff --git a/forge-gui/res/cardsfolder/upcoming/martyr_of_dusk.txt b/forge-gui/res/cardsfolder/m/martyr_of_dusk.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/martyr_of_dusk.txt rename to forge-gui/res/cardsfolder/m/martyr_of_dusk.txt diff --git a/forge-gui/res/cardsfolder/upcoming/masterminds_acquisition.txt b/forge-gui/res/cardsfolder/m/masterminds_acquisition.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/masterminds_acquisition.txt rename to forge-gui/res/cardsfolder/m/masterminds_acquisition.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mausoleum_harpy.txt b/forge-gui/res/cardsfolder/m/mausoleum_harpy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mausoleum_harpy.txt rename to forge-gui/res/cardsfolder/m/mausoleum_harpy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/merfolk_mistbinder.txt b/forge-gui/res/cardsfolder/m/merfolk_mistbinder.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/merfolk_mistbinder.txt rename to forge-gui/res/cardsfolder/m/merfolk_mistbinder.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mist_cloaked_herald.txt b/forge-gui/res/cardsfolder/m/mist_cloaked_herald.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mist_cloaked_herald.txt rename to forge-gui/res/cardsfolder/m/mist_cloaked_herald.txt diff --git a/forge-gui/res/cardsfolder/upcoming/moment_of_craving.txt b/forge-gui/res/cardsfolder/m/moment_of_craving.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/moment_of_craving.txt rename to forge-gui/res/cardsfolder/m/moment_of_craving.txt diff --git a/forge-gui/res/cardsfolder/upcoming/moment_of_triumph.txt b/forge-gui/res/cardsfolder/m/moment_of_triumph.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/moment_of_triumph.txt rename to forge-gui/res/cardsfolder/m/moment_of_triumph.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mutiny.txt b/forge-gui/res/cardsfolder/m/mutiny.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mutiny.txt rename to forge-gui/res/cardsfolder/m/mutiny.txt diff --git a/forge-gui/res/cardsfolder/upcoming/needletooth_raptor.txt b/forge-gui/res/cardsfolder/n/needletooth_raptor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/needletooth_raptor.txt rename to forge-gui/res/cardsfolder/n/needletooth_raptor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nezahal_primal_tide.txt b/forge-gui/res/cardsfolder/n/nezahal_primal_tide.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nezahal_primal_tide.txt rename to forge-gui/res/cardsfolder/n/nezahal_primal_tide.txt diff --git a/forge-gui/res/cardsfolder/upcoming/oathsworn_vampire.txt b/forge-gui/res/cardsfolder/o/oathsworn_vampire.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/oathsworn_vampire.txt rename to forge-gui/res/cardsfolder/o/oathsworn_vampire.txt diff --git a/forge-gui/res/cardsfolder/upcoming/orazca_frillback.txt b/forge-gui/res/cardsfolder/o/orazca_frillback.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/orazca_frillback.txt rename to forge-gui/res/cardsfolder/o/orazca_frillback.txt diff --git a/forge-gui/res/cardsfolder/upcoming/orazca_raptor.txt b/forge-gui/res/cardsfolder/o/orazca_raptor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/orazca_raptor.txt rename to forge-gui/res/cardsfolder/o/orazca_raptor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/orazca_relic.txt b/forge-gui/res/cardsfolder/o/orazca_relic.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/orazca_relic.txt rename to forge-gui/res/cardsfolder/o/orazca_relic.txt diff --git a/forge-gui/res/cardsfolder/upcoming/overgrown_armasaur.txt b/forge-gui/res/cardsfolder/o/overgrown_armasaur.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/overgrown_armasaur.txt rename to forge-gui/res/cardsfolder/o/overgrown_armasaur.txt diff --git a/forge-gui/res/cardsfolder/upcoming/paladin_of_atonement.txt b/forge-gui/res/cardsfolder/p/paladin_of_atonement.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/paladin_of_atonement.txt rename to forge-gui/res/cardsfolder/p/paladin_of_atonement.txt diff --git a/forge-gui/res/cardsfolder/upcoming/path_of_discovery.txt b/forge-gui/res/cardsfolder/p/path_of_discovery.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/path_of_discovery.txt rename to forge-gui/res/cardsfolder/p/path_of_discovery.txt diff --git a/forge-gui/res/cardsfolder/upcoming/path_of_mettle_metzali_tower_of_triumph.txt b/forge-gui/res/cardsfolder/p/path_of_mettle_metzali_tower_of_triumph.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/path_of_mettle_metzali_tower_of_triumph.txt rename to forge-gui/res/cardsfolder/p/path_of_mettle_metzali_tower_of_triumph.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pirates_pillage.txt b/forge-gui/res/cardsfolder/p/pirates_pillage.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pirates_pillage.txt rename to forge-gui/res/cardsfolder/p/pirates_pillage.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pitiless_plunderer.txt b/forge-gui/res/cardsfolder/p/pitiless_plunderer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pitiless_plunderer.txt rename to forge-gui/res/cardsfolder/p/pitiless_plunderer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/polyraptor.txt b/forge-gui/res/cardsfolder/p/polyraptor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/polyraptor.txt rename to forge-gui/res/cardsfolder/p/polyraptor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pride_of_conquerors.txt b/forge-gui/res/cardsfolder/p/pride_of_conquerors.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pride_of_conquerors.txt rename to forge-gui/res/cardsfolder/p/pride_of_conquerors.txt diff --git a/forge-gui/res/cardsfolder/upcoming/profane_procession_tomb_of_the_dusk_rose.txt b/forge-gui/res/cardsfolder/p/profane_procession_tomb_of_the_dusk_rose.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/profane_procession_tomb_of_the_dusk_rose.txt rename to forge-gui/res/cardsfolder/p/profane_procession_tomb_of_the_dusk_rose.txt diff --git a/forge-gui/res/cardsfolder/upcoming/protean_raider.txt b/forge-gui/res/cardsfolder/p/protean_raider.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/protean_raider.txt rename to forge-gui/res/cardsfolder/p/protean_raider.txt diff --git a/forge-gui/res/cardsfolder/upcoming/radiant_destiny.txt b/forge-gui/res/cardsfolder/r/radiant_destiny.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/radiant_destiny.txt rename to forge-gui/res/cardsfolder/r/radiant_destiny.txt diff --git a/forge-gui/res/cardsfolder/upcoming/raging_regisaur.txt b/forge-gui/res/cardsfolder/r/raging_regisaur.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/raging_regisaur.txt rename to forge-gui/res/cardsfolder/r/raging_regisaur.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ravenous_chupacabra.txt b/forge-gui/res/cardsfolder/r/ravenous_chupacabra.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ravenous_chupacabra.txt rename to forge-gui/res/cardsfolder/r/ravenous_chupacabra.txt diff --git a/forge-gui/res/cardsfolder/upcoming/reaver_ambush.txt b/forge-gui/res/cardsfolder/r/reaver_ambush.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/reaver_ambush.txt rename to forge-gui/res/cardsfolder/r/reaver_ambush.txt diff --git a/forge-gui/res/cardsfolder/upcoming/reckless_rage.txt b/forge-gui/res/cardsfolder/r/reckless_rage.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/reckless_rage.txt rename to forge-gui/res/cardsfolder/r/reckless_rage.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rekindling_phoenix.txt b/forge-gui/res/cardsfolder/r/rekindling_phoenix.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/rekindling_phoenix.txt rename to forge-gui/res/cardsfolder/r/rekindling_phoenix.txt diff --git a/forge-gui/res/cardsfolder/upcoming/release_to_the_wind.txt b/forge-gui/res/cardsfolder/r/release_to_the_wind.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/release_to_the_wind.txt rename to forge-gui/res/cardsfolder/r/release_to_the_wind.txt diff --git a/forge-gui/res/cardsfolder/upcoming/relentless_raptor.txt b/forge-gui/res/cardsfolder/r/relentless_raptor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/relentless_raptor.txt rename to forge-gui/res/cardsfolder/r/relentless_raptor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/resplendent_griffin.txt b/forge-gui/res/cardsfolder/r/resplendent_griffin.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/resplendent_griffin.txt rename to forge-gui/res/cardsfolder/r/resplendent_griffin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/river_darter.txt b/forge-gui/res/cardsfolder/r/river_darter.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/river_darter.txt rename to forge-gui/res/cardsfolder/r/river_darter.txt diff --git a/forge-gui/res/cardsfolder/upcoming/riverwise_augur.txt b/forge-gui/res/cardsfolder/r/riverwise_augur.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/riverwise_augur.txt rename to forge-gui/res/cardsfolder/r/riverwise_augur.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sadistic_skymarcher.txt b/forge-gui/res/cardsfolder/s/sadistic_skymarcher.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sadistic_skymarcher.txt rename to forge-gui/res/cardsfolder/s/sadistic_skymarcher.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sanguine_glorifier.txt b/forge-gui/res/cardsfolder/s/sanguine_glorifier.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sanguine_glorifier.txt rename to forge-gui/res/cardsfolder/s/sanguine_glorifier.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sea_legs.txt b/forge-gui/res/cardsfolder/s/sea_legs.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sea_legs.txt rename to forge-gui/res/cardsfolder/s/sea_legs.txt diff --git a/forge-gui/res/cardsfolder/upcoming/seafloor_oracle.txt b/forge-gui/res/cardsfolder/s/seafloor_oracle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/seafloor_oracle.txt rename to forge-gui/res/cardsfolder/s/seafloor_oracle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/secrets_of_the_golden_city.txt b/forge-gui/res/cardsfolder/s/secrets_of_the_golden_city.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/secrets_of_the_golden_city.txt rename to forge-gui/res/cardsfolder/s/secrets_of_the_golden_city.txt diff --git a/forge-gui/res/cardsfolder/upcoming/see_red.txt b/forge-gui/res/cardsfolder/s/see_red.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/see_red.txt rename to forge-gui/res/cardsfolder/s/see_red.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shake_the_foundations.txt b/forge-gui/res/cardsfolder/s/shake_the_foundations.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/shake_the_foundations.txt rename to forge-gui/res/cardsfolder/s/shake_the_foundations.txt diff --git a/forge-gui/res/cardsfolder/upcoming/siegehorn_ceratops.txt b/forge-gui/res/cardsfolder/s/siegehorn_ceratops.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/siegehorn_ceratops.txt rename to forge-gui/res/cardsfolder/s/siegehorn_ceratops.txt diff --git a/forge-gui/res/cardsfolder/upcoming/silent_gravestone.txt b/forge-gui/res/cardsfolder/s/silent_gravestone.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/silent_gravestone.txt rename to forge-gui/res/cardsfolder/s/silent_gravestone.txt diff --git a/forge-gui/res/cardsfolder/upcoming/silverclad_ferocidons.txt b/forge-gui/res/cardsfolder/s/silverclad_ferocidons.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/silverclad_ferocidons.txt rename to forge-gui/res/cardsfolder/s/silverclad_ferocidons.txt diff --git a/forge-gui/res/cardsfolder/upcoming/siren_reaver.txt b/forge-gui/res/cardsfolder/s/siren_reaver.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/siren_reaver.txt rename to forge-gui/res/cardsfolder/s/siren_reaver.txt diff --git a/forge-gui/res/cardsfolder/upcoming/skymarcher_aspirant.txt b/forge-gui/res/cardsfolder/s/skymarcher_aspirant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/skymarcher_aspirant.txt rename to forge-gui/res/cardsfolder/s/skymarcher_aspirant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/slaughter_the_strong.txt b/forge-gui/res/cardsfolder/s/slaughter_the_strong.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/slaughter_the_strong.txt rename to forge-gui/res/cardsfolder/s/slaughter_the_strong.txt diff --git a/forge-gui/res/cardsfolder/upcoming/slippery_scoundrel.txt b/forge-gui/res/cardsfolder/s/slippery_scoundrel.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/slippery_scoundrel.txt rename to forge-gui/res/cardsfolder/s/slippery_scoundrel.txt diff --git a/forge-gui/res/cardsfolder/upcoming/snubhorn_sentry.txt b/forge-gui/res/cardsfolder/s/snubhorn_sentry.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/snubhorn_sentry.txt rename to forge-gui/res/cardsfolder/s/snubhorn_sentry.txt diff --git a/forge-gui/res/cardsfolder/upcoming/soul_of_the_rapids.txt b/forge-gui/res/cardsfolder/s/soul_of_the_rapids.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/soul_of_the_rapids.txt rename to forge-gui/res/cardsfolder/s/soul_of_the_rapids.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sphinxs_decree.txt b/forge-gui/res/cardsfolder/s/sphinxs_decree.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sphinxs_decree.txt rename to forge-gui/res/cardsfolder/s/sphinxs_decree.txt diff --git a/forge-gui/res/cardsfolder/upcoming/spire_winder.txt b/forge-gui/res/cardsfolder/s/spire_winder.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/spire_winder.txt rename to forge-gui/res/cardsfolder/s/spire_winder.txt diff --git a/forge-gui/res/cardsfolder/upcoming/squires_devotion.txt b/forge-gui/res/cardsfolder/s/squires_devotion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/squires_devotion.txt rename to forge-gui/res/cardsfolder/s/squires_devotion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/stampeding_horncrest.txt b/forge-gui/res/cardsfolder/s/stampeding_horncrest.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/stampeding_horncrest.txt rename to forge-gui/res/cardsfolder/s/stampeding_horncrest.txt diff --git a/forge-gui/res/cardsfolder/upcoming/storm_fleet_sprinter.txt b/forge-gui/res/cardsfolder/s/storm_fleet_sprinter.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/storm_fleet_sprinter.txt rename to forge-gui/res/cardsfolder/s/storm_fleet_sprinter.txt diff --git a/forge-gui/res/cardsfolder/upcoming/storm_fleet_swashbuckler.txt b/forge-gui/res/cardsfolder/s/storm_fleet_swashbuckler.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/storm_fleet_swashbuckler.txt rename to forge-gui/res/cardsfolder/s/storm_fleet_swashbuckler.txt diff --git a/forge-gui/res/cardsfolder/upcoming/storm_the_vault_vault_of_catlacan.txt b/forge-gui/res/cardsfolder/s/storm_the_vault_vault_of_catlacan.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/storm_the_vault_vault_of_catlacan.txt rename to forge-gui/res/cardsfolder/s/storm_the_vault_vault_of_catlacan.txt diff --git a/forge-gui/res/cardsfolder/upcoming/strength_of_the_pack.txt b/forge-gui/res/cardsfolder/s/strength_of_the_pack.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/strength_of_the_pack.txt rename to forge-gui/res/cardsfolder/s/strength_of_the_pack.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sun_collared_raptor.txt b/forge-gui/res/cardsfolder/s/sun_collared_raptor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sun_collared_raptor.txt rename to forge-gui/res/cardsfolder/s/sun_collared_raptor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sun_crested_pterodon.txt b/forge-gui/res/cardsfolder/s/sun_crested_pterodon.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sun_crested_pterodon.txt rename to forge-gui/res/cardsfolder/s/sun_crested_pterodon.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sun_sentinel.txt b/forge-gui/res/cardsfolder/s/sun_sentinel.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sun_sentinel.txt rename to forge-gui/res/cardsfolder/s/sun_sentinel.txt diff --git a/forge-gui/res/cardsfolder/upcoming/swab_goblin.txt b/forge-gui/res/cardsfolder/s/swab_goblin.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/swab_goblin.txt rename to forge-gui/res/cardsfolder/s/swab_goblin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/swaggering_corsair.txt b/forge-gui/res/cardsfolder/s/swaggering_corsair.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/swaggering_corsair.txt rename to forge-gui/res/cardsfolder/s/swaggering_corsair.txt diff --git a/forge-gui/res/cardsfolder/upcoming/swift_warden.txt b/forge-gui/res/cardsfolder/s/swift_warden.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/swift_warden.txt rename to forge-gui/res/cardsfolder/s/swift_warden.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sworn_guardian.txt b/forge-gui/res/cardsfolder/s/sworn_guardian.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sworn_guardian.txt rename to forge-gui/res/cardsfolder/s/sworn_guardian.txt diff --git a/forge-gui/res/cardsfolder/upcoming/temple_altisaur.txt b/forge-gui/res/cardsfolder/t/temple_altisaur.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/temple_altisaur.txt rename to forge-gui/res/cardsfolder/t/temple_altisaur.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tendershoot_dryad.txt b/forge-gui/res/cardsfolder/t/tendershoot_dryad.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tendershoot_dryad.txt rename to forge-gui/res/cardsfolder/t/tendershoot_dryad.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tetzimoc_primal_death.txt b/forge-gui/res/cardsfolder/t/tetzimoc_primal_death.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tetzimoc_primal_death.txt rename to forge-gui/res/cardsfolder/t/tetzimoc_primal_death.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_immortal_sun.txt b/forge-gui/res/cardsfolder/t/the_immortal_sun.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_immortal_sun.txt rename to forge-gui/res/cardsfolder/t/the_immortal_sun.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thrashing_brontodon.txt b/forge-gui/res/cardsfolder/t/thrashing_brontodon.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thrashing_brontodon.txt rename to forge-gui/res/cardsfolder/t/thrashing_brontodon.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thunderherd_migration.txt b/forge-gui/res/cardsfolder/t/thunderherd_migration.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thunderherd_migration.txt rename to forge-gui/res/cardsfolder/t/thunderherd_migration.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tilonallis_crown.txt b/forge-gui/res/cardsfolder/t/tilonallis_crown.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tilonallis_crown.txt rename to forge-gui/res/cardsfolder/t/tilonallis_crown.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tilonallis_summoner.txt b/forge-gui/res/cardsfolder/t/tilonallis_summoner.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tilonallis_summoner.txt rename to forge-gui/res/cardsfolder/t/tilonallis_summoner.txt diff --git a/forge-gui/res/cardsfolder/upcoming/timestream_navigator.txt b/forge-gui/res/cardsfolder/t/timestream_navigator.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/timestream_navigator.txt rename to forge-gui/res/cardsfolder/t/timestream_navigator.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tomb_robber.txt b/forge-gui/res/cardsfolder/t/tomb_robber.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tomb_robber.txt rename to forge-gui/res/cardsfolder/t/tomb_robber.txt diff --git a/forge-gui/res/cardsfolder/upcoming/trapjaw_tyrant.txt b/forge-gui/res/cardsfolder/t/trapjaw_tyrant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/trapjaw_tyrant.txt rename to forge-gui/res/cardsfolder/t/trapjaw_tyrant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/twilight_prophet.txt b/forge-gui/res/cardsfolder/t/twilight_prophet.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/twilight_prophet.txt rename to forge-gui/res/cardsfolder/t/twilight_prophet.txt diff --git a/forge-gui/res/cardsfolder/upcoming/vampire_champion.txt b/forge-gui/res/cardsfolder/v/vampire_champion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/vampire_champion.txt rename to forge-gui/res/cardsfolder/v/vampire_champion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/vampire_revenant.txt b/forge-gui/res/cardsfolder/v/vampire_revenant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/vampire_revenant.txt rename to forge-gui/res/cardsfolder/v/vampire_revenant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/vonas_hunger.txt b/forge-gui/res/cardsfolder/v/vonas_hunger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/vonas_hunger.txt rename to forge-gui/res/cardsfolder/v/vonas_hunger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/voracious_vampire.txt b/forge-gui/res/cardsfolder/v/voracious_vampire.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/voracious_vampire.txt rename to forge-gui/res/cardsfolder/v/voracious_vampire.txt diff --git a/forge-gui/res/cardsfolder/upcoming/vraska_scheming_gorgon.txt b/forge-gui/res/cardsfolder/v/vraska_scheming_gorgon.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/vraska_scheming_gorgon.txt rename to forge-gui/res/cardsfolder/v/vraska_scheming_gorgon.txt diff --git a/forge-gui/res/cardsfolder/upcoming/vraskas_conquistador.txt b/forge-gui/res/cardsfolder/v/vraskas_conquistador.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/vraskas_conquistador.txt rename to forge-gui/res/cardsfolder/v/vraskas_conquistador.txt diff --git a/forge-gui/res/cardsfolder/upcoming/vraskas_scorn.txt b/forge-gui/res/cardsfolder/v/vraskas_scorn.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/vraskas_scorn.txt rename to forge-gui/res/cardsfolder/v/vraskas_scorn.txt diff --git a/forge-gui/res/cardsfolder/upcoming/warkite_marauder.txt b/forge-gui/res/cardsfolder/w/warkite_marauder.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/warkite_marauder.txt rename to forge-gui/res/cardsfolder/w/warkite_marauder.txt diff --git a/forge-gui/res/cardsfolder/upcoming/waterknot.txt b/forge-gui/res/cardsfolder/w/waterknot.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/waterknot.txt rename to forge-gui/res/cardsfolder/w/waterknot.txt diff --git a/forge-gui/res/cardsfolder/upcoming/wayward_swordtooth.txt b/forge-gui/res/cardsfolder/w/wayward_swordtooth.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/wayward_swordtooth.txt rename to forge-gui/res/cardsfolder/w/wayward_swordtooth.txt diff --git a/forge-gui/res/cardsfolder/upcoming/world_shaper.txt b/forge-gui/res/cardsfolder/w/world_shaper.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/world_shaper.txt rename to forge-gui/res/cardsfolder/w/world_shaper.txt diff --git a/forge-gui/res/cardsfolder/upcoming/zacama_primal_calamity.txt b/forge-gui/res/cardsfolder/z/zacama_primal_calamity.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/zacama_primal_calamity.txt rename to forge-gui/res/cardsfolder/z/zacama_primal_calamity.txt diff --git a/forge-gui/res/cardsfolder/upcoming/zetalpa_primal_dawn.txt b/forge-gui/res/cardsfolder/z/zetalpa_primal_dawn.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/zetalpa_primal_dawn.txt rename to forge-gui/res/cardsfolder/z/zetalpa_primal_dawn.txt diff --git a/forge-gui/tools/migrateUpcoming.py b/forge-gui/tools/migrateUpcoming.py index 8e4403dcc85..5204d124292 100644 --- a/forge-gui/tools/migrateUpcoming.py +++ b/forge-gui/tools/migrateUpcoming.py @@ -5,7 +5,9 @@ cardsfolder = os.path.join(os.path.dirname(os.getcwd()), 'res', 'cardsfolder') upcoming = os.path.join(cardsfolder, 'upcoming') for dirName, subdirList, fileList in os.walk(upcoming): - for file in fileList: - curLocation = os.path.join(upcoming, file) - newFile = os.path.join(cardsfolder, file[0], file) - subprocess.call('svn rename %s %s' % (curLocation, newFile), shell=True) \ No newline at end of file + for filename in fileList: + if filename.startswith(".") + continue + curLocation = os.path.join(upcoming, filename) + newFile = os.path.join(cardsfolder, filename[0], filename) + subprocess.call('git mv %s %s' % (curLocation, newFile), shell=True) \ No newline at end of file