diff --git a/src/Cli/dotnet/commands/dotnet-add/AddCommandParser.cs b/src/Cli/dotnet/commands/Add/AddCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/AddCommandParser.cs
rename to src/Cli/dotnet/commands/Add/AddCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-add/LocalizableStrings.resx b/src/Cli/dotnet/commands/Add/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Add/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs b/src/Cli/dotnet/commands/Add/dotnet-add-package/AddPackageParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs
rename to src/Cli/dotnet/commands/Add/dotnet-add-package/AddPackageParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-add/dotnet-add-reference/AddProjectToProjectReferenceParser.cs b/src/Cli/dotnet/commands/Add/dotnet-add-reference/AddProjectToProjectReferenceParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/dotnet-add-reference/AddProjectToProjectReferenceParser.cs
rename to src/Cli/dotnet/commands/Add/dotnet-add-reference/AddProjectToProjectReferenceParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-add/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Add/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-build/BuildCommand.cs b/src/Cli/dotnet/commands/Build/BuildCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/BuildCommand.cs
rename to src/Cli/dotnet/commands/Build/BuildCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-build/BuildCommandParser.cs b/src/Cli/dotnet/commands/Build/BuildCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/BuildCommandParser.cs
rename to src/Cli/dotnet/commands/Build/BuildCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-build/LocalizableStrings.resx b/src/Cli/dotnet/commands/Build/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Build/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-build/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Build/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/BuildServerCommandParser.cs b/src/Cli/dotnet/commands/BuildServer/BuildServerCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/BuildServerCommandParser.cs
rename to src/Cli/dotnet/commands/BuildServer/BuildServerCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/LocalizableStrings.resx b/src/Cli/dotnet/commands/BuildServer/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/BuildServer/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/BuildServerShutdownCommand.cs b/src/Cli/dotnet/commands/BuildServer/shutdown/BuildServerShutdownCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/BuildServerShutdownCommand.cs
rename to src/Cli/dotnet/commands/BuildServer/shutdown/BuildServerShutdownCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/BuildServerShutdownCommandParser.cs b/src/Cli/dotnet/commands/BuildServer/shutdown/BuildServerShutdownCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/BuildServerShutdownCommandParser.cs
rename to src/Cli/dotnet/commands/BuildServer/shutdown/BuildServerShutdownCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/LocalizableStrings.resx b/src/Cli/dotnet/commands/BuildServer/shutdown/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/BuildServer/shutdown/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/BuildServer/shutdown/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/BuildServer/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-clean/CleanCommandParser.cs b/src/Cli/dotnet/commands/Clean/CleanCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/CleanCommandParser.cs
rename to src/Cli/dotnet/commands/Clean/CleanCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-clean/LocalizableStrings.resx b/src/Cli/dotnet/commands/Clean/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Clean/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-clean/Program.cs b/src/Cli/dotnet/commands/Clean/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/Program.cs
rename to src/Cli/dotnet/commands/Clean/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Clean/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-complete/Complete.cs b/src/Cli/dotnet/commands/Complete/Complete.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-complete/Complete.cs
rename to src/Cli/dotnet/commands/Complete/Complete.cs
diff --git a/src/Cli/dotnet/commands/dotnet-complete/CompleteCommand.cs b/src/Cli/dotnet/commands/Complete/CompleteCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-complete/CompleteCommand.cs
rename to src/Cli/dotnet/commands/Complete/CompleteCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-complete/CompleteCommandParser.cs b/src/Cli/dotnet/commands/Complete/CompleteCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-complete/CompleteCommandParser.cs
rename to src/Cli/dotnet/commands/Complete/CompleteCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-complete/ParseCommand.cs b/src/Cli/dotnet/commands/Complete/ParseCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-complete/ParseCommand.cs
rename to src/Cli/dotnet/commands/Complete/ParseCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-complete/ParseCommandParser.cs b/src/Cli/dotnet/commands/Complete/ParseCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-complete/ParseCommandParser.cs
rename to src/Cli/dotnet/commands/Complete/ParseCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-format/DotnetFormatForwardingApp.cs b/src/Cli/dotnet/commands/Format/DotnetFormatForwardingApp.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-format/DotnetFormatForwardingApp.cs
rename to src/Cli/dotnet/commands/Format/DotnetFormatForwardingApp.cs
diff --git a/src/Cli/dotnet/commands/dotnet-format/FormatCommand.cs b/src/Cli/dotnet/commands/Format/FormatCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-format/FormatCommand.cs
rename to src/Cli/dotnet/commands/Format/FormatCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-format/FormatCommandParser.cs b/src/Cli/dotnet/commands/Format/FormatCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-format/FormatCommandParser.cs
rename to src/Cli/dotnet/commands/Format/FormatCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-fsi/FsiCommandParser.cs b/src/Cli/dotnet/commands/Fsi/FsiCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-fsi/FsiCommandParser.cs
rename to src/Cli/dotnet/commands/Fsi/FsiCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-fsi/FsiForwardingApp.cs b/src/Cli/dotnet/commands/Fsi/FsiForwardingApp.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-fsi/FsiForwardingApp.cs
rename to src/Cli/dotnet/commands/Fsi/FsiForwardingApp.cs
diff --git a/src/Cli/dotnet/commands/dotnet-fsi/Program.cs b/src/Cli/dotnet/commands/Fsi/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-fsi/Program.cs
rename to src/Cli/dotnet/commands/Fsi/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-help/HelpCommand.cs b/src/Cli/dotnet/commands/Help/HelpCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/HelpCommand.cs
rename to src/Cli/dotnet/commands/Help/HelpCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-help/HelpCommandParser.cs b/src/Cli/dotnet/commands/Help/HelpCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/HelpCommandParser.cs
rename to src/Cli/dotnet/commands/Help/HelpCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-help/HelpUsageText.cs b/src/Cli/dotnet/commands/Help/HelpUsageText.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/HelpUsageText.cs
rename to src/Cli/dotnet/commands/Help/HelpUsageText.cs
diff --git a/src/Cli/dotnet/commands/dotnet-help/LocalizableStrings.resx b/src/Cli/dotnet/commands/Help/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Help/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Help/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-internal-reportinstallsuccess/InternalReportinstallsuccessCommand.cs b/src/Cli/dotnet/commands/InternalReportInstallSuccess/InternalReportinstallsuccessCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-internal-reportinstallsuccess/InternalReportinstallsuccessCommand.cs
rename to src/Cli/dotnet/commands/InternalReportInstallSuccess/InternalReportinstallsuccessCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-internal-reportinstallsuccess/InternalReportinstallsuccessCommandParser.cs b/src/Cli/dotnet/commands/InternalReportInstallSuccess/InternalReportinstallsuccessCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-internal-reportinstallsuccess/InternalReportinstallsuccessCommandParser.cs
rename to src/Cli/dotnet/commands/InternalReportInstallSuccess/InternalReportinstallsuccessCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-list/ListCommandParser.cs b/src/Cli/dotnet/commands/List/ListCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/ListCommandParser.cs
rename to src/Cli/dotnet/commands/List/ListCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-list/LocalizableStrings.resx b/src/Cli/dotnet/commands/List/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/List/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommandParser.cs b/src/Cli/dotnet/commands/List/dotnet-list-package/ListPackageReferencesCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommandParser.cs
rename to src/Cli/dotnet/commands/List/dotnet-list-package/ListPackageReferencesCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-list/dotnet-list-reference/ListProjectToProjectReferencesCommandParser.cs b/src/Cli/dotnet/commands/List/dotnet-list-reference/ListProjectToProjectReferencesCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/dotnet-list-reference/ListProjectToProjectReferencesCommandParser.cs
rename to src/Cli/dotnet/commands/List/dotnet-list-reference/ListProjectToProjectReferencesCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/List/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/List/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/List/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/List/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/List/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/List/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/List/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/List/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/List/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/List/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/List/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/List/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/List/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/List/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/List/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/List/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/List/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/List/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/List/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/List/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/List/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/List/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/List/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/List/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/List/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-list/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/List/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-msbuild/MSBuildCommandParser.cs b/src/Cli/dotnet/commands/MSBuild/MSBuildCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-msbuild/MSBuildCommandParser.cs
rename to src/Cli/dotnet/commands/MSBuild/MSBuildCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs b/src/Cli/dotnet/commands/MSBuild/MSBuildForwardingApp.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs
rename to src/Cli/dotnet/commands/MSBuild/MSBuildForwardingApp.cs
diff --git a/src/Cli/dotnet/commands/dotnet-msbuild/MSBuildForwardingLogger.cs b/src/Cli/dotnet/commands/MSBuild/MSBuildForwardingLogger.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-msbuild/MSBuildForwardingLogger.cs
rename to src/Cli/dotnet/commands/MSBuild/MSBuildForwardingLogger.cs
diff --git a/src/Cli/dotnet/commands/dotnet-msbuild/MSBuildLogger.cs b/src/Cli/dotnet/commands/MSBuild/MSBuildLogger.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-msbuild/MSBuildLogger.cs
rename to src/Cli/dotnet/commands/MSBuild/MSBuildLogger.cs
diff --git a/src/Cli/dotnet/commands/dotnet-msbuild/Program.cs b/src/Cli/dotnet/commands/MSBuild/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-msbuild/Program.cs
rename to src/Cli/dotnet/commands/MSBuild/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/BuiltInTemplatePackageProvider.cs b/src/Cli/dotnet/commands/New/BuiltInTemplatePackageProvider.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/BuiltInTemplatePackageProvider.cs
rename to src/Cli/dotnet/commands/New/BuiltInTemplatePackageProvider.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/BuiltInTemplatePackageProviderFactory.cs b/src/Cli/dotnet/commands/New/BuiltInTemplatePackageProviderFactory.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/BuiltInTemplatePackageProviderFactory.cs
rename to src/Cli/dotnet/commands/New/BuiltInTemplatePackageProviderFactory.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/DotnetCommandCallbacks.cs b/src/Cli/dotnet/commands/New/DotnetCommandCallbacks.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/DotnetCommandCallbacks.cs
rename to src/Cli/dotnet/commands/New/DotnetCommandCallbacks.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/LocalizableStrings.resx b/src/Cli/dotnet/commands/New/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/New/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/CapabilityExpressionEvaluator.cs b/src/Cli/dotnet/commands/New/MSBuildEvaluation/CapabilityExpressionEvaluator.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/CapabilityExpressionEvaluator.cs
rename to src/Cli/dotnet/commands/New/MSBuildEvaluation/CapabilityExpressionEvaluator.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/MSBuildEvaluationResult.cs b/src/Cli/dotnet/commands/New/MSBuildEvaluation/MSBuildEvaluationResult.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/MSBuildEvaluationResult.cs
rename to src/Cli/dotnet/commands/New/MSBuildEvaluation/MSBuildEvaluationResult.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/MSBuildEvaluator.cs b/src/Cli/dotnet/commands/New/MSBuildEvaluation/MSBuildEvaluator.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/MSBuildEvaluator.cs
rename to src/Cli/dotnet/commands/New/MSBuildEvaluation/MSBuildEvaluator.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/MultiTargetEvaluationResult.cs b/src/Cli/dotnet/commands/New/MSBuildEvaluation/MultiTargetEvaluationResult.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/MultiTargetEvaluationResult.cs
rename to src/Cli/dotnet/commands/New/MSBuildEvaluation/MultiTargetEvaluationResult.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/MultipleProjectsEvaluationResult.cs b/src/Cli/dotnet/commands/New/MSBuildEvaluation/MultipleProjectsEvaluationResult.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/MultipleProjectsEvaluationResult.cs
rename to src/Cli/dotnet/commands/New/MSBuildEvaluation/MultipleProjectsEvaluationResult.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/NonSDKStyleEvaluationResult.cs b/src/Cli/dotnet/commands/New/MSBuildEvaluation/NonSDKStyleEvaluationResult.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/NonSDKStyleEvaluationResult.cs
rename to src/Cli/dotnet/commands/New/MSBuildEvaluation/NonSDKStyleEvaluationResult.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/ProjectCapabilityConstraint.cs b/src/Cli/dotnet/commands/New/MSBuildEvaluation/ProjectCapabilityConstraint.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/ProjectCapabilityConstraint.cs
rename to src/Cli/dotnet/commands/New/MSBuildEvaluation/ProjectCapabilityConstraint.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/ProjectContextSymbolSource.cs b/src/Cli/dotnet/commands/New/MSBuildEvaluation/ProjectContextSymbolSource.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/ProjectContextSymbolSource.cs
rename to src/Cli/dotnet/commands/New/MSBuildEvaluation/ProjectContextSymbolSource.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/SDKStyleEvaluationResult.cs b/src/Cli/dotnet/commands/New/MSBuildEvaluation/SDKStyleEvaluationResult.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/MSBuildEvaluation/SDKStyleEvaluationResult.cs
rename to src/Cli/dotnet/commands/New/MSBuildEvaluation/SDKStyleEvaluationResult.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/NewCommandParser.cs b/src/Cli/dotnet/commands/New/NewCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/NewCommandParser.cs
rename to src/Cli/dotnet/commands/New/NewCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/OptionalWorkloadProvider.cs b/src/Cli/dotnet/commands/New/OptionalWorkloadProvider.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/OptionalWorkloadProvider.cs
rename to src/Cli/dotnet/commands/New/OptionalWorkloadProvider.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/OptionalWorkloadProviderFactory.cs b/src/Cli/dotnet/commands/New/OptionalWorkloadProviderFactory.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/OptionalWorkloadProviderFactory.cs
rename to src/Cli/dotnet/commands/New/OptionalWorkloadProviderFactory.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/PostActions/DotnetAddPostActionProcessor.cs b/src/Cli/dotnet/commands/New/PostActions/DotnetAddPostActionProcessor.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/PostActions/DotnetAddPostActionProcessor.cs
rename to src/Cli/dotnet/commands/New/PostActions/DotnetAddPostActionProcessor.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/PostActions/DotnetRestorePostActionProcessor.cs b/src/Cli/dotnet/commands/New/PostActions/DotnetRestorePostActionProcessor.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/PostActions/DotnetRestorePostActionProcessor.cs
rename to src/Cli/dotnet/commands/New/PostActions/DotnetRestorePostActionProcessor.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/PostActions/DotnetSlnPostActionProcessor.cs b/src/Cli/dotnet/commands/New/PostActions/DotnetSlnPostActionProcessor.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/PostActions/DotnetSlnPostActionProcessor.cs
rename to src/Cli/dotnet/commands/New/PostActions/DotnetSlnPostActionProcessor.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/README.md b/src/Cli/dotnet/commands/New/README.md
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/README.md
rename to src/Cli/dotnet/commands/New/README.md
diff --git a/src/Cli/dotnet/commands/dotnet-new/SdkInfoProvider.cs b/src/Cli/dotnet/commands/New/SdkInfoProvider.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/SdkInfoProvider.cs
rename to src/Cli/dotnet/commands/New/SdkInfoProvider.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/WorkloadsInfoProvider.cs b/src/Cli/dotnet/commands/New/WorkloadsInfoProvider.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/WorkloadsInfoProvider.cs
rename to src/Cli/dotnet/commands/New/WorkloadsInfoProvider.cs
diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/New/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/New/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/New/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/New/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/New/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/New/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/New/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/New/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/New/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/New/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/New/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/New/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/New/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/New/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/New/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/New/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/New/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/New/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/New/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/New/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/New/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/New/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/New/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/New/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/New/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-new/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/New/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-nuget/NuGetCommandParser.cs b/src/Cli/dotnet/commands/NuGet/NuGetCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-nuget/NuGetCommandParser.cs
rename to src/Cli/dotnet/commands/NuGet/NuGetCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-nuget/Program.cs b/src/Cli/dotnet/commands/NuGet/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-nuget/Program.cs
rename to src/Cli/dotnet/commands/NuGet/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-pack/LocalizableStrings.resx b/src/Cli/dotnet/commands/Pack/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Pack/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-pack/PackCommand.cs b/src/Cli/dotnet/commands/Pack/PackCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/PackCommand.cs
rename to src/Cli/dotnet/commands/Pack/PackCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-pack/PackCommandParser.cs b/src/Cli/dotnet/commands/Pack/PackCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/PackCommandParser.cs
rename to src/Cli/dotnet/commands/Pack/PackCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Pack/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/PackageCommandParser.cs b/src/Cli/dotnet/commands/Package/PackageCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/PackageCommandParser.cs
rename to src/Cli/dotnet/commands/Package/PackageCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/LocalizableStrings.resx b/src/Cli/dotnet/commands/Package/add/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Package/add/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/PackageAddCommandParser.cs b/src/Cli/dotnet/commands/Package/add/PackageAddCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/PackageAddCommandParser.cs
rename to src/Cli/dotnet/commands/Package/add/PackageAddCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/Program.cs b/src/Cli/dotnet/commands/Package/add/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/Program.cs
rename to src/Cli/dotnet/commands/Package/add/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/add/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Package/add/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/ListPackageReferencesCommand.cs b/src/Cli/dotnet/commands/Package/list/ListPackageReferencesCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/ListPackageReferencesCommand.cs
rename to src/Cli/dotnet/commands/Package/list/ListPackageReferencesCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/LocalizableStrings.resx b/src/Cli/dotnet/commands/Package/list/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Package/list/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/PackageListCommandParser.cs b/src/Cli/dotnet/commands/Package/list/PackageListCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/PackageListCommandParser.cs
rename to src/Cli/dotnet/commands/Package/list/PackageListCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/ReportOutputFormat.cs b/src/Cli/dotnet/commands/Package/list/ReportOutputFormat.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/ReportOutputFormat.cs
rename to src/Cli/dotnet/commands/Package/list/ReportOutputFormat.cs
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/list/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Package/list/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/LocalizableStrings.resx b/src/Cli/dotnet/commands/Package/remove/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Package/remove/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/PackageRemoveCommandParser.cs b/src/Cli/dotnet/commands/Package/remove/PackageRemoveCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/PackageRemoveCommandParser.cs
rename to src/Cli/dotnet/commands/Package/remove/PackageRemoveCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/Program.cs b/src/Cli/dotnet/commands/Package/remove/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/Program.cs
rename to src/Cli/dotnet/commands/Package/remove/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/remove/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Package/remove/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/LocalizableStrings.resx b/src/Cli/dotnet/commands/Package/search/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Package/search/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/PackageSearchCommand.cs b/src/Cli/dotnet/commands/Package/search/PackageSearchCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/PackageSearchCommand.cs
rename to src/Cli/dotnet/commands/Package/search/PackageSearchCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/PackageSearchCommandParser.cs b/src/Cli/dotnet/commands/Package/search/PackageSearchCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/PackageSearchCommandParser.cs
rename to src/Cli/dotnet/commands/Package/search/PackageSearchCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Package/search/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-project/ProjectCommandParser.cs b/src/Cli/dotnet/commands/Project/ProjectCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/ProjectCommandParser.cs
rename to src/Cli/dotnet/commands/Project/ProjectCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/LocalizableStrings.resx b/src/Cli/dotnet/commands/Project/convert/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Project/convert/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/ProjectConvertCommand.cs b/src/Cli/dotnet/commands/Project/convert/ProjectConvertCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/ProjectConvertCommand.cs
rename to src/Cli/dotnet/commands/Project/convert/ProjectConvertCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/ProjectConvertCommandParser.cs b/src/Cli/dotnet/commands/Project/convert/ProjectConvertCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/ProjectConvertCommandParser.cs
rename to src/Cli/dotnet/commands/Project/convert/ProjectConvertCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Project/convert/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-publish/LocalizableStrings.resx b/src/Cli/dotnet/commands/Publish/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Publish/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-publish/Program.cs b/src/Cli/dotnet/commands/Publish/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/Program.cs
rename to src/Cli/dotnet/commands/Publish/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-publish/PublishCommandParser.cs b/src/Cli/dotnet/commands/Publish/PublishCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/PublishCommandParser.cs
rename to src/Cli/dotnet/commands/Publish/PublishCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Publish/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/ReferenceCommandParser.cs b/src/Cli/dotnet/commands/Reference/ReferenceCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/ReferenceCommandParser.cs
rename to src/Cli/dotnet/commands/Reference/ReferenceCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/LocalizableStrings.resx b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/Program.cs b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/Program.cs
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/ReferenceAddCommandParser.cs b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/ReferenceAddCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/ReferenceAddCommandParser.cs
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/ReferenceAddCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-add/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-add/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/ListProjectToProjectReferencesCommand.cs b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/ListProjectToProjectReferencesCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/ListProjectToProjectReferencesCommand.cs
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/ListProjectToProjectReferencesCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/LocalizableStrings.resx b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/ReferenceListCommandParser.cs b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/ReferenceListCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/ReferenceListCommandParser.cs
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/ReferenceListCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-list/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-list/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/LocalizableStrings.resx b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/Program.cs b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/Program.cs
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/ReferenceRemoveCommandParser.cs b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/ReferenceRemoveCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/ReferenceRemoveCommandParser.cs
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/ReferenceRemoveCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-reference/dotnet-reference-remove/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Reference/dotnet-reference-remove/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-remove/LocalizableStrings.resx b/src/Cli/dotnet/commands/Remove/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Remove/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-remove/RemoveCommandParser.cs b/src/Cli/dotnet/commands/Remove/RemoveCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/RemoveCommandParser.cs
rename to src/Cli/dotnet/commands/Remove/RemoveCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-remove/dotnet-remove-package/RemovePackageParser.cs b/src/Cli/dotnet/commands/Remove/dotnet-remove-package/RemovePackageParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/dotnet-remove-package/RemovePackageParser.cs
rename to src/Cli/dotnet/commands/Remove/dotnet-remove-package/RemovePackageParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-remove/dotnet-remove-reference/RemoveProjectToProjectReferenceParser.cs b/src/Cli/dotnet/commands/Remove/dotnet-remove-reference/RemoveProjectToProjectReferenceParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/dotnet-remove-reference/RemoveProjectToProjectReferenceParser.cs
rename to src/Cli/dotnet/commands/Remove/dotnet-remove-reference/RemoveProjectToProjectReferenceParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Remove/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore/LocalizableStrings.resx b/src/Cli/dotnet/commands/Restore/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Restore/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-restore/Program.cs b/src/Cli/dotnet/commands/Restore/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/Program.cs
rename to src/Cli/dotnet/commands/Restore/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs b/src/Cli/dotnet/commands/Restore/RestoreCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs
rename to src/Cli/dotnet/commands/Restore/RestoreCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-restore/RestoringCommand.cs b/src/Cli/dotnet/commands/Restore/RestoringCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/RestoringCommand.cs
rename to src/Cli/dotnet/commands/Restore/RestoringCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Restore/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/NuGet3.cs b/src/Cli/dotnet/commands/RestoreProjectJson/NuGet3.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/NuGet3.cs
rename to src/Cli/dotnet/commands/RestoreProjectJson/NuGet3.cs
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/Program.cs b/src/Cli/dotnet/commands/RestoreProjectJson/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/Program.cs
rename to src/Cli/dotnet/commands/RestoreProjectJson/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/README.md b/src/Cli/dotnet/commands/RestoreProjectJson/README.md
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/README.md
rename to src/Cli/dotnet/commands/RestoreProjectJson/README.md
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-restore-projectjson/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/RestoreProjectJson/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-run/CommonRunHelpers.cs b/src/Cli/dotnet/commands/Run/CommonRunHelpers.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/CommonRunHelpers.cs
rename to src/Cli/dotnet/commands/Run/CommonRunHelpers.cs
diff --git a/src/Cli/dotnet/commands/dotnet-run/LaunchSettings/ILaunchSettingsProvider.cs b/src/Cli/dotnet/commands/Run/LaunchSettings/ILaunchSettingsProvider.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/LaunchSettings/ILaunchSettingsProvider.cs
rename to src/Cli/dotnet/commands/Run/LaunchSettings/ILaunchSettingsProvider.cs
diff --git a/src/Cli/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsApplyResult.cs b/src/Cli/dotnet/commands/Run/LaunchSettings/LaunchSettingsApplyResult.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsApplyResult.cs
rename to src/Cli/dotnet/commands/Run/LaunchSettings/LaunchSettingsApplyResult.cs
diff --git a/src/Cli/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsManager.cs b/src/Cli/dotnet/commands/Run/LaunchSettings/LaunchSettingsManager.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsManager.cs
rename to src/Cli/dotnet/commands/Run/LaunchSettings/LaunchSettingsManager.cs
diff --git a/src/Cli/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsModel.cs b/src/Cli/dotnet/commands/Run/LaunchSettings/ProjectLaunchSettingsModel.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsModel.cs
rename to src/Cli/dotnet/commands/Run/LaunchSettings/ProjectLaunchSettingsModel.cs
diff --git a/src/Cli/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsProvider.cs b/src/Cli/dotnet/commands/Run/LaunchSettings/ProjectLaunchSettingsProvider.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsProvider.cs
rename to src/Cli/dotnet/commands/Run/LaunchSettings/ProjectLaunchSettingsProvider.cs
diff --git a/src/Cli/dotnet/commands/dotnet-run/LocalizableStrings.resx b/src/Cli/dotnet/commands/Run/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Run/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-run/Program.cs b/src/Cli/dotnet/commands/Run/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/Program.cs
rename to src/Cli/dotnet/commands/Run/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-run/RunCommand.cs b/src/Cli/dotnet/commands/Run/RunCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/RunCommand.cs
rename to src/Cli/dotnet/commands/Run/RunCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-run/RunCommandParser.cs b/src/Cli/dotnet/commands/Run/RunCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/RunCommandParser.cs
rename to src/Cli/dotnet/commands/Run/RunCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-run/RunProperties.cs b/src/Cli/dotnet/commands/Run/RunProperties.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/RunProperties.cs
rename to src/Cli/dotnet/commands/Run/RunProperties.cs
diff --git a/src/Cli/dotnet/commands/dotnet-run/VirtualProjectBuildingCommand.cs b/src/Cli/dotnet/commands/Run/VirtualProjectBuildingCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/VirtualProjectBuildingCommand.cs
rename to src/Cli/dotnet/commands/Run/VirtualProjectBuildingCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Run/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/LocalizableStrings.resx b/src/Cli/dotnet/commands/Sdk/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Sdk/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/SdkCommandParser.cs b/src/Cli/dotnet/commands/Sdk/SdkCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/SdkCommandParser.cs
rename to src/Cli/dotnet/commands/Sdk/SdkCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/BundleOutputWriter.cs b/src/Cli/dotnet/commands/Sdk/check/BundleOutputWriter.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/BundleOutputWriter.cs
rename to src/Cli/dotnet/commands/Sdk/check/BundleOutputWriter.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/IProductCollectionProvider.cs b/src/Cli/dotnet/commands/Sdk/check/IProductCollectionProvider.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/IProductCollectionProvider.cs
rename to src/Cli/dotnet/commands/Sdk/check/IProductCollectionProvider.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/LocalizableStrings.resx b/src/Cli/dotnet/commands/Sdk/check/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Sdk/check/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/ProductCollectionProvider.cs b/src/Cli/dotnet/commands/Sdk/check/ProductCollectionProvider.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/ProductCollectionProvider.cs
rename to src/Cli/dotnet/commands/Sdk/check/ProductCollectionProvider.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/Program.cs b/src/Cli/dotnet/commands/Sdk/check/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/Program.cs
rename to src/Cli/dotnet/commands/Sdk/check/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/RuntimeOutputWriter.cs b/src/Cli/dotnet/commands/Sdk/check/RuntimeOutputWriter.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/RuntimeOutputWriter.cs
rename to src/Cli/dotnet/commands/Sdk/check/RuntimeOutputWriter.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/SdkCheckCommandParser.cs b/src/Cli/dotnet/commands/Sdk/check/SdkCheckCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/SdkCheckCommandParser.cs
rename to src/Cli/dotnet/commands/Sdk/check/SdkCheckCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/SdkOutputWriter.cs b/src/Cli/dotnet/commands/Sdk/check/SdkOutputWriter.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/SdkOutputWriter.cs
rename to src/Cli/dotnet/commands/Sdk/check/SdkOutputWriter.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Sdk/check/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sdk/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Sdk/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sln/LocalizableStrings.resx b/src/Cli/dotnet/commands/Solution/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Solution/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-sln/SlnArgumentValidator.cs b/src/Cli/dotnet/commands/Solution/SlnArgumentValidator.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/SlnArgumentValidator.cs
rename to src/Cli/dotnet/commands/Solution/SlnArgumentValidator.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sln/SlnCommandParser.cs b/src/Cli/dotnet/commands/Solution/SlnCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/SlnCommandParser.cs
rename to src/Cli/dotnet/commands/Solution/SlnCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sln/add/Program.cs b/src/Cli/dotnet/commands/Solution/add/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/add/Program.cs
rename to src/Cli/dotnet/commands/Solution/add/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sln/add/SlnAddParser.cs b/src/Cli/dotnet/commands/Solution/add/SlnAddParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/add/SlnAddParser.cs
rename to src/Cli/dotnet/commands/Solution/add/SlnAddParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sln/list/Program.cs b/src/Cli/dotnet/commands/Solution/list/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/list/Program.cs
rename to src/Cli/dotnet/commands/Solution/list/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sln/list/SlnListParser.cs b/src/Cli/dotnet/commands/Solution/list/SlnListParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/list/SlnListParser.cs
rename to src/Cli/dotnet/commands/Solution/list/SlnListParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sln/migrate/SlnMigrateCommand.cs b/src/Cli/dotnet/commands/Solution/migrate/SlnMigrateCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/migrate/SlnMigrateCommand.cs
rename to src/Cli/dotnet/commands/Solution/migrate/SlnMigrateCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sln/migrate/SlnMigrateCommandParser.cs b/src/Cli/dotnet/commands/Solution/migrate/SlnMigrateCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/migrate/SlnMigrateCommandParser.cs
rename to src/Cli/dotnet/commands/Solution/migrate/SlnMigrateCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sln/remove/Program.cs b/src/Cli/dotnet/commands/Solution/remove/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/remove/Program.cs
rename to src/Cli/dotnet/commands/Solution/remove/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sln/remove/SlnRemoveParser.cs b/src/Cli/dotnet/commands/Solution/remove/SlnRemoveParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/remove/SlnRemoveParser.cs
rename to src/Cli/dotnet/commands/Solution/remove/SlnRemoveParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Solution/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-store/LocalizableStrings.resx b/src/Cli/dotnet/commands/Store/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Store/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-store/Program.cs b/src/Cli/dotnet/commands/Store/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/Program.cs
rename to src/Cli/dotnet/commands/Store/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-store/StoreCommandParser.cs b/src/Cli/dotnet/commands/Store/StoreCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/StoreCommandParser.cs
rename to src/Cli/dotnet/commands/Store/StoreCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-store/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Store/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-test/CliConstants.cs b/src/Cli/dotnet/commands/Test/CliConstants.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/CliConstants.cs
rename to src/Cli/dotnet/commands/Test/CliConstants.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/CustomEventArgs.cs b/src/Cli/dotnet/commands/Test/CustomEventArgs.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/CustomEventArgs.cs
rename to src/Cli/dotnet/commands/Test/CustomEventArgs.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/ExitCode.cs b/src/Cli/dotnet/commands/Test/ExitCode.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/ExitCode.cs
rename to src/Cli/dotnet/commands/Test/ExitCode.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/IClient.cs b/src/Cli/dotnet/commands/Test/IPC/IClient.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/IClient.cs
rename to src/Cli/dotnet/commands/Test/IPC/IClient.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/INamedPipeBase.cs b/src/Cli/dotnet/commands/Test/IPC/INamedPipeBase.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/INamedPipeBase.cs
rename to src/Cli/dotnet/commands/Test/IPC/INamedPipeBase.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/INamedPipeSerializer.cs b/src/Cli/dotnet/commands/Test/IPC/INamedPipeSerializer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/INamedPipeSerializer.cs
rename to src/Cli/dotnet/commands/Test/IPC/INamedPipeSerializer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/IRequest.cs b/src/Cli/dotnet/commands/Test/IPC/IRequest.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/IRequest.cs
rename to src/Cli/dotnet/commands/Test/IPC/IRequest.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/IResponse.cs b/src/Cli/dotnet/commands/Test/IPC/IResponse.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/IResponse.cs
rename to src/Cli/dotnet/commands/Test/IPC/IResponse.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/IServer.cs b/src/Cli/dotnet/commands/Test/IPC/IServer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/IServer.cs
rename to src/Cli/dotnet/commands/Test/IPC/IServer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Models/CommandLineOptionMessages.cs b/src/Cli/dotnet/commands/Test/IPC/Models/CommandLineOptionMessages.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Models/CommandLineOptionMessages.cs
rename to src/Cli/dotnet/commands/Test/IPC/Models/CommandLineOptionMessages.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Models/DiscoveredTestMessages.cs b/src/Cli/dotnet/commands/Test/IPC/Models/DiscoveredTestMessages.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Models/DiscoveredTestMessages.cs
rename to src/Cli/dotnet/commands/Test/IPC/Models/DiscoveredTestMessages.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Models/FileArtifactMessages.cs b/src/Cli/dotnet/commands/Test/IPC/Models/FileArtifactMessages.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Models/FileArtifactMessages.cs
rename to src/Cli/dotnet/commands/Test/IPC/Models/FileArtifactMessages.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Models/HandshakeMessage.cs b/src/Cli/dotnet/commands/Test/IPC/Models/HandshakeMessage.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Models/HandshakeMessage.cs
rename to src/Cli/dotnet/commands/Test/IPC/Models/HandshakeMessage.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Models/ModuleMessage.cs b/src/Cli/dotnet/commands/Test/IPC/Models/ModuleMessage.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Models/ModuleMessage.cs
rename to src/Cli/dotnet/commands/Test/IPC/Models/ModuleMessage.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Models/TestResultMessages.cs b/src/Cli/dotnet/commands/Test/IPC/Models/TestResultMessages.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Models/TestResultMessages.cs
rename to src/Cli/dotnet/commands/Test/IPC/Models/TestResultMessages.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Models/TestSessionEvent.cs b/src/Cli/dotnet/commands/Test/IPC/Models/TestSessionEvent.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Models/TestSessionEvent.cs
rename to src/Cli/dotnet/commands/Test/IPC/Models/TestSessionEvent.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Models/UnknownMessage.cs b/src/Cli/dotnet/commands/Test/IPC/Models/UnknownMessage.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Models/UnknownMessage.cs
rename to src/Cli/dotnet/commands/Test/IPC/Models/UnknownMessage.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Models/VoidResponse.cs b/src/Cli/dotnet/commands/Test/IPC/Models/VoidResponse.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Models/VoidResponse.cs
rename to src/Cli/dotnet/commands/Test/IPC/Models/VoidResponse.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/NamedPipeBase.cs b/src/Cli/dotnet/commands/Test/IPC/NamedPipeBase.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/NamedPipeBase.cs
rename to src/Cli/dotnet/commands/Test/IPC/NamedPipeBase.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/NamedPipeClient.cs b/src/Cli/dotnet/commands/Test/IPC/NamedPipeClient.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/NamedPipeClient.cs
rename to src/Cli/dotnet/commands/Test/IPC/NamedPipeClient.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/NamedPipeServer.cs b/src/Cli/dotnet/commands/Test/IPC/NamedPipeServer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/NamedPipeServer.cs
rename to src/Cli/dotnet/commands/Test/IPC/NamedPipeServer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/ObjectFieldIds.cs b/src/Cli/dotnet/commands/Test/IPC/ObjectFieldIds.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/ObjectFieldIds.cs
rename to src/Cli/dotnet/commands/Test/IPC/ObjectFieldIds.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/PipeNameDescription.cs b/src/Cli/dotnet/commands/Test/IPC/PipeNameDescription.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/PipeNameDescription.cs
rename to src/Cli/dotnet/commands/Test/IPC/PipeNameDescription.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/BaseSerializer.cs b/src/Cli/dotnet/commands/Test/IPC/Serializers/BaseSerializer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/BaseSerializer.cs
rename to src/Cli/dotnet/commands/Test/IPC/Serializers/BaseSerializer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/CommandLineOptionMessagesSerializer.cs b/src/Cli/dotnet/commands/Test/IPC/Serializers/CommandLineOptionMessagesSerializer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/CommandLineOptionMessagesSerializer.cs
rename to src/Cli/dotnet/commands/Test/IPC/Serializers/CommandLineOptionMessagesSerializer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/DiscoveredTestMessagesSerializer.cs b/src/Cli/dotnet/commands/Test/IPC/Serializers/DiscoveredTestMessagesSerializer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/DiscoveredTestMessagesSerializer.cs
rename to src/Cli/dotnet/commands/Test/IPC/Serializers/DiscoveredTestMessagesSerializer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/FileArtifactMessagesSerializer.cs b/src/Cli/dotnet/commands/Test/IPC/Serializers/FileArtifactMessagesSerializer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/FileArtifactMessagesSerializer.cs
rename to src/Cli/dotnet/commands/Test/IPC/Serializers/FileArtifactMessagesSerializer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/HandshakeMessageSerializer.cs b/src/Cli/dotnet/commands/Test/IPC/Serializers/HandshakeMessageSerializer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/HandshakeMessageSerializer.cs
rename to src/Cli/dotnet/commands/Test/IPC/Serializers/HandshakeMessageSerializer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/ModuleMessageSerializer.cs b/src/Cli/dotnet/commands/Test/IPC/Serializers/ModuleMessageSerializer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/ModuleMessageSerializer.cs
rename to src/Cli/dotnet/commands/Test/IPC/Serializers/ModuleMessageSerializer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/RegisterSerializers.cs b/src/Cli/dotnet/commands/Test/IPC/Serializers/RegisterSerializers.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/RegisterSerializers.cs
rename to src/Cli/dotnet/commands/Test/IPC/Serializers/RegisterSerializers.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/TestResultMessagesSerializer.cs b/src/Cli/dotnet/commands/Test/IPC/Serializers/TestResultMessagesSerializer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/TestResultMessagesSerializer.cs
rename to src/Cli/dotnet/commands/Test/IPC/Serializers/TestResultMessagesSerializer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/TestSessionEventSerializer.cs b/src/Cli/dotnet/commands/Test/IPC/Serializers/TestSessionEventSerializer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/TestSessionEventSerializer.cs
rename to src/Cli/dotnet/commands/Test/IPC/Serializers/TestSessionEventSerializer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/UnknownMessageSerializer.cs b/src/Cli/dotnet/commands/Test/IPC/Serializers/UnknownMessageSerializer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/UnknownMessageSerializer.cs
rename to src/Cli/dotnet/commands/Test/IPC/Serializers/UnknownMessageSerializer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/VoidResponseSerializer.cs b/src/Cli/dotnet/commands/Test/IPC/Serializers/VoidResponseSerializer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/VoidResponseSerializer.cs
rename to src/Cli/dotnet/commands/Test/IPC/Serializers/VoidResponseSerializer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/LocalizableStrings.resx b/src/Cli/dotnet/commands/Test/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Test/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-test/Logger.cs b/src/Cli/dotnet/commands/Test/Logger.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Logger.cs
rename to src/Cli/dotnet/commands/Test/Logger.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/MSBuildHandler.cs b/src/Cli/dotnet/commands/Test/MSBuildHandler.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/MSBuildHandler.cs
rename to src/Cli/dotnet/commands/Test/MSBuildHandler.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/MSBuildUtility.cs b/src/Cli/dotnet/commands/Test/MSBuildUtility.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/MSBuildUtility.cs
rename to src/Cli/dotnet/commands/Test/MSBuildUtility.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Models.cs b/src/Cli/dotnet/commands/Test/Models.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Models.cs
rename to src/Cli/dotnet/commands/Test/Models.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Options.cs b/src/Cli/dotnet/commands/Test/Options.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Options.cs
rename to src/Cli/dotnet/commands/Test/Options.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Program.cs b/src/Cli/dotnet/commands/Test/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Program.cs
rename to src/Cli/dotnet/commands/Test/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/SolutionAndProjectUtility.cs b/src/Cli/dotnet/commands/Test/SolutionAndProjectUtility.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/SolutionAndProjectUtility.cs
rename to src/Cli/dotnet/commands/Test/SolutionAndProjectUtility.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/AnsiCodes.cs b/src/Cli/dotnet/commands/Test/Terminal/AnsiCodes.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/AnsiCodes.cs
rename to src/Cli/dotnet/commands/Test/Terminal/AnsiCodes.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/AnsiDetector.cs b/src/Cli/dotnet/commands/Test/Terminal/AnsiDetector.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/AnsiDetector.cs
rename to src/Cli/dotnet/commands/Test/Terminal/AnsiDetector.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/AnsiTerminal.cs b/src/Cli/dotnet/commands/Test/Terminal/AnsiTerminal.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/AnsiTerminal.cs
rename to src/Cli/dotnet/commands/Test/Terminal/AnsiTerminal.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/AnsiTerminalTestProgressFrame.cs b/src/Cli/dotnet/commands/Test/Terminal/AnsiTerminalTestProgressFrame.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/AnsiTerminalTestProgressFrame.cs
rename to src/Cli/dotnet/commands/Test/Terminal/AnsiTerminalTestProgressFrame.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/ErrorMessage.cs b/src/Cli/dotnet/commands/Test/Terminal/ErrorMessage.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/ErrorMessage.cs
rename to src/Cli/dotnet/commands/Test/Terminal/ErrorMessage.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/ExceptionFlattener.cs b/src/Cli/dotnet/commands/Test/Terminal/ExceptionFlattener.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/ExceptionFlattener.cs
rename to src/Cli/dotnet/commands/Test/Terminal/ExceptionFlattener.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/FileUtilities.cs b/src/Cli/dotnet/commands/Test/Terminal/FileUtilities.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/FileUtilities.cs
rename to src/Cli/dotnet/commands/Test/Terminal/FileUtilities.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/HumanReadableDurationFormatter.cs b/src/Cli/dotnet/commands/Test/Terminal/HumanReadableDurationFormatter.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/HumanReadableDurationFormatter.cs
rename to src/Cli/dotnet/commands/Test/Terminal/HumanReadableDurationFormatter.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/IColor.cs b/src/Cli/dotnet/commands/Test/Terminal/IColor.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/IColor.cs
rename to src/Cli/dotnet/commands/Test/Terminal/IColor.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/IConsole.cs b/src/Cli/dotnet/commands/Test/Terminal/IConsole.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/IConsole.cs
rename to src/Cli/dotnet/commands/Test/Terminal/IConsole.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/IProgressMessage.cs b/src/Cli/dotnet/commands/Test/Terminal/IProgressMessage.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/IProgressMessage.cs
rename to src/Cli/dotnet/commands/Test/Terminal/IProgressMessage.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/IStopwatch.cs b/src/Cli/dotnet/commands/Test/Terminal/IStopwatch.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/IStopwatch.cs
rename to src/Cli/dotnet/commands/Test/Terminal/IStopwatch.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/ITerminal.cs b/src/Cli/dotnet/commands/Test/Terminal/ITerminal.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/ITerminal.cs
rename to src/Cli/dotnet/commands/Test/Terminal/ITerminal.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/NativeMethods.cs b/src/Cli/dotnet/commands/Test/Terminal/NativeMethods.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/NativeMethods.cs
rename to src/Cli/dotnet/commands/Test/Terminal/NativeMethods.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/NonAnsiTerminal.cs b/src/Cli/dotnet/commands/Test/Terminal/NonAnsiTerminal.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/NonAnsiTerminal.cs
rename to src/Cli/dotnet/commands/Test/Terminal/NonAnsiTerminal.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/SystemConsole.cs b/src/Cli/dotnet/commands/Test/Terminal/SystemConsole.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/SystemConsole.cs
rename to src/Cli/dotnet/commands/Test/Terminal/SystemConsole.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/SystemConsoleColor.cs b/src/Cli/dotnet/commands/Test/Terminal/SystemConsoleColor.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/SystemConsoleColor.cs
rename to src/Cli/dotnet/commands/Test/Terminal/SystemConsoleColor.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/SystemStopwatch.cs b/src/Cli/dotnet/commands/Test/Terminal/SystemStopwatch.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/SystemStopwatch.cs
rename to src/Cli/dotnet/commands/Test/Terminal/SystemStopwatch.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/TargetFrameworkParser.cs b/src/Cli/dotnet/commands/Test/Terminal/TargetFrameworkParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/TargetFrameworkParser.cs
rename to src/Cli/dotnet/commands/Test/Terminal/TargetFrameworkParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/TerminalColor.cs b/src/Cli/dotnet/commands/Test/Terminal/TerminalColor.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/TerminalColor.cs
rename to src/Cli/dotnet/commands/Test/Terminal/TerminalColor.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/TerminalTestReporter.cs b/src/Cli/dotnet/commands/Test/Terminal/TerminalTestReporter.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/TerminalTestReporter.cs
rename to src/Cli/dotnet/commands/Test/Terminal/TerminalTestReporter.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/TerminalTestReporterOptions.cs b/src/Cli/dotnet/commands/Test/Terminal/TerminalTestReporterOptions.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/TerminalTestReporterOptions.cs
rename to src/Cli/dotnet/commands/Test/Terminal/TerminalTestReporterOptions.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/TestDetailState.cs b/src/Cli/dotnet/commands/Test/Terminal/TestDetailState.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/TestDetailState.cs
rename to src/Cli/dotnet/commands/Test/Terminal/TestDetailState.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/TestNodeResultsState.cs b/src/Cli/dotnet/commands/Test/Terminal/TestNodeResultsState.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/TestNodeResultsState.cs
rename to src/Cli/dotnet/commands/Test/Terminal/TestNodeResultsState.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/TestOutcome.cs b/src/Cli/dotnet/commands/Test/Terminal/TestOutcome.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/TestOutcome.cs
rename to src/Cli/dotnet/commands/Test/Terminal/TestOutcome.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/TestProgressState.cs b/src/Cli/dotnet/commands/Test/Terminal/TestProgressState.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/TestProgressState.cs
rename to src/Cli/dotnet/commands/Test/Terminal/TestProgressState.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/TestProgressStateAwareTerminal.cs b/src/Cli/dotnet/commands/Test/Terminal/TestProgressStateAwareTerminal.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/TestProgressStateAwareTerminal.cs
rename to src/Cli/dotnet/commands/Test/Terminal/TestProgressStateAwareTerminal.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/TestRunArtifact.cs b/src/Cli/dotnet/commands/Test/Terminal/TestRunArtifact.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/TestRunArtifact.cs
rename to src/Cli/dotnet/commands/Test/Terminal/TestRunArtifact.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/WarningMessage.cs b/src/Cli/dotnet/commands/Test/Terminal/WarningMessage.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/Terminal/WarningMessage.cs
rename to src/Cli/dotnet/commands/Test/Terminal/WarningMessage.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/TestApplication.cs b/src/Cli/dotnet/commands/Test/TestApplication.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/TestApplication.cs
rename to src/Cli/dotnet/commands/Test/TestApplication.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/TestApplicationActionQueue.cs b/src/Cli/dotnet/commands/Test/TestApplicationActionQueue.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/TestApplicationActionQueue.cs
rename to src/Cli/dotnet/commands/Test/TestApplicationActionQueue.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/TestApplicationEventHandlers.cs b/src/Cli/dotnet/commands/Test/TestApplicationEventHandlers.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/TestApplicationEventHandlers.cs
rename to src/Cli/dotnet/commands/Test/TestApplicationEventHandlers.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs b/src/Cli/dotnet/commands/Test/TestCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs
rename to src/Cli/dotnet/commands/Test/TestCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/TestModulesFilterHandler.cs b/src/Cli/dotnet/commands/Test/TestModulesFilterHandler.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/TestModulesFilterHandler.cs
rename to src/Cli/dotnet/commands/Test/TestModulesFilterHandler.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/TestingPlatformCommand.Help.cs b/src/Cli/dotnet/commands/Test/TestingPlatformCommand.Help.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/TestingPlatformCommand.Help.cs
rename to src/Cli/dotnet/commands/Test/TestingPlatformCommand.Help.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/TestingPlatformCommand.cs b/src/Cli/dotnet/commands/Test/TestingPlatformCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/TestingPlatformCommand.cs
rename to src/Cli/dotnet/commands/Test/TestingPlatformCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/TestingPlatformOptions.cs b/src/Cli/dotnet/commands/Test/TestingPlatformOptions.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/TestingPlatformOptions.cs
rename to src/Cli/dotnet/commands/Test/TestingPlatformOptions.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/VSTestArgumentConverter.cs b/src/Cli/dotnet/commands/Test/VSTestArgumentConverter.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/VSTestArgumentConverter.cs
rename to src/Cli/dotnet/commands/Test/VSTestArgumentConverter.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/VSTestFeatureFlag.cs b/src/Cli/dotnet/commands/Test/VSTestFeatureFlag.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/VSTestFeatureFlag.cs
rename to src/Cli/dotnet/commands/Test/VSTestFeatureFlag.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/VSTestForwardingApp.cs b/src/Cli/dotnet/commands/Test/VSTestForwardingApp.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/VSTestForwardingApp.cs
rename to src/Cli/dotnet/commands/Test/VSTestForwardingApp.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/VSTestTrace.cs b/src/Cli/dotnet/commands/Test/VSTestTrace.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/VSTestTrace.cs
rename to src/Cli/dotnet/commands/Test/VSTestTrace.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/ValidationUtility.cs b/src/Cli/dotnet/commands/Test/ValidationUtility.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/ValidationUtility.cs
rename to src/Cli/dotnet/commands/Test/ValidationUtility.cs
diff --git a/src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Test/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/LocalizableStrings.resx b/src/Cli/dotnet/commands/Tool/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Tool/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-tool/ToolCommandParser.cs b/src/Cli/dotnet/commands/Tool/ToolCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/ToolCommandParser.cs
rename to src/Cli/dotnet/commands/Tool/ToolCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/ToolCommandRestorePassThroughOptions.cs b/src/Cli/dotnet/commands/Tool/ToolCommandRestorePassThroughOptions.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/ToolCommandRestorePassThroughOptions.cs
rename to src/Cli/dotnet/commands/Tool/ToolCommandRestorePassThroughOptions.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/LocalizableStrings.resx b/src/Cli/dotnet/commands/Tool/common/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Tool/common/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/ToolAppliedOption.cs b/src/Cli/dotnet/commands/Tool/common/ToolAppliedOption.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/ToolAppliedOption.cs
rename to src/Cli/dotnet/commands/Tool/common/ToolAppliedOption.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/ToolManifestFinderExtensions.cs b/src/Cli/dotnet/commands/Tool/common/ToolManifestFinderExtensions.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/ToolManifestFinderExtensions.cs
rename to src/Cli/dotnet/commands/Tool/common/ToolManifestFinderExtensions.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/common/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Tool/common/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/LocalToolsResolverCacheExtensions.cs b/src/Cli/dotnet/commands/Tool/install/LocalToolsResolverCacheExtensions.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/LocalToolsResolverCacheExtensions.cs
rename to src/Cli/dotnet/commands/Tool/install/LocalToolsResolverCacheExtensions.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx b/src/Cli/dotnet/commands/Tool/install/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Tool/install/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ParseResultExtension.cs b/src/Cli/dotnet/commands/Tool/install/ParseResultExtension.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/ParseResultExtension.cs
rename to src/Cli/dotnet/commands/Tool/install/ParseResultExtension.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ProjectRestorer.cs b/src/Cli/dotnet/commands/Tool/install/ProjectRestorer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/ProjectRestorer.cs
rename to src/Cli/dotnet/commands/Tool/install/ProjectRestorer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs b/src/Cli/dotnet/commands/Tool/install/ToolInstallCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs
rename to src/Cli/dotnet/commands/Tool/install/ToolInstallCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommandLowLevelErrorConverter.cs b/src/Cli/dotnet/commands/Tool/install/ToolInstallCommandLowLevelErrorConverter.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommandLowLevelErrorConverter.cs
rename to src/Cli/dotnet/commands/Tool/install/ToolInstallCommandLowLevelErrorConverter.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs b/src/Cli/dotnet/commands/Tool/install/ToolInstallCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs
rename to src/Cli/dotnet/commands/Tool/install/ToolInstallCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/Tool/install/ToolInstallGlobalOrToolPathCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs
rename to src/Cli/dotnet/commands/Tool/install/ToolInstallGlobalOrToolPathCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs b/src/Cli/dotnet/commands/Tool/install/ToolInstallLocalCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs
rename to src/Cli/dotnet/commands/Tool/install/ToolInstallLocalCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalInstaller.cs b/src/Cli/dotnet/commands/Tool/install/ToolInstallLocalInstaller.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalInstaller.cs
rename to src/Cli/dotnet/commands/Tool/install/ToolInstallLocalInstaller.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Tool/install/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/LocalizableStrings.resx b/src/Cli/dotnet/commands/Tool/list/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Tool/list/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/ToolListCommand.cs b/src/Cli/dotnet/commands/Tool/list/ToolListCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/ToolListCommand.cs
rename to src/Cli/dotnet/commands/Tool/list/ToolListCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/ToolListCommandParser.cs b/src/Cli/dotnet/commands/Tool/list/ToolListCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/ToolListCommandParser.cs
rename to src/Cli/dotnet/commands/Tool/list/ToolListCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/ToolListGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/Tool/list/ToolListGlobalOrToolPathCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/ToolListGlobalOrToolPathCommand.cs
rename to src/Cli/dotnet/commands/Tool/list/ToolListGlobalOrToolPathCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/ToolListJsonHelper.cs b/src/Cli/dotnet/commands/Tool/list/ToolListJsonHelper.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/ToolListJsonHelper.cs
rename to src/Cli/dotnet/commands/Tool/list/ToolListJsonHelper.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/ToolListLocalCommand.cs b/src/Cli/dotnet/commands/Tool/list/ToolListLocalCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/ToolListLocalCommand.cs
rename to src/Cli/dotnet/commands/Tool/list/ToolListLocalCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Tool/list/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/LocalizableStrings.resx b/src/Cli/dotnet/commands/Tool/restore/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Tool/restore/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/ToolRestoreCommand.cs b/src/Cli/dotnet/commands/Tool/restore/ToolRestoreCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/ToolRestoreCommand.cs
rename to src/Cli/dotnet/commands/Tool/restore/ToolRestoreCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/ToolRestoreCommandParser.cs b/src/Cli/dotnet/commands/Tool/restore/ToolRestoreCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/ToolRestoreCommandParser.cs
rename to src/Cli/dotnet/commands/Tool/restore/ToolRestoreCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/restore/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Tool/restore/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/LocalizableStrings.resx b/src/Cli/dotnet/commands/Tool/run/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Tool/run/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/ToolRunCommand.cs b/src/Cli/dotnet/commands/Tool/run/ToolRunCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/ToolRunCommand.cs
rename to src/Cli/dotnet/commands/Tool/run/ToolRunCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/ToolRunCommandParser.cs b/src/Cli/dotnet/commands/Tool/run/ToolRunCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/ToolRunCommandParser.cs
rename to src/Cli/dotnet/commands/Tool/run/ToolRunCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/run/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Tool/run/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/LocalizableStrings.resx b/src/Cli/dotnet/commands/Tool/search/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Tool/search/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/NugetSearchSerializables.cs b/src/Cli/dotnet/commands/Tool/search/NugetSearchSerializables.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/NugetSearchSerializables.cs
rename to src/Cli/dotnet/commands/Tool/search/NugetSearchSerializables.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/SearchResultPrinter.cs b/src/Cli/dotnet/commands/Tool/search/SearchResultPrinter.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/SearchResultPrinter.cs
rename to src/Cli/dotnet/commands/Tool/search/SearchResultPrinter.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/ToolSearchCommand.cs b/src/Cli/dotnet/commands/Tool/search/ToolSearchCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/ToolSearchCommand.cs
rename to src/Cli/dotnet/commands/Tool/search/ToolSearchCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/ToolSearchCommandParser.cs b/src/Cli/dotnet/commands/Tool/search/ToolSearchCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/ToolSearchCommandParser.cs
rename to src/Cli/dotnet/commands/Tool/search/ToolSearchCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/search/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Tool/search/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/LocalizableStrings.resx b/src/Cli/dotnet/commands/Tool/uninstall/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Tool/uninstall/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommand.cs b/src/Cli/dotnet/commands/Tool/uninstall/ToolUninstallCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommand.cs
rename to src/Cli/dotnet/commands/Tool/uninstall/ToolUninstallCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandLowLevelErrorConverter.cs b/src/Cli/dotnet/commands/Tool/uninstall/ToolUninstallCommandLowLevelErrorConverter.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandLowLevelErrorConverter.cs
rename to src/Cli/dotnet/commands/Tool/uninstall/ToolUninstallCommandLowLevelErrorConverter.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandParser.cs b/src/Cli/dotnet/commands/Tool/uninstall/ToolUninstallCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandParser.cs
rename to src/Cli/dotnet/commands/Tool/uninstall/ToolUninstallCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/ToolUninstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/Tool/uninstall/ToolUninstallGlobalOrToolPathCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/ToolUninstallGlobalOrToolPathCommand.cs
rename to src/Cli/dotnet/commands/Tool/uninstall/ToolUninstallGlobalOrToolPathCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/ToolUninstallLocalCommand.cs b/src/Cli/dotnet/commands/Tool/uninstall/ToolUninstallLocalCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/ToolUninstallLocalCommand.cs
rename to src/Cli/dotnet/commands/Tool/uninstall/ToolUninstallLocalCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Tool/uninstall/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx b/src/Cli/dotnet/commands/Tool/update/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Tool/update/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs b/src/Cli/dotnet/commands/Tool/update/ToolUpdateCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs
rename to src/Cli/dotnet/commands/Tool/update/ToolUpdateCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateCommandParser.cs b/src/Cli/dotnet/commands/Tool/update/ToolUpdateCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateCommandParser.cs
rename to src/Cli/dotnet/commands/Tool/update/ToolUpdateCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/Tool/update/ToolUpdateGlobalOrToolPathCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs
rename to src/Cli/dotnet/commands/Tool/update/ToolUpdateGlobalOrToolPathCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs b/src/Cli/dotnet/commands/Tool/update/ToolUpdateLocalCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs
rename to src/Cli/dotnet/commands/Tool/update/ToolUpdateLocalCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Tool/update/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Tool/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-vstest/Program.cs b/src/Cli/dotnet/commands/VSTest/Program.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-vstest/Program.cs
rename to src/Cli/dotnet/commands/VSTest/Program.cs
diff --git a/src/Cli/dotnet/commands/dotnet-vstest/VSTestCommandParser.cs b/src/Cli/dotnet/commands/VSTest/VSTestCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-vstest/VSTestCommandParser.cs
rename to src/Cli/dotnet/commands/VSTest/VSTestCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/GlobalJsonWorkloadSetFile.cs b/src/Cli/dotnet/commands/Workload/GlobalJsonWorkloadSetFile.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/GlobalJsonWorkloadSetFile.cs
rename to src/Cli/dotnet/commands/Workload/GlobalJsonWorkloadSetFile.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/IWorkloadInfoHelper.cs b/src/Cli/dotnet/commands/Workload/IWorkloadInfoHelper.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/IWorkloadInfoHelper.cs
rename to src/Cli/dotnet/commands/Workload/IWorkloadInfoHelper.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/InstallStateContents.cs b/src/Cli/dotnet/commands/Workload/InstallStateContents.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/InstallStateContents.cs
rename to src/Cli/dotnet/commands/Workload/InstallStateContents.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/InstallingWorkloadCommand.cs b/src/Cli/dotnet/commands/Workload/InstallingWorkloadCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/InstallingWorkloadCommand.cs
rename to src/Cli/dotnet/commands/Workload/InstallingWorkloadCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/LocalizableStrings.resx b/src/Cli/dotnet/commands/Workload/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Workload/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-workload/SignCheck.cs b/src/Cli/dotnet/commands/Workload/SignCheck.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/SignCheck.cs
rename to src/Cli/dotnet/commands/Workload/SignCheck.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs b/src/Cli/dotnet/commands/Workload/WorkloadCommandBase.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs
rename to src/Cli/dotnet/commands/Workload/WorkloadCommandBase.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandNuGetRestoreActionConfigOptions.cs b/src/Cli/dotnet/commands/Workload/WorkloadCommandNuGetRestoreActionConfigOptions.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandNuGetRestoreActionConfigOptions.cs
rename to src/Cli/dotnet/commands/Workload/WorkloadCommandNuGetRestoreActionConfigOptions.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandParser.cs b/src/Cli/dotnet/commands/Workload/WorkloadCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandParser.cs
rename to src/Cli/dotnet/commands/Workload/WorkloadCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadException.cs b/src/Cli/dotnet/commands/Workload/WorkloadException.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/WorkloadException.cs
rename to src/Cli/dotnet/commands/Workload/WorkloadException.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadHistoryDisplay.cs b/src/Cli/dotnet/commands/Workload/WorkloadHistoryDisplay.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/WorkloadHistoryDisplay.cs
rename to src/Cli/dotnet/commands/Workload/WorkloadHistoryDisplay.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadHistoryRecord.cs b/src/Cli/dotnet/commands/Workload/WorkloadHistoryRecord.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/WorkloadHistoryRecord.cs
rename to src/Cli/dotnet/commands/Workload/WorkloadHistoryRecord.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadHistoryRecorder.cs b/src/Cli/dotnet/commands/Workload/WorkloadHistoryRecorder.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/WorkloadHistoryRecorder.cs
rename to src/Cli/dotnet/commands/Workload/WorkloadHistoryRecorder.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs b/src/Cli/dotnet/commands/Workload/WorkloadInfoHelper.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs
rename to src/Cli/dotnet/commands/Workload/WorkloadInfoHelper.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadIntegrityChecker.cs b/src/Cli/dotnet/commands/Workload/WorkloadIntegrityChecker.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/WorkloadIntegrityChecker.cs
rename to src/Cli/dotnet/commands/Workload/WorkloadIntegrityChecker.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs b/src/Cli/dotnet/commands/Workload/WorkloadUtilities.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs
rename to src/Cli/dotnet/commands/Workload/WorkloadUtilities.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/LocalizableStrings.resx b/src/Cli/dotnet/commands/Workload/clean/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Workload/clean/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/WorkloadCleanCommand.cs b/src/Cli/dotnet/commands/Workload/clean/WorkloadCleanCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/WorkloadCleanCommand.cs
rename to src/Cli/dotnet/commands/Workload/clean/WorkloadCleanCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/WorkloadCleanCommandParser.cs b/src/Cli/dotnet/commands/Workload/clean/WorkloadCleanCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/WorkloadCleanCommandParser.cs
rename to src/Cli/dotnet/commands/Workload/clean/WorkloadCleanCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/clean/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Workload/clean/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/LocalizableStrings.resx b/src/Cli/dotnet/commands/Workload/config/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Workload/config/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/WorkloadConfigCommand.cs b/src/Cli/dotnet/commands/Workload/config/WorkloadConfigCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/WorkloadConfigCommand.cs
rename to src/Cli/dotnet/commands/Workload/config/WorkloadConfigCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/WorkloadConfigCommandParser.cs b/src/Cli/dotnet/commands/Workload/config/WorkloadConfigCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/WorkloadConfigCommandParser.cs
rename to src/Cli/dotnet/commands/Workload/config/WorkloadConfigCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Workload/config/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/LocalizableStrings.resx b/src/Cli/dotnet/commands/Workload/elevate/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Workload/elevate/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/WorkloadElevateCommand.cs b/src/Cli/dotnet/commands/Workload/elevate/WorkloadElevateCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/WorkloadElevateCommand.cs
rename to src/Cli/dotnet/commands/Workload/elevate/WorkloadElevateCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/WorkloadElevateCommandParser.cs b/src/Cli/dotnet/commands/Workload/elevate/WorkloadElevateCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/WorkloadElevateCommandParser.cs
rename to src/Cli/dotnet/commands/Workload/elevate/WorkloadElevateCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/elevate/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Workload/elevate/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/LocalizableStrings.resx b/src/Cli/dotnet/commands/Workload/history/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Workload/history/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/WorkloadHistoryCommand.cs b/src/Cli/dotnet/commands/Workload/history/WorkloadHistoryCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/WorkloadHistoryCommand.cs
rename to src/Cli/dotnet/commands/Workload/history/WorkloadHistoryCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/WorkloadHistoryCommandParser.cs b/src/Cli/dotnet/commands/Workload/history/WorkloadHistoryCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/WorkloadHistoryCommandParser.cs
rename to src/Cli/dotnet/commands/Workload/history/WorkloadHistoryCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/history/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Workload/history/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs b/src/Cli/dotnet/commands/Workload/install/FileBasedInstaller.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs
rename to src/Cli/dotnet/commands/Workload/install/FileBasedInstaller.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/IInstaller.cs b/src/Cli/dotnet/commands/Workload/install/IInstaller.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/IInstaller.cs
rename to src/Cli/dotnet/commands/Workload/install/IInstaller.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/IWorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/Workload/install/IWorkloadManifestUpdater.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/IWorkloadManifestUpdater.cs
rename to src/Cli/dotnet/commands/Workload/install/IWorkloadManifestUpdater.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/LocalizableStrings.resx b/src/Cli/dotnet/commands/Workload/install/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Workload/install/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs b/src/Cli/dotnet/commands/Workload/install/MsiInstallerBase.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs
rename to src/Cli/dotnet/commands/Workload/install/MsiInstallerBase.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.InstallRecords.cs b/src/Cli/dotnet/commands/Workload/install/NetSdkMsiInstallerClient.InstallRecords.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.InstallRecords.cs
rename to src/Cli/dotnet/commands/Workload/install/NetSdkMsiInstallerClient.InstallRecords.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.PackGroup.cs b/src/Cli/dotnet/commands/Workload/install/NetSdkMsiInstallerClient.PackGroup.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.PackGroup.cs
rename to src/Cli/dotnet/commands/Workload/install/NetSdkMsiInstallerClient.PackGroup.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs b/src/Cli/dotnet/commands/Workload/install/NetSdkMsiInstallerClient.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs
rename to src/Cli/dotnet/commands/Workload/install/NetSdkMsiInstallerClient.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs b/src/Cli/dotnet/commands/Workload/install/NetSdkMsiInstallerServer.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs
rename to src/Cli/dotnet/commands/Workload/install/NetSdkMsiInstallerServer.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NullReporter.cs b/src/Cli/dotnet/commands/Workload/install/NullReporter.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/NullReporter.cs
rename to src/Cli/dotnet/commands/Workload/install/NullReporter.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadGarbageCollector.cs b/src/Cli/dotnet/commands/Workload/install/WorkloadGarbageCollector.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/WorkloadGarbageCollector.cs
rename to src/Cli/dotnet/commands/Workload/install/WorkloadGarbageCollector.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs b/src/Cli/dotnet/commands/Workload/install/WorkloadInstallCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs
rename to src/Cli/dotnet/commands/Workload/install/WorkloadInstallCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommandParser.cs b/src/Cli/dotnet/commands/Workload/install/WorkloadInstallCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommandParser.cs
rename to src/Cli/dotnet/commands/Workload/install/WorkloadInstallCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallRecords/FileBasedInstallationRecordInstaller.cs b/src/Cli/dotnet/commands/Workload/install/WorkloadInstallRecords/FileBasedInstallationRecordInstaller.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallRecords/FileBasedInstallationRecordInstaller.cs
rename to src/Cli/dotnet/commands/Workload/install/WorkloadInstallRecords/FileBasedInstallationRecordInstaller.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallRecords/IWorkloadInstallationRecordRepository.cs b/src/Cli/dotnet/commands/Workload/install/WorkloadInstallRecords/IWorkloadInstallationRecordRepository.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallRecords/IWorkloadInstallationRecordRepository.cs
rename to src/Cli/dotnet/commands/Workload/install/WorkloadInstallRecords/IWorkloadInstallationRecordRepository.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallRecords/RegistryWorkloadInstallationRecordRepository.cs b/src/Cli/dotnet/commands/Workload/install/WorkloadInstallRecords/RegistryWorkloadInstallationRecordRepository.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallRecords/RegistryWorkloadInstallationRecordRepository.cs
rename to src/Cli/dotnet/commands/Workload/install/WorkloadInstallRecords/RegistryWorkloadInstallationRecordRepository.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallerFactory.cs b/src/Cli/dotnet/commands/Workload/install/WorkloadInstallerFactory.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallerFactory.cs
rename to src/Cli/dotnet/commands/Workload/install/WorkloadInstallerFactory.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/Workload/install/WorkloadManifestUpdater.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs
rename to src/Cli/dotnet/commands/Workload/install/WorkloadManifestUpdater.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadResolverFactory.cs b/src/Cli/dotnet/commands/Workload/install/WorkloadResolverFactory.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/WorkloadResolverFactory.cs
rename to src/Cli/dotnet/commands/Workload/install/WorkloadResolverFactory.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Workload/install/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/IWorkloadsRepositoryEnumerator.cs b/src/Cli/dotnet/commands/Workload/list/IWorkloadsRepositoryEnumerator.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/IWorkloadsRepositoryEnumerator.cs
rename to src/Cli/dotnet/commands/Workload/list/IWorkloadsRepositoryEnumerator.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/InstalledWorkloadsCollection.cs b/src/Cli/dotnet/commands/Workload/list/InstalledWorkloadsCollection.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/InstalledWorkloadsCollection.cs
rename to src/Cli/dotnet/commands/Workload/list/InstalledWorkloadsCollection.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/LocalizableStrings.resx b/src/Cli/dotnet/commands/Workload/list/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Workload/list/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs b/src/Cli/dotnet/commands/Workload/list/VisualStudioWorkloads.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs
rename to src/Cli/dotnet/commands/Workload/list/VisualStudioWorkloads.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs b/src/Cli/dotnet/commands/Workload/list/WorkloadListCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs
rename to src/Cli/dotnet/commands/Workload/list/WorkloadListCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommandParser.cs b/src/Cli/dotnet/commands/Workload/list/WorkloadListCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommandParser.cs
rename to src/Cli/dotnet/commands/Workload/list/WorkloadListCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/list/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Workload/list/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/LocalizableStrings.resx b/src/Cli/dotnet/commands/Workload/repair/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Workload/repair/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/WorkloadRepairCommand.cs b/src/Cli/dotnet/commands/Workload/repair/WorkloadRepairCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/WorkloadRepairCommand.cs
rename to src/Cli/dotnet/commands/Workload/repair/WorkloadRepairCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/WorkloadRepairCommandParser.cs b/src/Cli/dotnet/commands/Workload/repair/WorkloadRepairCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/WorkloadRepairCommandParser.cs
rename to src/Cli/dotnet/commands/Workload/repair/WorkloadRepairCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/repair/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Workload/repair/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/LocalizableStrings.resx b/src/Cli/dotnet/commands/Workload/restore/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Workload/restore/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommand.cs b/src/Cli/dotnet/commands/Workload/restore/WorkloadRestoreCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommand.cs
rename to src/Cli/dotnet/commands/Workload/restore/WorkloadRestoreCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommandParser.cs b/src/Cli/dotnet/commands/Workload/restore/WorkloadRestoreCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommandParser.cs
rename to src/Cli/dotnet/commands/Workload/restore/WorkloadRestoreCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/restore/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Workload/restore/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/LocalizableStrings.resx b/src/Cli/dotnet/commands/Workload/search/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Workload/search/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchCommand.cs b/src/Cli/dotnet/commands/Workload/search/WorkloadSearchCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchCommand.cs
rename to src/Cli/dotnet/commands/Workload/search/WorkloadSearchCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchCommandParser.cs b/src/Cli/dotnet/commands/Workload/search/WorkloadSearchCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchCommandParser.cs
rename to src/Cli/dotnet/commands/Workload/search/WorkloadSearchCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommand.cs b/src/Cli/dotnet/commands/Workload/search/WorkloadSearchVersionsCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommand.cs
rename to src/Cli/dotnet/commands/Workload/search/WorkloadSearchVersionsCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs b/src/Cli/dotnet/commands/Workload/search/WorkloadSearchVersionsCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs
rename to src/Cli/dotnet/commands/Workload/search/WorkloadSearchVersionsCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/search/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Workload/search/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/LocalizableStrings.resx b/src/Cli/dotnet/commands/Workload/uninstall/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Workload/uninstall/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/WorkloadUninstallCommand.cs b/src/Cli/dotnet/commands/Workload/uninstall/WorkloadUninstallCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/WorkloadUninstallCommand.cs
rename to src/Cli/dotnet/commands/Workload/uninstall/WorkloadUninstallCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/WorkloadUninstallCommandParser.cs b/src/Cli/dotnet/commands/Workload/uninstall/WorkloadUninstallCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/WorkloadUninstallCommandParser.cs
rename to src/Cli/dotnet/commands/Workload/uninstall/WorkloadUninstallCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/uninstall/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Workload/uninstall/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/LocalizableStrings.resx b/src/Cli/dotnet/commands/Workload/update/LocalizableStrings.resx
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/LocalizableStrings.resx
rename to src/Cli/dotnet/commands/Workload/update/LocalizableStrings.resx
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs b/src/Cli/dotnet/commands/Workload/update/WorkloadUpdateCommand.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs
rename to src/Cli/dotnet/commands/Workload/update/WorkloadUpdateCommand.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommandParser.cs b/src/Cli/dotnet/commands/Workload/update/WorkloadUpdateCommandParser.cs
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommandParser.cs
rename to src/Cli/dotnet/commands/Workload/update/WorkloadUpdateCommandParser.cs
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Workload/update/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.cs.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.cs.xlf
rename to src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.de.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.de.xlf
rename to src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.es.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.es.xlf
rename to src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.fr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.fr.xlf
rename to src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.it.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.it.xlf
rename to src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.ja.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.ja.xlf
rename to src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.ko.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.ko.xlf
rename to src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.pl.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.pl.xlf
rename to src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.pt-BR.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.pt-BR.xlf
rename to src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.ru.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.ru.xlf
rename to src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.tr.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.tr.xlf
rename to src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.zh-Hans.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.zh-Hans.xlf
rename to src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.zh-Hant.xlf
similarity index 100%
rename from src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.zh-Hant.xlf
rename to src/Cli/dotnet/commands/Workload/xlf/LocalizableStrings.zh-Hant.xlf
diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj
index 03afec6eb2aa..19b1d5d3a969 100644
--- a/src/Cli/dotnet/dotnet.csproj
+++ b/src/Cli/dotnet/dotnet.csproj
@@ -21,70 +21,70 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\Resolvers\Microsoft.DotNet.MSBuildSdkResolver\FXVersion.cs" LinkBase="commands/dotnet-new" />
+    <Compile Include="..\..\Resolvers\Microsoft.DotNet.MSBuildSdkResolver\FXVersion.cs" LinkBase="commands/New" />
     <Compile Include="$(RepoRoot)src\Common\CompileOptions.cs" LinkBase="Common" />
     <Compile Include="$(RepoRoot)src\Common\EnvironmentVariableNames.cs" LinkBase="Common" />
     <Compile Include="$(RepoRoot)src\Common\MSBuildPropertyNames.cs" LinkBase="Common" />
     <Compile Include="$(RepoRoot)src\Common\WorkloadFileBasedInstall.cs" LinkBase="Common" />
     <Compile Include="$(RepoRoot)src\Common\WorkloadSetVersion.cs" LinkBase="Common" />
