Refactor with more generic methods

[darobin]

Right now it's a mess, which is normal for something just grown, but can't be kept forever.

Everything that does a command should be of a clear interface. The way data is exchanged needs to be clarified and centralised. And lists of commands should just be straightforward.