Somehow mangled the files on merge.

Revert "Mixing components with states and will later refactor new states into components"

This reverts commit 2af9c7b7d3b4982d0fbe06db64e613603b14d755, reversing
changes made to b825b12e8db37ead81e20b2befdc3f28d567684c.