-    <Compile Remove="commands\dotnet-workload\list\VisualStudioWorkloads.cs" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <Compile Remove="commands\Workload\list\VisualStudioWorkloads.cs" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <Compile Remove="$(RepoRoot)\src\Cli\dotnet\Installer\Windows\Security\*.cs" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="commands\dotnet-new\*.zip" />
+    <EmbeddedResource Include="commands\New\*.zip" />
     <EmbeddedResource Update="**\*.resx" GenerateSource="true" />
     <EmbeddedResource Update="*.resx" Namespace="Microsoft.DotNet.Cli" />
     <EmbeddedResource Update="BuildServer\*.resx" Namespace="Microsoft.DotNet.Cli.BuildServer" />
     <EmbeddedResource Update="CommandFactory\*.resx" Namespace="Microsoft.DotNet.Cli.CommandFactory" />
-    <EmbeddedResource Update="**\dotnet-package\add\*.resx" Namespace="Microsoft.DotNet.Tools.Package.Add" />
-    <EmbeddedResource Update="**\dotnet-project\convert\*.resx" Namespace="Microsoft.DotNet.Tools.Project.Convert" />
-    <EmbeddedResource Update="**\dotnet-reference-add\*.resx" Namespace="Microsoft.DotNet.Tools.Reference.Add" />
-    <EmbeddedResource Update="**\dotnet-add\*.resx" Namespace="Microsoft.DotNet.Tools.Add" />
-    <EmbeddedResource Update="**\dotnet-build\*.resx" Namespace="Microsoft.DotNet.Tools.Build" />
-    <EmbeddedResource Update="**\dotnet-buildserver\*.resx" Namespace="Microsoft.DotNet.Tools.BuildServer" />
-    <EmbeddedResource Update="**\dotnet-buildserver\shutdown\*.resx" Namespace="Microsoft.DotNet.Tools.BuildServer.Shutdown" />
-    <EmbeddedResource Update="**\dotnet-clean\*.resx" Namespace="Microsoft.DotNet.Tools.Clean" />
-    <EmbeddedResource Update="**\dotnet-sdk\*.resx" Namespace="Microsoft.DotNet.Tools.Sdk" />
-    <EmbeddedResource Update="**\dotnet-sdk\check\*.resx" Namespace="Microsoft.DotNet.Tools.Sdk.Check" />
-    <EmbeddedResource Update="**\dotnet-help\*.resx" Namespace="Microsoft.DotNet.Tools.Help" />
-    <EmbeddedResource Update="**\dotnet-package\list\*.resx" Namespace="Microsoft.DotNet.Tools.Package.List" />
-    <EmbeddedResource Update="**\dotnet-reference-list\*.resx" Namespace="Microsoft.DotNet.Tools.Reference.List" />
-    <EmbeddedResource Update="**\dotnet-list\*.resx" Namespace="Microsoft.DotNet.Tools.List" />
-    <EmbeddedResource Update="**\dotnet-new\*.resx" Namespace="Microsoft.DotNet.Tools.New" />
-    <EmbeddedResource Update="**\dotnet-pack\*.resx" Namespace="Microsoft.DotNet.Tools.Pack" />
-    <EmbeddedResource Update="**\dotnet-package\search\*.resx" Namespace="Microsoft.DotNet.Tools.Package.Search" />
-    <EmbeddedResource Update="**\dotnet-publish\*.resx" Namespace="Microsoft.DotNet.Tools.Publish" />
-    <EmbeddedResource Update="**\dotnet-package\remove\*.resx" Namespace="Microsoft.DotNet.Tools.Package.Remove" />
-    <EmbeddedResource Update="**\dotnet-reference-remove\*.resx" Namespace="Microsoft.DotNet.Tools.Reference.Remove" />
-    <EmbeddedResource Update="**\dotnet-remove\*.resx" Namespace="Microsoft.DotNet.Tools.Remove" />
-    <EmbeddedResource Update="**\dotnet-restore\*.resx" Namespace="Microsoft.DotNet.Tools.Restore" />
-    <EmbeddedResource Update="**\dotnet-run\*.resx" Namespace="Microsoft.DotNet.Tools.Run" />
-    <EmbeddedResource Update="**\dotnet-sln\*.resx" Namespace="Microsoft.DotNet.Tools.Sln" />
-    <EmbeddedResource Update="**\dotnet-store\*.resx" Namespace="Microsoft.DotNet.Tools.Store" />
-    <EmbeddedResource Update="**\dotnet-test\*.resx" Namespace="Microsoft.DotNet.Tools.Test" />
-    <EmbeddedResource Update="**\dotnet-tool\*.resx" Namespace="Microsoft.DotNet.Tools.Tool" />
-    <EmbeddedResource Update="**\dotnet-tool\list\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.List" />
-    <EmbeddedResource Update="**\dotnet-tool\search\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.Search" />
-    <EmbeddedResource Update="**\dotnet-tool\uninstall\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.Uninstall" />
-    <EmbeddedResource Update="**\dotnet-tool\install\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.Install" />
-    <EmbeddedResource Update="**\dotnet-tool\update\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.Update" />
-    <EmbeddedResource Update="**\dotnet-tool\common\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.Common" />
-    <EmbeddedResource Update="**\dotnet-tool\restore\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.Restore" />
-    <EmbeddedResource Update="**\dotnet-tool\run\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.Run" />
-    <EmbeddedResource Update="**\dotnet-workload\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload" />
-    <EmbeddedResource Update="**\dotnet-workload\clean\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Clean" />
-    <EmbeddedResource Update="**\dotnet-workload\common\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Common" />
-    <EmbeddedResource Update="**\dotnet-workload\config\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Config" />
-    <EmbeddedResource Update="**\dotnet-workload\elevate\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Elevate" />
-    <EmbeddedResource Update="**\dotnet-workload\history\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.History" />
-    <EmbeddedResource Update="**\dotnet-workload\install\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Install" />
-    <EmbeddedResource Update="**\dotnet-workload\list\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.List" />
-    <EmbeddedResource Update="**\dotnet-workload\repair\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Repair" />
-    <EmbeddedResource Update="**\dotnet-workload\restore\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Restore" />
-    <EmbeddedResource Update="**\dotnet-workload\search\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Search" />
-    <EmbeddedResource Update="**\dotnet-workload\uninstall\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Uninstall" />
-    <EmbeddedResource Update="**\dotnet-workload\update\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Update" />
+    <EmbeddedResource Update="commands\Package\add\*.resx" Namespace="Microsoft.DotNet.Tools.Package.Add" />
+    <EmbeddedResource Update="commands\Project\convert\*.resx" Namespace="Microsoft.DotNet.Tools.Project.Convert" />
+    <EmbeddedResource Update="commands\Reference\dotnet-reference-add\*.resx" Namespace="Microsoft.DotNet.Tools.Reference.Add" />
+    <EmbeddedResource Update="commands\Add\*.resx" Namespace="Microsoft.DotNet.Tools.Add" />
+    <EmbeddedResource Update="commands\Build\*.resx" Namespace="Microsoft.DotNet.Tools.Build" />
+    <EmbeddedResource Update="commands\BuildServer\*.resx" Namespace="Microsoft.DotNet.Tools.BuildServer" />
+    <EmbeddedResource Update="commands\BuildServer\shutdown\*.resx" Namespace="Microsoft.DotNet.Tools.BuildServer.Shutdown" />
+    <EmbeddedResource Update="commands\Clean\*.resx" Namespace="Microsoft.DotNet.Tools.Clean" />
+    <EmbeddedResource Update="commands\Sdk\*.resx" Namespace="Microsoft.DotNet.Tools.Sdk" />
+    <EmbeddedResource Update="commands\Sdk\check\*.resx" Namespace="Microsoft.DotNet.Tools.Sdk.Check" />
+    <EmbeddedResource Update="commands\Help\*.resx" Namespace="Microsoft.DotNet.Tools.Help" />
+    <EmbeddedResource Update="commands\Package\list\*.resx" Namespace="Microsoft.DotNet.Tools.Package.List" />
+    <EmbeddedResource Update="commands\Reference\dotnet-reference-list\*.resx" Namespace="Microsoft.DotNet.Tools.Reference.List" />
+    <EmbeddedResource Update="commands\List\*.resx" Namespace="Microsoft.DotNet.Tools.List" />
+    <EmbeddedResource Update="commands\New\*.resx" Namespace="Microsoft.DotNet.Tools.New" />
+    <EmbeddedResource Update="commands\Pack\*.resx" Namespace="Microsoft.DotNet.Tools.Pack" />
+    <EmbeddedResource Update="commands\Package\search\*.resx" Namespace="Microsoft.DotNet.Tools.Package.Search" />
+    <EmbeddedResource Update="commands\Publish\*.resx" Namespace="Microsoft.DotNet.Tools.Publish" />
+    <EmbeddedResource Update="commands\Package\remove\*.resx" Namespace="Microsoft.DotNet.Tools.Package.Remove" />
+    <EmbeddedResource Update="commands\Reference\dotnet-reference-remove\*.resx" Namespace="Microsoft.DotNet.Tools.Reference.Remove" />
+    <EmbeddedResource Update="commands\Remove\*.resx" Namespace="Microsoft.DotNet.Tools.Remove" />
+    <EmbeddedResource Update="commands\Restore\*.resx" Namespace="Microsoft.DotNet.Tools.Restore" />
+    <EmbeddedResource Update="commands\Run\*.resx" Namespace="Microsoft.DotNet.Tools.Run" />
+    <EmbeddedResource Update="commands\Solution\*.resx" Namespace="Microsoft.DotNet.Tools.Sln" />
+    <EmbeddedResource Update="commands\Store\*.resx" Namespace="Microsoft.DotNet.Tools.Store" />
+    <EmbeddedResource Update="commands\Test\*.resx" Namespace="Microsoft.DotNet.Tools.Test" />
+    <EmbeddedResource Update="commands\Tool\*.resx" Namespace="Microsoft.DotNet.Tools.Tool" />
+    <EmbeddedResource Update="commands\Tool\list\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.List" />
+    <EmbeddedResource Update="commands\Tool\search\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.Search" />
+    <EmbeddedResource Update="commands\Tool\uninstall\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.Uninstall" />
+    <EmbeddedResource Update="commands\Tool\install\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.Install" />
+    <EmbeddedResource Update="commands\Tool\update\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.Update" />
+    <EmbeddedResource Update="commands\Tool\common\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.Common" />
+    <EmbeddedResource Update="commands\Tool\restore\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.Restore" />
+    <EmbeddedResource Update="commands\Tool\run\*.resx" Namespace="Microsoft.DotNet.Tools.Tool.Run" />
+    <EmbeddedResource Update="commands\Workload\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload" />
+    <EmbeddedResource Update="commands\Workload\clean\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Clean" />
+    <EmbeddedResource Update="commands\Workload\common\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Common" />
+    <EmbeddedResource Update="commands\Workload\config\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Config" />
+    <EmbeddedResource Update="commands\Workload\elevate\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Elevate" />
+    <EmbeddedResource Update="commands\Workload\history\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.History" />
+    <EmbeddedResource Update="commands\Workload\install\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Install" />
+    <EmbeddedResource Update="commands\Workload\list\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.List" />
+    <EmbeddedResource Update="commands\Workload\repair\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Repair" />
+    <EmbeddedResource Update="commands\Workload\restore\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Restore" />
+    <EmbeddedResource Update="commands\Workload\search\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Search" />
+    <EmbeddedResource Update="commands\Workload\uninstall\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Uninstall" />
+    <EmbeddedResource Update="commands\Workload\update\*.resx" Namespace="Microsoft.DotNet.Workloads.Workload.Update" />
     <EmbeddedResource Update="Installer\Windows\*.resx" Namespace="Microsoft.DotNet.Cli.Installer.Windows" />
     <EmbeddedResource Update="ToolManifest\*.resx" Namespace="Microsoft.DotNet.Cli.ToolManifest" />
     <EmbeddedResource Update="NugetSearch\*.resx" Namespace="Microsoft.DotNet.Cli.NugetSearch" />
