Move State record into Behaviour

This provides a better readability imho.

Signed-off-by: chatgris <jboyer@af83.com>