hashtable: Move from mware/ to struct/