Fix namespacing issues in Thor

Thor refuses to write the correct banner. It's still workable though
when we override the banner method and use namespaces for our
subcommands.
Minor reformatting