@@ -128,7 +128,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Update="commands\dotnet-new\LocalizableStrings.resx">
+    <EmbeddedResource Update="commands\New\LocalizableStrings.resx">
       <Generator>MSBuild:_GenerateResxSource</Generator>
       <LastGenOutput>LocalizableStrings.Designer.cs</LastGenOutput>
       <CustomToolNamespace></CustomToolNamespace>
diff --git a/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj b/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj
index 1574d3558e54..3dad08a50705 100644
--- a/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj
+++ b/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj
@@ -37,7 +37,7 @@
     <Compile Include="$(RepoRoot)src\Common\EnvironmentVariableNames.cs" LinkBase="Common"/>
     <Compile Include="$(RepoRoot)src\Common\WorkloadFileBasedInstall.cs" LinkBase="Common"/>
     <Compile Include="$(RepoRoot)src\Common\WorkloadSetVersion.cs" LinkBase="Common" />
-    <Compile Include="$(RepoRoot)src\Cli\dotnet\commands\dotnet-workload\InstallStateContents.cs" LinkBase="Cli"/>
+    <Compile Include="$(RepoRoot)src\Cli\dotnet\commands\Workload\InstallStateContents.cs" LinkBase="Cli"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
index da8962e5f6f3..a41e62d5cff9 100644
--- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
+++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
@@ -48,13 +48,13 @@
 
   <!-- To reduce dll load (cause RPS perf regression). Directly compile files from Microsoft.DotNet.NativeWrapper, Microsoft.DotNet.SdkResolver, and the workload resolver -->
   <ItemGroup>
