No, it should not.
Small Guns and Big Guns into -> Firearms (both 10mm pistol and minigun goes there),
Energy Weapons -> leave it as it is,
Unarmed -> F2 way so leave it as it is, but add karate, krav maga, special kicks and so on,
Melee Weapons -> merge it with throwing eg. you throw a spear...