Major structure rework

combined Mathes into ucMatches and Actions into ucActions

General elegance