Move state related scoped to the state module