state classes moved

state features moved to their own package