Finesse and Heavy should be weapon properties, not weapon types. Divide weapons into Simple (stuff anybody with functioning hands can use, clubs, scythes, daggers, maces, spears, crossbows, and whatnot) and Martial (Stuff you've gotta have military training to use, swords, axes, bows, pikes and...