Move states to client package