diff --git a/forge-gui/res/cardsfolder/upcoming/access_denied.txt b/forge-gui/res/cardsfolder/a/access_denied.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/access_denied.txt rename to forge-gui/res/cardsfolder/a/access_denied.txt diff --git a/forge-gui/res/cardsfolder/upcoming/acquisition_octopus.txt b/forge-gui/res/cardsfolder/a/acquisition_octopus.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/acquisition_octopus.txt rename to forge-gui/res/cardsfolder/a/acquisition_octopus.txt diff --git a/forge-gui/res/cardsfolder/upcoming/aerial_surveyor.txt b/forge-gui/res/cardsfolder/a/aerial_surveyor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/aerial_surveyor.txt rename to forge-gui/res/cardsfolder/a/aerial_surveyor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/akki_battle_squad.txt b/forge-gui/res/cardsfolder/a/akki_battle_squad.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/akki_battle_squad.txt rename to forge-gui/res/cardsfolder/a/akki_battle_squad.txt diff --git a/forge-gui/res/cardsfolder/upcoming/akki_ember_keeper.txt b/forge-gui/res/cardsfolder/a/akki_ember_keeper.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/akki_ember_keeper.txt rename to forge-gui/res/cardsfolder/a/akki_ember_keeper.txt diff --git a/forge-gui/res/cardsfolder/upcoming/akki_ronin.txt b/forge-gui/res/cardsfolder/a/akki_ronin.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/akki_ronin.txt rename to forge-gui/res/cardsfolder/a/akki_ronin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/akki_war_paint.txt b/forge-gui/res/cardsfolder/a/akki_war_paint.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/akki_war_paint.txt rename to forge-gui/res/cardsfolder/a/akki_war_paint.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ambitious_assault.txt b/forge-gui/res/cardsfolder/a/ambitious_assault.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ambitious_assault.txt rename to forge-gui/res/cardsfolder/a/ambitious_assault.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ancestral_katana.txt b/forge-gui/res/cardsfolder/a/ancestral_katana.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ancestral_katana.txt rename to forge-gui/res/cardsfolder/a/ancestral_katana.txt diff --git a/forge-gui/res/cardsfolder/upcoming/anchor_to_reality.txt b/forge-gui/res/cardsfolder/a/anchor_to_reality.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/anchor_to_reality.txt rename to forge-gui/res/cardsfolder/a/anchor_to_reality.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ao_the_dawn_sky.txt b/forge-gui/res/cardsfolder/a/ao_the_dawn_sky.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ao_the_dawn_sky.txt rename to forge-gui/res/cardsfolder/a/ao_the_dawn_sky.txt diff --git a/forge-gui/res/cardsfolder/upcoming/armguard_familiar.txt b/forge-gui/res/cardsfolder/a/armguard_familiar.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/armguard_familiar.txt rename to forge-gui/res/cardsfolder/a/armguard_familiar.txt diff --git a/forge-gui/res/cardsfolder/upcoming/asari_captain.txt b/forge-gui/res/cardsfolder/a/asari_captain.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/asari_captain.txt rename to forge-gui/res/cardsfolder/a/asari_captain.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ascendant_acolyte.txt b/forge-gui/res/cardsfolder/a/ascendant_acolyte.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ascendant_acolyte.txt rename to forge-gui/res/cardsfolder/a/ascendant_acolyte.txt diff --git a/forge-gui/res/cardsfolder/upcoming/assassins_ink.txt b/forge-gui/res/cardsfolder/a/assassins_ink.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/assassins_ink.txt rename to forge-gui/res/cardsfolder/a/assassins_ink.txt diff --git a/forge-gui/res/cardsfolder/upcoming/atsushi_the_blazing_sky.txt b/forge-gui/res/cardsfolder/a/atsushi_the_blazing_sky.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/atsushi_the_blazing_sky.txt rename to forge-gui/res/cardsfolder/a/atsushi_the_blazing_sky.txt diff --git a/forge-gui/res/cardsfolder/upcoming/automated_artificer.txt b/forge-gui/res/cardsfolder/a/automated_artificer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/automated_artificer.txt rename to forge-gui/res/cardsfolder/a/automated_artificer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/awakened_awareness.txt b/forge-gui/res/cardsfolder/a/awakened_awareness.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/awakened_awareness.txt rename to forge-gui/res/cardsfolder/a/awakened_awareness.txt diff --git a/forge-gui/res/cardsfolder/upcoming/azusas_many_journeys_likeness_of_the_seeker.txt b/forge-gui/res/cardsfolder/a/azusas_many_journeys_likeness_of_the_seeker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/azusas_many_journeys_likeness_of_the_seeker.txt rename to forge-gui/res/cardsfolder/a/azusas_many_journeys_likeness_of_the_seeker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bamboo_grove_archer.txt b/forge-gui/res/cardsfolder/b/bamboo_grove_archer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bamboo_grove_archer.txt rename to forge-gui/res/cardsfolder/b/bamboo_grove_archer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/banishing_slash.txt b/forge-gui/res/cardsfolder/b/banishing_slash.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/banishing_slash.txt rename to forge-gui/res/cardsfolder/b/banishing_slash.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bearer_of_memory.txt b/forge-gui/res/cardsfolder/b/bearer_of_memory.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bearer_of_memory.txt rename to forge-gui/res/cardsfolder/b/bearer_of_memory.txt diff --git a/forge-gui/res/cardsfolder/upcoming/befriending_the_moths_imperial_moth.txt b/forge-gui/res/cardsfolder/b/befriending_the_moths_imperial_moth.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/befriending_the_moths_imperial_moth.txt rename to forge-gui/res/cardsfolder/b/befriending_the_moths_imperial_moth.txt diff --git a/forge-gui/res/cardsfolder/upcoming/behold_the_unspeakable_vision_of_the_unspeakable.txt b/forge-gui/res/cardsfolder/b/behold_the_unspeakable_vision_of_the_unspeakable.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/behold_the_unspeakable_vision_of_the_unspeakable.txt rename to forge-gui/res/cardsfolder/b/behold_the_unspeakable_vision_of_the_unspeakable.txt diff --git a/forge-gui/res/cardsfolder/upcoming/biting_palm_ninja.txt b/forge-gui/res/cardsfolder/b/biting_palm_ninja.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/biting_palm_ninja.txt rename to forge-gui/res/cardsfolder/b/biting_palm_ninja.txt diff --git a/forge-gui/res/cardsfolder/upcoming/blade_blizzard_kitsune.txt b/forge-gui/res/cardsfolder/b/blade_blizzard_kitsune.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/blade_blizzard_kitsune.txt rename to forge-gui/res/cardsfolder/b/blade_blizzard_kitsune.txt diff --git a/forge-gui/res/cardsfolder/upcoming/blade_of_the_oni.txt b/forge-gui/res/cardsfolder/b/blade_of_the_oni.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/blade_of_the_oni.txt rename to forge-gui/res/cardsfolder/b/blade_of_the_oni.txt diff --git a/forge-gui/res/cardsfolder/upcoming/blossom_prancer.txt b/forge-gui/res/cardsfolder/b/blossom_prancer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/blossom_prancer.txt rename to forge-gui/res/cardsfolder/b/blossom_prancer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/boon_of_boseiju.txt b/forge-gui/res/cardsfolder/b/boon_of_boseiju.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/boon_of_boseiju.txt rename to forge-gui/res/cardsfolder/b/boon_of_boseiju.txt diff --git a/forge-gui/res/cardsfolder/upcoming/born_to_drive.txt b/forge-gui/res/cardsfolder/b/born_to_drive.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/born_to_drive.txt rename to forge-gui/res/cardsfolder/b/born_to_drive.txt diff --git a/forge-gui/res/cardsfolder/upcoming/boseiju_reaches_skyward_branch_of_boseiju.txt b/forge-gui/res/cardsfolder/b/boseiju_reaches_skyward_branch_of_boseiju.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/boseiju_reaches_skyward_branch_of_boseiju.txt rename to forge-gui/res/cardsfolder/b/boseiju_reaches_skyward_branch_of_boseiju.txt diff --git a/forge-gui/res/cardsfolder/upcoming/boseiju_who_endures.txt b/forge-gui/res/cardsfolder/b/boseiju_who_endures.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/boseiju_who_endures.txt rename to forge-gui/res/cardsfolder/b/boseiju_who_endures.txt diff --git a/forge-gui/res/cardsfolder/upcoming/brilliant_restoration.txt b/forge-gui/res/cardsfolder/b/brilliant_restoration.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/brilliant_restoration.txt rename to forge-gui/res/cardsfolder/b/brilliant_restoration.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bronze_cudgels.txt b/forge-gui/res/cardsfolder/b/bronze_cudgels.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bronze_cudgels.txt rename to forge-gui/res/cardsfolder/b/bronze_cudgels.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bronzeplate_boar.txt b/forge-gui/res/cardsfolder/b/bronzeplate_boar.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bronzeplate_boar.txt rename to forge-gui/res/cardsfolder/b/bronzeplate_boar.txt diff --git a/forge-gui/res/cardsfolder/upcoming/brute_suit.txt b/forge-gui/res/cardsfolder/b/brute_suit.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/brute_suit.txt rename to forge-gui/res/cardsfolder/b/brute_suit.txt diff --git a/forge-gui/res/cardsfolder/upcoming/careful_cultivation.txt b/forge-gui/res/cardsfolder/c/careful_cultivation.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/careful_cultivation.txt rename to forge-gui/res/cardsfolder/c/careful_cultivation.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chainflail_centipede.txt b/forge-gui/res/cardsfolder/c/chainflail_centipede.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chainflail_centipede.txt rename to forge-gui/res/cardsfolder/c/chainflail_centipede.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chishiro_the_shattered_blade.txt b/forge-gui/res/cardsfolder/c/chishiro_the_shattered_blade.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chishiro_the_shattered_blade.txt rename to forge-gui/res/cardsfolder/c/chishiro_the_shattered_blade.txt diff --git a/forge-gui/res/cardsfolder/upcoming/circuit_mender.txt b/forge-gui/res/cardsfolder/c/circuit_mender.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/circuit_mender.txt rename to forge-gui/res/cardsfolder/c/circuit_mender.txt diff --git a/forge-gui/res/cardsfolder/upcoming/clawing_torment.txt b/forge-gui/res/cardsfolder/c/clawing_torment.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/clawing_torment.txt rename to forge-gui/res/cardsfolder/c/clawing_torment.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cloudsteel_kirin.txt b/forge-gui/res/cardsfolder/c/cloudsteel_kirin.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cloudsteel_kirin.txt rename to forge-gui/res/cardsfolder/c/cloudsteel_kirin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/coiling_stalker.txt b/forge-gui/res/cardsfolder/c/coiling_stalker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/coiling_stalker.txt rename to forge-gui/res/cardsfolder/c/coiling_stalker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/collision_of_realms.txt b/forge-gui/res/cardsfolder/c/collision_of_realms.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/collision_of_realms.txt rename to forge-gui/res/cardsfolder/c/collision_of_realms.txt diff --git a/forge-gui/res/cardsfolder/upcoming/colossal_skyturtle.txt b/forge-gui/res/cardsfolder/c/colossal_skyturtle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/colossal_skyturtle.txt rename to forge-gui/res/cardsfolder/c/colossal_skyturtle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/commune_with_spirits.txt b/forge-gui/res/cardsfolder/c/commune_with_spirits.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/commune_with_spirits.txt rename to forge-gui/res/cardsfolder/c/commune_with_spirits.txt diff --git a/forge-gui/res/cardsfolder/upcoming/concord_with_the_kami.txt b/forge-gui/res/cardsfolder/c/concord_with_the_kami.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/concord_with_the_kami.txt rename to forge-gui/res/cardsfolder/c/concord_with_the_kami.txt diff --git a/forge-gui/res/cardsfolder/upcoming/containment_construct.txt b/forge-gui/res/cardsfolder/c/containment_construct.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/containment_construct.txt rename to forge-gui/res/cardsfolder/c/containment_construct.txt diff --git a/forge-gui/res/cardsfolder/upcoming/covert_technician.txt b/forge-gui/res/cardsfolder/c/covert_technician.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/covert_technician.txt rename to forge-gui/res/cardsfolder/c/covert_technician.txt diff --git a/forge-gui/res/cardsfolder/upcoming/crackling_emergence.txt b/forge-gui/res/cardsfolder/c/crackling_emergence.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/crackling_emergence.txt rename to forge-gui/res/cardsfolder/c/crackling_emergence.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cyberdrive_awakener.txt b/forge-gui/res/cardsfolder/c/cyberdrive_awakener.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cyberdrive_awakener.txt rename to forge-gui/res/cardsfolder/c/cyberdrive_awakener.txt diff --git a/forge-gui/res/cardsfolder/upcoming/debt_to_the_kami.txt b/forge-gui/res/cardsfolder/d/debt_to_the_kami.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/debt_to_the_kami.txt rename to forge-gui/res/cardsfolder/d/debt_to_the_kami.txt diff --git a/forge-gui/res/cardsfolder/upcoming/discover_the_impossible.txt b/forge-gui/res/cardsfolder/d/discover_the_impossible.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/discover_the_impossible.txt rename to forge-gui/res/cardsfolder/d/discover_the_impossible.txt diff --git a/forge-gui/res/cardsfolder/upcoming/disruption_protocol.txt b/forge-gui/res/cardsfolder/d/disruption_protocol.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/disruption_protocol.txt rename to forge-gui/res/cardsfolder/d/disruption_protocol.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dockside_chef.txt b/forge-gui/res/cardsfolder/d/dockside_chef.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dockside_chef.txt rename to forge-gui/res/cardsfolder/d/dockside_chef.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dokuchi_shadow_walker.txt b/forge-gui/res/cardsfolder/d/dokuchi_shadow_walker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dokuchi_shadow_walker.txt rename to forge-gui/res/cardsfolder/d/dokuchi_shadow_walker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dokuchi_silencer.txt b/forge-gui/res/cardsfolder/d/dokuchi_silencer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dokuchi_silencer.txt rename to forge-gui/res/cardsfolder/d/dokuchi_silencer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dragonfly_suit.txt b/forge-gui/res/cardsfolder/d/dragonfly_suit.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dragonfly_suit.txt rename to forge-gui/res/cardsfolder/d/dragonfly_suit.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dragonspark_reactor.txt b/forge-gui/res/cardsfolder/d/dragonspark_reactor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dragonspark_reactor.txt rename to forge-gui/res/cardsfolder/d/dragonspark_reactor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dramatists_puppet.txt b/forge-gui/res/cardsfolder/d/dramatists_puppet.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dramatists_puppet.txt rename to forge-gui/res/cardsfolder/d/dramatists_puppet.txt diff --git a/forge-gui/res/cardsfolder/upcoming/drumbellower.txt b/forge-gui/res/cardsfolder/d/drumbellower.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/drumbellower.txt rename to forge-gui/res/cardsfolder/d/drumbellower.txt diff --git a/forge-gui/res/cardsfolder/upcoming/eater_of_virtue.txt b/forge-gui/res/cardsfolder/e/eater_of_virtue.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/eater_of_virtue.txt rename to forge-gui/res/cardsfolder/e/eater_of_virtue.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ecologists_terrarium.txt b/forge-gui/res/cardsfolder/e/ecologists_terrarium.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ecologists_terrarium.txt rename to forge-gui/res/cardsfolder/e/ecologists_terrarium.txt diff --git a/forge-gui/res/cardsfolder/upcoming/eiganjo_exemplar.txt b/forge-gui/res/cardsfolder/e/eiganjo_exemplar.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/eiganjo_exemplar.txt rename to forge-gui/res/cardsfolder/e/eiganjo_exemplar.txt diff --git a/forge-gui/res/cardsfolder/upcoming/eiganjo_seat_of_the_empire.txt b/forge-gui/res/cardsfolder/e/eiganjo_seat_of_the_empire.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/eiganjo_seat_of_the_empire.txt rename to forge-gui/res/cardsfolder/e/eiganjo_seat_of_the_empire.txt diff --git a/forge-gui/res/cardsfolder/upcoming/eiganjo_uprising.txt b/forge-gui/res/cardsfolder/e/eiganjo_uprising.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/eiganjo_uprising.txt rename to forge-gui/res/cardsfolder/e/eiganjo_uprising.txt diff --git a/forge-gui/res/cardsfolder/upcoming/enormous_energy_blade.txt b/forge-gui/res/cardsfolder/e/enormous_energy_blade.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/enormous_energy_blade.txt rename to forge-gui/res/cardsfolder/e/enormous_energy_blade.txt diff --git a/forge-gui/res/cardsfolder/upcoming/enthusiastic_mechanaut.txt b/forge-gui/res/cardsfolder/e/enthusiastic_mechanaut.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/enthusiastic_mechanaut.txt rename to forge-gui/res/cardsfolder/e/enthusiastic_mechanaut.txt diff --git a/forge-gui/res/cardsfolder/upcoming/era_of_enlightenment_hand_of_enlightenment.txt b/forge-gui/res/cardsfolder/e/era_of_enlightenment_hand_of_enlightenment.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/era_of_enlightenment_hand_of_enlightenment.txt rename to forge-gui/res/cardsfolder/e/era_of_enlightenment_hand_of_enlightenment.txt diff --git a/forge-gui/res/cardsfolder/upcoming/euroakus.txt b/forge-gui/res/cardsfolder/e/euroakus.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/euroakus.txt rename to forge-gui/res/cardsfolder/e/euroakus.txt diff --git a/forge-gui/res/cardsfolder/upcoming/experimental_synthesizer.txt b/forge-gui/res/cardsfolder/e/experimental_synthesizer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/experimental_synthesizer.txt rename to forge-gui/res/cardsfolder/e/experimental_synthesizer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/explosive_entry.txt b/forge-gui/res/cardsfolder/e/explosive_entry.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/explosive_entry.txt rename to forge-gui/res/cardsfolder/e/explosive_entry.txt diff --git a/forge-gui/res/cardsfolder/upcoming/explosive_singularity.txt b/forge-gui/res/cardsfolder/e/explosive_singularity.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/explosive_singularity.txt rename to forge-gui/res/cardsfolder/e/explosive_singularity.txt diff --git a/forge-gui/res/cardsfolder/upcoming/fable_of_the_mirror_breaker_reflection_of_kiki_jiki.txt b/forge-gui/res/cardsfolder/f/fable_of_the_mirror_breaker_reflection_of_kiki_jiki.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/fable_of_the_mirror_breaker_reflection_of_kiki_jiki.txt rename to forge-gui/res/cardsfolder/f/fable_of_the_mirror_breaker_reflection_of_kiki_jiki.txt diff --git a/forge-gui/res/cardsfolder/upcoming/fang_of_shigeki.txt b/forge-gui/res/cardsfolder/f/fang_of_shigeki.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/fang_of_shigeki.txt rename to forge-gui/res/cardsfolder/f/fang_of_shigeki.txt diff --git a/forge-gui/res/cardsfolder/upcoming/farewell.txt b/forge-gui/res/cardsfolder/f/farewell.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/farewell.txt rename to forge-gui/res/cardsfolder/f/farewell.txt diff --git a/forge-gui/res/cardsfolder/upcoming/favor_of_jukai.txt b/forge-gui/res/cardsfolder/f/favor_of_jukai.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/favor_of_jukai.txt rename to forge-gui/res/cardsfolder/f/favor_of_jukai.txt diff --git a/forge-gui/res/cardsfolder/upcoming/flame_discharge.txt b/forge-gui/res/cardsfolder/f/flame_discharge.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/flame_discharge.txt rename to forge-gui/res/cardsfolder/f/flame_discharge.txt diff --git a/forge-gui/res/cardsfolder/upcoming/futurist_operative.txt b/forge-gui/res/cardsfolder/f/futurist_operative.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/futurist_operative.txt rename to forge-gui/res/cardsfolder/f/futurist_operative.txt diff --git a/forge-gui/res/cardsfolder/upcoming/futurist_sentinel.txt b/forge-gui/res/cardsfolder/f/futurist_sentinel.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/futurist_sentinel.txt rename to forge-gui/res/cardsfolder/f/futurist_sentinel.txt diff --git a/forge-gui/res/cardsfolder/upcoming/generous_visitor.txt b/forge-gui/res/cardsfolder/g/generous_visitor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/generous_visitor.txt rename to forge-gui/res/cardsfolder/g/generous_visitor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/geothermal_kami.txt b/forge-gui/res/cardsfolder/g/geothermal_kami.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/geothermal_kami.txt rename to forge-gui/res/cardsfolder/g/geothermal_kami.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gift_of_wrath.txt b/forge-gui/res/cardsfolder/g/gift_of_wrath.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gift_of_wrath.txt rename to forge-gui/res/cardsfolder/g/gift_of_wrath.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gloomshrieker.txt b/forge-gui/res/cardsfolder/g/gloomshrieker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gloomshrieker.txt rename to forge-gui/res/cardsfolder/g/gloomshrieker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/go_shintai_of_ancient_wars.txt b/forge-gui/res/cardsfolder/g/go_shintai_of_ancient_wars.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/go_shintai_of_ancient_wars.txt rename to forge-gui/res/cardsfolder/g/go_shintai_of_ancient_wars.txt diff --git a/forge-gui/res/cardsfolder/upcoming/go_shintai_of_boundless_vigor.txt b/forge-gui/res/cardsfolder/g/go_shintai_of_boundless_vigor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/go_shintai_of_boundless_vigor.txt rename to forge-gui/res/cardsfolder/g/go_shintai_of_boundless_vigor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/go_shintai_of_hidden_cruelty.txt b/forge-gui/res/cardsfolder/g/go_shintai_of_hidden_cruelty.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/go_shintai_of_hidden_cruelty.txt rename to forge-gui/res/cardsfolder/g/go_shintai_of_hidden_cruelty.txt diff --git a/forge-gui/res/cardsfolder/upcoming/go_shintai_of_lifes_origin.txt b/forge-gui/res/cardsfolder/g/go_shintai_of_lifes_origin.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/go_shintai_of_lifes_origin.txt rename to forge-gui/res/cardsfolder/g/go_shintai_of_lifes_origin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/go_shintai_of_lost_wisdom.txt b/forge-gui/res/cardsfolder/g/go_shintai_of_lost_wisdom.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/go_shintai_of_lost_wisdom.txt rename to forge-gui/res/cardsfolder/g/go_shintai_of_lost_wisdom.txt diff --git a/forge-gui/res/cardsfolder/upcoming/go_shintai_of_shared_purpose.txt b/forge-gui/res/cardsfolder/g/go_shintai_of_shared_purpose.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/go_shintai_of_shared_purpose.txt rename to forge-gui/res/cardsfolder/g/go_shintai_of_shared_purpose.txt diff --git a/forge-gui/res/cardsfolder/upcoming/golden_tail_disciple.txt b/forge-gui/res/cardsfolder/g/golden_tail_disciple.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/golden_tail_disciple.txt rename to forge-gui/res/cardsfolder/g/golden_tail_disciple.txt diff --git a/forge-gui/res/cardsfolder/upcoming/goro_goro_disciple_of_ryusei.txt b/forge-gui/res/cardsfolder/g/goro_goro_disciple_of_ryusei.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/goro_goro_disciple_of_ryusei.txt rename to forge-gui/res/cardsfolder/g/goro_goro_disciple_of_ryusei.txt diff --git a/forge-gui/res/cardsfolder/upcoming/grafted_growth.txt b/forge-gui/res/cardsfolder/g/grafted_growth.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/grafted_growth.txt rename to forge-gui/res/cardsfolder/g/grafted_growth.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gravelighter.txt b/forge-gui/res/cardsfolder/g/gravelighter.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gravelighter.txt rename to forge-gui/res/cardsfolder/g/gravelighter.txt diff --git a/forge-gui/res/cardsfolder/upcoming/greasefang_okiba_boss.txt b/forge-gui/res/cardsfolder/g/greasefang_okiba_boss.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/greasefang_okiba_boss.txt rename to forge-gui/res/cardsfolder/g/greasefang_okiba_boss.txt diff --git a/forge-gui/res/cardsfolder/upcoming/greater_tanuki.txt b/forge-gui/res/cardsfolder/g/greater_tanuki.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/greater_tanuki.txt rename to forge-gui/res/cardsfolder/g/greater_tanuki.txt diff --git a/forge-gui/res/cardsfolder/upcoming/guardians_of_oboro.txt b/forge-gui/res/cardsfolder/g/guardians_of_oboro.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/guardians_of_oboro.txt rename to forge-gui/res/cardsfolder/g/guardians_of_oboro.txt diff --git a/forge-gui/res/cardsfolder/upcoming/harmonious_emergence.txt b/forge-gui/res/cardsfolder/h/harmonious_emergence.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/harmonious_emergence.txt rename to forge-gui/res/cardsfolder/h/harmonious_emergence.txt diff --git a/forge-gui/res/cardsfolder/upcoming/heiko_yamazaki_the_general.txt b/forge-gui/res/cardsfolder/h/heiko_yamazaki_the_general.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/heiko_yamazaki_the_general.txt rename to forge-gui/res/cardsfolder/h/heiko_yamazaki_the_general.txt diff --git a/forge-gui/res/cardsfolder/upcoming/heir_of_the_ancient_fang.txt b/forge-gui/res/cardsfolder/h/heir_of_the_ancient_fang.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/heir_of_the_ancient_fang.txt rename to forge-gui/res/cardsfolder/h/heir_of_the_ancient_fang.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hidetsugu_consumes_all_vessel_of_the_all_consuming.txt b/forge-gui/res/cardsfolder/h/hidetsugu_consumes_all_vessel_of_the_all_consuming.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hidetsugu_consumes_all_vessel_of_the_all_consuming.txt rename to forge-gui/res/cardsfolder/h/hidetsugu_consumes_all_vessel_of_the_all_consuming.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hidetsugu_devouring_chaos.txt b/forge-gui/res/cardsfolder/h/hidetsugu_devouring_chaos.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hidetsugu_devouring_chaos.txt rename to forge-gui/res/cardsfolder/h/hidetsugu_devouring_chaos.txt diff --git a/forge-gui/res/cardsfolder/upcoming/high_speed_hoverbike.txt b/forge-gui/res/cardsfolder/h/high_speed_hoverbike.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/high_speed_hoverbike.txt rename to forge-gui/res/cardsfolder/h/high_speed_hoverbike.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hinata_dawn_crowned.txt b/forge-gui/res/cardsfolder/h/hinata_dawn_crowned.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hinata_dawn_crowned.txt rename to forge-gui/res/cardsfolder/h/hinata_dawn_crowned.txt diff --git a/forge-gui/res/cardsfolder/upcoming/historians_wisdom.txt b/forge-gui/res/cardsfolder/h/historians_wisdom.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/historians_wisdom.txt rename to forge-gui/res/cardsfolder/h/historians_wisdom.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hotshot_mechanic.txt b/forge-gui/res/cardsfolder/h/hotshot_mechanic.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hotshot_mechanic.txt rename to forge-gui/res/cardsfolder/h/hotshot_mechanic.txt diff --git a/forge-gui/res/cardsfolder/upcoming/imperial_oath.txt b/forge-gui/res/cardsfolder/i/imperial_oath.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/imperial_oath.txt rename to forge-gui/res/cardsfolder/i/imperial_oath.txt diff --git a/forge-gui/res/cardsfolder/upcoming/imperial_recovery_unit.txt b/forge-gui/res/cardsfolder/i/imperial_recovery_unit.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/imperial_recovery_unit.txt rename to forge-gui/res/cardsfolder/i/imperial_recovery_unit.txt diff --git a/forge-gui/res/cardsfolder/upcoming/imperial_subduer.txt b/forge-gui/res/cardsfolder/i/imperial_subduer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/imperial_subduer.txt rename to forge-gui/res/cardsfolder/i/imperial_subduer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/imposter_mech.txt b/forge-gui/res/cardsfolder/i/imposter_mech.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/imposter_mech.txt rename to forge-gui/res/cardsfolder/i/imposter_mech.txt diff --git a/forge-gui/res/cardsfolder/upcoming/inkrise_infiltrator.txt b/forge-gui/res/cardsfolder/i/inkrise_infiltrator.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/inkrise_infiltrator.txt rename to forge-gui/res/cardsfolder/i/inkrise_infiltrator.txt diff --git a/forge-gui/res/cardsfolder/upcoming/intercessors_arrest.txt b/forge-gui/res/cardsfolder/i/intercessors_arrest.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/intercessors_arrest.txt rename to forge-gui/res/cardsfolder/i/intercessors_arrest.txt diff --git a/forge-gui/res/cardsfolder/upcoming/inventive_iteration_living_breakthrough.txt b/forge-gui/res/cardsfolder/i/inventive_iteration_living_breakthrough.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/inventive_iteration_living_breakthrough.txt rename to forge-gui/res/cardsfolder/i/inventive_iteration_living_breakthrough.txt diff --git a/forge-gui/res/cardsfolder/upcoming/invigorating_hot_spring.txt b/forge-gui/res/cardsfolder/i/invigorating_hot_spring.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/invigorating_hot_spring.txt rename to forge-gui/res/cardsfolder/i/invigorating_hot_spring.txt diff --git a/forge-gui/res/cardsfolder/upcoming/invoke_calamity.txt b/forge-gui/res/cardsfolder/i/invoke_calamity.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/invoke_calamity.txt rename to forge-gui/res/cardsfolder/i/invoke_calamity.txt diff --git a/forge-gui/res/cardsfolder/upcoming/invoke_despair.txt b/forge-gui/res/cardsfolder/i/invoke_despair.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/invoke_despair.txt rename to forge-gui/res/cardsfolder/i/invoke_despair.txt diff --git a/forge-gui/res/cardsfolder/upcoming/invoke_justice.txt b/forge-gui/res/cardsfolder/i/invoke_justice.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/invoke_justice.txt rename to forge-gui/res/cardsfolder/i/invoke_justice.txt diff --git a/forge-gui/res/cardsfolder/upcoming/invoke_the_ancients.txt b/forge-gui/res/cardsfolder/i/invoke_the_ancients.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/invoke_the_ancients.txt rename to forge-gui/res/cardsfolder/i/invoke_the_ancients.txt diff --git a/forge-gui/res/cardsfolder/upcoming/invoke_the_winds.txt b/forge-gui/res/cardsfolder/i/invoke_the_winds.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/invoke_the_winds.txt rename to forge-gui/res/cardsfolder/i/invoke_the_winds.txt diff --git a/forge-gui/res/cardsfolder/upcoming/iron_apprentice.txt b/forge-gui/res/cardsfolder/i/iron_apprentice.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/iron_apprentice.txt rename to forge-gui/res/cardsfolder/i/iron_apprentice.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ironhoof_boar.txt b/forge-gui/res/cardsfolder/i/ironhoof_boar.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ironhoof_boar.txt rename to forge-gui/res/cardsfolder/i/ironhoof_boar.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ironsoul_enforcer.txt b/forge-gui/res/cardsfolder/i/ironsoul_enforcer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ironsoul_enforcer.txt rename to forge-gui/res/cardsfolder/i/ironsoul_enforcer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/isshin_two_heavens_as_one.txt b/forge-gui/res/cardsfolder/i/isshin_two_heavens_as_one.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/isshin_two_heavens_as_one.txt rename to forge-gui/res/cardsfolder/i/isshin_two_heavens_as_one.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jin_gitaxias_progress_tyrant.txt b/forge-gui/res/cardsfolder/j/jin_gitaxias_progress_tyrant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jin_gitaxias_progress_tyrant.txt rename to forge-gui/res/cardsfolder/j/jin_gitaxias_progress_tyrant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jugan_defends_the_temple_remnant_of_the_rising_star.txt b/forge-gui/res/cardsfolder/j/jugan_defends_the_temple_remnant_of_the_rising_star.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jugan_defends_the_temple_remnant_of_the_rising_star.txt rename to forge-gui/res/cardsfolder/j/jugan_defends_the_temple_remnant_of_the_rising_star.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jukai_naturalist.txt b/forge-gui/res/cardsfolder/j/jukai_naturalist.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jukai_naturalist.txt rename to forge-gui/res/cardsfolder/j/jukai_naturalist.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jukai_preserver.txt b/forge-gui/res/cardsfolder/j/jukai_preserver.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jukai_preserver.txt rename to forge-gui/res/cardsfolder/j/jukai_preserver.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jukai_trainee.txt b/forge-gui/res/cardsfolder/j/jukai_trainee.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jukai_trainee.txt rename to forge-gui/res/cardsfolder/j/jukai_trainee.txt diff --git a/forge-gui/res/cardsfolder/upcoming/junji_the_midnight_sky.txt b/forge-gui/res/cardsfolder/j/junji_the_midnight_sky.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/junji_the_midnight_sky.txt rename to forge-gui/res/cardsfolder/j/junji_the_midnight_sky.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kaima_the_fractured_calm.txt b/forge-gui/res/cardsfolder/k/kaima_the_fractured_calm.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kaima_the_fractured_calm.txt rename to forge-gui/res/cardsfolder/k/kaima_the_fractured_calm.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kairi_the_swirling_sky.txt b/forge-gui/res/cardsfolder/k/kairi_the_swirling_sky.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kairi_the_swirling_sky.txt rename to forge-gui/res/cardsfolder/k/kairi_the_swirling_sky.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kaito_shizuki.txt b/forge-gui/res/cardsfolder/k/kaito_shizuki.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kaito_shizuki.txt rename to forge-gui/res/cardsfolder/k/kaito_shizuki.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kaitos_pursuit.txt b/forge-gui/res/cardsfolder/k/kaitos_pursuit.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kaitos_pursuit.txt rename to forge-gui/res/cardsfolder/k/kaitos_pursuit.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kami_of_celebration.txt b/forge-gui/res/cardsfolder/k/kami_of_celebration.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kami_of_celebration.txt rename to forge-gui/res/cardsfolder/k/kami_of_celebration.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kami_of_industry.txt b/forge-gui/res/cardsfolder/k/kami_of_industry.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kami_of_industry.txt rename to forge-gui/res/cardsfolder/k/kami_of_industry.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kami_of_restless_shadows.txt b/forge-gui/res/cardsfolder/k/kami_of_restless_shadows.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kami_of_restless_shadows.txt rename to forge-gui/res/cardsfolder/k/kami_of_restless_shadows.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kami_of_terrible_secrets.txt b/forge-gui/res/cardsfolder/k/kami_of_terrible_secrets.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kami_of_terrible_secrets.txt rename to forge-gui/res/cardsfolder/k/kami_of_terrible_secrets.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kami_of_transience.txt b/forge-gui/res/cardsfolder/k/kami_of_transience.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kami_of_transience.txt rename to forge-gui/res/cardsfolder/k/kami_of_transience.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kamis_flare.txt b/forge-gui/res/cardsfolder/k/kamis_flare.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kamis_flare.txt rename to forge-gui/res/cardsfolder/k/kamis_flare.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kappa_cannoneer.txt b/forge-gui/res/cardsfolder/k/kappa_cannoneer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kappa_cannoneer.txt rename to forge-gui/res/cardsfolder/k/kappa_cannoneer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kappa_tech_wrecker.txt b/forge-gui/res/cardsfolder/k/kappa_tech_wrecker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kappa_tech_wrecker.txt rename to forge-gui/res/cardsfolder/k/kappa_tech_wrecker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/katsumasa_the_animator.txt b/forge-gui/res/cardsfolder/k/katsumasa_the_animator.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/katsumasa_the_animator.txt rename to forge-gui/res/cardsfolder/k/katsumasa_the_animator.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kitsune_ace.txt b/forge-gui/res/cardsfolder/k/kitsune_ace.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kitsune_ace.txt rename to forge-gui/res/cardsfolder/k/kitsune_ace.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kodama_of_the_west_tree.txt b/forge-gui/res/cardsfolder/k/kodama_of_the_west_tree.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kodama_of_the_west_tree.txt rename to forge-gui/res/cardsfolder/k/kodama_of_the_west_tree.txt diff --git a/forge-gui/res/cardsfolder/upcoming/komainu_battle_armor.txt b/forge-gui/res/cardsfolder/k/komainu_battle_armor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/komainu_battle_armor.txt rename to forge-gui/res/cardsfolder/k/komainu_battle_armor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kosei_penitent_warlord.txt b/forge-gui/res/cardsfolder/k/kosei_penitent_warlord.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kosei_penitent_warlord.txt rename to forge-gui/res/cardsfolder/k/kosei_penitent_warlord.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kotori_pilot_prodigy.txt b/forge-gui/res/cardsfolder/k/kotori_pilot_prodigy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kotori_pilot_prodigy.txt rename to forge-gui/res/cardsfolder/k/kotori_pilot_prodigy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kotose_the_silent_spider.txt b/forge-gui/res/cardsfolder/k/kotose_the_silent_spider.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kotose_the_silent_spider.txt rename to forge-gui/res/cardsfolder/k/kotose_the_silent_spider.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kumano_faces_kakkazan_etching_of_kumano.txt b/forge-gui/res/cardsfolder/k/kumano_faces_kakkazan_etching_of_kumano.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kumano_faces_kakkazan_etching_of_kumano.txt rename to forge-gui/res/cardsfolder/k/kumano_faces_kakkazan_etching_of_kumano.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kura_the_boundless_sky.txt b/forge-gui/res/cardsfolder/k/kura_the_boundless_sky.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kura_the_boundless_sky.txt rename to forge-gui/res/cardsfolder/k/kura_the_boundless_sky.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kyodai_soul_of_kamigawa.txt b/forge-gui/res/cardsfolder/k/kyodai_soul_of_kamigawa.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kyodai_soul_of_kamigawa.txt rename to forge-gui/res/cardsfolder/k/kyodai_soul_of_kamigawa.txt diff --git a/forge-gui/res/cardsfolder/upcoming/leech_gauntlet.txt b/forge-gui/res/cardsfolder/l/leech_gauntlet.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/leech_gauntlet.txt rename to forge-gui/res/cardsfolder/l/leech_gauntlet.txt diff --git a/forge-gui/res/cardsfolder/upcoming/lethal_exploit.txt b/forge-gui/res/cardsfolder/l/lethal_exploit.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/lethal_exploit.txt rename to forge-gui/res/cardsfolder/l/lethal_exploit.txt diff --git a/forge-gui/res/cardsfolder/upcoming/life_of_toshiro_umezawa_memory_of_toshiro.txt b/forge-gui/res/cardsfolder/l/life_of_toshiro_umezawa_memory_of_toshiro.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/life_of_toshiro_umezawa_memory_of_toshiro.txt rename to forge-gui/res/cardsfolder/l/life_of_toshiro_umezawa_memory_of_toshiro.txt diff --git a/forge-gui/res/cardsfolder/upcoming/light_paws_emperors_voice.txt b/forge-gui/res/cardsfolder/l/light_paws_emperors_voice.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/light_paws_emperors_voice.txt rename to forge-gui/res/cardsfolder/l/light_paws_emperors_voice.txt diff --git a/forge-gui/res/cardsfolder/upcoming/light_the_way.txt b/forge-gui/res/cardsfolder/l/light_the_way.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/light_the_way.txt rename to forge-gui/res/cardsfolder/l/light_the_way.txt diff --git a/forge-gui/res/cardsfolder/upcoming/lion_sash.txt b/forge-gui/res/cardsfolder/l/lion_sash.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/lion_sash.txt rename to forge-gui/res/cardsfolder/l/lion_sash.txt diff --git a/forge-gui/res/cardsfolder/upcoming/lizard_blades.txt b/forge-gui/res/cardsfolder/l/lizard_blades.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/lizard_blades.txt rename to forge-gui/res/cardsfolder/l/lizard_blades.txt diff --git a/forge-gui/res/cardsfolder/upcoming/lucky_offering.txt b/forge-gui/res/cardsfolder/l/lucky_offering.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/lucky_offering.txt rename to forge-gui/res/cardsfolder/l/lucky_offering.txt diff --git a/forge-gui/res/cardsfolder/upcoming/malicious_malfunction.txt b/forge-gui/res/cardsfolder/m/malicious_malfunction.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/malicious_malfunction.txt rename to forge-gui/res/cardsfolder/m/malicious_malfunction.txt diff --git a/forge-gui/res/cardsfolder/upcoming/march_of_burgeoning_life.txt b/forge-gui/res/cardsfolder/m/march_of_burgeoning_life.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/march_of_burgeoning_life.txt rename to forge-gui/res/cardsfolder/m/march_of_burgeoning_life.txt diff --git a/forge-gui/res/cardsfolder/upcoming/march_of_otherworldly_light.txt b/forge-gui/res/cardsfolder/m/march_of_otherworldly_light.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/march_of_otherworldly_light.txt rename to forge-gui/res/cardsfolder/m/march_of_otherworldly_light.txt diff --git a/forge-gui/res/cardsfolder/upcoming/march_of_reckless_joy.txt b/forge-gui/res/cardsfolder/m/march_of_reckless_joy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/march_of_reckless_joy.txt rename to forge-gui/res/cardsfolder/m/march_of_reckless_joy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/march_of_swirling_mist.txt b/forge-gui/res/cardsfolder/m/march_of_swirling_mist.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/march_of_swirling_mist.txt rename to forge-gui/res/cardsfolder/m/march_of_swirling_mist.txt diff --git a/forge-gui/res/cardsfolder/upcoming/march_of_wretched_sorrow.txt b/forge-gui/res/cardsfolder/m/march_of_wretched_sorrow.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/march_of_wretched_sorrow.txt rename to forge-gui/res/cardsfolder/m/march_of_wretched_sorrow.txt diff --git a/forge-gui/res/cardsfolder/upcoming/masters_rebuke.txt b/forge-gui/res/cardsfolder/m/masters_rebuke.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/masters_rebuke.txt rename to forge-gui/res/cardsfolder/m/masters_rebuke.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mech_hangar.txt b/forge-gui/res/cardsfolder/m/mech_hangar.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mech_hangar.txt rename to forge-gui/res/cardsfolder/m/mech_hangar.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mechtitan_core.txt b/forge-gui/res/cardsfolder/m/mechtitan_core.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mechtitan_core.txt rename to forge-gui/res/cardsfolder/m/mechtitan_core.txt diff --git a/forge-gui/res/cardsfolder/upcoming/michikos_reign_of_truth_portrait_of_michiko.txt b/forge-gui/res/cardsfolder/m/michikos_reign_of_truth_portrait_of_michiko.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/michikos_reign_of_truth_portrait_of_michiko.txt rename to forge-gui/res/cardsfolder/m/michikos_reign_of_truth_portrait_of_michiko.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mindlink_mech.txt b/forge-gui/res/cardsfolder/m/mindlink_mech.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mindlink_mech.txt rename to forge-gui/res/cardsfolder/m/mindlink_mech.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mirror_box.txt b/forge-gui/res/cardsfolder/m/mirror_box.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mirror_box.txt rename to forge-gui/res/cardsfolder/m/mirror_box.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mirrorshell_crab.txt b/forge-gui/res/cardsfolder/m/mirrorshell_crab.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mirrorshell_crab.txt rename to forge-gui/res/cardsfolder/m/mirrorshell_crab.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mnemonic_sphere.txt b/forge-gui/res/cardsfolder/m/mnemonic_sphere.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mnemonic_sphere.txt rename to forge-gui/res/cardsfolder/m/mnemonic_sphere.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mobilizer_mech.txt b/forge-gui/res/cardsfolder/m/mobilizer_mech.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mobilizer_mech.txt rename to forge-gui/res/cardsfolder/m/mobilizer_mech.txt diff --git a/forge-gui/res/cardsfolder/upcoming/moon_circuit_hacker.txt b/forge-gui/res/cardsfolder/m/moon_circuit_hacker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/moon_circuit_hacker.txt rename to forge-gui/res/cardsfolder/m/moon_circuit_hacker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/moonfolk_puzzlemaker.txt b/forge-gui/res/cardsfolder/m/moonfolk_puzzlemaker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/moonfolk_puzzlemaker.txt rename to forge-gui/res/cardsfolder/m/moonfolk_puzzlemaker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/moonsnare_prototype.txt b/forge-gui/res/cardsfolder/m/moonsnare_prototype.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/moonsnare_prototype.txt rename to forge-gui/res/cardsfolder/m/moonsnare_prototype.txt diff --git a/forge-gui/res/cardsfolder/upcoming/moonsnare_specialist.txt b/forge-gui/res/cardsfolder/m/moonsnare_specialist.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/moonsnare_specialist.txt rename to forge-gui/res/cardsfolder/m/moonsnare_specialist.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mothrider_patrol.txt b/forge-gui/res/cardsfolder/m/mothrider_patrol.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mothrider_patrol.txt rename to forge-gui/res/cardsfolder/m/mothrider_patrol.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mukotai_ambusher.txt b/forge-gui/res/cardsfolder/m/mukotai_ambusher.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mukotai_ambusher.txt rename to forge-gui/res/cardsfolder/m/mukotai_ambusher.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mukotai_soulripper.txt b/forge-gui/res/cardsfolder/m/mukotai_soulripper.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mukotai_soulripper.txt rename to forge-gui/res/cardsfolder/m/mukotai_soulripper.txt diff --git a/forge-gui/res/cardsfolder/upcoming/myojin_of_blooming_dawn.txt b/forge-gui/res/cardsfolder/m/myojin_of_blooming_dawn.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/myojin_of_blooming_dawn.txt rename to forge-gui/res/cardsfolder/m/myojin_of_blooming_dawn.txt diff --git a/forge-gui/res/cardsfolder/upcoming/myojin_of_cryptic_dreams.txt b/forge-gui/res/cardsfolder/m/myojin_of_cryptic_dreams.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/myojin_of_cryptic_dreams.txt rename to forge-gui/res/cardsfolder/m/myojin_of_cryptic_dreams.txt diff --git a/forge-gui/res/cardsfolder/upcoming/myojin_of_grim_betrayal.txt b/forge-gui/res/cardsfolder/m/myojin_of_grim_betrayal.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/myojin_of_grim_betrayal.txt rename to forge-gui/res/cardsfolder/m/myojin_of_grim_betrayal.txt diff --git a/forge-gui/res/cardsfolder/upcoming/myojin_of_roaring_blades.txt b/forge-gui/res/cardsfolder/m/myojin_of_roaring_blades.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/myojin_of_roaring_blades.txt rename to forge-gui/res/cardsfolder/m/myojin_of_roaring_blades.txt diff --git a/forge-gui/res/cardsfolder/upcoming/myojin_of_towering_might.txt b/forge-gui/res/cardsfolder/m/myojin_of_towering_might.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/myojin_of_towering_might.txt rename to forge-gui/res/cardsfolder/m/myojin_of_towering_might.txt diff --git a/forge-gui/res/cardsfolder/upcoming/naomi_pillar_of_order.txt b/forge-gui/res/cardsfolder/n/naomi_pillar_of_order.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/naomi_pillar_of_order.txt rename to forge-gui/res/cardsfolder/n/naomi_pillar_of_order.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nashi_moon_sages_scion.txt b/forge-gui/res/cardsfolder/n/nashi_moon_sages_scion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nashi_moon_sages_scion.txt rename to forge-gui/res/cardsfolder/n/nashi_moon_sages_scion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/network_disruptor.txt b/forge-gui/res/cardsfolder/n/network_disruptor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/network_disruptor.txt rename to forge-gui/res/cardsfolder/n/network_disruptor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/network_terminal.txt b/forge-gui/res/cardsfolder/n/network_terminal.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/network_terminal.txt rename to forge-gui/res/cardsfolder/n/network_terminal.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nezumi_bladeblesser.txt b/forge-gui/res/cardsfolder/n/nezumi_bladeblesser.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nezumi_bladeblesser.txt rename to forge-gui/res/cardsfolder/n/nezumi_bladeblesser.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nezumi_prowler.txt b/forge-gui/res/cardsfolder/n/nezumi_prowler.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nezumi_prowler.txt rename to forge-gui/res/cardsfolder/n/nezumi_prowler.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ninjas_kunai.txt b/forge-gui/res/cardsfolder/n/ninjas_kunai.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ninjas_kunai.txt rename to forge-gui/res/cardsfolder/n/ninjas_kunai.txt diff --git a/forge-gui/res/cardsfolder/upcoming/norika_yamazaki_the_poet.txt b/forge-gui/res/cardsfolder/n/norika_yamazaki_the_poet.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/norika_yamazaki_the_poet.txt rename to forge-gui/res/cardsfolder/n/norika_yamazaki_the_poet.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ogre_head_helm.txt b/forge-gui/res/cardsfolder/o/ogre_head_helm.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ogre_head_helm.txt rename to forge-gui/res/cardsfolder/o/ogre_head_helm.txt diff --git a/forge-gui/res/cardsfolder/upcoming/okiba_reckoner_raid_nezumi_road_captain.txt b/forge-gui/res/cardsfolder/o/okiba_reckoner_raid_nezumi_road_captain.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/okiba_reckoner_raid_nezumi_road_captain.txt rename to forge-gui/res/cardsfolder/o/okiba_reckoner_raid_nezumi_road_captain.txt diff --git a/forge-gui/res/cardsfolder/upcoming/okiba_salvage.txt b/forge-gui/res/cardsfolder/o/okiba_salvage.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/okiba_salvage.txt rename to forge-gui/res/cardsfolder/o/okiba_salvage.txt diff --git a/forge-gui/res/cardsfolder/upcoming/one_with_the_kami.txt b/forge-gui/res/cardsfolder/o/one_with_the_kami.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/one_with_the_kami.txt rename to forge-gui/res/cardsfolder/o/one_with_the_kami.txt diff --git a/forge-gui/res/cardsfolder/upcoming/oni_cult_anvil.txt b/forge-gui/res/cardsfolder/o/oni_cult_anvil.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/oni_cult_anvil.txt rename to forge-gui/res/cardsfolder/o/oni_cult_anvil.txt diff --git a/forge-gui/res/cardsfolder/upcoming/organic_extinction.txt b/forge-gui/res/cardsfolder/o/organic_extinction.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/organic_extinction.txt rename to forge-gui/res/cardsfolder/o/organic_extinction.txt diff --git a/forge-gui/res/cardsfolder/upcoming/orochi_merge_keeper.txt b/forge-gui/res/cardsfolder/o/orochi_merge_keeper.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/orochi_merge_keeper.txt rename to forge-gui/res/cardsfolder/o/orochi_merge_keeper.txt diff --git a/forge-gui/res/cardsfolder/upcoming/otawara_soaring_city.txt b/forge-gui/res/cardsfolder/o/otawara_soaring_city.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/otawara_soaring_city.txt rename to forge-gui/res/cardsfolder/o/otawara_soaring_city.txt diff --git a/forge-gui/res/cardsfolder/upcoming/papercraft_decoy.txt b/forge-gui/res/cardsfolder/p/papercraft_decoy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/papercraft_decoy.txt rename to forge-gui/res/cardsfolder/p/papercraft_decoy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/patchwork_automaton.txt b/forge-gui/res/cardsfolder/p/patchwork_automaton.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/patchwork_automaton.txt rename to forge-gui/res/cardsfolder/p/patchwork_automaton.txt diff --git a/forge-gui/res/cardsfolder/upcoming/peerless_samurai.txt b/forge-gui/res/cardsfolder/p/peerless_samurai.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/peerless_samurai.txt rename to forge-gui/res/cardsfolder/p/peerless_samurai.txt diff --git a/forge-gui/res/cardsfolder/upcoming/planar_incision.txt b/forge-gui/res/cardsfolder/p/planar_incision.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/planar_incision.txt rename to forge-gui/res/cardsfolder/p/planar_incision.txt diff --git a/forge-gui/res/cardsfolder/upcoming/prodigys_prototype.txt b/forge-gui/res/cardsfolder/p/prodigys_prototype.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/prodigys_prototype.txt rename to forge-gui/res/cardsfolder/p/prodigys_prototype.txt diff --git a/forge-gui/res/cardsfolder/upcoming/prosperous_thief.txt b/forge-gui/res/cardsfolder/p/prosperous_thief.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/prosperous_thief.txt rename to forge-gui/res/cardsfolder/p/prosperous_thief.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rabbit_battery.txt b/forge-gui/res/cardsfolder/r/rabbit_battery.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/rabbit_battery.txt rename to forge-gui/res/cardsfolder/r/rabbit_battery.txt diff --git a/forge-gui/res/cardsfolder/upcoming/raiyuu_storms_edge.txt b/forge-gui/res/cardsfolder/r/raiyuu_storms_edge.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/raiyuu_storms_edge.txt rename to forge-gui/res/cardsfolder/r/raiyuu_storms_edge.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rampant_rejuvenator.txt b/forge-gui/res/cardsfolder/r/rampant_rejuvenator.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/rampant_rejuvenator.txt rename to forge-gui/res/cardsfolder/r/rampant_rejuvenator.txt diff --git a/forge-gui/res/cardsfolder/upcoming/reality_heist.txt b/forge-gui/res/cardsfolder/r/reality_heist.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/reality_heist.txt rename to forge-gui/res/cardsfolder/r/reality_heist.txt diff --git a/forge-gui/res/cardsfolder/upcoming/reckoner_bankbuster.txt b/forge-gui/res/cardsfolder/r/reckoner_bankbuster.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/reckoner_bankbuster.txt rename to forge-gui/res/cardsfolder/r/reckoner_bankbuster.txt diff --git a/forge-gui/res/cardsfolder/upcoming/reckoner_shakedown.txt b/forge-gui/res/cardsfolder/r/reckoner_shakedown.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/reckoner_shakedown.txt rename to forge-gui/res/cardsfolder/r/reckoner_shakedown.txt diff --git a/forge-gui/res/cardsfolder/upcoming/reckoners_bargain.txt b/forge-gui/res/cardsfolder/r/reckoners_bargain.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/reckoners_bargain.txt rename to forge-gui/res/cardsfolder/r/reckoners_bargain.txt diff --git a/forge-gui/res/cardsfolder/upcoming/regents_authority.txt b/forge-gui/res/cardsfolder/r/regents_authority.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/regents_authority.txt rename to forge-gui/res/cardsfolder/r/regents_authority.txt diff --git a/forge-gui/res/cardsfolder/upcoming/reinforced_ronin.txt b/forge-gui/res/cardsfolder/r/reinforced_ronin.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/reinforced_ronin.txt rename to forge-gui/res/cardsfolder/r/reinforced_ronin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/reito_sentinel.txt b/forge-gui/res/cardsfolder/r/reito_sentinel.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/reito_sentinel.txt rename to forge-gui/res/cardsfolder/r/reito_sentinel.txt diff --git a/forge-gui/res/cardsfolder/upcoming/release_to_memory.txt b/forge-gui/res/cardsfolder/r/release_to_memory.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/release_to_memory.txt rename to forge-gui/res/cardsfolder/r/release_to_memory.txt diff --git a/forge-gui/res/cardsfolder/upcoming/repel_the_vile.txt b/forge-gui/res/cardsfolder/r/repel_the_vile.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/repel_the_vile.txt rename to forge-gui/res/cardsfolder/r/repel_the_vile.txt diff --git a/forge-gui/res/cardsfolder/upcoming/replication_specialist.txt b/forge-gui/res/cardsfolder/r/replication_specialist.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/replication_specialist.txt rename to forge-gui/res/cardsfolder/r/replication_specialist.txt diff --git a/forge-gui/res/cardsfolder/upcoming/research_thief.txt b/forge-gui/res/cardsfolder/r/research_thief.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/research_thief.txt rename to forge-gui/res/cardsfolder/r/research_thief.txt diff --git a/forge-gui/res/cardsfolder/upcoming/return_to_action.txt b/forge-gui/res/cardsfolder/r/return_to_action.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/return_to_action.txt rename to forge-gui/res/cardsfolder/r/return_to_action.txt diff --git a/forge-gui/res/cardsfolder/upcoming/risona_asari_commander.txt b/forge-gui/res/cardsfolder/r/risona_asari_commander.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/risona_asari_commander.txt rename to forge-gui/res/cardsfolder/r/risona_asari_commander.txt diff --git a/forge-gui/res/cardsfolder/upcoming/roadside_reliquary.txt b/forge-gui/res/cardsfolder/r/roadside_reliquary.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/roadside_reliquary.txt rename to forge-gui/res/cardsfolder/r/roadside_reliquary.txt diff --git a/forge-gui/res/cardsfolder/upcoming/roaring_earth.txt b/forge-gui/res/cardsfolder/r/roaring_earth.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/roaring_earth.txt rename to forge-gui/res/cardsfolder/r/roaring_earth.txt diff --git a/forge-gui/res/cardsfolder/upcoming/runaway_trash_bot.txt b/forge-gui/res/cardsfolder/r/runaway_trash_bot.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/runaway_trash_bot.txt rename to forge-gui/res/cardsfolder/r/runaway_trash_bot.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ruthless_technomancer.txt b/forge-gui/res/cardsfolder/r/ruthless_technomancer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ruthless_technomancer.txt rename to forge-gui/res/cardsfolder/r/ruthless_technomancer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/saiba_trespassers.txt b/forge-gui/res/cardsfolder/s/saiba_trespassers.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/saiba_trespassers.txt rename to forge-gui/res/cardsfolder/s/saiba_trespassers.txt diff --git a/forge-gui/res/cardsfolder/upcoming/satoru_umezawa.txt b/forge-gui/res/cardsfolder/s/satoru_umezawa.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/satoru_umezawa.txt rename to forge-gui/res/cardsfolder/s/satoru_umezawa.txt diff --git a/forge-gui/res/cardsfolder/upcoming/satsuki_the_living_lore.txt b/forge-gui/res/cardsfolder/s/satsuki_the_living_lore.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/satsuki_the_living_lore.txt rename to forge-gui/res/cardsfolder/s/satsuki_the_living_lore.txt diff --git a/forge-gui/res/cardsfolder/upcoming/scrap_welder.txt b/forge-gui/res/cardsfolder/s/scrap_welder.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/scrap_welder.txt rename to forge-gui/res/cardsfolder/s/scrap_welder.txt diff --git a/forge-gui/res/cardsfolder/upcoming/scrapyard_steelbreaker.txt b/forge-gui/res/cardsfolder/s/scrapyard_steelbreaker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/scrapyard_steelbreaker.txt rename to forge-gui/res/cardsfolder/s/scrapyard_steelbreaker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/searchlight_companion.txt b/forge-gui/res/cardsfolder/s/searchlight_companion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/searchlight_companion.txt rename to forge-gui/res/cardsfolder/s/searchlight_companion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/season_of_renewal.txt b/forge-gui/res/cardsfolder/s/season_of_renewal.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/season_of_renewal.txt rename to forge-gui/res/cardsfolder/s/season_of_renewal.txt diff --git a/forge-gui/res/cardsfolder/upcoming/secluded_courtyard.txt b/forge-gui/res/cardsfolder/s/secluded_courtyard.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/secluded_courtyard.txt rename to forge-gui/res/cardsfolder/s/secluded_courtyard.txt diff --git a/forge-gui/res/cardsfolder/upcoming/seismic_wave.txt b/forge-gui/res/cardsfolder/s/seismic_wave.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/seismic_wave.txt rename to forge-gui/res/cardsfolder/s/seismic_wave.txt diff --git a/forge-gui/res/cardsfolder/upcoming/selfless_samurai.txt b/forge-gui/res/cardsfolder/s/selfless_samurai.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/selfless_samurai.txt rename to forge-gui/res/cardsfolder/s/selfless_samurai.txt diff --git a/forge-gui/res/cardsfolder/upcoming/seven_tail_mentor.txt b/forge-gui/res/cardsfolder/s/seven_tail_mentor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/seven_tail_mentor.txt rename to forge-gui/res/cardsfolder/s/seven_tail_mentor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shigeki_jukai_visionary.txt b/forge-gui/res/cardsfolder/s/shigeki_jukai_visionary.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/shigeki_jukai_visionary.txt rename to forge-gui/res/cardsfolder/s/shigeki_jukai_visionary.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shorikai_genesis_engine.txt b/forge-gui/res/cardsfolder/s/shorikai_genesis_engine.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/shorikai_genesis_engine.txt rename to forge-gui/res/cardsfolder/s/shorikai_genesis_engine.txt diff --git a/forge-gui/res/cardsfolder/upcoming/short_circuit.txt b/forge-gui/res/cardsfolder/s/short_circuit.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/short_circuit.txt rename to forge-gui/res/cardsfolder/s/short_circuit.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shrine_steward.txt b/forge-gui/res/cardsfolder/s/shrine_steward.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/shrine_steward.txt rename to forge-gui/res/cardsfolder/s/shrine_steward.txt diff --git a/forge-gui/res/cardsfolder/upcoming/silkguard.txt b/forge-gui/res/cardsfolder/s/silkguard.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/silkguard.txt rename to forge-gui/res/cardsfolder/s/silkguard.txt diff --git a/forge-gui/res/cardsfolder/upcoming/silver_fur_master.txt b/forge-gui/res/cardsfolder/s/silver_fur_master.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/silver_fur_master.txt rename to forge-gui/res/cardsfolder/s/silver_fur_master.txt diff --git a/forge-gui/res/cardsfolder/upcoming/simian_sling.txt b/forge-gui/res/cardsfolder/s/simian_sling.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/simian_sling.txt rename to forge-gui/res/cardsfolder/s/simian_sling.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sky_blessed_samurai.txt b/forge-gui/res/cardsfolder/s/sky_blessed_samurai.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sky_blessed_samurai.txt rename to forge-gui/res/cardsfolder/s/sky_blessed_samurai.txt diff --git a/forge-gui/res/cardsfolder/upcoming/skyswimmer_koi.txt b/forge-gui/res/cardsfolder/s/skyswimmer_koi.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/skyswimmer_koi.txt rename to forge-gui/res/cardsfolder/s/skyswimmer_koi.txt diff --git a/forge-gui/res/cardsfolder/upcoming/smoke_spirits_aid.txt b/forge-gui/res/cardsfolder/s/smoke_spirits_aid.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/smoke_spirits_aid.txt rename to forge-gui/res/cardsfolder/s/smoke_spirits_aid.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sokenzan_crucible_of_defiance.txt b/forge-gui/res/cardsfolder/s/sokenzan_crucible_of_defiance.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sokenzan_crucible_of_defiance.txt rename to forge-gui/res/cardsfolder/s/sokenzan_crucible_of_defiance.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sokenzan_smelter.txt b/forge-gui/res/cardsfolder/s/sokenzan_smelter.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sokenzan_smelter.txt rename to forge-gui/res/cardsfolder/s/sokenzan_smelter.txt diff --git a/forge-gui/res/cardsfolder/upcoming/soul_transfer.txt b/forge-gui/res/cardsfolder/s/soul_transfer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/soul_transfer.txt rename to forge-gui/res/cardsfolder/s/soul_transfer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/spinning_wheel_kick.txt b/forge-gui/res/cardsfolder/s/spinning_wheel_kick.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/spinning_wheel_kick.txt rename to forge-gui/res/cardsfolder/s/spinning_wheel_kick.txt diff --git a/forge-gui/res/cardsfolder/upcoming/spirit_sisters_call.txt b/forge-gui/res/cardsfolder/s/spirit_sisters_call.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/spirit_sisters_call.txt rename to forge-gui/res/cardsfolder/s/spirit_sisters_call.txt diff --git a/forge-gui/res/cardsfolder/upcoming/spirited_companion.txt b/forge-gui/res/cardsfolder/s/spirited_companion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/spirited_companion.txt rename to forge-gui/res/cardsfolder/s/spirited_companion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/spring_leaf_avenger.txt b/forge-gui/res/cardsfolder/s/spring_leaf_avenger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/spring_leaf_avenger.txt rename to forge-gui/res/cardsfolder/s/spring_leaf_avenger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/storyweave.txt b/forge-gui/res/cardsfolder/s/storyweave.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/storyweave.txt rename to forge-gui/res/cardsfolder/s/storyweave.txt diff --git a/forge-gui/res/cardsfolder/upcoming/suit_up.txt b/forge-gui/res/cardsfolder/s/suit_up.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/suit_up.txt rename to forge-gui/res/cardsfolder/s/suit_up.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sunblade_samurai.txt b/forge-gui/res/cardsfolder/s/sunblade_samurai.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sunblade_samurai.txt rename to forge-gui/res/cardsfolder/s/sunblade_samurai.txt diff --git a/forge-gui/res/cardsfolder/upcoming/surgehacker_mech.txt b/forge-gui/res/cardsfolder/s/surgehacker_mech.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/surgehacker_mech.txt rename to forge-gui/res/cardsfolder/s/surgehacker_mech.txt diff --git a/forge-gui/res/cardsfolder/upcoming/swift_reconfiguration.txt b/forge-gui/res/cardsfolder/s/swift_reconfiguration.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/swift_reconfiguration.txt rename to forge-gui/res/cardsfolder/s/swift_reconfiguration.txt diff --git a/forge-gui/res/cardsfolder/upcoming/takenuma_abandoned_mire.txt b/forge-gui/res/cardsfolder/t/takenuma_abandoned_mire.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/takenuma_abandoned_mire.txt rename to forge-gui/res/cardsfolder/t/takenuma_abandoned_mire.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tales_of_master_seshiro_seshiros_living_legacy.txt b/forge-gui/res/cardsfolder/t/tales_of_master_seshiro_seshiros_living_legacy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tales_of_master_seshiro_seshiros_living_legacy.txt rename to forge-gui/res/cardsfolder/t/tales_of_master_seshiro_seshiros_living_legacy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tameshi_reality_architect.txt b/forge-gui/res/cardsfolder/t/tameshi_reality_architect.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tameshi_reality_architect.txt rename to forge-gui/res/cardsfolder/t/tameshi_reality_architect.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tamiyo_compleated_sage.txt b/forge-gui/res/cardsfolder/t/tamiyo_compleated_sage.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tamiyo_compleated_sage.txt rename to forge-gui/res/cardsfolder/t/tamiyo_compleated_sage.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tamiyos_compleation.txt b/forge-gui/res/cardsfolder/t/tamiyos_compleation.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tamiyos_compleation.txt rename to forge-gui/res/cardsfolder/t/tamiyos_compleation.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tamiyos_safekeeping.txt b/forge-gui/res/cardsfolder/t/tamiyos_safekeeping.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tamiyos_safekeeping.txt rename to forge-gui/res/cardsfolder/t/tamiyos_safekeeping.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tanuki_transplanter.txt b/forge-gui/res/cardsfolder/t/tanuki_transplanter.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tanuki_transplanter.txt rename to forge-gui/res/cardsfolder/t/tanuki_transplanter.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tatsunari_toad_rider.txt b/forge-gui/res/cardsfolder/t/tatsunari_toad_rider.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tatsunari_toad_rider.txt rename to forge-gui/res/cardsfolder/t/tatsunari_toad_rider.txt diff --git a/forge-gui/res/cardsfolder/upcoming/teachings_of_the_kirin_kirin_touched_orochi.txt b/forge-gui/res/cardsfolder/t/teachings_of_the_kirin_kirin_touched_orochi.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/teachings_of_the_kirin_kirin_touched_orochi.txt rename to forge-gui/res/cardsfolder/t/teachings_of_the_kirin_kirin_touched_orochi.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tempered_in_solitude.txt b/forge-gui/res/cardsfolder/t/tempered_in_solitude.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tempered_in_solitude.txt rename to forge-gui/res/cardsfolder/t/tempered_in_solitude.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tezzeret_betrayer_of_flesh.txt b/forge-gui/res/cardsfolder/t/tezzeret_betrayer_of_flesh.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tezzeret_betrayer_of_flesh.txt rename to forge-gui/res/cardsfolder/t/tezzeret_betrayer_of_flesh.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_dragon_kami_reborn_dragon_kamis_egg.txt b/forge-gui/res/cardsfolder/t/the_dragon_kami_reborn_dragon_kamis_egg.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_dragon_kami_reborn_dragon_kamis_egg.txt rename to forge-gui/res/cardsfolder/t/the_dragon_kami_reborn_dragon_kamis_egg.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_fall_of_lord_konda_fragment_of_konda.txt b/forge-gui/res/cardsfolder/t/the_fall_of_lord_konda_fragment_of_konda.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_fall_of_lord_konda_fragment_of_konda.txt rename to forge-gui/res/cardsfolder/t/the_fall_of_lord_konda_fragment_of_konda.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_kami_war_o_kagachi_made_manifest.txt b/forge-gui/res/cardsfolder/t/the_kami_war_o_kagachi_made_manifest.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_kami_war_o_kagachi_made_manifest.txt rename to forge-gui/res/cardsfolder/t/the_kami_war_o_kagachi_made_manifest.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_long_reach_of_night_animus_of_nights_reach.txt b/forge-gui/res/cardsfolder/t/the_long_reach_of_night_animus_of_nights_reach.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_long_reach_of_night_animus_of_nights_reach.txt rename to forge-gui/res/cardsfolder/t/the_long_reach_of_night_animus_of_nights_reach.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_modern_age_vector_glider.txt b/forge-gui/res/cardsfolder/t/the_modern_age_vector_glider.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_modern_age_vector_glider.txt rename to forge-gui/res/cardsfolder/t/the_modern_age_vector_glider.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_reality_chip.txt b/forge-gui/res/cardsfolder/t/the_reality_chip.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_reality_chip.txt rename to forge-gui/res/cardsfolder/t/the_reality_chip.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_restoration_of_eiganjo_architect_of_restoration.txt b/forge-gui/res/cardsfolder/t/the_restoration_of_eiganjo_architect_of_restoration.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_restoration_of_eiganjo_architect_of_restoration.txt rename to forge-gui/res/cardsfolder/t/the_restoration_of_eiganjo_architect_of_restoration.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_shattered_states_era_nameless_conqueror.txt b/forge-gui/res/cardsfolder/t/the_shattered_states_era_nameless_conqueror.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_shattered_states_era_nameless_conqueror.txt rename to forge-gui/res/cardsfolder/t/the_shattered_states_era_nameless_conqueror.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_wandering_emperor.txt b/forge-gui/res/cardsfolder/t/the_wandering_emperor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_wandering_emperor.txt rename to forge-gui/res/cardsfolder/t/the_wandering_emperor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thousand_faced_shadow.txt b/forge-gui/res/cardsfolder/t/thousand_faced_shadow.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thousand_faced_shadow.txt rename to forge-gui/res/cardsfolder/t/thousand_faced_shadow.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thundering_raiju.txt b/forge-gui/res/cardsfolder/t/thundering_raiju.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thundering_raiju.txt rename to forge-gui/res/cardsfolder/t/thundering_raiju.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thundersteel_colossus.txt b/forge-gui/res/cardsfolder/t/thundersteel_colossus.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thundersteel_colossus.txt rename to forge-gui/res/cardsfolder/t/thundersteel_colossus.txt diff --git a/forge-gui/res/cardsfolder/upcoming/touch_the_spirit_realm.txt b/forge-gui/res/cardsfolder/t/touch_the_spirit_realm.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/touch_the_spirit_realm.txt rename to forge-gui/res/cardsfolder/t/touch_the_spirit_realm.txt diff --git a/forge-gui/res/cardsfolder/upcoming/towashi_guide_bot.txt b/forge-gui/res/cardsfolder/t/towashi_guide_bot.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/towashi_guide_bot.txt rename to forge-gui/res/cardsfolder/t/towashi_guide_bot.txt diff --git a/forge-gui/res/cardsfolder/upcoming/towashi_songshaper.txt b/forge-gui/res/cardsfolder/t/towashi_songshaper.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/towashi_songshaper.txt rename to forge-gui/res/cardsfolder/t/towashi_songshaper.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tribute_to_horobi_echo_of_deaths_wail.txt b/forge-gui/res/cardsfolder/t/tribute_to_horobi_echo_of_deaths_wail.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tribute_to_horobi_echo_of_deaths_wail.txt rename to forge-gui/res/cardsfolder/t/tribute_to_horobi_echo_of_deaths_wail.txt diff --git a/forge-gui/res/cardsfolder/upcoming/twinshot_sniper.txt b/forge-gui/res/cardsfolder/t/twinshot_sniper.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/twinshot_sniper.txt rename to forge-gui/res/cardsfolder/t/twinshot_sniper.txt diff --git a/forge-gui/res/cardsfolder/upcoming/twisted_embrace.txt b/forge-gui/res/cardsfolder/t/twisted_embrace.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/twisted_embrace.txt rename to forge-gui/res/cardsfolder/t/twisted_embrace.txt diff --git a/forge-gui/res/cardsfolder/upcoming/uncharted_haven.txt b/forge-gui/res/cardsfolder/u/uncharted_haven.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/uncharted_haven.txt rename to forge-gui/res/cardsfolder/u/uncharted_haven.txt diff --git a/forge-gui/res/cardsfolder/upcoming/undercity_scrounger.txt b/forge-gui/res/cardsfolder/u/undercity_scrounger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/undercity_scrounger.txt rename to forge-gui/res/cardsfolder/u/undercity_scrounger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/unforgiving_one.txt b/forge-gui/res/cardsfolder/u/unforgiving_one.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/unforgiving_one.txt rename to forge-gui/res/cardsfolder/u/unforgiving_one.txt diff --git a/forge-gui/res/cardsfolder/upcoming/universal_surveillance.txt b/forge-gui/res/cardsfolder/u/universal_surveillance.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/universal_surveillance.txt rename to forge-gui/res/cardsfolder/u/universal_surveillance.txt diff --git a/forge-gui/res/cardsfolder/upcoming/unquenchable_fury.txt b/forge-gui/res/cardsfolder/u/unquenchable_fury.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/unquenchable_fury.txt rename to forge-gui/res/cardsfolder/u/unquenchable_fury.txt diff --git a/forge-gui/res/cardsfolder/upcoming/unstoppable_ogre.txt b/forge-gui/res/cardsfolder/u/unstoppable_ogre.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/unstoppable_ogre.txt rename to forge-gui/res/cardsfolder/u/unstoppable_ogre.txt diff --git a/forge-gui/res/cardsfolder/upcoming/upriser_renegade.txt b/forge-gui/res/cardsfolder/u/upriser_renegade.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/upriser_renegade.txt rename to forge-gui/res/cardsfolder/u/upriser_renegade.txt diff --git a/forge-gui/res/cardsfolder/upcoming/virus_beetle.txt b/forge-gui/res/cardsfolder/v/virus_beetle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/virus_beetle.txt rename to forge-gui/res/cardsfolder/v/virus_beetle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/voltage_surge.txt b/forge-gui/res/cardsfolder/v/voltage_surge.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/voltage_surge.txt rename to forge-gui/res/cardsfolder/v/voltage_surge.txt diff --git a/forge-gui/res/cardsfolder/upcoming/walking_skyscraper.txt b/forge-gui/res/cardsfolder/w/walking_skyscraper.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/walking_skyscraper.txt rename to forge-gui/res/cardsfolder/w/walking_skyscraper.txt diff --git a/forge-gui/res/cardsfolder/upcoming/wanderers_intervention.txt b/forge-gui/res/cardsfolder/w/wanderers_intervention.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/wanderers_intervention.txt rename to forge-gui/res/cardsfolder/w/wanderers_intervention.txt diff --git a/forge-gui/res/cardsfolder/upcoming/weaver_of_harmony.txt b/forge-gui/res/cardsfolder/w/weaver_of_harmony.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/weaver_of_harmony.txt rename to forge-gui/res/cardsfolder/w/weaver_of_harmony.txt diff --git a/forge-gui/res/cardsfolder/upcoming/webspinner_cuff.txt b/forge-gui/res/cardsfolder/w/webspinner_cuff.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/webspinner_cuff.txt rename to forge-gui/res/cardsfolder/w/webspinner_cuff.txt diff --git a/forge-gui/res/cardsfolder/upcoming/when_we_were_young.txt b/forge-gui/res/cardsfolder/w/when_we_were_young.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/when_we_were_young.txt rename to forge-gui/res/cardsfolder/w/when_we_were_young.txt diff --git a/forge-gui/res/cardsfolder/upcoming/yoshimaru_ever_faithful.txt b/forge-gui/res/cardsfolder/y/yoshimaru_ever_faithful.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/yoshimaru_ever_faithful.txt rename to forge-gui/res/cardsfolder/y/yoshimaru_ever_faithful.txt diff --git a/forge-gui/res/cardsfolder/upcoming/you_are_already_dead.txt b/forge-gui/res/cardsfolder/y/you_are_already_dead.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/you_are_already_dead.txt rename to forge-gui/res/cardsfolder/y/you_are_already_dead.txt