Refactor to MaterialType and ItemType

And move to datatypes.skills