Organised command classes a bit.

More to come