From 4cdd2f05ebcd81e1e28444679c36b666a5be4a1e Mon Sep 17 00:00:00 2001
From: Dapoulp <74197441+Dapoulp@users.noreply.github.com>
Date: Sat, 31 May 2025 22:20:10 +0200
Subject: [PATCH] Compendium Reorg (#94)

---
 ...feature_Arcane_Sense_D5HUGwdizhBVZ0RW.json |   8 +-
 ...ttack_of_Opportunity_VfUbJwGU4Cka0xLP.json |   8 +-
 .../feature_Beastform_NkSKDXGNNiOUlFqm.json   |   8 +-
 ...re_Channel_Raw_Power_ovxuqhl01XZSwx2n.json |   8 +-
 .../feature_Cloaked_TpaoHSJ3npjWiBOf.json     |   8 +-
 ...ture_Combat_Training_elb6ZVertgu6OdKA.json |   8 +-
 ...eature_Combo_Strikes_RNC8NT8F6x73gRZi.json |  44 ---
 .../feature_Evolution_bZxfyPTZ6rsakyA2.json   |   8 +-
 ...ature_Frontline_Tank_ftUZznLFJ5xbcxcu.json |   8 +-
 ...eature_Hold_Them_Off_FSx2ojskU0pRE72g.json |   8 +-
 ...ture_I_Am_The_Weapon_ihtvQaH18eG56RWY.json |  44 ---
 ...feature_Life_Support_UZ9UjZArSJh6UHXG.json |   8 +-
 ...feature_Make_a_Scene_Ddk0PAgwM4VLRbyY.json |   8 +-
 ...ature_Minor_Illusion_qFq7kynAZhbWTbT5.json |   8 +-
 .../feature_No_Mercy_t3tLoq4h9wgQD7E9.json    |   8 +-
 ...eature_Not_This_Time_5msGbQyFwdwdFdYs.json |   8 +-
 .../feature_Prayer_Dice_jXfGnLnU8PswJYJd.json |   8 +-
 ...ure_Prestidigitation_ofBmJIn6NWxA0wPz.json |   8 +-
 .../feature_Rally_8uORDWrXtNFzA00U.json       |   8 +-
 ...ature_Ranger_s_Focus_b4O4r2HPbWU8s59q.json |   8 +-
 ...eature_Rogue_s_Dodge_fPGn9JNV24nt1G9d.json |   8 +-
 ...feature_Sneak_Attack_PhHOmsoYUDC42by6.json |   8 +-
 ...re_Staggering_Strike_xC0ZG862KrjHGHlx.json |  44 ---
 ...ure_Strange_Patterns_ONtJ7r2g6tN5q6Ga.json |   8 +-
 .../feature_Unstoppable_rlpNYKW18FX4Hw7t.json |   8 +-
 ...ature_Volatile_Magic_J3TdB5ZsmyJ68rxZ.json |   8 +-
 .../feature_Wildtouch_Dy0lco20C0Nk6yQo.json   |   8 +-
 .../folders_Bard_3QoIMKARHfRnBvQJ.json        |  23 ++
 .../folders_Druid_l94HTIXSvdZG3zIh.json       |  23 ++
 .../folders_Guardian_imOcur5Zv8WcMHXz.json    |  23 ++
 .../folders_Ranger_84neMcqoIRAoIvXP.json      |  23 ++
 .../folders_Rogue_AzwvgmcvToIUGYti.json       |  23 ++
 .../folders_Seraph_aI54jXjBNrAOm7R8.json      |  23 ++
 .../folders_Sorcerer_ncQG0s0ttAPObaeV.json    |  23 ++
 .../folders_Warrior_3znRxBqsK0lOJhvJ.json     |  23 ++
 .../folders_Wizard_8I0S9f458qu36qSW.json      |  23 ++
 .../class_Fighter_HPzaWaZBc6RvElKd.json       |  98 -------
 .../class_Warlock_kSSIqmgxFTm1Xr9s.json       |  70 -----
 .../folders_Arcana_jc1HbSpJmjAsq9GX.json      |  23 ++
 .../folders_Blade_gXc5zPwSyZXqrC6D.json       |  23 ++
 .../folders_Bone_IMRfDo5DDrpniKKv.json        |  23 ++
 .../folders_Codex_q9VsNwg9r0bTn2ll.json       |  23 ++
 .../folders_Grace_c380soh7Z1YAqzOT.json       |  23 ++
 .../folders_Level_10_7Cs44YADBTmmtCw6.json    |  21 ++
 .../folders_Level_10_7pKKYgRQAKlQAksV.json    |  21 ++
 .../folders_Level_10_8qr1Y2tW3vLwNZOg.json    |  21 ++
 .../folders_Level_10_D1MFCYakdFIKDmcD.json    |  21 ++
 .../folders_Level_10_Hs6POmXKThDXQJBn.json    |  21 ++
 .../folders_Level_10_IIVaYseNJbA2ta1B.json    |  21 ++
 .../folders_Level_10_nZr2hsu6Q6TlFXQn.json    |  21 ++
 .../folders_Level_10_pPzU9WOQNv3ckO1w.json    |  21 ++
 .../folders_Level_10_wdhWWqWlPiBxtsvr.json    |  21 ++
 .../folders_Level_1_9Xc6KzNyjDtTGZkp.json     |  21 ++
 .../folders_Level_1_EJoXzO85rG5EiZsh.json     |  21 ++
 .../folders_Level_1_LlWJaBZOKh0Ot2kD.json     |  21 ++
 .../folders_Level_1_PeeIjbkBv41613yZ.json     |  21 ++
 .../folders_Level_1_QpOL7jPbMBzH96qR.json     |  21 ++
 .../folders_Level_1_nVCKcZkcoEivYJaF.json     |  21 ++
 .../folders_Level_1_o7kvw9NRGvDZSce2.json     |  21 ++
 .../folders_Level_1_sCiN7DoysdKceIMd.json     |  21 ++
 .../folders_Level_1_tqhasjtHBX0F20lN.json     |  21 ++
 .../folders_Level_2_2yh8wuYprOyswf0r.json     |  21 ++
 .../folders_Level_2_Abn46nCQst6kpGeA.json     |  21 ++
 .../folders_Level_2_Q9rmrfeKqcqBNnWc.json     |  21 ++
 .../folders_Level_2_j9i2Q6Z7Z82udHn1.json     |  21 ++
 .../folders_Level_2_o7t2fsAmRxKLoHrO.json     |  21 ++
 .../folders_Level_2_pk4xXE8D3vTawrqj.json     |  21 ++
 .../folders_Level_2_pu3xD4rEkdfdAvGc.json     |  21 ++
 .../folders_Level_2_u8Yz2hUTaF3N2fFT.json     |  21 ++
 .../folders_Level_2_xZrCYAd05ayNu1yW.json     |  21 ++
 .../folders_Level_3_7XeaYZPMB0SopAfo.json     |  21 ++
 .../folders_Level_3_8ZfL09F8MiOEUzzw.json     |  21 ++
 .../folders_Level_3_GhLhMfmSgGqS9bwU.json     |  21 ++
 .../folders_Level_3_Oo9EkkF7CDD3QZEG.json     |  21 ++
 .../folders_Level_3_eR7sP5jQwfCLORUe.json     |  21 ++
 .../folders_Level_3_hoDIPBzwYPxiSXGU.json     |  21 ++
 .../folders_Level_3_mOv6BGhJAeGrzA84.json     |  21 ++
 .../folders_Level_3_uXGugK72AffddFdH.json     |  21 ++
 .../folders_Level_3_wWL9mV6i2EGX5xHS.json     |  21 ++
 .../folders_Level_4_1e5Sn8OXxEQ57GSD.json     |  21 ++
 .../folders_Level_4_3e8kCsLzLxiACJDb.json     |  21 ++
 .../folders_Level_4_BJIiOIWAQUz5zuqo.json     |  21 ++
 .../folders_Level_4_WTdOLLkQyPdg0KWU.json     |  21 ++
 .../folders_Level_4_cOZgzLQRGNnBzsHT.json     |  21 ++
 .../folders_Level_4_rUGDM9JvGfhh9a2Y.json     |  21 ++
 .../folders_Level_4_thP6nUk0nkrNcpXY.json     |  21 ++
 .../folders_Level_4_vAZKNDtAafd7HDWV.json     |  21 ++
 .../folders_Level_4_yalAnCU3SndrYImF.json     |  21 ++
 .../folders_Level_5_6gA7SmNIblkMaYgr.json     |  21 ++
 .../folders_Level_5_8erksbTp7ic6in4I.json     |  21 ++
 .../folders_Level_5_BQ1L4EiwOs84Xysp.json     |  21 ++
 .../folders_Level_5_Emnx4o1DWGTVKoAg.json     |  21 ++
 .../folders_Level_5_Jbw6Teaha6So9tym.json     |  21 ++
 .../folders_Level_5_XDSp0FdiYDVO0tfw.json     |  21 ++
 .../folders_Level_5_ZZHIbaynhzVArA1p.json     |  21 ++
 .../folders_Level_5_l387HKojhqcDAV0b.json     |  21 ++
 .../folders_Level_5_pDtffkb0SMv1O8pL.json     |  21 ++
 .../folders_Level_6_EiP5dLozOFZKIeWN.json     |  21 ++
 .../folders_Level_6_FcMclsLDy86EicA6.json     |  21 ++
 .../folders_Level_6_OwsbTSWzKq2WJmQN.json     |  21 ++
 .../folders_Level_6_VgADdqYn9nS9G1Us.json     |  21 ++
 .../folders_Level_6_gqnmAgerh7HhNo7t.json     |  21 ++
 .../folders_Level_6_nKCmeAn7ESsb4byE.json     |  21 ++
 .../folders_Level_6_pYEavNqteiQepvvD.json     |  21 ++
 .../folders_Level_6_u5Lq2kfC8LlDAGDC.json     |  21 ++
 .../folders_Level_6_xuGz0QPNlkTOV0rV.json     |  21 ++
 .../folders_Level_7_HAGbPLHwm0UozDeG.json     |  21 ++
 .../folders_Level_7_ML2JusN36oJoR8QA.json     |  21 ++
 .../folders_Level_7_W81LnTWzwmoaycTl.json     |  21 ++
 .../folders_Level_7_Z6oglw8LIOrtBcN6.json     |  21 ++
 .../folders_Level_7_bCjkysrofWPiZqNh.json     |  21 ++
 .../folders_Level_7_gEVGjjPrjqxxZkb5.json     |  21 ++
 .../folders_Level_7_hh2vkggcAQ0QUE6C.json     |  21 ++
 .../folders_Level_7_i5iDLXMZLc0ckWI5.json     |  21 ++
 .../folders_Level_7_kj3gwg5bmCqwFYze.json     |  21 ++
 .../folders_Level_8_7O1tTswJMNdPgLsx.json     |  21 ++
 .../folders_Level_8_8bWpGblWODdf8mDR.json     |  21 ++
 .../folders_Level_8_A00z8Q8B3aKApKzI.json     |  21 ++
 .../folders_Level_8_FUzQxkv4gFc46SIs.json     |  21 ++
 .../folders_Level_8_KmaX6wNBLzkFevaG.json     |  21 ++
 .../folders_Level_8_me7ywrVh38j6T8Sm.json     |  21 ++
 .../folders_Level_8_n7pgTBYSItMzCX0s.json     |  21 ++
 .../folders_Level_8_qY4Zqc1Ch6p317uK.json     |  21 ++
 .../folders_Level_8_taM81THa8h6Bv2Xa.json     |  21 ++
 .../folders_Level_9_2rqOUxEglhhPKk2j.json     |  21 ++
 .../folders_Level_9_8DOVMjTtZFKtwX4p.json     |  21 ++
 .../folders_Level_9_KwZYrsSUYnHiNtPl.json     |  21 ++
 .../folders_Level_9_QYdeGsmVYIF34kZR.json     |  21 ++
 .../folders_Level_9_R5afi5bhq9ccnYY2.json     |  21 ++
 .../folders_Level_9_eg2vM8j9xhya9Rwa.json     |  21 ++
 .../folders_Level_9_fucNnucgoUjbzvcA.json     |  21 ++
 .../folders_Level_9_sGCKwmomutMTv0Xs.json     |  21 ++
 .../folders_Level_9_yFcD1LOM3xKbkNYl.json     |  21 ++
 .../folders_Midnight_tgwSE1t5B0Ka10Xh.json    |  23 ++
 .../folders_Sage_io1DZ9MMMDfuNf8b.json        |  23 ++
 .../folders_Splendor_TL1TutmbeCVJ06nR.json    |  23 ++
 .../folders_Valor_yPVeShe47ETIqs9q.json       |  23 ++
 ...ced_Chainmail_Armor_CsZ4X1gMhKrfK0B8.json} |  19 +-
 ...ed_Full_Plate_Armor_1mJ37VQGgO7nGyaq.json} |  22 +-
 ...nced_Gambeson_Armor_0BAULrYPaX7tcoA4.json} |  22 +-
 ...anced_Leather_Armor_wWecy3cm3cZzuG0o.json} |  21 +-
 ...Bellamoi_Fine_Armor_scTgxT4uMylqtoW0.json} |  21 +-
 ...mor_Bladefare_Armor_kYj9YqqWEWTk7Of4.json} |  21 +-
 ...mor_Chainmail_Armor_cihoaJXe1YfLaz60.json} |  21 +-
 ...or_Channeling_Armor_plRn94qJi7WF2P2O.json} |  21 +-
 ...r_Dragonscale_Armor_RL1AKA4VNuRnYiR3.json} |  21 +-
 ...r_Dunamis_Silkchain_oTpJi31bKq4rut07.json} |  21 +-
 ...undrian_Chain_Armor_ShMNcz0KBsToMC44.json} |  21 +-
 ...or_Emberwoven_Armor_8sUPsWMhjQprt8yI.json} |  21 +-
 ...ull_Fortified_Armor_mb5OFsUSlPEPb4wU.json} |  21 +-
 ...or_Full_Plate_Armor_Vc3mfssiGZFQFuAf.json} |  22 +-
 ...rmor_Gambeson_Armor_kGm7XO3LZDZWvSXq.json} |  22 +-
 ...or_Harrowbone_Armor_uPpGA468Zi8TSQCd.json} |  22 +-
 ...ved_Chainmail_Armor_f0EfsoCmlg4cTIL1.json} |  21 +-
 ...ed_Full_Plate_Armor_nHcz1Ed7FXokdeyu.json} |  22 +-
 ...oved_Gambeson_Armor_dC5XHTRtqQvuTMef.json} |  22 +-
 ...roved_Leather_Armor_mQJ55Nd8ugzjGvWl.json} |  21 +-
 ...e_Breastplate_Armor_E6Ri6nwMtVOBedCy.json} |  21 +-
 ...armor_Leather_Armor_Fcz2Gg3V6O9whY8j.json} |  21 +-
 ...ary_Chainmail_Armor_MjVHoiFL4ooLY9YP.json} |  21 +-
 ...ry_Full_Plate_Armor_ZS7GwxrNThKZpD6l.json} |  20 +-
 ...dary_Gambeson_Armor_VkRQZFSXkrLm0gQD.json} |  21 +-
 ...ndary_Leather_Armor_eWPVkncjAu9h6H0E.json} |  21 +-
 ...rmor_Monett_s_Cloak_CDUbtl6zED5uhOsA.json} |  21 +-
 ...rmor_Rosewild_Armor_1d2XtD71WGMn1CNT.json} |  21 +-
 ...es_of_Fortification_HLiw7DTgSgY2F1rC.json} |  21 +-
 ...etan_Floating_Armor_jQTUywiUZzoheULn.json} |  21 +-
 ...or_Savior_Chainmail_S1jq3KXLHWw3OLgX.json} |  21 +-
 ..._Spiked_Plate_Armor_TkNjxTz0IapYe0YU.json} |  21 +-
 ...or_Tyris_Soft_Armor_4NRiIunReDbj9zoC.json} |  21 +-
 ...r_Veritas_Oal_Armor_1ByiV04ofK4TG5vR.json} |  21 +-
 .../folders_Tier_1_h4QgrovjVZ1oee7O.json      |  23 ++
 .../folders_Tier_2_hLn0v6ov6KuFgptu.json      |  23 ++
 .../folders_Tier_3_rkSdPu86ybLz6aKF.json      |  23 ++
 .../folders_Tier_4_Hbjp64XzuyJs2hOs.json      |  23 ++
 .../folders_Tier_1_d7tdCsIUd94XuTtq.json      |  23 ++
 .../folders_Tier_2_ereMKW01MCYg0qUY.json      |  23 ++
 .../folders_Tier_3_oreMpiiytMRaR9sy.json      |  23 ++
 .../folders_Tier_4_UNDVQEo6UtTuueNQ.json      |  23 ++
 ...vanced_Glowing_Rings_tiF1InKThXGrG5A5.json |  41 ---
 ... weapon_Aantari_Bow_DNSHS8KTawyOfQqH.json} |  21 +-
 ...ed_Arcane_Gauntlets_wy7ylEZZL6quWba0.json} |  21 +-
 ..._Advanced_Battleaxe_8crRfaAQ9g3ZSlz0.json} |  21 +-
 ...Advanced_Broadsword_NM9iNiVQSWRfUzbC.json} |  21 +-
 ...n_Advanced_Crossbow_avxhDjL3lxBMpqq5.json} |  21 +-
 ...on_Advanced_Cutlass_kBwwJ1vbuy5lyIyp.json} |  21 +-
 ...pon_Advanced_Dagger_ZjZwghxJTAhbJwgf.json} |  21 +-
 ..._Advanced_Dualstaff_9f1XlCd3fN7SgTkk.json} |  21 +-
 ...Advanced_Greatstaff_r45VbaXuCbAgeh6p.json} |  21 +-
 ...Advanced_Greatsword_XAkNXcsfWLoNeyoF.json} |  21 +-
 ...on_Advanced_Halberd_1ro8WmVPGvU5AcNb.json} |  21 +-
 ...vanced_Hallowed_Axe_6tltkuPbrHaqbCO0.json} |  21 +-
 ...Advanced_Hand_Runes_UKnk8XcmeG5BiNEP.json} |  21 +-
 ...on_Advanced_Longbow_CTBVsiB2abltveHL.json} |  21 +-
 ..._Advanced_Longsword_MGjqO5ovO4m63pnR.json} |  21 +-
 ...eapon_Advanced_Mace_bhPYWRBEYjdLxjsS.json} |  21 +-
 ...vanced_Quarterstaff_FAlwfHMZ57zMeEXX.json} |  21 +-
 ...pon_Advanced_Rapier_2Ja5VIvPszG0ZOFa.json} |  21 +-
 ...ced_Returning_Blade_EiWtyGG1438yU7FE.json} |  18 +-
 ...on_Advanced_Scepter_svrqrOD9ICZtyX5C.json} |  21 +-
 ...n_Advanced_Shortbow_5SsnVWZfaLNZ262c.json} |  21 +-
 ...Advanced_Shortstaff_u7WEnZfpJibSbq7j.json} |  21 +-
 ...apon_Advanced_Spear_E5SEF7QYomDM6tIn.json} |  21 +-
 ...eapon_Advanced_Wand_EBYFq8AMUrVmlV10.json} |  21 +-
 ..._Advanced_Warhammer_7oyZvWDs9QXQJLkX.json} |  21 +-
 ...on_Arcane_Gauntlets_Py1MXNUmI81Qq5Eb.json} |  21 +-
 ...pon_Axe_of_Fortunis_7acS1kBjE98WwngU.json} |  20 +-
 ...=> weapon_Battleaxe_FasGIMef6XBoygUG.json} |  21 +-
 ...ack_Powder_Revolver_yKRCcrggt4kroLGc.json} |  21 +-
 ... weapon_Bladed_Whip_DcugVpNyWKgoKvSf.json} |  21 +-
 ...apon_Blessed_Anlace_c93VQ2ZLScV0o0m5.json} |  20 +-
 ...> weapon_Bloodstaff_nrb7pyh8YYncOWti.json} |  21 +-
 ... weapon_Blunderbuss_xLFEBehUK17zML2B.json} |  21 +-
 ...> weapon_Bravesword_JCvRYFpIwdqfmqdk.json} |  21 +-
 ...> weapon_Broadsword_tB2lDopuefiG4gD7.json} |  21 +-
 ...eapon_Casting_Sword_qfJbWjwKZ5k8vzCr.json} |  21 +-
 ... => weapon_Crossbow_sTIiyrI2o2GHKp0u.json} |  21 +-
 ...eapon_Curved_Dagger_IQpfAz5mjXBNgq7A.json} |  21 +-
 ...n => weapon_Cutlass_HdyZyBywO1byCsfM.json} |  21 +-
 ...on => weapon_Dagger_PQ8QSP0BhzJcVy4Z.json} |  21 +-
 ...on_Devouring_Dagger_iv4ojTQDd91tOGeP.json} |  21 +-
 ...weapon_Double_Flail_9U7Q69SA2V4WtlyE.json} |  21 +-
 ...on_Dual_Ended_Sword_wT0yIYoQmgXgUyhO.json} |  21 +-
 ...=> weapon_Dualstaff_953Q2rTuxkAuNhyh.json} |  21 +-
 ...=> weapon_Ego_Blade_wiud7JWoMilk2KQN.json} |  21 +-
 ...=> weapon_Elder_Bow_rgUz50aNrRn9poGf.json} |  21 +-
 ...on_Extended_Polearm_Yg3WZZq6jgAn9xED.json} |  21 +-
 ...weapon_Finehair_Bow_KocXOIOSVFazOqFh.json} |  21 +-
 ...=> weapon_Firestaff_0jQunbQG1LnTRdOI.json} |  20 +-
 ...on_Flickerfly_Blade_QGAvPrLPWHJWcAV1.json} |  21 +-
 ...loating_Bladeshards_arBh0DEfg5X9TJbn.json} |  21 +-
 ...eapon_Fusion_Gloves_Rj1eYiu6BPp58xn2.json} |  21 +-
 ...> weapon_Ghostblade_QzymDpCD7NMbLlpu.json} |  20 +-
 ...> weapon_Gilded_Bow_XONn2rH8NyZbXi68.json} |  20 +-
 ...pon_Gilded_Falchion_ZOL4O7BqmcmYHfjY.json} |  21 +-
 ...eapon_Glowing_Rings_4Mjzmyvjwhq3mm6l.json} |  21 +-
 ... => weapon_Greatbow_cxBpxu3X2bNs8HN4.json} |  21 +-
 ...> weapon_Greatstaff_AYSnrvAX0IgbexFI.json} |  21 +-
 ...> weapon_Greatsword_GsRLkQG13xoPc7kq.json} |  21 +-
 ...n => weapon_Halberd_0SlckjJMb30R5ErF.json} |  21 +-
 ...weapon_Hallowed_Axe_WckoUxyJZfvq9cR7.json} |  21 +-
 ...pon_Hammer_of_Exota_p889rprb5FMsSlK5.json} |  21 +-
 ...pon_Hammer_of_Wrath_cHrHkq7AwYk34ach.json} |  21 +-
 ... weapon_Hand_Cannon_4tAGYqfm0fsSncr4.json} |  21 +-
 ...> weapon_Hand_Runes_mPaKupCQhJzS5wMc.json} |  21 +-
 ...apon_Ilmari_s_Rifle_qGH3VFuBQV8DGhPd.json} |  21 +-
 ...pon_Impact_Gauntlet_H73r7YuOkVmAgIci.json} |  21 +-
 ...ed_Arcane_Gauntlets_CTkuKjwWfrvmmRvH.json} |  21 +-
 ..._Improved_Battleaxe_c6ss8Ydb5ydmLsnO.json} |  21 +-
 ...Improved_Broadsword_lXRVCITpGlXF3sOw.json} |  21 +-
 ...n_Improved_Crossbow_TSvPCik6v3UYqr9f.json} |  21 +-
 ...on_Improved_Cutlass_sCuu0hIzsdWowP4h.json} |  21 +-
 ...pon_Improved_Dagger_qyMnZ5uJTeqgiEPb.json} |  21 +-
 ..._Improved_Dualstaff_wNB9Uyl3aY842K9p.json} |  21 +-
 ...roved_Glowing_Rings_9jzi0f7MOL3Ot1tj.json} |  21 +-
 ...Improved_Greatstaff_rZEHNAwKW1vgS3Or.json} |  21 +-
 ...Improved_Greatsword_c1HtTqfS9OnNv1Bt.json} |  21 +-
 ...on_Improved_Halberd_0i6CzOfsBoZjbuTZ.json} |  21 +-
 ...proved_Hallowed_Axe_6zrrwIYQNa7gHhDA.json} |  21 +-
 ...Improved_Hand_Runes_PlJj4nObc6zDVVIv.json} |  21 +-
 ...on_Improved_Longbow_S9fPH89qdYHAygG5.json} |  21 +-
 ..._Improved_Longsword_1sk01NDq0XVHAFpa.json} |  21 +-
 ...eapon_Improved_Mace_KwCBPCV9wFH9FuxZ.json} |  21 +-
 ...proved_Quarterstaff_CgELEWAyG4ASDLZA.json} |  21 +-
 ...pon_Improved_Rapier_BCUXoneSYSw0imXe.json} |  21 +-
 ...ved_Returning_Blade_YHlzVFpHVYyDJSwc.json} |  21 +-
 ...on_Improved_Scepter_uPqG5L8ltREV4605.json} |  21 +-
 ...n_Improved_Shortbow_ZSBJ0cYWHrWMMJHc.json} |  21 +-
 ...Improved_Shortstaff_RkJezS4b5VwesYoR.json} |  21 +-
 ...apon_Improved_Spear_KnWHxJNf7ZJWePdg.json} |  21 +-
 ...eapon_Improved_Wand_NzvNV6lnWPbk7AQW.json} |  21 +-
 ..._Improved_Warhammer_0grDkkD9bYHT3Dk5.json} |  21 +-
 ...apon_Keeper_s_Staff_EyPLO7vy5VcmEKbA.json} |  21 +-
 ...apon_Knuckle_Blades_kzE863F8Kqh6Ssrw.json} |  21 +-
 ...> weapon_Labrys_Axe_Wzkf1I3PMKX1aL22.json} |  21 +-
 ...ry_Arcane_Gauntlets_brGbwSLC8i5KSIgw.json} |  21 +-
 ...Legendary_Battleaxe_RZqNqIJA8Y76vyAS.json} |  21 +-
 ...egendary_Broadsword_ZagTf04G2LUzBVIJ.json} |  21 +-
 ..._Legendary_Crossbow_kHO5zhsA6neUWIIY.json} |  21 +-
 ...n_Legendary_Cutlass_5yF2KXtThRMjHlVY.json} |  21 +-
 ...on_Legendary_Dagger_KWPrdOcsjw0UqiaO.json} |  21 +-
 ...Legendary_Dualstaff_CA7tFWu0yJY8AKaf.json} |  21 +-
 ...ndary_Glowing_Rings_M5ksicUetj1cUQV4.json} |  21 +-
 ...egendary_Greatstaff_8vK8Cgp43QjVAqO4.json} |  21 +-
 ...egendary_Greatsword_g1Jg7UAyWPHswjec.json} |  21 +-
 ...n_Legendary_Halberd_r0XAlwFuUBrKALfw.json} |  21 +-
 ...endary_Hallowed_Axe_cgmsLxAQ3o9oUoCG.json} |  21 +-
 ...egendary_Hand_Runes_aY7GF7lU7pozg8ji.json} |  21 +-
 ...n_Legendary_Longbow_0VMzALprSt7t4vk7.json} |  21 +-
 ...Legendary_Longsword_OfYAhe88Z0biN4Sa.json} |  21 +-
 ...apon_Legendary_Mace_ZImmy9vIJlmnzEPr.json} |  21 +-
 ...endary_Quarterstaff_pinNKWkejkzHPCQj.json} |  21 +-
 ...on_Legendary_Rapier_90XtvPz8EfjqdMcM.json} |  21 +-
 ...ary_Returning_Blade_RYRwUObgRgWOWjAY.json} |  22 +-
 ...n_Legendary_Scepter_zut78R32b72vCe2W.json} |  21 +-
 ..._Legendary_Shortbow_KDQClgBxRL6ky6pP.json} |  21 +-
 ...egendary_Shortstaff_a3Am2xUZxQuqkvqQ.json} |  21 +-
 ...pon_Legendary_Spear_zT53LgiBetkWtQKE.json} |  21 +-
 ...apon_Legendary_Wand_YAMbvl0sGYWaeGuh.json} |  21 +-
 ...Legendary_Warhammer_Ms76FGrkbxJu3xdP.json} |  21 +-
 ...n => weapon_Longbow_QxDqWi0hu9uNwwe6.json} |  21 +-
 ...=> weapon_Longsword_h8XhL7dB7mJbFf6R.json} |  21 +-
 ...json => weapon_Mace_CFIK5SxXN2FxV8ew.json} |  21 +-
 ... => weapon_Mage_Orb_xP8qusQ2orIHnDIk.json} |  21 +-
 ...apon_Magus_Revolver_QBZi7ftJIv4VRSjX.json} |  21 +-
 ...on_Meridian_Cutlass_O5e5ltywjeEwXZw5.json} |  20 +-
 ...weapon_Midas_Scythe_NCQxM3efha2fi3un.json} |  21 +-
 ...weapon_Quarterstaff_J4Mlwt3BmVeWV6vC.json} |  21 +-
 ...on => weapon_Rapier_GldFyzsA56nyVQZR.json} |  21 +-
 ...n_Retractable_Saber_7lqP8EycKwpsYp2H.json} |  21 +-
 ...pon_Returning_Blade_JsKC4GypAiA67a60.json} |  20 +-
 ...eapon_Ricochet_Axes_ianVggptVejn9RnU.json} |  21 +-
 ..._Runes_of_Ruination_SyrN9HZ2q5J3uw7f.json} |  21 +-
 ...n => weapon_Scepter_As9XfR5ZpwnfcEsM.json} |  21 +-
 ...on_Scepter_of_Elias_XIrmU6NCXXElx2JI.json} |  21 +-
 ... => weapon_Shortbow_GoooPAB5sJ9eDPWz.json} |  21 +-
 ...> weapon_Shortstaff_ydm5W8kYujEbElmj.json} |  21 +-
 ...Siphoning_Gauntlets_WdbNUGWB2Dsx0JLs.json} |  21 +-
 ...> weapon_Sledge_Axe_BYcF7qAR8yR5Rv0f.json} |  21 +-
 ...son => weapon_Spear_ZsX59BQsuGvlB3mw.json} |  21 +-
 ...> weapon_Spiked_Bow_oyQRdPFBkPu1G7uN.json} |  21 +-
 ...Steelforged_Halberd_rrWmGNT0L0Cvw9Tx.json} |  21 +-
 ..._Swinging_Ropeblade_e6DVC3wUxMM7puMK.json} |  21 +-
 ...rd_of_Light___Flame_8Sa5TccQvhWde1O7.json} |  22 +-
 ...weapon_Talon_Blades_lswl0hauQmLAQh58.json} |  21 +-
 ...> weapon_Thistlebow_FoLC2rSujCBXxtZ9.json} |  21 +-
 ...pon_Urok_Broadsword_kpp3gAPXoke7mx0d.json} |  21 +-
 ...and_of_Enthrallment_8u0tnoaSBpRWmVex.json} |  21 +-
 ...eapon_Wand_of_Essek_lNWN759jT1Z098RI.json} |  22 +-
 ...json => weapon_Wand_pTOX05HxPJgwwMnf.json} |  21 +-
 ...> weapon_War_Scythe_UhWpEKkfo9mjRgnw.json} |  21 +-
 ...=> weapon_Warhammer_54gLWy5YhwB9YeTA.json} |  21 +-
 ...on_Widogast_Pendant_6wASGCohz4Y7CxjK.json} |  20 +-
 ...pon_Yutari_Bloodbow_zDVW3GhTnSwISSxF.json} |  21 +-
 .../folders_Bard_GdwNrxosxgFCMwUJ.json        |  23 ++
 .../folders_Druid_8o3AE33T1pSQH296.json       |  23 ++
 .../folders_Guardian_GECczaEI6KI9W7B7.json    |  23 ++
 .../folders_Ranger_cTmpeni3Jg55NkX4.json      |  23 ++
 .../folders_Rogue_2ifNVaI1HZtXVSdf.json       |  23 ++
 .../folders_Seraph_8fx2IqJphzGyrZbx.json      |  23 ++
 .../folders_Sorcerer_3H1ThzHW4rZStZrr.json    |  23 ++
 .../folders_Warrior_OzZ4UX9B6eNEzF49.json     |  23 ++
 .../folders_Wizard_H1Djv0I92cn25M4t.json      |  23 ++
 .../subclass_Troubadour_T1iBO8i0xRF5c8Q2.json |   8 +-
 .../subclass_Wordsmith_FXT65YDVWFy85EI0.json  |   8 +-
 system.json                                   | 276 ++----------------
 346 files changed, 4914 insertions(+), 2550 deletions(-)
 delete mode 100644 src/packs/class-features/feature_Combo_Strikes_RNC8NT8F6x73gRZi.json
 delete mode 100644 src/packs/class-features/feature_I_Am_The_Weapon_ihtvQaH18eG56RWY.json
 delete mode 100644 src/packs/class-features/feature_Staggering_Strike_xC0ZG862KrjHGHlx.json
 create mode 100644 src/packs/class-features/folders_Bard_3QoIMKARHfRnBvQJ.json
 create mode 100644 src/packs/class-features/folders_Druid_l94HTIXSvdZG3zIh.json
 create mode 100644 src/packs/class-features/folders_Guardian_imOcur5Zv8WcMHXz.json
 create mode 100644 src/packs/class-features/folders_Ranger_84neMcqoIRAoIvXP.json
 create mode 100644 src/packs/class-features/folders_Rogue_AzwvgmcvToIUGYti.json
 create mode 100644 src/packs/class-features/folders_Seraph_aI54jXjBNrAOm7R8.json
 create mode 100644 src/packs/class-features/folders_Sorcerer_ncQG0s0ttAPObaeV.json
 create mode 100644 src/packs/class-features/folders_Warrior_3znRxBqsK0lOJhvJ.json
 create mode 100644 src/packs/class-features/folders_Wizard_8I0S9f458qu36qSW.json
 delete mode 100644 src/packs/classes/class_Fighter_HPzaWaZBc6RvElKd.json
 delete mode 100644 src/packs/classes/class_Warlock_kSSIqmgxFTm1Xr9s.json
 create mode 100644 src/packs/domains/folders_Arcana_jc1HbSpJmjAsq9GX.json
 create mode 100644 src/packs/domains/folders_Blade_gXc5zPwSyZXqrC6D.json
 create mode 100644 src/packs/domains/folders_Bone_IMRfDo5DDrpniKKv.json
 create mode 100644 src/packs/domains/folders_Codex_q9VsNwg9r0bTn2ll.json
 create mode 100644 src/packs/domains/folders_Grace_c380soh7Z1YAqzOT.json
 create mode 100644 src/packs/domains/folders_Level_10_7Cs44YADBTmmtCw6.json
 create mode 100644 src/packs/domains/folders_Level_10_7pKKYgRQAKlQAksV.json
 create mode 100644 src/packs/domains/folders_Level_10_8qr1Y2tW3vLwNZOg.json
 create mode 100644 src/packs/domains/folders_Level_10_D1MFCYakdFIKDmcD.json
 create mode 100644 src/packs/domains/folders_Level_10_Hs6POmXKThDXQJBn.json
 create mode 100644 src/packs/domains/folders_Level_10_IIVaYseNJbA2ta1B.json
 create mode 100644 src/packs/domains/folders_Level_10_nZr2hsu6Q6TlFXQn.json
 create mode 100644 src/packs/domains/folders_Level_10_pPzU9WOQNv3ckO1w.json
 create mode 100644 src/packs/domains/folders_Level_10_wdhWWqWlPiBxtsvr.json
 create mode 100644 src/packs/domains/folders_Level_1_9Xc6KzNyjDtTGZkp.json
 create mode 100644 src/packs/domains/folders_Level_1_EJoXzO85rG5EiZsh.json
 create mode 100644 src/packs/domains/folders_Level_1_LlWJaBZOKh0Ot2kD.json
 create mode 100644 src/packs/domains/folders_Level_1_PeeIjbkBv41613yZ.json
 create mode 100644 src/packs/domains/folders_Level_1_QpOL7jPbMBzH96qR.json
 create mode 100644 src/packs/domains/folders_Level_1_nVCKcZkcoEivYJaF.json
 create mode 100644 src/packs/domains/folders_Level_1_o7kvw9NRGvDZSce2.json
 create mode 100644 src/packs/domains/folders_Level_1_sCiN7DoysdKceIMd.json
 create mode 100644 src/packs/domains/folders_Level_1_tqhasjtHBX0F20lN.json
 create mode 100644 src/packs/domains/folders_Level_2_2yh8wuYprOyswf0r.json
 create mode 100644 src/packs/domains/folders_Level_2_Abn46nCQst6kpGeA.json
 create mode 100644 src/packs/domains/folders_Level_2_Q9rmrfeKqcqBNnWc.json
 create mode 100644 src/packs/domains/folders_Level_2_j9i2Q6Z7Z82udHn1.json
 create mode 100644 src/packs/domains/folders_Level_2_o7t2fsAmRxKLoHrO.json
 create mode 100644 src/packs/domains/folders_Level_2_pk4xXE8D3vTawrqj.json
 create mode 100644 src/packs/domains/folders_Level_2_pu3xD4rEkdfdAvGc.json
 create mode 100644 src/packs/domains/folders_Level_2_u8Yz2hUTaF3N2fFT.json
 create mode 100644 src/packs/domains/folders_Level_2_xZrCYAd05ayNu1yW.json
 create mode 100644 src/packs/domains/folders_Level_3_7XeaYZPMB0SopAfo.json
 create mode 100644 src/packs/domains/folders_Level_3_8ZfL09F8MiOEUzzw.json
 create mode 100644 src/packs/domains/folders_Level_3_GhLhMfmSgGqS9bwU.json
 create mode 100644 src/packs/domains/folders_Level_3_Oo9EkkF7CDD3QZEG.json
 create mode 100644 src/packs/domains/folders_Level_3_eR7sP5jQwfCLORUe.json
 create mode 100644 src/packs/domains/folders_Level_3_hoDIPBzwYPxiSXGU.json
 create mode 100644 src/packs/domains/folders_Level_3_mOv6BGhJAeGrzA84.json
 create mode 100644 src/packs/domains/folders_Level_3_uXGugK72AffddFdH.json
 create mode 100644 src/packs/domains/folders_Level_3_wWL9mV6i2EGX5xHS.json
 create mode 100644 src/packs/domains/folders_Level_4_1e5Sn8OXxEQ57GSD.json
 create mode 100644 src/packs/domains/folders_Level_4_3e8kCsLzLxiACJDb.json
 create mode 100644 src/packs/domains/folders_Level_4_BJIiOIWAQUz5zuqo.json
 create mode 100644 src/packs/domains/folders_Level_4_WTdOLLkQyPdg0KWU.json
 create mode 100644 src/packs/domains/folders_Level_4_cOZgzLQRGNnBzsHT.json
 create mode 100644 src/packs/domains/folders_Level_4_rUGDM9JvGfhh9a2Y.json
 create mode 100644 src/packs/domains/folders_Level_4_thP6nUk0nkrNcpXY.json
 create mode 100644 src/packs/domains/folders_Level_4_vAZKNDtAafd7HDWV.json
 create mode 100644 src/packs/domains/folders_Level_4_yalAnCU3SndrYImF.json
 create mode 100644 src/packs/domains/folders_Level_5_6gA7SmNIblkMaYgr.json
 create mode 100644 src/packs/domains/folders_Level_5_8erksbTp7ic6in4I.json
 create mode 100644 src/packs/domains/folders_Level_5_BQ1L4EiwOs84Xysp.json
 create mode 100644 src/packs/domains/folders_Level_5_Emnx4o1DWGTVKoAg.json
 create mode 100644 src/packs/domains/folders_Level_5_Jbw6Teaha6So9tym.json
 create mode 100644 src/packs/domains/folders_Level_5_XDSp0FdiYDVO0tfw.json
 create mode 100644 src/packs/domains/folders_Level_5_ZZHIbaynhzVArA1p.json
 create mode 100644 src/packs/domains/folders_Level_5_l387HKojhqcDAV0b.json
 create mode 100644 src/packs/domains/folders_Level_5_pDtffkb0SMv1O8pL.json
 create mode 100644 src/packs/domains/folders_Level_6_EiP5dLozOFZKIeWN.json
 create mode 100644 src/packs/domains/folders_Level_6_FcMclsLDy86EicA6.json
 create mode 100644 src/packs/domains/folders_Level_6_OwsbTSWzKq2WJmQN.json
 create mode 100644 src/packs/domains/folders_Level_6_VgADdqYn9nS9G1Us.json
 create mode 100644 src/packs/domains/folders_Level_6_gqnmAgerh7HhNo7t.json
 create mode 100644 src/packs/domains/folders_Level_6_nKCmeAn7ESsb4byE.json
 create mode 100644 src/packs/domains/folders_Level_6_pYEavNqteiQepvvD.json
 create mode 100644 src/packs/domains/folders_Level_6_u5Lq2kfC8LlDAGDC.json
 create mode 100644 src/packs/domains/folders_Level_6_xuGz0QPNlkTOV0rV.json
 create mode 100644 src/packs/domains/folders_Level_7_HAGbPLHwm0UozDeG.json
 create mode 100644 src/packs/domains/folders_Level_7_ML2JusN36oJoR8QA.json
 create mode 100644 src/packs/domains/folders_Level_7_W81LnTWzwmoaycTl.json
 create mode 100644 src/packs/domains/folders_Level_7_Z6oglw8LIOrtBcN6.json
 create mode 100644 src/packs/domains/folders_Level_7_bCjkysrofWPiZqNh.json
 create mode 100644 src/packs/domains/folders_Level_7_gEVGjjPrjqxxZkb5.json
 create mode 100644 src/packs/domains/folders_Level_7_hh2vkggcAQ0QUE6C.json
 create mode 100644 src/packs/domains/folders_Level_7_i5iDLXMZLc0ckWI5.json
 create mode 100644 src/packs/domains/folders_Level_7_kj3gwg5bmCqwFYze.json
 create mode 100644 src/packs/domains/folders_Level_8_7O1tTswJMNdPgLsx.json
 create mode 100644 src/packs/domains/folders_Level_8_8bWpGblWODdf8mDR.json
 create mode 100644 src/packs/domains/folders_Level_8_A00z8Q8B3aKApKzI.json
 create mode 100644 src/packs/domains/folders_Level_8_FUzQxkv4gFc46SIs.json
 create mode 100644 src/packs/domains/folders_Level_8_KmaX6wNBLzkFevaG.json
 create mode 100644 src/packs/domains/folders_Level_8_me7ywrVh38j6T8Sm.json
 create mode 100644 src/packs/domains/folders_Level_8_n7pgTBYSItMzCX0s.json
 create mode 100644 src/packs/domains/folders_Level_8_qY4Zqc1Ch6p317uK.json
 create mode 100644 src/packs/domains/folders_Level_8_taM81THa8h6Bv2Xa.json
 create mode 100644 src/packs/domains/folders_Level_9_2rqOUxEglhhPKk2j.json
 create mode 100644 src/packs/domains/folders_Level_9_8DOVMjTtZFKtwX4p.json
 create mode 100644 src/packs/domains/folders_Level_9_KwZYrsSUYnHiNtPl.json
 create mode 100644 src/packs/domains/folders_Level_9_QYdeGsmVYIF34kZR.json
 create mode 100644 src/packs/domains/folders_Level_9_R5afi5bhq9ccnYY2.json
 create mode 100644 src/packs/domains/folders_Level_9_eg2vM8j9xhya9Rwa.json
 create mode 100644 src/packs/domains/folders_Level_9_fucNnucgoUjbzvcA.json
 create mode 100644 src/packs/domains/folders_Level_9_sGCKwmomutMTv0Xs.json
 create mode 100644 src/packs/domains/folders_Level_9_yFcD1LOM3xKbkNYl.json
 create mode 100644 src/packs/domains/folders_Midnight_tgwSE1t5B0Ka10Xh.json
 create mode 100644 src/packs/domains/folders_Sage_io1DZ9MMMDfuNf8b.json
 create mode 100644 src/packs/domains/folders_Splendor_TL1TutmbeCVJ06nR.json
 create mode 100644 src/packs/domains/folders_Valor_yPVeShe47ETIqs9q.json
 rename src/packs/items/{armor/tier3/armor_Advanced_Chainmail_Armor_X5k7Stier3vxz4V0.json => armors/armor_Advanced_Chainmail_Armor_CsZ4X1gMhKrfK0B8.json} (68%)
 rename src/packs/items/{armor/tier3/armor_Advanced_Full_Plate_Armor_IaHC7MKRdxUh1VqK.json => armors/armor_Advanced_Full_Plate_Armor_1mJ37VQGgO7nGyaq.json} (65%)
 rename src/packs/items/{armor/tier3/armor_Advanced_Gambeson_Armor_45Ecu1PgMahpKbsN.json => armors/armor_Advanced_Gambeson_Armor_0BAULrYPaX7tcoA4.json} (65%)
 rename src/packs/items/{armor/tier3/armor_Advanced_Leather_Armor_v6V96UsXSuyx1UV7.json => armors/armor_Advanced_Leather_Armor_wWecy3cm3cZzuG0o.json} (66%)
 rename src/packs/items/{armor/tier3/armor_Bellamoi_Fine_Armor_iBbmRG7cNXmqs4ga.json => armors/armor_Bellamoi_Fine_Armor_scTgxT4uMylqtoW0.json} (66%)
 rename src/packs/items/{armor/tier3/armor_Bladefare_Armor_YVfTNS1YD5sbKx3S.json => armors/armor_Bladefare_Armor_kYj9YqqWEWTk7Of4.json} (65%)
 rename src/packs/items/{armor/tier1/armor_Chainmail_Armor_s7PUmApOFX0YryDG.json => armors/armor_Chainmail_Armor_cihoaJXe1YfLaz60.json} (66%)
 rename src/packs/items/{armor/tier4/armor_Channeling_Armor_oceDrXoEGSTQXeJd.json => armors/armor_Channeling_Armor_plRn94qJi7WF2P2O.json} (62%)
 rename src/packs/items/{armor/tier3/armor_Dragonscale_Armor_XeoC52EJA4dV9l6W.json => armors/armor_Dragonscale_Armor_RL1AKA4VNuRnYiR3.json} (66%)
 rename src/packs/items/{armor/tier4/armor_Dunamis_Silkchain_ffIEaWPRHLlWy1Ft.json => armors/armor_Dunamis_Silkchain_oTpJi31bKq4rut07.json} (62%)
 rename src/packs/items/{armor/tier2/armor_Elundrian_Chain_Armor_ED8RhELKD9Pgnxgb.json => armors/armor_Elundrian_Chain_Armor_ShMNcz0KBsToMC44.json} (66%)
 rename src/packs/items/{armor/tier4/armor_Emberwoven_Armor_8YhysA01kwSSX8Vg.json => armors/armor_Emberwoven_Armor_8sUPsWMhjQprt8yI.json} (62%)
 rename src/packs/items/{armor/tier4/armor_Full_Fortified_Armor_Zk0WWk1WTc5X4DSv.json => armors/armor_Full_Fortified_Armor_mb5OFsUSlPEPb4wU.json} (63%)
 rename src/packs/items/{armor/tier1/armor_Full_Plate_Armor_LLL9gflIUF8ZFkzZ.json => armors/armor_Full_Plate_Armor_Vc3mfssiGZFQFuAf.json} (65%)
 rename src/packs/items/{armor/tier1/armor_Gambeson_Armor_alp2w20UmD7jKXOL.json => armors/armor_Gambeson_Armor_kGm7XO3LZDZWvSXq.json} (64%)
 rename src/packs/items/{armor/tier2/armor_Harrowbone_Armor_Rl8dZeOnM3foAnth.json => armors/armor_Harrowbone_Armor_uPpGA468Zi8TSQCd.json} (64%)
 rename src/packs/items/{armor/tier2/armor_Improved_Chainmail_Armor_kVpH1vvbdK5prOT5.json => armors/armor_Improved_Chainmail_Armor_f0EfsoCmlg4cTIL1.json} (66%)
 rename src/packs/items/{armor/tier2/armor_Improved_Full_Plate_Armor_E6asa0VMozd4zZbV.json => armors/armor_Improved_Full_Plate_Armor_nHcz1Ed7FXokdeyu.json} (65%)
 rename src/packs/items/{armor/tier2/armor_Improved_Gambeson_Armor_ou0he5rHyi06dqO3.json => armors/armor_Improved_Gambeson_Armor_dC5XHTRtqQvuTMef.json} (67%)
 rename src/packs/items/{armor/tier2/armor_Improved_Leather_Armor_Lx94Q7Cl7wMwcl58.json => armors/armor_Improved_Leather_Armor_mQJ55Nd8ugzjGvWl.json} (66%)
 rename src/packs/items/{armor/tier2/armor_Irontree_Breastplate_Armor_4ImHfMsKbDzIFRNF.json => armors/armor_Irontree_Breastplate_Armor_E6Ri6nwMtVOBedCy.json} (66%)
 rename src/packs/items/{armor/tier1/armor_Leather_Armor_QMCh4ooGamb9oIGz.json => armors/armor_Leather_Armor_Fcz2Gg3V6O9whY8j.json} (65%)
 rename src/packs/items/{armor/tier4/armor_Legendary_Chainmail_Armor_CiH20oR05hKNUdp3.json => armors/armor_Legendary_Chainmail_Armor_MjVHoiFL4ooLY9YP.json} (63%)
 rename src/packs/items/{armor/tier4/armor_Legendary_Full_Plate_Armor_h172qCAmBNvPhE25.json => armors/armor_Legendary_Full_Plate_Armor_ZS7GwxrNThKZpD6l.json} (65%)
 rename src/packs/items/{armor/tier4/armor_Legendary_Gambeson_Armor_CJLU4txFc0QYJF7G.json => armors/armor_Legendary_Gambeson_Armor_VkRQZFSXkrLm0gQD.json} (63%)
 rename src/packs/items/{armor/tier4/armor_Legendary_Leather_Armor_XguKW7nNTCOqyWRw.json => armors/armor_Legendary_Leather_Armor_eWPVkncjAu9h6H0E.json} (63%)
 rename src/packs/items/{armor/tier3/armor_Monett_s_Cloak_eqdjA5Z2eiu3w9z3.json => armors/armor_Monett_s_Cloak_CDUbtl6zED5uhOsA.json} (65%)
 rename src/packs/items/{armor/tier2/armor_Rosewild_Armor_Cd0jzt1EBUiihcEQ.json => armors/armor_Rosewild_Armor_1d2XtD71WGMn1CNT.json} (65%)
 rename src/packs/items/{armor/tier3/armor_Runes_of_Fortification_FBUDL6gCPh9HiOSu.json => armors/armor_Runes_of_Fortification_HLiw7DTgSgY2F1rC.json} (66%)
 rename src/packs/items/{armor/tier2/armor_Runetan_Floating_Armor_VUYFNEt6xNVHw9Yd.json => armors/armor_Runetan_Floating_Armor_jQTUywiUZzoheULn.json} (66%)
 rename src/packs/items/{armor/tier4/armor_Savior_Chainmail_ixcNkPjIPpLgPuaA.json => armors/armor_Savior_Chainmail_S1jq3KXLHWw3OLgX.json} (62%)
 rename src/packs/items/{armor/tier3/armor_Spiked_Plate_Armor_Enscb2W5lei9FGuc.json => armors/armor_Spiked_Plate_Armor_TkNjxTz0IapYe0YU.json} (66%)
 rename src/packs/items/{armor/tier2/armor_Tyris_Soft_Armor_0mqF7VUJvEUq2Umv.json => armors/armor_Tyris_Soft_Armor_4NRiIunReDbj9zoC.json} (66%)
 rename src/packs/items/{armor/tier4/armor_Veritas_Oal_Armor_QM9sfBKRcrKXZXHV.json => armors/armor_Veritas_Oal_Armor_1ByiV04ofK4TG5vR.json} (62%)
 create mode 100644 src/packs/items/armors/folders_Tier_1_h4QgrovjVZ1oee7O.json
 create mode 100644 src/packs/items/armors/folders_Tier_2_hLn0v6ov6KuFgptu.json
 create mode 100644 src/packs/items/armors/folders_Tier_3_rkSdPu86ybLz6aKF.json
 create mode 100644 src/packs/items/armors/folders_Tier_4_Hbjp64XzuyJs2hOs.json
 create mode 100644 src/packs/items/weapons/folders_Tier_1_d7tdCsIUd94XuTtq.json
 create mode 100644 src/packs/items/weapons/folders_Tier_2_ereMKW01MCYg0qUY.json
 create mode 100644 src/packs/items/weapons/folders_Tier_3_oreMpiiytMRaR9sy.json
 create mode 100644 src/packs/items/weapons/folders_Tier_4_UNDVQEo6UtTuueNQ.json
 delete mode 100644 src/packs/items/weapons/tier3/weapon_Advanced_Glowing_Rings_tiF1InKThXGrG5A5.json
 rename src/packs/items/weapons/{tier4/weapon_Aantari_Bow_9SVzLUWdp7ZeSqH5.json => weapon_Aantari_Bow_DNSHS8KTawyOfQqH.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Arcane_Gauntlets_f1v9t1oDs4c9TI2K.json => weapon_Advanced_Arcane_Gauntlets_wy7ylEZZL6quWba0.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Battleaxe_55kmkScxSwAGXSdN.json => weapon_Advanced_Battleaxe_8crRfaAQ9g3ZSlz0.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Broadsword_6iBBqlwCA1xBpEkz.json => weapon_Advanced_Broadsword_NM9iNiVQSWRfUzbC.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Crossbow_CwRGALuF4o0NJe3y.json => weapon_Advanced_Crossbow_avxhDjL3lxBMpqq5.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Cutlass_rVoF4pXluLGXbAlk.json => weapon_Advanced_Cutlass_kBwwJ1vbuy5lyIyp.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Dagger_HoBYwjE8G9OTqISk.json => weapon_Advanced_Dagger_ZjZwghxJTAhbJwgf.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Dualstaff_Jtzvg4VmTzQyEvgw.json => weapon_Advanced_Dualstaff_9f1XlCd3fN7SgTkk.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Greatstaff_lIk92ZPvryDQrtrm.json => weapon_Advanced_Greatstaff_r45VbaXuCbAgeh6p.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Greatsword_dYFKPIujOvDH2sEx.json => weapon_Advanced_Greatsword_XAkNXcsfWLoNeyoF.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Halberd_hX3CM1pvIfeebF2g.json => weapon_Advanced_Halberd_1ro8WmVPGvU5AcNb.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Hallowed_Axe_Gf7I4j8skD862SU0.json => weapon_Advanced_Hallowed_Axe_6tltkuPbrHaqbCO0.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Hand_Runes_uuZTjjTN73zXYVxE.json => weapon_Advanced_Hand_Runes_UKnk8XcmeG5BiNEP.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Longbow_wDsxrxhkuJwFEw8q.json => weapon_Advanced_Longbow_CTBVsiB2abltveHL.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Longsword_ohLQbYRlQx4ivJMl.json => weapon_Advanced_Longsword_MGjqO5ovO4m63pnR.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Mace_d0SqlcuhkKufJScF.json => weapon_Advanced_Mace_bhPYWRBEYjdLxjsS.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Quarterstaff_w3Hze7ailRPQh4kc.json => weapon_Advanced_Quarterstaff_FAlwfHMZ57zMeEXX.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Rapier_JEQZMzrlsoU2Pjd0.json => weapon_Advanced_Rapier_2Ja5VIvPszG0ZOFa.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Returning_Blade_fcLmPt9wFqM1xojl.json => weapon_Advanced_Returning_Blade_EiWtyGG1438yU7FE.json} (72%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Scepter_BqYoefSRnoQVpC2Q.json => weapon_Advanced_Scepter_svrqrOD9ICZtyX5C.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Shortbow_HLdn8xNWmDkdtFL7.json => weapon_Advanced_Shortbow_5SsnVWZfaLNZ262c.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Shortstaff_1OgEUTyTwP63JuWE.json => weapon_Advanced_Shortstaff_u7WEnZfpJibSbq7j.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Spear_ZZWf8dSIs9m2PH2h.json => weapon_Advanced_Spear_E5SEF7QYomDM6tIn.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Wand_tAEIzS7BlPz9D7xy.json => weapon_Advanced_Wand_EBYFq8AMUrVmlV10.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Advanced_Warhammer_IV3HYPjJ5uRaq80h.json => weapon_Advanced_Warhammer_7oyZvWDs9QXQJLkX.json} (68%)
 rename src/packs/items/weapons/{tier1/weapon_Arcane_Gauntlets_sZXALjdKu3HQ8hQE.json => weapon_Arcane_Gauntlets_Py1MXNUmI81Qq5Eb.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Axe_of_Fortunis_X1pTuQSSPm7PBPi0.json => weapon_Axe_of_Fortunis_7acS1kBjE98WwngU.json} (69%)
 rename src/packs/items/weapons/{tier1/weapon_Battleaxe_27Kmwjycfn1De9ig.json => weapon_Battleaxe_FasGIMef6XBoygUG.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Black_Powder_Revolver_POHACCee5wa92XD1.json => weapon_Black_Powder_Revolver_yKRCcrggt4kroLGc.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Bladed_Whip_3YR4qTSUT5TAzSNs.json => weapon_Bladed_Whip_DcugVpNyWKgoKvSf.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Blessed_Anlace_p0oeyqhAIRdAQv6k.json => weapon_Blessed_Anlace_c93VQ2ZLScV0o0m5.json} (69%)
 rename src/packs/items/weapons/{tier4/weapon_Bloodstaff_LWYvJXHStsyNaYBR.json => weapon_Bloodstaff_nrb7pyh8YYncOWti.json} (66%)
 rename src/packs/items/weapons/{tier2/weapon_Blunderbuss_OUH7FtPwrvhyRGfg.json => weapon_Blunderbuss_xLFEBehUK17zML2B.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Bravesword_1qE6NDSlN8bHVNLE.json => weapon_Bravesword_JCvRYFpIwdqfmqdk.json} (67%)
 rename src/packs/items/weapons/{tier1/weapon_Broadsword_k4cXJtgvlPzOKJ4s.json => weapon_Broadsword_tB2lDopuefiG4gD7.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Casting_Sword_MtJNIBRq4CaXEfQj.json => weapon_Casting_Sword_qfJbWjwKZ5k8vzCr.json} (68%)
 rename src/packs/items/weapons/{tier1/weapon_Crossbow_GXdE6NaEGgiwUNEs.json => weapon_Crossbow_sTIiyrI2o2GHKp0u.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Curved_Dagger_sbKB1f2i7bQCR1i8.json => weapon_Curved_Dagger_IQpfAz5mjXBNgq7A.json} (67%)
 rename src/packs/items/weapons/{tier1/weapon_Cutlass_2qe0ilpRfBuVYbDo.json => weapon_Cutlass_HdyZyBywO1byCsfM.json} (67%)
 rename src/packs/items/weapons/{tier1/weapon_Dagger_Rz8lyl0B2rS3gBTP.json => weapon_Dagger_PQ8QSP0BhzJcVy4Z.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Devouring_Dagger_CBXVCc2YKUhofHBg.json => weapon_Devouring_Dagger_iv4ojTQDd91tOGeP.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Double_Flail_tRqpSGHIIDCBS7sN.json => weapon_Double_Flail_9U7Q69SA2V4WtlyE.json} (68%)
 rename src/packs/items/weapons/{tier4/weapon_Dual_Ended_Sword_kmSom1Srz8I3CXsh.json => weapon_Dual_Ended_Sword_wT0yIYoQmgXgUyhO.json} (67%)
 rename src/packs/items/weapons/{tier1/weapon_Dualstaff_GTEiHJ5Qvn99m4Os.json => weapon_Dualstaff_953Q2rTuxkAuNhyh.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Ego_Blade_v2x2UxypzWdGpxeI.json => weapon_Ego_Blade_wiud7JWoMilk2KQN.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Elder_Bow_6YGoaFlUgzLZ7h7v.json => weapon_Elder_Bow_rgUz50aNrRn9poGf.json} (68%)
 rename src/packs/items/weapons/{tier4/weapon_Extended_Polearm_cIc4kCK0qET1ilvM.json => weapon_Extended_Polearm_Yg3WZZq6jgAn9xED.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Finehair_Bow_7pALPrsv0dqzRGCV.json => weapon_Finehair_Bow_KocXOIOSVFazOqFh.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Firestaff_jeLL7YLCvzDo2MyT.json => weapon_Firestaff_0jQunbQG1LnTRdOI.json} (69%)
 rename src/packs/items/weapons/{tier3/weapon_Flickerfly_Blade_QTvf9KZeK567PClS.json => weapon_Flickerfly_Blade_QGAvPrLPWHJWcAV1.json} (68%)
 rename src/packs/items/weapons/{tier4/weapon_Floating_Bladeshards_1HBqL3gwZNSwCBFL.json => weapon_Floating_Bladeshards_arBh0DEfg5X9TJbn.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Fusion_Gloves_XcJce4ZCzXkhirza.json => weapon_Fusion_Gloves_Rj1eYiu6BPp58xn2.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Ghostblade_yAszCKtIlBieTuth.json => weapon_Ghostblade_QzymDpCD7NMbLlpu.json} (69%)
 rename src/packs/items/weapons/{tier3/weapon_Gilded_Bow_mqtFoVo5umeCJ3g4.json => weapon_Gilded_Bow_XONn2rH8NyZbXi68.json} (69%)
 rename src/packs/items/weapons/{tier2/weapon_Gilded_Falchion_Pp2tAzb5hOip0zyi.json => weapon_Gilded_Falchion_ZOL4O7BqmcmYHfjY.json} (68%)
 rename src/packs/items/weapons/{tier1/weapon_Glowing_Rings_vRQGEHauOXXVhsjX.json => weapon_Glowing_Rings_4Mjzmyvjwhq3mm6l.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Greatbow_yNZ6ZqtGKtPvqPxu.json => weapon_Greatbow_cxBpxu3X2bNs8HN4.json} (68%)
 rename src/packs/items/weapons/{tier1/weapon_Greatstaff_GRZIvEb2ZFmYw50B.json => weapon_Greatstaff_AYSnrvAX0IgbexFI.json} (68%)
 rename src/packs/items/weapons/{tier1/weapon_Greatsword_9Vy0YJHNVee1tYvN.json => weapon_Greatsword_GsRLkQG13xoPc7kq.json} (68%)
 rename src/packs/items/weapons/{tier1/weapon_Halberd_SCi1BGjkp85nrCah.json => weapon_Halberd_0SlckjJMb30R5ErF.json} (68%)
 rename src/packs/items/weapons/{tier1/weapon_Hallowed_Axe_s6dHJKCQdS6QPKsf.json => weapon_Hallowed_Axe_WckoUxyJZfvq9cR7.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Hammer_of_Exota_X1DHoD7sHb9v27p0.json => weapon_Hammer_of_Exota_p889rprb5FMsSlK5.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Hammer_of_Wrath_g9EKWZaHZfuU5Yha.json => weapon_Hammer_of_Wrath_cHrHkq7AwYk34ach.json} (68%)
 rename src/packs/items/weapons/{tier4/weapon_Hand_Cannon_R8xE9WZ9iPV6Z1gX.json => weapon_Hand_Cannon_4tAGYqfm0fsSncr4.json} (67%)
 rename src/packs/items/weapons/{tier1/weapon_Hand_Runes_JUCgEbB0PRyViFMc.json => weapon_Hand_Runes_mPaKupCQhJzS5wMc.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Ilmari_s_Rifle_zVMZvitG5ESNBxjm.json => weapon_Ilmari_s_Rifle_qGH3VFuBQV8DGhPd.json} (68%)
 rename src/packs/items/weapons/{tier4/weapon_Impact_Gauntlet_kI8Fw82maQYBiuKO.json => weapon_Impact_Gauntlet_H73r7YuOkVmAgIci.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Arcane_Gauntlets_GZ6OxXjA4OBPxV1F.json => weapon_Improved_Arcane_Gauntlets_CTkuKjwWfrvmmRvH.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Battleaxe_vCBROhfmKwXzgY9G.json => weapon_Improved_Battleaxe_c6ss8Ydb5ydmLsnO.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Broadsword_h6KrDyeyEGwZYm4z.json => weapon_Improved_Broadsword_lXRVCITpGlXF3sOw.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Crossbow_Me2aEKQzEHMl5CiG.json => weapon_Improved_Crossbow_TSvPCik6v3UYqr9f.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Cutlass_qswhdn7ncrLwpJ4I.json => weapon_Improved_Cutlass_sCuu0hIzsdWowP4h.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Dagger_aBM1qoaOGCTmytB8.json => weapon_Improved_Dagger_qyMnZ5uJTeqgiEPb.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Dualstaff_ft68IExN2tPWiP87.json => weapon_Improved_Dualstaff_wNB9Uyl3aY842K9p.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Glowing_Rings_82pBMYukFn0rqvRc.json => weapon_Improved_Glowing_Rings_9jzi0f7MOL3Ot1tj.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Greatstaff_b5g5jR7aH2I2krs1.json => weapon_Improved_Greatstaff_rZEHNAwKW1vgS3Or.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Greatsword_aMYQY7T7nJpTHOjy.json => weapon_Improved_Greatsword_c1HtTqfS9OnNv1Bt.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Halberd_9rhJEWn4xSTcerRq.json => weapon_Improved_Halberd_0i6CzOfsBoZjbuTZ.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Hallowed_Axe_Z3IziiiimIDR88wg.json => weapon_Improved_Hallowed_Axe_6zrrwIYQNa7gHhDA.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Hand_Runes_RSxE3zlycp4UMGs5.json => weapon_Improved_Hand_Runes_PlJj4nObc6zDVVIv.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Longbow_W8PjOiQwZbL86YO4.json => weapon_Improved_Longbow_S9fPH89qdYHAygG5.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Longsword_H5DuWNbmfUmdgxgk.json => weapon_Improved_Longsword_1sk01NDq0XVHAFpa.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Mace_NUFPD3bBflCztTw6.json => weapon_Improved_Mace_KwCBPCV9wFH9FuxZ.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Quarterstaff_HxqNhfekSKGZ5lER.json => weapon_Improved_Quarterstaff_CgELEWAyG4ASDLZA.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Rapier_llBQI4DjfJAadtE8.json => weapon_Improved_Rapier_BCUXoneSYSw0imXe.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Returning_Blade_G812F19Q4iK4Qmj6.json => weapon_Improved_Returning_Blade_YHlzVFpHVYyDJSwc.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Scepter_v93pZH1JNWfGzgVB.json => weapon_Improved_Scepter_uPqG5L8ltREV4605.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Shortbow_i27H7xSpYaMOnyTE.json => weapon_Improved_Shortbow_ZSBJ0cYWHrWMMJHc.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Shortstaff_tyKBNpIhrJrTJam5.json => weapon_Improved_Shortstaff_RkJezS4b5VwesYoR.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Spear_88DGrDCZcCUU9uwy.json => weapon_Improved_Spear_KnWHxJNf7ZJWePdg.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Wand_NvCk3CHdyf7ZSwMd.json => weapon_Improved_Wand_NzvNV6lnWPbk7AQW.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Improved_Warhammer_kxqaACQb9VQEbc9S.json => weapon_Improved_Warhammer_0grDkkD9bYHT3Dk5.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Keeper_s_Staff_LlpGDvN6cd0rVZ9p.json => weapon_Keeper_s_Staff_EyPLO7vy5VcmEKbA.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Knuckle_Blades_hzyIf7akuGl7jYlo.json => weapon_Knuckle_Blades_kzE863F8Kqh6Ssrw.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Labrys_Axe_VkxSrdGjlWW6tUvO.json => weapon_Labrys_Axe_Wzkf1I3PMKX1aL22.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Arcane_Gauntlets_sI23YidfmazUWSd5.json => weapon_Legendary_Arcane_Gauntlets_brGbwSLC8i5KSIgw.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Battleaxe_30V01DlHo5rrVfJT.json => weapon_Legendary_Battleaxe_RZqNqIJA8Y76vyAS.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Broadsword_a3j8NNUEUmfOXFZQ.json => weapon_Legendary_Broadsword_ZagTf04G2LUzBVIJ.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Crossbow_zT0lfEzzay3Pfjai.json => weapon_Legendary_Crossbow_kHO5zhsA6neUWIIY.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Cutlass_5tYEYizBM6IS9bHH.json => weapon_Legendary_Cutlass_5yF2KXtThRMjHlVY.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Dagger_KtFWQLwrDT1eAXfW.json => weapon_Legendary_Dagger_KWPrdOcsjw0UqiaO.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Dualstaff_8IiuOpspImJXxd3M.json => weapon_Legendary_Dualstaff_CA7tFWu0yJY8AKaf.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Glowing_Rings_o2YogWivkfQN5uiO.json => weapon_Legendary_Glowing_Rings_M5ksicUetj1cUQV4.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Greatstaff_6yHpOErxja3ORXR3.json => weapon_Legendary_Greatstaff_8vK8Cgp43QjVAqO4.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Greatsword_bocnpC5X34s9DJ84.json => weapon_Legendary_Greatsword_g1Jg7UAyWPHswjec.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Halberd_KIzmmRZCRnlfy398.json => weapon_Legendary_Halberd_r0XAlwFuUBrKALfw.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Hallowed_Axe_TxhLOsmk5CGbOXtl.json => weapon_Legendary_Hallowed_Axe_cgmsLxAQ3o9oUoCG.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Hand_Runes_VoERob9158dndnz0.json => weapon_Legendary_Hand_Runes_aY7GF7lU7pozg8ji.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Longbow_72WaOMvPburJGcSV.json => weapon_Legendary_Longbow_0VMzALprSt7t4vk7.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Longsword_UaAZOEco3yrUMF2R.json => weapon_Legendary_Longsword_OfYAhe88Z0biN4Sa.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Mace_Q3zGz4BWGPwThNhK.json => weapon_Legendary_Mace_ZImmy9vIJlmnzEPr.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Quarterstaff_iEXntwy16qcBXVjy.json => weapon_Legendary_Quarterstaff_pinNKWkejkzHPCQj.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Rapier_P1xXyWvYCLR02b5l.json => weapon_Legendary_Rapier_90XtvPz8EfjqdMcM.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Returning_Blade_FEDXHLxkC3UK7ZEM.json => weapon_Legendary_Returning_Blade_RYRwUObgRgWOWjAY.json} (66%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Scepter_UruA4MYOIblYgCDt.json => weapon_Legendary_Scepter_zut78R32b72vCe2W.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Shortbow_4LJ3n3dXQeaUkSQo.json => weapon_Legendary_Shortbow_KDQClgBxRL6ky6pP.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Shortstaff_tNAcnWoed7WEZ9p0.json => weapon_Legendary_Shortstaff_a3Am2xUZxQuqkvqQ.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Spear_DI75wSq10QSF5sFM.json => weapon_Legendary_Spear_zT53LgiBetkWtQKE.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Wand_2FiMSztRSxvl2OWN.json => weapon_Legendary_Wand_YAMbvl0sGYWaeGuh.json} (66%)
 rename src/packs/items/weapons/{tier4/weapon_Legendary_Warhammer_9CCfQYb9s7fWVEjh.json => weapon_Legendary_Warhammer_Ms76FGrkbxJu3xdP.json} (67%)
 rename src/packs/items/weapons/{tier1/weapon_Longbow_z6TTwLScjmMOn7yX.json => weapon_Longbow_QxDqWi0hu9uNwwe6.json} (67%)
 rename src/packs/items/weapons/{tier1/weapon_Longsword_MzM4Xp8WoYmJImp7.json => weapon_Longsword_h8XhL7dB7mJbFf6R.json} (67%)
 rename src/packs/items/weapons/{tier1/weapon_Mace_5PfnAoO12JXH8KSV.json => weapon_Mace_CFIK5SxXN2FxV8ew.json} (66%)
 rename src/packs/items/weapons/{tier3/weapon_Mage_Orb_LuZBjH3QvsEOkcVM.json => weapon_Mage_Orb_xP8qusQ2orIHnDIk.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Magus_Revolver_h4BHRl3Ji6NAmOd4.json => weapon_Magus_Revolver_QBZi7ftJIv4VRSjX.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Meridian_Cutlass_grOsR6ArQQR4OBzX.json => weapon_Meridian_Cutlass_O5e5ltywjeEwXZw5.json} (70%)
 rename src/packs/items/weapons/{tier4/weapon_Midas_Scythe_cpK9iWwesVYUFyXO.json => weapon_Midas_Scythe_NCQxM3efha2fi3un.json} (67%)
 rename src/packs/items/weapons/{tier1/weapon_Quarterstaff_2jUxZEBhFX60Mbll.json => weapon_Quarterstaff_J4Mlwt3BmVeWV6vC.json} (67%)
 rename src/packs/items/weapons/{tier1/weapon_Rapier_79kmSUqnjHPmUrhQ.json => weapon_Rapier_GldFyzsA56nyVQZR.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Retractable_Saber_sXyasH1B078wvaSQ.json => weapon_Retractable_Saber_7lqP8EycKwpsYp2H.json} (68%)
 rename src/packs/items/weapons/{tier1/weapon_Returning_Blade_VZ1IzrGqoco0S1FH.json => weapon_Returning_Blade_JsKC4GypAiA67a60.json} (74%)
 rename src/packs/items/weapons/{tier4/weapon_Ricochet_Axes_9Eqdt9BDUGjfP6Lx.json => weapon_Ricochet_Axes_ianVggptVejn9RnU.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Runes_of_Ruination_HEcvQ9sX8NlqWuKN.json => weapon_Runes_of_Ruination_SyrN9HZ2q5J3uw7f.json} (68%)
 rename src/packs/items/weapons/{tier1/weapon_Scepter_teDiNLXxtTYzFVaX.json => weapon_Scepter_As9XfR5ZpwnfcEsM.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Scepter_of_Elias_N5nXkW5NBN2UYawJ.json => weapon_Scepter_of_Elias_XIrmU6NCXXElx2JI.json} (68%)
 rename src/packs/items/weapons/{tier1/weapon_Shortbow_7PMPT9r312jr5Vuu.json => weapon_Shortbow_GoooPAB5sJ9eDPWz.json} (67%)
 rename src/packs/items/weapons/{tier1/weapon_Shortstaff_m6qCbG7WQ9fy3jhT.json => weapon_Shortstaff_ydm5W8kYujEbElmj.json} (67%)
 rename src/packs/items/weapons/{tier4/weapon_Siphoning_Gauntlets_sVAw2DRc5goXxFVk.json => weapon_Siphoning_Gauntlets_WdbNUGWB2Dsx0JLs.json} (69%)
 rename src/packs/items/weapons/{tier4/weapon_Sledge_Axe_ltCk06bPulLKwMs0.json => weapon_Sledge_Axe_BYcF7qAR8yR5Rv0f.json} (68%)
 rename src/packs/items/weapons/{tier1/weapon_Spear_weKCJX4KfbaL26W4.json => weapon_Spear_ZsX59BQsuGvlB3mw.json} (67%)
 rename src/packs/items/weapons/{tier3/weapon_Spiked_Bow_UF2AEiCmIftqllAB.json => weapon_Spiked_Bow_oyQRdPFBkPu1G7uN.json} (67%)
 rename src/packs/items/weapons/{tier2/weapon_Steelforged_Halberd_vSixA7cq1nQYxvCH.json => weapon_Steelforged_Halberd_rrWmGNT0L0Cvw9Tx.json} (69%)
 rename src/packs/items/weapons/{tier4/weapon_Swinging_Ropeblade_n3KjqDGkTteA0akJ.json => weapon_Swinging_Ropeblade_e6DVC3wUxMM7puMK.json} (69%)
 rename src/packs/items/weapons/{tier4/weapon_Sword_of_Light___Flame_rgWjQGvUvgbk1h7d.json => weapon_Sword_of_Light___Flame_8Sa5TccQvhWde1O7.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Talon_Blades_32DXoEEDbV3J8amu.json => weapon_Talon_Blades_lswl0hauQmLAQh58.json} (68%)
 rename src/packs/items/weapons/{tier4/weapon_Thistlebow_oOhEjWqxLlAIcKjX.json => weapon_Thistlebow_FoLC2rSujCBXxtZ9.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Urok_Broadsword_RpTkQgMbI3KlAXB6.json => weapon_Urok_Broadsword_kpp3gAPXoke7mx0d.json} (68%)
 rename src/packs/items/weapons/{tier2/weapon_Wand_of_Enthrallment_ME6aDBfBjecVkdoZ.json => weapon_Wand_of_Enthrallment_8u0tnoaSBpRWmVex.json} (68%)
 rename src/packs/items/weapons/{tier4/weapon_Wand_of_Essek_mp8s5umPvk4Vw25q.json => weapon_Wand_of_Essek_lNWN759jT1Z098RI.json} (67%)
 rename src/packs/items/weapons/{tier1/weapon_Wand_95kiAjBsDA4aYgCJ.json => weapon_Wand_pTOX05HxPJgwwMnf.json} (66%)
 rename src/packs/items/weapons/{tier2/weapon_War_Scythe_EidEr900k7AatPed.json => weapon_War_Scythe_UhWpEKkfo9mjRgnw.json} (68%)
 rename src/packs/items/weapons/{tier1/weapon_Warhammer_EUUq7W9U7XOCvc0Z.json => weapon_Warhammer_54gLWy5YhwB9YeTA.json} (68%)
 rename src/packs/items/weapons/{tier3/weapon_Widogast_Pendant_MIvqgdCV9IbQ3gdm.json => weapon_Widogast_Pendant_6wASGCohz4Y7CxjK.json} (70%)
 rename src/packs/items/weapons/{tier2/weapon_Yutari_Bloodbow_YAeJexbo14oCp8SF.json => weapon_Yutari_Bloodbow_zDVW3GhTnSwISSxF.json} (68%)
 create mode 100644 src/packs/subclasses/folders_Bard_GdwNrxosxgFCMwUJ.json
 create mode 100644 src/packs/subclasses/folders_Druid_8o3AE33T1pSQH296.json
 create mode 100644 src/packs/subclasses/folders_Guardian_GECczaEI6KI9W7B7.json
 create mode 100644 src/packs/subclasses/folders_Ranger_cTmpeni3Jg55NkX4.json
 create mode 100644 src/packs/subclasses/folders_Rogue_2ifNVaI1HZtXVSdf.json
 create mode 100644 src/packs/subclasses/folders_Seraph_8fx2IqJphzGyrZbx.json
 create mode 100644 src/packs/subclasses/folders_Sorcerer_3H1ThzHW4rZStZrr.json
 create mode 100644 src/packs/subclasses/folders_Warrior_OzZ4UX9B6eNEzF49.json
 create mode 100644 src/packs/subclasses/folders_Wizard_H1Djv0I92cn25M4t.json

diff --git a/src/packs/class-features/feature_Arcane_Sense_D5HUGwdizhBVZ0RW.json b/src/packs/class-features/feature_Arcane_Sense_D5HUGwdizhBVZ0RW.json
index 84f958b0..cea142f2 100644
--- a/src/packs/class-features/feature_Arcane_Sense_D5HUGwdizhBVZ0RW.json
+++ b/src/packs/class-features/feature_Arcane_Sense_D5HUGwdizhBVZ0RW.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "ncQG0s0ttAPObaeV",
+  "sort": 100000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748033779155,
-    "modifiedTime": 1748033799399,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710066261,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!D5HUGwdizhBVZ0RW"
 }
diff --git a/src/packs/class-features/feature_Attack_of_Opportunity_VfUbJwGU4Cka0xLP.json b/src/packs/class-features/feature_Attack_of_Opportunity_VfUbJwGU4Cka0xLP.json
index 6e700787..2fe397cf 100644
--- a/src/packs/class-features/feature_Attack_of_Opportunity_VfUbJwGU4Cka0xLP.json
+++ b/src/packs/class-features/feature_Attack_of_Opportunity_VfUbJwGU4Cka0xLP.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "3znRxBqsK0lOJhvJ",
+  "sort": 100000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748034185325,
-    "modifiedTime": 1748034212853,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710073183,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!VfUbJwGU4Cka0xLP"
 }
diff --git a/src/packs/class-features/feature_Beastform_NkSKDXGNNiOUlFqm.json b/src/packs/class-features/feature_Beastform_NkSKDXGNNiOUlFqm.json
index 7412a42a..2122e595 100644
--- a/src/packs/class-features/feature_Beastform_NkSKDXGNNiOUlFqm.json
+++ b/src/packs/class-features/feature_Beastform_NkSKDXGNNiOUlFqm.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "l94HTIXSvdZG3zIh",
+  "sort": 100000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748028817729,
-    "modifiedTime": 1748028856597,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710083736,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!NkSKDXGNNiOUlFqm"
 }
diff --git a/src/packs/class-features/feature_Channel_Raw_Power_ovxuqhl01XZSwx2n.json b/src/packs/class-features/feature_Channel_Raw_Power_ovxuqhl01XZSwx2n.json
index 561ff17b..bd35d681 100644
--- a/src/packs/class-features/feature_Channel_Raw_Power_ovxuqhl01XZSwx2n.json
+++ b/src/packs/class-features/feature_Channel_Raw_Power_ovxuqhl01XZSwx2n.json
@@ -24,8 +24,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "ncQG0s0ttAPObaeV",
+  "sort": 200000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -39,8 +39,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748033854379,
-    "modifiedTime": 1748033877334,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710088872,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!ovxuqhl01XZSwx2n"
 }
diff --git a/src/packs/class-features/feature_Cloaked_TpaoHSJ3npjWiBOf.json b/src/packs/class-features/feature_Cloaked_TpaoHSJ3npjWiBOf.json
index 37af654f..a4e53ffa 100644
--- a/src/packs/class-features/feature_Cloaked_TpaoHSJ3npjWiBOf.json
+++ b/src/packs/class-features/feature_Cloaked_TpaoHSJ3npjWiBOf.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "AzwvgmcvToIUGYti",
+  "sort": 100000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748032226905,
-    "modifiedTime": 1748032258303,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710097141,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!TpaoHSJ3npjWiBOf"
 }
diff --git a/src/packs/class-features/feature_Combat_Training_elb6ZVertgu6OdKA.json b/src/packs/class-features/feature_Combat_Training_elb6ZVertgu6OdKA.json
index c8b39914..70f3c1f8 100644
--- a/src/packs/class-features/feature_Combat_Training_elb6ZVertgu6OdKA.json
+++ b/src/packs/class-features/feature_Combat_Training_elb6ZVertgu6OdKA.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "3znRxBqsK0lOJhvJ",
+  "sort": 200000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748034225886,
-    "modifiedTime": 1748034251807,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710182918,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!elb6ZVertgu6OdKA"
 }
diff --git a/src/packs/class-features/feature_Combo_Strikes_RNC8NT8F6x73gRZi.json b/src/packs/class-features/feature_Combo_Strikes_RNC8NT8F6x73gRZi.json
deleted file mode 100644
index 312d847a..00000000
--- a/src/packs/class-features/feature_Combo_Strikes_RNC8NT8F6x73gRZi.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "name": "Combo Strikes",
-  "type": "feature",
-  "_id": "RNC8NT8F6x73gRZi",
-  "img": "icons/svg/item-bag.svg",
-  "system": {
-    "actionType": "action",
-    "featureType": {
-      "type": "normal",
-      "data": {
-        "property": "spellcastingTrait",
-        "max": 1,
-        "numbers": {}
-      }
-    },
-    "refreshData": null,
-    "multiclass": null,
-    "disabled": false,
-    "description": "<p>After making a damage roll with a Melee weapon but before dealing that damage to the target, mark a Stress to start a combo strike.</p><p>When you do, roll a Combo Die and note its value. Then, roll another Combo Die. If the value of the second die is equal to or greater than your first Combo Die, continue rolling additional dice until the latest Combo Die’s value is less than the roll that preceeded it. Total all rolled Combo Dice and add the value to your weapon’s damage.</p><p>Your Combo Die starts as a d4. When you level up, once per tier you may use one of your advancement options to increase your Combo Die instead.</p>",
-    "effects": {},
-    "actions": [],
-    "type": "class"
-  },
-  "effects": [],
-  "folder": null,
-  "sort": 0,
-  "ownership": {
-    "default": 0,
-    "ei8OkswTzyDp4IGC": 3
-  },
-  "flags": {},
-  "_stats": {
-    "compendiumSource": null,
-    "duplicateSource": null,
-    "exportSource": null,
-    "coreVersion": "13.344",
-    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
-    "createdTime": 1748031102847,
-    "modifiedTime": 1748031132259,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
-  },
-  "_key": "!items!RNC8NT8F6x73gRZi"
-}
diff --git a/src/packs/class-features/feature_Evolution_bZxfyPTZ6rsakyA2.json b/src/packs/class-features/feature_Evolution_bZxfyPTZ6rsakyA2.json
index 780b028c..484da82c 100644
--- a/src/packs/class-features/feature_Evolution_bZxfyPTZ6rsakyA2.json
+++ b/src/packs/class-features/feature_Evolution_bZxfyPTZ6rsakyA2.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "l94HTIXSvdZG3zIh",
+  "sort": 200000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748028774087,
-    "modifiedTime": 1748028862047,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710255976,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!bZxfyPTZ6rsakyA2"
 }
diff --git a/src/packs/class-features/feature_Frontline_Tank_ftUZznLFJ5xbcxcu.json b/src/packs/class-features/feature_Frontline_Tank_ftUZznLFJ5xbcxcu.json
index 3e0f06e4..a707e0f1 100644
--- a/src/packs/class-features/feature_Frontline_Tank_ftUZznLFJ5xbcxcu.json
+++ b/src/packs/class-features/feature_Frontline_Tank_ftUZznLFJ5xbcxcu.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "imOcur5Zv8WcMHXz",
+  "sort": 100000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748030942761,
-    "modifiedTime": 1748030954992,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710261406,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!ftUZznLFJ5xbcxcu"
 }
diff --git a/src/packs/class-features/feature_Hold_Them_Off_FSx2ojskU0pRE72g.json b/src/packs/class-features/feature_Hold_Them_Off_FSx2ojskU0pRE72g.json
index a52aac6c..2cabfdd5 100644
--- a/src/packs/class-features/feature_Hold_Them_Off_FSx2ojskU0pRE72g.json
+++ b/src/packs/class-features/feature_Hold_Them_Off_FSx2ojskU0pRE72g.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "84neMcqoIRAoIvXP",
+  "sort": 100000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748030888304,
-    "modifiedTime": 1748030905059,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710266972,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!FSx2ojskU0pRE72g"
 }
diff --git a/src/packs/class-features/feature_I_Am_The_Weapon_ihtvQaH18eG56RWY.json b/src/packs/class-features/feature_I_Am_The_Weapon_ihtvQaH18eG56RWY.json
deleted file mode 100644
index 32da8c74..00000000
--- a/src/packs/class-features/feature_I_Am_The_Weapon_ihtvQaH18eG56RWY.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "name": "I Am The Weapon",
-  "type": "feature",
-  "_id": "ihtvQaH18eG56RWY",
-  "img": "icons/svg/item-bag.svg",
-  "system": {
-    "actionType": "passive",
-    "featureType": {
-      "type": "normal",
-      "data": {
-        "property": "spellcastingTrait",
-        "max": 1,
-        "numbers": {}
-      }
-    },
-    "refreshData": null,
-    "multiclass": null,
-    "disabled": false,
-    "description": "<p>While you don’t have any equipped weapons, your evasion has a +1 bonus. Your unarmed strikes are considered a Melee weapon, use the trait of your choice, and deal d10+your tier phy damage.</p>",
-    "effects": {},
-    "actions": [],
-    "type": "class"
-  },
-  "effects": [],
-  "folder": null,
-  "sort": 0,
-  "ownership": {
-    "default": 0,
-    "ei8OkswTzyDp4IGC": 3
-  },
-  "flags": {},
-  "_stats": {
-    "compendiumSource": null,
-    "duplicateSource": null,
-    "exportSource": null,
-    "coreVersion": "13.344",
-    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
-    "createdTime": 1748031035883,
-    "modifiedTime": 1748031085182,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
-  },
-  "_key": "!items!ihtvQaH18eG56RWY"
-}
diff --git a/src/packs/class-features/feature_Life_Support_UZ9UjZArSJh6UHXG.json b/src/packs/class-features/feature_Life_Support_UZ9UjZArSJh6UHXG.json
index 2a9c66ab..00f21865 100644
--- a/src/packs/class-features/feature_Life_Support_UZ9UjZArSJh6UHXG.json
+++ b/src/packs/class-features/feature_Life_Support_UZ9UjZArSJh6UHXG.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "aI54jXjBNrAOm7R8",
+  "sort": 100000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748033044907,
-    "modifiedTime": 1748033065659,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710332116,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!UZ9UjZArSJh6UHXG"
 }
diff --git a/src/packs/class-features/feature_Make_a_Scene_Ddk0PAgwM4VLRbyY.json b/src/packs/class-features/feature_Make_a_Scene_Ddk0PAgwM4VLRbyY.json
index b878085e..1f64caa9 100644
--- a/src/packs/class-features/feature_Make_a_Scene_Ddk0PAgwM4VLRbyY.json
+++ b/src/packs/class-features/feature_Make_a_Scene_Ddk0PAgwM4VLRbyY.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "3QoIMKARHfRnBvQJ",
+  "sort": 100000,
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1747991384366,
-    "modifiedTime": 1747991421484,
-    "lastModifiedBy": "NqO2eQGMjrvUO6v9"
+    "modifiedTime": 1748710338024,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!Ddk0PAgwM4VLRbyY"
 }
diff --git a/src/packs/class-features/feature_Minor_Illusion_qFq7kynAZhbWTbT5.json b/src/packs/class-features/feature_Minor_Illusion_qFq7kynAZhbWTbT5.json
index 49c46d46..2ce91d1f 100644
--- a/src/packs/class-features/feature_Minor_Illusion_qFq7kynAZhbWTbT5.json
+++ b/src/packs/class-features/feature_Minor_Illusion_qFq7kynAZhbWTbT5.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "ncQG0s0ttAPObaeV",
+  "sort": 150000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748033817443,
-    "modifiedTime": 1748033834348,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710347004,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!qFq7kynAZhbWTbT5"
 }
diff --git a/src/packs/class-features/feature_No_Mercy_t3tLoq4h9wgQD7E9.json b/src/packs/class-features/feature_No_Mercy_t3tLoq4h9wgQD7E9.json
index 0e539323..afafb921 100644
--- a/src/packs/class-features/feature_No_Mercy_t3tLoq4h9wgQD7E9.json
+++ b/src/packs/class-features/feature_No_Mercy_t3tLoq4h9wgQD7E9.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "3znRxBqsK0lOJhvJ",
+  "sort": 150000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748034146678,
-    "modifiedTime": 1748034158455,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710386929,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!t3tLoq4h9wgQD7E9"
 }
diff --git a/src/packs/class-features/feature_Not_This_Time_5msGbQyFwdwdFdYs.json b/src/packs/class-features/feature_Not_This_Time_5msGbQyFwdwdFdYs.json
index a263d76d..0667a293 100644
--- a/src/packs/class-features/feature_Not_This_Time_5msGbQyFwdwdFdYs.json
+++ b/src/packs/class-features/feature_Not_This_Time_5msGbQyFwdwdFdYs.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "8I0S9f458qu36qSW",
+  "sort": 100000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748034883014,
-    "modifiedTime": 1748034907509,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710410194,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!5msGbQyFwdwdFdYs"
 }
diff --git a/src/packs/class-features/feature_Prayer_Dice_jXfGnLnU8PswJYJd.json b/src/packs/class-features/feature_Prayer_Dice_jXfGnLnU8PswJYJd.json
index 6cf18da4..af0b3923 100644
--- a/src/packs/class-features/feature_Prayer_Dice_jXfGnLnU8PswJYJd.json
+++ b/src/packs/class-features/feature_Prayer_Dice_jXfGnLnU8PswJYJd.json
@@ -25,8 +25,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "aI54jXjBNrAOm7R8",
+  "sort": 200000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -40,8 +40,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748033372327,
-    "modifiedTime": 1748033499150,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710416279,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!jXfGnLnU8PswJYJd"
 }
diff --git a/src/packs/class-features/feature_Prestidigitation_ofBmJIn6NWxA0wPz.json b/src/packs/class-features/feature_Prestidigitation_ofBmJIn6NWxA0wPz.json
index 716cd906..7fda6182 100644
--- a/src/packs/class-features/feature_Prestidigitation_ofBmJIn6NWxA0wPz.json
+++ b/src/packs/class-features/feature_Prestidigitation_ofBmJIn6NWxA0wPz.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "8I0S9f458qu36qSW",
+  "sort": 200000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748034934147,
-    "modifiedTime": 1748034955883,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710421634,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!ofBmJIn6NWxA0wPz"
 }
diff --git a/src/packs/class-features/feature_Rally_8uORDWrXtNFzA00U.json b/src/packs/class-features/feature_Rally_8uORDWrXtNFzA00U.json
index d07fef13..1734a435 100644
--- a/src/packs/class-features/feature_Rally_8uORDWrXtNFzA00U.json
+++ b/src/packs/class-features/feature_Rally_8uORDWrXtNFzA00U.json
@@ -25,8 +25,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "3QoIMKARHfRnBvQJ",
+  "sort": 200000,
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3
@@ -40,8 +40,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1747991484460,
-    "modifiedTime": 1747991546148,
-    "lastModifiedBy": "NqO2eQGMjrvUO6v9"
+    "modifiedTime": 1748710434139,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!8uORDWrXtNFzA00U"
 }
diff --git a/src/packs/class-features/feature_Ranger_s_Focus_b4O4r2HPbWU8s59q.json b/src/packs/class-features/feature_Ranger_s_Focus_b4O4r2HPbWU8s59q.json
index 222d5b99..b12146b6 100644
--- a/src/packs/class-features/feature_Ranger_s_Focus_b4O4r2HPbWU8s59q.json
+++ b/src/packs/class-features/feature_Ranger_s_Focus_b4O4r2HPbWU8s59q.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "84neMcqoIRAoIvXP",
+  "sort": 200000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748030780267,
-    "modifiedTime": 1748030834985,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710475164,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!b4O4r2HPbWU8s59q"
 }
diff --git a/src/packs/class-features/feature_Rogue_s_Dodge_fPGn9JNV24nt1G9d.json b/src/packs/class-features/feature_Rogue_s_Dodge_fPGn9JNV24nt1G9d.json
index 5c017fcf..a2b3dac4 100644
--- a/src/packs/class-features/feature_Rogue_s_Dodge_fPGn9JNV24nt1G9d.json
+++ b/src/packs/class-features/feature_Rogue_s_Dodge_fPGn9JNV24nt1G9d.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "AzwvgmcvToIUGYti",
+  "sort": 200000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748032185608,
-    "modifiedTime": 1748032213243,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710477647,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!fPGn9JNV24nt1G9d"
 }
diff --git a/src/packs/class-features/feature_Sneak_Attack_PhHOmsoYUDC42by6.json b/src/packs/class-features/feature_Sneak_Attack_PhHOmsoYUDC42by6.json
index eb92680f..322f33f2 100644
--- a/src/packs/class-features/feature_Sneak_Attack_PhHOmsoYUDC42by6.json
+++ b/src/packs/class-features/feature_Sneak_Attack_PhHOmsoYUDC42by6.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "AzwvgmcvToIUGYti",
+  "sort": 150000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748032274441,
-    "modifiedTime": 1748032300923,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710492033,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!PhHOmsoYUDC42by6"
 }
diff --git a/src/packs/class-features/feature_Staggering_Strike_xC0ZG862KrjHGHlx.json b/src/packs/class-features/feature_Staggering_Strike_xC0ZG862KrjHGHlx.json
deleted file mode 100644
index 9873a102..00000000
--- a/src/packs/class-features/feature_Staggering_Strike_xC0ZG862KrjHGHlx.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "name": "Staggering Strike",
-  "type": "feature",
-  "_id": "xC0ZG862KrjHGHlx",
-  "img": "icons/svg/item-bag.svg",
-  "system": {
-    "actionType": "action",
-    "featureType": {
-      "type": "normal",
-      "data": {
-        "property": "spellcastingTrait",
-        "max": 1,
-        "numbers": {}
-      }
-    },
-    "refreshData": null,
-    "multiclass": null,
-    "disabled": false,
-    "description": "<p>Spend 3 Hope when you hit an adversary to also deal them a Stress and make them temporarily Staggered.</p><p>While Staggered, all attack rolls they make are at disadvantage.</p>",
-    "effects": {},
-    "actions": [],
-    "type": "class"
-  },
-  "effects": [],
-  "folder": null,
-  "sort": 0,
-  "ownership": {
-    "default": 0,
-    "ei8OkswTzyDp4IGC": 3
-  },
-  "flags": {},
-  "_stats": {
-    "compendiumSource": null,
-    "duplicateSource": null,
-    "exportSource": null,
-    "coreVersion": "13.344",
-    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
-    "createdTime": 1748030990710,
-    "modifiedTime": 1748031014128,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
-  },
-  "_key": "!items!xC0ZG862KrjHGHlx"
-}
diff --git a/src/packs/class-features/feature_Strange_Patterns_ONtJ7r2g6tN5q6Ga.json b/src/packs/class-features/feature_Strange_Patterns_ONtJ7r2g6tN5q6Ga.json
index b4c4fa28..d637ce8c 100644
--- a/src/packs/class-features/feature_Strange_Patterns_ONtJ7r2g6tN5q6Ga.json
+++ b/src/packs/class-features/feature_Strange_Patterns_ONtJ7r2g6tN5q6Ga.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "8I0S9f458qu36qSW",
+  "sort": 150000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748034976746,
-    "modifiedTime": 1748034998077,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710516187,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!ONtJ7r2g6tN5q6Ga"
 }
diff --git a/src/packs/class-features/feature_Unstoppable_rlpNYKW18FX4Hw7t.json b/src/packs/class-features/feature_Unstoppable_rlpNYKW18FX4Hw7t.json
index db614e70..8c46fc53 100644
--- a/src/packs/class-features/feature_Unstoppable_rlpNYKW18FX4Hw7t.json
+++ b/src/packs/class-features/feature_Unstoppable_rlpNYKW18FX4Hw7t.json
@@ -24,8 +24,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "imOcur5Zv8WcMHXz",
+  "sort": 200000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -39,8 +39,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748030398960,
-    "modifiedTime": 1748030576414,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710525532,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!rlpNYKW18FX4Hw7t"
 }
diff --git a/src/packs/class-features/feature_Volatile_Magic_J3TdB5ZsmyJ68rxZ.json b/src/packs/class-features/feature_Volatile_Magic_J3TdB5ZsmyJ68rxZ.json
index 4812bccf..f5e890f8 100644
--- a/src/packs/class-features/feature_Volatile_Magic_J3TdB5ZsmyJ68rxZ.json
+++ b/src/packs/class-features/feature_Volatile_Magic_J3TdB5ZsmyJ68rxZ.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "ncQG0s0ttAPObaeV",
+  "sort": 125000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748033750328,
-    "modifiedTime": 1748033766963,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710593717,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!J3TdB5ZsmyJ68rxZ"
 }
diff --git a/src/packs/class-features/feature_Wildtouch_Dy0lco20C0Nk6yQo.json b/src/packs/class-features/feature_Wildtouch_Dy0lco20C0Nk6yQo.json
index ce95b251..c50808d0 100644
--- a/src/packs/class-features/feature_Wildtouch_Dy0lco20C0Nk6yQo.json
+++ b/src/packs/class-features/feature_Wildtouch_Dy0lco20C0Nk6yQo.json
@@ -22,8 +22,8 @@
     "type": "class"
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "l94HTIXSvdZG3zIh",
+  "sort": 150000,
   "ownership": {
     "default": 0,
     "ei8OkswTzyDp4IGC": 3
@@ -37,8 +37,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1748028880107,
-    "modifiedTime": 1748028893170,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "modifiedTime": 1748710640932,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!Dy0lco20C0Nk6yQo"
 }
diff --git a/src/packs/class-features/folders_Bard_3QoIMKARHfRnBvQJ.json b/src/packs/class-features/folders_Bard_3QoIMKARHfRnBvQJ.json
new file mode 100644
index 00000000..c9613739
--- /dev/null
+++ b/src/packs/class-features/folders_Bard_3QoIMKARHfRnBvQJ.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Bard",
+  "color": null,
+  "sorting": "a",
+  "_id": "3QoIMKARHfRnBvQJ",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748709671341,
+    "modifiedTime": 1748709671341,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!3QoIMKARHfRnBvQJ"
+}
diff --git a/src/packs/class-features/folders_Druid_l94HTIXSvdZG3zIh.json b/src/packs/class-features/folders_Druid_l94HTIXSvdZG3zIh.json
new file mode 100644
index 00000000..4a34b92f
--- /dev/null
+++ b/src/packs/class-features/folders_Druid_l94HTIXSvdZG3zIh.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Druid",
+  "color": null,
+  "sorting": "a",
+  "_id": "l94HTIXSvdZG3zIh",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748709677349,
+    "modifiedTime": 1748709677349,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!l94HTIXSvdZG3zIh"
+}
diff --git a/src/packs/class-features/folders_Guardian_imOcur5Zv8WcMHXz.json b/src/packs/class-features/folders_Guardian_imOcur5Zv8WcMHXz.json
new file mode 100644
index 00000000..14542699
--- /dev/null
+++ b/src/packs/class-features/folders_Guardian_imOcur5Zv8WcMHXz.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Guardian",
+  "color": null,
+  "sorting": "a",
+  "_id": "imOcur5Zv8WcMHXz",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748709688824,
+    "modifiedTime": 1748709688824,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!imOcur5Zv8WcMHXz"
+}
diff --git a/src/packs/class-features/folders_Ranger_84neMcqoIRAoIvXP.json b/src/packs/class-features/folders_Ranger_84neMcqoIRAoIvXP.json
new file mode 100644
index 00000000..c49048a2
--- /dev/null
+++ b/src/packs/class-features/folders_Ranger_84neMcqoIRAoIvXP.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Ranger",
+  "color": null,
+  "sorting": "a",
+  "_id": "84neMcqoIRAoIvXP",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748709694559,
+    "modifiedTime": 1748709694559,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!84neMcqoIRAoIvXP"
+}
diff --git a/src/packs/class-features/folders_Rogue_AzwvgmcvToIUGYti.json b/src/packs/class-features/folders_Rogue_AzwvgmcvToIUGYti.json
new file mode 100644
index 00000000..2d94183a
--- /dev/null
+++ b/src/packs/class-features/folders_Rogue_AzwvgmcvToIUGYti.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Rogue",
+  "color": null,
+  "sorting": "a",
+  "_id": "AzwvgmcvToIUGYti",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748709700301,
+    "modifiedTime": 1748709700301,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!AzwvgmcvToIUGYti"
+}
diff --git a/src/packs/class-features/folders_Seraph_aI54jXjBNrAOm7R8.json b/src/packs/class-features/folders_Seraph_aI54jXjBNrAOm7R8.json
new file mode 100644
index 00000000..232e538b
--- /dev/null
+++ b/src/packs/class-features/folders_Seraph_aI54jXjBNrAOm7R8.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Seraph",
+  "color": null,
+  "sorting": "a",
+  "_id": "aI54jXjBNrAOm7R8",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748709709654,
+    "modifiedTime": 1748709709654,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!aI54jXjBNrAOm7R8"
+}
diff --git a/src/packs/class-features/folders_Sorcerer_ncQG0s0ttAPObaeV.json b/src/packs/class-features/folders_Sorcerer_ncQG0s0ttAPObaeV.json
new file mode 100644
index 00000000..60b68e8e
--- /dev/null
+++ b/src/packs/class-features/folders_Sorcerer_ncQG0s0ttAPObaeV.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Sorcerer",
+  "color": null,
+  "sorting": "a",
+  "_id": "ncQG0s0ttAPObaeV",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748709715969,
+    "modifiedTime": 1748709715969,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!ncQG0s0ttAPObaeV"
+}
diff --git a/src/packs/class-features/folders_Warrior_3znRxBqsK0lOJhvJ.json b/src/packs/class-features/folders_Warrior_3znRxBqsK0lOJhvJ.json
new file mode 100644
index 00000000..1e9e1974
--- /dev/null
+++ b/src/packs/class-features/folders_Warrior_3znRxBqsK0lOJhvJ.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Warrior",
+  "color": null,
+  "sorting": "a",
+  "_id": "3znRxBqsK0lOJhvJ",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748709756134,
+    "modifiedTime": 1748709756134,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!3znRxBqsK0lOJhvJ"
+}
diff --git a/src/packs/class-features/folders_Wizard_8I0S9f458qu36qSW.json b/src/packs/class-features/folders_Wizard_8I0S9f458qu36qSW.json
new file mode 100644
index 00000000..d660567b
--- /dev/null
+++ b/src/packs/class-features/folders_Wizard_8I0S9f458qu36qSW.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Wizard",
+  "color": null,
+  "sorting": "a",
+  "_id": "8I0S9f458qu36qSW",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748709931420,
+    "modifiedTime": 1748709931420,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!8I0S9f458qu36qSW"
+}
diff --git a/src/packs/classes/class_Fighter_HPzaWaZBc6RvElKd.json b/src/packs/classes/class_Fighter_HPzaWaZBc6RvElKd.json
deleted file mode 100644
index 2373bedd..00000000
--- a/src/packs/classes/class_Fighter_HPzaWaZBc6RvElKd.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  "name": "Fighter",
-  "type": "class",
-  "_id": "HPzaWaZBc6RvElKd",
-  "img": "systems/daggerheart/assets/icons/classes/fighter.png",
-  "system": {
-    "domains": [
-      "bone",
-      "valor"
-    ],
-    "classItems": [],
-    "damageThresholds": {
-      "minor": 0,
-      "major": 0,
-      "severe": 0
-    },
-    "evasion": 11,
-    "features": [
-      {
-        "name": "Staggering Strike",
-        "img": "icons/svg/item-bag.svg",
-        "uuid": "Compendium.daggerheart.class-features.Item.xC0ZG862KrjHGHlx"
-      },
-      {
-        "name": "I Am The Weapon",
-        "img": "icons/svg/item-bag.svg",
-        "uuid": "Compendium.daggerheart.class-features.Item.ihtvQaH18eG56RWY"
-      },
-      {
-        "img": "icons/svg/item-bag.svg",
-        "name": "Combo Strikes",
-        "uuid": "Compendium.daggerheart.class-features.Item.RNC8NT8F6x73gRZi"
-      }
-    ],
-    "subclasses": [],
-    "inventory": {
-      "take": [],
-      "choiceA": [],
-      "choiceB": [],
-      "extra": {
-        "title": "",
-        "description": ""
-      }
-    },
-    "characterGuide": {
-      "suggestedTraits": {
-        "agility": 1,
-        "strength": 1,
-        "finesse": 0,
-        "instinct": 2,
-        "presence": 10,
-        "knowledge": -1
-      },
-      "suggestedPrimaryWeapon": null,
-      "suggestedSecondaryWeapon": null,
-      "suggestedArmor": null,
-      "characterDescription": {
-        "clothes": "",
-        "eyes": "",
-        "body": "",
-        "color": "",
-        "attitude": ""
-      },
-      "backgroundQuestions": [
-        "Where did you spend time during your formative years that taught you, directly or indirectly, how to fight in the style you use?",
-        "What group or organization that has always had your back, and how did you get in their good graces?",
-        "Who did you lose to long ago that you are desperate for a rematch against?"
-      ],
-      "connections": [
-        "What is one thing we’re both afraid of?",
-        "I rely on your for something important during our travels together. What is it and how do you feel about it?",
-        "I still haven't forgiven you for something you said to me. What was it and why did you say it?"
-      ]
-    },
-    "multiclass": null,
-    "description": ""
-  },
-  "effects": [],
-  "folder": null,
-  "sort": 0,
-  "ownership": {
-    "default": 0,
-    "NqO2eQGMjrvUO6v9": 3
-  },
-  "flags": {},
-  "_stats": {
-    "compendiumSource": null,
-    "duplicateSource": null,
-    "exportSource": null,
-    "coreVersion": "13.344",
-    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
-    "createdTime": 1747946839346,
-    "modifiedTime": 1748031139229,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
-  },
-  "_key": "!items!HPzaWaZBc6RvElKd"
-}
diff --git a/src/packs/classes/class_Warlock_kSSIqmgxFTm1Xr9s.json b/src/packs/classes/class_Warlock_kSSIqmgxFTm1Xr9s.json
deleted file mode 100644
index 0f4cd617..00000000
--- a/src/packs/classes/class_Warlock_kSSIqmgxFTm1Xr9s.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "name": "Warlock",
-  "type": "class",
-  "_id": "kSSIqmgxFTm1Xr9s",
-  "img": "systems/daggerheart/assets/icons/classes/warlock.png",
-  "system": {
-    "domains": [],
-    "classItems": [],
-    "damageThresholds": {
-      "minor": 0,
-      "major": 0,
-      "severe": 0
-    },
-    "evasion": 0,
-    "features": [],
-    "subclasses": [],
-    "inventory": {
-      "take": [],
-      "choiceA": [],
-      "choiceB": [],
-      "extra": null
-    },
-    "characterGuide": {
-      "suggestedTraits": {
-        "agility": 0,
-        "strength": 0,
-        "finesse": 0,
-        "instinct": 0,
-        "presence": 0,
-        "knowledge": 0
-      },
-      "suggestedPrimaryWeapon": null,
-      "suggestedSecondaryWeapon": null,
-      "suggestedArmor": null,
-      "characterDescription": {},
-      "backgroundQuestions": [
-        "",
-        "",
-        ""
-      ],
-      "connections": [
-        "",
-        "",
-        ""
-      ]
-    },
-    "multiclass": null,
-    "description": ""
-  },
-  "effects": [],
-  "folder": null,
-  "sort": 0,
-  "ownership": {
-    "default": 0,
-    "NqO2eQGMjrvUO6v9": 3
-  },
-  "flags": {},
-  "_stats": {
-    "compendiumSource": null,
-    "duplicateSource": null,
-    "exportSource": null,
-    "coreVersion": "13.344",
-    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
-    "createdTime": 1747946952119,
-    "modifiedTime": 1747946955843,
-    "lastModifiedBy": "NqO2eQGMjrvUO6v9"
-  },
-  "_key": "!items!kSSIqmgxFTm1Xr9s"
-}
diff --git a/src/packs/domains/folders_Arcana_jc1HbSpJmjAsq9GX.json b/src/packs/domains/folders_Arcana_jc1HbSpJmjAsq9GX.json
new file mode 100644
index 00000000..97119cbc
--- /dev/null
+++ b/src/packs/domains/folders_Arcana_jc1HbSpJmjAsq9GX.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Arcana",
+  "color": "#562d6c",
+  "sorting": "a",
+  "_id": "jc1HbSpJmjAsq9GX",
+  "description": "",
+  "sort": 100000,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717088692,
+    "modifiedTime": 1748717766758,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!jc1HbSpJmjAsq9GX"
+}
diff --git a/src/packs/domains/folders_Blade_gXc5zPwSyZXqrC6D.json b/src/packs/domains/folders_Blade_gXc5zPwSyZXqrC6D.json
new file mode 100644
index 00000000..0d1f8329
--- /dev/null
+++ b/src/packs/domains/folders_Blade_gXc5zPwSyZXqrC6D.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Blade",
+  "color": "#923628",
+  "sorting": "a",
+  "_id": "gXc5zPwSyZXqrC6D",
+  "description": "",
+  "sort": 200000,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717097962,
+    "modifiedTime": 1748717766758,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!gXc5zPwSyZXqrC6D"
+}
diff --git a/src/packs/domains/folders_Bone_IMRfDo5DDrpniKKv.json b/src/packs/domains/folders_Bone_IMRfDo5DDrpniKKv.json
new file mode 100644
index 00000000..acf60d30
--- /dev/null
+++ b/src/packs/domains/folders_Bone_IMRfDo5DDrpniKKv.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Bone",
+  "color": "#656768",
+  "sorting": "a",
+  "_id": "IMRfDo5DDrpniKKv",
+  "description": "",
+  "sort": 300000,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717103209,
+    "modifiedTime": 1748717766758,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!IMRfDo5DDrpniKKv"
+}
diff --git a/src/packs/domains/folders_Codex_q9VsNwg9r0bTn2ll.json b/src/packs/domains/folders_Codex_q9VsNwg9r0bTn2ll.json
new file mode 100644
index 00000000..f2fb729a
--- /dev/null
+++ b/src/packs/domains/folders_Codex_q9VsNwg9r0bTn2ll.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Codex",
+  "color": "#1a315b",
+  "sorting": "a",
+  "_id": "q9VsNwg9r0bTn2ll",
+  "description": "",
+  "sort": 400000,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717109630,
+    "modifiedTime": 1748717766758,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!q9VsNwg9r0bTn2ll"
+}
diff --git a/src/packs/domains/folders_Grace_c380soh7Z1YAqzOT.json b/src/packs/domains/folders_Grace_c380soh7Z1YAqzOT.json
new file mode 100644
index 00000000..e2ac29a3
--- /dev/null
+++ b/src/packs/domains/folders_Grace_c380soh7Z1YAqzOT.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Grace",
+  "color": "#7a3961",
+  "sorting": "a",
+  "_id": "c380soh7Z1YAqzOT",
+  "description": "",
+  "sort": 500000,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717115983,
+    "modifiedTime": 1748717766758,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!c380soh7Z1YAqzOT"
+}
diff --git a/src/packs/domains/folders_Level_10_7Cs44YADBTmmtCw6.json b/src/packs/domains/folders_Level_10_7Cs44YADBTmmtCw6.json
new file mode 100644
index 00000000..ccf312f8
--- /dev/null
+++ b/src/packs/domains/folders_Level_10_7Cs44YADBTmmtCw6.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "jc1HbSpJmjAsq9GX",
+  "name": "Level 10",
+  "color": null,
+  "sorting": "a",
+  "_id": "7Cs44YADBTmmtCw6",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!7Cs44YADBTmmtCw6"
+}
diff --git a/src/packs/domains/folders_Level_10_7pKKYgRQAKlQAksV.json b/src/packs/domains/folders_Level_10_7pKKYgRQAKlQAksV.json
new file mode 100644
index 00000000..c70c8b4d
--- /dev/null
+++ b/src/packs/domains/folders_Level_10_7pKKYgRQAKlQAksV.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "gXc5zPwSyZXqrC6D",
+  "name": "Level 10",
+  "color": null,
+  "sorting": "a",
+  "_id": "7pKKYgRQAKlQAksV",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!7pKKYgRQAKlQAksV"
+}
diff --git a/src/packs/domains/folders_Level_10_8qr1Y2tW3vLwNZOg.json b/src/packs/domains/folders_Level_10_8qr1Y2tW3vLwNZOg.json
new file mode 100644
index 00000000..644ba797
--- /dev/null
+++ b/src/packs/domains/folders_Level_10_8qr1Y2tW3vLwNZOg.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "tgwSE1t5B0Ka10Xh",
+  "name": "Level 10",
+  "color": null,
+  "sorting": "a",
+  "_id": "8qr1Y2tW3vLwNZOg",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!8qr1Y2tW3vLwNZOg"
+}
diff --git a/src/packs/domains/folders_Level_10_D1MFCYakdFIKDmcD.json b/src/packs/domains/folders_Level_10_D1MFCYakdFIKDmcD.json
new file mode 100644
index 00000000..1a395612
--- /dev/null
+++ b/src/packs/domains/folders_Level_10_D1MFCYakdFIKDmcD.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "yPVeShe47ETIqs9q",
+  "name": "Level 10",
+  "color": null,
+  "sorting": "a",
+  "_id": "D1MFCYakdFIKDmcD",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!D1MFCYakdFIKDmcD"
+}
diff --git a/src/packs/domains/folders_Level_10_Hs6POmXKThDXQJBn.json b/src/packs/domains/folders_Level_10_Hs6POmXKThDXQJBn.json
new file mode 100644
index 00000000..544cbe4f
--- /dev/null
+++ b/src/packs/domains/folders_Level_10_Hs6POmXKThDXQJBn.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "IMRfDo5DDrpniKKv",
+  "name": "Level 10",
+  "color": null,
+  "sorting": "a",
+  "_id": "Hs6POmXKThDXQJBn",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!Hs6POmXKThDXQJBn"
+}
diff --git a/src/packs/domains/folders_Level_10_IIVaYseNJbA2ta1B.json b/src/packs/domains/folders_Level_10_IIVaYseNJbA2ta1B.json
new file mode 100644
index 00000000..9554bc23
--- /dev/null
+++ b/src/packs/domains/folders_Level_10_IIVaYseNJbA2ta1B.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "q9VsNwg9r0bTn2ll",
+  "name": "Level 10",
+  "color": null,
+  "sorting": "a",
+  "_id": "IIVaYseNJbA2ta1B",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!IIVaYseNJbA2ta1B"
+}
diff --git a/src/packs/domains/folders_Level_10_nZr2hsu6Q6TlFXQn.json b/src/packs/domains/folders_Level_10_nZr2hsu6Q6TlFXQn.json
new file mode 100644
index 00000000..fffffa77
--- /dev/null
+++ b/src/packs/domains/folders_Level_10_nZr2hsu6Q6TlFXQn.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "TL1TutmbeCVJ06nR",
+  "name": "Level 10",
+  "color": null,
+  "sorting": "a",
+  "_id": "nZr2hsu6Q6TlFXQn",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!nZr2hsu6Q6TlFXQn"
+}
diff --git a/src/packs/domains/folders_Level_10_pPzU9WOQNv3ckO1w.json b/src/packs/domains/folders_Level_10_pPzU9WOQNv3ckO1w.json
new file mode 100644
index 00000000..aac6635d
--- /dev/null
+++ b/src/packs/domains/folders_Level_10_pPzU9WOQNv3ckO1w.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "io1DZ9MMMDfuNf8b",
+  "name": "Level 10",
+  "color": null,
+  "sorting": "a",
+  "_id": "pPzU9WOQNv3ckO1w",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!pPzU9WOQNv3ckO1w"
+}
diff --git a/src/packs/domains/folders_Level_10_wdhWWqWlPiBxtsvr.json b/src/packs/domains/folders_Level_10_wdhWWqWlPiBxtsvr.json
new file mode 100644
index 00000000..06262533
--- /dev/null
+++ b/src/packs/domains/folders_Level_10_wdhWWqWlPiBxtsvr.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "c380soh7Z1YAqzOT",
+  "name": "Level 10",
+  "color": null,
+  "sorting": "a",
+  "_id": "wdhWWqWlPiBxtsvr",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!wdhWWqWlPiBxtsvr"
+}
diff --git a/src/packs/domains/folders_Level_1_9Xc6KzNyjDtTGZkp.json b/src/packs/domains/folders_Level_1_9Xc6KzNyjDtTGZkp.json
new file mode 100644
index 00000000..5fa8df48
--- /dev/null
+++ b/src/packs/domains/folders_Level_1_9Xc6KzNyjDtTGZkp.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "gXc5zPwSyZXqrC6D",
+  "name": "Level 1",
+  "color": null,
+  "sorting": "a",
+  "_id": "9Xc6KzNyjDtTGZkp",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!9Xc6KzNyjDtTGZkp"
+}
diff --git a/src/packs/domains/folders_Level_1_EJoXzO85rG5EiZsh.json b/src/packs/domains/folders_Level_1_EJoXzO85rG5EiZsh.json
new file mode 100644
index 00000000..ae5f9acb
--- /dev/null
+++ b/src/packs/domains/folders_Level_1_EJoXzO85rG5EiZsh.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "io1DZ9MMMDfuNf8b",
+  "name": "Level 1",
+  "color": null,
+  "sorting": "a",
+  "_id": "EJoXzO85rG5EiZsh",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!EJoXzO85rG5EiZsh"
+}
diff --git a/src/packs/domains/folders_Level_1_LlWJaBZOKh0Ot2kD.json b/src/packs/domains/folders_Level_1_LlWJaBZOKh0Ot2kD.json
new file mode 100644
index 00000000..8b535a9f
--- /dev/null
+++ b/src/packs/domains/folders_Level_1_LlWJaBZOKh0Ot2kD.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "TL1TutmbeCVJ06nR",
+  "name": "Level 1",
+  "color": null,
+  "sorting": "a",
+  "_id": "LlWJaBZOKh0Ot2kD",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!LlWJaBZOKh0Ot2kD"
+}
diff --git a/src/packs/domains/folders_Level_1_PeeIjbkBv41613yZ.json b/src/packs/domains/folders_Level_1_PeeIjbkBv41613yZ.json
new file mode 100644
index 00000000..7db9c3c5
--- /dev/null
+++ b/src/packs/domains/folders_Level_1_PeeIjbkBv41613yZ.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "IMRfDo5DDrpniKKv",
+  "name": "Level 1",
+  "color": null,
+  "sorting": "a",
+  "_id": "PeeIjbkBv41613yZ",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!PeeIjbkBv41613yZ"
+}
diff --git a/src/packs/domains/folders_Level_1_QpOL7jPbMBzH96qR.json b/src/packs/domains/folders_Level_1_QpOL7jPbMBzH96qR.json
new file mode 100644
index 00000000..dc5982e7
--- /dev/null
+++ b/src/packs/domains/folders_Level_1_QpOL7jPbMBzH96qR.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "yPVeShe47ETIqs9q",
+  "name": "Level 1",
+  "color": null,
+  "sorting": "a",
+  "_id": "QpOL7jPbMBzH96qR",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!QpOL7jPbMBzH96qR"
+}
diff --git a/src/packs/domains/folders_Level_1_nVCKcZkcoEivYJaF.json b/src/packs/domains/folders_Level_1_nVCKcZkcoEivYJaF.json
new file mode 100644
index 00000000..2643f089
--- /dev/null
+++ b/src/packs/domains/folders_Level_1_nVCKcZkcoEivYJaF.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "c380soh7Z1YAqzOT",
+  "name": "Level 1",
+  "color": null,
+  "sorting": "a",
+  "_id": "nVCKcZkcoEivYJaF",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!nVCKcZkcoEivYJaF"
+}
diff --git a/src/packs/domains/folders_Level_1_o7kvw9NRGvDZSce2.json b/src/packs/domains/folders_Level_1_o7kvw9NRGvDZSce2.json
new file mode 100644
index 00000000..da59144c
--- /dev/null
+++ b/src/packs/domains/folders_Level_1_o7kvw9NRGvDZSce2.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "jc1HbSpJmjAsq9GX",
+  "name": "Level 1",
+  "color": null,
+  "sorting": "a",
+  "_id": "o7kvw9NRGvDZSce2",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!o7kvw9NRGvDZSce2"
+}
diff --git a/src/packs/domains/folders_Level_1_sCiN7DoysdKceIMd.json b/src/packs/domains/folders_Level_1_sCiN7DoysdKceIMd.json
new file mode 100644
index 00000000..b515ba55
--- /dev/null
+++ b/src/packs/domains/folders_Level_1_sCiN7DoysdKceIMd.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "tgwSE1t5B0Ka10Xh",
+  "name": "Level 1",
+  "color": null,
+  "sorting": "a",
+  "_id": "sCiN7DoysdKceIMd",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!sCiN7DoysdKceIMd"
+}
diff --git a/src/packs/domains/folders_Level_1_tqhasjtHBX0F20lN.json b/src/packs/domains/folders_Level_1_tqhasjtHBX0F20lN.json
new file mode 100644
index 00000000..04e6bdd5
--- /dev/null
+++ b/src/packs/domains/folders_Level_1_tqhasjtHBX0F20lN.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "q9VsNwg9r0bTn2ll",
+  "name": "Level 1",
+  "color": null,
+  "sorting": "a",
+  "_id": "tqhasjtHBX0F20lN",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!tqhasjtHBX0F20lN"
+}
diff --git a/src/packs/domains/folders_Level_2_2yh8wuYprOyswf0r.json b/src/packs/domains/folders_Level_2_2yh8wuYprOyswf0r.json
new file mode 100644
index 00000000..70501166
--- /dev/null
+++ b/src/packs/domains/folders_Level_2_2yh8wuYprOyswf0r.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "TL1TutmbeCVJ06nR",
+  "name": "Level 2",
+  "color": null,
+  "sorting": "a",
+  "_id": "2yh8wuYprOyswf0r",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!2yh8wuYprOyswf0r"
+}
diff --git a/src/packs/domains/folders_Level_2_Abn46nCQst6kpGeA.json b/src/packs/domains/folders_Level_2_Abn46nCQst6kpGeA.json
new file mode 100644
index 00000000..7ad07a5f
--- /dev/null
+++ b/src/packs/domains/folders_Level_2_Abn46nCQst6kpGeA.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "tgwSE1t5B0Ka10Xh",
+  "name": "Level 2",
+  "color": null,
+  "sorting": "a",
+  "_id": "Abn46nCQst6kpGeA",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!Abn46nCQst6kpGeA"
+}
diff --git a/src/packs/domains/folders_Level_2_Q9rmrfeKqcqBNnWc.json b/src/packs/domains/folders_Level_2_Q9rmrfeKqcqBNnWc.json
new file mode 100644
index 00000000..1c9229a2
--- /dev/null
+++ b/src/packs/domains/folders_Level_2_Q9rmrfeKqcqBNnWc.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "IMRfDo5DDrpniKKv",
+  "name": "Level 2",
+  "color": null,
+  "sorting": "a",
+  "_id": "Q9rmrfeKqcqBNnWc",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!Q9rmrfeKqcqBNnWc"
+}
diff --git a/src/packs/domains/folders_Level_2_j9i2Q6Z7Z82udHn1.json b/src/packs/domains/folders_Level_2_j9i2Q6Z7Z82udHn1.json
new file mode 100644
index 00000000..989c4cec
--- /dev/null
+++ b/src/packs/domains/folders_Level_2_j9i2Q6Z7Z82udHn1.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "q9VsNwg9r0bTn2ll",
+  "name": "Level 2",
+  "color": null,
+  "sorting": "a",
+  "_id": "j9i2Q6Z7Z82udHn1",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!j9i2Q6Z7Z82udHn1"
+}
diff --git a/src/packs/domains/folders_Level_2_o7t2fsAmRxKLoHrO.json b/src/packs/domains/folders_Level_2_o7t2fsAmRxKLoHrO.json
new file mode 100644
index 00000000..d0bd857d
--- /dev/null
+++ b/src/packs/domains/folders_Level_2_o7t2fsAmRxKLoHrO.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "gXc5zPwSyZXqrC6D",
+  "name": "Level 2",
+  "color": null,
+  "sorting": "a",
+  "_id": "o7t2fsAmRxKLoHrO",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!o7t2fsAmRxKLoHrO"
+}
diff --git a/src/packs/domains/folders_Level_2_pk4xXE8D3vTawrqj.json b/src/packs/domains/folders_Level_2_pk4xXE8D3vTawrqj.json
new file mode 100644
index 00000000..048fb29d
--- /dev/null
+++ b/src/packs/domains/folders_Level_2_pk4xXE8D3vTawrqj.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "yPVeShe47ETIqs9q",
+  "name": "Level 2",
+  "color": null,
+  "sorting": "a",
+  "_id": "pk4xXE8D3vTawrqj",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!pk4xXE8D3vTawrqj"
+}
diff --git a/src/packs/domains/folders_Level_2_pu3xD4rEkdfdAvGc.json b/src/packs/domains/folders_Level_2_pu3xD4rEkdfdAvGc.json
new file mode 100644
index 00000000..3b00a7e7
--- /dev/null
+++ b/src/packs/domains/folders_Level_2_pu3xD4rEkdfdAvGc.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "c380soh7Z1YAqzOT",
+  "name": "Level 2",
+  "color": null,
+  "sorting": "a",
+  "_id": "pu3xD4rEkdfdAvGc",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!pu3xD4rEkdfdAvGc"
+}
diff --git a/src/packs/domains/folders_Level_2_u8Yz2hUTaF3N2fFT.json b/src/packs/domains/folders_Level_2_u8Yz2hUTaF3N2fFT.json
new file mode 100644
index 00000000..1364e716
--- /dev/null
+++ b/src/packs/domains/folders_Level_2_u8Yz2hUTaF3N2fFT.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "jc1HbSpJmjAsq9GX",
+  "name": "Level 2",
+  "color": null,
+  "sorting": "a",
+  "_id": "u8Yz2hUTaF3N2fFT",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!u8Yz2hUTaF3N2fFT"
+}
diff --git a/src/packs/domains/folders_Level_2_xZrCYAd05ayNu1yW.json b/src/packs/domains/folders_Level_2_xZrCYAd05ayNu1yW.json
new file mode 100644
index 00000000..3768acad
--- /dev/null
+++ b/src/packs/domains/folders_Level_2_xZrCYAd05ayNu1yW.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "io1DZ9MMMDfuNf8b",
+  "name": "Level 2",
+  "color": null,
+  "sorting": "a",
+  "_id": "xZrCYAd05ayNu1yW",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!xZrCYAd05ayNu1yW"
+}
diff --git a/src/packs/domains/folders_Level_3_7XeaYZPMB0SopAfo.json b/src/packs/domains/folders_Level_3_7XeaYZPMB0SopAfo.json
new file mode 100644
index 00000000..15417ed9
--- /dev/null
+++ b/src/packs/domains/folders_Level_3_7XeaYZPMB0SopAfo.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "q9VsNwg9r0bTn2ll",
+  "name": "Level 3",
+  "color": null,
+  "sorting": "a",
+  "_id": "7XeaYZPMB0SopAfo",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!7XeaYZPMB0SopAfo"
+}
diff --git a/src/packs/domains/folders_Level_3_8ZfL09F8MiOEUzzw.json b/src/packs/domains/folders_Level_3_8ZfL09F8MiOEUzzw.json
new file mode 100644
index 00000000..a77a2f88
--- /dev/null
+++ b/src/packs/domains/folders_Level_3_8ZfL09F8MiOEUzzw.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "TL1TutmbeCVJ06nR",
+  "name": "Level 3",
+  "color": null,
+  "sorting": "a",
+  "_id": "8ZfL09F8MiOEUzzw",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!8ZfL09F8MiOEUzzw"
+}
diff --git a/src/packs/domains/folders_Level_3_GhLhMfmSgGqS9bwU.json b/src/packs/domains/folders_Level_3_GhLhMfmSgGqS9bwU.json
new file mode 100644
index 00000000..063a6e0d
--- /dev/null
+++ b/src/packs/domains/folders_Level_3_GhLhMfmSgGqS9bwU.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "c380soh7Z1YAqzOT",
+  "name": "Level 3",
+  "color": null,
+  "sorting": "a",
+  "_id": "GhLhMfmSgGqS9bwU",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!GhLhMfmSgGqS9bwU"
+}
diff --git a/src/packs/domains/folders_Level_3_Oo9EkkF7CDD3QZEG.json b/src/packs/domains/folders_Level_3_Oo9EkkF7CDD3QZEG.json
new file mode 100644
index 00000000..e6b677ab
--- /dev/null
+++ b/src/packs/domains/folders_Level_3_Oo9EkkF7CDD3QZEG.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "yPVeShe47ETIqs9q",
+  "name": "Level 3",
+  "color": null,
+  "sorting": "a",
+  "_id": "Oo9EkkF7CDD3QZEG",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!Oo9EkkF7CDD3QZEG"
+}
diff --git a/src/packs/domains/folders_Level_3_eR7sP5jQwfCLORUe.json b/src/packs/domains/folders_Level_3_eR7sP5jQwfCLORUe.json
new file mode 100644
index 00000000..8aeb92a7
--- /dev/null
+++ b/src/packs/domains/folders_Level_3_eR7sP5jQwfCLORUe.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "IMRfDo5DDrpniKKv",
+  "name": "Level 3",
+  "color": null,
+  "sorting": "a",
+  "_id": "eR7sP5jQwfCLORUe",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!eR7sP5jQwfCLORUe"
+}
diff --git a/src/packs/domains/folders_Level_3_hoDIPBzwYPxiSXGU.json b/src/packs/domains/folders_Level_3_hoDIPBzwYPxiSXGU.json
new file mode 100644
index 00000000..ab5c1865
--- /dev/null
+++ b/src/packs/domains/folders_Level_3_hoDIPBzwYPxiSXGU.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "tgwSE1t5B0Ka10Xh",
+  "name": "Level 3",
+  "color": null,
+  "sorting": "a",
+  "_id": "hoDIPBzwYPxiSXGU",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!hoDIPBzwYPxiSXGU"
+}
diff --git a/src/packs/domains/folders_Level_3_mOv6BGhJAeGrzA84.json b/src/packs/domains/folders_Level_3_mOv6BGhJAeGrzA84.json
new file mode 100644
index 00000000..8c2ca9f8
--- /dev/null
+++ b/src/packs/domains/folders_Level_3_mOv6BGhJAeGrzA84.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "jc1HbSpJmjAsq9GX",
+  "name": "Level 3",
+  "color": null,
+  "sorting": "a",
+  "_id": "mOv6BGhJAeGrzA84",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!mOv6BGhJAeGrzA84"
+}
diff --git a/src/packs/domains/folders_Level_3_uXGugK72AffddFdH.json b/src/packs/domains/folders_Level_3_uXGugK72AffddFdH.json
new file mode 100644
index 00000000..3963e819
--- /dev/null
+++ b/src/packs/domains/folders_Level_3_uXGugK72AffddFdH.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "io1DZ9MMMDfuNf8b",
+  "name": "Level 3",
+  "color": null,
+  "sorting": "a",
+  "_id": "uXGugK72AffddFdH",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!uXGugK72AffddFdH"
+}
diff --git a/src/packs/domains/folders_Level_3_wWL9mV6i2EGX5xHS.json b/src/packs/domains/folders_Level_3_wWL9mV6i2EGX5xHS.json
new file mode 100644
index 00000000..0fa120a9
--- /dev/null
+++ b/src/packs/domains/folders_Level_3_wWL9mV6i2EGX5xHS.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "gXc5zPwSyZXqrC6D",
+  "name": "Level 3",
+  "color": null,
+  "sorting": "a",
+  "_id": "wWL9mV6i2EGX5xHS",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!wWL9mV6i2EGX5xHS"
+}
diff --git a/src/packs/domains/folders_Level_4_1e5Sn8OXxEQ57GSD.json b/src/packs/domains/folders_Level_4_1e5Sn8OXxEQ57GSD.json
new file mode 100644
index 00000000..b18a545a
--- /dev/null
+++ b/src/packs/domains/folders_Level_4_1e5Sn8OXxEQ57GSD.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "jc1HbSpJmjAsq9GX",
+  "name": "Level 4",
+  "color": null,
+  "sorting": "a",
+  "_id": "1e5Sn8OXxEQ57GSD",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!1e5Sn8OXxEQ57GSD"
+}
diff --git a/src/packs/domains/folders_Level_4_3e8kCsLzLxiACJDb.json b/src/packs/domains/folders_Level_4_3e8kCsLzLxiACJDb.json
new file mode 100644
index 00000000..c6c37c44
--- /dev/null
+++ b/src/packs/domains/folders_Level_4_3e8kCsLzLxiACJDb.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "IMRfDo5DDrpniKKv",
+  "name": "Level 4",
+  "color": null,
+  "sorting": "a",
+  "_id": "3e8kCsLzLxiACJDb",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!3e8kCsLzLxiACJDb"
+}
diff --git a/src/packs/domains/folders_Level_4_BJIiOIWAQUz5zuqo.json b/src/packs/domains/folders_Level_4_BJIiOIWAQUz5zuqo.json
new file mode 100644
index 00000000..f4feabe3
--- /dev/null
+++ b/src/packs/domains/folders_Level_4_BJIiOIWAQUz5zuqo.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "io1DZ9MMMDfuNf8b",
+  "name": "Level 4",
+  "color": null,
+  "sorting": "a",
+  "_id": "BJIiOIWAQUz5zuqo",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!BJIiOIWAQUz5zuqo"
+}
diff --git a/src/packs/domains/folders_Level_4_WTdOLLkQyPdg0KWU.json b/src/packs/domains/folders_Level_4_WTdOLLkQyPdg0KWU.json
new file mode 100644
index 00000000..8cc4455e
--- /dev/null
+++ b/src/packs/domains/folders_Level_4_WTdOLLkQyPdg0KWU.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "tgwSE1t5B0Ka10Xh",
+  "name": "Level 4",
+  "color": null,
+  "sorting": "a",
+  "_id": "WTdOLLkQyPdg0KWU",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!WTdOLLkQyPdg0KWU"
+}
diff --git a/src/packs/domains/folders_Level_4_cOZgzLQRGNnBzsHT.json b/src/packs/domains/folders_Level_4_cOZgzLQRGNnBzsHT.json
new file mode 100644
index 00000000..e3fb6d91
--- /dev/null
+++ b/src/packs/domains/folders_Level_4_cOZgzLQRGNnBzsHT.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "yPVeShe47ETIqs9q",
+  "name": "Level 4",
+  "color": null,
+  "sorting": "a",
+  "_id": "cOZgzLQRGNnBzsHT",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!cOZgzLQRGNnBzsHT"
+}
diff --git a/src/packs/domains/folders_Level_4_rUGDM9JvGfhh9a2Y.json b/src/packs/domains/folders_Level_4_rUGDM9JvGfhh9a2Y.json
new file mode 100644
index 00000000..b95fccfa
--- /dev/null
+++ b/src/packs/domains/folders_Level_4_rUGDM9JvGfhh9a2Y.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "q9VsNwg9r0bTn2ll",
+  "name": "Level 4",
+  "color": null,
+  "sorting": "a",
+  "_id": "rUGDM9JvGfhh9a2Y",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!rUGDM9JvGfhh9a2Y"
+}
diff --git a/src/packs/domains/folders_Level_4_thP6nUk0nkrNcpXY.json b/src/packs/domains/folders_Level_4_thP6nUk0nkrNcpXY.json
new file mode 100644
index 00000000..a923dfa0
--- /dev/null
+++ b/src/packs/domains/folders_Level_4_thP6nUk0nkrNcpXY.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "c380soh7Z1YAqzOT",
+  "name": "Level 4",
+  "color": null,
+  "sorting": "a",
+  "_id": "thP6nUk0nkrNcpXY",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!thP6nUk0nkrNcpXY"
+}
diff --git a/src/packs/domains/folders_Level_4_vAZKNDtAafd7HDWV.json b/src/packs/domains/folders_Level_4_vAZKNDtAafd7HDWV.json
new file mode 100644
index 00000000..6dfea92f
--- /dev/null
+++ b/src/packs/domains/folders_Level_4_vAZKNDtAafd7HDWV.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "TL1TutmbeCVJ06nR",
+  "name": "Level 4",
+  "color": null,
+  "sorting": "a",
+  "_id": "vAZKNDtAafd7HDWV",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!vAZKNDtAafd7HDWV"
+}
diff --git a/src/packs/domains/folders_Level_4_yalAnCU3SndrYImF.json b/src/packs/domains/folders_Level_4_yalAnCU3SndrYImF.json
new file mode 100644
index 00000000..9e68181d
--- /dev/null
+++ b/src/packs/domains/folders_Level_4_yalAnCU3SndrYImF.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "gXc5zPwSyZXqrC6D",
+  "name": "Level 4",
+  "color": null,
+  "sorting": "a",
+  "_id": "yalAnCU3SndrYImF",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!yalAnCU3SndrYImF"
+}
diff --git a/src/packs/domains/folders_Level_5_6gA7SmNIblkMaYgr.json b/src/packs/domains/folders_Level_5_6gA7SmNIblkMaYgr.json
new file mode 100644
index 00000000..4dc9f597
--- /dev/null
+++ b/src/packs/domains/folders_Level_5_6gA7SmNIblkMaYgr.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "c380soh7Z1YAqzOT",
+  "name": "Level 5",
+  "color": null,
+  "sorting": "a",
+  "_id": "6gA7SmNIblkMaYgr",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!6gA7SmNIblkMaYgr"
+}
diff --git a/src/packs/domains/folders_Level_5_8erksbTp7ic6in4I.json b/src/packs/domains/folders_Level_5_8erksbTp7ic6in4I.json
new file mode 100644
index 00000000..61b7f4f2
--- /dev/null
+++ b/src/packs/domains/folders_Level_5_8erksbTp7ic6in4I.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "tgwSE1t5B0Ka10Xh",
+  "name": "Level 5",
+  "color": null,
+  "sorting": "a",
+  "_id": "8erksbTp7ic6in4I",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!8erksbTp7ic6in4I"
+}
diff --git a/src/packs/domains/folders_Level_5_BQ1L4EiwOs84Xysp.json b/src/packs/domains/folders_Level_5_BQ1L4EiwOs84Xysp.json
new file mode 100644
index 00000000..f76f64cf
--- /dev/null
+++ b/src/packs/domains/folders_Level_5_BQ1L4EiwOs84Xysp.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "IMRfDo5DDrpniKKv",
+  "name": "Level 5",
+  "color": null,
+  "sorting": "a",
+  "_id": "BQ1L4EiwOs84Xysp",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!BQ1L4EiwOs84Xysp"
+}
diff --git a/src/packs/domains/folders_Level_5_Emnx4o1DWGTVKoAg.json b/src/packs/domains/folders_Level_5_Emnx4o1DWGTVKoAg.json
new file mode 100644
index 00000000..dd07fbfd
--- /dev/null
+++ b/src/packs/domains/folders_Level_5_Emnx4o1DWGTVKoAg.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "gXc5zPwSyZXqrC6D",
+  "name": "Level 5",
+  "color": null,
+  "sorting": "a",
+  "_id": "Emnx4o1DWGTVKoAg",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!Emnx4o1DWGTVKoAg"
+}
diff --git a/src/packs/domains/folders_Level_5_Jbw6Teaha6So9tym.json b/src/packs/domains/folders_Level_5_Jbw6Teaha6So9tym.json
new file mode 100644
index 00000000..a39039e4
--- /dev/null
+++ b/src/packs/domains/folders_Level_5_Jbw6Teaha6So9tym.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "TL1TutmbeCVJ06nR",
+  "name": "Level 5",
+  "color": null,
+  "sorting": "a",
+  "_id": "Jbw6Teaha6So9tym",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!Jbw6Teaha6So9tym"
+}
diff --git a/src/packs/domains/folders_Level_5_XDSp0FdiYDVO0tfw.json b/src/packs/domains/folders_Level_5_XDSp0FdiYDVO0tfw.json
new file mode 100644
index 00000000..b7a6dd48
--- /dev/null
+++ b/src/packs/domains/folders_Level_5_XDSp0FdiYDVO0tfw.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "yPVeShe47ETIqs9q",
+  "name": "Level 5",
+  "color": null,
+  "sorting": "a",
+  "_id": "XDSp0FdiYDVO0tfw",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!XDSp0FdiYDVO0tfw"
+}
diff --git a/src/packs/domains/folders_Level_5_ZZHIbaynhzVArA1p.json b/src/packs/domains/folders_Level_5_ZZHIbaynhzVArA1p.json
new file mode 100644
index 00000000..74e995c9
--- /dev/null
+++ b/src/packs/domains/folders_Level_5_ZZHIbaynhzVArA1p.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "io1DZ9MMMDfuNf8b",
+  "name": "Level 5",
+  "color": null,
+  "sorting": "a",
+  "_id": "ZZHIbaynhzVArA1p",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!ZZHIbaynhzVArA1p"
+}
diff --git a/src/packs/domains/folders_Level_5_l387HKojhqcDAV0b.json b/src/packs/domains/folders_Level_5_l387HKojhqcDAV0b.json
new file mode 100644
index 00000000..279e7d88
--- /dev/null
+++ b/src/packs/domains/folders_Level_5_l387HKojhqcDAV0b.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "jc1HbSpJmjAsq9GX",
+  "name": "Level 5",
+  "color": null,
+  "sorting": "a",
+  "_id": "l387HKojhqcDAV0b",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!l387HKojhqcDAV0b"
+}
diff --git a/src/packs/domains/folders_Level_5_pDtffkb0SMv1O8pL.json b/src/packs/domains/folders_Level_5_pDtffkb0SMv1O8pL.json
new file mode 100644
index 00000000..0ce4e669
--- /dev/null
+++ b/src/packs/domains/folders_Level_5_pDtffkb0SMv1O8pL.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "q9VsNwg9r0bTn2ll",
+  "name": "Level 5",
+  "color": null,
+  "sorting": "a",
+  "_id": "pDtffkb0SMv1O8pL",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!pDtffkb0SMv1O8pL"
+}
diff --git a/src/packs/domains/folders_Level_6_EiP5dLozOFZKIeWN.json b/src/packs/domains/folders_Level_6_EiP5dLozOFZKIeWN.json
new file mode 100644
index 00000000..7017c7ce
--- /dev/null
+++ b/src/packs/domains/folders_Level_6_EiP5dLozOFZKIeWN.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "gXc5zPwSyZXqrC6D",
+  "name": "Level 6",
+  "color": null,
+  "sorting": "a",
+  "_id": "EiP5dLozOFZKIeWN",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!EiP5dLozOFZKIeWN"
+}
diff --git a/src/packs/domains/folders_Level_6_FcMclsLDy86EicA6.json b/src/packs/domains/folders_Level_6_FcMclsLDy86EicA6.json
new file mode 100644
index 00000000..e87cbfdf
--- /dev/null
+++ b/src/packs/domains/folders_Level_6_FcMclsLDy86EicA6.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "q9VsNwg9r0bTn2ll",
+  "name": "Level 6",
+  "color": null,
+  "sorting": "a",
+  "_id": "FcMclsLDy86EicA6",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!FcMclsLDy86EicA6"
+}
diff --git a/src/packs/domains/folders_Level_6_OwsbTSWzKq2WJmQN.json b/src/packs/domains/folders_Level_6_OwsbTSWzKq2WJmQN.json
new file mode 100644
index 00000000..f6da2d63
--- /dev/null
+++ b/src/packs/domains/folders_Level_6_OwsbTSWzKq2WJmQN.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "TL1TutmbeCVJ06nR",
+  "name": "Level 6",
+  "color": null,
+  "sorting": "a",
+  "_id": "OwsbTSWzKq2WJmQN",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!OwsbTSWzKq2WJmQN"
+}
diff --git a/src/packs/domains/folders_Level_6_VgADdqYn9nS9G1Us.json b/src/packs/domains/folders_Level_6_VgADdqYn9nS9G1Us.json
new file mode 100644
index 00000000..82f700f7
--- /dev/null
+++ b/src/packs/domains/folders_Level_6_VgADdqYn9nS9G1Us.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "c380soh7Z1YAqzOT",
+  "name": "Level 6",
+  "color": null,
+  "sorting": "a",
+  "_id": "VgADdqYn9nS9G1Us",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!VgADdqYn9nS9G1Us"
+}
diff --git a/src/packs/domains/folders_Level_6_gqnmAgerh7HhNo7t.json b/src/packs/domains/folders_Level_6_gqnmAgerh7HhNo7t.json
new file mode 100644
index 00000000..fb478b05
--- /dev/null
+++ b/src/packs/domains/folders_Level_6_gqnmAgerh7HhNo7t.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "jc1HbSpJmjAsq9GX",
+  "name": "Level 6",
+  "color": null,
+  "sorting": "a",
+  "_id": "gqnmAgerh7HhNo7t",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!gqnmAgerh7HhNo7t"
+}
diff --git a/src/packs/domains/folders_Level_6_nKCmeAn7ESsb4byE.json b/src/packs/domains/folders_Level_6_nKCmeAn7ESsb4byE.json
new file mode 100644
index 00000000..d52ef5a4
--- /dev/null
+++ b/src/packs/domains/folders_Level_6_nKCmeAn7ESsb4byE.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "yPVeShe47ETIqs9q",
+  "name": "Level 6",
+  "color": null,
+  "sorting": "a",
+  "_id": "nKCmeAn7ESsb4byE",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!nKCmeAn7ESsb4byE"
+}
diff --git a/src/packs/domains/folders_Level_6_pYEavNqteiQepvvD.json b/src/packs/domains/folders_Level_6_pYEavNqteiQepvvD.json
new file mode 100644
index 00000000..ddc92a67
--- /dev/null
+++ b/src/packs/domains/folders_Level_6_pYEavNqteiQepvvD.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "IMRfDo5DDrpniKKv",
+  "name": "Level 6",
+  "color": null,
+  "sorting": "a",
+  "_id": "pYEavNqteiQepvvD",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!pYEavNqteiQepvvD"
+}
diff --git a/src/packs/domains/folders_Level_6_u5Lq2kfC8LlDAGDC.json b/src/packs/domains/folders_Level_6_u5Lq2kfC8LlDAGDC.json
new file mode 100644
index 00000000..097a0d00
--- /dev/null
+++ b/src/packs/domains/folders_Level_6_u5Lq2kfC8LlDAGDC.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "io1DZ9MMMDfuNf8b",
+  "name": "Level 6",
+  "color": null,
+  "sorting": "a",
+  "_id": "u5Lq2kfC8LlDAGDC",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!u5Lq2kfC8LlDAGDC"
+}
diff --git a/src/packs/domains/folders_Level_6_xuGz0QPNlkTOV0rV.json b/src/packs/domains/folders_Level_6_xuGz0QPNlkTOV0rV.json
new file mode 100644
index 00000000..c78eae18
--- /dev/null
+++ b/src/packs/domains/folders_Level_6_xuGz0QPNlkTOV0rV.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "tgwSE1t5B0Ka10Xh",
+  "name": "Level 6",
+  "color": null,
+  "sorting": "a",
+  "_id": "xuGz0QPNlkTOV0rV",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!xuGz0QPNlkTOV0rV"
+}
diff --git a/src/packs/domains/folders_Level_7_HAGbPLHwm0UozDeG.json b/src/packs/domains/folders_Level_7_HAGbPLHwm0UozDeG.json
new file mode 100644
index 00000000..e5126eef
--- /dev/null
+++ b/src/packs/domains/folders_Level_7_HAGbPLHwm0UozDeG.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "gXc5zPwSyZXqrC6D",
+  "name": "Level 7",
+  "color": null,
+  "sorting": "a",
+  "_id": "HAGbPLHwm0UozDeG",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!HAGbPLHwm0UozDeG"
+}
diff --git a/src/packs/domains/folders_Level_7_ML2JusN36oJoR8QA.json b/src/packs/domains/folders_Level_7_ML2JusN36oJoR8QA.json
new file mode 100644
index 00000000..790f4afb
--- /dev/null
+++ b/src/packs/domains/folders_Level_7_ML2JusN36oJoR8QA.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "tgwSE1t5B0Ka10Xh",
+  "name": "Level 7",
+  "color": null,
+  "sorting": "a",
+  "_id": "ML2JusN36oJoR8QA",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!ML2JusN36oJoR8QA"
+}
diff --git a/src/packs/domains/folders_Level_7_W81LnTWzwmoaycTl.json b/src/packs/domains/folders_Level_7_W81LnTWzwmoaycTl.json
new file mode 100644
index 00000000..c9e73a93
--- /dev/null
+++ b/src/packs/domains/folders_Level_7_W81LnTWzwmoaycTl.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "c380soh7Z1YAqzOT",
+  "name": "Level 7",
+  "color": null,
+  "sorting": "a",
+  "_id": "W81LnTWzwmoaycTl",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!W81LnTWzwmoaycTl"
+}
diff --git a/src/packs/domains/folders_Level_7_Z6oglw8LIOrtBcN6.json b/src/packs/domains/folders_Level_7_Z6oglw8LIOrtBcN6.json
new file mode 100644
index 00000000..2c0c01ce
--- /dev/null
+++ b/src/packs/domains/folders_Level_7_Z6oglw8LIOrtBcN6.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "TL1TutmbeCVJ06nR",
+  "name": "Level 7",
+  "color": null,
+  "sorting": "a",
+  "_id": "Z6oglw8LIOrtBcN6",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!Z6oglw8LIOrtBcN6"
+}
diff --git a/src/packs/domains/folders_Level_7_bCjkysrofWPiZqNh.json b/src/packs/domains/folders_Level_7_bCjkysrofWPiZqNh.json
new file mode 100644
index 00000000..19ed1f98
--- /dev/null
+++ b/src/packs/domains/folders_Level_7_bCjkysrofWPiZqNh.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "jc1HbSpJmjAsq9GX",
+  "name": "Level 7",
+  "color": null,
+  "sorting": "a",
+  "_id": "bCjkysrofWPiZqNh",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!bCjkysrofWPiZqNh"
+}
diff --git a/src/packs/domains/folders_Level_7_gEVGjjPrjqxxZkb5.json b/src/packs/domains/folders_Level_7_gEVGjjPrjqxxZkb5.json
new file mode 100644
index 00000000..68c2f05b
--- /dev/null
+++ b/src/packs/domains/folders_Level_7_gEVGjjPrjqxxZkb5.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "io1DZ9MMMDfuNf8b",
+  "name": "Level 7",
+  "color": null,
+  "sorting": "a",
+  "_id": "gEVGjjPrjqxxZkb5",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!gEVGjjPrjqxxZkb5"
+}
diff --git a/src/packs/domains/folders_Level_7_hh2vkggcAQ0QUE6C.json b/src/packs/domains/folders_Level_7_hh2vkggcAQ0QUE6C.json
new file mode 100644
index 00000000..3bd611ed
--- /dev/null
+++ b/src/packs/domains/folders_Level_7_hh2vkggcAQ0QUE6C.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "q9VsNwg9r0bTn2ll",
+  "name": "Level 7",
+  "color": null,
+  "sorting": "a",
+  "_id": "hh2vkggcAQ0QUE6C",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!hh2vkggcAQ0QUE6C"
+}
diff --git a/src/packs/domains/folders_Level_7_i5iDLXMZLc0ckWI5.json b/src/packs/domains/folders_Level_7_i5iDLXMZLc0ckWI5.json
new file mode 100644
index 00000000..d0893613
--- /dev/null
+++ b/src/packs/domains/folders_Level_7_i5iDLXMZLc0ckWI5.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "IMRfDo5DDrpniKKv",
+  "name": "Level 7",
+  "color": null,
+  "sorting": "a",
+  "_id": "i5iDLXMZLc0ckWI5",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!i5iDLXMZLc0ckWI5"
+}
diff --git a/src/packs/domains/folders_Level_7_kj3gwg5bmCqwFYze.json b/src/packs/domains/folders_Level_7_kj3gwg5bmCqwFYze.json
new file mode 100644
index 00000000..83a04b1f
--- /dev/null
+++ b/src/packs/domains/folders_Level_7_kj3gwg5bmCqwFYze.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "yPVeShe47ETIqs9q",
+  "name": "Level 7",
+  "color": null,
+  "sorting": "a",
+  "_id": "kj3gwg5bmCqwFYze",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!kj3gwg5bmCqwFYze"
+}
diff --git a/src/packs/domains/folders_Level_8_7O1tTswJMNdPgLsx.json b/src/packs/domains/folders_Level_8_7O1tTswJMNdPgLsx.json
new file mode 100644
index 00000000..b82cf2e4
--- /dev/null
+++ b/src/packs/domains/folders_Level_8_7O1tTswJMNdPgLsx.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "c380soh7Z1YAqzOT",
+  "name": "Level 8",
+  "color": null,
+  "sorting": "a",
+  "_id": "7O1tTswJMNdPgLsx",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!7O1tTswJMNdPgLsx"
+}
diff --git a/src/packs/domains/folders_Level_8_8bWpGblWODdf8mDR.json b/src/packs/domains/folders_Level_8_8bWpGblWODdf8mDR.json
new file mode 100644
index 00000000..ff26cb25
--- /dev/null
+++ b/src/packs/domains/folders_Level_8_8bWpGblWODdf8mDR.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "q9VsNwg9r0bTn2ll",
+  "name": "Level 8",
+  "color": null,
+  "sorting": "a",
+  "_id": "8bWpGblWODdf8mDR",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!8bWpGblWODdf8mDR"
+}
diff --git a/src/packs/domains/folders_Level_8_A00z8Q8B3aKApKzI.json b/src/packs/domains/folders_Level_8_A00z8Q8B3aKApKzI.json
new file mode 100644
index 00000000..cababd7b
--- /dev/null
+++ b/src/packs/domains/folders_Level_8_A00z8Q8B3aKApKzI.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "TL1TutmbeCVJ06nR",
+  "name": "Level 8",
+  "color": null,
+  "sorting": "a",
+  "_id": "A00z8Q8B3aKApKzI",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!A00z8Q8B3aKApKzI"
+}
diff --git a/src/packs/domains/folders_Level_8_FUzQxkv4gFc46SIs.json b/src/packs/domains/folders_Level_8_FUzQxkv4gFc46SIs.json
new file mode 100644
index 00000000..c3d2c6dd
--- /dev/null
+++ b/src/packs/domains/folders_Level_8_FUzQxkv4gFc46SIs.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "yPVeShe47ETIqs9q",
+  "name": "Level 8",
+  "color": null,
+  "sorting": "a",
+  "_id": "FUzQxkv4gFc46SIs",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!FUzQxkv4gFc46SIs"
+}
diff --git a/src/packs/domains/folders_Level_8_KmaX6wNBLzkFevaG.json b/src/packs/domains/folders_Level_8_KmaX6wNBLzkFevaG.json
new file mode 100644
index 00000000..0eff3653
--- /dev/null
+++ b/src/packs/domains/folders_Level_8_KmaX6wNBLzkFevaG.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "jc1HbSpJmjAsq9GX",
+  "name": "Level 8",
+  "color": null,
+  "sorting": "a",
+  "_id": "KmaX6wNBLzkFevaG",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!KmaX6wNBLzkFevaG"
+}
diff --git a/src/packs/domains/folders_Level_8_me7ywrVh38j6T8Sm.json b/src/packs/domains/folders_Level_8_me7ywrVh38j6T8Sm.json
new file mode 100644
index 00000000..73ef44fa
--- /dev/null
+++ b/src/packs/domains/folders_Level_8_me7ywrVh38j6T8Sm.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "gXc5zPwSyZXqrC6D",
+  "name": "Level 8",
+  "color": null,
+  "sorting": "a",
+  "_id": "me7ywrVh38j6T8Sm",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!me7ywrVh38j6T8Sm"
+}
diff --git a/src/packs/domains/folders_Level_8_n7pgTBYSItMzCX0s.json b/src/packs/domains/folders_Level_8_n7pgTBYSItMzCX0s.json
new file mode 100644
index 00000000..a60bf86c
--- /dev/null
+++ b/src/packs/domains/folders_Level_8_n7pgTBYSItMzCX0s.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "IMRfDo5DDrpniKKv",
+  "name": "Level 8",
+  "color": null,
+  "sorting": "a",
+  "_id": "n7pgTBYSItMzCX0s",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!n7pgTBYSItMzCX0s"
+}
diff --git a/src/packs/domains/folders_Level_8_qY4Zqc1Ch6p317uK.json b/src/packs/domains/folders_Level_8_qY4Zqc1Ch6p317uK.json
new file mode 100644
index 00000000..5bb45c09
--- /dev/null
+++ b/src/packs/domains/folders_Level_8_qY4Zqc1Ch6p317uK.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "io1DZ9MMMDfuNf8b",
+  "name": "Level 8",
+  "color": null,
+  "sorting": "a",
+  "_id": "qY4Zqc1Ch6p317uK",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!qY4Zqc1Ch6p317uK"
+}
diff --git a/src/packs/domains/folders_Level_8_taM81THa8h6Bv2Xa.json b/src/packs/domains/folders_Level_8_taM81THa8h6Bv2Xa.json
new file mode 100644
index 00000000..e07ca233
--- /dev/null
+++ b/src/packs/domains/folders_Level_8_taM81THa8h6Bv2Xa.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "tgwSE1t5B0Ka10Xh",
+  "name": "Level 8",
+  "color": null,
+  "sorting": "a",
+  "_id": "taM81THa8h6Bv2Xa",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!taM81THa8h6Bv2Xa"
+}
diff --git a/src/packs/domains/folders_Level_9_2rqOUxEglhhPKk2j.json b/src/packs/domains/folders_Level_9_2rqOUxEglhhPKk2j.json
new file mode 100644
index 00000000..5cf348c0
--- /dev/null
+++ b/src/packs/domains/folders_Level_9_2rqOUxEglhhPKk2j.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "tgwSE1t5B0Ka10Xh",
+  "name": "Level 9",
+  "color": null,
+  "sorting": "a",
+  "_id": "2rqOUxEglhhPKk2j",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!2rqOUxEglhhPKk2j"
+}
diff --git a/src/packs/domains/folders_Level_9_8DOVMjTtZFKtwX4p.json b/src/packs/domains/folders_Level_9_8DOVMjTtZFKtwX4p.json
new file mode 100644
index 00000000..6b1aa18d
--- /dev/null
+++ b/src/packs/domains/folders_Level_9_8DOVMjTtZFKtwX4p.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "yPVeShe47ETIqs9q",
+  "name": "Level 9",
+  "color": null,
+  "sorting": "a",
+  "_id": "8DOVMjTtZFKtwX4p",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!8DOVMjTtZFKtwX4p"
+}
diff --git a/src/packs/domains/folders_Level_9_KwZYrsSUYnHiNtPl.json b/src/packs/domains/folders_Level_9_KwZYrsSUYnHiNtPl.json
new file mode 100644
index 00000000..a431dbc3
--- /dev/null
+++ b/src/packs/domains/folders_Level_9_KwZYrsSUYnHiNtPl.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "q9VsNwg9r0bTn2ll",
+  "name": "Level 9",
+  "color": null,
+  "sorting": "a",
+  "_id": "KwZYrsSUYnHiNtPl",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!KwZYrsSUYnHiNtPl"
+}
diff --git a/src/packs/domains/folders_Level_9_QYdeGsmVYIF34kZR.json b/src/packs/domains/folders_Level_9_QYdeGsmVYIF34kZR.json
new file mode 100644
index 00000000..e4da2c26
--- /dev/null
+++ b/src/packs/domains/folders_Level_9_QYdeGsmVYIF34kZR.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "gXc5zPwSyZXqrC6D",
+  "name": "Level 9",
+  "color": null,
+  "sorting": "a",
+  "_id": "QYdeGsmVYIF34kZR",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!QYdeGsmVYIF34kZR"
+}
diff --git a/src/packs/domains/folders_Level_9_R5afi5bhq9ccnYY2.json b/src/packs/domains/folders_Level_9_R5afi5bhq9ccnYY2.json
new file mode 100644
index 00000000..a197a2bd
--- /dev/null
+++ b/src/packs/domains/folders_Level_9_R5afi5bhq9ccnYY2.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "io1DZ9MMMDfuNf8b",
+  "name": "Level 9",
+  "color": null,
+  "sorting": "a",
+  "_id": "R5afi5bhq9ccnYY2",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!R5afi5bhq9ccnYY2"
+}
diff --git a/src/packs/domains/folders_Level_9_eg2vM8j9xhya9Rwa.json b/src/packs/domains/folders_Level_9_eg2vM8j9xhya9Rwa.json
new file mode 100644
index 00000000..90316b38
--- /dev/null
+++ b/src/packs/domains/folders_Level_9_eg2vM8j9xhya9Rwa.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "IMRfDo5DDrpniKKv",
+  "name": "Level 9",
+  "color": null,
+  "sorting": "a",
+  "_id": "eg2vM8j9xhya9Rwa",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!eg2vM8j9xhya9Rwa"
+}
diff --git a/src/packs/domains/folders_Level_9_fucNnucgoUjbzvcA.json b/src/packs/domains/folders_Level_9_fucNnucgoUjbzvcA.json
new file mode 100644
index 00000000..2ac8049c
--- /dev/null
+++ b/src/packs/domains/folders_Level_9_fucNnucgoUjbzvcA.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "jc1HbSpJmjAsq9GX",
+  "name": "Level 9",
+  "color": null,
+  "sorting": "a",
+  "_id": "fucNnucgoUjbzvcA",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!fucNnucgoUjbzvcA"
+}
diff --git a/src/packs/domains/folders_Level_9_sGCKwmomutMTv0Xs.json b/src/packs/domains/folders_Level_9_sGCKwmomutMTv0Xs.json
new file mode 100644
index 00000000..b74e3af2
--- /dev/null
+++ b/src/packs/domains/folders_Level_9_sGCKwmomutMTv0Xs.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "TL1TutmbeCVJ06nR",
+  "name": "Level 9",
+  "color": null,
+  "sorting": "a",
+  "_id": "sGCKwmomutMTv0Xs",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!sGCKwmomutMTv0Xs"
+}
diff --git a/src/packs/domains/folders_Level_9_yFcD1LOM3xKbkNYl.json b/src/packs/domains/folders_Level_9_yFcD1LOM3xKbkNYl.json
new file mode 100644
index 00000000..5657860e
--- /dev/null
+++ b/src/packs/domains/folders_Level_9_yFcD1LOM3xKbkNYl.json
@@ -0,0 +1,21 @@
+{
+  "type": "Item",
+  "folder": "c380soh7Z1YAqzOT",
+  "name": "Level 9",
+  "color": null,
+  "sorting": "a",
+  "_id": "yFcD1LOM3xKbkNYl",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "lastModifiedBy": null
+  },
+  "_key": "!folders!yFcD1LOM3xKbkNYl"
+}
diff --git a/src/packs/domains/folders_Midnight_tgwSE1t5B0Ka10Xh.json b/src/packs/domains/folders_Midnight_tgwSE1t5B0Ka10Xh.json
new file mode 100644
index 00000000..0efe962c
--- /dev/null
+++ b/src/packs/domains/folders_Midnight_tgwSE1t5B0Ka10Xh.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Midnight",
+  "color": "#26252b",
+  "sorting": "a",
+  "_id": "tgwSE1t5B0Ka10Xh",
+  "description": "",
+  "sort": 600000,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717122329,
+    "modifiedTime": 1748717766758,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!tgwSE1t5B0Ka10Xh"
+}
diff --git a/src/packs/domains/folders_Sage_io1DZ9MMMDfuNf8b.json b/src/packs/domains/folders_Sage_io1DZ9MMMDfuNf8b.json
new file mode 100644
index 00000000..7b7e9072
--- /dev/null
+++ b/src/packs/domains/folders_Sage_io1DZ9MMMDfuNf8b.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Sage",
+  "color": "#0a5932",
+  "sorting": "a",
+  "_id": "io1DZ9MMMDfuNf8b",
+  "description": "",
+  "sort": 700000,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717128125,
+    "modifiedTime": 1748717766758,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!io1DZ9MMMDfuNf8b"
+}
diff --git a/src/packs/domains/folders_Splendor_TL1TutmbeCVJ06nR.json b/src/packs/domains/folders_Splendor_TL1TutmbeCVJ06nR.json
new file mode 100644
index 00000000..570b97ff
--- /dev/null
+++ b/src/packs/domains/folders_Splendor_TL1TutmbeCVJ06nR.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Splendor",
+  "color": "#c79b44",
+  "sorting": "a",
+  "_id": "TL1TutmbeCVJ06nR",
+  "description": "",
+  "sort": 800000,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717133557,
+    "modifiedTime": 1748717766758,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!TL1TutmbeCVJ06nR"
+}
diff --git a/src/packs/domains/folders_Valor_yPVeShe47ETIqs9q.json b/src/packs/domains/folders_Valor_yPVeShe47ETIqs9q.json
new file mode 100644
index 00000000..7c8f426e
--- /dev/null
+++ b/src/packs/domains/folders_Valor_yPVeShe47ETIqs9q.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Valor",
+  "color": "#b07229",
+  "sorting": "a",
+  "_id": "yPVeShe47ETIqs9q",
+  "description": "",
+  "sort": 900000,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717138700,
+    "modifiedTime": 1748717766758,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!yPVeShe47ETIqs9q"
+}
diff --git a/src/packs/items/armor/tier3/armor_Advanced_Chainmail_Armor_X5k7Stier3vxz4V0.json b/src/packs/items/armors/armor_Advanced_Chainmail_Armor_CsZ4X1gMhKrfK0B8.json
similarity index 68%
rename from src/packs/items/armor/tier3/armor_Advanced_Chainmail_Armor_X5k7Stier3vxz4V0.json
rename to src/packs/items/armors/armor_Advanced_Chainmail_Armor_CsZ4X1gMhKrfK0B8.json
index fcfaded5..9edf9f4b 100644
--- a/src/packs/items/armor/tier3/armor_Advanced_Chainmail_Armor_X5k7Stier3vxz4V0.json
+++ b/src/packs/items/armors/armor_Advanced_Chainmail_Armor_CsZ4X1gMhKrfK0B8.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 13,
       "severe": 31
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "rkSdPu86ybLz6aKF",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008781137,
-    "modifiedTime": 1748028510367,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717648531,
+    "modifiedTime": 1748717654084,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "X5k7Stier3vxz4V0",
+  "_id": "CsZ4X1gMhKrfK0B8",
   "sort": 100000,
-  "_key": "!items!X5k7Stier3vxz4V0"
+  "_key": "!items!CsZ4X1gMhKrfK0B8"
 }
diff --git a/src/packs/items/armor/tier3/armor_Advanced_Full_Plate_Armor_IaHC7MKRdxUh1VqK.json b/src/packs/items/armors/armor_Advanced_Full_Plate_Armor_1mJ37VQGgO7nGyaq.json
similarity index 65%
rename from src/packs/items/armor/tier3/armor_Advanced_Full_Plate_Armor_IaHC7MKRdxUh1VqK.json
rename to src/packs/items/armors/armor_Advanced_Full_Plate_Armor_1mJ37VQGgO7nGyaq.json
index bdf7e563..6ea43b45 100644
--- a/src/packs/items/armor/tier3/armor_Advanced_Full_Plate_Armor_IaHC7MKRdxUh1VqK.json
+++ b/src/packs/items/armors/armor_Advanced_Full_Plate_Armor_1mJ37VQGgO7nGyaq.json
@@ -9,18 +9,20 @@
       "value": 0
     },
     "description": "",
-    "feature": "veryHeavy",
     "baseThresholds": {
       "major": 15,
       "severe": 35
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "rkSdPu86ybLz6aKF",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008781890,
-    "modifiedTime": 1748028521542,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717650229,
+    "modifiedTime": 1748717654084,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "IaHC7MKRdxUh1VqK",
-  "sort": 300000,
-  "_key": "!items!IaHC7MKRdxUh1VqK"
+  "_id": "1mJ37VQGgO7nGyaq",
+  "sort": 200000,
+  "_key": "!items!1mJ37VQGgO7nGyaq"
 }
diff --git a/src/packs/items/armor/tier3/armor_Advanced_Gambeson_Armor_45Ecu1PgMahpKbsN.json b/src/packs/items/armors/armor_Advanced_Gambeson_Armor_0BAULrYPaX7tcoA4.json
similarity index 65%
rename from src/packs/items/armor/tier3/armor_Advanced_Gambeson_Armor_45Ecu1PgMahpKbsN.json
rename to src/packs/items/armors/armor_Advanced_Gambeson_Armor_0BAULrYPaX7tcoA4.json
index 0c11aeb4..6a9d1b52 100644
--- a/src/packs/items/armor/tier3/armor_Advanced_Gambeson_Armor_45Ecu1PgMahpKbsN.json
+++ b/src/packs/items/armors/armor_Advanced_Gambeson_Armor_0BAULrYPaX7tcoA4.json
@@ -9,18 +9,20 @@
       "value": 0
     },
     "description": "",
-    "feature": "light",
     "baseThresholds": {
       "major": 9,
       "severe": 23
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "rkSdPu86ybLz6aKF",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008782599,
-    "modifiedTime": 1748028482409,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717651189,
+    "modifiedTime": 1748717654084,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "45Ecu1PgMahpKbsN",
-  "sort": 400000,
-  "_key": "!items!45Ecu1PgMahpKbsN"
+  "_id": "0BAULrYPaX7tcoA4",
+  "sort": 600000,
+  "_key": "!items!0BAULrYPaX7tcoA4"
 }
diff --git a/src/packs/items/armor/tier3/armor_Advanced_Leather_Armor_v6V96UsXSuyx1UV7.json b/src/packs/items/armors/armor_Advanced_Leather_Armor_wWecy3cm3cZzuG0o.json
similarity index 66%
rename from src/packs/items/armor/tier3/armor_Advanced_Leather_Armor_v6V96UsXSuyx1UV7.json
rename to src/packs/items/armors/armor_Advanced_Leather_Armor_wWecy3cm3cZzuG0o.json
index ef402f0f..97da18d8 100644
--- a/src/packs/items/armor/tier3/armor_Advanced_Leather_Armor_v6V96UsXSuyx1UV7.json
+++ b/src/packs/items/armors/armor_Advanced_Leather_Armor_wWecy3cm3cZzuG0o.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 11,
       "severe": 27
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "rkSdPu86ybLz6aKF",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008783273,
-    "modifiedTime": 1748028496110,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717652152,
+    "modifiedTime": 1748717654084,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "v6V96UsXSuyx1UV7",
-  "sort": 500000,
-  "_key": "!items!v6V96UsXSuyx1UV7"
+  "_id": "wWecy3cm3cZzuG0o",
+  "sort": 300000,
+  "_key": "!items!wWecy3cm3cZzuG0o"
 }
diff --git a/src/packs/items/armor/tier3/armor_Bellamoi_Fine_Armor_iBbmRG7cNXmqs4ga.json b/src/packs/items/armors/armor_Bellamoi_Fine_Armor_scTgxT4uMylqtoW0.json
similarity index 66%
rename from src/packs/items/armor/tier3/armor_Bellamoi_Fine_Armor_iBbmRG7cNXmqs4ga.json
rename to src/packs/items/armors/armor_Bellamoi_Fine_Armor_scTgxT4uMylqtoW0.json
index eef8c186..8ab8d188 100644
--- a/src/packs/items/armor/tier3/armor_Bellamoi_Fine_Armor_iBbmRG7cNXmqs4ga.json
+++ b/src/packs/items/armors/armor_Bellamoi_Fine_Armor_scTgxT4uMylqtoW0.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 11,
       "severe": 27
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "rkSdPu86ybLz6aKF",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008783947,
-    "modifiedTime": 1748028554404,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717653091,
+    "modifiedTime": 1748717654084,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "iBbmRG7cNXmqs4ga",
-  "sort": 600000,
-  "_key": "!items!iBbmRG7cNXmqs4ga"
+  "_id": "scTgxT4uMylqtoW0",
+  "sort": 500000,
+  "_key": "!items!scTgxT4uMylqtoW0"
 }
diff --git a/src/packs/items/armor/tier3/armor_Bladefare_Armor_YVfTNS1YD5sbKx3S.json b/src/packs/items/armors/armor_Bladefare_Armor_kYj9YqqWEWTk7Of4.json
similarity index 65%
rename from src/packs/items/armor/tier3/armor_Bladefare_Armor_YVfTNS1YD5sbKx3S.json
rename to src/packs/items/armors/armor_Bladefare_Armor_kYj9YqqWEWTk7Of4.json
index 8796a230..31d4d2c0 100644
--- a/src/packs/items/armor/tier3/armor_Bladefare_Armor_YVfTNS1YD5sbKx3S.json
+++ b/src/packs/items/armors/armor_Bladefare_Armor_kYj9YqqWEWTk7Of4.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 16,
       "severe": 39
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "rkSdPu86ybLz6aKF",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008784769,
-    "modifiedTime": 1748028597257,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717654075,
+    "modifiedTime": 1748717654084,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "YVfTNS1YD5sbKx3S",
-  "sort": 700000,
-  "_key": "!items!YVfTNS1YD5sbKx3S"
+  "_id": "kYj9YqqWEWTk7Of4",
+  "sort": 400000,
+  "_key": "!items!kYj9YqqWEWTk7Of4"
 }
diff --git a/src/packs/items/armor/tier1/armor_Chainmail_Armor_s7PUmApOFX0YryDG.json b/src/packs/items/armors/armor_Chainmail_Armor_cihoaJXe1YfLaz60.json
similarity index 66%
rename from src/packs/items/armor/tier1/armor_Chainmail_Armor_s7PUmApOFX0YryDG.json
rename to src/packs/items/armors/armor_Chainmail_Armor_cihoaJXe1YfLaz60.json
index c926d3ed..398885dc 100644
--- a/src/packs/items/armor/tier1/armor_Chainmail_Armor_s7PUmApOFX0YryDG.json
+++ b/src/packs/items/armors/armor_Chainmail_Armor_cihoaJXe1YfLaz60.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 7,
       "severe": 15
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "h4QgrovjVZ1oee7O",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008741139,
-    "modifiedTime": 1748028173861,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717625340,
+    "modifiedTime": 1748717625340,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "s7PUmApOFX0YryDG",
-  "sort": 100000,
-  "_key": "!items!s7PUmApOFX0YryDG"
+  "_id": "cihoaJXe1YfLaz60",
+  "sort": 0,
+  "_key": "!items!cihoaJXe1YfLaz60"
 }
diff --git a/src/packs/items/armor/tier4/armor_Channeling_Armor_oceDrXoEGSTQXeJd.json b/src/packs/items/armors/armor_Channeling_Armor_plRn94qJi7WF2P2O.json
similarity index 62%
rename from src/packs/items/armor/tier4/armor_Channeling_Armor_oceDrXoEGSTQXeJd.json
rename to src/packs/items/armors/armor_Channeling_Armor_plRn94qJi7WF2P2O.json
index 8d3936ce..8a334adb 100644
--- a/src/packs/items/armor/tier4/armor_Channeling_Armor_oceDrXoEGSTQXeJd.json
+++ b/src/packs/items/armors/armor_Channeling_Armor_plRn94qJi7WF2P2O.json
@@ -1,7 +1,6 @@
 {
   "name": "Channeling Armor",
   "type": "armor",
-  "_id": "oceDrXoEGSTQXeJd",
   "img": "systems/daggerheart/assets/icons/armor/tier_4/channeling_armor.png",
   "system": {
     "baseScore": 5,
@@ -14,14 +13,16 @@
       "severe": 36
     },
     "description": "",
-    "feature": "channeling"
+    "feature": "channeling",
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "Hbjp64XzuyJs2hOs",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748027971730,
-    "modifiedTime": 1748027988576,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717665846,
+    "modifiedTime": 1748717674251,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!oceDrXoEGSTQXeJd"
+  "_id": "plRn94qJi7WF2P2O",
+  "sort": 500000,
+  "_key": "!items!plRn94qJi7WF2P2O"
 }
diff --git a/src/packs/items/armor/tier3/armor_Dragonscale_Armor_XeoC52EJA4dV9l6W.json b/src/packs/items/armors/armor_Dragonscale_Armor_RL1AKA4VNuRnYiR3.json
similarity index 66%
rename from src/packs/items/armor/tier3/armor_Dragonscale_Armor_XeoC52EJA4dV9l6W.json
rename to src/packs/items/armors/armor_Dragonscale_Armor_RL1AKA4VNuRnYiR3.json
index 15f32808..e680afbe 100644
--- a/src/packs/items/armor/tier3/armor_Dragonscale_Armor_XeoC52EJA4dV9l6W.json
+++ b/src/packs/items/armors/armor_Dragonscale_Armor_RL1AKA4VNuRnYiR3.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 11,
       "severe": 27
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "rkSdPu86ybLz6aKF",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008785541,
-    "modifiedTime": 1748028567955,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717655130,
+    "modifiedTime": 1748717655130,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "XeoC52EJA4dV9l6W",
-  "sort": 800000,
-  "_key": "!items!XeoC52EJA4dV9l6W"
+  "_id": "RL1AKA4VNuRnYiR3",
+  "sort": 0,
+  "_key": "!items!RL1AKA4VNuRnYiR3"
 }
diff --git a/src/packs/items/armor/tier4/armor_Dunamis_Silkchain_ffIEaWPRHLlWy1Ft.json b/src/packs/items/armors/armor_Dunamis_Silkchain_oTpJi31bKq4rut07.json
similarity index 62%
rename from src/packs/items/armor/tier4/armor_Dunamis_Silkchain_ffIEaWPRHLlWy1Ft.json
rename to src/packs/items/armors/armor_Dunamis_Silkchain_oTpJi31bKq4rut07.json
index d5814681..959bfdaa 100644
--- a/src/packs/items/armor/tier4/armor_Dunamis_Silkchain_ffIEaWPRHLlWy1Ft.json
+++ b/src/packs/items/armors/armor_Dunamis_Silkchain_oTpJi31bKq4rut07.json
@@ -1,7 +1,6 @@
 {
   "name": "Dunamis Silkchain",
   "type": "armor",
-  "_id": "ffIEaWPRHLlWy1Ft",
   "img": "systems/daggerheart/assets/icons/armor/tier_4/dunamis_silkchain.png",
   "system": {
     "baseScore": 7,
@@ -14,14 +13,16 @@
       "severe": 36
     },
     "description": "",
-    "feature": "timeslowing"
+    "feature": "timeslowing",
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "Hbjp64XzuyJs2hOs",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748027943461,
-    "modifiedTime": 1748027965045,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717666804,
+    "modifiedTime": 1748717674251,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!ffIEaWPRHLlWy1Ft"
+  "_id": "oTpJi31bKq4rut07",
+  "sort": 600000,
+  "_key": "!items!oTpJi31bKq4rut07"
 }
diff --git a/src/packs/items/armor/tier2/armor_Elundrian_Chain_Armor_ED8RhELKD9Pgnxgb.json b/src/packs/items/armors/armor_Elundrian_Chain_Armor_ShMNcz0KBsToMC44.json
similarity index 66%
rename from src/packs/items/armor/tier2/armor_Elundrian_Chain_Armor_ED8RhELKD9Pgnxgb.json
rename to src/packs/items/armors/armor_Elundrian_Chain_Armor_ShMNcz0KBsToMC44.json
index 57cb9184..906004a5 100644
--- a/src/packs/items/armor/tier2/armor_Elundrian_Chain_Armor_ED8RhELKD9Pgnxgb.json
+++ b/src/packs/items/armors/armor_Elundrian_Chain_Armor_ShMNcz0KBsToMC44.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 9,
       "severe": 21
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "hLn0v6ov6KuFgptu",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008765138,
-    "modifiedTime": 1748028270334,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717633727,
+    "modifiedTime": 1748717641884,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "ED8RhELKD9Pgnxgb",
-  "sort": 100000,
-  "_key": "!items!ED8RhELKD9Pgnxgb"
+  "_id": "ShMNcz0KBsToMC44",
+  "sort": 600000,
+  "_key": "!items!ShMNcz0KBsToMC44"
 }
diff --git a/src/packs/items/armor/tier4/armor_Emberwoven_Armor_8YhysA01kwSSX8Vg.json b/src/packs/items/armors/armor_Emberwoven_Armor_8sUPsWMhjQprt8yI.json
similarity index 62%
rename from src/packs/items/armor/tier4/armor_Emberwoven_Armor_8YhysA01kwSSX8Vg.json
rename to src/packs/items/armors/armor_Emberwoven_Armor_8sUPsWMhjQprt8yI.json
index 7ba5425b..1467d1b5 100644
--- a/src/packs/items/armor/tier4/armor_Emberwoven_Armor_8YhysA01kwSSX8Vg.json
+++ b/src/packs/items/armors/armor_Emberwoven_Armor_8sUPsWMhjQprt8yI.json
@@ -1,7 +1,6 @@
 {
   "name": "Emberwoven Armor",
   "type": "armor",
-  "_id": "8YhysA01kwSSX8Vg",
   "img": "systems/daggerheart/assets/icons/armor/tier_4/emberwoven_armor.png",
   "system": {
     "baseScore": 6,
@@ -14,14 +13,16 @@
       "severe": 36
     },
     "description": "",
-    "feature": "burning"
+    "feature": "burning",
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "Hbjp64XzuyJs2hOs",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748027998531,
-    "modifiedTime": 1748028013331,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717667767,
+    "modifiedTime": 1748717674251,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!8YhysA01kwSSX8Vg"
+  "_id": "8sUPsWMhjQprt8yI",
+  "sort": 700000,
+  "_key": "!items!8sUPsWMhjQprt8yI"
 }
diff --git a/src/packs/items/armor/tier4/armor_Full_Fortified_Armor_Zk0WWk1WTc5X4DSv.json b/src/packs/items/armors/armor_Full_Fortified_Armor_mb5OFsUSlPEPb4wU.json
similarity index 63%
rename from src/packs/items/armor/tier4/armor_Full_Fortified_Armor_Zk0WWk1WTc5X4DSv.json
rename to src/packs/items/armors/armor_Full_Fortified_Armor_mb5OFsUSlPEPb4wU.json
index 2716806a..fbd1b90c 100644
--- a/src/packs/items/armor/tier4/armor_Full_Fortified_Armor_Zk0WWk1WTc5X4DSv.json
+++ b/src/packs/items/armors/armor_Full_Fortified_Armor_mb5OFsUSlPEPb4wU.json
@@ -1,7 +1,6 @@
 {
   "name": "Full Fortified Armor",
   "type": "armor",
-  "_id": "Zk0WWk1WTc5X4DSv",
   "img": "systems/daggerheart/assets/icons/armor/tier_4/full_fortified_armor.png",
   "system": {
     "baseScore": 4,
@@ -14,14 +13,16 @@
       "severe": 40
     },
     "description": "",
-    "feature": ""
+    "feature": "",
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "Hbjp64XzuyJs2hOs",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748028024206,
-    "modifiedTime": 1748028050721,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717668860,
+    "modifiedTime": 1748717674251,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!Zk0WWk1WTc5X4DSv"
+  "_id": "mb5OFsUSlPEPb4wU",
+  "sort": 800000,
+  "_key": "!items!mb5OFsUSlPEPb4wU"
 }
diff --git a/src/packs/items/armor/tier1/armor_Full_Plate_Armor_LLL9gflIUF8ZFkzZ.json b/src/packs/items/armors/armor_Full_Plate_Armor_Vc3mfssiGZFQFuAf.json
similarity index 65%
rename from src/packs/items/armor/tier1/armor_Full_Plate_Armor_LLL9gflIUF8ZFkzZ.json
rename to src/packs/items/armors/armor_Full_Plate_Armor_Vc3mfssiGZFQFuAf.json
index ba18b999..6db29aa2 100644
--- a/src/packs/items/armor/tier1/armor_Full_Plate_Armor_LLL9gflIUF8ZFkzZ.json
+++ b/src/packs/items/armors/armor_Full_Plate_Armor_Vc3mfssiGZFQFuAf.json
@@ -9,18 +9,20 @@
       "value": 0
     },
     "description": "",
-    "feature": "veryHeavy",
     "baseThresholds": {
       "major": 8,
       "severe": 17
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "h4QgrovjVZ1oee7O",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008742116,
-    "modifiedTime": 1748028187244,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717626142,
+    "modifiedTime": 1748717626142,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "LLL9gflIUF8ZFkzZ",
-  "sort": 300000,
-  "_key": "!items!LLL9gflIUF8ZFkzZ"
+  "_id": "Vc3mfssiGZFQFuAf",
+  "sort": 0,
+  "_key": "!items!Vc3mfssiGZFQFuAf"
 }
diff --git a/src/packs/items/armor/tier1/armor_Gambeson_Armor_alp2w20UmD7jKXOL.json b/src/packs/items/armors/armor_Gambeson_Armor_kGm7XO3LZDZWvSXq.json
similarity index 64%
rename from src/packs/items/armor/tier1/armor_Gambeson_Armor_alp2w20UmD7jKXOL.json
rename to src/packs/items/armors/armor_Gambeson_Armor_kGm7XO3LZDZWvSXq.json
index 2efc120f..36ab1dcf 100644
--- a/src/packs/items/armor/tier1/armor_Gambeson_Armor_alp2w20UmD7jKXOL.json
+++ b/src/packs/items/armors/armor_Gambeson_Armor_kGm7XO3LZDZWvSXq.json
@@ -9,18 +9,20 @@
       "value": 0
     },
     "description": "",
-    "feature": "light",
     "baseThresholds": {
       "major": 5,
       "severe": 11
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "h4QgrovjVZ1oee7O",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008742848,
-    "modifiedTime": 1748028147106,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717627046,
+    "modifiedTime": 1748717627052,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "alp2w20UmD7jKXOL",
-  "sort": 400000,
-  "_key": "!items!alp2w20UmD7jKXOL"
+  "_id": "kGm7XO3LZDZWvSXq",
+  "sort": 100000,
+  "_key": "!items!kGm7XO3LZDZWvSXq"
 }
diff --git a/src/packs/items/armor/tier2/armor_Harrowbone_Armor_Rl8dZeOnM3foAnth.json b/src/packs/items/armors/armor_Harrowbone_Armor_uPpGA468Zi8TSQCd.json
similarity index 64%
rename from src/packs/items/armor/tier2/armor_Harrowbone_Armor_Rl8dZeOnM3foAnth.json
rename to src/packs/items/armors/armor_Harrowbone_Armor_uPpGA468Zi8TSQCd.json
index c8f185f0..bf400295 100644
--- a/src/packs/items/armor/tier2/armor_Harrowbone_Armor_Rl8dZeOnM3foAnth.json
+++ b/src/packs/items/armors/armor_Harrowbone_Armor_uPpGA468Zi8TSQCd.json
@@ -9,18 +9,20 @@
       "value": 0
     },
     "description": "",
-    "feature": "resistant",
     "baseThresholds": {
       "major": 9,
       "severe": 21
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "hLn0v6ov6KuFgptu",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008765925,
-    "modifiedTime": 1748028291278,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717634731,
+    "modifiedTime": 1748717641884,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "Rl8dZeOnM3foAnth",
-  "sort": 300000,
-  "_key": "!items!Rl8dZeOnM3foAnth"
+  "_id": "uPpGA468Zi8TSQCd",
+  "sort": 700000,
+  "_key": "!items!uPpGA468Zi8TSQCd"
 }
diff --git a/src/packs/items/armor/tier2/armor_Improved_Chainmail_Armor_kVpH1vvbdK5prOT5.json b/src/packs/items/armors/armor_Improved_Chainmail_Armor_f0EfsoCmlg4cTIL1.json
similarity index 66%
rename from src/packs/items/armor/tier2/armor_Improved_Chainmail_Armor_kVpH1vvbdK5prOT5.json
rename to src/packs/items/armors/armor_Improved_Chainmail_Armor_f0EfsoCmlg4cTIL1.json
index 88e28d2f..623d1931 100644
--- a/src/packs/items/armor/tier2/armor_Improved_Chainmail_Armor_kVpH1vvbdK5prOT5.json
+++ b/src/packs/items/armors/armor_Improved_Chainmail_Armor_f0EfsoCmlg4cTIL1.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 11,
       "severe": 24
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "hLn0v6ov6KuFgptu",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008766641,
-    "modifiedTime": 1748028242876,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717635822,
+    "modifiedTime": 1748717641884,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "kVpH1vvbdK5prOT5",
-  "sort": 400000,
-  "_key": "!items!kVpH1vvbdK5prOT5"
+  "_id": "f0EfsoCmlg4cTIL1",
+  "sort": 900000,
+  "_key": "!items!f0EfsoCmlg4cTIL1"
 }
diff --git a/src/packs/items/armor/tier2/armor_Improved_Full_Plate_Armor_E6asa0VMozd4zZbV.json b/src/packs/items/armors/armor_Improved_Full_Plate_Armor_nHcz1Ed7FXokdeyu.json
similarity index 65%
rename from src/packs/items/armor/tier2/armor_Improved_Full_Plate_Armor_E6asa0VMozd4zZbV.json
rename to src/packs/items/armors/armor_Improved_Full_Plate_Armor_nHcz1Ed7FXokdeyu.json
index 05ba362b..a76b60eb 100644
--- a/src/packs/items/armor/tier2/armor_Improved_Full_Plate_Armor_E6asa0VMozd4zZbV.json
+++ b/src/packs/items/armors/armor_Improved_Full_Plate_Armor_nHcz1Ed7FXokdeyu.json
@@ -9,18 +9,20 @@
       "value": 0
     },
     "description": "",
-    "feature": "veryHeavy",
     "baseThresholds": {
       "major": 13,
       "severe": 28
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "hLn0v6ov6KuFgptu",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008767365,
-    "modifiedTime": 1748028257241,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717636849,
+    "modifiedTime": 1748717641884,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "E6asa0VMozd4zZbV",
-  "sort": 500000,
-  "_key": "!items!E6asa0VMozd4zZbV"
+  "_id": "nHcz1Ed7FXokdeyu",
+  "sort": 800000,
+  "_key": "!items!nHcz1Ed7FXokdeyu"
 }
diff --git a/src/packs/items/armor/tier2/armor_Improved_Gambeson_Armor_ou0he5rHyi06dqO3.json b/src/packs/items/armors/armor_Improved_Gambeson_Armor_dC5XHTRtqQvuTMef.json
similarity index 67%
rename from src/packs/items/armor/tier2/armor_Improved_Gambeson_Armor_ou0he5rHyi06dqO3.json
rename to src/packs/items/armors/armor_Improved_Gambeson_Armor_dC5XHTRtqQvuTMef.json
index 0ef846a8..3e7b258d 100644
--- a/src/packs/items/armor/tier2/armor_Improved_Gambeson_Armor_ou0he5rHyi06dqO3.json
+++ b/src/packs/items/armors/armor_Improved_Gambeson_Armor_dC5XHTRtqQvuTMef.json
@@ -9,18 +9,20 @@
       "value": 0
     },
     "description": "<p><strong>Flexible</strong>: +1 to Evasion</p>",
-    "feature": "light",
     "baseThresholds": {
       "major": 7,
       "severe": 16
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "hLn0v6ov6KuFgptu",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008768058,
-    "modifiedTime": 1748028207851,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717637819,
+    "modifiedTime": 1748717641884,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "ou0he5rHyi06dqO3",
-  "sort": 600000,
-  "_key": "!items!ou0he5rHyi06dqO3"
+  "_id": "dC5XHTRtqQvuTMef",
+  "sort": 100000,
+  "_key": "!items!dC5XHTRtqQvuTMef"
 }
diff --git a/src/packs/items/armor/tier2/armor_Improved_Leather_Armor_Lx94Q7Cl7wMwcl58.json b/src/packs/items/armors/armor_Improved_Leather_Armor_mQJ55Nd8ugzjGvWl.json
similarity index 66%
rename from src/packs/items/armor/tier2/armor_Improved_Leather_Armor_Lx94Q7Cl7wMwcl58.json
rename to src/packs/items/armors/armor_Improved_Leather_Armor_mQJ55Nd8ugzjGvWl.json
index 4672f7c6..42f32701 100644
--- a/src/packs/items/armor/tier2/armor_Improved_Leather_Armor_Lx94Q7Cl7wMwcl58.json
+++ b/src/packs/items/armors/armor_Improved_Leather_Armor_mQJ55Nd8ugzjGvWl.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 9,
       "severe": 20
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "hLn0v6ov6KuFgptu",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008768829,
-    "modifiedTime": 1748028224201,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717638846,
+    "modifiedTime": 1748717641884,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "Lx94Q7Cl7wMwcl58",
-  "sort": 700000,
-  "_key": "!items!Lx94Q7Cl7wMwcl58"
+  "_id": "mQJ55Nd8ugzjGvWl",
+  "sort": 200000,
+  "_key": "!items!mQJ55Nd8ugzjGvWl"
 }
diff --git a/src/packs/items/armor/tier2/armor_Irontree_Breastplate_Armor_4ImHfMsKbDzIFRNF.json b/src/packs/items/armors/armor_Irontree_Breastplate_Armor_E6Ri6nwMtVOBedCy.json
similarity index 66%
rename from src/packs/items/armor/tier2/armor_Irontree_Breastplate_Armor_4ImHfMsKbDzIFRNF.json
rename to src/packs/items/armors/armor_Irontree_Breastplate_Armor_E6Ri6nwMtVOBedCy.json
index bb12b640..a92ac2f2 100644
--- a/src/packs/items/armor/tier2/armor_Irontree_Breastplate_Armor_4ImHfMsKbDzIFRNF.json
+++ b/src/packs/items/armors/armor_Irontree_Breastplate_Armor_E6Ri6nwMtVOBedCy.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 9,
       "severe": 20
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "hLn0v6ov6KuFgptu",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008769590,
-    "modifiedTime": 1748028314955,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717639903,
+    "modifiedTime": 1748717641884,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "4ImHfMsKbDzIFRNF",
-  "sort": 800000,
-  "_key": "!items!4ImHfMsKbDzIFRNF"
+  "_id": "E6Ri6nwMtVOBedCy",
+  "sort": 400000,
+  "_key": "!items!E6Ri6nwMtVOBedCy"
 }
diff --git a/src/packs/items/armor/tier1/armor_Leather_Armor_QMCh4ooGamb9oIGz.json b/src/packs/items/armors/armor_Leather_Armor_Fcz2Gg3V6O9whY8j.json
similarity index 65%
rename from src/packs/items/armor/tier1/armor_Leather_Armor_QMCh4ooGamb9oIGz.json
rename to src/packs/items/armors/armor_Leather_Armor_Fcz2Gg3V6O9whY8j.json
index bb0e8464..cfeeb371 100644
--- a/src/packs/items/armor/tier1/armor_Leather_Armor_QMCh4ooGamb9oIGz.json
+++ b/src/packs/items/armors/armor_Leather_Armor_Fcz2Gg3V6O9whY8j.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 6,
       "severe": 13
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "h4QgrovjVZ1oee7O",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008743698,
-    "modifiedTime": 1748028160837,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717627937,
+    "modifiedTime": 1748717627943,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "QMCh4ooGamb9oIGz",
-  "sort": 200000,
-  "_key": "!items!QMCh4ooGamb9oIGz"
+  "_id": "Fcz2Gg3V6O9whY8j",
+  "sort": 50000,
+  "_key": "!items!Fcz2Gg3V6O9whY8j"
 }
diff --git a/src/packs/items/armor/tier4/armor_Legendary_Chainmail_Armor_CiH20oR05hKNUdp3.json b/src/packs/items/armors/armor_Legendary_Chainmail_Armor_MjVHoiFL4ooLY9YP.json
similarity index 63%
rename from src/packs/items/armor/tier4/armor_Legendary_Chainmail_Armor_CiH20oR05hKNUdp3.json
rename to src/packs/items/armors/armor_Legendary_Chainmail_Armor_MjVHoiFL4ooLY9YP.json
index 980bc93b..cbe6532c 100644
--- a/src/packs/items/armor/tier4/armor_Legendary_Chainmail_Armor_CiH20oR05hKNUdp3.json
+++ b/src/packs/items/armors/armor_Legendary_Chainmail_Armor_MjVHoiFL4ooLY9YP.json
@@ -1,7 +1,6 @@
 {
   "name": "Legendary Chainmail Armor",
   "type": "armor",
-  "_id": "CiH20oR05hKNUdp3",
   "img": "systems/daggerheart/assets/icons/armor/tier_4/legendary_chainmail_armor.png",
   "system": {
     "baseScore": 7,
@@ -14,14 +13,16 @@
       "severe": 40
     },
     "description": "",
-    "feature": "heavy"
+    "feature": "heavy",
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "Hbjp64XzuyJs2hOs",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748027874542,
-    "modifiedTime": 1748027898156,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717669780,
+    "modifiedTime": 1748717674251,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!CiH20oR05hKNUdp3"
+  "_id": "MjVHoiFL4ooLY9YP",
+  "sort": 1000000,
+  "_key": "!items!MjVHoiFL4ooLY9YP"
 }
diff --git a/src/packs/items/armor/tier4/armor_Legendary_Full_Plate_Armor_h172qCAmBNvPhE25.json b/src/packs/items/armors/armor_Legendary_Full_Plate_Armor_ZS7GwxrNThKZpD6l.json
similarity index 65%
rename from src/packs/items/armor/tier4/armor_Legendary_Full_Plate_Armor_h172qCAmBNvPhE25.json
rename to src/packs/items/armors/armor_Legendary_Full_Plate_Armor_ZS7GwxrNThKZpD6l.json
index 899def40..a7451c13 100644
--- a/src/packs/items/armor/tier4/armor_Legendary_Full_Plate_Armor_h172qCAmBNvPhE25.json
+++ b/src/packs/items/armors/armor_Legendary_Full_Plate_Armor_ZS7GwxrNThKZpD6l.json
@@ -1,7 +1,6 @@
 {
   "name": "Legendary Full Plate Armor",
   "type": "armor",
-  "_id": "h172qCAmBNvPhE25",
   "img": "systems/daggerheart/assets/icons/armor/tier_4/legendary_full_plate_armor.png",
   "system": {
     "baseScore": 7,
@@ -14,14 +13,15 @@
       "severe": 44
     },
     "description": "",
-    "feature": "veryHeavy"
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "Hbjp64XzuyJs2hOs",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,9 +31,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748027908657,
-    "modifiedTime": 1748027926684,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717670992,
+    "modifiedTime": 1748717674251,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!h172qCAmBNvPhE25"
+  "_id": "ZS7GwxrNThKZpD6l",
+  "sort": 900000,
+  "_key": "!items!ZS7GwxrNThKZpD6l"
 }
diff --git a/src/packs/items/armor/tier4/armor_Legendary_Gambeson_Armor_CJLU4txFc0QYJF7G.json b/src/packs/items/armors/armor_Legendary_Gambeson_Armor_VkRQZFSXkrLm0gQD.json
similarity index 63%
rename from src/packs/items/armor/tier4/armor_Legendary_Gambeson_Armor_CJLU4txFc0QYJF7G.json
rename to src/packs/items/armors/armor_Legendary_Gambeson_Armor_VkRQZFSXkrLm0gQD.json
index d23fdb88..77863f09 100644
--- a/src/packs/items/armor/tier4/armor_Legendary_Gambeson_Armor_CJLU4txFc0QYJF7G.json
+++ b/src/packs/items/armors/armor_Legendary_Gambeson_Armor_VkRQZFSXkrLm0gQD.json
@@ -1,7 +1,6 @@
 {
   "name": "Legendary Gambeson Armor",
   "type": "armor",
-  "_id": "CJLU4txFc0QYJF7G",
   "img": "systems/daggerheart/assets/icons/armor/tier_4/legendary_gambeson_armor.png",
   "system": {
     "baseScore": 6,
@@ -14,14 +13,16 @@
       "severe": 32
     },
     "description": "",
-    "feature": ""
+    "feature": "",
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "Hbjp64XzuyJs2hOs",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748027753507,
-    "modifiedTime": 1748027822574,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717671798,
+    "modifiedTime": 1748717674251,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!CJLU4txFc0QYJF7G"
+  "_id": "VkRQZFSXkrLm0gQD",
+  "sort": 100000,
+  "_key": "!items!VkRQZFSXkrLm0gQD"
 }
diff --git a/src/packs/items/armor/tier4/armor_Legendary_Leather_Armor_XguKW7nNTCOqyWRw.json b/src/packs/items/armors/armor_Legendary_Leather_Armor_eWPVkncjAu9h6H0E.json
similarity index 63%
rename from src/packs/items/armor/tier4/armor_Legendary_Leather_Armor_XguKW7nNTCOqyWRw.json
rename to src/packs/items/armors/armor_Legendary_Leather_Armor_eWPVkncjAu9h6H0E.json
index 230876f5..e9d1e9df 100644
--- a/src/packs/items/armor/tier4/armor_Legendary_Leather_Armor_XguKW7nNTCOqyWRw.json
+++ b/src/packs/items/armors/armor_Legendary_Leather_Armor_eWPVkncjAu9h6H0E.json
@@ -1,7 +1,6 @@
 {
   "name": "Legendary Leather Armor",
   "type": "armor",
-  "_id": "XguKW7nNTCOqyWRw",
   "img": "systems/daggerheart/assets/icons/armor/tier_4/legendary_leather_armor.png",
   "system": {
     "baseScore": 6,
@@ -14,14 +13,16 @@
       "severe": 36
     },
     "description": "",
-    "feature": ""
+    "feature": "",
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "Hbjp64XzuyJs2hOs",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748027838790,
-    "modifiedTime": 1748027856107,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717672612,
+    "modifiedTime": 1748717674251,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!XguKW7nNTCOqyWRw"
+  "_id": "eWPVkncjAu9h6H0E",
+  "sort": 300000,
+  "_key": "!items!eWPVkncjAu9h6H0E"
 }
diff --git a/src/packs/items/armor/tier3/armor_Monett_s_Cloak_eqdjA5Z2eiu3w9z3.json b/src/packs/items/armors/armor_Monett_s_Cloak_CDUbtl6zED5uhOsA.json
similarity index 65%
rename from src/packs/items/armor/tier3/armor_Monett_s_Cloak_eqdjA5Z2eiu3w9z3.json
rename to src/packs/items/armors/armor_Monett_s_Cloak_CDUbtl6zED5uhOsA.json
index 14b56cab..6e23a159 100644
--- a/src/packs/items/armor/tier3/armor_Monett_s_Cloak_eqdjA5Z2eiu3w9z3.json
+++ b/src/packs/items/armors/armor_Monett_s_Cloak_CDUbtl6zED5uhOsA.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 16,
       "severe": 39
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "rkSdPu86ybLz6aKF",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008786218,
-    "modifiedTime": 1748028612656,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717656099,
+    "modifiedTime": 1748717656099,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "eqdjA5Z2eiu3w9z3",
-  "sort": 900000,
-  "_key": "!items!eqdjA5Z2eiu3w9z3"
+  "_id": "CDUbtl6zED5uhOsA",
+  "sort": 0,
+  "_key": "!items!CDUbtl6zED5uhOsA"
 }
diff --git a/src/packs/items/armor/tier2/armor_Rosewild_Armor_Cd0jzt1EBUiihcEQ.json b/src/packs/items/armors/armor_Rosewild_Armor_1d2XtD71WGMn1CNT.json
similarity index 65%
rename from src/packs/items/armor/tier2/armor_Rosewild_Armor_Cd0jzt1EBUiihcEQ.json
rename to src/packs/items/armors/armor_Rosewild_Armor_1d2XtD71WGMn1CNT.json
index 0d692139..a748c1f3 100644
--- a/src/packs/items/armor/tier2/armor_Rosewild_Armor_Cd0jzt1EBUiihcEQ.json
+++ b/src/packs/items/armors/armor_Rosewild_Armor_1d2XtD71WGMn1CNT.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 11,
       "severe": 23
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "hLn0v6ov6KuFgptu",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008770268,
-    "modifiedTime": 1748028371396,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717640881,
+    "modifiedTime": 1748717641884,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "Cd0jzt1EBUiihcEQ",
-  "sort": 900000,
-  "_key": "!items!Cd0jzt1EBUiihcEQ"
+  "_id": "1d2XtD71WGMn1CNT",
+  "sort": 500000,
+  "_key": "!items!1d2XtD71WGMn1CNT"
 }
diff --git a/src/packs/items/armor/tier3/armor_Runes_of_Fortification_FBUDL6gCPh9HiOSu.json b/src/packs/items/armors/armor_Runes_of_Fortification_HLiw7DTgSgY2F1rC.json
similarity index 66%
rename from src/packs/items/armor/tier3/armor_Runes_of_Fortification_FBUDL6gCPh9HiOSu.json
rename to src/packs/items/armors/armor_Runes_of_Fortification_HLiw7DTgSgY2F1rC.json
index 47e9b1bb..bc12a79f 100644
--- a/src/packs/items/armor/tier3/armor_Runes_of_Fortification_FBUDL6gCPh9HiOSu.json
+++ b/src/packs/items/armors/armor_Runes_of_Fortification_HLiw7DTgSgY2F1rC.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 17,
       "severe": 43
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "rkSdPu86ybLz6aKF",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008787018,
-    "modifiedTime": 1748028627292,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717656973,
+    "modifiedTime": 1748717656973,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "FBUDL6gCPh9HiOSu",
-  "sort": 1000000,
-  "_key": "!items!FBUDL6gCPh9HiOSu"
+  "_id": "HLiw7DTgSgY2F1rC",
+  "sort": 0,
+  "_key": "!items!HLiw7DTgSgY2F1rC"
 }
diff --git a/src/packs/items/armor/tier2/armor_Runetan_Floating_Armor_VUYFNEt6xNVHw9Yd.json b/src/packs/items/armors/armor_Runetan_Floating_Armor_jQTUywiUZzoheULn.json
similarity index 66%
rename from src/packs/items/armor/tier2/armor_Runetan_Floating_Armor_VUYFNEt6xNVHw9Yd.json
rename to src/packs/items/armors/armor_Runetan_Floating_Armor_jQTUywiUZzoheULn.json
index 17101dae..d4b845ed 100644
--- a/src/packs/items/armor/tier2/armor_Runetan_Floating_Armor_VUYFNEt6xNVHw9Yd.json
+++ b/src/packs/items/armors/armor_Runetan_Floating_Armor_jQTUywiUZzoheULn.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 9,
       "severe": 20
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "hLn0v6ov6KuFgptu",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008770925,
-    "modifiedTime": 1748028339907,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717641872,
+    "modifiedTime": 1748717641884,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "VUYFNEt6xNVHw9Yd",
-  "sort": 1000000,
-  "_key": "!items!VUYFNEt6xNVHw9Yd"
+  "_id": "jQTUywiUZzoheULn",
+  "sort": 300000,
+  "_key": "!items!jQTUywiUZzoheULn"
 }
diff --git a/src/packs/items/armor/tier4/armor_Savior_Chainmail_ixcNkPjIPpLgPuaA.json b/src/packs/items/armors/armor_Savior_Chainmail_S1jq3KXLHWw3OLgX.json
similarity index 62%
rename from src/packs/items/armor/tier4/armor_Savior_Chainmail_ixcNkPjIPpLgPuaA.json
rename to src/packs/items/armors/armor_Savior_Chainmail_S1jq3KXLHWw3OLgX.json
index b5380952..e53a1d81 100644
--- a/src/packs/items/armor/tier4/armor_Savior_Chainmail_ixcNkPjIPpLgPuaA.json
+++ b/src/packs/items/armors/armor_Savior_Chainmail_S1jq3KXLHWw3OLgX.json
@@ -1,7 +1,6 @@
 {
   "name": "Savior Chainmail",
   "type": "armor",
-  "_id": "ixcNkPjIPpLgPuaA",
   "img": "systems/daggerheart/assets/icons/armor/tier_4/savior_chainmail.png",
   "system": {
     "baseScore": 8,
@@ -14,14 +13,16 @@
       "severe": 48
     },
     "description": "",
-    "feature": "difficult"
+    "feature": "difficult",
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "Hbjp64XzuyJs2hOs",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748028096316,
-    "modifiedTime": 1748028114965,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717673454,
+    "modifiedTime": 1748717674251,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!ixcNkPjIPpLgPuaA"
+  "_id": "S1jq3KXLHWw3OLgX",
+  "sort": 400000,
+  "_key": "!items!S1jq3KXLHWw3OLgX"
 }
diff --git a/src/packs/items/armor/tier3/armor_Spiked_Plate_Armor_Enscb2W5lei9FGuc.json b/src/packs/items/armors/armor_Spiked_Plate_Armor_TkNjxTz0IapYe0YU.json
similarity index 66%
rename from src/packs/items/armor/tier3/armor_Spiked_Plate_Armor_Enscb2W5lei9FGuc.json
rename to src/packs/items/armors/armor_Spiked_Plate_Armor_TkNjxTz0IapYe0YU.json
index a316afd3..a12b5836 100644
--- a/src/packs/items/armor/tier3/armor_Spiked_Plate_Armor_Enscb2W5lei9FGuc.json
+++ b/src/packs/items/armors/armor_Spiked_Plate_Armor_TkNjxTz0IapYe0YU.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 10,
       "severe": 25
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "rkSdPu86ybLz6aKF",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008787719,
-    "modifiedTime": 1748028581947,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717657828,
+    "modifiedTime": 1748717657828,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "Enscb2W5lei9FGuc",
-  "sort": 200000,
-  "_key": "!items!Enscb2W5lei9FGuc"
+  "_id": "TkNjxTz0IapYe0YU",
+  "sort": 0,
+  "_key": "!items!TkNjxTz0IapYe0YU"
 }
diff --git a/src/packs/items/armor/tier2/armor_Tyris_Soft_Armor_0mqF7VUJvEUq2Umv.json b/src/packs/items/armors/armor_Tyris_Soft_Armor_4NRiIunReDbj9zoC.json
similarity index 66%
rename from src/packs/items/armor/tier2/armor_Tyris_Soft_Armor_0mqF7VUJvEUq2Umv.json
rename to src/packs/items/armors/armor_Tyris_Soft_Armor_4NRiIunReDbj9zoC.json
index 423b76c5..3ee449ac 100644
--- a/src/packs/items/armor/tier2/armor_Tyris_Soft_Armor_0mqF7VUJvEUq2Umv.json
+++ b/src/packs/items/armors/armor_Tyris_Soft_Armor_4NRiIunReDbj9zoC.json
@@ -13,14 +13,17 @@
     "baseThresholds": {
       "major": 8,
       "severe": 18
-    }
+    },
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
+  "folder": "hLn0v6ov6KuFgptu",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -30,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748008771577,
-    "modifiedTime": 1748028353841,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717642821,
+    "modifiedTime": 1748717642821,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "0mqF7VUJvEUq2Umv",
-  "sort": 200000,
-  "_key": "!items!0mqF7VUJvEUq2Umv"
+  "_id": "4NRiIunReDbj9zoC",
+  "sort": 0,
+  "_key": "!items!4NRiIunReDbj9zoC"
 }
diff --git a/src/packs/items/armor/tier4/armor_Veritas_Oal_Armor_QM9sfBKRcrKXZXHV.json b/src/packs/items/armors/armor_Veritas_Oal_Armor_1ByiV04ofK4TG5vR.json
similarity index 62%
rename from src/packs/items/armor/tier4/armor_Veritas_Oal_Armor_QM9sfBKRcrKXZXHV.json
rename to src/packs/items/armors/armor_Veritas_Oal_Armor_1ByiV04ofK4TG5vR.json
index c99cec9a..b8a17074 100644
--- a/src/packs/items/armor/tier4/armor_Veritas_Oal_Armor_QM9sfBKRcrKXZXHV.json
+++ b/src/packs/items/armors/armor_Veritas_Oal_Armor_1ByiV04ofK4TG5vR.json
@@ -1,7 +1,6 @@
 {
   "name": "Veritas Oal Armor",
   "type": "armor",
-  "_id": "QM9sfBKRcrKXZXHV",
   "img": "systems/daggerheart/assets/icons/armor/tier_4/veritas_opal_armor.png",
   "system": {
     "baseScore": 6,
@@ -14,14 +13,16 @@
       "severe": 36
     },
     "description": "",
-    "feature": "truthseeking"
+    "feature": "truthseeking",
+    "equipped": false,
+    "quantity": 1
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "Hbjp64XzuyJs2hOs",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748028069751,
-    "modifiedTime": 1748028084978,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717674241,
+    "modifiedTime": 1748717674251,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!QM9sfBKRcrKXZXHV"
+  "_id": "1ByiV04ofK4TG5vR",
+  "sort": 200000,
+  "_key": "!items!1ByiV04ofK4TG5vR"
 }
diff --git a/src/packs/items/armors/folders_Tier_1_h4QgrovjVZ1oee7O.json b/src/packs/items/armors/folders_Tier_1_h4QgrovjVZ1oee7O.json
new file mode 100644
index 00000000..5c18c463
--- /dev/null
+++ b/src/packs/items/armors/folders_Tier_1_h4QgrovjVZ1oee7O.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Tier 1",
+  "color": null,
+  "sorting": "a",
+  "_id": "h4QgrovjVZ1oee7O",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717612711,
+    "modifiedTime": 1748717612711,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!h4QgrovjVZ1oee7O"
+}
diff --git a/src/packs/items/armors/folders_Tier_2_hLn0v6ov6KuFgptu.json b/src/packs/items/armors/folders_Tier_2_hLn0v6ov6KuFgptu.json
new file mode 100644
index 00000000..4f745426
--- /dev/null
+++ b/src/packs/items/armors/folders_Tier_2_hLn0v6ov6KuFgptu.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Tier 2",
+  "color": null,
+  "sorting": "a",
+  "_id": "hLn0v6ov6KuFgptu",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717616591,
+    "modifiedTime": 1748717616591,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!hLn0v6ov6KuFgptu"
+}
diff --git a/src/packs/items/armors/folders_Tier_3_rkSdPu86ybLz6aKF.json b/src/packs/items/armors/folders_Tier_3_rkSdPu86ybLz6aKF.json
new file mode 100644
index 00000000..792e637b
--- /dev/null
+++ b/src/packs/items/armors/folders_Tier_3_rkSdPu86ybLz6aKF.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Tier 3",
+  "color": null,
+  "sorting": "a",
+  "_id": "rkSdPu86ybLz6aKF",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717619406,
+    "modifiedTime": 1748717619406,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!rkSdPu86ybLz6aKF"
+}
diff --git a/src/packs/items/armors/folders_Tier_4_Hbjp64XzuyJs2hOs.json b/src/packs/items/armors/folders_Tier_4_Hbjp64XzuyJs2hOs.json
new file mode 100644
index 00000000..a0a93e39
--- /dev/null
+++ b/src/packs/items/armors/folders_Tier_4_Hbjp64XzuyJs2hOs.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Tier 4",
+  "color": null,
+  "sorting": "a",
+  "_id": "Hbjp64XzuyJs2hOs",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717622303,
+    "modifiedTime": 1748717622303,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!Hbjp64XzuyJs2hOs"
+}
diff --git a/src/packs/items/weapons/folders_Tier_1_d7tdCsIUd94XuTtq.json b/src/packs/items/weapons/folders_Tier_1_d7tdCsIUd94XuTtq.json
new file mode 100644
index 00000000..468d4ee4
--- /dev/null
+++ b/src/packs/items/weapons/folders_Tier_1_d7tdCsIUd94XuTtq.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Tier 1",
+  "color": null,
+  "sorting": "a",
+  "_id": "d7tdCsIUd94XuTtq",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717279663,
+    "modifiedTime": 1748717279663,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!d7tdCsIUd94XuTtq"
+}
diff --git a/src/packs/items/weapons/folders_Tier_2_ereMKW01MCYg0qUY.json b/src/packs/items/weapons/folders_Tier_2_ereMKW01MCYg0qUY.json
new file mode 100644
index 00000000..54ac1fe7
--- /dev/null
+++ b/src/packs/items/weapons/folders_Tier_2_ereMKW01MCYg0qUY.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Tier 2",
+  "color": null,
+  "sorting": "a",
+  "_id": "ereMKW01MCYg0qUY",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717283254,
+    "modifiedTime": 1748717283254,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!ereMKW01MCYg0qUY"
+}
diff --git a/src/packs/items/weapons/folders_Tier_3_oreMpiiytMRaR9sy.json b/src/packs/items/weapons/folders_Tier_3_oreMpiiytMRaR9sy.json
new file mode 100644
index 00000000..015eeaef
--- /dev/null
+++ b/src/packs/items/weapons/folders_Tier_3_oreMpiiytMRaR9sy.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Tier 3",
+  "color": null,
+  "sorting": "a",
+  "_id": "oreMpiiytMRaR9sy",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717286219,
+    "modifiedTime": 1748717286219,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!oreMpiiytMRaR9sy"
+}
diff --git a/src/packs/items/weapons/folders_Tier_4_UNDVQEo6UtTuueNQ.json b/src/packs/items/weapons/folders_Tier_4_UNDVQEo6UtTuueNQ.json
new file mode 100644
index 00000000..db695459
--- /dev/null
+++ b/src/packs/items/weapons/folders_Tier_4_UNDVQEo6UtTuueNQ.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Tier 4",
+  "color": null,
+  "sorting": "a",
+  "_id": "UNDVQEo6UtTuueNQ",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748717289155,
+    "modifiedTime": 1748717289155,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
+  },
+  "_key": "!folders!UNDVQEo6UtTuueNQ"
+}
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Glowing_Rings_tiF1InKThXGrG5A5.json b/src/packs/items/weapons/tier3/weapon_Advanced_Glowing_Rings_tiF1InKThXGrG5A5.json
deleted file mode 100644
index aecbde60..00000000
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Glowing_Rings_tiF1InKThXGrG5A5.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "name": "Advanced Glowing Rings",
-  "type": "weapon",
-  "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/advanced_glowing_rings.png",
-  "system": {
-    "active": false,
-    "inventoryWeapon": null,
-    "secondary": false,
-    "damage": {
-      "value": "d10+8",
-      "type": "magical"
-    },
-    "quantity": 1,
-    "description": "",
-    "trait": "agility",
-    "range": "veryClose",
-    "burden": "twoHanded"
-  },
-  "effects": [],
-  "folder": null,
-  "ownership": {
-    "default": 0,
-    "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
-  },
-  "flags": {},
-  "_stats": {
-    "compendiumSource": null,
-    "duplicateSource": null,
-    "exportSource": null,
-    "coreVersion": "13.344",
-    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
-    "createdTime": 1748009719025,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
-  },
-  "_id": "tiF1InKThXGrG5A5",
-  "sort": 600000,
-  "_key": "!items!tiF1InKThXGrG5A5"
-}
diff --git a/src/packs/items/weapons/tier4/weapon_Aantari_Bow_9SVzLUWdp7ZeSqH5.json b/src/packs/items/weapons/weapon_Aantari_Bow_DNSHS8KTawyOfQqH.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Aantari_Bow_9SVzLUWdp7ZeSqH5.json
rename to src/packs/items/weapons/weapon_Aantari_Bow_DNSHS8KTawyOfQqH.json
index 8826b59f..8b05f7cc 100644
--- a/src/packs/items/weapons/tier4/weapon_Aantari_Bow_9SVzLUWdp7ZeSqH5.json
+++ b/src/packs/items/weapons/weapon_Aantari_Bow_DNSHS8KTawyOfQqH.json
@@ -1,10 +1,8 @@
 {
   "name": "Aantari Bow",
   "type": "weapon",
-  "_id": "9SVzLUWdp7ZeSqH5",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/aanatari_bow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "finesse",
     "feature": "reliable",
     "range": "far",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748036207567,
-    "modifiedTime": 1748036227740,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717524137,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!9SVzLUWdp7ZeSqH5"
+  "_id": "DNSHS8KTawyOfQqH",
+  "sort": 3400000,
+  "_key": "!items!DNSHS8KTawyOfQqH"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Arcane_Gauntlets_f1v9t1oDs4c9TI2K.json b/src/packs/items/weapons/weapon_Advanced_Arcane_Gauntlets_wy7ylEZZL6quWba0.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Arcane_Gauntlets_f1v9t1oDs4c9TI2K.json
rename to src/packs/items/weapons/weapon_Advanced_Arcane_Gauntlets_wy7ylEZZL6quWba0.json
index 1116df2e..050b082b 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Arcane_Gauntlets_f1v9t1oDs4c9TI2K.json
+++ b/src/packs/items/weapons/weapon_Advanced_Arcane_Gauntlets_wy7ylEZZL6quWba0.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/advanced_arcane_gauntlets.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "strength",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009726670,
-    "modifiedTime": 1748009726670,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717459609,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "f1v9t1oDs4c9TI2K",
-  "sort": 0,
-  "_key": "!items!f1v9t1oDs4c9TI2K"
+  "_id": "wy7ylEZZL6quWba0",
+  "sort": 4100000,
+  "_key": "!items!wy7ylEZZL6quWba0"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Battleaxe_55kmkScxSwAGXSdN.json b/src/packs/items/weapons/weapon_Advanced_Battleaxe_8crRfaAQ9g3ZSlz0.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Battleaxe_55kmkScxSwAGXSdN.json
rename to src/packs/items/weapons/weapon_Advanced_Battleaxe_8crRfaAQ9g3ZSlz0.json
index ff280d45..e0af548a 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Battleaxe_55kmkScxSwAGXSdN.json
+++ b/src/packs/items/weapons/weapon_Advanced_Battleaxe_8crRfaAQ9g3ZSlz0.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_battleaxe.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "strength",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009725955,
-    "modifiedTime": 1748009725955,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717461045,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "55kmkScxSwAGXSdN",
-  "sort": 0,
-  "_key": "!items!55kmkScxSwAGXSdN"
+  "_id": "8crRfaAQ9g3ZSlz0",
+  "sort": 4300000,
+  "_key": "!items!8crRfaAQ9g3ZSlz0"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Broadsword_6iBBqlwCA1xBpEkz.json b/src/packs/items/weapons/weapon_Advanced_Broadsword_NM9iNiVQSWRfUzbC.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Broadsword_6iBBqlwCA1xBpEkz.json
rename to src/packs/items/weapons/weapon_Advanced_Broadsword_NM9iNiVQSWRfUzbC.json
index 66585846..4dd13748 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Broadsword_6iBBqlwCA1xBpEkz.json
+++ b/src/packs/items/weapons/weapon_Advanced_Broadsword_NM9iNiVQSWRfUzbC.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_broadsword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "agility",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "reliable"
+    "feature": "reliable",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009724319,
-    "modifiedTime": 1748009724319,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717463127,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "6iBBqlwCA1xBpEkz",
-  "sort": 0,
-  "_key": "!items!6iBBqlwCA1xBpEkz"
+  "_id": "NM9iNiVQSWRfUzbC",
+  "sort": 4200000,
+  "_key": "!items!NM9iNiVQSWRfUzbC"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Crossbow_CwRGALuF4o0NJe3y.json b/src/packs/items/weapons/weapon_Advanced_Crossbow_avxhDjL3lxBMpqq5.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Crossbow_CwRGALuF4o0NJe3y.json
rename to src/packs/items/weapons/weapon_Advanced_Crossbow_avxhDjL3lxBMpqq5.json
index cacf7ed5..2362f59b 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Crossbow_CwRGALuF4o0NJe3y.json
+++ b/src/packs/items/weapons/weapon_Advanced_Crossbow_avxhDjL3lxBMpqq5.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_crossbow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "finesse",
     "range": "far",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009723452,
-    "modifiedTime": 1748009723452,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717464940,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "CwRGALuF4o0NJe3y",
-  "sort": 0,
-  "_key": "!items!CwRGALuF4o0NJe3y"
+  "_id": "avxhDjL3lxBMpqq5",
+  "sort": 3600000,
+  "_key": "!items!avxhDjL3lxBMpqq5"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Cutlass_rVoF4pXluLGXbAlk.json b/src/packs/items/weapons/weapon_Advanced_Cutlass_kBwwJ1vbuy5lyIyp.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Cutlass_rVoF4pXluLGXbAlk.json
rename to src/packs/items/weapons/weapon_Advanced_Cutlass_kBwwJ1vbuy5lyIyp.json
index 3a7079cc..1a8e9e5e 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Cutlass_rVoF4pXluLGXbAlk.json
+++ b/src/packs/items/weapons/weapon_Advanced_Cutlass_kBwwJ1vbuy5lyIyp.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_cutlass.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "presence",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009721740,
-    "modifiedTime": 1748009721740,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717465845,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "rVoF4pXluLGXbAlk",
-  "sort": 0,
-  "_key": "!items!rVoF4pXluLGXbAlk"
+  "_id": "kBwwJ1vbuy5lyIyp",
+  "sort": 3700000,
+  "_key": "!items!kBwwJ1vbuy5lyIyp"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Dagger_HoBYwjE8G9OTqISk.json b/src/packs/items/weapons/weapon_Advanced_Dagger_ZjZwghxJTAhbJwgf.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Dagger_HoBYwjE8G9OTqISk.json
rename to src/packs/items/weapons/weapon_Advanced_Dagger_ZjZwghxJTAhbJwgf.json
index 95cbb1ca..07391f16 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Dagger_HoBYwjE8G9OTqISk.json
+++ b/src/packs/items/weapons/weapon_Advanced_Dagger_ZjZwghxJTAhbJwgf.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_dagger.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "finesse",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009720844,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717466693,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "HoBYwjE8G9OTqISk",
-  "sort": 400000,
-  "_key": "!items!HoBYwjE8G9OTqISk"
+  "_id": "ZjZwghxJTAhbJwgf",
+  "sort": 3900000,
+  "_key": "!items!ZjZwghxJTAhbJwgf"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Dualstaff_Jtzvg4VmTzQyEvgw.json b/src/packs/items/weapons/weapon_Advanced_Dualstaff_9f1XlCd3fN7SgTkk.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Dualstaff_Jtzvg4VmTzQyEvgw.json
rename to src/packs/items/weapons/weapon_Advanced_Dualstaff_9f1XlCd3fN7SgTkk.json
index 5272f8c3..f139ff57 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Dualstaff_Jtzvg4VmTzQyEvgw.json
+++ b/src/packs/items/weapons/weapon_Advanced_Dualstaff_9f1XlCd3fN7SgTkk.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/advanced_dualstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "instinct",
     "range": "far",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009719957,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717467499,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "Jtzvg4VmTzQyEvgw",
-  "sort": 700000,
-  "_key": "!items!Jtzvg4VmTzQyEvgw"
+  "_id": "9f1XlCd3fN7SgTkk",
+  "sort": 4000000,
+  "_key": "!items!9f1XlCd3fN7SgTkk"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Greatstaff_lIk92ZPvryDQrtrm.json b/src/packs/items/weapons/weapon_Advanced_Greatstaff_r45VbaXuCbAgeh6p.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Greatstaff_lIk92ZPvryDQrtrm.json
rename to src/packs/items/weapons/weapon_Advanced_Greatstaff_r45VbaXuCbAgeh6p.json
index 029ad709..1b06b864 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Greatstaff_lIk92ZPvryDQrtrm.json
+++ b/src/packs/items/weapons/weapon_Advanced_Greatstaff_r45VbaXuCbAgeh6p.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/advanced_greatstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "knowledge",
     "range": "veryFar",
     "burden": "twoHanded",
-    "feature": "powerful"
+    "feature": "powerful",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009717363,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717469459,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "lIk92ZPvryDQrtrm",
-  "sort": 500000,
-  "_key": "!items!lIk92ZPvryDQrtrm"
+  "_id": "r45VbaXuCbAgeh6p",
+  "sort": 3800000,
+  "_key": "!items!r45VbaXuCbAgeh6p"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Greatsword_dYFKPIujOvDH2sEx.json b/src/packs/items/weapons/weapon_Advanced_Greatsword_XAkNXcsfWLoNeyoF.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Greatsword_dYFKPIujOvDH2sEx.json
rename to src/packs/items/weapons/weapon_Advanced_Greatsword_XAkNXcsfWLoNeyoF.json
index e3eeda3c..58875c75 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Greatsword_dYFKPIujOvDH2sEx.json
+++ b/src/packs/items/weapons/weapon_Advanced_Greatsword_XAkNXcsfWLoNeyoF.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_greatsword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "melee",
     "burden": "twoHanded",
-    "feature": "massive"
+    "feature": "massive",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009716491,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717470422,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "dYFKPIujOvDH2sEx",
-  "sort": 300000,
-  "_key": "!items!dYFKPIujOvDH2sEx"
+  "_id": "XAkNXcsfWLoNeyoF",
+  "sort": 2900000,
+  "_key": "!items!XAkNXcsfWLoNeyoF"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Halberd_hX3CM1pvIfeebF2g.json b/src/packs/items/weapons/weapon_Advanced_Halberd_1ro8WmVPGvU5AcNb.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Halberd_hX3CM1pvIfeebF2g.json
rename to src/packs/items/weapons/weapon_Advanced_Halberd_1ro8WmVPGvU5AcNb.json
index ed63e8be..4b3bfd9f 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Halberd_hX3CM1pvIfeebF2g.json
+++ b/src/packs/items/weapons/weapon_Advanced_Halberd_1ro8WmVPGvU5AcNb.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_halberd.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "veryClose",
     "burden": "twoHanded",
-    "feature": "cumbersome"
+    "feature": "cumbersome",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009715670,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717471485,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "hX3CM1pvIfeebF2g",
-  "sort": 200000,
-  "_key": "!items!hX3CM1pvIfeebF2g"
+  "_id": "1ro8WmVPGvU5AcNb",
+  "sort": 3000000,
+  "_key": "!items!1ro8WmVPGvU5AcNb"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Hallowed_Axe_Gf7I4j8skD862SU0.json b/src/packs/items/weapons/weapon_Advanced_Hallowed_Axe_6tltkuPbrHaqbCO0.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Hallowed_Axe_Gf7I4j8skD862SU0.json
rename to src/packs/items/weapons/weapon_Advanced_Hallowed_Axe_6tltkuPbrHaqbCO0.json
index a1c300d8..574eb917 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Hallowed_Axe_Gf7I4j8skD862SU0.json
+++ b/src/packs/items/weapons/weapon_Advanced_Hallowed_Axe_6tltkuPbrHaqbCO0.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/advanced_hallowed_axe.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "strength",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009714741,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717472596,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "Gf7I4j8skD862SU0",
-  "sort": 100000,
-  "_key": "!items!Gf7I4j8skD862SU0"
+  "_id": "6tltkuPbrHaqbCO0",
+  "sort": 3100000,
+  "_key": "!items!6tltkuPbrHaqbCO0"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Hand_Runes_uuZTjjTN73zXYVxE.json b/src/packs/items/weapons/weapon_Advanced_Hand_Runes_UKnk8XcmeG5BiNEP.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Hand_Runes_uuZTjjTN73zXYVxE.json
rename to src/packs/items/weapons/weapon_Advanced_Hand_Runes_UKnk8XcmeG5BiNEP.json
index 5afd8134..143e998f 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Hand_Runes_uuZTjjTN73zXYVxE.json
+++ b/src/packs/items/weapons/weapon_Advanced_Hand_Runes_UKnk8XcmeG5BiNEP.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/advanced_hand_runes.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "instinct",
     "range": "veryClose",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009712990,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717474332,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "uuZTjjTN73zXYVxE",
-  "sort": 1100000,
-  "_key": "!items!uuZTjjTN73zXYVxE"
+  "_id": "UKnk8XcmeG5BiNEP",
+  "sort": 3300000,
+  "_key": "!items!UKnk8XcmeG5BiNEP"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Longbow_wDsxrxhkuJwFEw8q.json b/src/packs/items/weapons/weapon_Advanced_Longbow_CTBVsiB2abltveHL.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Longbow_wDsxrxhkuJwFEw8q.json
rename to src/packs/items/weapons/weapon_Advanced_Longbow_CTBVsiB2abltveHL.json
index 91b2b956..0fd849fb 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Longbow_wDsxrxhkuJwFEw8q.json
+++ b/src/packs/items/weapons/weapon_Advanced_Longbow_CTBVsiB2abltveHL.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_longbow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "agility",
     "range": "veryFar",
     "burden": "twoHanded",
-    "feature": "cumbersome"
+    "feature": "cumbersome",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009712027,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717475290,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "wDsxrxhkuJwFEw8q",
-  "sort": 1300000,
-  "_key": "!items!wDsxrxhkuJwFEw8q"
+  "_id": "CTBVsiB2abltveHL",
+  "sort": 3400000,
+  "_key": "!items!CTBVsiB2abltveHL"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Longsword_ohLQbYRlQx4ivJMl.json b/src/packs/items/weapons/weapon_Advanced_Longsword_MGjqO5ovO4m63pnR.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Longsword_ohLQbYRlQx4ivJMl.json
rename to src/packs/items/weapons/weapon_Advanced_Longsword_MGjqO5ovO4m63pnR.json
index 80d36fca..cf318497 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Longsword_ohLQbYRlQx4ivJMl.json
+++ b/src/packs/items/weapons/weapon_Advanced_Longsword_MGjqO5ovO4m63pnR.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_longsword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "agility",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009711161,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717476881,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "ohLQbYRlQx4ivJMl",
-  "sort": 1200000,
-  "_key": "!items!ohLQbYRlQx4ivJMl"
+  "_id": "MGjqO5ovO4m63pnR",
+  "sort": 3500000,
+  "_key": "!items!MGjqO5ovO4m63pnR"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Mace_d0SqlcuhkKufJScF.json b/src/packs/items/weapons/weapon_Advanced_Mace_bhPYWRBEYjdLxjsS.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Mace_d0SqlcuhkKufJScF.json
rename to src/packs/items/weapons/weapon_Advanced_Mace_bhPYWRBEYjdLxjsS.json
index 973b8fd7..4d505c9b 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Mace_d0SqlcuhkKufJScF.json
+++ b/src/packs/items/weapons/weapon_Advanced_Mace_bhPYWRBEYjdLxjsS.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_mace.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "strength",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009710185,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717478009,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "d0SqlcuhkKufJScF",
-  "sort": 1000000,
-  "_key": "!items!d0SqlcuhkKufJScF"
+  "_id": "bhPYWRBEYjdLxjsS",
+  "sort": 3200000,
+  "_key": "!items!bhPYWRBEYjdLxjsS"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Quarterstaff_w3Hze7ailRPQh4kc.json b/src/packs/items/weapons/weapon_Advanced_Quarterstaff_FAlwfHMZ57zMeEXX.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Quarterstaff_w3Hze7ailRPQh4kc.json
rename to src/packs/items/weapons/weapon_Advanced_Quarterstaff_FAlwfHMZ57zMeEXX.json
index ec1bf3ca..652e3f7a 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Quarterstaff_w3Hze7ailRPQh4kc.json
+++ b/src/packs/items/weapons/weapon_Advanced_Quarterstaff_FAlwfHMZ57zMeEXX.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_quarterstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "instinct",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009708527,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717479047,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "w3Hze7ailRPQh4kc",
-  "sort": 900000,
-  "_key": "!items!w3Hze7ailRPQh4kc"
+  "_id": "FAlwfHMZ57zMeEXX",
+  "sort": 1400000,
+  "_key": "!items!FAlwfHMZ57zMeEXX"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Rapier_JEQZMzrlsoU2Pjd0.json b/src/packs/items/weapons/weapon_Advanced_Rapier_2Ja5VIvPszG0ZOFa.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Rapier_JEQZMzrlsoU2Pjd0.json
rename to src/packs/items/weapons/weapon_Advanced_Rapier_2Ja5VIvPszG0ZOFa.json
index 858f0d9f..eab87e9b 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Rapier_JEQZMzrlsoU2Pjd0.json
+++ b/src/packs/items/weapons/weapon_Advanced_Rapier_2Ja5VIvPszG0ZOFa.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_rapier.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "presence",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "quick"
+    "feature": "quick",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009707684,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717480168,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "JEQZMzrlsoU2Pjd0",
-  "sort": 800000,
-  "_key": "!items!JEQZMzrlsoU2Pjd0"
+  "_id": "2Ja5VIvPszG0ZOFa",
+  "sort": 1500000,
+  "_key": "!items!2Ja5VIvPszG0ZOFa"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Returning_Blade_fcLmPt9wFqM1xojl.json b/src/packs/items/weapons/weapon_Advanced_Returning_Blade_EiWtyGG1438yU7FE.json
similarity index 72%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Returning_Blade_fcLmPt9wFqM1xojl.json
rename to src/packs/items/weapons/weapon_Advanced_Returning_Blade_EiWtyGG1438yU7FE.json
index 9360f469..58f2da50 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Returning_Blade_fcLmPt9wFqM1xojl.json
+++ b/src/packs/items/weapons/weapon_Advanced_Returning_Blade_EiWtyGG1438yU7FE.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/advanced_returning_blade.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,15 @@
     "trait": "finesse",
     "range": "close",
     "burden": "oneHanded",
-    "feature": "retrieve"
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009706817,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717483515,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "fcLmPt9wFqM1xojl",
+  "_id": "EiWtyGG1438yU7FE",
   "sort": 1600000,
-  "_key": "!items!fcLmPt9wFqM1xojl"
+  "_key": "!items!EiWtyGG1438yU7FE"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Scepter_BqYoefSRnoQVpC2Q.json b/src/packs/items/weapons/weapon_Advanced_Scepter_svrqrOD9ICZtyX5C.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Scepter_BqYoefSRnoQVpC2Q.json
rename to src/packs/items/weapons/weapon_Advanced_Scepter_svrqrOD9ICZtyX5C.json
index 555e8ad2..5611f6d8 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Scepter_BqYoefSRnoQVpC2Q.json
+++ b/src/packs/items/weapons/weapon_Advanced_Scepter_svrqrOD9ICZtyX5C.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/advanced_scepter.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "presence",
     "range": "far",
     "burden": "twoHanded",
-    "feature": "versatile"
+    "feature": "versatile",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009706027,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717484622,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "BqYoefSRnoQVpC2Q",
-  "sort": 2000000,
-  "_key": "!items!BqYoefSRnoQVpC2Q"
+  "_id": "svrqrOD9ICZtyX5C",
+  "sort": 1800000,
+  "_key": "!items!svrqrOD9ICZtyX5C"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Shortbow_HLdn8xNWmDkdtFL7.json b/src/packs/items/weapons/weapon_Advanced_Shortbow_5SsnVWZfaLNZ262c.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Shortbow_HLdn8xNWmDkdtFL7.json
rename to src/packs/items/weapons/weapon_Advanced_Shortbow_5SsnVWZfaLNZ262c.json
index 35ff1161..49cafd22 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Shortbow_HLdn8xNWmDkdtFL7.json
+++ b/src/packs/items/weapons/weapon_Advanced_Shortbow_5SsnVWZfaLNZ262c.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_shortbow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "agility",
     "range": "far",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009702575,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717485676,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "HLdn8xNWmDkdtFL7",
-  "sort": 1800000,
-  "_key": "!items!HLdn8xNWmDkdtFL7"
+  "_id": "5SsnVWZfaLNZ262c",
+  "sort": 1900000,
+  "_key": "!items!5SsnVWZfaLNZ262c"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Shortstaff_1OgEUTyTwP63JuWE.json b/src/packs/items/weapons/weapon_Advanced_Shortstaff_u7WEnZfpJibSbq7j.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Shortstaff_1OgEUTyTwP63JuWE.json
rename to src/packs/items/weapons/weapon_Advanced_Shortstaff_u7WEnZfpJibSbq7j.json
index 3faacf72..fd041b5d 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Shortstaff_1OgEUTyTwP63JuWE.json
+++ b/src/packs/items/weapons/weapon_Advanced_Shortstaff_u7WEnZfpJibSbq7j.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/advanced_shortstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "instinct",
     "range": "close",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009703303,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717486808,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "1OgEUTyTwP63JuWE",
-  "sort": 1900000,
-  "_key": "!items!1OgEUTyTwP63JuWE"
+  "_id": "u7WEnZfpJibSbq7j",
+  "sort": 2000000,
+  "_key": "!items!u7WEnZfpJibSbq7j"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Spear_ZZWf8dSIs9m2PH2h.json b/src/packs/items/weapons/weapon_Advanced_Spear_E5SEF7QYomDM6tIn.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Spear_ZZWf8dSIs9m2PH2h.json
rename to src/packs/items/weapons/weapon_Advanced_Spear_E5SEF7QYomDM6tIn.json
index 1189bd8b..aa5627f4 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Spear_ZZWf8dSIs9m2PH2h.json
+++ b/src/packs/items/weapons/weapon_Advanced_Spear_E5SEF7QYomDM6tIn.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_spear.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "finesse",
     "range": "veryClose",
     "burden": "twoHanded",
-    "feature": "cumbersome"
+    "feature": "cumbersome",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009701007,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717487907,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "ZZWf8dSIs9m2PH2h",
-  "sort": 1700000,
-  "_key": "!items!ZZWf8dSIs9m2PH2h"
+  "_id": "E5SEF7QYomDM6tIn",
+  "sort": 2100000,
+  "_key": "!items!E5SEF7QYomDM6tIn"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Wand_tAEIzS7BlPz9D7xy.json b/src/packs/items/weapons/weapon_Advanced_Wand_EBYFq8AMUrVmlV10.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Wand_tAEIzS7BlPz9D7xy.json
rename to src/packs/items/weapons/weapon_Advanced_Wand_EBYFq8AMUrVmlV10.json
index 76feaafc..86dd8903 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Wand_tAEIzS7BlPz9D7xy.json
+++ b/src/packs/items/weapons/weapon_Advanced_Wand_EBYFq8AMUrVmlV10.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/advanced_wand.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "knowledge",
     "range": "far",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009700097,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717489144,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "tAEIzS7BlPz9D7xy",
-  "sort": 1500000,
-  "_key": "!items!tAEIzS7BlPz9D7xy"
+  "_id": "EBYFq8AMUrVmlV10",
+  "sort": 2200000,
+  "_key": "!items!EBYFq8AMUrVmlV10"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Advanced_Warhammer_IV3HYPjJ5uRaq80h.json b/src/packs/items/weapons/weapon_Advanced_Warhammer_7oyZvWDs9QXQJLkX.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Advanced_Warhammer_IV3HYPjJ5uRaq80h.json
rename to src/packs/items/weapons/weapon_Advanced_Warhammer_7oyZvWDs9QXQJLkX.json
index 11518f3b..da8471b9 100644
--- a/src/packs/items/weapons/tier3/weapon_Advanced_Warhammer_IV3HYPjJ5uRaq80h.json
+++ b/src/packs/items/weapons/weapon_Advanced_Warhammer_7oyZvWDs9QXQJLkX.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/advanced_warhammer.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "melee",
     "burden": "twoHanded",
-    "feature": "heavy"
+    "feature": "heavy",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009697372,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717490314,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "IV3HYPjJ5uRaq80h",
-  "sort": 1400000,
-  "_key": "!items!IV3HYPjJ5uRaq80h"
+  "_id": "7oyZvWDs9QXQJLkX",
+  "sort": 2300000,
+  "_key": "!items!7oyZvWDs9QXQJLkX"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Arcane_Gauntlets_sZXALjdKu3HQ8hQE.json b/src/packs/items/weapons/weapon_Arcane_Gauntlets_Py1MXNUmI81Qq5Eb.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Arcane_Gauntlets_sZXALjdKu3HQ8hQE.json
rename to src/packs/items/weapons/weapon_Arcane_Gauntlets_Py1MXNUmI81Qq5Eb.json
index 0c0ba852..f93d6677 100644
--- a/src/packs/items/weapons/tier1/weapon_Arcane_Gauntlets_sZXALjdKu3HQ8hQE.json
+++ b/src/packs/items/weapons/weapon_Arcane_Gauntlets_Py1MXNUmI81Qq5Eb.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/magical/arcane_gauntlets.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "strength",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009471341,
-    "modifiedTime": 1748009471341,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717298932,
+    "modifiedTime": 1748717301647,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "sZXALjdKu3HQ8hQE",
-  "sort": 0,
-  "_key": "!items!sZXALjdKu3HQ8hQE"
+  "_id": "Py1MXNUmI81Qq5Eb",
+  "sort": 100000,
+  "_key": "!items!Py1MXNUmI81Qq5Eb"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Axe_of_Fortunis_X1pTuQSSPm7PBPi0.json b/src/packs/items/weapons/weapon_Axe_of_Fortunis_7acS1kBjE98WwngU.json
similarity index 69%
rename from src/packs/items/weapons/tier3/weapon_Axe_of_Fortunis_X1pTuQSSPm7PBPi0.json
rename to src/packs/items/weapons/weapon_Axe_of_Fortunis_7acS1kBjE98WwngU.json
index 6d7ac741..df647076 100644
--- a/src/packs/items/weapons/tier3/weapon_Axe_of_Fortunis_X1pTuQSSPm7PBPi0.json
+++ b/src/packs/items/weapons/weapon_Axe_of_Fortunis_7acS1kBjE98WwngU.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/axe_of_fortunis.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,15 @@
     "trait": "strength",
     "range": "melee",
     "burden": "twoHanded",
-    "feature": "lucky"
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009696541,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717491382,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "X1pTuQSSPm7PBPi0",
-  "sort": 2300000,
-  "_key": "!items!X1pTuQSSPm7PBPi0"
+  "_id": "7acS1kBjE98WwngU",
+  "sort": 2400000,
+  "_key": "!items!7acS1kBjE98WwngU"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Battleaxe_27Kmwjycfn1De9ig.json b/src/packs/items/weapons/weapon_Battleaxe_FasGIMef6XBoygUG.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Battleaxe_27Kmwjycfn1De9ig.json
rename to src/packs/items/weapons/weapon_Battleaxe_FasGIMef6XBoygUG.json
index 28224696..a0f3d95f 100644
--- a/src/packs/items/weapons/tier1/weapon_Battleaxe_27Kmwjycfn1De9ig.json
+++ b/src/packs/items/weapons/weapon_Battleaxe_FasGIMef6XBoygUG.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/battleaxe.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "strength",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009469760,
-    "modifiedTime": 1748009469760,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717300326,
+    "modifiedTime": 1748717301647,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "27Kmwjycfn1De9ig",
-  "sort": 0,
-  "_key": "!items!27Kmwjycfn1De9ig"
+  "_id": "FasGIMef6XBoygUG",
+  "sort": 300000,
+  "_key": "!items!FasGIMef6XBoygUG"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Black_Powder_Revolver_POHACCee5wa92XD1.json b/src/packs/items/weapons/weapon_Black_Powder_Revolver_yKRCcrggt4kroLGc.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Black_Powder_Revolver_POHACCee5wa92XD1.json
rename to src/packs/items/weapons/weapon_Black_Powder_Revolver_yKRCcrggt4kroLGc.json
index 49b0b528..2aecea8d 100644
--- a/src/packs/items/weapons/tier3/weapon_Black_Powder_Revolver_POHACCee5wa92XD1.json
+++ b/src/packs/items/weapons/weapon_Black_Powder_Revolver_yKRCcrggt4kroLGc.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/black_powder_revolver.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "finesse",
     "range": "far",
     "burden": "oneHanded",
-    "feature": "reloading"
+    "feature": "reloading",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009695686,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717492483,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "POHACCee5wa92XD1",
-  "sort": 2600000,
-  "_key": "!items!POHACCee5wa92XD1"
+  "_id": "yKRCcrggt4kroLGc",
+  "sort": 2500000,
+  "_key": "!items!yKRCcrggt4kroLGc"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Bladed_Whip_3YR4qTSUT5TAzSNs.json b/src/packs/items/weapons/weapon_Bladed_Whip_DcugVpNyWKgoKvSf.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Bladed_Whip_3YR4qTSUT5TAzSNs.json
rename to src/packs/items/weapons/weapon_Bladed_Whip_DcugVpNyWKgoKvSf.json
index 9188fa11..6919bb3c 100644
--- a/src/packs/items/weapons/tier2/weapon_Bladed_Whip_3YR4qTSUT5TAzSNs.json
+++ b/src/packs/items/weapons/weapon_Bladed_Whip_DcugVpNyWKgoKvSf.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/bladed_whip.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "agility",
     "range": "veryClose",
     "burden": "oneHanded",
-    "feature": "quick"
+    "feature": "quick",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009546888,
-    "modifiedTime": 1748009546888,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717375482,
+    "modifiedTime": 1748717378187,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "3YR4qTSUT5TAzSNs",
-  "sort": 0,
-  "_key": "!items!3YR4qTSUT5TAzSNs"
+  "_id": "DcugVpNyWKgoKvSf",
+  "sort": 100000,
+  "_key": "!items!DcugVpNyWKgoKvSf"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Blessed_Anlace_p0oeyqhAIRdAQv6k.json b/src/packs/items/weapons/weapon_Blessed_Anlace_c93VQ2ZLScV0o0m5.json
similarity index 69%
rename from src/packs/items/weapons/tier3/weapon_Blessed_Anlace_p0oeyqhAIRdAQv6k.json
rename to src/packs/items/weapons/weapon_Blessed_Anlace_c93VQ2ZLScV0o0m5.json
index 707136e5..c836ea11 100644
--- a/src/packs/items/weapons/tier3/weapon_Blessed_Anlace_p0oeyqhAIRdAQv6k.json
+++ b/src/packs/items/weapons/weapon_Blessed_Anlace_c93VQ2ZLScV0o0m5.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/blessed_anlace.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,15 @@
     "trait": "instinct",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "healing"
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009694614,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717493410,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "p0oeyqhAIRdAQv6k",
-  "sort": 2500000,
-  "_key": "!items!p0oeyqhAIRdAQv6k"
+  "_id": "c93VQ2ZLScV0o0m5",
+  "sort": 2600000,
+  "_key": "!items!c93VQ2ZLScV0o0m5"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Bloodstaff_LWYvJXHStsyNaYBR.json b/src/packs/items/weapons/weapon_Bloodstaff_nrb7pyh8YYncOWti.json
similarity index 66%
rename from src/packs/items/weapons/tier4/weapon_Bloodstaff_LWYvJXHStsyNaYBR.json
rename to src/packs/items/weapons/weapon_Bloodstaff_nrb7pyh8YYncOWti.json
index 2f72d9ce..dfbc4892 100644
--- a/src/packs/items/weapons/tier4/weapon_Bloodstaff_LWYvJXHStsyNaYBR.json
+++ b/src/packs/items/weapons/weapon_Bloodstaff_nrb7pyh8YYncOWti.json
@@ -1,10 +1,8 @@
 {
   "name": "Bloodstaff",
   "type": "weapon",
-  "_id": "LWYvJXHStsyNaYBR",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/bloodstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "instinct",
     "feature": "painful",
     "range": "far",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748038067989,
-    "modifiedTime": 1748038098782,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717526335,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!LWYvJXHStsyNaYBR"
+  "_id": "nrb7pyh8YYncOWti",
+  "sort": 3500000,
+  "_key": "!items!nrb7pyh8YYncOWti"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Blunderbuss_OUH7FtPwrvhyRGfg.json b/src/packs/items/weapons/weapon_Blunderbuss_xLFEBehUK17zML2B.json
similarity index 67%
rename from src/packs/items/weapons/tier2/weapon_Blunderbuss_OUH7FtPwrvhyRGfg.json
rename to src/packs/items/weapons/weapon_Blunderbuss_xLFEBehUK17zML2B.json
index 2e0434a2..3f19deae 100644
--- a/src/packs/items/weapons/tier2/weapon_Blunderbuss_OUH7FtPwrvhyRGfg.json
+++ b/src/packs/items/weapons/weapon_Blunderbuss_xLFEBehUK17zML2B.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/blunderbuss.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "finesse",
     "range": "close",
     "burden": "twoHanded",
-    "feature": "reloading"
+    "feature": "reloading",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009546083,
-    "modifiedTime": 1748009546083,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717376945,
+    "modifiedTime": 1748717378187,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "OUH7FtPwrvhyRGfg",
-  "sort": 0,
-  "_key": "!items!OUH7FtPwrvhyRGfg"
+  "_id": "xLFEBehUK17zML2B",
+  "sort": 300000,
+  "_key": "!items!xLFEBehUK17zML2B"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Bravesword_1qE6NDSlN8bHVNLE.json b/src/packs/items/weapons/weapon_Bravesword_JCvRYFpIwdqfmqdk.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Bravesword_1qE6NDSlN8bHVNLE.json
rename to src/packs/items/weapons/weapon_Bravesword_JCvRYFpIwdqfmqdk.json
index c35771c0..21a60083 100644
--- a/src/packs/items/weapons/tier3/weapon_Bravesword_1qE6NDSlN8bHVNLE.json
+++ b/src/packs/items/weapons/weapon_Bravesword_JCvRYFpIwdqfmqdk.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/bravesword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "melee",
     "burden": "twoHanded",
-    "feature": "barrier"
+    "feature": "barrier",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009692041,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717494401,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "1qE6NDSlN8bHVNLE",
-  "sort": 2400000,
-  "_key": "!items!1qE6NDSlN8bHVNLE"
+  "_id": "JCvRYFpIwdqfmqdk",
+  "sort": 2700000,
+  "_key": "!items!JCvRYFpIwdqfmqdk"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Broadsword_k4cXJtgvlPzOKJ4s.json b/src/packs/items/weapons/weapon_Broadsword_tB2lDopuefiG4gD7.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Broadsword_k4cXJtgvlPzOKJ4s.json
rename to src/packs/items/weapons/weapon_Broadsword_tB2lDopuefiG4gD7.json
index 1103d388..d9531417 100644
--- a/src/packs/items/weapons/tier1/weapon_Broadsword_k4cXJtgvlPzOKJ4s.json
+++ b/src/packs/items/weapons/weapon_Broadsword_tB2lDopuefiG4gD7.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/broadsword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "agility",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "reliable"
+    "feature": "reliable",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009468771,
-    "modifiedTime": 1748009468771,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717301639,
+    "modifiedTime": 1748717301647,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "k4cXJtgvlPzOKJ4s",
-  "sort": 0,
-  "_key": "!items!k4cXJtgvlPzOKJ4s"
+  "_id": "tB2lDopuefiG4gD7",
+  "sort": 200000,
+  "_key": "!items!tB2lDopuefiG4gD7"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Casting_Sword_MtJNIBRq4CaXEfQj.json b/src/packs/items/weapons/weapon_Casting_Sword_qfJbWjwKZ5k8vzCr.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Casting_Sword_MtJNIBRq4CaXEfQj.json
rename to src/packs/items/weapons/weapon_Casting_Sword_qfJbWjwKZ5k8vzCr.json
index 4c5aedc4..db7c83f3 100644
--- a/src/packs/items/weapons/tier2/weapon_Casting_Sword_MtJNIBRq4CaXEfQj.json
+++ b/src/packs/items/weapons/weapon_Casting_Sword_qfJbWjwKZ5k8vzCr.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/casting_sword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "melee",
     "burden": "twoHanded",
-    "feature": "versatile"
+    "feature": "versatile",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009543885,
-    "modifiedTime": 1748009543885,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717378179,
+    "modifiedTime": 1748717378187,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "MtJNIBRq4CaXEfQj",
-  "sort": 0,
-  "_key": "!items!MtJNIBRq4CaXEfQj"
+  "_id": "qfJbWjwKZ5k8vzCr",
+  "sort": 200000,
+  "_key": "!items!qfJbWjwKZ5k8vzCr"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Crossbow_GXdE6NaEGgiwUNEs.json b/src/packs/items/weapons/weapon_Crossbow_sTIiyrI2o2GHKp0u.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Crossbow_GXdE6NaEGgiwUNEs.json
rename to src/packs/items/weapons/weapon_Crossbow_sTIiyrI2o2GHKp0u.json
index 72b6fa65..535214e1 100644
--- a/src/packs/items/weapons/tier1/weapon_Crossbow_GXdE6NaEGgiwUNEs.json
+++ b/src/packs/items/weapons/weapon_Crossbow_sTIiyrI2o2GHKp0u.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/crossbow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "finesse",
     "range": "far",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009467966,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717302887,
+    "modifiedTime": 1748717302887,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "GXdE6NaEGgiwUNEs",
-  "sort": 300000,
-  "_key": "!items!GXdE6NaEGgiwUNEs"
+  "_id": "sTIiyrI2o2GHKp0u",
+  "sort": 0,
+  "_key": "!items!sTIiyrI2o2GHKp0u"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Curved_Dagger_sbKB1f2i7bQCR1i8.json b/src/packs/items/weapons/weapon_Curved_Dagger_IQpfAz5mjXBNgq7A.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Curved_Dagger_sbKB1f2i7bQCR1i8.json
rename to src/packs/items/weapons/weapon_Curved_Dagger_IQpfAz5mjXBNgq7A.json
index 3a70ff8f..7281f453 100644
--- a/src/packs/items/weapons/tier4/weapon_Curved_Dagger_sbKB1f2i7bQCR1i8.json
+++ b/src/packs/items/weapons/weapon_Curved_Dagger_IQpfAz5mjXBNgq7A.json
@@ -1,10 +1,8 @@
 {
   "name": "Curved Dagger",
   "type": "weapon",
-  "_id": "sbKB1f2i7bQCR1i8",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/curved_dagger.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "finesse",
     "feature": "serrated",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035972954,
-    "modifiedTime": 1748035994504,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717527943,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!sbKB1f2i7bQCR1i8"
+  "_id": "IQpfAz5mjXBNgq7A",
+  "sort": 3700000,
+  "_key": "!items!IQpfAz5mjXBNgq7A"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Cutlass_2qe0ilpRfBuVYbDo.json b/src/packs/items/weapons/weapon_Cutlass_HdyZyBywO1byCsfM.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Cutlass_2qe0ilpRfBuVYbDo.json
rename to src/packs/items/weapons/weapon_Cutlass_HdyZyBywO1byCsfM.json
index ebc70d7e..a02f02d2 100644
--- a/src/packs/items/weapons/tier1/weapon_Cutlass_2qe0ilpRfBuVYbDo.json
+++ b/src/packs/items/weapons/weapon_Cutlass_HdyZyBywO1byCsfM.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/cutlass.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "presence",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009467172,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717304153,
+    "modifiedTime": 1748717304153,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "2qe0ilpRfBuVYbDo",
-  "sort": 800000,
-  "_key": "!items!2qe0ilpRfBuVYbDo"
+  "_id": "HdyZyBywO1byCsfM",
+  "sort": 0,
+  "_key": "!items!HdyZyBywO1byCsfM"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Dagger_Rz8lyl0B2rS3gBTP.json b/src/packs/items/weapons/weapon_Dagger_PQ8QSP0BhzJcVy4Z.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Dagger_Rz8lyl0B2rS3gBTP.json
rename to src/packs/items/weapons/weapon_Dagger_PQ8QSP0BhzJcVy4Z.json
index 08d685c7..8f3a42e8 100644
--- a/src/packs/items/weapons/tier1/weapon_Dagger_Rz8lyl0B2rS3gBTP.json
+++ b/src/packs/items/weapons/weapon_Dagger_PQ8QSP0BhzJcVy4Z.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/dagger.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "finesse",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009466224,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717305476,
+    "modifiedTime": 1748717305476,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "Rz8lyl0B2rS3gBTP",
-  "sort": 700000,
-  "_key": "!items!Rz8lyl0B2rS3gBTP"
+  "_id": "PQ8QSP0BhzJcVy4Z",
+  "sort": 0,
+  "_key": "!items!PQ8QSP0BhzJcVy4Z"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Devouring_Dagger_CBXVCc2YKUhofHBg.json b/src/packs/items/weapons/weapon_Devouring_Dagger_iv4ojTQDd91tOGeP.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Devouring_Dagger_CBXVCc2YKUhofHBg.json
rename to src/packs/items/weapons/weapon_Devouring_Dagger_iv4ojTQDd91tOGeP.json
index 3126e6dd..fb7e07c6 100644
--- a/src/packs/items/weapons/tier2/weapon_Devouring_Dagger_CBXVCc2YKUhofHBg.json
+++ b/src/packs/items/weapons/weapon_Devouring_Dagger_iv4ojTQDd91tOGeP.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/devouring_dagger.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "finesse",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "scary"
+    "feature": "scary",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009543021,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717379624,
+    "modifiedTime": 1748717379624,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "CBXVCc2YKUhofHBg",
-  "sort": 300000,
-  "_key": "!items!CBXVCc2YKUhofHBg"
+  "_id": "iv4ojTQDd91tOGeP",
+  "sort": 0,
+  "_key": "!items!iv4ojTQDd91tOGeP"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Double_Flail_tRqpSGHIIDCBS7sN.json b/src/packs/items/weapons/weapon_Double_Flail_9U7Q69SA2V4WtlyE.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Double_Flail_tRqpSGHIIDCBS7sN.json
rename to src/packs/items/weapons/weapon_Double_Flail_9U7Q69SA2V4WtlyE.json
index 66ce6914..a90dfb30 100644
--- a/src/packs/items/weapons/tier3/weapon_Double_Flail_tRqpSGHIIDCBS7sN.json
+++ b/src/packs/items/weapons/weapon_Double_Flail_9U7Q69SA2V4WtlyE.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/double_flail.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "agility",
     "range": "veryClose",
     "burden": "twoHanded",
-    "feature": "powerful"
+    "feature": "powerful",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009691193,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717495519,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "tRqpSGHIIDCBS7sN",
-  "sort": 2200000,
-  "_key": "!items!tRqpSGHIIDCBS7sN"
+  "_id": "9U7Q69SA2V4WtlyE",
+  "sort": 2800000,
+  "_key": "!items!9U7Q69SA2V4WtlyE"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Dual_Ended_Sword_kmSom1Srz8I3CXsh.json b/src/packs/items/weapons/weapon_Dual_Ended_Sword_wT0yIYoQmgXgUyhO.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Dual_Ended_Sword_kmSom1Srz8I3CXsh.json
rename to src/packs/items/weapons/weapon_Dual_Ended_Sword_wT0yIYoQmgXgUyhO.json
index e353f593..f8909d74 100644
--- a/src/packs/items/weapons/tier4/weapon_Dual_Ended_Sword_kmSom1Srz8I3CXsh.json
+++ b/src/packs/items/weapons/weapon_Dual_Ended_Sword_wT0yIYoQmgXgUyhO.json
@@ -1,10 +1,8 @@
 {
   "name": "Dual-Ended Sword",
   "type": "weapon",
-  "_id": "kmSom1Srz8I3CXsh",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/dual-ended_sword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "agility",
     "feature": "quick",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035869264,
-    "modifiedTime": 1748035890591,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717532363,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!kmSom1Srz8I3CXsh"
+  "_id": "wT0yIYoQmgXgUyhO",
+  "sort": 3600000,
+  "_key": "!items!wT0yIYoQmgXgUyhO"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Dualstaff_GTEiHJ5Qvn99m4Os.json b/src/packs/items/weapons/weapon_Dualstaff_953Q2rTuxkAuNhyh.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Dualstaff_GTEiHJ5Qvn99m4Os.json
rename to src/packs/items/weapons/weapon_Dualstaff_953Q2rTuxkAuNhyh.json
index 2a56c9f3..456c4550 100644
--- a/src/packs/items/weapons/tier1/weapon_Dualstaff_GTEiHJ5Qvn99m4Os.json
+++ b/src/packs/items/weapons/weapon_Dualstaff_953Q2rTuxkAuNhyh.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/magical/dualstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "instinct",
     "range": "far",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009462631,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717306841,
+    "modifiedTime": 1748717306841,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "GTEiHJ5Qvn99m4Os",
-  "sort": 600000,
-  "_key": "!items!GTEiHJ5Qvn99m4Os"
+  "_id": "953Q2rTuxkAuNhyh",
+  "sort": 0,
+  "_key": "!items!953Q2rTuxkAuNhyh"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Ego_Blade_v2x2UxypzWdGpxeI.json b/src/packs/items/weapons/weapon_Ego_Blade_wiud7JWoMilk2KQN.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Ego_Blade_v2x2UxypzWdGpxeI.json
rename to src/packs/items/weapons/weapon_Ego_Blade_wiud7JWoMilk2KQN.json
index b25a9252..da564bc1 100644
--- a/src/packs/items/weapons/tier2/weapon_Ego_Blade_v2x2UxypzWdGpxeI.json
+++ b/src/packs/items/weapons/weapon_Ego_Blade_wiud7JWoMilk2KQN.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/ego_blade.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "agility",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "pompous"
+    "feature": "pompous",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009542183,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717381040,
+    "modifiedTime": 1748717381040,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "v2x2UxypzWdGpxeI",
-  "sort": 600000,
-  "_key": "!items!v2x2UxypzWdGpxeI"
+  "_id": "wiud7JWoMilk2KQN",
+  "sort": 0,
+  "_key": "!items!wiud7JWoMilk2KQN"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Elder_Bow_6YGoaFlUgzLZ7h7v.json b/src/packs/items/weapons/weapon_Elder_Bow_rgUz50aNrRn9poGf.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Elder_Bow_6YGoaFlUgzLZ7h7v.json
rename to src/packs/items/weapons/weapon_Elder_Bow_rgUz50aNrRn9poGf.json
index 6f23da5d..5d7336a2 100644
--- a/src/packs/items/weapons/tier2/weapon_Elder_Bow_6YGoaFlUgzLZ7h7v.json
+++ b/src/packs/items/weapons/weapon_Elder_Bow_rgUz50aNrRn9poGf.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/elder_bow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "instinct",
     "range": "far",
     "burden": "twoHanded",
-    "feature": "powerful"
+    "feature": "powerful",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009541351,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717382547,
+    "modifiedTime": 1748717382547,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "6YGoaFlUgzLZ7h7v",
-  "sort": 500000,
-  "_key": "!items!6YGoaFlUgzLZ7h7v"
+  "_id": "rgUz50aNrRn9poGf",
+  "sort": 0,
+  "_key": "!items!rgUz50aNrRn9poGf"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Extended_Polearm_cIc4kCK0qET1ilvM.json b/src/packs/items/weapons/weapon_Extended_Polearm_Yg3WZZq6jgAn9xED.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Extended_Polearm_cIc4kCK0qET1ilvM.json
rename to src/packs/items/weapons/weapon_Extended_Polearm_Yg3WZZq6jgAn9xED.json
index c7ac045f..e8021932 100644
--- a/src/packs/items/weapons/tier4/weapon_Extended_Polearm_cIc4kCK0qET1ilvM.json
+++ b/src/packs/items/weapons/weapon_Extended_Polearm_Yg3WZZq6jgAn9xED.json
@@ -1,10 +1,8 @@
 {
   "name": "Extended Polearm",
   "type": "weapon",
-  "_id": "cIc4kCK0qET1ilvM",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/extended_polearm.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "finesse",
     "feature": "long",
     "range": "veryClose",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748036008663,
-    "modifiedTime": 1748036132678,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717533153,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!cIc4kCK0qET1ilvM"
+  "_id": "Yg3WZZq6jgAn9xED",
+  "sort": 3000000,
+  "_key": "!items!Yg3WZZq6jgAn9xED"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Finehair_Bow_7pALPrsv0dqzRGCV.json b/src/packs/items/weapons/weapon_Finehair_Bow_KocXOIOSVFazOqFh.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Finehair_Bow_7pALPrsv0dqzRGCV.json
rename to src/packs/items/weapons/weapon_Finehair_Bow_KocXOIOSVFazOqFh.json
index 8b201106..c29fb816 100644
--- a/src/packs/items/weapons/tier2/weapon_Finehair_Bow_7pALPrsv0dqzRGCV.json
+++ b/src/packs/items/weapons/weapon_Finehair_Bow_KocXOIOSVFazOqFh.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/finehair_bow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "agility",
     "range": "veryFar",
     "burden": "twoHanded",
-    "feature": "reliable"
+    "feature": "reliable",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009540474,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717383959,
+    "modifiedTime": 1748717383959,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "7pALPrsv0dqzRGCV",
-  "sort": 400000,
-  "_key": "!items!7pALPrsv0dqzRGCV"
+  "_id": "KocXOIOSVFazOqFh",
+  "sort": 0,
+  "_key": "!items!KocXOIOSVFazOqFh"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Firestaff_jeLL7YLCvzDo2MyT.json b/src/packs/items/weapons/weapon_Firestaff_0jQunbQG1LnTRdOI.json
similarity index 69%
rename from src/packs/items/weapons/tier3/weapon_Firestaff_jeLL7YLCvzDo2MyT.json
rename to src/packs/items/weapons/weapon_Firestaff_0jQunbQG1LnTRdOI.json
index 6756fac4..612729b5 100644
--- a/src/packs/items/weapons/tier3/weapon_Firestaff_jeLL7YLCvzDo2MyT.json
+++ b/src/packs/items/weapons/weapon_Firestaff_0jQunbQG1LnTRdOI.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/firestaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,15 @@
     "trait": "instinct",
     "range": "far",
     "burden": "twoHanded",
-    "feature": "burn"
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009689947,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717500707,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "jeLL7YLCvzDo2MyT",
-  "sort": 2100000,
-  "_key": "!items!jeLL7YLCvzDo2MyT"
+  "_id": "0jQunbQG1LnTRdOI",
+  "sort": 1700000,
+  "_key": "!items!0jQunbQG1LnTRdOI"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Flickerfly_Blade_QTvf9KZeK567PClS.json b/src/packs/items/weapons/weapon_Flickerfly_Blade_QGAvPrLPWHJWcAV1.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Flickerfly_Blade_QTvf9KZeK567PClS.json
rename to src/packs/items/weapons/weapon_Flickerfly_Blade_QGAvPrLPWHJWcAV1.json
index 68a4a4b9..e0108d7b 100644
--- a/src/packs/items/weapons/tier3/weapon_Flickerfly_Blade_QTvf9KZeK567PClS.json
+++ b/src/packs/items/weapons/weapon_Flickerfly_Blade_QGAvPrLPWHJWcAV1.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/flickerfly_blade.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "agility",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "sheltering"
+    "feature": "sheltering",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009688811,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717501586,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "QTvf9KZeK567PClS",
-  "sort": 2900000,
-  "_key": "!items!QTvf9KZeK567PClS"
+  "_id": "QGAvPrLPWHJWcAV1",
+  "sort": 100000,
+  "_key": "!items!QGAvPrLPWHJWcAV1"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Floating_Bladeshards_1HBqL3gwZNSwCBFL.json b/src/packs/items/weapons/weapon_Floating_Bladeshards_arBh0DEfg5X9TJbn.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Floating_Bladeshards_1HBqL3gwZNSwCBFL.json
rename to src/packs/items/weapons/weapon_Floating_Bladeshards_arBh0DEfg5X9TJbn.json
index 2ecac1c9..3bdb4c54 100644
--- a/src/packs/items/weapons/tier4/weapon_Floating_Bladeshards_1HBqL3gwZNSwCBFL.json
+++ b/src/packs/items/weapons/weapon_Floating_Bladeshards_arBh0DEfg5X9TJbn.json
@@ -1,10 +1,8 @@
 {
   "name": "Floating Bladeshards",
   "type": "weapon",
-  "_id": "1HBqL3gwZNSwCBFL",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/floating_bladeshards.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "instinct",
     "feature": "powerful",
     "range": "close",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748037994398,
-    "modifiedTime": 1748038014447,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717533904,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!1HBqL3gwZNSwCBFL"
+  "_id": "arBh0DEfg5X9TJbn",
+  "sort": 3200000,
+  "_key": "!items!arBh0DEfg5X9TJbn"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Fusion_Gloves_XcJce4ZCzXkhirza.json b/src/packs/items/weapons/weapon_Fusion_Gloves_Rj1eYiu6BPp58xn2.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Fusion_Gloves_XcJce4ZCzXkhirza.json
rename to src/packs/items/weapons/weapon_Fusion_Gloves_Rj1eYiu6BPp58xn2.json
index aa6bf1fd..f390e89a 100644
--- a/src/packs/items/weapons/tier4/weapon_Fusion_Gloves_XcJce4ZCzXkhirza.json
+++ b/src/packs/items/weapons/weapon_Fusion_Gloves_Rj1eYiu6BPp58xn2.json
@@ -1,10 +1,8 @@
 {
   "name": "Fusion Gloves",
   "type": "weapon",
-  "_id": "XcJce4ZCzXkhirza",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/fusion_gloves.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "knowledge",
     "feature": "bonded",
     "range": "veryFar",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748038283403,
-    "modifiedTime": 1748038307993,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717535412,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!XcJce4ZCzXkhirza"
+  "_id": "Rj1eYiu6BPp58xn2",
+  "sort": 3300000,
+  "_key": "!items!Rj1eYiu6BPp58xn2"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Ghostblade_yAszCKtIlBieTuth.json b/src/packs/items/weapons/weapon_Ghostblade_QzymDpCD7NMbLlpu.json
similarity index 69%
rename from src/packs/items/weapons/tier3/weapon_Ghostblade_yAszCKtIlBieTuth.json
rename to src/packs/items/weapons/weapon_Ghostblade_QzymDpCD7NMbLlpu.json
index 7c2f72b1..641fb2d3 100644
--- a/src/packs/items/weapons/tier3/weapon_Ghostblade_yAszCKtIlBieTuth.json
+++ b/src/packs/items/weapons/weapon_Ghostblade_QzymDpCD7NMbLlpu.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/ghostblade.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,15 @@
     "trait": "presence",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "otherwordly"
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009688005,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717502573,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "yAszCKtIlBieTuth",
-  "sort": 3300000,
-  "_key": "!items!yAszCKtIlBieTuth"
+  "_id": "QzymDpCD7NMbLlpu",
+  "sort": 200000,
+  "_key": "!items!QzymDpCD7NMbLlpu"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Gilded_Bow_mqtFoVo5umeCJ3g4.json b/src/packs/items/weapons/weapon_Gilded_Bow_XONn2rH8NyZbXi68.json
similarity index 69%
rename from src/packs/items/weapons/tier3/weapon_Gilded_Bow_mqtFoVo5umeCJ3g4.json
rename to src/packs/items/weapons/weapon_Gilded_Bow_XONn2rH8NyZbXi68.json
index 8ddaeb97..bc6bf2c6 100644
--- a/src/packs/items/weapons/tier3/weapon_Gilded_Bow_mqtFoVo5umeCJ3g4.json
+++ b/src/packs/items/weapons/weapon_Gilded_Bow_XONn2rH8NyZbXi68.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/guilded_bow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,15 @@
     "trait": "finesse",
     "range": "far",
     "burden": "twoHanded",
-    "feature": "selfCorrecting"
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009687074,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717503716,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "mqtFoVo5umeCJ3g4",
-  "sort": 3200000,
-  "_key": "!items!mqtFoVo5umeCJ3g4"
+  "_id": "XONn2rH8NyZbXi68",
+  "sort": 300000,
+  "_key": "!items!XONn2rH8NyZbXi68"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Gilded_Falchion_Pp2tAzb5hOip0zyi.json b/src/packs/items/weapons/weapon_Gilded_Falchion_ZOL4O7BqmcmYHfjY.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Gilded_Falchion_Pp2tAzb5hOip0zyi.json
rename to src/packs/items/weapons/weapon_Gilded_Falchion_ZOL4O7BqmcmYHfjY.json
index e63c5710..dfd58243 100644
--- a/src/packs/items/weapons/tier2/weapon_Gilded_Falchion_Pp2tAzb5hOip0zyi.json
+++ b/src/packs/items/weapons/weapon_Gilded_Falchion_ZOL4O7BqmcmYHfjY.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/gilded_falchion.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "powerful"
+    "feature": "powerful",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009539372,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717385831,
+    "modifiedTime": 1748717385831,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "Pp2tAzb5hOip0zyi",
-  "sort": 200000,
-  "_key": "!items!Pp2tAzb5hOip0zyi"
+  "_id": "ZOL4O7BqmcmYHfjY",
+  "sort": 0,
+  "_key": "!items!ZOL4O7BqmcmYHfjY"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Glowing_Rings_vRQGEHauOXXVhsjX.json b/src/packs/items/weapons/weapon_Glowing_Rings_4Mjzmyvjwhq3mm6l.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Glowing_Rings_vRQGEHauOXXVhsjX.json
rename to src/packs/items/weapons/weapon_Glowing_Rings_4Mjzmyvjwhq3mm6l.json
index 5b8a7a02..747ae64b 100644
--- a/src/packs/items/weapons/tier1/weapon_Glowing_Rings_vRQGEHauOXXVhsjX.json
+++ b/src/packs/items/weapons/weapon_Glowing_Rings_4Mjzmyvjwhq3mm6l.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/magical/glowing_rings.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "agility",
     "range": "veryClose",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009461747,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717308235,
+    "modifiedTime": 1748717308235,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "vRQGEHauOXXVhsjX",
-  "sort": 500000,
-  "_key": "!items!vRQGEHauOXXVhsjX"
+  "_id": "4Mjzmyvjwhq3mm6l",
+  "sort": 0,
+  "_key": "!items!4Mjzmyvjwhq3mm6l"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Greatbow_yNZ6ZqtGKtPvqPxu.json b/src/packs/items/weapons/weapon_Greatbow_cxBpxu3X2bNs8HN4.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Greatbow_yNZ6ZqtGKtPvqPxu.json
rename to src/packs/items/weapons/weapon_Greatbow_cxBpxu3X2bNs8HN4.json
index 47b0fc24..69cb6dd3 100644
--- a/src/packs/items/weapons/tier2/weapon_Greatbow_yNZ6ZqtGKtPvqPxu.json
+++ b/src/packs/items/weapons/weapon_Greatbow_cxBpxu3X2bNs8HN4.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/greatbow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "far",
     "burden": "twoHanded",
-    "feature": "powerful"
+    "feature": "powerful",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009537355,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717387209,
+    "modifiedTime": 1748717387209,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "yNZ6ZqtGKtPvqPxu",
-  "sort": 100000,
-  "_key": "!items!yNZ6ZqtGKtPvqPxu"
+  "_id": "cxBpxu3X2bNs8HN4",
+  "sort": 0,
+  "_key": "!items!cxBpxu3X2bNs8HN4"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Greatstaff_GRZIvEb2ZFmYw50B.json b/src/packs/items/weapons/weapon_Greatstaff_AYSnrvAX0IgbexFI.json
similarity index 68%
rename from src/packs/items/weapons/tier1/weapon_Greatstaff_GRZIvEb2ZFmYw50B.json
rename to src/packs/items/weapons/weapon_Greatstaff_AYSnrvAX0IgbexFI.json
index 45a27cda..10cd56d1 100644
--- a/src/packs/items/weapons/tier1/weapon_Greatstaff_GRZIvEb2ZFmYw50B.json
+++ b/src/packs/items/weapons/weapon_Greatstaff_AYSnrvAX0IgbexFI.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/magical/greatstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "knowledge",
     "range": "veryFar",
     "burden": "twoHanded",
-    "feature": "powerful"
+    "feature": "powerful",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009460779,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717309498,
+    "modifiedTime": 1748717309498,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "GRZIvEb2ZFmYw50B",
-  "sort": 400000,
-  "_key": "!items!GRZIvEb2ZFmYw50B"
+  "_id": "AYSnrvAX0IgbexFI",
+  "sort": 0,
+  "_key": "!items!AYSnrvAX0IgbexFI"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Greatsword_9Vy0YJHNVee1tYvN.json b/src/packs/items/weapons/weapon_Greatsword_GsRLkQG13xoPc7kq.json
similarity index 68%
rename from src/packs/items/weapons/tier1/weapon_Greatsword_9Vy0YJHNVee1tYvN.json
rename to src/packs/items/weapons/weapon_Greatsword_GsRLkQG13xoPc7kq.json
index 1f7eb1ae..3190cb87 100644
--- a/src/packs/items/weapons/tier1/weapon_Greatsword_9Vy0YJHNVee1tYvN.json
+++ b/src/packs/items/weapons/weapon_Greatsword_GsRLkQG13xoPc7kq.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/greatsword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "melee",
     "burden": "twoHanded",
-    "feature": "massive"
+    "feature": "massive",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009459689,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717311128,
+    "modifiedTime": 1748717311128,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "9Vy0YJHNVee1tYvN",
-  "sort": 200000,
-  "_key": "!items!9Vy0YJHNVee1tYvN"
+  "_id": "GsRLkQG13xoPc7kq",
+  "sort": 0,
+  "_key": "!items!GsRLkQG13xoPc7kq"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Halberd_SCi1BGjkp85nrCah.json b/src/packs/items/weapons/weapon_Halberd_0SlckjJMb30R5ErF.json
similarity index 68%
rename from src/packs/items/weapons/tier1/weapon_Halberd_SCi1BGjkp85nrCah.json
rename to src/packs/items/weapons/weapon_Halberd_0SlckjJMb30R5ErF.json
index bbf5e10e..6e805337 100644
--- a/src/packs/items/weapons/tier1/weapon_Halberd_SCi1BGjkp85nrCah.json
+++ b/src/packs/items/weapons/weapon_Halberd_0SlckjJMb30R5ErF.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/halberd.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "veryClose",
     "burden": "twoHanded",
-    "feature": "cumbersome"
+    "feature": "cumbersome",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009457587,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717312672,
+    "modifiedTime": 1748717312672,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "SCi1BGjkp85nrCah",
-  "sort": 100000,
-  "_key": "!items!SCi1BGjkp85nrCah"
+  "_id": "0SlckjJMb30R5ErF",
+  "sort": 0,
+  "_key": "!items!0SlckjJMb30R5ErF"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Hallowed_Axe_s6dHJKCQdS6QPKsf.json b/src/packs/items/weapons/weapon_Hallowed_Axe_WckoUxyJZfvq9cR7.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Hallowed_Axe_s6dHJKCQdS6QPKsf.json
rename to src/packs/items/weapons/weapon_Hallowed_Axe_WckoUxyJZfvq9cR7.json
index b4c51593..963009de 100644
--- a/src/packs/items/weapons/tier1/weapon_Hallowed_Axe_s6dHJKCQdS6QPKsf.json
+++ b/src/packs/items/weapons/weapon_Hallowed_Axe_WckoUxyJZfvq9cR7.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/magical/hallowed_axe.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "strength",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009456582,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717314116,
+    "modifiedTime": 1748717314116,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "s6dHJKCQdS6QPKsf",
-  "sort": 1200000,
-  "_key": "!items!s6dHJKCQdS6QPKsf"
+  "_id": "WckoUxyJZfvq9cR7",
+  "sort": 0,
+  "_key": "!items!WckoUxyJZfvq9cR7"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Hammer_of_Exota_X1DHoD7sHb9v27p0.json b/src/packs/items/weapons/weapon_Hammer_of_Exota_p889rprb5FMsSlK5.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Hammer_of_Exota_X1DHoD7sHb9v27p0.json
rename to src/packs/items/weapons/weapon_Hammer_of_Exota_p889rprb5FMsSlK5.json
index d6684b4a..7638fd22 100644
--- a/src/packs/items/weapons/tier2/weapon_Hammer_of_Exota_X1DHoD7sHb9v27p0.json
+++ b/src/packs/items/weapons/weapon_Hammer_of_Exota_p889rprb5FMsSlK5.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/hammer_of_exota.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "instinct",
     "range": "melee",
     "burden": "twoHanded",
-    "feature": "eruptive"
+    "feature": "eruptive",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009536388,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717388704,
+    "modifiedTime": 1748717388704,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "X1DHoD7sHb9v27p0",
-  "sort": 900000,
-  "_key": "!items!X1DHoD7sHb9v27p0"
+  "_id": "p889rprb5FMsSlK5",
+  "sort": 0,
+  "_key": "!items!p889rprb5FMsSlK5"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Hammer_of_Wrath_g9EKWZaHZfuU5Yha.json b/src/packs/items/weapons/weapon_Hammer_of_Wrath_cHrHkq7AwYk34ach.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Hammer_of_Wrath_g9EKWZaHZfuU5Yha.json
rename to src/packs/items/weapons/weapon_Hammer_of_Wrath_cHrHkq7AwYk34ach.json
index b30018ff..618e6497 100644
--- a/src/packs/items/weapons/tier3/weapon_Hammer_of_Wrath_g9EKWZaHZfuU5Yha.json
+++ b/src/packs/items/weapons/weapon_Hammer_of_Wrath_cHrHkq7AwYk34ach.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/hammer_of_wrath.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "melee",
     "burden": "twoHanded",
-    "feature": "devastating"
+    "feature": "devastating",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009686240,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717504678,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "g9EKWZaHZfuU5Yha",
-  "sort": 3100000,
-  "_key": "!items!g9EKWZaHZfuU5Yha"
+  "_id": "cHrHkq7AwYk34ach",
+  "sort": 400000,
+  "_key": "!items!cHrHkq7AwYk34ach"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Hand_Cannon_R8xE9WZ9iPV6Z1gX.json b/src/packs/items/weapons/weapon_Hand_Cannon_4tAGYqfm0fsSncr4.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Hand_Cannon_R8xE9WZ9iPV6Z1gX.json
rename to src/packs/items/weapons/weapon_Hand_Cannon_4tAGYqfm0fsSncr4.json
index f196d58a..cba099a4 100644
--- a/src/packs/items/weapons/tier4/weapon_Hand_Cannon_R8xE9WZ9iPV6Z1gX.json
+++ b/src/packs/items/weapons/weapon_Hand_Cannon_4tAGYqfm0fsSncr4.json
@@ -1,10 +1,8 @@
 {
   "name": "Hand Cannon",
   "type": "weapon",
-  "_id": "R8xE9WZ9iPV6Z1gX",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/hand_cannon.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "finesse",
     "feature": "reloading",
     "range": "veryFar",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748036236804,
-    "modifiedTime": 1748036255361,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717536259,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!R8xE9WZ9iPV6Z1gX"
+  "_id": "4tAGYqfm0fsSncr4",
+  "sort": 3100000,
+  "_key": "!items!4tAGYqfm0fsSncr4"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Hand_Runes_JUCgEbB0PRyViFMc.json b/src/packs/items/weapons/weapon_Hand_Runes_mPaKupCQhJzS5wMc.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Hand_Runes_JUCgEbB0PRyViFMc.json
rename to src/packs/items/weapons/weapon_Hand_Runes_mPaKupCQhJzS5wMc.json
index 72d9b275..770f5589 100644
--- a/src/packs/items/weapons/tier1/weapon_Hand_Runes_JUCgEbB0PRyViFMc.json
+++ b/src/packs/items/weapons/weapon_Hand_Runes_mPaKupCQhJzS5wMc.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/magical/hand_runes.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "instinct",
     "range": "veryClose",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009455636,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717315723,
+    "modifiedTime": 1748717315723,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "JUCgEbB0PRyViFMc",
-  "sort": 1600000,
-  "_key": "!items!JUCgEbB0PRyViFMc"
+  "_id": "mPaKupCQhJzS5wMc",
+  "sort": 0,
+  "_key": "!items!mPaKupCQhJzS5wMc"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Ilmari_s_Rifle_zVMZvitG5ESNBxjm.json b/src/packs/items/weapons/weapon_Ilmari_s_Rifle_qGH3VFuBQV8DGhPd.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Ilmari_s_Rifle_zVMZvitG5ESNBxjm.json
rename to src/packs/items/weapons/weapon_Ilmari_s_Rifle_qGH3VFuBQV8DGhPd.json
index eb32c859..e1b6da69 100644
--- a/src/packs/items/weapons/tier3/weapon_Ilmari_s_Rifle_zVMZvitG5ESNBxjm.json
+++ b/src/packs/items/weapons/weapon_Ilmari_s_Rifle_qGH3VFuBQV8DGhPd.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/ilmaris_rifle.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "finesse",
     "range": "veryFar",
     "burden": "oneHanded",
-    "feature": "reloading"
+    "feature": "reloading",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009685440,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717505646,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "zVMZvitG5ESNBxjm",
-  "sort": 3000000,
-  "_key": "!items!zVMZvitG5ESNBxjm"
+  "_id": "qGH3VFuBQV8DGhPd",
+  "sort": 500000,
+  "_key": "!items!qGH3VFuBQV8DGhPd"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Impact_Gauntlet_kI8Fw82maQYBiuKO.json b/src/packs/items/weapons/weapon_Impact_Gauntlet_H73r7YuOkVmAgIci.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Impact_Gauntlet_kI8Fw82maQYBiuKO.json
rename to src/packs/items/weapons/weapon_Impact_Gauntlet_H73r7YuOkVmAgIci.json
index 023f64c1..be332871 100644
--- a/src/packs/items/weapons/tier4/weapon_Impact_Gauntlet_kI8Fw82maQYBiuKO.json
+++ b/src/packs/items/weapons/weapon_Impact_Gauntlet_H73r7YuOkVmAgIci.json
@@ -1,10 +1,8 @@
 {
   "name": "Impact Gauntlet",
   "type": "weapon",
-  "_id": "kI8Fw82maQYBiuKO",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/impact_gauntlet.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "strength",
     "feature": "concussive",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035900679,
-    "modifiedTime": 1748035920680,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717537244,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!kI8Fw82maQYBiuKO"
+  "_id": "H73r7YuOkVmAgIci",
+  "sort": 2500000,
+  "_key": "!items!H73r7YuOkVmAgIci"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Arcane_Gauntlets_GZ6OxXjA4OBPxV1F.json b/src/packs/items/weapons/weapon_Improved_Arcane_Gauntlets_CTkuKjwWfrvmmRvH.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Arcane_Gauntlets_GZ6OxXjA4OBPxV1F.json
rename to src/packs/items/weapons/weapon_Improved_Arcane_Gauntlets_CTkuKjwWfrvmmRvH.json
index 4c9b1079..a19b0b49 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Arcane_Gauntlets_GZ6OxXjA4OBPxV1F.json
+++ b/src/packs/items/weapons/weapon_Improved_Arcane_Gauntlets_CTkuKjwWfrvmmRvH.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/improved_arcane_gauntlets.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "strength",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009535552,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717390549,
+    "modifiedTime": 1748717390549,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "GZ6OxXjA4OBPxV1F",
-  "sort": 1200000,
-  "_key": "!items!GZ6OxXjA4OBPxV1F"
+  "_id": "CTkuKjwWfrvmmRvH",
+  "sort": 0,
+  "_key": "!items!CTkuKjwWfrvmmRvH"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Battleaxe_vCBROhfmKwXzgY9G.json b/src/packs/items/weapons/weapon_Improved_Battleaxe_c6ss8Ydb5ydmLsnO.json
similarity index 67%
rename from src/packs/items/weapons/tier2/weapon_Improved_Battleaxe_vCBROhfmKwXzgY9G.json
rename to src/packs/items/weapons/weapon_Improved_Battleaxe_c6ss8Ydb5ydmLsnO.json
index d98515c9..1cd64b77 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Battleaxe_vCBROhfmKwXzgY9G.json
+++ b/src/packs/items/weapons/weapon_Improved_Battleaxe_c6ss8Ydb5ydmLsnO.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_battleaxe.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "strength",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009534822,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717392247,
+    "modifiedTime": 1748717392247,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "vCBROhfmKwXzgY9G",
-  "sort": 1100000,
-  "_key": "!items!vCBROhfmKwXzgY9G"
+  "_id": "c6ss8Ydb5ydmLsnO",
+  "sort": 0,
+  "_key": "!items!c6ss8Ydb5ydmLsnO"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Broadsword_h6KrDyeyEGwZYm4z.json b/src/packs/items/weapons/weapon_Improved_Broadsword_lXRVCITpGlXF3sOw.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Broadsword_h6KrDyeyEGwZYm4z.json
rename to src/packs/items/weapons/weapon_Improved_Broadsword_lXRVCITpGlXF3sOw.json
index eb6e802c..d05328d0 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Broadsword_h6KrDyeyEGwZYm4z.json
+++ b/src/packs/items/weapons/weapon_Improved_Broadsword_lXRVCITpGlXF3sOw.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_broadsword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "agility",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "reliable"
+    "feature": "reliable",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009534024,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717394086,
+    "modifiedTime": 1748717394086,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "h6KrDyeyEGwZYm4z",
-  "sort": 1000000,
-  "_key": "!items!h6KrDyeyEGwZYm4z"
+  "_id": "lXRVCITpGlXF3sOw",
+  "sort": 0,
+  "_key": "!items!lXRVCITpGlXF3sOw"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Crossbow_Me2aEKQzEHMl5CiG.json b/src/packs/items/weapons/weapon_Improved_Crossbow_TSvPCik6v3UYqr9f.json
similarity index 67%
rename from src/packs/items/weapons/tier2/weapon_Improved_Crossbow_Me2aEKQzEHMl5CiG.json
rename to src/packs/items/weapons/weapon_Improved_Crossbow_TSvPCik6v3UYqr9f.json
index 55de8bab..7ce693d6 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Crossbow_Me2aEKQzEHMl5CiG.json
+++ b/src/packs/items/weapons/weapon_Improved_Crossbow_TSvPCik6v3UYqr9f.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_crossbow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "finesse",
     "range": "far",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009532416,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717395774,
+    "modifiedTime": 1748717395774,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "Me2aEKQzEHMl5CiG",
-  "sort": 800000,
-  "_key": "!items!Me2aEKQzEHMl5CiG"
+  "_id": "TSvPCik6v3UYqr9f",
+  "sort": 0,
+  "_key": "!items!TSvPCik6v3UYqr9f"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Cutlass_qswhdn7ncrLwpJ4I.json b/src/packs/items/weapons/weapon_Improved_Cutlass_sCuu0hIzsdWowP4h.json
similarity index 67%
rename from src/packs/items/weapons/tier2/weapon_Improved_Cutlass_qswhdn7ncrLwpJ4I.json
rename to src/packs/items/weapons/weapon_Improved_Cutlass_sCuu0hIzsdWowP4h.json
index fdb5c454..964ccb86 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Cutlass_qswhdn7ncrLwpJ4I.json
+++ b/src/packs/items/weapons/weapon_Improved_Cutlass_sCuu0hIzsdWowP4h.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_cutlass.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "presence",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009531622,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717397513,
+    "modifiedTime": 1748717397513,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "qswhdn7ncrLwpJ4I",
-  "sort": 700000,
-  "_key": "!items!qswhdn7ncrLwpJ4I"
+  "_id": "sCuu0hIzsdWowP4h",
+  "sort": 0,
+  "_key": "!items!sCuu0hIzsdWowP4h"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Dagger_aBM1qoaOGCTmytB8.json b/src/packs/items/weapons/weapon_Improved_Dagger_qyMnZ5uJTeqgiEPb.json
similarity index 67%
rename from src/packs/items/weapons/tier2/weapon_Improved_Dagger_aBM1qoaOGCTmytB8.json
rename to src/packs/items/weapons/weapon_Improved_Dagger_qyMnZ5uJTeqgiEPb.json
index b0006c04..6e50b531 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Dagger_aBM1qoaOGCTmytB8.json
+++ b/src/packs/items/weapons/weapon_Improved_Dagger_qyMnZ5uJTeqgiEPb.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_dagger.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "finesse",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009530754,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717399443,
+    "modifiedTime": 1748717399443,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "aBM1qoaOGCTmytB8",
-  "sort": 1600000,
-  "_key": "!items!aBM1qoaOGCTmytB8"
+  "_id": "qyMnZ5uJTeqgiEPb",
+  "sort": 0,
+  "_key": "!items!qyMnZ5uJTeqgiEPb"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Dualstaff_ft68IExN2tPWiP87.json b/src/packs/items/weapons/weapon_Improved_Dualstaff_wNB9Uyl3aY842K9p.json
similarity index 67%
rename from src/packs/items/weapons/tier2/weapon_Improved_Dualstaff_ft68IExN2tPWiP87.json
rename to src/packs/items/weapons/weapon_Improved_Dualstaff_wNB9Uyl3aY842K9p.json
index ec3ab07b..e3adee4f 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Dualstaff_ft68IExN2tPWiP87.json
+++ b/src/packs/items/weapons/weapon_Improved_Dualstaff_wNB9Uyl3aY842K9p.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/improved_dualstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "instinct",
     "range": "far",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009529809,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717401150,
+    "modifiedTime": 1748717401150,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "ft68IExN2tPWiP87",
-  "sort": 2000000,
-  "_key": "!items!ft68IExN2tPWiP87"
+  "_id": "wNB9Uyl3aY842K9p",
+  "sort": 0,
+  "_key": "!items!wNB9Uyl3aY842K9p"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Glowing_Rings_82pBMYukFn0rqvRc.json b/src/packs/items/weapons/weapon_Improved_Glowing_Rings_9jzi0f7MOL3Ot1tj.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Glowing_Rings_82pBMYukFn0rqvRc.json
rename to src/packs/items/weapons/weapon_Improved_Glowing_Rings_9jzi0f7MOL3Ot1tj.json
index 031cedba..6e24544f 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Glowing_Rings_82pBMYukFn0rqvRc.json
+++ b/src/packs/items/weapons/weapon_Improved_Glowing_Rings_9jzi0f7MOL3Ot1tj.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/improved_glowing_rings.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "agility",
     "range": "veryClose",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009527917,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717403044,
+    "modifiedTime": 1748717403044,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "82pBMYukFn0rqvRc",
-  "sort": 1900000,
-  "_key": "!items!82pBMYukFn0rqvRc"
+  "_id": "9jzi0f7MOL3Ot1tj",
+  "sort": 0,
+  "_key": "!items!9jzi0f7MOL3Ot1tj"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Greatstaff_b5g5jR7aH2I2krs1.json b/src/packs/items/weapons/weapon_Improved_Greatstaff_rZEHNAwKW1vgS3Or.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Greatstaff_b5g5jR7aH2I2krs1.json
rename to src/packs/items/weapons/weapon_Improved_Greatstaff_rZEHNAwKW1vgS3Or.json
index 23cc5ffa..6a8a9e0c 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Greatstaff_b5g5jR7aH2I2krs1.json
+++ b/src/packs/items/weapons/weapon_Improved_Greatstaff_rZEHNAwKW1vgS3Or.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/improved_greatstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "knowledge",
     "range": "veryClose",
     "burden": "twoHanded",
-    "feature": "powerful"
+    "feature": "powerful",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009526945,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717405238,
+    "modifiedTime": 1748717405238,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "b5g5jR7aH2I2krs1",
-  "sort": 1800000,
-  "_key": "!items!b5g5jR7aH2I2krs1"
+  "_id": "rZEHNAwKW1vgS3Or",
+  "sort": 0,
+  "_key": "!items!rZEHNAwKW1vgS3Or"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Greatsword_aMYQY7T7nJpTHOjy.json b/src/packs/items/weapons/weapon_Improved_Greatsword_c1HtTqfS9OnNv1Bt.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Greatsword_aMYQY7T7nJpTHOjy.json
rename to src/packs/items/weapons/weapon_Improved_Greatsword_c1HtTqfS9OnNv1Bt.json
index 033c44e0..5cc7bd6c 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Greatsword_aMYQY7T7nJpTHOjy.json
+++ b/src/packs/items/weapons/weapon_Improved_Greatsword_c1HtTqfS9OnNv1Bt.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_greatsword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "melee",
     "burden": "twoHanded",
-    "feature": "massive"
+    "feature": "massive",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009526175,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717406944,
+    "modifiedTime": 1748717406944,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "aMYQY7T7nJpTHOjy",
-  "sort": 1700000,
-  "_key": "!items!aMYQY7T7nJpTHOjy"
+  "_id": "c1HtTqfS9OnNv1Bt",
+  "sort": 0,
+  "_key": "!items!c1HtTqfS9OnNv1Bt"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Halberd_9rhJEWn4xSTcerRq.json b/src/packs/items/weapons/weapon_Improved_Halberd_0i6CzOfsBoZjbuTZ.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Halberd_9rhJEWn4xSTcerRq.json
rename to src/packs/items/weapons/weapon_Improved_Halberd_0i6CzOfsBoZjbuTZ.json
index 7d2605ed..d8dc3027 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Halberd_9rhJEWn4xSTcerRq.json
+++ b/src/packs/items/weapons/weapon_Improved_Halberd_0i6CzOfsBoZjbuTZ.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_halberd.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "veryClose",
     "burden": "twoHanded",
-    "feature": "cumbersome"
+    "feature": "cumbersome",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009525423,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717408834,
+    "modifiedTime": 1748717408834,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "9rhJEWn4xSTcerRq",
-  "sort": 1500000,
-  "_key": "!items!9rhJEWn4xSTcerRq"
+  "_id": "0i6CzOfsBoZjbuTZ",
+  "sort": 0,
+  "_key": "!items!0i6CzOfsBoZjbuTZ"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Hallowed_Axe_Z3IziiiimIDR88wg.json b/src/packs/items/weapons/weapon_Improved_Hallowed_Axe_6zrrwIYQNa7gHhDA.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Hallowed_Axe_Z3IziiiimIDR88wg.json
rename to src/packs/items/weapons/weapon_Improved_Hallowed_Axe_6zrrwIYQNa7gHhDA.json
index 63417492..62771665 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Hallowed_Axe_Z3IziiiimIDR88wg.json
+++ b/src/packs/items/weapons/weapon_Improved_Hallowed_Axe_6zrrwIYQNa7gHhDA.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/improved_hallowed_axe.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "strength",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009524364,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717413816,
+    "modifiedTime": 1748717413816,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "Z3IziiiimIDR88wg",
-  "sort": 1400000,
-  "_key": "!items!Z3IziiiimIDR88wg"
+  "_id": "6zrrwIYQNa7gHhDA",
+  "sort": 0,
+  "_key": "!items!6zrrwIYQNa7gHhDA"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Hand_Runes_RSxE3zlycp4UMGs5.json b/src/packs/items/weapons/weapon_Improved_Hand_Runes_PlJj4nObc6zDVVIv.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Hand_Runes_RSxE3zlycp4UMGs5.json
rename to src/packs/items/weapons/weapon_Improved_Hand_Runes_PlJj4nObc6zDVVIv.json
index cb784d9a..7674b8cf 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Hand_Runes_RSxE3zlycp4UMGs5.json
+++ b/src/packs/items/weapons/weapon_Improved_Hand_Runes_PlJj4nObc6zDVVIv.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/improved_hand_runes.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "instinct",
     "range": "veryClose",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009522783,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717415774,
+    "modifiedTime": 1748717415774,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "RSxE3zlycp4UMGs5",
-  "sort": 1300000,
-  "_key": "!items!RSxE3zlycp4UMGs5"
+  "_id": "PlJj4nObc6zDVVIv",
+  "sort": 0,
+  "_key": "!items!PlJj4nObc6zDVVIv"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Longbow_W8PjOiQwZbL86YO4.json b/src/packs/items/weapons/weapon_Improved_Longbow_S9fPH89qdYHAygG5.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Longbow_W8PjOiQwZbL86YO4.json
rename to src/packs/items/weapons/weapon_Improved_Longbow_S9fPH89qdYHAygG5.json
index c4251733..4a2c263e 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Longbow_W8PjOiQwZbL86YO4.json
+++ b/src/packs/items/weapons/weapon_Improved_Longbow_S9fPH89qdYHAygG5.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_longbow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "agility",
     "range": "veryFar",
     "burden": "twoHanded",
-    "feature": "cumbersome"
+    "feature": "cumbersome",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009520552,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717417053,
+    "modifiedTime": 1748717417053,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "W8PjOiQwZbL86YO4",
-  "sort": 2400000,
-  "_key": "!items!W8PjOiQwZbL86YO4"
+  "_id": "S9fPH89qdYHAygG5",
+  "sort": 0,
+  "_key": "!items!S9fPH89qdYHAygG5"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Longsword_H5DuWNbmfUmdgxgk.json b/src/packs/items/weapons/weapon_Improved_Longsword_1sk01NDq0XVHAFpa.json
similarity index 67%
rename from src/packs/items/weapons/tier2/weapon_Improved_Longsword_H5DuWNbmfUmdgxgk.json
rename to src/packs/items/weapons/weapon_Improved_Longsword_1sk01NDq0XVHAFpa.json
index bac74318..726efa75 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Longsword_H5DuWNbmfUmdgxgk.json
+++ b/src/packs/items/weapons/weapon_Improved_Longsword_1sk01NDq0XVHAFpa.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_longsword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "agility",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009519715,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717418334,
+    "modifiedTime": 1748717418334,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "H5DuWNbmfUmdgxgk",
-  "sort": 2700000,
-  "_key": "!items!H5DuWNbmfUmdgxgk"
+  "_id": "1sk01NDq0XVHAFpa",
+  "sort": 0,
+  "_key": "!items!1sk01NDq0XVHAFpa"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Mace_NUFPD3bBflCztTw6.json b/src/packs/items/weapons/weapon_Improved_Mace_KwCBPCV9wFH9FuxZ.json
similarity index 67%
rename from src/packs/items/weapons/tier2/weapon_Improved_Mace_NUFPD3bBflCztTw6.json
rename to src/packs/items/weapons/weapon_Improved_Mace_KwCBPCV9wFH9FuxZ.json
index 6a514b92..aa11fb2c 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Mace_NUFPD3bBflCztTw6.json
+++ b/src/packs/items/weapons/weapon_Improved_Mace_KwCBPCV9wFH9FuxZ.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_mace.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "strength",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009518795,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717419874,
+    "modifiedTime": 1748717419874,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "NUFPD3bBflCztTw6",
-  "sort": 2600000,
-  "_key": "!items!NUFPD3bBflCztTw6"
+  "_id": "KwCBPCV9wFH9FuxZ",
+  "sort": 0,
+  "_key": "!items!KwCBPCV9wFH9FuxZ"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Quarterstaff_HxqNhfekSKGZ5lER.json b/src/packs/items/weapons/weapon_Improved_Quarterstaff_CgELEWAyG4ASDLZA.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Quarterstaff_HxqNhfekSKGZ5lER.json
rename to src/packs/items/weapons/weapon_Improved_Quarterstaff_CgELEWAyG4ASDLZA.json
index 191b969a..0edd000b 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Quarterstaff_HxqNhfekSKGZ5lER.json
+++ b/src/packs/items/weapons/weapon_Improved_Quarterstaff_CgELEWAyG4ASDLZA.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_quarterstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "instinct",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009517603,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717421307,
+    "modifiedTime": 1748717421307,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "HxqNhfekSKGZ5lER",
-  "sort": 2500000,
-  "_key": "!items!HxqNhfekSKGZ5lER"
+  "_id": "CgELEWAyG4ASDLZA",
+  "sort": 0,
+  "_key": "!items!CgELEWAyG4ASDLZA"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Rapier_llBQI4DjfJAadtE8.json b/src/packs/items/weapons/weapon_Improved_Rapier_BCUXoneSYSw0imXe.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Rapier_llBQI4DjfJAadtE8.json
rename to src/packs/items/weapons/weapon_Improved_Rapier_BCUXoneSYSw0imXe.json
index bd167408..46d31fc6 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Rapier_llBQI4DjfJAadtE8.json
+++ b/src/packs/items/weapons/weapon_Improved_Rapier_BCUXoneSYSw0imXe.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_rapier.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "presence",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "quick"
+    "feature": "quick",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009515586,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717422912,
+    "modifiedTime": 1748717422912,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "llBQI4DjfJAadtE8",
-  "sort": 2300000,
-  "_key": "!items!llBQI4DjfJAadtE8"
+  "_id": "BCUXoneSYSw0imXe",
+  "sort": 0,
+  "_key": "!items!BCUXoneSYSw0imXe"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Returning_Blade_G812F19Q4iK4Qmj6.json b/src/packs/items/weapons/weapon_Improved_Returning_Blade_YHlzVFpHVYyDJSwc.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Returning_Blade_G812F19Q4iK4Qmj6.json
rename to src/packs/items/weapons/weapon_Improved_Returning_Blade_YHlzVFpHVYyDJSwc.json
index a398446e..50e968bd 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Returning_Blade_G812F19Q4iK4Qmj6.json
+++ b/src/packs/items/weapons/weapon_Improved_Returning_Blade_YHlzVFpHVYyDJSwc.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/improved_returning_blade.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "finesse",
     "range": "close",
     "burden": "oneHanded",
-    "feature": "retractable"
+    "feature": "retractable",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009514599,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717424591,
+    "modifiedTime": 1748717424591,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "G812F19Q4iK4Qmj6",
-  "sort": 2200000,
-  "_key": "!items!G812F19Q4iK4Qmj6"
+  "_id": "YHlzVFpHVYyDJSwc",
+  "sort": 0,
+  "_key": "!items!YHlzVFpHVYyDJSwc"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Scepter_v93pZH1JNWfGzgVB.json b/src/packs/items/weapons/weapon_Improved_Scepter_uPqG5L8ltREV4605.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Scepter_v93pZH1JNWfGzgVB.json
rename to src/packs/items/weapons/weapon_Improved_Scepter_uPqG5L8ltREV4605.json
index ce628f57..bf3ba045 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Scepter_v93pZH1JNWfGzgVB.json
+++ b/src/packs/items/weapons/weapon_Improved_Scepter_uPqG5L8ltREV4605.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/improved_scepter.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "presence",
     "range": "far",
     "burden": "twoHanded",
-    "feature": "versatile"
+    "feature": "versatile",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009513614,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717425972,
+    "modifiedTime": 1748717425972,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "v93pZH1JNWfGzgVB",
-  "sort": 2100000,
-  "_key": "!items!v93pZH1JNWfGzgVB"
+  "_id": "uPqG5L8ltREV4605",
+  "sort": 0,
+  "_key": "!items!uPqG5L8ltREV4605"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Shortbow_i27H7xSpYaMOnyTE.json b/src/packs/items/weapons/weapon_Improved_Shortbow_ZSBJ0cYWHrWMMJHc.json
similarity index 67%
rename from src/packs/items/weapons/tier2/weapon_Improved_Shortbow_i27H7xSpYaMOnyTE.json
rename to src/packs/items/weapons/weapon_Improved_Shortbow_ZSBJ0cYWHrWMMJHc.json
index f74d2fc3..5e24e823 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Shortbow_i27H7xSpYaMOnyTE.json
+++ b/src/packs/items/weapons/weapon_Improved_Shortbow_ZSBJ0cYWHrWMMJHc.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_shortbow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "agility",
     "range": "far",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009512488,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717427240,
+    "modifiedTime": 1748717427240,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "i27H7xSpYaMOnyTE",
-  "sort": 3100000,
-  "_key": "!items!i27H7xSpYaMOnyTE"
+  "_id": "ZSBJ0cYWHrWMMJHc",
+  "sort": 0,
+  "_key": "!items!ZSBJ0cYWHrWMMJHc"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Shortstaff_tyKBNpIhrJrTJam5.json b/src/packs/items/weapons/weapon_Improved_Shortstaff_RkJezS4b5VwesYoR.json
similarity index 67%
rename from src/packs/items/weapons/tier2/weapon_Improved_Shortstaff_tyKBNpIhrJrTJam5.json
rename to src/packs/items/weapons/weapon_Improved_Shortstaff_RkJezS4b5VwesYoR.json
index cfb8027b..6a586e6e 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Shortstaff_tyKBNpIhrJrTJam5.json
+++ b/src/packs/items/weapons/weapon_Improved_Shortstaff_RkJezS4b5VwesYoR.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/improved_shortstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "instinct",
     "range": "close",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009511367,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717428719,
+    "modifiedTime": 1748717428719,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "tyKBNpIhrJrTJam5",
-  "sort": 3700000,
-  "_key": "!items!tyKBNpIhrJrTJam5"
+  "_id": "RkJezS4b5VwesYoR",
+  "sort": 0,
+  "_key": "!items!RkJezS4b5VwesYoR"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Spear_88DGrDCZcCUU9uwy.json b/src/packs/items/weapons/weapon_Improved_Spear_KnWHxJNf7ZJWePdg.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Spear_88DGrDCZcCUU9uwy.json
rename to src/packs/items/weapons/weapon_Improved_Spear_KnWHxJNf7ZJWePdg.json
index fda531cb..7d5898b1 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Spear_88DGrDCZcCUU9uwy.json
+++ b/src/packs/items/weapons/weapon_Improved_Spear_KnWHxJNf7ZJWePdg.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_spear.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "finesse",
     "range": "veryClose",
     "burden": "twoHanded",
-    "feature": "cumbersome"
+    "feature": "cumbersome",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009510256,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717430283,
+    "modifiedTime": 1748717430283,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "88DGrDCZcCUU9uwy",
-  "sort": 3600000,
-  "_key": "!items!88DGrDCZcCUU9uwy"
+  "_id": "KnWHxJNf7ZJWePdg",
+  "sort": 0,
+  "_key": "!items!KnWHxJNf7ZJWePdg"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Wand_NvCk3CHdyf7ZSwMd.json b/src/packs/items/weapons/weapon_Improved_Wand_NzvNV6lnWPbk7AQW.json
similarity index 67%
rename from src/packs/items/weapons/tier2/weapon_Improved_Wand_NvCk3CHdyf7ZSwMd.json
rename to src/packs/items/weapons/weapon_Improved_Wand_NzvNV6lnWPbk7AQW.json
index 431ac2a5..54f83705 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Wand_NvCk3CHdyf7ZSwMd.json
+++ b/src/packs/items/weapons/weapon_Improved_Wand_NzvNV6lnWPbk7AQW.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/improved_wand.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "knowledge",
     "range": "far",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009509283,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717432599,
+    "modifiedTime": 1748717432599,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "NvCk3CHdyf7ZSwMd",
-  "sort": 3500000,
-  "_key": "!items!NvCk3CHdyf7ZSwMd"
+  "_id": "NzvNV6lnWPbk7AQW",
+  "sort": 0,
+  "_key": "!items!NzvNV6lnWPbk7AQW"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Improved_Warhammer_kxqaACQb9VQEbc9S.json b/src/packs/items/weapons/weapon_Improved_Warhammer_0grDkkD9bYHT3Dk5.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Improved_Warhammer_kxqaACQb9VQEbc9S.json
rename to src/packs/items/weapons/weapon_Improved_Warhammer_0grDkkD9bYHT3Dk5.json
index 9a6b4558..590c06bb 100644
--- a/src/packs/items/weapons/tier2/weapon_Improved_Warhammer_kxqaACQb9VQEbc9S.json
+++ b/src/packs/items/weapons/weapon_Improved_Warhammer_0grDkkD9bYHT3Dk5.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/improved_warhammer.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "melee",
     "burden": "twoHanded",
-    "feature": "heavy"
+    "feature": "heavy",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009508360,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717434236,
+    "modifiedTime": 1748717434236,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "kxqaACQb9VQEbc9S",
-  "sort": 3400000,
-  "_key": "!items!kxqaACQb9VQEbc9S"
+  "_id": "0grDkkD9bYHT3Dk5",
+  "sort": 0,
+  "_key": "!items!0grDkkD9bYHT3Dk5"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Keeper_s_Staff_LlpGDvN6cd0rVZ9p.json b/src/packs/items/weapons/weapon_Keeper_s_Staff_EyPLO7vy5VcmEKbA.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Keeper_s_Staff_LlpGDvN6cd0rVZ9p.json
rename to src/packs/items/weapons/weapon_Keeper_s_Staff_EyPLO7vy5VcmEKbA.json
index e92496b3..53fde521 100644
--- a/src/packs/items/weapons/tier2/weapon_Keeper_s_Staff_LlpGDvN6cd0rVZ9p.json
+++ b/src/packs/items/weapons/weapon_Keeper_s_Staff_EyPLO7vy5VcmEKbA.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/keepers_staff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "knowledge",
     "range": "far",
     "burden": "twoHanded",
-    "feature": "reliable"
+    "feature": "reliable",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009507308,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717435900,
+    "modifiedTime": 1748717435900,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "LlpGDvN6cd0rVZ9p",
-  "sort": 3300000,
-  "_key": "!items!LlpGDvN6cd0rVZ9p"
+  "_id": "EyPLO7vy5VcmEKbA",
+  "sort": 0,
+  "_key": "!items!EyPLO7vy5VcmEKbA"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Knuckle_Blades_hzyIf7akuGl7jYlo.json b/src/packs/items/weapons/weapon_Knuckle_Blades_kzE863F8Kqh6Ssrw.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Knuckle_Blades_hzyIf7akuGl7jYlo.json
rename to src/packs/items/weapons/weapon_Knuckle_Blades_kzE863F8Kqh6Ssrw.json
index 24e05e9f..b0d9d8be 100644
--- a/src/packs/items/weapons/tier2/weapon_Knuckle_Blades_hzyIf7akuGl7jYlo.json
+++ b/src/packs/items/weapons/weapon_Knuckle_Blades_kzE863F8Kqh6Ssrw.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/knuckle_blades.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "melee",
     "burden": "twoHanded",
-    "feature": "brutal"
+    "feature": "brutal",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009506432,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717437872,
+    "modifiedTime": 1748717437872,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "hzyIf7akuGl7jYlo",
-  "sort": 3200000,
-  "_key": "!items!hzyIf7akuGl7jYlo"
+  "_id": "kzE863F8Kqh6Ssrw",
+  "sort": 0,
+  "_key": "!items!kzE863F8Kqh6Ssrw"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Labrys_Axe_VkxSrdGjlWW6tUvO.json b/src/packs/items/weapons/weapon_Labrys_Axe_Wzkf1I3PMKX1aL22.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Labrys_Axe_VkxSrdGjlWW6tUvO.json
rename to src/packs/items/weapons/weapon_Labrys_Axe_Wzkf1I3PMKX1aL22.json
index 140bf07b..bc5ec10c 100644
--- a/src/packs/items/weapons/tier3/weapon_Labrys_Axe_VkxSrdGjlWW6tUvO.json
+++ b/src/packs/items/weapons/weapon_Labrys_Axe_Wzkf1I3PMKX1aL22.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/labrys_axe.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "melee",
     "burden": "twoHanded",
-    "feature": "protective"
+    "feature": "protective",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009684684,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717506661,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "VkxSrdGjlWW6tUvO",
-  "sort": 2800000,
-  "_key": "!items!VkxSrdGjlWW6tUvO"
+  "_id": "Wzkf1I3PMKX1aL22",
+  "sort": 600000,
+  "_key": "!items!Wzkf1I3PMKX1aL22"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Arcane_Gauntlets_sI23YidfmazUWSd5.json b/src/packs/items/weapons/weapon_Legendary_Arcane_Gauntlets_brGbwSLC8i5KSIgw.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Arcane_Gauntlets_sI23YidfmazUWSd5.json
rename to src/packs/items/weapons/weapon_Legendary_Arcane_Gauntlets_brGbwSLC8i5KSIgw.json
index 7137575a..4110d8b0 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Arcane_Gauntlets_sI23YidfmazUWSd5.json
+++ b/src/packs/items/weapons/weapon_Legendary_Arcane_Gauntlets_brGbwSLC8i5KSIgw.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Arcane Gauntlets",
   "type": "weapon",
-  "_id": "sI23YidfmazUWSd5",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/legendary_arcane_gauntlets.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "strength",
     "feature": "",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748036278482,
-    "modifiedTime": 1748036298386,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717538077,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!sI23YidfmazUWSd5"
+  "_id": "brGbwSLC8i5KSIgw",
+  "sort": 2700000,
+  "_key": "!items!brGbwSLC8i5KSIgw"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Battleaxe_30V01DlHo5rrVfJT.json b/src/packs/items/weapons/weapon_Legendary_Battleaxe_RZqNqIJA8Y76vyAS.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Battleaxe_30V01DlHo5rrVfJT.json
rename to src/packs/items/weapons/weapon_Legendary_Battleaxe_RZqNqIJA8Y76vyAS.json
index 63572797..389e0132 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Battleaxe_30V01DlHo5rrVfJT.json
+++ b/src/packs/items/weapons/weapon_Legendary_Battleaxe_RZqNqIJA8Y76vyAS.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Battleaxe",
   "type": "weapon",
-  "_id": "30V01DlHo5rrVfJT",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_battleaxe.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "strength",
     "feature": "",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035381150,
-    "modifiedTime": 1748035402533,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717538837,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!30V01DlHo5rrVfJT"
+  "_id": "RZqNqIJA8Y76vyAS",
+  "sort": 2800000,
+  "_key": "!items!RZqNqIJA8Y76vyAS"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Broadsword_a3j8NNUEUmfOXFZQ.json b/src/packs/items/weapons/weapon_Legendary_Broadsword_ZagTf04G2LUzBVIJ.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Broadsword_a3j8NNUEUmfOXFZQ.json
rename to src/packs/items/weapons/weapon_Legendary_Broadsword_ZagTf04G2LUzBVIJ.json
index 53677e19..56e05c79 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Broadsword_a3j8NNUEUmfOXFZQ.json
+++ b/src/packs/items/weapons/weapon_Legendary_Broadsword_ZagTf04G2LUzBVIJ.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Broadsword",
   "type": "weapon",
-  "_id": "a3j8NNUEUmfOXFZQ",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_broadsword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "agility",
     "feature": "reliable",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035124153,
-    "modifiedTime": 1748035160291,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717539610,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!a3j8NNUEUmfOXFZQ"
+  "_id": "ZagTf04G2LUzBVIJ",
+  "sort": 2900000,
+  "_key": "!items!ZagTf04G2LUzBVIJ"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Crossbow_zT0lfEzzay3Pfjai.json b/src/packs/items/weapons/weapon_Legendary_Crossbow_kHO5zhsA6neUWIIY.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Crossbow_zT0lfEzzay3Pfjai.json
rename to src/packs/items/weapons/weapon_Legendary_Crossbow_kHO5zhsA6neUWIIY.json
index 2c1254c0..bdb8e03a 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Crossbow_zT0lfEzzay3Pfjai.json
+++ b/src/packs/items/weapons/weapon_Legendary_Crossbow_kHO5zhsA6neUWIIY.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Crossbow",
   "type": "weapon",
-  "_id": "zT0lfEzzay3Pfjai",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_crossbow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "finesse",
     "feature": "",
     "range": "far",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035809338,
-    "modifiedTime": 1748035823146,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717540479,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!zT0lfEzzay3Pfjai"
+  "_id": "kHO5zhsA6neUWIIY",
+  "sort": 2600000,
+  "_key": "!items!kHO5zhsA6neUWIIY"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Cutlass_5tYEYizBM6IS9bHH.json b/src/packs/items/weapons/weapon_Legendary_Cutlass_5yF2KXtThRMjHlVY.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Cutlass_5tYEYizBM6IS9bHH.json
rename to src/packs/items/weapons/weapon_Legendary_Cutlass_5yF2KXtThRMjHlVY.json
index 8f997e60..8381ee07 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Cutlass_5tYEYizBM6IS9bHH.json
+++ b/src/packs/items/weapons/weapon_Legendary_Cutlass_5yF2KXtThRMjHlVY.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Cutlass",
   "type": "weapon",
-  "_id": "5tYEYizBM6IS9bHH",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_cutlass.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "presence",
     "feature": "",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035596682,
-    "modifiedTime": 1748035618015,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717541362,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!5tYEYizBM6IS9bHH"
+  "_id": "5yF2KXtThRMjHlVY",
+  "sort": 1900000,
+  "_key": "!items!5yF2KXtThRMjHlVY"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Dagger_KtFWQLwrDT1eAXfW.json b/src/packs/items/weapons/weapon_Legendary_Dagger_KWPrdOcsjw0UqiaO.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Dagger_KtFWQLwrDT1eAXfW.json
rename to src/packs/items/weapons/weapon_Legendary_Dagger_KWPrdOcsjw0UqiaO.json
index 6b75acae..a6fa77b4 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Dagger_KtFWQLwrDT1eAXfW.json
+++ b/src/packs/items/weapons/weapon_Legendary_Dagger_KWPrdOcsjw0UqiaO.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Dagger",
   "type": "weapon",
-  "_id": "KtFWQLwrDT1eAXfW",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_dagger.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "finesse",
     "feature": "",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035511214,
-    "modifiedTime": 1748035543656,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717542285,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!KtFWQLwrDT1eAXfW"
+  "_id": "KWPrdOcsjw0UqiaO",
+  "sort": 2100000,
+  "_key": "!items!KWPrdOcsjw0UqiaO"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Dualstaff_8IiuOpspImJXxd3M.json b/src/packs/items/weapons/weapon_Legendary_Dualstaff_CA7tFWu0yJY8AKaf.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Dualstaff_8IiuOpspImJXxd3M.json
rename to src/packs/items/weapons/weapon_Legendary_Dualstaff_CA7tFWu0yJY8AKaf.json
index 445de56c..98dbc23f 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Dualstaff_8IiuOpspImJXxd3M.json
+++ b/src/packs/items/weapons/weapon_Legendary_Dualstaff_CA7tFWu0yJY8AKaf.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Dualstaff",
   "type": "weapon",
-  "_id": "8IiuOpspImJXxd3M",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/legendary_dualstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "instinct",
     "feature": "",
     "range": "far",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748036876318,
-    "modifiedTime": 1748036899738,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717545502,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!8IiuOpspImJXxd3M"
+  "_id": "CA7tFWu0yJY8AKaf",
+  "sort": 2200000,
+  "_key": "!items!CA7tFWu0yJY8AKaf"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Glowing_Rings_o2YogWivkfQN5uiO.json b/src/packs/items/weapons/weapon_Legendary_Glowing_Rings_M5ksicUetj1cUQV4.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Glowing_Rings_o2YogWivkfQN5uiO.json
rename to src/packs/items/weapons/weapon_Legendary_Glowing_Rings_M5ksicUetj1cUQV4.json
index ea76f445..dfc85a25 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Glowing_Rings_o2YogWivkfQN5uiO.json
+++ b/src/packs/items/weapons/weapon_Legendary_Glowing_Rings_M5ksicUetj1cUQV4.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Glowing Rings",
   "type": "weapon",
-  "_id": "o2YogWivkfQN5uiO",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/legendary_glowing_rings.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "agility",
     "feature": "",
     "range": "veryClose",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748036340614,
-    "modifiedTime": 1748036668101,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717546412,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!o2YogWivkfQN5uiO"
+  "_id": "M5ksicUetj1cUQV4",
+  "sort": 2300000,
+  "_key": "!items!M5ksicUetj1cUQV4"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Greatstaff_6yHpOErxja3ORXR3.json b/src/packs/items/weapons/weapon_Legendary_Greatstaff_8vK8Cgp43QjVAqO4.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Greatstaff_6yHpOErxja3ORXR3.json
rename to src/packs/items/weapons/weapon_Legendary_Greatstaff_8vK8Cgp43QjVAqO4.json
index 35c75e07..c9414434 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Greatstaff_6yHpOErxja3ORXR3.json
+++ b/src/packs/items/weapons/weapon_Legendary_Greatstaff_8vK8Cgp43QjVAqO4.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Greatstaff",
   "type": "weapon",
-  "_id": "6yHpOErxja3ORXR3",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/legendary_greatstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "knowledge",
     "feature": "powerful",
     "range": "veryClose",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748037493547,
-    "modifiedTime": 1748037516990,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717547431,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!6yHpOErxja3ORXR3"
+  "_id": "8vK8Cgp43QjVAqO4",
+  "sort": 2400000,
+  "_key": "!items!8vK8Cgp43QjVAqO4"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Greatsword_bocnpC5X34s9DJ84.json b/src/packs/items/weapons/weapon_Legendary_Greatsword_g1Jg7UAyWPHswjec.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Greatsword_bocnpC5X34s9DJ84.json
rename to src/packs/items/weapons/weapon_Legendary_Greatsword_g1Jg7UAyWPHswjec.json
index be11b3f2..75854650 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Greatsword_bocnpC5X34s9DJ84.json
+++ b/src/packs/items/weapons/weapon_Legendary_Greatsword_g1Jg7UAyWPHswjec.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Greatsword",
   "type": "weapon",
-  "_id": "bocnpC5X34s9DJ84",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_greatsword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "strength",
     "feature": "massive",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035411406,
-    "modifiedTime": 1748035426315,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717548513,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!bocnpC5X34s9DJ84"
+  "_id": "g1Jg7UAyWPHswjec",
+  "sort": 2000000,
+  "_key": "!items!g1Jg7UAyWPHswjec"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Halberd_KIzmmRZCRnlfy398.json b/src/packs/items/weapons/weapon_Legendary_Halberd_r0XAlwFuUBrKALfw.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Halberd_KIzmmRZCRnlfy398.json
rename to src/packs/items/weapons/weapon_Legendary_Halberd_r0XAlwFuUBrKALfw.json
index ac9c3cba..e70520fc 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Halberd_KIzmmRZCRnlfy398.json
+++ b/src/packs/items/weapons/weapon_Legendary_Halberd_r0XAlwFuUBrKALfw.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Halberd",
   "type": "weapon",
-  "_id": "KIzmmRZCRnlfy398",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_halberd.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "strength",
     "feature": "cumbersome",
     "range": "veryClose",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035694823,
-    "modifiedTime": 1748035717710,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717554475,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!KIzmmRZCRnlfy398"
+  "_id": "r0XAlwFuUBrKALfw",
+  "sort": 800000,
+  "_key": "!items!r0XAlwFuUBrKALfw"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Hallowed_Axe_TxhLOsmk5CGbOXtl.json b/src/packs/items/weapons/weapon_Legendary_Hallowed_Axe_cgmsLxAQ3o9oUoCG.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Hallowed_Axe_TxhLOsmk5CGbOXtl.json
rename to src/packs/items/weapons/weapon_Legendary_Hallowed_Axe_cgmsLxAQ3o9oUoCG.json
index c5d47783..aa8f16dd 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Hallowed_Axe_TxhLOsmk5CGbOXtl.json
+++ b/src/packs/items/weapons/weapon_Legendary_Hallowed_Axe_cgmsLxAQ3o9oUoCG.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Hallowed Axe",
   "type": "weapon",
-  "_id": "TxhLOsmk5CGbOXtl",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/legendary_hallowed_axe.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "strength",
     "feature": "",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748036308494,
-    "modifiedTime": 1748036324619,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717555462,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!TxhLOsmk5CGbOXtl"
+  "_id": "cgmsLxAQ3o9oUoCG",
+  "sort": 900000,
+  "_key": "!items!cgmsLxAQ3o9oUoCG"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Hand_Runes_VoERob9158dndnz0.json b/src/packs/items/weapons/weapon_Legendary_Hand_Runes_aY7GF7lU7pozg8ji.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Hand_Runes_VoERob9158dndnz0.json
rename to src/packs/items/weapons/weapon_Legendary_Hand_Runes_aY7GF7lU7pozg8ji.json
index 60536557..b8403b79 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Hand_Runes_VoERob9158dndnz0.json
+++ b/src/packs/items/weapons/weapon_Legendary_Hand_Runes_aY7GF7lU7pozg8ji.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Hand Runes",
   "type": "weapon",
-  "_id": "VoERob9158dndnz0",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/legendary_hand_runes.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "instinct",
     "feature": "",
     "range": "veryClose",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748036679767,
-    "modifiedTime": 1748036698804,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717556534,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!VoERob9158dndnz0"
+  "_id": "aY7GF7lU7pozg8ji",
+  "sort": 1000000,
+  "_key": "!items!aY7GF7lU7pozg8ji"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Longbow_72WaOMvPburJGcSV.json b/src/packs/items/weapons/weapon_Legendary_Longbow_0VMzALprSt7t4vk7.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Longbow_72WaOMvPburJGcSV.json
rename to src/packs/items/weapons/weapon_Legendary_Longbow_0VMzALprSt7t4vk7.json
index b559fc49..39e9db2a 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Longbow_72WaOMvPburJGcSV.json
+++ b/src/packs/items/weapons/weapon_Legendary_Longbow_0VMzALprSt7t4vk7.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Longbow",
   "type": "weapon",
-  "_id": "72WaOMvPburJGcSV",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_longbow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "agility",
     "feature": "cumbersome",
     "range": "veryFar",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035834991,
-    "modifiedTime": 1748035854361,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717557541,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!72WaOMvPburJGcSV"
+  "_id": "0VMzALprSt7t4vk7",
+  "sort": 1200000,
+  "_key": "!items!0VMzALprSt7t4vk7"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Longsword_UaAZOEco3yrUMF2R.json b/src/packs/items/weapons/weapon_Legendary_Longsword_OfYAhe88Z0biN4Sa.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Longsword_UaAZOEco3yrUMF2R.json
rename to src/packs/items/weapons/weapon_Legendary_Longsword_OfYAhe88Z0biN4Sa.json
index af8f183b..71d42e3a 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Longsword_UaAZOEco3yrUMF2R.json
+++ b/src/packs/items/weapons/weapon_Legendary_Longsword_OfYAhe88Z0biN4Sa.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Longsword",
   "type": "weapon",
-  "_id": "UaAZOEco3yrUMF2R",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_longsword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "agility",
     "feature": "",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035241283,
-    "modifiedTime": 1748035262092,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717558437,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!UaAZOEco3yrUMF2R"
+  "_id": "OfYAhe88Z0biN4Sa",
+  "sort": 1300000,
+  "_key": "!items!OfYAhe88Z0biN4Sa"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Mace_Q3zGz4BWGPwThNhK.json b/src/packs/items/weapons/weapon_Legendary_Mace_ZImmy9vIJlmnzEPr.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Mace_Q3zGz4BWGPwThNhK.json
rename to src/packs/items/weapons/weapon_Legendary_Mace_ZImmy9vIJlmnzEPr.json
index c1b2eff3..a85f47c9 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Mace_Q3zGz4BWGPwThNhK.json
+++ b/src/packs/items/weapons/weapon_Legendary_Mace_ZImmy9vIJlmnzEPr.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Mace",
   "type": "weapon",
-  "_id": "Q3zGz4BWGPwThNhK",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_mace.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "strength",
     "feature": "",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035444280,
-    "modifiedTime": 1748035462669,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717559415,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!Q3zGz4BWGPwThNhK"
+  "_id": "ZImmy9vIJlmnzEPr",
+  "sort": 1400000,
+  "_key": "!items!ZImmy9vIJlmnzEPr"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Quarterstaff_iEXntwy16qcBXVjy.json b/src/packs/items/weapons/weapon_Legendary_Quarterstaff_pinNKWkejkzHPCQj.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Quarterstaff_iEXntwy16qcBXVjy.json
rename to src/packs/items/weapons/weapon_Legendary_Quarterstaff_pinNKWkejkzHPCQj.json
index 704bfdb1..cae48ce2 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Quarterstaff_iEXntwy16qcBXVjy.json
+++ b/src/packs/items/weapons/weapon_Legendary_Quarterstaff_pinNKWkejkzHPCQj.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Quarterstaff",
   "type": "weapon",
-  "_id": "iEXntwy16qcBXVjy",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_quarterstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "instinct",
     "feature": "",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035558663,
-    "modifiedTime": 1748035588193,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717560359,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!iEXntwy16qcBXVjy"
+  "_id": "pinNKWkejkzHPCQj",
+  "sort": 1500000,
+  "_key": "!items!pinNKWkejkzHPCQj"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Rapier_P1xXyWvYCLR02b5l.json b/src/packs/items/weapons/weapon_Legendary_Rapier_90XtvPz8EfjqdMcM.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Rapier_P1xXyWvYCLR02b5l.json
rename to src/packs/items/weapons/weapon_Legendary_Rapier_90XtvPz8EfjqdMcM.json
index 5b4cc713..50a64ae5 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Rapier_P1xXyWvYCLR02b5l.json
+++ b/src/packs/items/weapons/weapon_Legendary_Rapier_90XtvPz8EfjqdMcM.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Rapier",
   "type": "weapon",
-  "_id": "P1xXyWvYCLR02b5l",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_rapier.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "presence",
     "feature": "quick",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035626405,
-    "modifiedTime": 1748035684846,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717561443,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!P1xXyWvYCLR02b5l"
+  "_id": "90XtvPz8EfjqdMcM",
+  "sort": 1600000,
+  "_key": "!items!90XtvPz8EfjqdMcM"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Returning_Blade_FEDXHLxkC3UK7ZEM.json b/src/packs/items/weapons/weapon_Legendary_Returning_Blade_RYRwUObgRgWOWjAY.json
similarity index 66%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Returning_Blade_FEDXHLxkC3UK7ZEM.json
rename to src/packs/items/weapons/weapon_Legendary_Returning_Blade_RYRwUObgRgWOWjAY.json
index 87e0f412..d244ac49 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Returning_Blade_FEDXHLxkC3UK7ZEM.json
+++ b/src/packs/items/weapons/weapon_Legendary_Returning_Blade_RYRwUObgRgWOWjAY.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Returning Blade",
   "type": "weapon",
-  "_id": "FEDXHLxkC3UK7ZEM",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/legendary_returning_blade.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,16 +12,16 @@
     "quantity": 1,
     "description": "",
     "trait": "finesse",
-    "feature": "retrieve",
     "range": "close",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +31,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748036711181,
-    "modifiedTime": 1748036774931,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717562323,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!FEDXHLxkC3UK7ZEM"
+  "_id": "RYRwUObgRgWOWjAY",
+  "sort": 1700000,
+  "_key": "!items!RYRwUObgRgWOWjAY"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Scepter_UruA4MYOIblYgCDt.json b/src/packs/items/weapons/weapon_Legendary_Scepter_zut78R32b72vCe2W.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Scepter_UruA4MYOIblYgCDt.json
rename to src/packs/items/weapons/weapon_Legendary_Scepter_zut78R32b72vCe2W.json
index b7ea7c74..c33e9009 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Scepter_UruA4MYOIblYgCDt.json
+++ b/src/packs/items/weapons/weapon_Legendary_Scepter_zut78R32b72vCe2W.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Scepter",
   "type": "weapon",
-  "_id": "UruA4MYOIblYgCDt",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/legendary_scepter.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "presence",
     "feature": "versatile",
     "range": "far",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748037404434,
-    "modifiedTime": 1748037453330,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717563317,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!UruA4MYOIblYgCDt"
+  "_id": "zut78R32b72vCe2W",
+  "sort": 1800000,
+  "_key": "!items!zut78R32b72vCe2W"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Shortbow_4LJ3n3dXQeaUkSQo.json b/src/packs/items/weapons/weapon_Legendary_Shortbow_KDQClgBxRL6ky6pP.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Shortbow_4LJ3n3dXQeaUkSQo.json
rename to src/packs/items/weapons/weapon_Legendary_Shortbow_KDQClgBxRL6ky6pP.json
index d5664d30..4165ee73 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Shortbow_4LJ3n3dXQeaUkSQo.json
+++ b/src/packs/items/weapons/weapon_Legendary_Shortbow_KDQClgBxRL6ky6pP.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Shortbow",
   "type": "weapon",
-  "_id": "4LJ3n3dXQeaUkSQo",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_shortbow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "agility",
     "feature": "",
     "range": "far",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035780892,
-    "modifiedTime": 1748035798511,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717568502,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!4LJ3n3dXQeaUkSQo"
+  "_id": "KDQClgBxRL6ky6pP",
+  "sort": 1100000,
+  "_key": "!items!KDQClgBxRL6ky6pP"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Shortstaff_tNAcnWoed7WEZ9p0.json b/src/packs/items/weapons/weapon_Legendary_Shortstaff_a3Am2xUZxQuqkvqQ.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Shortstaff_tNAcnWoed7WEZ9p0.json
rename to src/packs/items/weapons/weapon_Legendary_Shortstaff_a3Am2xUZxQuqkvqQ.json
index 664462a3..9a60ef3f 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Shortstaff_tNAcnWoed7WEZ9p0.json
+++ b/src/packs/items/weapons/weapon_Legendary_Shortstaff_a3Am2xUZxQuqkvqQ.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Shortstaff",
   "type": "weapon",
-  "_id": "tNAcnWoed7WEZ9p0",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/legendary_shortstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "instinct",
     "feature": "",
     "range": "close",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748036751087,
-    "modifiedTime": 1748036765881,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717569510,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!tNAcnWoed7WEZ9p0"
+  "_id": "a3Am2xUZxQuqkvqQ",
+  "sort": 100000,
+  "_key": "!items!a3Am2xUZxQuqkvqQ"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Spear_DI75wSq10QSF5sFM.json b/src/packs/items/weapons/weapon_Legendary_Spear_zT53LgiBetkWtQKE.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Spear_DI75wSq10QSF5sFM.json
rename to src/packs/items/weapons/weapon_Legendary_Spear_zT53LgiBetkWtQKE.json
index 9ac30145..ebbea09a 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Spear_DI75wSq10QSF5sFM.json
+++ b/src/packs/items/weapons/weapon_Legendary_Spear_zT53LgiBetkWtQKE.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Spear",
   "type": "weapon",
-  "_id": "DI75wSq10QSF5sFM",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_spear.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "finesse",
     "feature": "cumbersome",
     "range": "veryClose",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035729969,
-    "modifiedTime": 1748036865195,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717570332,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!DI75wSq10QSF5sFM"
+  "_id": "zT53LgiBetkWtQKE",
+  "sort": 300000,
+  "_key": "!items!zT53LgiBetkWtQKE"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Wand_2FiMSztRSxvl2OWN.json b/src/packs/items/weapons/weapon_Legendary_Wand_YAMbvl0sGYWaeGuh.json
similarity index 66%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Wand_2FiMSztRSxvl2OWN.json
rename to src/packs/items/weapons/weapon_Legendary_Wand_YAMbvl0sGYWaeGuh.json
index ecbedf8e..77e24ffa 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Wand_2FiMSztRSxvl2OWN.json
+++ b/src/packs/items/weapons/weapon_Legendary_Wand_YAMbvl0sGYWaeGuh.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Wand",
   "type": "weapon",
-  "_id": "2FiMSztRSxvl2OWN",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/legendary_wand.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "knowledge",
     "feature": "",
     "range": "far",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748037462942,
-    "modifiedTime": 1748037481379,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717571500,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!2FiMSztRSxvl2OWN"
+  "_id": "YAMbvl0sGYWaeGuh",
+  "sort": 400000,
+  "_key": "!items!YAMbvl0sGYWaeGuh"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Legendary_Warhammer_9CCfQYb9s7fWVEjh.json b/src/packs/items/weapons/weapon_Legendary_Warhammer_Ms76FGrkbxJu3xdP.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Legendary_Warhammer_9CCfQYb9s7fWVEjh.json
rename to src/packs/items/weapons/weapon_Legendary_Warhammer_Ms76FGrkbxJu3xdP.json
index c689ae59..aa6ced97 100644
--- a/src/packs/items/weapons/tier4/weapon_Legendary_Warhammer_9CCfQYb9s7fWVEjh.json
+++ b/src/packs/items/weapons/weapon_Legendary_Warhammer_Ms76FGrkbxJu3xdP.json
@@ -1,10 +1,8 @@
 {
   "name": "Legendary Warhammer",
   "type": "weapon",
-  "_id": "9CCfQYb9s7fWVEjh",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/legendary_warhammer.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "strength",
     "feature": "heavy",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035473288,
-    "modifiedTime": 1748035493376,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717572463,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!9CCfQYb9s7fWVEjh"
+  "_id": "Ms76FGrkbxJu3xdP",
+  "sort": 500000,
+  "_key": "!items!Ms76FGrkbxJu3xdP"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Longbow_z6TTwLScjmMOn7yX.json b/src/packs/items/weapons/weapon_Longbow_QxDqWi0hu9uNwwe6.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Longbow_z6TTwLScjmMOn7yX.json
rename to src/packs/items/weapons/weapon_Longbow_QxDqWi0hu9uNwwe6.json
index c3c4cc02..d9c979e7 100644
--- a/src/packs/items/weapons/tier1/weapon_Longbow_z6TTwLScjmMOn7yX.json
+++ b/src/packs/items/weapons/weapon_Longbow_QxDqWi0hu9uNwwe6.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/longbow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "agility",
     "range": "veryFar",
     "burden": "twoHanded",
-    "feature": "cumbersome"
+    "feature": "cumbersome",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009454814,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717317714,
+    "modifiedTime": 1748717317714,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "z6TTwLScjmMOn7yX",
-  "sort": 1500000,
-  "_key": "!items!z6TTwLScjmMOn7yX"
+  "_id": "QxDqWi0hu9uNwwe6",
+  "sort": 0,
+  "_key": "!items!QxDqWi0hu9uNwwe6"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Longsword_MzM4Xp8WoYmJImp7.json b/src/packs/items/weapons/weapon_Longsword_h8XhL7dB7mJbFf6R.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Longsword_MzM4Xp8WoYmJImp7.json
rename to src/packs/items/weapons/weapon_Longsword_h8XhL7dB7mJbFf6R.json
index 3dbd6a6b..ffc4c0eb 100644
--- a/src/packs/items/weapons/tier1/weapon_Longsword_MzM4Xp8WoYmJImp7.json
+++ b/src/packs/items/weapons/weapon_Longsword_h8XhL7dB7mJbFf6R.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/longsword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "agility",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009453846,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717319700,
+    "modifiedTime": 1748717319700,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "MzM4Xp8WoYmJImp7",
-  "sort": 1400000,
-  "_key": "!items!MzM4Xp8WoYmJImp7"
+  "_id": "h8XhL7dB7mJbFf6R",
+  "sort": 0,
+  "_key": "!items!h8XhL7dB7mJbFf6R"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Mace_5PfnAoO12JXH8KSV.json b/src/packs/items/weapons/weapon_Mace_CFIK5SxXN2FxV8ew.json
similarity index 66%
rename from src/packs/items/weapons/tier1/weapon_Mace_5PfnAoO12JXH8KSV.json
rename to src/packs/items/weapons/weapon_Mace_CFIK5SxXN2FxV8ew.json
index 5012981c..c4f08417 100644
--- a/src/packs/items/weapons/tier1/weapon_Mace_5PfnAoO12JXH8KSV.json
+++ b/src/packs/items/weapons/weapon_Mace_CFIK5SxXN2FxV8ew.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/mace.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "strength",
     "range": "melee",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009452909,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717321399,
+    "modifiedTime": 1748717321399,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "5PfnAoO12JXH8KSV",
-  "sort": 1300000,
-  "_key": "!items!5PfnAoO12JXH8KSV"
+  "_id": "CFIK5SxXN2FxV8ew",
+  "sort": 0,
+  "_key": "!items!CFIK5SxXN2FxV8ew"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Mage_Orb_LuZBjH3QvsEOkcVM.json b/src/packs/items/weapons/weapon_Mage_Orb_xP8qusQ2orIHnDIk.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Mage_Orb_LuZBjH3QvsEOkcVM.json
rename to src/packs/items/weapons/weapon_Mage_Orb_xP8qusQ2orIHnDIk.json
index 8903ac4e..971cc15c 100644
--- a/src/packs/items/weapons/tier3/weapon_Mage_Orb_LuZBjH3QvsEOkcVM.json
+++ b/src/packs/items/weapons/weapon_Mage_Orb_xP8qusQ2orIHnDIk.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/mage_orb.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "knowledge",
     "range": "far",
     "burden": "oneHanded",
-    "feature": "powerful"
+    "feature": "powerful",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009683824,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717507510,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "LuZBjH3QvsEOkcVM",
-  "sort": 2700000,
-  "_key": "!items!LuZBjH3QvsEOkcVM"
+  "_id": "xP8qusQ2orIHnDIk",
+  "sort": 700000,
+  "_key": "!items!xP8qusQ2orIHnDIk"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Magus_Revolver_h4BHRl3Ji6NAmOd4.json b/src/packs/items/weapons/weapon_Magus_Revolver_QBZi7ftJIv4VRSjX.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Magus_Revolver_h4BHRl3Ji6NAmOd4.json
rename to src/packs/items/weapons/weapon_Magus_Revolver_QBZi7ftJIv4VRSjX.json
index b83f130b..be95ce4d 100644
--- a/src/packs/items/weapons/tier4/weapon_Magus_Revolver_h4BHRl3Ji6NAmOd4.json
+++ b/src/packs/items/weapons/weapon_Magus_Revolver_QBZi7ftJIv4VRSjX.json
@@ -1,10 +1,8 @@
 {
   "name": "Magus Revolver",
   "type": "weapon",
-  "_id": "h4BHRl3Ji6NAmOd4",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/magus_revolver.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "finesse",
     "feature": "reloading",
     "range": "veryFar",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748038246368,
-    "modifiedTime": 1748038271449,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717573571,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!h4BHRl3Ji6NAmOd4"
+  "_id": "QBZi7ftJIv4VRSjX",
+  "sort": 600000,
+  "_key": "!items!QBZi7ftJIv4VRSjX"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Meridian_Cutlass_grOsR6ArQQR4OBzX.json b/src/packs/items/weapons/weapon_Meridian_Cutlass_O5e5ltywjeEwXZw5.json
similarity index 70%
rename from src/packs/items/weapons/tier3/weapon_Meridian_Cutlass_grOsR6ArQQR4OBzX.json
rename to src/packs/items/weapons/weapon_Meridian_Cutlass_O5e5ltywjeEwXZw5.json
index 3acd7928..cdf12995 100644
--- a/src/packs/items/weapons/tier3/weapon_Meridian_Cutlass_grOsR6ArQQR4OBzX.json
+++ b/src/packs/items/weapons/weapon_Meridian_Cutlass_O5e5ltywjeEwXZw5.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/meridian_cutlass.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,15 @@
     "trait": "presence",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "doubleDuty"
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009682959,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717508398,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "grOsR6ArQQR4OBzX",
-  "sort": 3500000,
-  "_key": "!items!grOsR6ArQQR4OBzX"
+  "_id": "O5e5ltywjeEwXZw5",
+  "sort": 800000,
+  "_key": "!items!O5e5ltywjeEwXZw5"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Midas_Scythe_cpK9iWwesVYUFyXO.json b/src/packs/items/weapons/weapon_Midas_Scythe_NCQxM3efha2fi3un.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Midas_Scythe_cpK9iWwesVYUFyXO.json
rename to src/packs/items/weapons/weapon_Midas_Scythe_NCQxM3efha2fi3un.json
index d02b552f..e8e508fc 100644
--- a/src/packs/items/weapons/tier4/weapon_Midas_Scythe_cpK9iWwesVYUFyXO.json
+++ b/src/packs/items/weapons/weapon_Midas_Scythe_NCQxM3efha2fi3un.json
@@ -1,10 +1,8 @@
 {
   "name": "Midas Scythe",
   "type": "weapon",
-  "_id": "cpK9iWwesVYUFyXO",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/midas_scythe.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "knowledge",
     "feature": "greedy",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748037954420,
-    "modifiedTime": 1748037972671,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717574508,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!cpK9iWwesVYUFyXO"
+  "_id": "NCQxM3efha2fi3un",
+  "sort": 700000,
+  "_key": "!items!NCQxM3efha2fi3un"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Quarterstaff_2jUxZEBhFX60Mbll.json b/src/packs/items/weapons/weapon_Quarterstaff_J4Mlwt3BmVeWV6vC.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Quarterstaff_2jUxZEBhFX60Mbll.json
rename to src/packs/items/weapons/weapon_Quarterstaff_J4Mlwt3BmVeWV6vC.json
index 37528226..052ed3bd 100644
--- a/src/packs/items/weapons/tier1/weapon_Quarterstaff_2jUxZEBhFX60Mbll.json
+++ b/src/packs/items/weapons/weapon_Quarterstaff_J4Mlwt3BmVeWV6vC.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/quarterstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "instinct",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009452101,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717323051,
+    "modifiedTime": 1748717323051,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "2jUxZEBhFX60Mbll",
-  "sort": 1100000,
-  "_key": "!items!2jUxZEBhFX60Mbll"
+  "_id": "J4Mlwt3BmVeWV6vC",
+  "sort": 0,
+  "_key": "!items!J4Mlwt3BmVeWV6vC"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Rapier_79kmSUqnjHPmUrhQ.json b/src/packs/items/weapons/weapon_Rapier_GldFyzsA56nyVQZR.json
similarity index 68%
rename from src/packs/items/weapons/tier1/weapon_Rapier_79kmSUqnjHPmUrhQ.json
rename to src/packs/items/weapons/weapon_Rapier_GldFyzsA56nyVQZR.json
index 438a7a48..d9b43795 100644
--- a/src/packs/items/weapons/tier1/weapon_Rapier_79kmSUqnjHPmUrhQ.json
+++ b/src/packs/items/weapons/weapon_Rapier_GldFyzsA56nyVQZR.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/rapier.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "presence",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "quick"
+    "feature": "quick",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009451166,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717324656,
+    "modifiedTime": 1748717324656,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "79kmSUqnjHPmUrhQ",
-  "sort": 1000000,
-  "_key": "!items!79kmSUqnjHPmUrhQ"
+  "_id": "GldFyzsA56nyVQZR",
+  "sort": 0,
+  "_key": "!items!GldFyzsA56nyVQZR"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Retractable_Saber_sXyasH1B078wvaSQ.json b/src/packs/items/weapons/weapon_Retractable_Saber_7lqP8EycKwpsYp2H.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Retractable_Saber_sXyasH1B078wvaSQ.json
rename to src/packs/items/weapons/weapon_Retractable_Saber_7lqP8EycKwpsYp2H.json
index c1fea06b..9ead1e04 100644
--- a/src/packs/items/weapons/tier3/weapon_Retractable_Saber_sXyasH1B078wvaSQ.json
+++ b/src/packs/items/weapons/weapon_Retractable_Saber_7lqP8EycKwpsYp2H.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/retractable_saber.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "presence",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "retractable"
+    "feature": "retractable",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009682132,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717509423,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "sXyasH1B078wvaSQ",
-  "sort": 3600000,
-  "_key": "!items!sXyasH1B078wvaSQ"
+  "_id": "7lqP8EycKwpsYp2H",
+  "sort": 1000000,
+  "_key": "!items!7lqP8EycKwpsYp2H"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Returning_Blade_VZ1IzrGqoco0S1FH.json b/src/packs/items/weapons/weapon_Returning_Blade_JsKC4GypAiA67a60.json
similarity index 74%
rename from src/packs/items/weapons/tier1/weapon_Returning_Blade_VZ1IzrGqoco0S1FH.json
rename to src/packs/items/weapons/weapon_Returning_Blade_JsKC4GypAiA67a60.json
index ceefddea..a0388166 100644
--- a/src/packs/items/weapons/tier1/weapon_Returning_Blade_VZ1IzrGqoco0S1FH.json
+++ b/src/packs/items/weapons/weapon_Returning_Blade_JsKC4GypAiA67a60.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/magical/returning_blade.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,15 @@
     "trait": "finesse",
     "range": "close",
     "burden": "oneHanded",
-    "feature": "retrieve"
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009450291,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717326300,
+    "modifiedTime": 1748717326300,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "VZ1IzrGqoco0S1FH",
-  "sort": 900000,
-  "_key": "!items!VZ1IzrGqoco0S1FH"
+  "_id": "JsKC4GypAiA67a60",
+  "sort": 0,
+  "_key": "!items!JsKC4GypAiA67a60"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Ricochet_Axes_9Eqdt9BDUGjfP6Lx.json b/src/packs/items/weapons/weapon_Ricochet_Axes_ianVggptVejn9RnU.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Ricochet_Axes_9Eqdt9BDUGjfP6Lx.json
rename to src/packs/items/weapons/weapon_Ricochet_Axes_ianVggptVejn9RnU.json
index 06f4268a..5ebee5b4 100644
--- a/src/packs/items/weapons/tier4/weapon_Ricochet_Axes_9Eqdt9BDUGjfP6Lx.json
+++ b/src/packs/items/weapons/weapon_Ricochet_Axes_ianVggptVejn9RnU.json
@@ -1,10 +1,8 @@
 {
   "name": "Ricochet Axes",
   "type": "weapon",
-  "_id": "9Eqdt9BDUGjfP6Lx",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/ricochet_axes.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "agility",
     "feature": "bouncing",
     "range": "far",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748036183658,
-    "modifiedTime": 1748036197458,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717577623,
+    "modifiedTime": 1748717577648,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!9Eqdt9BDUGjfP6Lx"
+  "_id": "ianVggptVejn9RnU",
+  "sort": 200000,
+  "_key": "!items!ianVggptVejn9RnU"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Runes_of_Ruination_HEcvQ9sX8NlqWuKN.json b/src/packs/items/weapons/weapon_Runes_of_Ruination_SyrN9HZ2q5J3uw7f.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Runes_of_Ruination_HEcvQ9sX8NlqWuKN.json
rename to src/packs/items/weapons/weapon_Runes_of_Ruination_SyrN9HZ2q5J3uw7f.json
index f8926af2..a8c6d9e4 100644
--- a/src/packs/items/weapons/tier3/weapon_Runes_of_Ruination_HEcvQ9sX8NlqWuKN.json
+++ b/src/packs/items/weapons/weapon_Runes_of_Ruination_SyrN9HZ2q5J3uw7f.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/runes_of_ruination.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "knowledge",
     "range": "veryClose",
     "burden": "oneHanded",
-    "feature": "painful"
+    "feature": "painful",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009681254,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717510342,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "HEcvQ9sX8NlqWuKN",
-  "sort": 3400000,
-  "_key": "!items!HEcvQ9sX8NlqWuKN"
+  "_id": "SyrN9HZ2q5J3uw7f",
+  "sort": 1100000,
+  "_key": "!items!SyrN9HZ2q5J3uw7f"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Scepter_teDiNLXxtTYzFVaX.json b/src/packs/items/weapons/weapon_Scepter_As9XfR5ZpwnfcEsM.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Scepter_teDiNLXxtTYzFVaX.json
rename to src/packs/items/weapons/weapon_Scepter_As9XfR5ZpwnfcEsM.json
index 47ce6171..32d85e6e 100644
--- a/src/packs/items/weapons/tier1/weapon_Scepter_teDiNLXxtTYzFVaX.json
+++ b/src/packs/items/weapons/weapon_Scepter_As9XfR5ZpwnfcEsM.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/magical/scepter.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "presence",
     "range": "far",
     "burden": "twoHanded",
-    "feature": "versatile"
+    "feature": "versatile",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009449461,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717328765,
+    "modifiedTime": 1748717328765,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "teDiNLXxtTYzFVaX",
-  "sort": 1800000,
-  "_key": "!items!teDiNLXxtTYzFVaX"
+  "_id": "As9XfR5ZpwnfcEsM",
+  "sort": 0,
+  "_key": "!items!As9XfR5ZpwnfcEsM"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Scepter_of_Elias_N5nXkW5NBN2UYawJ.json b/src/packs/items/weapons/weapon_Scepter_of_Elias_XIrmU6NCXXElx2JI.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Scepter_of_Elias_N5nXkW5NBN2UYawJ.json
rename to src/packs/items/weapons/weapon_Scepter_of_Elias_XIrmU6NCXXElx2JI.json
index eebb3b58..96790016 100644
--- a/src/packs/items/weapons/tier2/weapon_Scepter_of_Elias_N5nXkW5NBN2UYawJ.json
+++ b/src/packs/items/weapons/weapon_Scepter_of_Elias_XIrmU6NCXXElx2JI.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/scepter_of_elias.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "presence",
     "range": "far",
     "burden": "oneHanded",
-    "feature": "invigorating"
+    "feature": "invigorating",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009505571,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717439440,
+    "modifiedTime": 1748717439440,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "N5nXkW5NBN2UYawJ",
-  "sort": 3000000,
-  "_key": "!items!N5nXkW5NBN2UYawJ"
+  "_id": "XIrmU6NCXXElx2JI",
+  "sort": 0,
+  "_key": "!items!XIrmU6NCXXElx2JI"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Shortbow_7PMPT9r312jr5Vuu.json b/src/packs/items/weapons/weapon_Shortbow_GoooPAB5sJ9eDPWz.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Shortbow_7PMPT9r312jr5Vuu.json
rename to src/packs/items/weapons/weapon_Shortbow_GoooPAB5sJ9eDPWz.json
index 2dfc662f..9392141b 100644
--- a/src/packs/items/weapons/tier1/weapon_Shortbow_7PMPT9r312jr5Vuu.json
+++ b/src/packs/items/weapons/weapon_Shortbow_GoooPAB5sJ9eDPWz.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/shortbow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "agility",
     "range": "far",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009448691,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717331306,
+    "modifiedTime": 1748717331306,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "7PMPT9r312jr5Vuu",
-  "sort": 1900000,
-  "_key": "!items!7PMPT9r312jr5Vuu"
+  "_id": "GoooPAB5sJ9eDPWz",
+  "sort": 0,
+  "_key": "!items!GoooPAB5sJ9eDPWz"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Shortstaff_m6qCbG7WQ9fy3jhT.json b/src/packs/items/weapons/weapon_Shortstaff_ydm5W8kYujEbElmj.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Shortstaff_m6qCbG7WQ9fy3jhT.json
rename to src/packs/items/weapons/weapon_Shortstaff_ydm5W8kYujEbElmj.json
index ba917f77..c19c1486 100644
--- a/src/packs/items/weapons/tier1/weapon_Shortstaff_m6qCbG7WQ9fy3jhT.json
+++ b/src/packs/items/weapons/weapon_Shortstaff_ydm5W8kYujEbElmj.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/magical/shortstaff.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "instinct",
     "range": "close",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009447942,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717334049,
+    "modifiedTime": 1748717334049,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "m6qCbG7WQ9fy3jhT",
-  "sort": 1700000,
-  "_key": "!items!m6qCbG7WQ9fy3jhT"
+  "_id": "ydm5W8kYujEbElmj",
+  "sort": 0,
+  "_key": "!items!ydm5W8kYujEbElmj"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Siphoning_Gauntlets_sVAw2DRc5goXxFVk.json b/src/packs/items/weapons/weapon_Siphoning_Gauntlets_WdbNUGWB2Dsx0JLs.json
similarity index 69%
rename from src/packs/items/weapons/tier4/weapon_Siphoning_Gauntlets_sVAw2DRc5goXxFVk.json
rename to src/packs/items/weapons/weapon_Siphoning_Gauntlets_WdbNUGWB2Dsx0JLs.json
index 79c771c0..adad70ab 100644
--- a/src/packs/items/weapons/tier4/weapon_Siphoning_Gauntlets_sVAw2DRc5goXxFVk.json
+++ b/src/packs/items/weapons/weapon_Siphoning_Gauntlets_WdbNUGWB2Dsx0JLs.json
@@ -1,10 +1,8 @@
 {
   "name": "Siphoning Gauntlets",
   "type": "weapon",
-  "_id": "sVAw2DRc5goXxFVk",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/siphoning_gauntlets.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "presence",
     "feature": "lifestealing",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748037919641,
-    "modifiedTime": 1748037941422,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717578566,
+    "modifiedTime": 1748717578566,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!sVAw2DRc5goXxFVk"
+  "_id": "WdbNUGWB2Dsx0JLs",
+  "sort": 0,
+  "_key": "!items!WdbNUGWB2Dsx0JLs"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Sledge_Axe_ltCk06bPulLKwMs0.json b/src/packs/items/weapons/weapon_Sledge_Axe_BYcF7qAR8yR5Rv0f.json
similarity index 68%
rename from src/packs/items/weapons/tier4/weapon_Sledge_Axe_ltCk06bPulLKwMs0.json
rename to src/packs/items/weapons/weapon_Sledge_Axe_BYcF7qAR8yR5Rv0f.json
index 0c7c5199..850b7055 100644
--- a/src/packs/items/weapons/tier4/weapon_Sledge_Axe_ltCk06bPulLKwMs0.json
+++ b/src/packs/items/weapons/weapon_Sledge_Axe_BYcF7qAR8yR5Rv0f.json
@@ -1,10 +1,8 @@
 {
   "name": "Sledge Axe",
   "type": "weapon",
-  "_id": "ltCk06bPulLKwMs0",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/sledge_axe.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "strength",
     "feature": "destructive",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748035931856,
-    "modifiedTime": 1748035964268,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717579882,
+    "modifiedTime": 1748717579882,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!ltCk06bPulLKwMs0"
+  "_id": "BYcF7qAR8yR5Rv0f",
+  "sort": 0,
+  "_key": "!items!BYcF7qAR8yR5Rv0f"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Spear_weKCJX4KfbaL26W4.json b/src/packs/items/weapons/weapon_Spear_ZsX59BQsuGvlB3mw.json
similarity index 67%
rename from src/packs/items/weapons/tier1/weapon_Spear_weKCJX4KfbaL26W4.json
rename to src/packs/items/weapons/weapon_Spear_ZsX59BQsuGvlB3mw.json
index db7ecd03..215db200 100644
--- a/src/packs/items/weapons/tier1/weapon_Spear_weKCJX4KfbaL26W4.json
+++ b/src/packs/items/weapons/weapon_Spear_ZsX59BQsuGvlB3mw.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/spear.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "finesse",
     "range": "veryClose",
     "burden": "twoHanded",
-    "feature": "cumbersome"
+    "feature": "cumbersome",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009446966,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717336219,
+    "modifiedTime": 1748717336219,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "weKCJX4KfbaL26W4",
-  "sort": 2100000,
-  "_key": "!items!weKCJX4KfbaL26W4"
+  "_id": "ZsX59BQsuGvlB3mw",
+  "sort": 0,
+  "_key": "!items!ZsX59BQsuGvlB3mw"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Spiked_Bow_UF2AEiCmIftqllAB.json b/src/packs/items/weapons/weapon_Spiked_Bow_oyQRdPFBkPu1G7uN.json
similarity index 67%
rename from src/packs/items/weapons/tier3/weapon_Spiked_Bow_UF2AEiCmIftqllAB.json
rename to src/packs/items/weapons/weapon_Spiked_Bow_oyQRdPFBkPu1G7uN.json
index 999d1d78..90020bd1 100644
--- a/src/packs/items/weapons/tier3/weapon_Spiked_Bow_UF2AEiCmIftqllAB.json
+++ b/src/packs/items/weapons/weapon_Spiked_Bow_oyQRdPFBkPu1G7uN.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/spiked_bow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "agility",
     "range": "veryFar",
     "burden": "twoHanded",
-    "feature": "versatile"
+    "feature": "versatile",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009680484,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717511737,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "UF2AEiCmIftqllAB",
-  "sort": 3800000,
-  "_key": "!items!UF2AEiCmIftqllAB"
+  "_id": "oyQRdPFBkPu1G7uN",
+  "sort": 1200000,
+  "_key": "!items!oyQRdPFBkPu1G7uN"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Steelforged_Halberd_vSixA7cq1nQYxvCH.json b/src/packs/items/weapons/weapon_Steelforged_Halberd_rrWmGNT0L0Cvw9Tx.json
similarity index 69%
rename from src/packs/items/weapons/tier2/weapon_Steelforged_Halberd_vSixA7cq1nQYxvCH.json
rename to src/packs/items/weapons/weapon_Steelforged_Halberd_rrWmGNT0L0Cvw9Tx.json
index 5d53cdfe..6f9f3254 100644
--- a/src/packs/items/weapons/tier2/weapon_Steelforged_Halberd_vSixA7cq1nQYxvCH.json
+++ b/src/packs/items/weapons/weapon_Steelforged_Halberd_rrWmGNT0L0Cvw9Tx.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/steelforged_halberd.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "veryClose",
     "burden": "twoHanded",
-    "feature": "scary"
+    "feature": "scary",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009504802,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717441444,
+    "modifiedTime": 1748717441444,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "vSixA7cq1nQYxvCH",
-  "sort": 2900000,
-  "_key": "!items!vSixA7cq1nQYxvCH"
+  "_id": "rrWmGNT0L0Cvw9Tx",
+  "sort": 0,
+  "_key": "!items!rrWmGNT0L0Cvw9Tx"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Swinging_Ropeblade_n3KjqDGkTteA0akJ.json b/src/packs/items/weapons/weapon_Swinging_Ropeblade_e6DVC3wUxMM7puMK.json
similarity index 69%
rename from src/packs/items/weapons/tier4/weapon_Swinging_Ropeblade_n3KjqDGkTteA0akJ.json
rename to src/packs/items/weapons/weapon_Swinging_Ropeblade_e6DVC3wUxMM7puMK.json
index cc09568d..6154390b 100644
--- a/src/packs/items/weapons/tier4/weapon_Swinging_Ropeblade_n3KjqDGkTteA0akJ.json
+++ b/src/packs/items/weapons/weapon_Swinging_Ropeblade_e6DVC3wUxMM7puMK.json
@@ -1,10 +1,8 @@
 {
   "name": "Swinging Ropeblade",
   "type": "weapon",
-  "_id": "n3KjqDGkTteA0akJ",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/physical/swinging_ropeblade.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "presence",
     "feature": "grappling",
     "range": "close",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748036149445,
-    "modifiedTime": 1748036170107,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717581081,
+    "modifiedTime": 1748717581081,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!n3KjqDGkTteA0akJ"
+  "_id": "e6DVC3wUxMM7puMK",
+  "sort": 0,
+  "_key": "!items!e6DVC3wUxMM7puMK"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Sword_of_Light___Flame_rgWjQGvUvgbk1h7d.json b/src/packs/items/weapons/weapon_Sword_of_Light___Flame_8Sa5TccQvhWde1O7.json
similarity index 68%
rename from src/packs/items/weapons/tier4/weapon_Sword_of_Light___Flame_rgWjQGvUvgbk1h7d.json
rename to src/packs/items/weapons/weapon_Sword_of_Light___Flame_8Sa5TccQvhWde1O7.json
index 4ef4907d..c3af3775 100644
--- a/src/packs/items/weapons/tier4/weapon_Sword_of_Light___Flame_rgWjQGvUvgbk1h7d.json
+++ b/src/packs/items/weapons/weapon_Sword_of_Light___Flame_8Sa5TccQvhWde1O7.json
@@ -1,10 +1,8 @@
 {
   "name": "Sword of Light & Flame",
   "type": "weapon",
-  "_id": "rgWjQGvUvgbk1h7d",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/sword_of_light_flame.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,16 +12,16 @@
     "quantity": 1,
     "description": "",
     "trait": "strength",
-    "feature": "chargedAttack",
     "range": "melee",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +31,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748037560954,
-    "modifiedTime": 1748037607118,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717581996,
+    "modifiedTime": 1748717581996,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!rgWjQGvUvgbk1h7d"
+  "_id": "8Sa5TccQvhWde1O7",
+  "sort": 0,
+  "_key": "!items!8Sa5TccQvhWde1O7"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Talon_Blades_32DXoEEDbV3J8amu.json b/src/packs/items/weapons/weapon_Talon_Blades_lswl0hauQmLAQh58.json
similarity index 68%
rename from src/packs/items/weapons/tier3/weapon_Talon_Blades_32DXoEEDbV3J8amu.json
rename to src/packs/items/weapons/weapon_Talon_Blades_lswl0hauQmLAQh58.json
index 8c32454a..020093cf 100644
--- a/src/packs/items/weapons/tier3/weapon_Talon_Blades_32DXoEEDbV3J8amu.json
+++ b/src/packs/items/weapons/weapon_Talon_Blades_lswl0hauQmLAQh58.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/physical/talon_blades.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "finesse",
     "range": "close",
     "burden": "twoHanded",
-    "feature": "brutal"
+    "feature": "brutal",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009679650,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717513931,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "32DXoEEDbV3J8amu",
-  "sort": 3900000,
-  "_key": "!items!32DXoEEDbV3J8amu"
+  "_id": "lswl0hauQmLAQh58",
+  "sort": 1300000,
+  "_key": "!items!lswl0hauQmLAQh58"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Thistlebow_oOhEjWqxLlAIcKjX.json b/src/packs/items/weapons/weapon_Thistlebow_FoLC2rSujCBXxtZ9.json
similarity index 68%
rename from src/packs/items/weapons/tier4/weapon_Thistlebow_oOhEjWqxLlAIcKjX.json
rename to src/packs/items/weapons/weapon_Thistlebow_FoLC2rSujCBXxtZ9.json
index 24a6f6a3..092631db 100644
--- a/src/packs/items/weapons/tier4/weapon_Thistlebow_oOhEjWqxLlAIcKjX.json
+++ b/src/packs/items/weapons/weapon_Thistlebow_FoLC2rSujCBXxtZ9.json
@@ -1,10 +1,8 @@
 {
   "name": "Thistlebow",
   "type": "weapon",
-  "_id": "oOhEjWqxLlAIcKjX",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/thistlebow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -16,14 +14,15 @@
     "trait": "instinct",
     "feature": "reliable",
     "range": "far",
-    "burden": "twoHanded"
+    "burden": "twoHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748038319940,
-    "modifiedTime": 1748038336938,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717582991,
+    "modifiedTime": 1748717582991,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!oOhEjWqxLlAIcKjX"
+  "_id": "FoLC2rSujCBXxtZ9",
+  "sort": 0,
+  "_key": "!items!FoLC2rSujCBXxtZ9"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Urok_Broadsword_RpTkQgMbI3KlAXB6.json b/src/packs/items/weapons/weapon_Urok_Broadsword_kpp3gAPXoke7mx0d.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Urok_Broadsword_RpTkQgMbI3KlAXB6.json
rename to src/packs/items/weapons/weapon_Urok_Broadsword_kpp3gAPXoke7mx0d.json
index 411fc04b..8c67d46c 100644
--- a/src/packs/items/weapons/tier2/weapon_Urok_Broadsword_RpTkQgMbI3KlAXB6.json
+++ b/src/packs/items/weapons/weapon_Urok_Broadsword_kpp3gAPXoke7mx0d.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/urok_broadsword.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "finesse",
     "range": "melee",
     "burden": "oneHanded",
-    "feature": "devastating"
+    "feature": "devastating",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009504025,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717444575,
+    "modifiedTime": 1748717444575,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "RpTkQgMbI3KlAXB6",
-  "sort": 2800000,
-  "_key": "!items!RpTkQgMbI3KlAXB6"
+  "_id": "kpp3gAPXoke7mx0d",
+  "sort": 0,
+  "_key": "!items!kpp3gAPXoke7mx0d"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Wand_of_Enthrallment_ME6aDBfBjecVkdoZ.json b/src/packs/items/weapons/weapon_Wand_of_Enthrallment_8u0tnoaSBpRWmVex.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Wand_of_Enthrallment_ME6aDBfBjecVkdoZ.json
rename to src/packs/items/weapons/weapon_Wand_of_Enthrallment_8u0tnoaSBpRWmVex.json
index 46705df6..6899f777 100644
--- a/src/packs/items/weapons/tier2/weapon_Wand_of_Enthrallment_ME6aDBfBjecVkdoZ.json
+++ b/src/packs/items/weapons/weapon_Wand_of_Enthrallment_8u0tnoaSBpRWmVex.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/wand_of_enthrallment.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "presence",
     "range": "far",
     "burden": "oneHanded",
-    "feature": "persuasive"
+    "feature": "persuasive",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009503226,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717447447,
+    "modifiedTime": 1748717447447,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "ME6aDBfBjecVkdoZ",
-  "sort": 3900000,
-  "_key": "!items!ME6aDBfBjecVkdoZ"
+  "_id": "8u0tnoaSBpRWmVex",
+  "sort": 0,
+  "_key": "!items!8u0tnoaSBpRWmVex"
 }
diff --git a/src/packs/items/weapons/tier4/weapon_Wand_of_Essek_mp8s5umPvk4Vw25q.json b/src/packs/items/weapons/weapon_Wand_of_Essek_lNWN759jT1Z098RI.json
similarity index 67%
rename from src/packs/items/weapons/tier4/weapon_Wand_of_Essek_mp8s5umPvk4Vw25q.json
rename to src/packs/items/weapons/weapon_Wand_of_Essek_lNWN759jT1Z098RI.json
index 184a65c3..4fc224d4 100644
--- a/src/packs/items/weapons/tier4/weapon_Wand_of_Essek_mp8s5umPvk4Vw25q.json
+++ b/src/packs/items/weapons/weapon_Wand_of_Essek_lNWN759jT1Z098RI.json
@@ -1,10 +1,8 @@
 {
   "name": "Wand of Essek",
   "type": "weapon",
-  "_id": "mp8s5umPvk4Vw25q",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_4/magical/wand_of_essek.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,16 +12,16 @@
     "quantity": 1,
     "description": "",
     "trait": "knowledge",
-    "feature": "timebender",
     "range": "far",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "UNDVQEo6UtTuueNQ",
   "ownership": {
     "default": 0,
-    "ei8OkswTzyDp4IGC": 3
+    "ei8OkswTzyDp4IGC": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -33,9 +31,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748038190876,
-    "modifiedTime": 1748038227799,
-    "lastModifiedBy": "ei8OkswTzyDp4IGC"
+    "createdTime": 1748717584048,
+    "modifiedTime": 1748717584048,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_key": "!items!mp8s5umPvk4Vw25q"
+  "_id": "lNWN759jT1Z098RI",
+  "sort": 0,
+  "_key": "!items!lNWN759jT1Z098RI"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Wand_95kiAjBsDA4aYgCJ.json b/src/packs/items/weapons/weapon_Wand_pTOX05HxPJgwwMnf.json
similarity index 66%
rename from src/packs/items/weapons/tier1/weapon_Wand_95kiAjBsDA4aYgCJ.json
rename to src/packs/items/weapons/weapon_Wand_pTOX05HxPJgwwMnf.json
index a1c438aa..0e067837 100644
--- a/src/packs/items/weapons/tier1/weapon_Wand_95kiAjBsDA4aYgCJ.json
+++ b/src/packs/items/weapons/weapon_Wand_pTOX05HxPJgwwMnf.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/magical/wand.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -14,14 +13,16 @@
     "description": "",
     "trait": "knowledge",
     "range": "far",
-    "burden": "oneHanded"
+    "burden": "oneHanded",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -31,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009445897,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717337955,
+    "modifiedTime": 1748717337955,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "95kiAjBsDA4aYgCJ",
-  "sort": 2200000,
-  "_key": "!items!95kiAjBsDA4aYgCJ"
+  "_id": "pTOX05HxPJgwwMnf",
+  "sort": 0,
+  "_key": "!items!pTOX05HxPJgwwMnf"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_War_Scythe_EidEr900k7AatPed.json b/src/packs/items/weapons/weapon_War_Scythe_UhWpEKkfo9mjRgnw.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_War_Scythe_EidEr900k7AatPed.json
rename to src/packs/items/weapons/weapon_War_Scythe_UhWpEKkfo9mjRgnw.json
index 755ed928..fbff35bd 100644
--- a/src/packs/items/weapons/tier2/weapon_War_Scythe_EidEr900k7AatPed.json
+++ b/src/packs/items/weapons/weapon_War_Scythe_UhWpEKkfo9mjRgnw.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/physical/war_scythe.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "finesse",
     "range": "veryClose",
     "burden": "twoHanded",
-    "feature": "reliable"
+    "feature": "reliable",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009502355,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717449196,
+    "modifiedTime": 1748717449196,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "EidEr900k7AatPed",
-  "sort": 4000000,
-  "_key": "!items!EidEr900k7AatPed"
+  "_id": "UhWpEKkfo9mjRgnw",
+  "sort": 0,
+  "_key": "!items!UhWpEKkfo9mjRgnw"
 }
diff --git a/src/packs/items/weapons/tier1/weapon_Warhammer_EUUq7W9U7XOCvc0Z.json b/src/packs/items/weapons/weapon_Warhammer_54gLWy5YhwB9YeTA.json
similarity index 68%
rename from src/packs/items/weapons/tier1/weapon_Warhammer_EUUq7W9U7XOCvc0Z.json
rename to src/packs/items/weapons/weapon_Warhammer_54gLWy5YhwB9YeTA.json
index 8c73721d..6976e9b4 100644
--- a/src/packs/items/weapons/tier1/weapon_Warhammer_EUUq7W9U7XOCvc0Z.json
+++ b/src/packs/items/weapons/weapon_Warhammer_54gLWy5YhwB9YeTA.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_1/physical/warhammer.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "strength",
     "range": "melee",
     "burden": "twoHanded",
-    "feature": "heavy"
+    "feature": "heavy",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "d7tdCsIUd94XuTtq",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009445078,
-    "modifiedTime": 1748009467975,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717339775,
+    "modifiedTime": 1748717339775,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "EUUq7W9U7XOCvc0Z",
-  "sort": 2000000,
-  "_key": "!items!EUUq7W9U7XOCvc0Z"
+  "_id": "54gLWy5YhwB9YeTA",
+  "sort": 0,
+  "_key": "!items!54gLWy5YhwB9YeTA"
 }
diff --git a/src/packs/items/weapons/tier3/weapon_Widogast_Pendant_MIvqgdCV9IbQ3gdm.json b/src/packs/items/weapons/weapon_Widogast_Pendant_6wASGCohz4Y7CxjK.json
similarity index 70%
rename from src/packs/items/weapons/tier3/weapon_Widogast_Pendant_MIvqgdCV9IbQ3gdm.json
rename to src/packs/items/weapons/weapon_Widogast_Pendant_6wASGCohz4Y7CxjK.json
index 4eccd9be..24d7fb18 100644
--- a/src/packs/items/weapons/tier3/weapon_Widogast_Pendant_MIvqgdCV9IbQ3gdm.json
+++ b/src/packs/items/weapons/weapon_Widogast_Pendant_6wASGCohz4Y7CxjK.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_3/magical/widogast_pendant.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,15 @@
     "trait": "knowledge",
     "range": "close",
     "burden": "oneHanded",
-    "feature": "timebender"
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "oreMpiiytMRaR9sy",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +32,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009678700,
-    "modifiedTime": 1748009720858,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717516383,
+    "modifiedTime": 1748717516398,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "MIvqgdCV9IbQ3gdm",
-  "sort": 3700000,
-  "_key": "!items!MIvqgdCV9IbQ3gdm"
+  "_id": "6wASGCohz4Y7CxjK",
+  "sort": 900000,
+  "_key": "!items!6wASGCohz4Y7CxjK"
 }
diff --git a/src/packs/items/weapons/tier2/weapon_Yutari_Bloodbow_YAeJexbo14oCp8SF.json b/src/packs/items/weapons/weapon_Yutari_Bloodbow_zDVW3GhTnSwISSxF.json
similarity index 68%
rename from src/packs/items/weapons/tier2/weapon_Yutari_Bloodbow_YAeJexbo14oCp8SF.json
rename to src/packs/items/weapons/weapon_Yutari_Bloodbow_zDVW3GhTnSwISSxF.json
index 2196eb66..2addf1d4 100644
--- a/src/packs/items/weapons/tier2/weapon_Yutari_Bloodbow_YAeJexbo14oCp8SF.json
+++ b/src/packs/items/weapons/weapon_Yutari_Bloodbow_zDVW3GhTnSwISSxF.json
@@ -3,7 +3,6 @@
   "type": "weapon",
   "img": "systems/daggerheart/assets/icons/weapons/primary/tier_2/magical/yutari_bloodbow.png",
   "system": {
-    "active": false,
     "inventoryWeapon": null,
     "secondary": false,
     "damage": {
@@ -15,14 +14,16 @@
     "trait": "finesse",
     "range": "far",
     "burden": "twoHanded",
-    "feature": "brutal"
+    "feature": "brutal",
+    "equipped": false
   },
   "effects": [],
-  "folder": null,
+  "folder": "ereMKW01MCYg0qUY",
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3,
-    "JKaKJsbixtjbUa07": 3
+    "JKaKJsbixtjbUa07": 3,
+    "WafZqd6qLGpBRGTt": 3
   },
   "flags": {},
   "_stats": {
@@ -32,11 +33,11 @@
     "coreVersion": "13.344",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
-    "createdTime": 1748009501453,
-    "modifiedTime": 1748009543035,
-    "lastModifiedBy": "JKaKJsbixtjbUa07"
+    "createdTime": 1748717451048,
+    "modifiedTime": 1748717451048,
+    "lastModifiedBy": "WafZqd6qLGpBRGTt"
   },
-  "_id": "YAeJexbo14oCp8SF",
-  "sort": 3800000,
-  "_key": "!items!YAeJexbo14oCp8SF"
+  "_id": "zDVW3GhTnSwISSxF",
+  "sort": 0,
+  "_key": "!items!zDVW3GhTnSwISSxF"
 }
diff --git a/src/packs/subclasses/folders_Bard_GdwNrxosxgFCMwUJ.json b/src/packs/subclasses/folders_Bard_GdwNrxosxgFCMwUJ.json
new file mode 100644
index 00000000..e7e8aba9
--- /dev/null
+++ b/src/packs/subclasses/folders_Bard_GdwNrxosxgFCMwUJ.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Bard",
+  "color": null,
+  "sorting": "a",
+  "_id": "GdwNrxosxgFCMwUJ",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748710754682,
+    "modifiedTime": 1748710754682,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!GdwNrxosxgFCMwUJ"
+}
diff --git a/src/packs/subclasses/folders_Druid_8o3AE33T1pSQH296.json b/src/packs/subclasses/folders_Druid_8o3AE33T1pSQH296.json
new file mode 100644
index 00000000..208512b0
--- /dev/null
+++ b/src/packs/subclasses/folders_Druid_8o3AE33T1pSQH296.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Druid",
+  "color": null,
+  "sorting": "a",
+  "_id": "8o3AE33T1pSQH296",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748710759338,
+    "modifiedTime": 1748710759338,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!8o3AE33T1pSQH296"
+}
diff --git a/src/packs/subclasses/folders_Guardian_GECczaEI6KI9W7B7.json b/src/packs/subclasses/folders_Guardian_GECczaEI6KI9W7B7.json
new file mode 100644
index 00000000..ca69a32e
--- /dev/null
+++ b/src/packs/subclasses/folders_Guardian_GECczaEI6KI9W7B7.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Guardian",
+  "color": null,
+  "sorting": "a",
+  "_id": "GECczaEI6KI9W7B7",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748710765365,
+    "modifiedTime": 1748710765365,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!GECczaEI6KI9W7B7"
+}
diff --git a/src/packs/subclasses/folders_Ranger_cTmpeni3Jg55NkX4.json b/src/packs/subclasses/folders_Ranger_cTmpeni3Jg55NkX4.json
new file mode 100644
index 00000000..609c8475
--- /dev/null
+++ b/src/packs/subclasses/folders_Ranger_cTmpeni3Jg55NkX4.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Ranger",
+  "color": null,
+  "sorting": "a",
+  "_id": "cTmpeni3Jg55NkX4",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748710771596,
+    "modifiedTime": 1748710771596,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!cTmpeni3Jg55NkX4"
+}
diff --git a/src/packs/subclasses/folders_Rogue_2ifNVaI1HZtXVSdf.json b/src/packs/subclasses/folders_Rogue_2ifNVaI1HZtXVSdf.json
new file mode 100644
index 00000000..361524ab
--- /dev/null
+++ b/src/packs/subclasses/folders_Rogue_2ifNVaI1HZtXVSdf.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Rogue",
+  "color": null,
+  "sorting": "a",
+  "_id": "2ifNVaI1HZtXVSdf",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748710777343,
+    "modifiedTime": 1748710777343,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!2ifNVaI1HZtXVSdf"
+}
diff --git a/src/packs/subclasses/folders_Seraph_8fx2IqJphzGyrZbx.json b/src/packs/subclasses/folders_Seraph_8fx2IqJphzGyrZbx.json
new file mode 100644
index 00000000..39eb0cfa
--- /dev/null
+++ b/src/packs/subclasses/folders_Seraph_8fx2IqJphzGyrZbx.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Seraph",
+  "color": null,
+  "sorting": "a",
+  "_id": "8fx2IqJphzGyrZbx",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748710783410,
+    "modifiedTime": 1748710783410,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!8fx2IqJphzGyrZbx"
+}
diff --git a/src/packs/subclasses/folders_Sorcerer_3H1ThzHW4rZStZrr.json b/src/packs/subclasses/folders_Sorcerer_3H1ThzHW4rZStZrr.json
new file mode 100644
index 00000000..13f215d0
--- /dev/null
+++ b/src/packs/subclasses/folders_Sorcerer_3H1ThzHW4rZStZrr.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Sorcerer",
+  "color": null,
+  "sorting": "a",
+  "_id": "3H1ThzHW4rZStZrr",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748710789227,
+    "modifiedTime": 1748710789227,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!3H1ThzHW4rZStZrr"
+}
diff --git a/src/packs/subclasses/folders_Warrior_OzZ4UX9B6eNEzF49.json b/src/packs/subclasses/folders_Warrior_OzZ4UX9B6eNEzF49.json
new file mode 100644
index 00000000..cd0bcd40
--- /dev/null
+++ b/src/packs/subclasses/folders_Warrior_OzZ4UX9B6eNEzF49.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Warrior",
+  "color": null,
+  "sorting": "a",
+  "_id": "OzZ4UX9B6eNEzF49",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748710794270,
+    "modifiedTime": 1748710794270,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!OzZ4UX9B6eNEzF49"
+}
diff --git a/src/packs/subclasses/folders_Wizard_H1Djv0I92cn25M4t.json b/src/packs/subclasses/folders_Wizard_H1Djv0I92cn25M4t.json
new file mode 100644
index 00000000..2cac09dc
--- /dev/null
+++ b/src/packs/subclasses/folders_Wizard_H1Djv0I92cn25M4t.json
@@ -0,0 +1,23 @@
+{
+  "type": "Item",
+  "folder": null,
+  "name": "Wizard",
+  "color": null,
+  "sorting": "a",
+  "_id": "H1Djv0I92cn25M4t",
+  "description": "",
+  "sort": 0,
+  "flags": {},
+  "_stats": {
+    "compendiumSource": null,
+    "duplicateSource": null,
+    "exportSource": null,
+    "coreVersion": "13.344",
+    "systemId": "daggerheart",
+    "systemVersion": "0.0.1",
+    "createdTime": 1748710800425,
+    "modifiedTime": 1748710800425,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
+  },
+  "_key": "!folders!H1Djv0I92cn25M4t"
+}
diff --git a/src/packs/subclasses/subclass_Troubadour_T1iBO8i0xRF5c8Q2.json b/src/packs/subclasses/subclass_Troubadour_T1iBO8i0xRF5c8Q2.json
index 7fe389b1..e4e87698 100644
--- a/src/packs/subclasses/subclass_Troubadour_T1iBO8i0xRF5c8Q2.json
+++ b/src/packs/subclasses/subclass_Troubadour_T1iBO8i0xRF5c8Q2.json
@@ -25,8 +25,8 @@
     "multiclass": null
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "GdwNrxosxgFCMwUJ",
+  "sort": 100000,
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3
@@ -40,8 +40,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1747991594334,
-    "modifiedTime": 1747991866434,
-    "lastModifiedBy": "NqO2eQGMjrvUO6v9"
+    "modifiedTime": 1748710816900,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!T1iBO8i0xRF5c8Q2"
 }
diff --git a/src/packs/subclasses/subclass_Wordsmith_FXT65YDVWFy85EI0.json b/src/packs/subclasses/subclass_Wordsmith_FXT65YDVWFy85EI0.json
index e0b7f70b..c8e4c3d4 100644
--- a/src/packs/subclasses/subclass_Wordsmith_FXT65YDVWFy85EI0.json
+++ b/src/packs/subclasses/subclass_Wordsmith_FXT65YDVWFy85EI0.json
@@ -25,8 +25,8 @@
     "multiclass": null
   },
   "effects": [],
-  "folder": null,
-  "sort": 0,
+  "folder": "GdwNrxosxgFCMwUJ",
+  "sort": 200000,
   "ownership": {
     "default": 0,
     "NqO2eQGMjrvUO6v9": 3
@@ -40,8 +40,8 @@
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1747991988842,
-    "modifiedTime": 1747992014955,
-    "lastModifiedBy": "NqO2eQGMjrvUO6v9"
+    "modifiedTime": 1748710818443,
+    "lastModifiedBy": "MxkU9FQYKmOxbdzm"
   },
   "_key": "!items!FXT65YDVWFy85EI0"
 }
diff --git a/system.json b/system.json
index dd875adb..0d7b75f7 100644
--- a/system.json
+++ b/system.json
@@ -68,82 +68,10 @@
             "flags": {}
         },
         {
-            "name": "arcana-domain",
-            "label": "Arcana",
+            "name": "domains",
+            "label": "Domains",
             "system": "daggerheart",
-            "path": "packs/domain-cards/arcana.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "blade-domain",
-            "label": "Blade",
-            "system": "daggerheart",
-            "path": "packs/domain-cards/blade.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "bone-domain",
-            "label": "Bone",
-            "system": "daggerheart",
-            "path": "packs/domain-cards/bone.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "codex-domain",
-            "label": "Codex",
-            "system": "daggerheart",
-            "path": "packs/domain-cards/codex.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "grace-domain",
-            "label": "Grace",
-            "system": "daggerheart",
-            "path": "packs/domain-cards/grace.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "midnight-domain",
-            "label": "Midnight",
-            "system": "daggerheart",
-            "path": "packs/domain-cards/midnight.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "sage-domain",
-            "label": "Sage",
-            "system": "daggerheart",
-            "path": "packs/domain-cards/sage.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "splendor-domain",
-            "label": "Splendor",
-            "system": "daggerheart",
-            "path": "packs/domain-cards/splendor.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "valor-domain",
-            "label": "Valor",
-            "system": "daggerheart",
-            "path": "packs/domain-cards/valor.db",
+            "path": "packs/domains.db",
             "type": "Item",
             "private": false,
             "flags": {}
@@ -176,73 +104,19 @@
             "flags": {}
         },
         {
-            "name": "weapons-tier1",
-            "label": "Tier 1",
+            "name": "weapons",
+            "label": "Weapons",
             "system": "daggerheart",
-            "path": "packs/items/weapons/tier1.db",
+            "path": "packs/items/weapons.db",
             "type": "Item",
             "private": false,
             "flags": {}
         },
         {
-            "name": "weapons-tier2",
-            "label": "Tier 2",
+            "name": "armors",
+            "label": "Armors",
             "system": "daggerheart",
-            "path": "packs/items/weapons/tier2.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "weapons-tier3",
-            "label": "Tier 3",
-            "system": "daggerheart",
-            "path": "packs/items/weapons/tier3.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "weapons-tier4",
-            "label": "Tier 4",
-            "system": "daggerheart",
-            "path": "packs/items/weapons/tier4.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "armor-tier1",
-            "label": "Tier 1",
-            "system": "daggerheart",
-            "path": "packs/items/armor/tier1.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "armor-tier2",
-            "label": "Tier 2",
-            "system": "daggerheart",
-            "path": "packs/items/armor/tier2.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "armor-tier3",
-            "label": "Tier 3",
-            "system": "daggerheart",
-            "path": "packs/items/armor/tier3.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "armor-tier4",
-            "label": "Tier 4",
-            "system": "daggerheart",
-            "path": "packs/items/armor/tier4.db",
+            "path": "packs/items/armors.db",
             "type": "Item",
             "private": false,
             "flags": {}
@@ -266,73 +140,19 @@
             "flags": {}
         },
         {
-            "name": "adversaries-tier1",
-            "label": "Tier 1",
+            "name": "adversaries",
+            "label": "Adversaries",
             "system": "daggerheart",
-            "path": "packs/adversaries/tier1.db",
+            "path": "packs/adversaries.db",
             "type": "Item",
             "private": false,
             "flags": {}
         },
         {
-            "name": "adversaries-tier2",
-            "label": "Tier 2",
+            "name": "environments",
+            "label": "Environments",
             "system": "daggerheart",
-            "path": "packs/adversaries/tier2.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "adversaries-tier3",
-            "label": "Tier 3",
-            "system": "daggerheart",
-            "path": "packs/adversaries/tier3.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "adversaries-tier4",
-            "label": "Tier 4",
-            "system": "daggerheart",
-            "path": "packs/adversaries/tier4.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "environments-tier1",
-            "label": "Tier 1",
-            "system": "daggerheart",
-            "path": "packs/environments/tier1.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "environments-tier2",
-            "label": "Tier 2",
-            "system": "daggerheart",
-            "path": "packs/environments/tier2.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "environments-tier3",
-            "label": "Tier 3",
-            "system": "daggerheart",
-            "path": "packs/environments/tier3.db",
-            "type": "Item",
-            "private": false,
-            "flags": {}
-        },
-        {
-            "name": "environments-tier4",
-            "label": "Tier 4",
-            "system": "daggerheart",
-            "path": "packs/environments/tier4.db",
+            "path": "packs/environments.db",
             "type": "Item",
             "private": false,
             "flags": {}
@@ -343,7 +163,10 @@
             "name": "Daggerheart",
             "sorting": "m",
             "color": "#08718c",
-            "packs": [],
+            "packs": [
+                "adversaries",
+                "environments"
+            ],
             "folders": [
                 {
                     "name": "Character Options",
@@ -353,71 +176,22 @@
                         "classes",
                         "class-features",
                         "subclasses",
+                        "domains",
                         "ancestries",
                         "communities",
                         "community-features"
-                    ],
-                    "folders": [
-                        {
-                            "name": "Domains",
-                            "sorting": "m",
-                            "color": "#000000",
-                            "packs": [
-                                "arcana-domain",
-                                "blade-domain",
-                                "bone-domain",
-                                "codex-domain",
-                                "grace-domain",
-                                "midnight-domain",
-                                "sage-domain",
-                                "splendor-domain",
-                                "valor-domain"
-                            ]
-                        }
                     ]
                 },
                 {
                     "name": "Items",
                     "sorting": "m",
                     "color": "#000000",
-                    "folders": [
-                        {
-                            "name": "Weapons",
-                            "sorting": "m",
-                            "color": "#000000",
-                            "packs": ["weapons-tier1", "weapons-tier2", "weapons-tier3", "weapons-tier4"]
-                        },
-                        {
-                            "name": "Armor",
-                            "sorting": "m",
-                            "color": "#000000",
-                            "packs": ["armor-tier1", "armor-tier2", "armor-tier3", "armor-tier4"]
-                        },
-                        {
-                            "name": "Consumables",
-                            "sorting": "m",
-                            "color": "#000000",
-                            "packs": ["consumables"]
-                        },
-                        {
-                            "name": "General",
-                            "sorting": "m",
-                            "color": "#000000",
-                            "packs": ["general-items"]
-                        }
+                    "packs": [
+                        "weapons",
+                        "armors",
+                        "consumables",
+                        "general-items"
                     ]
-                },
-                {
-                    "name": "Adversaries",
-                    "sorting": "m",
-                    "color": "#000000",
-                    "packs": ["adversaries-tier1", "adversaries-tier2", "adversaries-tier3", "adversaries-tier4"]
-                },
-                {
-                    "name": "Environments",
-                    "sorting": "m",
-                    "color": "#000000",
-                    "packs": ["environments-tier1", "environments-tier2", "environments-tier3", "environments-tier4"]
                 }
             ]
         }