Minor changes

The controllers are now dependent on the state, not the other way
around.
Some name changes