-    <Compile Include="$(RepoRoot)src\Cli\dotnet\commands\dotnet-workload\InstallStateContents.cs" LinkBase="Cli"/>
+    <Compile Include="$(RepoRoot)src\Cli\dotnet\commands\Workload\InstallStateContents.cs" LinkBase="Cli"/>
     <Compile Include="..\Microsoft.DotNet.NativeWrapper\**\*.cs" LinkBase="Microsoft.DotNet.NativeWrapper" />
     <Compile Include="..\Microsoft.DotNet.SdkResolver\**\*.cs" LinkBase="Microsoft.DotNet.SdkResolver" />
     <Compile Include="..\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\CachingWorkloadResolver.cs" LinkBase="Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver" />
     <Compile Include="..\Microsoft.NET.Sdk.WorkloadManifestReader\**\*.cs" LinkBase="Microsoft.NET.Sdk.WorkloadManifestReader" />
-    <Compile Include="..\..\Cli\dotnet\commands\dotnet-workload\install\WorkloadInstallRecords\**\*.cs"
-             Exclude="..\..\Cli\dotnet\commands\dotnet-workload\install\WorkloadInstallRecords\RegistryWorkloadInstallationRecordRepository.cs"
+    <Compile Include="..\..\Cli\dotnet\commands\Workload\install\WorkloadInstallRecords\**\*.cs"
+             Exclude="..\..\Cli\dotnet\commands\Workload\install\WorkloadInstallRecords\RegistryWorkloadInstallationRecordRepository.cs"
              LinkBase="WorkloadInstallRecords" />
 
     <Compile Include="$(RepoRoot)src\Common\EnvironmentVariableNames.cs" LinkBase="Common"/>
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj
index d713f088b96c..749a4f3f300f 100644
--- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj
+++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj
@@ -20,8 +20,8 @@
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.NET.Sdk.WorkloadManifestReader\Microsoft.NET.Sdk.WorkloadManifestReader.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.NativeWrapper\Microsoft.DotNet.NativeWrapper.csproj" />
-    <Compile Include="..\..\Cli\dotnet\commands\dotnet-workload\install\WorkloadInstallRecords\**\*.cs"
-             Exclude="..\..\Cli\dotnet\commands\dotnet-workload\install\WorkloadInstallRecords\RegistryWorkloadInstallationRecordRepository.cs"
+    <Compile Include="..\..\Cli\dotnet\commands\Workload\install\WorkloadInstallRecords\**\*.cs"
+             Exclude="..\..\Cli\dotnet\commands\Workload\install\WorkloadInstallRecords\RegistryWorkloadInstallationRecordRepository.cs"
              LinkBase="WorkloadInstallRecords" />
     <Compile Include="$(RepoRoot)src\Common\CliFolderPathCalculatorCore.cs" LinkBase="Common"/>
     <Compile Include="$(RepoRoot)src\Common\WorkloadFileBasedInstall.cs" LinkBase="Common"/>
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj
index c9771ab10f0a..10b2cd013329 100644
--- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj
+++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj
@@ -12,7 +12,7 @@
     <Compile Include="$(RepoRoot)src\Common\EnvironmentVariableNames.cs" LinkBase="Common" />
     <Compile Include="$(RepoRoot)src\Common\WorkloadFileBasedInstall.cs" LinkBase="Common" />
     <Compile Include="$(RepoRoot)src\Common\WorkloadSetVersion.cs" LinkBase="Common" />
