Big reorganisation of command-line syntax.

42 files changed