ActionTag refactor leading to state package refactoring too