State Module, not State Declaration
Merge pull request #16460 from basepi/highstatestructure

State Module, not State Declaration