Move lots of the subcommands to proper place, let's see if this works.