diff --git a/src/Spectre.Console/Widgets/Live/LiveDisplay.cs b/src/Spectre.Console/Live/LiveDisplay.cs similarity index 100% rename from src/Spectre.Console/Widgets/Live/LiveDisplay.cs rename to src/Spectre.Console/Live/LiveDisplay.cs diff --git a/src/Spectre.Console/Widgets/Live/LiveDisplayContext.cs b/src/Spectre.Console/Live/LiveDisplayContext.cs similarity index 100% rename from src/Spectre.Console/Widgets/Live/LiveDisplayContext.cs rename to src/Spectre.Console/Live/LiveDisplayContext.cs diff --git a/src/Spectre.Console/Widgets/Live/LiveDisplayRenderer.cs b/src/Spectre.Console/Live/LiveDisplayRenderer.cs similarity index 100% rename from src/Spectre.Console/Widgets/Live/LiveDisplayRenderer.cs rename to src/Spectre.Console/Live/LiveDisplayRenderer.cs diff --git a/src/Spectre.Console/Rendering/LiveRenderable.cs b/src/Spectre.Console/Live/LiveRenderable.cs similarity index 100% rename from src/Spectre.Console/Rendering/LiveRenderable.cs rename to src/Spectre.Console/Live/LiveRenderable.cs diff --git a/src/Spectre.Console/Widgets/Progress/Columns/DownloadedColumn.cs b/src/Spectre.Console/Live/Progress/Columns/DownloadedColumn.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Columns/DownloadedColumn.cs rename to src/Spectre.Console/Live/Progress/Columns/DownloadedColumn.cs diff --git a/src/Spectre.Console/Widgets/Progress/Columns/ElapsedTimeColumn.cs b/src/Spectre.Console/Live/Progress/Columns/ElapsedTimeColumn.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Columns/ElapsedTimeColumn.cs rename to src/Spectre.Console/Live/Progress/Columns/ElapsedTimeColumn.cs diff --git a/src/Spectre.Console/Widgets/Progress/Columns/PercentageColumn.cs b/src/Spectre.Console/Live/Progress/Columns/PercentageColumn.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Columns/PercentageColumn.cs rename to src/Spectre.Console/Live/Progress/Columns/PercentageColumn.cs diff --git a/src/Spectre.Console/Widgets/Progress/Columns/ProgressBarColumn.cs b/src/Spectre.Console/Live/Progress/Columns/ProgressBarColumn.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Columns/ProgressBarColumn.cs rename to src/Spectre.Console/Live/Progress/Columns/ProgressBarColumn.cs diff --git a/src/Spectre.Console/Widgets/Progress/Columns/RemainingTimeColumn.cs b/src/Spectre.Console/Live/Progress/Columns/RemainingTimeColumn.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Columns/RemainingTimeColumn.cs rename to src/Spectre.Console/Live/Progress/Columns/RemainingTimeColumn.cs diff --git a/src/Spectre.Console/Widgets/Progress/Columns/SpinnerColumn.cs b/src/Spectre.Console/Live/Progress/Columns/SpinnerColumn.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Columns/SpinnerColumn.cs rename to src/Spectre.Console/Live/Progress/Columns/SpinnerColumn.cs diff --git a/src/Spectre.Console/Widgets/Progress/Columns/TaskDescriptionColumn.cs b/src/Spectre.Console/Live/Progress/Columns/TaskDescriptionColumn.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Columns/TaskDescriptionColumn.cs rename to src/Spectre.Console/Live/Progress/Columns/TaskDescriptionColumn.cs diff --git a/src/Spectre.Console/Widgets/Progress/Columns/TransferSpeedColumn.cs b/src/Spectre.Console/Live/Progress/Columns/TransferSpeedColumn.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Columns/TransferSpeedColumn.cs rename to src/Spectre.Console/Live/Progress/Columns/TransferSpeedColumn.cs diff --git a/src/Spectre.Console/Widgets/Progress/Progress.cs b/src/Spectre.Console/Live/Progress/Progress.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Progress.cs rename to src/Spectre.Console/Live/Progress/Progress.cs diff --git a/src/Spectre.Console/Widgets/Progress/ProgressColumn.cs b/src/Spectre.Console/Live/Progress/ProgressColumn.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/ProgressColumn.cs rename to src/Spectre.Console/Live/Progress/ProgressColumn.cs diff --git a/src/Spectre.Console/Widgets/Progress/ProgressContext.cs b/src/Spectre.Console/Live/Progress/ProgressContext.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/ProgressContext.cs rename to src/Spectre.Console/Live/Progress/ProgressContext.cs diff --git a/src/Spectre.Console/Widgets/Progress/ProgressRefreshThread.cs b/src/Spectre.Console/Live/Progress/ProgressRefreshThread.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/ProgressRefreshThread.cs rename to src/Spectre.Console/Live/Progress/ProgressRefreshThread.cs diff --git a/src/Spectre.Console/Widgets/Progress/ProgressRenderer.cs b/src/Spectre.Console/Live/Progress/ProgressRenderer.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/ProgressRenderer.cs rename to src/Spectre.Console/Live/Progress/ProgressRenderer.cs diff --git a/src/Spectre.Console/Widgets/Progress/ProgressSample.cs b/src/Spectre.Console/Live/Progress/ProgressSample.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/ProgressSample.cs rename to src/Spectre.Console/Live/Progress/ProgressSample.cs diff --git a/src/Spectre.Console/Widgets/Progress/ProgressTask.cs b/src/Spectre.Console/Live/Progress/ProgressTask.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/ProgressTask.cs rename to src/Spectre.Console/Live/Progress/ProgressTask.cs diff --git a/src/Spectre.Console/Widgets/Progress/ProgressTaskSettings.cs b/src/Spectre.Console/Live/Progress/ProgressTaskSettings.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/ProgressTaskSettings.cs rename to src/Spectre.Console/Live/Progress/ProgressTaskSettings.cs diff --git a/src/Spectre.Console/Widgets/Progress/ProgressTaskState.cs b/src/Spectre.Console/Live/Progress/ProgressTaskState.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/ProgressTaskState.cs rename to src/Spectre.Console/Live/Progress/ProgressTaskState.cs diff --git a/src/Spectre.Console/Widgets/Progress/Renderers/DefaultProgressRenderer.cs b/src/Spectre.Console/Live/Progress/Renderers/DefaultProgressRenderer.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Renderers/DefaultProgressRenderer.cs rename to src/Spectre.Console/Live/Progress/Renderers/DefaultProgressRenderer.cs diff --git a/src/Spectre.Console/Widgets/Progress/Renderers/FallbackProgressRenderer.cs b/src/Spectre.Console/Live/Progress/Renderers/FallbackProgressRenderer.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Renderers/FallbackProgressRenderer.cs rename to src/Spectre.Console/Live/Progress/Renderers/FallbackProgressRenderer.cs diff --git a/src/Spectre.Console/Widgets/Progress/Renderers/FallbackStatusRenderer.cs b/src/Spectre.Console/Live/Progress/Renderers/FallbackStatusRenderer.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Renderers/FallbackStatusRenderer.cs rename to src/Spectre.Console/Live/Progress/Renderers/FallbackStatusRenderer.cs diff --git a/src/Spectre.Console/Widgets/Progress/Spinner.Generated.cs b/src/Spectre.Console/Live/Progress/Spinner.Generated.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Spinner.Generated.cs rename to src/Spectre.Console/Live/Progress/Spinner.Generated.cs diff --git a/src/Spectre.Console/Widgets/Progress/Spinner.cs b/src/Spectre.Console/Live/Progress/Spinner.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Spinner.cs rename to src/Spectre.Console/Live/Progress/Spinner.cs diff --git a/src/Spectre.Console/Widgets/Progress/Status.cs b/src/Spectre.Console/Live/Status/Status.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/Status.cs rename to src/Spectre.Console/Live/Status/Status.cs diff --git a/src/Spectre.Console/Widgets/Progress/StatusContext.cs b/src/Spectre.Console/Live/Status/StatusContext.cs similarity index 100% rename from src/Spectre.Console/Widgets/Progress/StatusContext.cs rename to src/Spectre.Console/Live/Status/StatusContext.cs diff --git a/src/Spectre.Console/Widgets/Prompt/ConfirmationPrompt.cs b/src/Spectre.Console/Prompts/ConfirmationPrompt.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/ConfirmationPrompt.cs rename to src/Spectre.Console/Prompts/ConfirmationPrompt.cs diff --git a/src/Spectre.Console/Widgets/Prompt/DefaultPromptValue.cs b/src/Spectre.Console/Prompts/DefaultPromptValue.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/DefaultPromptValue.cs rename to src/Spectre.Console/Prompts/DefaultPromptValue.cs diff --git a/src/Spectre.Console/Widgets/Prompt/IMultiSelectionItem.cs b/src/Spectre.Console/Prompts/IMultiSelectionItem.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/IMultiSelectionItem.cs rename to src/Spectre.Console/Prompts/IMultiSelectionItem.cs diff --git a/src/Spectre.Console/Widgets/Prompt/IPrompt.cs b/src/Spectre.Console/Prompts/IPrompt.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/IPrompt.cs rename to src/Spectre.Console/Prompts/IPrompt.cs diff --git a/src/Spectre.Console/Widgets/Prompt/ISelectionItem.cs b/src/Spectre.Console/Prompts/ISelectionItem.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/ISelectionItem.cs rename to src/Spectre.Console/Prompts/ISelectionItem.cs diff --git a/src/Spectre.Console/Widgets/Prompt/List/IListPromptStrategy.cs b/src/Spectre.Console/Prompts/List/IListPromptStrategy.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/List/IListPromptStrategy.cs rename to src/Spectre.Console/Prompts/List/IListPromptStrategy.cs diff --git a/src/Spectre.Console/Widgets/Prompt/List/ListPrompt.cs b/src/Spectre.Console/Prompts/List/ListPrompt.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/List/ListPrompt.cs rename to src/Spectre.Console/Prompts/List/ListPrompt.cs diff --git a/src/Spectre.Console/Widgets/Prompt/List/ListPromptConstants.cs b/src/Spectre.Console/Prompts/List/ListPromptConstants.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/List/ListPromptConstants.cs rename to src/Spectre.Console/Prompts/List/ListPromptConstants.cs diff --git a/src/Spectre.Console/Widgets/Prompt/List/ListPromptInputResult.cs b/src/Spectre.Console/Prompts/List/ListPromptInputResult.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/List/ListPromptInputResult.cs rename to src/Spectre.Console/Prompts/List/ListPromptInputResult.cs diff --git a/src/Spectre.Console/Widgets/Prompt/List/ListPromptItem.cs b/src/Spectre.Console/Prompts/List/ListPromptItem.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/List/ListPromptItem.cs rename to src/Spectre.Console/Prompts/List/ListPromptItem.cs diff --git a/src/Spectre.Console/Widgets/Prompt/List/ListPromptRenderHook.cs b/src/Spectre.Console/Prompts/List/ListPromptRenderHook.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/List/ListPromptRenderHook.cs rename to src/Spectre.Console/Prompts/List/ListPromptRenderHook.cs diff --git a/src/Spectre.Console/Widgets/Prompt/List/ListPromptState.cs b/src/Spectre.Console/Prompts/List/ListPromptState.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/List/ListPromptState.cs rename to src/Spectre.Console/Prompts/List/ListPromptState.cs diff --git a/src/Spectre.Console/Widgets/Prompt/List/ListPromptTree.cs b/src/Spectre.Console/Prompts/List/ListPromptTree.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/List/ListPromptTree.cs rename to src/Spectre.Console/Prompts/List/ListPromptTree.cs diff --git a/src/Spectre.Console/Widgets/Prompt/MultiSelectionPrompt.cs b/src/Spectre.Console/Prompts/MultiSelectionPrompt.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/MultiSelectionPrompt.cs rename to src/Spectre.Console/Prompts/MultiSelectionPrompt.cs diff --git a/src/Spectre.Console/Widgets/Prompt/MultiSelectionPromptExtensions.cs b/src/Spectre.Console/Prompts/MultiSelectionPromptExtensions.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/MultiSelectionPromptExtensions.cs rename to src/Spectre.Console/Prompts/MultiSelectionPromptExtensions.cs diff --git a/src/Spectre.Console/Widgets/Prompt/SelectionPrompt.cs b/src/Spectre.Console/Prompts/SelectionPrompt.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/SelectionPrompt.cs rename to src/Spectre.Console/Prompts/SelectionPrompt.cs diff --git a/src/Spectre.Console/Widgets/Prompt/SelectionPromptExtensions.cs b/src/Spectre.Console/Prompts/SelectionPromptExtensions.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/SelectionPromptExtensions.cs rename to src/Spectre.Console/Prompts/SelectionPromptExtensions.cs diff --git a/src/Spectre.Console/Widgets/Prompt/SelectionType.cs b/src/Spectre.Console/Prompts/SelectionType.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/SelectionType.cs rename to src/Spectre.Console/Prompts/SelectionType.cs diff --git a/src/Spectre.Console/Widgets/Prompt/TextPrompt.cs b/src/Spectre.Console/Prompts/TextPrompt.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/TextPrompt.cs rename to src/Spectre.Console/Prompts/TextPrompt.cs diff --git a/src/Spectre.Console/Widgets/Prompt/TextPromptExtensions.cs b/src/Spectre.Console/Prompts/TextPromptExtensions.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/TextPromptExtensions.cs rename to src/Spectre.Console/Prompts/TextPromptExtensions.cs diff --git a/src/Spectre.Console/Widgets/Prompt/ValidationResult.cs b/src/Spectre.Console/Prompts/ValidationResult.cs similarity index 100% rename from src/Spectre.Console/Widgets/Prompt/ValidationResult.cs rename to src/Spectre.Console/Prompts/ValidationResult.cs diff --git a/test/Spectre.Console.Tests/Expectations/Widgets/Progress/Render_ReduceWidth.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Live/Progress/Render_ReduceWidth.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Widgets/Progress/Render_ReduceWidth.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Live/Progress/Render_ReduceWidth.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Widgets/Status/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Live/Status/Render.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Widgets/Status/Render.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Live/Status/Render.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AcceptChoice.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Prompts/Text/AcceptChoice.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AcceptChoice.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Prompts/Text/AcceptChoice.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_BestMatch.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Prompts/Text/AutoComplete_BestMatch.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_BestMatch.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Prompts/Text/AutoComplete_BestMatch.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_Empty.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Prompts/Text/AutoComplete_Empty.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_Empty.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Prompts/Text/AutoComplete_Empty.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_NextChoice.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Prompts/Text/AutoComplete_NextChoice.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_NextChoice.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Prompts/Text/AutoComplete_NextChoice.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/ConversionError.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Prompts/Text/ConversionError.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/ConversionError.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Prompts/Text/ConversionError.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomConverter.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Prompts/Text/CustomConverter.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomConverter.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Prompts/Text/CustomConverter.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomValidation.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Prompts/Text/CustomValidation.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomValidation.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Prompts/Text/CustomValidation.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/DefaultValue.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Prompts/Text/DefaultValue.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/DefaultValue.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Prompts/Text/DefaultValue.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/InvalidChoice.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Prompts/Text/InvalidChoice.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/InvalidChoice.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Prompts/Text/InvalidChoice.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/NoSuffix.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Prompts/Text/NoSuffix.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/NoSuffix.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Prompts/Text/NoSuffix.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/SecretDefaultValue.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Prompts/Text/SecretDefaultValue.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/SecretDefaultValue.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Prompts/Text/SecretDefaultValue.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Box/AsciiBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/AsciiBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Box/AsciiBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/AsciiBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Box/DoubleBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/DoubleBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Box/DoubleBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/DoubleBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Box/HeavyBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/HeavyBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Box/HeavyBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/HeavyBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Box/NoBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/NoBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Box/NoBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/NoBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Box/RoundedBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/RoundedBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Box/RoundedBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/RoundedBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Box/SquareBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/SquareBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Box/SquareBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/SquareBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/Ascii2Border.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/Ascii2Border.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/Ascii2Border.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/Ascii2Border.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/AsciiBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/AsciiBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/AsciiBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/AsciiBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/AsciiDoubleHeadBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/AsciiDoubleHeadBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/AsciiDoubleHeadBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/AsciiDoubleHeadBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/DoubleBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/DoubleBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/DoubleBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/DoubleBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/DoubleEdgeBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/DoubleEdgeBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/DoubleEdgeBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/DoubleEdgeBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/HeavyBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HeavyBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/HeavyBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HeavyBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/HeavyEdgeBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HeavyEdgeBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/HeavyEdgeBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HeavyEdgeBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/HeavyHeadBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HeavyHeadBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/HeavyHeadBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HeavyHeadBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/HorizontalBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HorizontalBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/HorizontalBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HorizontalBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_Centered.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder_Centered.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_Centered.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder_Centered.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_LeftAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder_LeftAligned.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_LeftAligned.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder_LeftAligned.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_RightAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder_RightAligned.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_RightAligned.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder_RightAligned.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/MinimalBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MinimalBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/MinimalBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MinimalBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/MinimalDoubleHeadBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MinimalDoubleHeadBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/MinimalDoubleHeadBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MinimalDoubleHeadBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/MinimalHeavyHeadBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MinimalHeavyHeadBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/MinimalHeavyHeadBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MinimalHeavyHeadBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/NoBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/NoBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/NoBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/NoBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/RoundedBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/RoundedBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/RoundedBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/RoundedBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/SimpleBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/SimpleBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/SimpleBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/SimpleBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/SimpleHeavyBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/SimpleHeavyBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/SimpleHeavyBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/SimpleHeavyBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Expectations/Borders/Table/SquareBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/SquareBorder.Output.verified.txt similarity index 100% rename from test/Spectre.Console.Tests/Expectations/Borders/Table/SquareBorder.Output.verified.txt rename to test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/SquareBorder.Output.verified.txt diff --git a/test/Spectre.Console.Tests/Unit/Progress/DownloadedColumnTests.cs b/test/Spectre.Console.Tests/Unit/Live/Progress/DownloadedColumnTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/Progress/DownloadedColumnTests.cs rename to test/Spectre.Console.Tests/Unit/Live/Progress/DownloadedColumnTests.cs diff --git a/test/Spectre.Console.Tests/Unit/Progress/ProgressColumnFixture.cs b/test/Spectre.Console.Tests/Unit/Live/Progress/ProgressColumnFixture.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/Progress/ProgressColumnFixture.cs rename to test/Spectre.Console.Tests/Unit/Live/Progress/ProgressColumnFixture.cs diff --git a/test/Spectre.Console.Tests/Unit/Progress/ProgressTests.cs b/test/Spectre.Console.Tests/Unit/Live/Progress/ProgressTests.cs similarity index 99% rename from test/Spectre.Console.Tests/Unit/Progress/ProgressTests.cs rename to test/Spectre.Console.Tests/Unit/Live/Progress/ProgressTests.cs index 36f4067..9f93d67 100644 --- a/test/Spectre.Console.Tests/Unit/Progress/ProgressTests.cs +++ b/test/Spectre.Console.Tests/Unit/Live/Progress/ProgressTests.cs @@ -9,7 +9,7 @@ using Xunit; namespace Spectre.Console.Tests.Unit { [UsesVerify] - [ExpectationPath("Widgets/Progress")] + [ExpectationPath("Live/Progress")] public sealed class ProgressTests { [Fact] diff --git a/test/Spectre.Console.Tests/Unit/StatusTests.cs b/test/Spectre.Console.Tests/Unit/Live/StatusTests.cs similarity index 97% rename from test/Spectre.Console.Tests/Unit/StatusTests.cs rename to test/Spectre.Console.Tests/Unit/Live/StatusTests.cs index cecbd87..300f7e1 100644 --- a/test/Spectre.Console.Tests/Unit/StatusTests.cs +++ b/test/Spectre.Console.Tests/Unit/Live/StatusTests.cs @@ -9,7 +9,7 @@ using Xunit; namespace Spectre.Console.Tests.Unit { [UsesVerify] - [ExpectationPath("Widgets/Status")] + [ExpectationPath("Live/Status")] public sealed class StatusTests { public sealed class DummySpinner1 : Spinner diff --git a/test/Spectre.Console.Tests/Unit/Prompt/MultiSelectionPromptTests.cs b/test/Spectre.Console.Tests/Unit/Prompts/MultiSelectionPromptTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/Prompt/MultiSelectionPromptTests.cs rename to test/Spectre.Console.Tests/Unit/Prompts/MultiSelectionPromptTests.cs diff --git a/test/Spectre.Console.Tests/Unit/TextPromptTests.cs b/test/Spectre.Console.Tests/Unit/Prompts/TextPromptTests.cs similarity index 99% rename from test/Spectre.Console.Tests/Unit/TextPromptTests.cs rename to test/Spectre.Console.Tests/Unit/Prompts/TextPromptTests.cs index f560b87..7974a1f 100644 --- a/test/Spectre.Console.Tests/Unit/TextPromptTests.cs +++ b/test/Spectre.Console.Tests/Unit/Prompts/TextPromptTests.cs @@ -9,7 +9,7 @@ using Spectre.Verify.Extensions; namespace Spectre.Console.Tests.Unit { [UsesVerify] - [ExpectationPath("Widgets/Prompt/Text")] + [ExpectationPath("Prompts/Text")] public sealed class TextPromptTests { [Fact] diff --git a/test/Spectre.Console.Tests/Unit/BoxBorderTests.cs b/test/Spectre.Console.Tests/Unit/Rendering/Borders/BoxBorderTests.cs similarity index 99% rename from test/Spectre.Console.Tests/Unit/BoxBorderTests.cs rename to test/Spectre.Console.Tests/Unit/Rendering/Borders/BoxBorderTests.cs index 798264b..5172444 100644 --- a/test/Spectre.Console.Tests/Unit/BoxBorderTests.cs +++ b/test/Spectre.Console.Tests/Unit/Rendering/Borders/BoxBorderTests.cs @@ -9,7 +9,7 @@ using Xunit; namespace Spectre.Console.Tests.Unit { [UsesVerify] - [ExpectationPath("Borders/Box")] + [ExpectationPath("Rendering/Borders/Box")] public sealed class BoxBorderTests { [UsesVerify] diff --git a/test/Spectre.Console.Tests/Unit/TableBorderTests.cs b/test/Spectre.Console.Tests/Unit/Rendering/Borders/TableBorderTests.cs similarity index 99% rename from test/Spectre.Console.Tests/Unit/TableBorderTests.cs rename to test/Spectre.Console.Tests/Unit/Rendering/Borders/TableBorderTests.cs index f2d311b..545beda 100644 --- a/test/Spectre.Console.Tests/Unit/TableBorderTests.cs +++ b/test/Spectre.Console.Tests/Unit/Rendering/Borders/TableBorderTests.cs @@ -9,7 +9,7 @@ using Xunit; namespace Spectre.Console.Tests.Unit { [UsesVerify] - [ExpectationPath("Borders/Table")] + [ExpectationPath("Rendering/Borders/Table")] public sealed class TableBorderTests { [UsesVerify] diff --git a/test/Spectre.Console.Tests/Unit/RenderHookTests.cs b/test/Spectre.Console.Tests/Unit/Rendering/RenderHookTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/RenderHookTests.cs rename to test/Spectre.Console.Tests/Unit/Rendering/RenderHookTests.cs diff --git a/test/Spectre.Console.Tests/Unit/SegmentTests.cs b/test/Spectre.Console.Tests/Unit/Rendering/SegmentTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/SegmentTests.cs rename to test/Spectre.Console.Tests/Unit/Rendering/SegmentTests.cs diff --git a/test/Spectre.Console.Tests/Unit/BarChartTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/BarChartTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/BarChartTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/BarChartTests.cs diff --git a/test/Spectre.Console.Tests/Unit/BreakdownChartTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/BreakdownChartTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/BreakdownChartTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/BreakdownChartTests.cs diff --git a/test/Spectre.Console.Tests/Unit/CalendarTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/CalendarTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/CalendarTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/CalendarTests.cs diff --git a/test/Spectre.Console.Tests/Unit/CanvasTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/CanvasTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/CanvasTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/CanvasTests.cs diff --git a/test/Spectre.Console.Tests/Unit/ColumnsTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/ColumnsTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/ColumnsTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/ColumnsTests.cs diff --git a/test/Spectre.Console.Tests/Unit/FigletTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/FigletTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/FigletTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/FigletTests.cs diff --git a/test/Spectre.Console.Tests/Unit/GridTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/GridTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/GridTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/GridTests.cs diff --git a/test/Spectre.Console.Tests/Unit/MarkupTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/MarkupTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/MarkupTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/MarkupTests.cs diff --git a/test/Spectre.Console.Tests/Unit/PadderTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/PadderTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/PadderTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/PadderTests.cs diff --git a/test/Spectre.Console.Tests/Unit/PanelTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/PanelTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/PanelTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/PanelTests.cs diff --git a/test/Spectre.Console.Tests/Unit/RowsTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/RowsTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/RowsTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/RowsTests.cs diff --git a/test/Spectre.Console.Tests/Unit/RuleTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/RuleTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/RuleTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/RuleTests.cs diff --git a/test/Spectre.Console.Tests/Unit/TableTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/TableTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/TableTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/TableTests.cs diff --git a/test/Spectre.Console.Tests/Unit/TextTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/TextTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/TextTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/TextTests.cs diff --git a/test/Spectre.Console.Tests/Unit/TreeTests.cs b/test/Spectre.Console.Tests/Unit/Widgets/TreeTests.cs similarity index 100% rename from test/Spectre.Console.Tests/Unit/TreeTests.cs rename to test/Spectre.Console.Tests/Unit/Widgets/TreeTests.cs