diff --git a/forge-gui/res/cardsfolder/upcoming/a_realm_reborn.txt b/forge-gui/res/cardsfolder/a/a_realm_reborn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/a_realm_reborn.txt
rename to forge-gui/res/cardsfolder/a/a_realm_reborn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/absolute_virtue.txt b/forge-gui/res/cardsfolder/a/absolute_virtue.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/absolute_virtue.txt
rename to forge-gui/res/cardsfolder/a/absolute_virtue.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/adelbert_steiner.txt b/forge-gui/res/cardsfolder/a/adelbert_steiner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/adelbert_steiner.txt
rename to forge-gui/res/cardsfolder/a/adelbert_steiner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/adventurers_airship.txt b/forge-gui/res/cardsfolder/a/adventurers_airship.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/adventurers_airship.txt
rename to forge-gui/res/cardsfolder/a/adventurers_airship.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/adventurers_inn.txt b/forge-gui/res/cardsfolder/a/adventurers_inn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/adventurers_inn.txt
rename to forge-gui/res/cardsfolder/a/adventurers_inn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aerith_gainsborough.txt b/forge-gui/res/cardsfolder/a/aerith_gainsborough.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aerith_gainsborough.txt
rename to forge-gui/res/cardsfolder/a/aerith_gainsborough.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aerith_last_ancient.txt b/forge-gui/res/cardsfolder/a/aerith_last_ancient.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aerith_last_ancient.txt
rename to forge-gui/res/cardsfolder/a/aerith_last_ancient.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aerith_rescue_mission.txt b/forge-gui/res/cardsfolder/a/aerith_rescue_mission.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aerith_rescue_mission.txt
rename to forge-gui/res/cardsfolder/a/aerith_rescue_mission.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aettir_and_priwen.txt b/forge-gui/res/cardsfolder/a/aettir_and_priwen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aettir_and_priwen.txt
rename to forge-gui/res/cardsfolder/a/aettir_and_priwen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ahriman.txt b/forge-gui/res/cardsfolder/a/ahriman.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ahriman.txt
rename to forge-gui/res/cardsfolder/a/ahriman.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/airship_crash.txt b/forge-gui/res/cardsfolder/a/airship_crash.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/airship_crash.txt
rename to forge-gui/res/cardsfolder/a/airship_crash.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/al_bhed_salvagers.txt b/forge-gui/res/cardsfolder/a/al_bhed_salvagers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/al_bhed_salvagers.txt
rename to forge-gui/res/cardsfolder/a/al_bhed_salvagers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alisaie_leveilleur.txt b/forge-gui/res/cardsfolder/a/alisaie_leveilleur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alisaie_leveilleur.txt
rename to forge-gui/res/cardsfolder/a/alisaie_leveilleur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/alphinaud_leveilleur.txt b/forge-gui/res/cardsfolder/a/alphinaud_leveilleur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alphinaud_leveilleur.txt
rename to forge-gui/res/cardsfolder/a/alphinaud_leveilleur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/amber_plate_ainok.txt b/forge-gui/res/cardsfolder/a/amber_plate_ainok.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/amber_plate_ainok.txt
rename to forge-gui/res/cardsfolder/a/amber_plate_ainok.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ambrosia_whiteheart.txt b/forge-gui/res/cardsfolder/a/ambrosia_whiteheart.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ambrosia_whiteheart.txt
rename to forge-gui/res/cardsfolder/a/ambrosia_whiteheart.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ancient_adamantoise.txt b/forge-gui/res/cardsfolder/a/ancient_adamantoise.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ancient_adamantoise.txt
rename to forge-gui/res/cardsfolder/a/ancient_adamantoise.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ardbert_warrior_of_darkness.txt b/forge-gui/res/cardsfolder/a/ardbert_warrior_of_darkness.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ardbert_warrior_of_darkness.txt
rename to forge-gui/res/cardsfolder/a/ardbert_warrior_of_darkness.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ardyn_the_usurper.txt b/forge-gui/res/cardsfolder/a/ardyn_the_usurper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ardyn_the_usurper.txt
rename to forge-gui/res/cardsfolder/a/ardyn_the_usurper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ashe_princess_of_dalmasca.txt b/forge-gui/res/cardsfolder/a/ashe_princess_of_dalmasca.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ashe_princess_of_dalmasca.txt
rename to forge-gui/res/cardsfolder/a/ashe_princess_of_dalmasca.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/astrologians_planisphere.txt b/forge-gui/res/cardsfolder/a/astrologians_planisphere.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/astrologians_planisphere.txt
rename to forge-gui/res/cardsfolder/a/astrologians_planisphere.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/audacious_knuckleblade.txt b/forge-gui/res/cardsfolder/a/audacious_knuckleblade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/audacious_knuckleblade.txt
rename to forge-gui/res/cardsfolder/a/audacious_knuckleblade.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/auron_venerated_guardian.txt b/forge-gui/res/cardsfolder/a/auron_venerated_guardian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/auron_venerated_guardian.txt
rename to forge-gui/res/cardsfolder/a/auron_venerated_guardian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aurons_inspiration.txt b/forge-gui/res/cardsfolder/a/aurons_inspiration.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aurons_inspiration.txt
rename to forge-gui/res/cardsfolder/a/aurons_inspiration.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/avalanche_of_sector_7.txt b/forge-gui/res/cardsfolder/a/avalanche_of_sector_7.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/avalanche_of_sector_7.txt
rename to forge-gui/res/cardsfolder/a/avalanche_of_sector_7.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/balamb_garden_seed_academy_balamb_garden_airborne.txt b/forge-gui/res/cardsfolder/b/balamb_garden_seed_academy_balamb_garden_airborne.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/balamb_garden_seed_academy_balamb_garden_airborne.txt
rename to forge-gui/res/cardsfolder/b/balamb_garden_seed_academy_balamb_garden_airborne.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/balamb_t_rexaur.txt b/forge-gui/res/cardsfolder/b/balamb_t_rexaur.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/balamb_t_rexaur.txt
rename to forge-gui/res/cardsfolder/b/balamb_t_rexaur.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/balthier_and_fran.txt b/forge-gui/res/cardsfolder/b/balthier_and_fran.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/balthier_and_fran.txt
rename to forge-gui/res/cardsfolder/b/balthier_and_fran.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/banon_the_returners_leader.txt b/forge-gui/res/cardsfolder/b/banon_the_returners_leader.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/banon_the_returners_leader.txt
rename to forge-gui/res/cardsfolder/b/banon_the_returners_leader.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bards_bow.txt b/forge-gui/res/cardsfolder/b/bards_bow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bards_bow.txt
rename to forge-gui/res/cardsfolder/b/bards_bow.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/baron_airship_kingdom.txt b/forge-gui/res/cardsfolder/b/baron_airship_kingdom.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/baron_airship_kingdom.txt
rename to forge-gui/res/cardsfolder/b/baron_airship_kingdom.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/barret_avalanche_leader.txt b/forge-gui/res/cardsfolder/b/barret_avalanche_leader.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/barret_avalanche_leader.txt
rename to forge-gui/res/cardsfolder/b/barret_avalanche_leader.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/barret_wallace.txt b/forge-gui/res/cardsfolder/b/barret_wallace.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/barret_wallace.txt
rename to forge-gui/res/cardsfolder/b/barret_wallace.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bartz_and_boko.txt b/forge-gui/res/cardsfolder/b/bartz_and_boko.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bartz_and_boko.txt
rename to forge-gui/res/cardsfolder/b/bartz_and_boko.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/battle_menu.txt b/forge-gui/res/cardsfolder/b/battle_menu.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/battle_menu.txt
rename to forge-gui/res/cardsfolder/b/battle_menu.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/beatrix_loyal_general.txt b/forge-gui/res/cardsfolder/b/beatrix_loyal_general.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/beatrix_loyal_general.txt
rename to forge-gui/res/cardsfolder/b/beatrix_loyal_general.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/black_mages_rod.txt b/forge-gui/res/cardsfolder/b/black_mages_rod.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/black_mages_rod.txt
rename to forge-gui/res/cardsfolder/b/black_mages_rod.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/black_waltz_no_3.txt b/forge-gui/res/cardsfolder/b/black_waltz_no_3.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/black_waltz_no_3.txt
rename to forge-gui/res/cardsfolder/b/black_waltz_no_3.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blazing_bomb.txt b/forge-gui/res/cardsfolder/b/blazing_bomb.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blazing_bomb.txt
rename to forge-gui/res/cardsfolder/b/blazing_bomb.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blitzball.txt b/forge-gui/res/cardsfolder/b/blitzball.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blitzball.txt
rename to forge-gui/res/cardsfolder/b/blitzball.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blitzball_shot.txt b/forge-gui/res/cardsfolder/b/blitzball_shot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blitzball_shot.txt
rename to forge-gui/res/cardsfolder/b/blitzball_shot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blitzball_stadium.txt b/forge-gui/res/cardsfolder/b/blitzball_stadium.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blitzball_stadium.txt
rename to forge-gui/res/cardsfolder/b/blitzball_stadium.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/blue_mages_cane.txt b/forge-gui/res/cardsfolder/b/blue_mages_cane.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/blue_mages_cane.txt
rename to forge-gui/res/cardsfolder/b/blue_mages_cane.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bugenhagen_wise_elder.txt b/forge-gui/res/cardsfolder/b/bugenhagen_wise_elder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/bugenhagen_wise_elder.txt
rename to forge-gui/res/cardsfolder/b/bugenhagen_wise_elder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/buster_sword.txt b/forge-gui/res/cardsfolder/b/buster_sword.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/buster_sword.txt
rename to forge-gui/res/cardsfolder/b/buster_sword.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cactuar.txt b/forge-gui/res/cardsfolder/c/cactuar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cactuar.txt
rename to forge-gui/res/cardsfolder/c/cactuar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cait_sith_fortune_teller.txt b/forge-gui/res/cardsfolder/c/cait_sith_fortune_teller.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cait_sith_fortune_teller.txt
rename to forge-gui/res/cardsfolder/c/cait_sith_fortune_teller.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/call_the_crash.txt b/forge-gui/res/cardsfolder/c/call_the_crash.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/call_the_crash.txt
rename to forge-gui/res/cardsfolder/c/call_the_crash.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/call_the_mountain_chocobo.txt b/forge-gui/res/cardsfolder/c/call_the_mountain_chocobo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/call_the_mountain_chocobo.txt
rename to forge-gui/res/cardsfolder/c/call_the_mountain_chocobo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/capital_city.txt b/forge-gui/res/cardsfolder/c/capital_city.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/capital_city.txt
rename to forge-gui/res/cardsfolder/c/capital_city.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cargo_ship.txt b/forge-gui/res/cardsfolder/c/cargo_ship.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cargo_ship.txt
rename to forge-gui/res/cardsfolder/c/cargo_ship.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/champions_from_beyond.txt b/forge-gui/res/cardsfolder/c/champions_from_beyond.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/champions_from_beyond.txt
rename to forge-gui/res/cardsfolder/c/champions_from_beyond.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/choco_comet.txt b/forge-gui/res/cardsfolder/c/choco_comet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/choco_comet.txt
rename to forge-gui/res/cardsfolder/c/choco_comet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/choco_seeker_of_paradise.txt b/forge-gui/res/cardsfolder/c/choco_seeker_of_paradise.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/choco_seeker_of_paradise.txt
rename to forge-gui/res/cardsfolder/c/choco_seeker_of_paradise.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chocobo_kick.txt b/forge-gui/res/cardsfolder/c/chocobo_kick.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chocobo_kick.txt
rename to forge-gui/res/cardsfolder/c/chocobo_kick.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chocobo_knights.txt b/forge-gui/res/cardsfolder/c/chocobo_knights.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chocobo_knights.txt
rename to forge-gui/res/cardsfolder/c/chocobo_knights.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/chocobo_racetrack.txt b/forge-gui/res/cardsfolder/c/chocobo_racetrack.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/chocobo_racetrack.txt
rename to forge-gui/res/cardsfolder/c/chocobo_racetrack.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cid_freeflier_pilot.txt b/forge-gui/res/cardsfolder/c/cid_freeflier_pilot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cid_freeflier_pilot.txt
rename to forge-gui/res/cardsfolder/c/cid_freeflier_pilot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cid_timeless_artificer.txt b/forge-gui/res/cardsfolder/c/cid_timeless_artificer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cid_timeless_artificer.txt
rename to forge-gui/res/cardsfolder/c/cid_timeless_artificer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/circle_of_power.txt b/forge-gui/res/cardsfolder/c/circle_of_power.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/circle_of_power.txt
rename to forge-gui/res/cardsfolder/c/circle_of_power.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clash_of_the_eikons.txt b/forge-gui/res/cardsfolder/c/clash_of_the_eikons.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clash_of_the_eikons.txt
rename to forge-gui/res/cardsfolder/c/clash_of_the_eikons.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clive_ifrits_dominant_ifrit_warden_of_inferno.txt b/forge-gui/res/cardsfolder/c/clive_ifrits_dominant_ifrit_warden_of_inferno.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clive_ifrits_dominant_ifrit_warden_of_inferno.txt
rename to forge-gui/res/cardsfolder/c/clive_ifrits_dominant_ifrit_warden_of_inferno.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clives_hideaway.txt b/forge-gui/res/cardsfolder/c/clives_hideaway.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clives_hideaway.txt
rename to forge-gui/res/cardsfolder/c/clives_hideaway.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cloud_midgar_mercenary.txt b/forge-gui/res/cardsfolder/c/cloud_midgar_mercenary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cloud_midgar_mercenary.txt
rename to forge-gui/res/cardsfolder/c/cloud_midgar_mercenary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cloud_of_darkness.txt b/forge-gui/res/cardsfolder/c/cloud_of_darkness.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cloud_of_darkness.txt
rename to forge-gui/res/cardsfolder/c/cloud_of_darkness.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cloudbound_moogle.txt b/forge-gui/res/cardsfolder/c/cloudbound_moogle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cloudbound_moogle.txt
rename to forge-gui/res/cardsfolder/c/cloudbound_moogle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/clouds_limit_break.txt b/forge-gui/res/cardsfolder/c/clouds_limit_break.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/clouds_limit_break.txt
rename to forge-gui/res/cardsfolder/c/clouds_limit_break.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/coeurl.txt b/forge-gui/res/cardsfolder/c/coeurl.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/coeurl.txt
rename to forge-gui/res/cardsfolder/c/coeurl.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/coin_of_fate.txt b/forge-gui/res/cardsfolder/c/coin_of_fate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/coin_of_fate.txt
rename to forge-gui/res/cardsfolder/c/coin_of_fate.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/coliseum_behemoth.txt b/forge-gui/res/cardsfolder/c/coliseum_behemoth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/coliseum_behemoth.txt
rename to forge-gui/res/cardsfolder/c/coliseum_behemoth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/combat_tutorial.txt b/forge-gui/res/cardsfolder/c/combat_tutorial.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/combat_tutorial.txt
rename to forge-gui/res/cardsfolder/c/combat_tutorial.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/commune_with_beavers.txt b/forge-gui/res/cardsfolder/c/commune_with_beavers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/commune_with_beavers.txt
rename to forge-gui/res/cardsfolder/c/commune_with_beavers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/conformer_shuriken.txt b/forge-gui/res/cardsfolder/c/conformer_shuriken.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/conformer_shuriken.txt
rename to forge-gui/res/cardsfolder/c/conformer_shuriken.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/coral_sword.txt b/forge-gui/res/cardsfolder/c/coral_sword.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/coral_sword.txt
rename to forge-gui/res/cardsfolder/c/coral_sword.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cornered_by_black_mages.txt b/forge-gui/res/cardsfolder/c/cornered_by_black_mages.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cornered_by_black_mages.txt
rename to forge-gui/res/cardsfolder/c/cornered_by_black_mages.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crossroads_village.txt b/forge-gui/res/cardsfolder/c/crossroads_village.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crossroads_village.txt
rename to forge-gui/res/cardsfolder/c/crossroads_village.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/crystal_fragments_summon_alexander.txt b/forge-gui/res/cardsfolder/c/crystal_fragments_summon_alexander.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/crystal_fragments_summon_alexander.txt
rename to forge-gui/res/cardsfolder/c/crystal_fragments_summon_alexander.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cunning_azurescale_divining_dive.txt b/forge-gui/res/cardsfolder/c/cunning_azurescale_divining_dive.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cunning_azurescale_divining_dive.txt
rename to forge-gui/res/cardsfolder/c/cunning_azurescale_divining_dive.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cyan_vengeful_samurai.txt b/forge-gui/res/cardsfolder/c/cyan_vengeful_samurai.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cyan_vengeful_samurai.txt
rename to forge-gui/res/cardsfolder/c/cyan_vengeful_samurai.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dalkovan_outrider.txt b/forge-gui/res/cardsfolder/d/dalkovan_outrider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dalkovan_outrider.txt
rename to forge-gui/res/cardsfolder/d/dalkovan_outrider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dancers_chakrams.txt b/forge-gui/res/cardsfolder/d/dancers_chakrams.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dancers_chakrams.txt
rename to forge-gui/res/cardsfolder/d/dancers_chakrams.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dark_knights_greatsword.txt b/forge-gui/res/cardsfolder/d/dark_knights_greatsword.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dark_knights_greatsword.txt
rename to forge-gui/res/cardsfolder/d/dark_knights_greatsword.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deadly_embrace.txt b/forge-gui/res/cardsfolder/d/deadly_embrace.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deadly_embrace.txt
rename to forge-gui/res/cardsfolder/d/deadly_embrace.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/delivery_moogle.txt b/forge-gui/res/cardsfolder/d/delivery_moogle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/delivery_moogle.txt
rename to forge-gui/res/cardsfolder/d/delivery_moogle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/demon_wall.txt b/forge-gui/res/cardsfolder/d/demon_wall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/demon_wall.txt
rename to forge-gui/res/cardsfolder/d/demon_wall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/diamond_weapon.txt b/forge-gui/res/cardsfolder/d/diamond_weapon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/diamond_weapon.txt
rename to forge-gui/res/cardsfolder/d/diamond_weapon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dion_bahamuts_dominant_bahamut_warden_of_light.txt b/forge-gui/res/cardsfolder/d/dion_bahamuts_dominant_bahamut_warden_of_light.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dion_bahamuts_dominant_bahamut_warden_of_light.txt
rename to forge-gui/res/cardsfolder/d/dion_bahamuts_dominant_bahamut_warden_of_light.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/draconic_fealty.txt b/forge-gui/res/cardsfolder/d/draconic_fealty.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/draconic_fealty.txt
rename to forge-gui/res/cardsfolder/d/draconic_fealty.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dragon_typhoon.txt b/forge-gui/res/cardsfolder/d/dragon_typhoon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dragon_typhoon.txt
rename to forge-gui/res/cardsfolder/d/dragon_typhoon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dragonblood_twins.txt b/forge-gui/res/cardsfolder/d/dragonblood_twins.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dragonblood_twins.txt
rename to forge-gui/res/cardsfolder/d/dragonblood_twins.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dragonsoul_prodigy.txt b/forge-gui/res/cardsfolder/d/dragonsoul_prodigy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dragonsoul_prodigy.txt
rename to forge-gui/res/cardsfolder/d/dragonsoul_prodigy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dragoons_lance.txt b/forge-gui/res/cardsfolder/d/dragoons_lance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dragoons_lance.txt
rename to forge-gui/res/cardsfolder/d/dragoons_lance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dragoons_wyvern.txt b/forge-gui/res/cardsfolder/d/dragoons_wyvern.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dragoons_wyvern.txt
rename to forge-gui/res/cardsfolder/d/dragoons_wyvern.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dreams_of_laguna.txt b/forge-gui/res/cardsfolder/d/dreams_of_laguna.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dreams_of_laguna.txt
rename to forge-gui/res/cardsfolder/d/dreams_of_laguna.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dwarven_castle_guard.txt b/forge-gui/res/cardsfolder/d/dwarven_castle_guard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dwarven_castle_guard.txt
rename to forge-gui/res/cardsfolder/d/dwarven_castle_guard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eden_seat_of_the_sanctum.txt b/forge-gui/res/cardsfolder/e/eden_seat_of_the_sanctum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eden_seat_of_the_sanctum.txt
rename to forge-gui/res/cardsfolder/e/eden_seat_of_the_sanctum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/edgar_king_of_figaro.txt b/forge-gui/res/cardsfolder/e/edgar_king_of_figaro.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/edgar_king_of_figaro.txt
rename to forge-gui/res/cardsfolder/e/edgar_king_of_figaro.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/edgar_master_machinist.txt b/forge-gui/res/cardsfolder/e/edgar_master_machinist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/edgar_master_machinist.txt
rename to forge-gui/res/cardsfolder/e/edgar_master_machinist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eject.txt b/forge-gui/res/cardsfolder/e/eject.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eject.txt
rename to forge-gui/res/cardsfolder/e/eject.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elena_turk_recruit.txt b/forge-gui/res/cardsfolder/e/elena_turk_recruit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elena_turk_recruit.txt
rename to forge-gui/res/cardsfolder/e/elena_turk_recruit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/elixir.txt b/forge-gui/res/cardsfolder/e/elixir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elixir.txt
rename to forge-gui/res/cardsfolder/e/elixir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/emet_selch_of_the_third_seat.txt b/forge-gui/res/cardsfolder/e/emet_selch_of_the_third_seat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/emet_selch_of_the_third_seat.txt
rename to forge-gui/res/cardsfolder/e/emet_selch_of_the_third_seat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/esper_origins_summon_esper_maduin.txt b/forge-gui/res/cardsfolder/e/esper_origins_summon_esper_maduin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/esper_origins_summon_esper_maduin.txt
rename to forge-gui/res/cardsfolder/e/esper_origins_summon_esper_maduin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/espers_to_magicite.txt b/forge-gui/res/cardsfolder/e/espers_to_magicite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/espers_to_magicite.txt
rename to forge-gui/res/cardsfolder/e/espers_to_magicite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/estinien_varlineau.txt b/forge-gui/res/cardsfolder/e/estinien_varlineau.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/estinien_varlineau.txt
rename to forge-gui/res/cardsfolder/e/estinien_varlineau.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ether.txt b/forge-gui/res/cardsfolder/e/ether.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ether.txt
rename to forge-gui/res/cardsfolder/e/ether.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/evil_reawakened.txt b/forge-gui/res/cardsfolder/e/evil_reawakened.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/evil_reawakened.txt
rename to forge-gui/res/cardsfolder/e/evil_reawakened.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/excalibur_ii.txt b/forge-gui/res/cardsfolder/e/excalibur_ii.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/excalibur_ii.txt
rename to forge-gui/res/cardsfolder/e/excalibur_ii.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/exdeath_void_warlock_neo_exdeath_dimensions_end.txt b/forge-gui/res/cardsfolder/e/exdeath_void_warlock_neo_exdeath_dimensions_end.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/exdeath_void_warlock_neo_exdeath_dimensions_end.txt
rename to forge-gui/res/cardsfolder/e/exdeath_void_warlock_neo_exdeath_dimensions_end.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eye_of_nidhogg.txt b/forge-gui/res/cardsfolder/e/eye_of_nidhogg.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eye_of_nidhogg.txt
rename to forge-gui/res/cardsfolder/e/eye_of_nidhogg.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fandaniel_telophoroi_ascian.txt b/forge-gui/res/cardsfolder/f/fandaniel_telophoroi_ascian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fandaniel_telophoroi_ascian.txt
rename to forge-gui/res/cardsfolder/f/fandaniel_telophoroi_ascian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fang_fearless_lcie.txt b/forge-gui/res/cardsfolder/f/fang_fearless_lcie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fang_fearless_lcie.txt
rename to forge-gui/res/cardsfolder/f/fang_fearless_lcie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fate_of_the_sun_cryst.txt b/forge-gui/res/cardsfolder/f/fate_of_the_sun_cryst.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fate_of_the_sun_cryst.txt
rename to forge-gui/res/cardsfolder/f/fate_of_the_sun_cryst.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fight_on.txt b/forge-gui/res/cardsfolder/f/fight_on.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fight_on.txt
rename to forge-gui/res/cardsfolder/f/fight_on.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fire_magic.txt b/forge-gui/res/cardsfolder/f/fire_magic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fire_magic.txt
rename to forge-gui/res/cardsfolder/f/fire_magic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/firion_wild_rose_warrior.txt b/forge-gui/res/cardsfolder/f/firion_wild_rose_warrior.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/firion_wild_rose_warrior.txt
rename to forge-gui/res/cardsfolder/f/firion_wild_rose_warrior.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/freya_crescent.txt b/forge-gui/res/cardsfolder/f/freya_crescent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/freya_crescent.txt
rename to forge-gui/res/cardsfolder/f/freya_crescent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/from_father_to_son.txt b/forge-gui/res/cardsfolder/f/from_father_to_son.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/from_father_to_son.txt
rename to forge-gui/res/cardsfolder/f/from_father_to_son.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gaelicat.txt b/forge-gui/res/cardsfolder/g/gaelicat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gaelicat.txt
rename to forge-gui/res/cardsfolder/g/gaelicat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gaius_van_baelsar.txt b/forge-gui/res/cardsfolder/g/gaius_van_baelsar.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gaius_van_baelsar.txt
rename to forge-gui/res/cardsfolder/g/gaius_van_baelsar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/galufs_final_act.txt b/forge-gui/res/cardsfolder/g/galufs_final_act.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/galufs_final_act.txt
rename to forge-gui/res/cardsfolder/g/galufs_final_act.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/garnet_princess_of_alexandria.txt b/forge-gui/res/cardsfolder/g/garnet_princess_of_alexandria.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/garnet_princess_of_alexandria.txt
rename to forge-gui/res/cardsfolder/g/garnet_princess_of_alexandria.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gatta_and_luzzu.txt b/forge-gui/res/cardsfolder/g/gatta_and_luzzu.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gatta_and_luzzu.txt
rename to forge-gui/res/cardsfolder/g/gatta_and_luzzu.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gau_feral_youth.txt b/forge-gui/res/cardsfolder/g/gau_feral_youth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gau_feral_youth.txt
rename to forge-gui/res/cardsfolder/g/gau_feral_youth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/general_leo_cristophe.txt b/forge-gui/res/cardsfolder/g/general_leo_cristophe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/general_leo_cristophe.txt
rename to forge-gui/res/cardsfolder/g/general_leo_cristophe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/genji_glove.txt b/forge-gui/res/cardsfolder/g/genji_glove.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/genji_glove.txt
rename to forge-gui/res/cardsfolder/g/genji_glove.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gigantoad.txt b/forge-gui/res/cardsfolder/g/gigantoad.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gigantoad.txt
rename to forge-gui/res/cardsfolder/g/gigantoad.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gilgamesh_master_at_arms.txt b/forge-gui/res/cardsfolder/g/gilgamesh_master_at_arms.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gilgamesh_master_at_arms.txt
rename to forge-gui/res/cardsfolder/g/gilgamesh_master_at_arms.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/giott_king_of_the_dwarves.txt b/forge-gui/res/cardsfolder/g/giott_king_of_the_dwarves.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/giott_king_of_the_dwarves.txt
rename to forge-gui/res/cardsfolder/g/giott_king_of_the_dwarves.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gogo_master_of_mimicry.txt b/forge-gui/res/cardsfolder/g/gogo_master_of_mimicry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gogo_master_of_mimicry.txt
rename to forge-gui/res/cardsfolder/g/gogo_master_of_mimicry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gogo_mysterious_mime.txt b/forge-gui/res/cardsfolder/g/gogo_mysterious_mime.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gogo_mysterious_mime.txt
rename to forge-gui/res/cardsfolder/g/gogo_mysterious_mime.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gohn_town_of_ruin.txt b/forge-gui/res/cardsfolder/g/gohn_town_of_ruin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gohn_town_of_ruin.txt
rename to forge-gui/res/cardsfolder/g/gohn_town_of_ruin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/golbez_crystal_collector.txt b/forge-gui/res/cardsfolder/g/golbez_crystal_collector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/golbez_crystal_collector.txt
rename to forge-gui/res/cardsfolder/g/golbez_crystal_collector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gongaga_reactor_town.txt b/forge-gui/res/cardsfolder/g/gongaga_reactor_town.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gongaga_reactor_town.txt
rename to forge-gui/res/cardsfolder/g/gongaga_reactor_town.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/goobbue_gardener.txt b/forge-gui/res/cardsfolder/g/goobbue_gardener.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/goobbue_gardener.txt
rename to forge-gui/res/cardsfolder/g/goobbue_gardener.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/graha_tia.txt b/forge-gui/res/cardsfolder/g/graha_tia.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/graha_tia.txt
rename to forge-gui/res/cardsfolder/g/graha_tia.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/graha_tia_scion_reborn.txt b/forge-gui/res/cardsfolder/g/graha_tia_scion_reborn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/graha_tia_scion_reborn.txt
rename to forge-gui/res/cardsfolder/g/graha_tia_scion_reborn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gran_pulse_ochu.txt b/forge-gui/res/cardsfolder/g/gran_pulse_ochu.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gran_pulse_ochu.txt
rename to forge-gui/res/cardsfolder/g/gran_pulse_ochu.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/guadosalam_farplane_gateway.txt b/forge-gui/res/cardsfolder/g/guadosalam_farplane_gateway.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/guadosalam_farplane_gateway.txt
rename to forge-gui/res/cardsfolder/g/guadosalam_farplane_gateway.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gysahl_greens.txt b/forge-gui/res/cardsfolder/g/gysahl_greens.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gysahl_greens.txt
rename to forge-gui/res/cardsfolder/g/gysahl_greens.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hamza_might_of_the_yathan.txt b/forge-gui/res/cardsfolder/h/hamza_might_of_the_yathan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hamza_might_of_the_yathan.txt
rename to forge-gui/res/cardsfolder/h/hamza_might_of_the_yathan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hardened_bonds.txt b/forge-gui/res/cardsfolder/h/hardened_bonds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hardened_bonds.txt
rename to forge-gui/res/cardsfolder/h/hardened_bonds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/haste_magic.txt b/forge-gui/res/cardsfolder/h/haste_magic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/haste_magic.txt
rename to forge-gui/res/cardsfolder/h/haste_magic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hecteyes.txt b/forge-gui/res/cardsfolder/h/hecteyes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hecteyes.txt
rename to forge-gui/res/cardsfolder/h/hecteyes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/heidegger_shinra_executive.txt b/forge-gui/res/cardsfolder/h/heidegger_shinra_executive.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/heidegger_shinra_executive.txt
rename to forge-gui/res/cardsfolder/h/heidegger_shinra_executive.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/helitrooper.txt b/forge-gui/res/cardsfolder/h/helitrooper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/helitrooper.txt
rename to forge-gui/res/cardsfolder/h/helitrooper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hermes_overseer_of_elpis.txt b/forge-gui/res/cardsfolder/h/hermes_overseer_of_elpis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hermes_overseer_of_elpis.txt
rename to forge-gui/res/cardsfolder/h/hermes_overseer_of_elpis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hildibrand_manderville.txt b/forge-gui/res/cardsfolder/h/hildibrand_manderville.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hildibrand_manderville.txt
rename to forge-gui/res/cardsfolder/h/hildibrand_manderville.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hill_gigas.txt b/forge-gui/res/cardsfolder/h/hill_gigas.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hill_gigas.txt
rename to forge-gui/res/cardsfolder/h/hill_gigas.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hope_estheim.txt b/forge-gui/res/cardsfolder/h/hope_estheim.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hope_estheim.txt
rename to forge-gui/res/cardsfolder/h/hope_estheim.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hraesvelgr_of_the_first_brood.txt b/forge-gui/res/cardsfolder/h/hraesvelgr_of_the_first_brood.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hraesvelgr_of_the_first_brood.txt
rename to forge-gui/res/cardsfolder/h/hraesvelgr_of_the_first_brood.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ice_flan.txt b/forge-gui/res/cardsfolder/i/ice_flan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ice_flan.txt
rename to forge-gui/res/cardsfolder/i/ice_flan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ice_magic.txt b/forge-gui/res/cardsfolder/i/ice_magic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ice_magic.txt
rename to forge-gui/res/cardsfolder/i/ice_magic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ignis_scientia.txt b/forge-gui/res/cardsfolder/i/ignis_scientia.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ignis_scientia.txt
rename to forge-gui/res/cardsfolder/i/ignis_scientia.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/il_mheg_pixie.txt b/forge-gui/res/cardsfolder/i/il_mheg_pixie.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/il_mheg_pixie.txt
rename to forge-gui/res/cardsfolder/i/il_mheg_pixie.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/illuminating_lash.txt b/forge-gui/res/cardsfolder/i/illuminating_lash.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/illuminating_lash.txt
rename to forge-gui/res/cardsfolder/i/illuminating_lash.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/insomnia_crown_city.txt b/forge-gui/res/cardsfolder/i/insomnia_crown_city.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/insomnia_crown_city.txt
rename to forge-gui/res/cardsfolder/i/insomnia_crown_city.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/instant_ramen.txt b/forge-gui/res/cardsfolder/i/instant_ramen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/instant_ramen.txt
rename to forge-gui/res/cardsfolder/i/instant_ramen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/interceptor_shadows_hound.txt b/forge-gui/res/cardsfolder/i/interceptor_shadows_hound.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/interceptor_shadows_hound.txt
rename to forge-gui/res/cardsfolder/i/interceptor_shadows_hound.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/iron_giant.txt b/forge-gui/res/cardsfolder/i/iron_giant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/iron_giant.txt
rename to forge-gui/res/cardsfolder/i/iron_giant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ishgard_the_holy_see_faith_grief.txt b/forge-gui/res/cardsfolder/i/ishgard_the_holy_see_faith_grief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ishgard_the_holy_see_faith_grief.txt
rename to forge-gui/res/cardsfolder/i/ishgard_the_holy_see_faith_grief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/item_shopkeep.txt b/forge-gui/res/cardsfolder/i/item_shopkeep.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/item_shopkeep.txt
rename to forge-gui/res/cardsfolder/i/item_shopkeep.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jecht_reluctant_guardian_braskas_final_aeon.txt b/forge-gui/res/cardsfolder/j/jecht_reluctant_guardian_braskas_final_aeon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jecht_reluctant_guardian_braskas_final_aeon.txt
rename to forge-gui/res/cardsfolder/j/jecht_reluctant_guardian_braskas_final_aeon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jenova_ancient_calamity.txt b/forge-gui/res/cardsfolder/j/jenova_ancient_calamity.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jenova_ancient_calamity.txt
rename to forge-gui/res/cardsfolder/j/jenova_ancient_calamity.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jidoor_aristocratic_capital_overture.txt b/forge-gui/res/cardsfolder/j/jidoor_aristocratic_capital_overture.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jidoor_aristocratic_capital_overture.txt
rename to forge-gui/res/cardsfolder/j/jidoor_aristocratic_capital_overture.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/jill_shivas_dominant_shiva_warden_of_ice.txt b/forge-gui/res/cardsfolder/j/jill_shivas_dominant_shiva_warden_of_ice.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jill_shivas_dominant_shiva_warden_of_ice.txt
rename to forge-gui/res/cardsfolder/j/jill_shivas_dominant_shiva_warden_of_ice.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/joshua_phoenixs_dominant_phoenix_warden_of_fire.txt b/forge-gui/res/cardsfolder/j/joshua_phoenixs_dominant_phoenix_warden_of_fire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/joshua_phoenixs_dominant_phoenix_warden_of_fire.txt
rename to forge-gui/res/cardsfolder/j/joshua_phoenixs_dominant_phoenix_warden_of_fire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/judge_magister_gabranth.txt b/forge-gui/res/cardsfolder/j/judge_magister_gabranth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/judge_magister_gabranth.txt
rename to forge-gui/res/cardsfolder/j/judge_magister_gabranth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/judgment_bolt.txt b/forge-gui/res/cardsfolder/j/judgment_bolt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/judgment_bolt.txt
rename to forge-gui/res/cardsfolder/j/judgment_bolt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kain_traitorous_dragoon.txt b/forge-gui/res/cardsfolder/k/kain_traitorous_dragoon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kain_traitorous_dragoon.txt
rename to forge-gui/res/cardsfolder/k/kain_traitorous_dragoon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kefka_court_mage_kefka_ruler_of_ruin.txt b/forge-gui/res/cardsfolder/k/kefka_court_mage_kefka_ruler_of_ruin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kefka_court_mage_kefka_ruler_of_ruin.txt
rename to forge-gui/res/cardsfolder/k/kefka_court_mage_kefka_ruler_of_ruin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kefka_dancing_mad.txt b/forge-gui/res/cardsfolder/k/kefka_dancing_mad.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kefka_dancing_mad.txt
rename to forge-gui/res/cardsfolder/k/kefka_dancing_mad.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kimahri_valiant guardian.txt b/forge-gui/res/cardsfolder/k/kimahri_valiant_guardian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kimahri_valiant guardian.txt
rename to forge-gui/res/cardsfolder/k/kimahri_valiant_guardian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/krile_baldesion.txt b/forge-gui/res/cardsfolder/k/krile_baldesion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/krile_baldesion.txt
rename to forge-gui/res/cardsfolder/k/krile_baldesion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kuja_genome_sorcerer_trance_kuja_fate_defied.txt b/forge-gui/res/cardsfolder/k/kuja_genome_sorcerer_trance_kuja_fate_defied.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kuja_genome_sorcerer_trance_kuja_fate_defied.txt
rename to forge-gui/res/cardsfolder/k/kuja_genome_sorcerer_trance_kuja_fate_defied.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lam_storm_crane_elder.txt b/forge-gui/res/cardsfolder/l/lam_storm_crane_elder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lam_storm_crane_elder.txt
rename to forge-gui/res/cardsfolder/l/lam_storm_crane_elder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/laughing_mad.txt b/forge-gui/res/cardsfolder/l/laughing_mad.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/laughing_mad.txt
rename to forge-gui/res/cardsfolder/l/laughing_mad.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lifestreams_blessing.txt b/forge-gui/res/cardsfolder/l/lifestreams_blessing.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lifestreams_blessing.txt
rename to forge-gui/res/cardsfolder/l/lifestreams_blessing.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/light_of_judgment.txt b/forge-gui/res/cardsfolder/l/light_of_judgment.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/light_of_judgment.txt
rename to forge-gui/res/cardsfolder/l/light_of_judgment.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lightning_army_of_one.txt b/forge-gui/res/cardsfolder/l/lightning_army_of_one.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lightning_army_of_one.txt
rename to forge-gui/res/cardsfolder/l/lightning_army_of_one.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lightning_security_sergeant.txt b/forge-gui/res/cardsfolder/l/lightning_security_sergeant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lightning_security_sergeant.txt
rename to forge-gui/res/cardsfolder/l/lightning_security_sergeant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lindblum_industrial_regency_mage_siege.txt b/forge-gui/res/cardsfolder/l/lindblum_industrial_regency_mage_siege.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lindblum_industrial_regency_mage_siege.txt
rename to forge-gui/res/cardsfolder/l/lindblum_industrial_regency_mage_siege.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lion_heart.txt b/forge-gui/res/cardsfolder/l/lion_heart.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lion_heart.txt
rename to forge-gui/res/cardsfolder/l/lion_heart.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/locke_cole.txt b/forge-gui/res/cardsfolder/l/locke_cole.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/locke_cole.txt
rename to forge-gui/res/cardsfolder/l/locke_cole.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/locke_treasure_hunter.txt b/forge-gui/res/cardsfolder/l/locke_treasure_hunter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/locke_treasure_hunter.txt
rename to forge-gui/res/cardsfolder/l/locke_treasure_hunter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/loporrit_scout.txt b/forge-gui/res/cardsfolder/l/loporrit_scout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/loporrit_scout.txt
rename to forge-gui/res/cardsfolder/l/loporrit_scout.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lord_jyscal_guado.txt b/forge-gui/res/cardsfolder/l/lord_jyscal_guado.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lord_jyscal_guado.txt
rename to forge-gui/res/cardsfolder/l/lord_jyscal_guado.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/louisoixs_sacrifice.txt b/forge-gui/res/cardsfolder/l/louisoixs_sacrifice.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/louisoixs_sacrifice.txt
rename to forge-gui/res/cardsfolder/l/louisoixs_sacrifice.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lulu_stern_guardian.txt b/forge-gui/res/cardsfolder/l/lulu_stern_guardian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lulu_stern_guardian.txt
rename to forge-gui/res/cardsfolder/l/lulu_stern_guardian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lunatic_pandora.txt b/forge-gui/res/cardsfolder/l/lunatic_pandora.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lunatic_pandora.txt
rename to forge-gui/res/cardsfolder/l/lunatic_pandora.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lyse_hext.txt b/forge-gui/res/cardsfolder/l/lyse_hext.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lyse_hext.txt
rename to forge-gui/res/cardsfolder/l/lyse_hext.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/machinists_arsenal.txt b/forge-gui/res/cardsfolder/m/machinists_arsenal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/machinists_arsenal.txt
rename to forge-gui/res/cardsfolder/m/machinists_arsenal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/maester_seymour.txt b/forge-gui/res/cardsfolder/m/maester_seymour.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/maester_seymour.txt
rename to forge-gui/res/cardsfolder/m/maester_seymour.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/magic_damper.txt b/forge-gui/res/cardsfolder/m/magic_damper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/magic_damper.txt
rename to forge-gui/res/cardsfolder/m/magic_damper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/magic_pot.txt b/forge-gui/res/cardsfolder/m/magic_pot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/magic_pot.txt
rename to forge-gui/res/cardsfolder/m/magic_pot.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/magitek_armor.txt b/forge-gui/res/cardsfolder/m/magitek_armor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/magitek_armor.txt
rename to forge-gui/res/cardsfolder/m/magitek_armor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/magitek_infantry.txt b/forge-gui/res/cardsfolder/m/magitek_infantry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/magitek_infantry.txt
rename to forge-gui/res/cardsfolder/m/magitek_infantry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/magitek_scythe.txt b/forge-gui/res/cardsfolder/m/magitek_scythe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/magitek_scythe.txt
rename to forge-gui/res/cardsfolder/m/magitek_scythe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/malboro.txt b/forge-gui/res/cardsfolder/m/malboro.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/malboro.txt
rename to forge-gui/res/cardsfolder/m/malboro.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/matoya_archon_elder.txt b/forge-gui/res/cardsfolder/m/matoya_archon_elder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/matoya_archon_elder.txt
rename to forge-gui/res/cardsfolder/m/matoya_archon_elder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/memories_returning.txt b/forge-gui/res/cardsfolder/m/memories_returning.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/memories_returning.txt
rename to forge-gui/res/cardsfolder/m/memories_returning.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/midgar_city_of_mako_reactor_raid.txt b/forge-gui/res/cardsfolder/m/midgar_city_of_mako_reactor_raid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/midgar_city_of_mako_reactor_raid.txt
rename to forge-gui/res/cardsfolder/m/midgar_city_of_mako_reactor_raid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/minwu_white_mage.txt b/forge-gui/res/cardsfolder/m/minwu_white_mage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/minwu_white_mage.txt
rename to forge-gui/res/cardsfolder/m/minwu_white_mage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mog_moogle_warrior.txt b/forge-gui/res/cardsfolder/m/mog_moogle_warrior.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mog_moogle_warrior.txt
rename to forge-gui/res/cardsfolder/m/mog_moogle_warrior.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/monks_fist.txt b/forge-gui/res/cardsfolder/m/monks_fist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/monks_fist.txt
rename to forge-gui/res/cardsfolder/m/monks_fist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/moogles_valor.txt b/forge-gui/res/cardsfolder/m/moogles_valor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/moogles_valor.txt
rename to forge-gui/res/cardsfolder/m/moogles_valor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mysidian_elder.txt b/forge-gui/res/cardsfolder/m/mysidian_elder.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mysidian_elder.txt
rename to forge-gui/res/cardsfolder/m/mysidian_elder.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/namazu_trader.txt b/forge-gui/res/cardsfolder/n/namazu_trader.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/namazu_trader.txt
rename to forge-gui/res/cardsfolder/n/namazu_trader.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/nibelheim_aflame.txt b/forge-gui/res/cardsfolder/n/nibelheim_aflame.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/nibelheim_aflame.txt
rename to forge-gui/res/cardsfolder/n/nibelheim_aflame.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ninjas_blades.txt b/forge-gui/res/cardsfolder/n/ninjas_blades.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ninjas_blades.txt
rename to forge-gui/res/cardsfolder/n/ninjas_blades.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/noctis_prince_of_lucis.txt b/forge-gui/res/cardsfolder/n/noctis_prince_of_lucis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/noctis_prince_of_lucis.txt
rename to forge-gui/res/cardsfolder/n/noctis_prince_of_lucis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/oaka_traveling_merchant.txt b/forge-gui/res/cardsfolder/o/oaka_traveling_merchant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/oaka_traveling_merchant.txt
rename to forge-gui/res/cardsfolder/o/oaka_traveling_merchant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/observed_stasis.txt b/forge-gui/res/cardsfolder/o/observed_stasis.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/observed_stasis.txt
rename to forge-gui/res/cardsfolder/o/observed_stasis.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/omega_heartless_evolution.txt b/forge-gui/res/cardsfolder/o/omega_heartless_evolution.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/omega_heartless_evolution.txt
rename to forge-gui/res/cardsfolder/o/omega_heartless_evolution.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/opera_love_song.txt b/forge-gui/res/cardsfolder/o/opera_love_song.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/opera_love_song.txt
rename to forge-gui/res/cardsfolder/o/opera_love_song.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/overkill.txt b/forge-gui/res/cardsfolder/o/overkill.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/overkill.txt
rename to forge-gui/res/cardsfolder/o/overkill.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/paladins_arms.txt b/forge-gui/res/cardsfolder/p/paladins_arms.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/paladins_arms.txt
rename to forge-gui/res/cardsfolder/p/paladins_arms.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/papalymo_totolymo.txt b/forge-gui/res/cardsfolder/p/papalymo_totolymo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/papalymo_totolymo.txt
rename to forge-gui/res/cardsfolder/p/papalymo_totolymo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phantom_train.txt b/forge-gui/res/cardsfolder/p/phantom_train.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phantom_train.txt
rename to forge-gui/res/cardsfolder/p/phantom_train.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/phoenix_down.txt b/forge-gui/res/cardsfolder/p/phoenix_down.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/phoenix_down.txt
rename to forge-gui/res/cardsfolder/p/phoenix_down.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/poison_the_waters.txt b/forge-gui/res/cardsfolder/p/poison_the_waters.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/poison_the_waters.txt
rename to forge-gui/res/cardsfolder/p/poison_the_waters.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prishes_wanderings.txt b/forge-gui/res/cardsfolder/p/prishes_wanderings.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prishes_wanderings.txt
rename to forge-gui/res/cardsfolder/p/prishes_wanderings.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/professor_hojo.txt b/forge-gui/res/cardsfolder/p/professor_hojo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/professor_hojo.txt
rename to forge-gui/res/cardsfolder/p/professor_hojo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/prompto_argentum.txt b/forge-gui/res/cardsfolder/p/prompto_argentum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prompto_argentum.txt
rename to forge-gui/res/cardsfolder/p/prompto_argentum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/protection_magic.txt b/forge-gui/res/cardsfolder/p/protection_magic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/protection_magic.txt
rename to forge-gui/res/cardsfolder/p/protection_magic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/pupu_ufo.txt b/forge-gui/res/cardsfolder/p/pupu_ufo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pupu_ufo.txt
rename to forge-gui/res/cardsfolder/p/pupu_ufo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/qiqirn_merchant.txt b/forge-gui/res/cardsfolder/q/qiqirn_merchant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/qiqirn_merchant.txt
rename to forge-gui/res/cardsfolder/q/qiqirn_merchant.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/queen_brahne.txt b/forge-gui/res/cardsfolder/q/queen_brahne.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/queen_brahne.txt
rename to forge-gui/res/cardsfolder/q/queen_brahne.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quina_qu_gourmet.txt b/forge-gui/res/cardsfolder/q/quina_qu_gourmet.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quina_qu_gourmet.txt
rename to forge-gui/res/cardsfolder/q/quina_qu_gourmet.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/quistis_trepe.txt b/forge-gui/res/cardsfolder/q/quistis_trepe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/quistis_trepe.txt
rename to forge-gui/res/cardsfolder/q/quistis_trepe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/qutrub_forayer.txt b/forge-gui/res/cardsfolder/q/qutrub_forayer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/qutrub_forayer.txt
rename to forge-gui/res/cardsfolder/q/qutrub_forayer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rabanastre_royal_city.txt b/forge-gui/res/cardsfolder/r/rabanastre_royal_city.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rabanastre_royal_city.txt
rename to forge-gui/res/cardsfolder/r/rabanastre_royal_city.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/random_encounter.txt b/forge-gui/res/cardsfolder/r/random_encounter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/random_encounter.txt
rename to forge-gui/res/cardsfolder/r/random_encounter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/raubahn_bull_of_ala_mhigo.txt b/forge-gui/res/cardsfolder/r/raubahn_bull_of_ala_mhigo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raubahn_bull_of_ala_mhigo.txt
rename to forge-gui/res/cardsfolder/r/raubahn_bull_of_ala_mhigo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reach_the_horizon.txt b/forge-gui/res/cardsfolder/r/reach_the_horizon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reach_the_horizon.txt
rename to forge-gui/res/cardsfolder/r/reach_the_horizon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reapers_scythe.txt b/forge-gui/res/cardsfolder/r/reapers_scythe.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reapers_scythe.txt
rename to forge-gui/res/cardsfolder/r/reapers_scythe.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/red_mages_rapier.txt b/forge-gui/res/cardsfolder/r/red_mages_rapier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/red_mages_rapier.txt
rename to forge-gui/res/cardsfolder/r/red_mages_rapier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/red_xiii_proud_warrior.txt b/forge-gui/res/cardsfolder/r/red_xiii_proud_warrior.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/red_xiii_proud_warrior.txt
rename to forge-gui/res/cardsfolder/r/red_xiii_proud_warrior.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rejoin_the_fight.txt b/forge-gui/res/cardsfolder/r/rejoin_the_fight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rejoin_the_fight.txt
rename to forge-gui/res/cardsfolder/r/rejoin_the_fight.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/relentless_x_atm092.txt b/forge-gui/res/cardsfolder/r/relentless_x_atm092.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/relentless_x_atm092.txt
rename to forge-gui/res/cardsfolder/r/relentless_x_atm092.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/relms_sketching.txt b/forge-gui/res/cardsfolder/r/relms_sketching.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/relms_sketching.txt
rename to forge-gui/res/cardsfolder/r/relms_sketching.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/reno_and_rude.txt b/forge-gui/res/cardsfolder/r/reno_and_rude.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/reno_and_rude.txt
rename to forge-gui/res/cardsfolder/r/reno_and_rude.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/resentful_revelation.txt b/forge-gui/res/cardsfolder/r/resentful_revelation.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/resentful_revelation.txt
rename to forge-gui/res/cardsfolder/r/resentful_revelation.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/restoration_magic.txt b/forge-gui/res/cardsfolder/r/restoration_magic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/restoration_magic.txt
rename to forge-gui/res/cardsfolder/r/restoration_magic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/retrieve_the_esper.txt b/forge-gui/res/cardsfolder/r/retrieve_the_esper.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/retrieve_the_esper.txt
rename to forge-gui/res/cardsfolder/r/retrieve_the_esper.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ride_the_shoopuf.txt b/forge-gui/res/cardsfolder/r/ride_the_shoopuf.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ride_the_shoopuf.txt
rename to forge-gui/res/cardsfolder/r/ride_the_shoopuf.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rikku_resourceful_guardian.txt b/forge-gui/res/cardsfolder/r/rikku_resourceful_guardian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rikku_resourceful_guardian.txt
rename to forge-gui/res/cardsfolder/r/rikku_resourceful_guardian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ring_of_the_lucii.txt b/forge-gui/res/cardsfolder/r/ring_of_the_lucii.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ring_of_the_lucii.txt
rename to forge-gui/res/cardsfolder/r/ring_of_the_lucii.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rinoa_heartilly.txt b/forge-gui/res/cardsfolder/r/rinoa_heartilly.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rinoa_heartilly.txt
rename to forge-gui/res/cardsfolder/r/rinoa_heartilly.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rook_turret.txt b/forge-gui/res/cardsfolder/r/rook_turret.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rook_turret.txt
rename to forge-gui/res/cardsfolder/r/rook_turret.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rosa_resolute_white_mage.txt b/forge-gui/res/cardsfolder/r/rosa_resolute_white_mage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rosa_resolute_white_mage.txt
rename to forge-gui/res/cardsfolder/r/rosa_resolute_white_mage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rufus_shinra.txt b/forge-gui/res/cardsfolder/r/rufus_shinra.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rufus_shinra.txt
rename to forge-gui/res/cardsfolder/r/rufus_shinra.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rydia_summoner_of_mist.txt b/forge-gui/res/cardsfolder/r/rydia_summoner_of_mist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rydia_summoner_of_mist.txt
rename to forge-gui/res/cardsfolder/r/rydia_summoner_of_mist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rydias_return.txt b/forge-gui/res/cardsfolder/r/rydias_return.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rydias_return.txt
rename to forge-gui/res/cardsfolder/r/rydias_return.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sabin_master_monk.txt b/forge-gui/res/cardsfolder/s/sabin_master_monk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sabin_master_monk.txt
rename to forge-gui/res/cardsfolder/s/sabin_master_monk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sabotender.txt b/forge-gui/res/cardsfolder/s/sabotender.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sabotender.txt
rename to forge-gui/res/cardsfolder/s/sabotender.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sages_nouliths.txt b/forge-gui/res/cardsfolder/s/sages_nouliths.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sages_nouliths.txt
rename to forge-gui/res/cardsfolder/s/sages_nouliths.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sahagin.txt b/forge-gui/res/cardsfolder/s/sahagin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sahagin.txt
rename to forge-gui/res/cardsfolder/s/sahagin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/samurais_katana.txt b/forge-gui/res/cardsfolder/s/samurais_katana.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/samurais_katana.txt
rename to forge-gui/res/cardsfolder/s/samurais_katana.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sandworm.txt b/forge-gui/res/cardsfolder/s/sandworm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sandworm.txt
rename to forge-gui/res/cardsfolder/s/sandworm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sazh_katzroy.txt b/forge-gui/res/cardsfolder/s/sazh_katzroy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sazh_katzroy.txt
rename to forge-gui/res/cardsfolder/s/sazh_katzroy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scorpion_sentinel.txt b/forge-gui/res/cardsfolder/s/scorpion_sentinel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scorpion_sentinel.txt
rename to forge-gui/res/cardsfolder/s/scorpion_sentinel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seifer_almasy.txt b/forge-gui/res/cardsfolder/s/seifer_almasy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seifer_almasy.txt
rename to forge-gui/res/cardsfolder/s/seifer_almasy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/self_destruct.txt b/forge-gui/res/cardsfolder/s/self_destruct.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/self_destruct.txt
rename to forge-gui/res/cardsfolder/s/self_destruct.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sephiroth_fabled_soldier_sephiroth_one_winged_angel.txt b/forge-gui/res/cardsfolder/s/sephiroth_fabled_soldier_sephiroth_one_winged_angel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sephiroth_fabled_soldier_sephiroth_one_winged_angel.txt
rename to forge-gui/res/cardsfolder/s/sephiroth_fabled_soldier_sephiroth_one_winged_angel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sephiroth_fallen_hero.txt b/forge-gui/res/cardsfolder/s/sephiroth_fallen_hero.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sephiroth_fallen_hero.txt
rename to forge-gui/res/cardsfolder/s/sephiroth_fallen_hero.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sephiroths_intervention.txt b/forge-gui/res/cardsfolder/s/sephiroths_intervention.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sephiroths_intervention.txt
rename to forge-gui/res/cardsfolder/s/sephiroths_intervention.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/serah_farron_crystallized_serah.txt b/forge-gui/res/cardsfolder/s/serah_farron_crystallized_serah.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/serah_farron_crystallized_serah.txt
rename to forge-gui/res/cardsfolder/s/serah_farron_crystallized_serah.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/setzer_wandering_gambler.txt b/forge-gui/res/cardsfolder/s/setzer_wandering_gambler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/setzer_wandering_gambler.txt
rename to forge-gui/res/cardsfolder/s/setzer_wandering_gambler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/seymour_flux.txt b/forge-gui/res/cardsfolder/s/seymour_flux.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seymour_flux.txt
rename to forge-gui/res/cardsfolder/s/seymour_flux.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shadow_mysterious_assassin.txt b/forge-gui/res/cardsfolder/s/shadow_mysterious_assassin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shadow_mysterious_assassin.txt
rename to forge-gui/res/cardsfolder/s/shadow_mysterious_assassin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shambling_cieth.txt b/forge-gui/res/cardsfolder/s/shambling_cieth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shambling_cieth.txt
rename to forge-gui/res/cardsfolder/s/shambling_cieth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shantotto_tactician_magician.txt b/forge-gui/res/cardsfolder/s/shantotto_tactician_magician.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shantotto_tactician_magician.txt
rename to forge-gui/res/cardsfolder/s/shantotto_tactician_magician.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sharlayan_nation_of_scholars.txt b/forge-gui/res/cardsfolder/s/sharlayan_nation_of_scholars.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sharlayan_nation_of_scholars.txt
rename to forge-gui/res/cardsfolder/s/sharlayan_nation_of_scholars.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shelinda_yevon_acolyte.txt b/forge-gui/res/cardsfolder/s/shelinda_yevon_acolyte.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shelinda_yevon_acolyte.txt
rename to forge-gui/res/cardsfolder/s/shelinda_yevon_acolyte.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/shinra_reinforcements.txt b/forge-gui/res/cardsfolder/s/shinra_reinforcements.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shinra_reinforcements.txt
rename to forge-gui/res/cardsfolder/s/shinra_reinforcements.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sidequest_card_collection_magicked_card.txt b/forge-gui/res/cardsfolder/s/sidequest_card_collection_magicked_card.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sidequest_card_collection_magicked_card.txt
rename to forge-gui/res/cardsfolder/s/sidequest_card_collection_magicked_card.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sidequest_hunt_the_mark_yiazmat_ultimate_mark.txt b/forge-gui/res/cardsfolder/s/sidequest_hunt_the_mark_yiazmat_ultimate_mark.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sidequest_hunt_the_mark_yiazmat_ultimate_mark.txt
rename to forge-gui/res/cardsfolder/s/sidequest_hunt_the_mark_yiazmat_ultimate_mark.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sidequest_play_blitzball_world_champion_celestial_weapon.txt b/forge-gui/res/cardsfolder/s/sidequest_play_blitzball_world_champion_celestial_weapon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sidequest_play_blitzball_world_champion_celestial_weapon.txt
rename to forge-gui/res/cardsfolder/s/sidequest_play_blitzball_world_champion_celestial_weapon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sidequest_raise_a_chocobo_black_chocobo.txt b/forge-gui/res/cardsfolder/s/sidequest_raise_a_chocobo_black_chocobo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sidequest_raise_a_chocobo_black_chocobo.txt
rename to forge-gui/res/cardsfolder/s/sidequest_raise_a_chocobo_black_chocobo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/siegfried_famed_swordsman.txt b/forge-gui/res/cardsfolder/s/siegfried_famed_swordsman.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/siegfried_famed_swordsman.txt
rename to forge-gui/res/cardsfolder/s/siegfried_famed_swordsman.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sin_unending_cataclysm.txt b/forge-gui/res/cardsfolder/s/sin_unending_cataclysm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sin_unending_cataclysm.txt
rename to forge-gui/res/cardsfolder/s/sin_unending_cataclysm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/slash_of_light.txt b/forge-gui/res/cardsfolder/s/slash_of_light.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/slash_of_light.txt
rename to forge-gui/res/cardsfolder/s/slash_of_light.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sleep_magic.txt b/forge-gui/res/cardsfolder/s/sleep_magic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sleep_magic.txt
rename to forge-gui/res/cardsfolder/s/sleep_magic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/snort.txt b/forge-gui/res/cardsfolder/s/snort.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/snort.txt
rename to forge-gui/res/cardsfolder/s/snort.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/snow_villiers.txt b/forge-gui/res/cardsfolder/s/snow_villiers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/snow_villiers.txt
rename to forge-gui/res/cardsfolder/s/snow_villiers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/soldier_military_program.txt b/forge-gui/res/cardsfolder/s/soldier_military_program.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/soldier_military_program.txt
rename to forge-gui/res/cardsfolder/s/soldier_military_program.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/song_of_seasons.txt b/forge-gui/res/cardsfolder/s/song_of_seasons.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/song_of_seasons.txt
rename to forge-gui/res/cardsfolder/s/song_of_seasons.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sorceresss_schemes.txt b/forge-gui/res/cardsfolder/s/sorceresss_schemes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sorceresss_schemes.txt
rename to forge-gui/res/cardsfolder/s/sorceresss_schemes.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sphere_grid.txt b/forge-gui/res/cardsfolder/s/sphere_grid.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sphere_grid.txt
rename to forge-gui/res/cardsfolder/s/sphere_grid.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/squall_seed_mercenary.txt b/forge-gui/res/cardsfolder/s/squall_seed_mercenary.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/squall_seed_mercenary.txt
rename to forge-gui/res/cardsfolder/s/squall_seed_mercenary.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/starting_town.txt b/forge-gui/res/cardsfolder/s/starting_town.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/starting_town.txt
rename to forge-gui/res/cardsfolder/s/starting_town.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stolen_uniform.txt b/forge-gui/res/cardsfolder/s/stolen_uniform.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stolen_uniform.txt
rename to forge-gui/res/cardsfolder/s/stolen_uniform.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stonehide_ancient_warning_tremor.txt b/forge-gui/res/cardsfolder/s/stonehide_ancient_warning_tremor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stonehide_ancient_warning_tremor.txt
rename to forge-gui/res/cardsfolder/s/stonehide_ancient_warning_tremor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/strago_and_relm.txt b/forge-gui/res/cardsfolder/s/strago_and_relm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/strago_and_relm.txt
rename to forge-gui/res/cardsfolder/s/strago_and_relm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/stuck_in_summoners_sanctum.txt b/forge-gui/res/cardsfolder/s/stuck_in_summoners_sanctum.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stuck_in_summoners_sanctum.txt
rename to forge-gui/res/cardsfolder/s/stuck_in_summoners_sanctum.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_anima.txt b/forge-gui/res/cardsfolder/s/summon_anima.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_anima.txt
rename to forge-gui/res/cardsfolder/s/summon_anima.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_bahamut.txt b/forge-gui/res/cardsfolder/s/summon_bahamut.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_bahamut.txt
rename to forge-gui/res/cardsfolder/s/summon_bahamut.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_brynhildr.txt b/forge-gui/res/cardsfolder/s/summon_brynhildr.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_brynhildr.txt
rename to forge-gui/res/cardsfolder/s/summon_brynhildr.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_choco_mog.txt b/forge-gui/res/cardsfolder/s/summon_choco_mog.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_choco_mog.txt
rename to forge-gui/res/cardsfolder/s/summon_choco_mog.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_esper_ramuh.txt b/forge-gui/res/cardsfolder/s/summon_esper_ramuh.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_esper_ramuh.txt
rename to forge-gui/res/cardsfolder/s/summon_esper_ramuh.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_esper_valigarmanda.txt b/forge-gui/res/cardsfolder/s/summon_esper_valigarmanda.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_esper_valigarmanda.txt
rename to forge-gui/res/cardsfolder/s/summon_esper_valigarmanda.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_fat_chocobo.txt b/forge-gui/res/cardsfolder/s/summon_fat_chocobo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_fat_chocobo.txt
rename to forge-gui/res/cardsfolder/s/summon_fat_chocobo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_fenrir.txt b/forge-gui/res/cardsfolder/s/summon_fenrir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_fenrir.txt
rename to forge-gui/res/cardsfolder/s/summon_fenrir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_g_f_cerberus.txt b/forge-gui/res/cardsfolder/s/summon_g_f_cerberus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_g_f_cerberus.txt
rename to forge-gui/res/cardsfolder/s/summon_g_f_cerberus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_g_f_ifrit.txt b/forge-gui/res/cardsfolder/s/summon_g_f_ifrit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_g_f_ifrit.txt
rename to forge-gui/res/cardsfolder/s/summon_g_f_ifrit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_good_king_mog_xii.txt b/forge-gui/res/cardsfolder/s/summon_good_king_mog_xii.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_good_king_mog_xii.txt
rename to forge-gui/res/cardsfolder/s/summon_good_king_mog_xii.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_ixion.txt b/forge-gui/res/cardsfolder/s/summon_ixion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_ixion.txt
rename to forge-gui/res/cardsfolder/s/summon_ixion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_knights_of_round.txt b/forge-gui/res/cardsfolder/s/summon_knights_of_round.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_knights_of_round.txt
rename to forge-gui/res/cardsfolder/s/summon_knights_of_round.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_kujata.txt b/forge-gui/res/cardsfolder/s/summon_kujata.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_kujata.txt
rename to forge-gui/res/cardsfolder/s/summon_kujata.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_leviathan.txt b/forge-gui/res/cardsfolder/s/summon_leviathan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_leviathan.txt
rename to forge-gui/res/cardsfolder/s/summon_leviathan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_magus_sisters.txt b/forge-gui/res/cardsfolder/s/summon_magus_sisters.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_magus_sisters.txt
rename to forge-gui/res/cardsfolder/s/summon_magus_sisters.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_primal_garuda.txt b/forge-gui/res/cardsfolder/s/summon_primal_garuda.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_primal_garuda.txt
rename to forge-gui/res/cardsfolder/s/summon_primal_garuda.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_primal_odin.txt b/forge-gui/res/cardsfolder/s/summon_primal_odin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_primal_odin.txt
rename to forge-gui/res/cardsfolder/s/summon_primal_odin.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_titan.txt b/forge-gui/res/cardsfolder/s/summon_titan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_titan.txt
rename to forge-gui/res/cardsfolder/s/summon_titan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_valefor.txt b/forge-gui/res/cardsfolder/s/summon_valefor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_valefor.txt
rename to forge-gui/res/cardsfolder/s/summon_valefor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_yojimbo.txt b/forge-gui/res/cardsfolder/s/summon_yojimbo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summon_yojimbo.txt
rename to forge-gui/res/cardsfolder/s/summon_yojimbo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summoners_grimoire.txt b/forge-gui/res/cardsfolder/s/summoners_grimoire.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summoners_grimoire.txt
rename to forge-gui/res/cardsfolder/s/summoners_grimoire.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summoners_sending.txt b/forge-gui/res/cardsfolder/s/summoners_sending.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summoners_sending.txt
rename to forge-gui/res/cardsfolder/s/summoners_sending.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/summoning_materia.txt b/forge-gui/res/cardsfolder/s/summoning_materia.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/summoning_materia.txt
rename to forge-gui/res/cardsfolder/s/summoning_materia.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/suplex.txt b/forge-gui/res/cardsfolder/s/suplex.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/suplex.txt
rename to forge-gui/res/cardsfolder/s/suplex.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/swallowed_by_leviathan.txt b/forge-gui/res/cardsfolder/s/swallowed_by_leviathan.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/swallowed_by_leviathan.txt
rename to forge-gui/res/cardsfolder/s/swallowed_by_leviathan.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/swiftspears_teachings.txt b/forge-gui/res/cardsfolder/s/swiftspears_teachings.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/swiftspears_teachings.txt
rename to forge-gui/res/cardsfolder/s/swiftspears_teachings.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tataru_taru.txt b/forge-gui/res/cardsfolder/t/tataru_taru.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tataru_taru.txt
rename to forge-gui/res/cardsfolder/t/tataru_taru.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tellah_great_sage.txt b/forge-gui/res/cardsfolder/t/tellah_great_sage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tellah_great_sage.txt
rename to forge-gui/res/cardsfolder/t/tellah_great_sage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/terra_magical_adept_esper_terra.txt b/forge-gui/res/cardsfolder/t/terra_magical_adept_esper_terra.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/terra_magical_adept_esper_terra.txt
rename to forge-gui/res/cardsfolder/t/terra_magical_adept_esper_terra.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thancred_waters.txt b/forge-gui/res/cardsfolder/t/thancred_waters.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thancred_waters.txt
rename to forge-gui/res/cardsfolder/t/thancred_waters.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_crystals_chosen.txt b/forge-gui/res/cardsfolder/t/the_crystals_chosen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_crystals_chosen.txt
rename to forge-gui/res/cardsfolder/t/the_crystals_chosen.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_darkness_crystal.txt b/forge-gui/res/cardsfolder/t/the_darkness_crystal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_darkness_crystal.txt
rename to forge-gui/res/cardsfolder/t/the_darkness_crystal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_earth_crystal.txt b/forge-gui/res/cardsfolder/t/the_earth_crystal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_earth_crystal.txt
rename to forge-gui/res/cardsfolder/t/the_earth_crystal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_emperor_of_palamecia_the_lord_master_of_hell.txt b/forge-gui/res/cardsfolder/t/the_emperor_of_palamecia_the_lord_master_of_hell.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_emperor_of_palamecia_the_lord_master_of_hell.txt
rename to forge-gui/res/cardsfolder/t/the_emperor_of_palamecia_the_lord_master_of_hell.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_falcon_airship_restored.txt b/forge-gui/res/cardsfolder/t/the_falcon_airship_restored.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_falcon_airship_restored.txt
rename to forge-gui/res/cardsfolder/t/the_falcon_airship_restored.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_final_days.txt b/forge-gui/res/cardsfolder/t/the_final_days.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_final_days.txt
rename to forge-gui/res/cardsfolder/t/the_final_days.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_fire_crystal.txt b/forge-gui/res/cardsfolder/t/the_fire_crystal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_fire_crystal.txt
rename to forge-gui/res/cardsfolder/t/the_fire_crystal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_gold_saucer.txt b/forge-gui/res/cardsfolder/t/the_gold_saucer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_gold_saucer.txt
rename to forge-gui/res/cardsfolder/t/the_gold_saucer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_lunar_whale.txt b/forge-gui/res/cardsfolder/t/the_lunar_whale.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_lunar_whale.txt
rename to forge-gui/res/cardsfolder/t/the_lunar_whale.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_masamune.txt b/forge-gui/res/cardsfolder/t/the_masamune.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_masamune.txt
rename to forge-gui/res/cardsfolder/t/the_masamune.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_prima_vista.txt b/forge-gui/res/cardsfolder/t/the_prima_vista.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_prima_vista.txt
rename to forge-gui/res/cardsfolder/t/the_prima_vista.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_regalia.txt b/forge-gui/res/cardsfolder/t/the_regalia.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_regalia.txt
rename to forge-gui/res/cardsfolder/t/the_regalia.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_wandering_minstrel.txt b/forge-gui/res/cardsfolder/t/the_wandering_minstrel.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_wandering_minstrel.txt
rename to forge-gui/res/cardsfolder/t/the_wandering_minstrel.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_warring_triad.txt b/forge-gui/res/cardsfolder/t/the_warring_triad.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_warring_triad.txt
rename to forge-gui/res/cardsfolder/t/the_warring_triad.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_water_crystal.txt b/forge-gui/res/cardsfolder/t/the_water_crystal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_water_crystal.txt
rename to forge-gui/res/cardsfolder/t/the_water_crystal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/the_wind_crystal.txt b/forge-gui/res/cardsfolder/t/the_wind_crystal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_wind_crystal.txt
rename to forge-gui/res/cardsfolder/t/the_wind_crystal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thiefs_knife.txt b/forge-gui/res/cardsfolder/t/thiefs_knife.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thiefs_knife.txt
rename to forge-gui/res/cardsfolder/t/thiefs_knife.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thunder_magic.txt b/forge-gui/res/cardsfolder/t/thunder_magic.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thunder_magic.txt
rename to forge-gui/res/cardsfolder/t/thunder_magic.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/thunderbond_vanguard.txt b/forge-gui/res/cardsfolder/t/thunderbond_vanguard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thunderbond_vanguard.txt
rename to forge-gui/res/cardsfolder/t/thunderbond_vanguard.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tidus_blitzball_star.txt b/forge-gui/res/cardsfolder/t/tidus_blitzball_star.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tidus_blitzball_star.txt
rename to forge-gui/res/cardsfolder/t/tidus_blitzball_star.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tifa_lockhart.txt b/forge-gui/res/cardsfolder/t/tifa_lockhart.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tifa_lockhart.txt
rename to forge-gui/res/cardsfolder/t/tifa_lockhart.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tifa_martial_artist.txt b/forge-gui/res/cardsfolder/t/tifa_martial_artist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tifa_martial_artist.txt
rename to forge-gui/res/cardsfolder/t/tifa_martial_artist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tifas_limit_break.txt b/forge-gui/res/cardsfolder/t/tifas_limit_break.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tifas_limit_break.txt
rename to forge-gui/res/cardsfolder/t/tifas_limit_break.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/torgal_a_fine_hound.txt b/forge-gui/res/cardsfolder/t/torgal_a_fine_hound.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/torgal_a_fine_hound.txt
rename to forge-gui/res/cardsfolder/t/torgal_a_fine_hound.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/town_greeter.txt b/forge-gui/res/cardsfolder/t/town_greeter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/town_greeter.txt
rename to forge-gui/res/cardsfolder/t/town_greeter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/transpose.txt b/forge-gui/res/cardsfolder/t/transpose.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/transpose.txt
rename to forge-gui/res/cardsfolder/t/transpose.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/travel_the_overworld.txt b/forge-gui/res/cardsfolder/t/travel_the_overworld.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/travel_the_overworld.txt
rename to forge-gui/res/cardsfolder/t/travel_the_overworld.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/traveling_chocobo.txt b/forge-gui/res/cardsfolder/t/traveling_chocobo.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/traveling_chocobo.txt
rename to forge-gui/res/cardsfolder/t/traveling_chocobo.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/treno_dark_city.txt b/forge-gui/res/cardsfolder/t/treno_dark_city.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/treno_dark_city.txt
rename to forge-gui/res/cardsfolder/t/treno_dark_city.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/triple_triad.txt b/forge-gui/res/cardsfolder/t/triple_triad.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/triple_triad.txt
rename to forge-gui/res/cardsfolder/t/triple_triad.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/tromell_seymours_butler.txt b/forge-gui/res/cardsfolder/t/tromell_seymours_butler.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tromell_seymours_butler.txt
rename to forge-gui/res/cardsfolder/t/tromell_seymours_butler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ultima.txt b/forge-gui/res/cardsfolder/u/ultima.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ultima.txt
rename to forge-gui/res/cardsfolder/u/ultima.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ultima_origin_of_oblivion.txt b/forge-gui/res/cardsfolder/u/ultima_origin_of_oblivion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ultima_origin_of_oblivion.txt
rename to forge-gui/res/cardsfolder/u/ultima_origin_of_oblivion.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ultima_weapon.txt b/forge-gui/res/cardsfolder/u/ultima_weapon.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ultima_weapon.txt
rename to forge-gui/res/cardsfolder/u/ultima_weapon.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ultimate_magic_holy.txt b/forge-gui/res/cardsfolder/u/ultimate_magic_holy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ultimate_magic_holy.txt
rename to forge-gui/res/cardsfolder/u/ultimate_magic_holy.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ultimate_magic_meteor.txt b/forge-gui/res/cardsfolder/u/ultimate_magic_meteor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ultimate_magic_meteor.txt
rename to forge-gui/res/cardsfolder/u/ultimate_magic_meteor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ultimecia_temporal_threat.txt b/forge-gui/res/cardsfolder/u/ultimecia_temporal_threat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ultimecia_temporal_threat.txt
rename to forge-gui/res/cardsfolder/u/ultimecia_temporal_threat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ultimecia_time_sorceress_ultimecia_omnipotent.txt b/forge-gui/res/cardsfolder/u/ultimecia_time_sorceress_ultimecia_omnipotent.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ultimecia_time_sorceress_ultimecia_omnipotent.txt
rename to forge-gui/res/cardsfolder/u/ultimecia_time_sorceress_ultimecia_omnipotent.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ultros_obnoxious_octopus.txt b/forge-gui/res/cardsfolder/u/ultros_obnoxious_octopus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ultros_obnoxious_octopus.txt
rename to forge-gui/res/cardsfolder/u/ultros_obnoxious_octopus.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/umaro_raging_yeti.txt b/forge-gui/res/cardsfolder/u/umaro_raging_yeti.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/umaro_raging_yeti.txt
rename to forge-gui/res/cardsfolder/u/umaro_raging_yeti.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/undercity_dire_rat.txt b/forge-gui/res/cardsfolder/u/undercity_dire_rat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/undercity_dire_rat.txt
rename to forge-gui/res/cardsfolder/u/undercity_dire_rat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/unexpected_request.txt b/forge-gui/res/cardsfolder/u/unexpected_request.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unexpected_request.txt
rename to forge-gui/res/cardsfolder/u/unexpected_request.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/urianger_augurelt.txt b/forge-gui/res/cardsfolder/u/urianger_augurelt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/urianger_augurelt.txt
rename to forge-gui/res/cardsfolder/u/urianger_augurelt.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vaan_street_thief.txt b/forge-gui/res/cardsfolder/v/vaan_street_thief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vaan_street_thief.txt
rename to forge-gui/res/cardsfolder/v/vaan_street_thief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/valkyrie_aerial_unit.txt b/forge-gui/res/cardsfolder/v/valkyrie_aerial_unit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/valkyrie_aerial_unit.txt
rename to forge-gui/res/cardsfolder/v/valkyrie_aerial_unit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vanille_cheerful_lcie_ragnarok_divine_deliverance.txt b/forge-gui/res/cardsfolder/v/vanille_cheerful_lcie_ragnarok_divine_deliverance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vanille_cheerful_lcie_ragnarok_divine_deliverance.txt
rename to forge-gui/res/cardsfolder/v/vanille_cheerful_lcie_ragnarok_divine_deliverance.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vaynes_treachery.txt b/forge-gui/res/cardsfolder/v/vaynes_treachery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vaynes_treachery.txt
rename to forge-gui/res/cardsfolder/v/vaynes_treachery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vector_imperial_capital.txt b/forge-gui/res/cardsfolder/v/vector_imperial_capital.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vector_imperial_capital.txt
rename to forge-gui/res/cardsfolder/v/vector_imperial_capital.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/venat_heart_of_hydaelyn_hydaelyn_the_mothercrystal.txt b/forge-gui/res/cardsfolder/v/venat_heart_of_hydaelyn_hydaelyn_the_mothercrystal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/venat_heart_of_hydaelyn_hydaelyn_the_mothercrystal.txt
rename to forge-gui/res/cardsfolder/v/venat_heart_of_hydaelyn_hydaelyn_the_mothercrystal.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vincent_valentine_galian_beast.txt b/forge-gui/res/cardsfolder/v/vincent_valentine_galian_beast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vincent_valentine_galian_beast.txt
rename to forge-gui/res/cardsfolder/v/vincent_valentine_galian_beast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vincent_vengeful_atoner.txt b/forge-gui/res/cardsfolder/v/vincent_vengeful_atoner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vincent_vengeful_atoner.txt
rename to forge-gui/res/cardsfolder/v/vincent_vengeful_atoner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vincents_limit_break.txt b/forge-gui/res/cardsfolder/v/vincents_limit_break.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vincents_limit_break.txt
rename to forge-gui/res/cardsfolder/v/vincents_limit_break.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/vivi_ornitier.txt b/forge-gui/res/cardsfolder/v/vivi_ornitier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/vivi_ornitier.txt
rename to forge-gui/res/cardsfolder/v/vivi_ornitier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wakka_devoted_guardian.txt b/forge-gui/res/cardsfolder/w/wakka_devoted_guardian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wakka_devoted_guardian.txt
rename to forge-gui/res/cardsfolder/w/wakka_devoted_guardian.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/warriors_sword.txt b/forge-gui/res/cardsfolder/w/warriors_sword.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/warriors_sword.txt
rename to forge-gui/res/cardsfolder/w/warriors_sword.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/weapons_vendor.txt b/forge-gui/res/cardsfolder/w/weapons_vendor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/weapons_vendor.txt
rename to forge-gui/res/cardsfolder/w/weapons_vendor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/white_auracite.txt b/forge-gui/res/cardsfolder/w/white_auracite.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/white_auracite.txt
rename to forge-gui/res/cardsfolder/w/white_auracite.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/white_mages_staff.txt b/forge-gui/res/cardsfolder/w/white_mages_staff.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/white_mages_staff.txt
rename to forge-gui/res/cardsfolder/w/white_mages_staff.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/windurst_federation_center.txt b/forge-gui/res/cardsfolder/w/windurst_federation_center.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/windurst_federation_center.txt
rename to forge-gui/res/cardsfolder/w/windurst_federation_center.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/world_map.txt b/forge-gui/res/cardsfolder/w/world_map.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/world_map.txt
rename to forge-gui/res/cardsfolder/w/world_map.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/wrecking_ball_arm.txt b/forge-gui/res/cardsfolder/w/wrecking_ball_arm.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wrecking_ball_arm.txt
rename to forge-gui/res/cardsfolder/w/wrecking_ball_arm.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/xande_dark_mage.txt b/forge-gui/res/cardsfolder/x/xande_dark_mage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/xande_dark_mage.txt
rename to forge-gui/res/cardsfolder/x/xande_dark_mage.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/youre_not_alone.txt b/forge-gui/res/cardsfolder/y/youre_not_alone.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/youre_not_alone.txt
rename to forge-gui/res/cardsfolder/y/youre_not_alone.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yshtola_rhul.txt b/forge-gui/res/cardsfolder/y/yshtola_rhul.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yshtola_rhul.txt
rename to forge-gui/res/cardsfolder/y/yshtola_rhul.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yuffie_materia_hunter.txt b/forge-gui/res/cardsfolder/y/yuffie_materia_hunter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yuffie_materia_hunter.txt
rename to forge-gui/res/cardsfolder/y/yuffie_materia_hunter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yuna_grand_summoner.txt b/forge-gui/res/cardsfolder/y/yuna_grand_summoner.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yuna_grand_summoner.txt
rename to forge-gui/res/cardsfolder/y/yuna_grand_summoner.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yuna_hope_of_spira.txt b/forge-gui/res/cardsfolder/y/yuna_hope_of_spira.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yuna_hope_of_spira.txt
rename to forge-gui/res/cardsfolder/y/yuna_hope_of_spira.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yunas_decision.txt b/forge-gui/res/cardsfolder/y/yunas_decision.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yunas_decision.txt
rename to forge-gui/res/cardsfolder/y/yunas_decision.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/yunas_whistle.txt b/forge-gui/res/cardsfolder/y/yunas_whistle.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yunas_whistle.txt
rename to forge-gui/res/cardsfolder/y/yunas_whistle.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zack_fair.txt b/forge-gui/res/cardsfolder/z/zack_fair.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zack_fair.txt
rename to forge-gui/res/cardsfolder/z/zack_fair.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zanarkand_ancient_metropolis_lasting_fayth.txt b/forge-gui/res/cardsfolder/z/zanarkand_ancient_metropolis_lasting_fayth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zanarkand_ancient_metropolis_lasting_fayth.txt
rename to forge-gui/res/cardsfolder/z/zanarkand_ancient_metropolis_lasting_fayth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zenos_yae_galvus_shinryu_transcendent_rival.txt b/forge-gui/res/cardsfolder/z/zenos_yae_galvus_shinryu_transcendent_rival.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zenos_yae_galvus_shinryu_transcendent_rival.txt
rename to forge-gui/res/cardsfolder/z/zenos_yae_galvus_shinryu_transcendent_rival.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zidane_tantalus_thief.txt b/forge-gui/res/cardsfolder/z/zidane_tantalus_thief.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zidane_tantalus_thief.txt
rename to forge-gui/res/cardsfolder/z/zidane_tantalus_thief.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zodiark_umbral_god.txt b/forge-gui/res/cardsfolder/z/zodiark_umbral_god.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zodiark_umbral_god.txt
rename to forge-gui/res/cardsfolder/z/zodiark_umbral_god.txt