Refactor Action, per new names.ActionTag changes...

... and to improve internal structure.
I think its a slight gain because it's consistent with other state/<entity> documents...?