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

... and to improve internal structure.
I almost did this refactor... will do now.