I think we should make a new rule that you can only restructure code if you explain to people what's actually going on. Like: are we suppose to only update v2 now, or both, which one is the CLI using, etc.

/rant