Rework / cleanup the command-handler (and rename for command-parser). Update tests (and integrate with sources)
