restructured states by component #26

Closed lmartins91 closed 8 years ago