Reorganized how the weapon entity s are organized.