Put the cmdliner stuff in the same module tree

This is more convenient for functorisation.

Signed-off-by: David Scott <dave.scott@citrix.com>