Major change.

1. Move common to sensor.
2. Adding state map.