-    <Compile Include="$(RepoRoot)src\Cli\dotnet\commands\dotnet-workload\InstallStateContents.cs" LinkBase="Cli"/>
+    <Compile Include="$(RepoRoot)src\Cli\dotnet\commands\Workload\InstallStateContents.cs" LinkBase="Cli"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
index 44d6dfafa15f..107e63fad607 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
@@ -103,8 +103,8 @@
     <Compile Include="$(RepoRoot)src\Common\CliFolderPathCalculatorCore.cs" LinkBase="Common" />
     <Compile Include="$(RepoRoot)src\Common\WorkloadFileBasedInstall.cs" LinkBase="Common" />
     <Compile Include="$(RepoRoot)src\Common\WorkloadSetVersion.cs" LinkBase="Common" />
-    <Compile Include="$(RepoRoot)src\Cli\dotnet\commands\dotnet-workload\InstallStateContents.cs" LinkBase="Cli" />
-    <Compile Include="$(RepoRoot)src\Cli\dotnet\commands\dotnet-test\IPC\**\*.cs" />
+    <Compile Include="$(RepoRoot)src\Cli\dotnet\commands\Workload\InstallStateContents.cs" LinkBase="Cli" />
+    <Compile Include="$(RepoRoot)src\Cli\dotnet\commands\Test\IPC\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/dotnet-sln.Tests/dotnet-sln.Tests.csproj b/test/dotnet-sln.Tests/dotnet-sln.Tests.csproj
index e8b10d28890e..d1130d59cc6a 100644
--- a/test/dotnet-sln.Tests/dotnet-sln.Tests.csproj
+++ b/test/dotnet-sln.Tests/dotnet-sln.Tests.csproj
@@ -19,7 +19,7 @@
   <ItemGroup>
     <!-- Use string resources from product in order to validate test output. -->
     <EmbeddedResource Include="..\..\src\Cli\dotnet\CommonLocalizableStrings.resx" LinkBase="Resources" GenerateSource="True" Namespace="Microsoft.DotNet.Tools" />
-    <EmbeddedResource Include="..\..\src\Cli\dotnet\commands\dotnet-sln\LocalizableStrings.resx" LinkBase="Resources" GenerateSource="True" Namespace="Microsoft.DotNet.Tools.Sln" />
+    <EmbeddedResource Include="..\..\src\Cli\dotnet\commands\Solution\LocalizableStrings.resx" LinkBase="Resources" GenerateSource="True" Namespace="Microsoft.DotNet.Tools.Sln" />
   </ItemGroup>
 
   <ItemGroup>