Moved things around to be more idiomatic, now the command is a subpackage.