diff --git a/test/powershell/CmdletExample.Tests.ps1 b/test/powershell/CmdletExample.Tests.ps1
deleted file mode 100644
index 449d850ee..000000000
--- a/test/powershell/CmdletExample.Tests.ps1
+++ /dev/null
@@ -1,6 +0,0 @@
-try {
-    Push-Location $PSScriptRoot/../../docs/cmdlet-example
-    ./SendGreeting.Tests.ps1
-} finally {
-    Pop-Location
-}
diff --git a/test/powershell/Base-Directory.Tests.ps1 b/test/powershell/Host/Base-Directory.Tests.ps1
similarity index 100%
rename from test/powershell/Base-Directory.Tests.ps1
rename to test/powershell/Host/Base-Directory.Tests.ps1
diff --git a/test/powershell/ConsoleHost.Tests.ps1 b/test/powershell/Host/ConsoleHost.Tests.ps1
similarity index 99%
rename from test/powershell/ConsoleHost.Tests.ps1
rename to test/powershell/Host/ConsoleHost.Tests.ps1
index 94b0b25a0..e1854e3ab 100644
--- a/test/powershell/ConsoleHost.Tests.ps1
+++ b/test/powershell/Host/ConsoleHost.Tests.ps1
@@ -1,6 +1,7 @@
 using namespace System.Diagnostics
 
 Describe "ConsoleHost unit tests" -Tag 'Slow' {
+
     $powershell = Join-Path -Path $PsHome -ChildPath "powershell"
 
     Context "CommandLine" {
diff --git a/test/powershell/PSVersionTable.Tests.ps1 b/test/powershell/Host/PSVersionTable.Tests.ps1
similarity index 100%
rename from test/powershell/PSVersionTable.Tests.ps1
rename to test/powershell/Host/PSVersionTable.Tests.ps1
diff --git a/test/powershell/DotNetAPI.Tests.ps1 b/test/powershell/Language/Interop/DotNet/DotNetAPI.Tests.ps1
similarity index 100%
rename from test/powershell/DotNetAPI.Tests.ps1
rename to test/powershell/Language/Interop/DotNet/DotNetAPI.Tests.ps1
diff --git a/test/powershell/DotNetInterop.Tests.ps1 b/test/powershell/Language/Interop/DotNet/DotNetInterop.Tests.ps1
similarity index 100%
rename from test/powershell/DotNetInterop.Tests.ps1
rename to test/powershell/Language/Interop/DotNet/DotNetInterop.Tests.ps1
diff --git a/test/powershell/ComparisonOperator.Tests.ps1 b/test/powershell/Language/Operators/ComparisonOperator.Tests.ps1
similarity index 100%
rename from test/powershell/ComparisonOperator.Tests.ps1
rename to test/powershell/Language/Operators/ComparisonOperator.Tests.ps1
diff --git a/test/powershell/Import-Module.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Import-Module.Tests.ps1
similarity index 100%
rename from test/powershell/Import-Module.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Core/Import-Module.Tests.ps1
diff --git a/test/powershell/Remove-Module.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Remove-Module.Tests.ps1
similarity index 100%
rename from test/powershell/Remove-Module.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Core/Remove-Module.Tests.ps1
diff --git a/test/powershell/Set-PSDebug.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Set-PSDebug.Tests.ps1
similarity index 100%
rename from test/powershell/Set-PSDebug.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Core/Set-PSDebug.Tests.ps1
diff --git a/test/powershell/Add-Content.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Add-Content.Tests.ps1
similarity index 100%
rename from test/powershell/Add-Content.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Add-Content.Tests.ps1
diff --git a/test/powershell/Clear-Content.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Clear-Content.Tests.ps1
similarity index 100%
rename from test/powershell/Clear-Content.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Clear-Content.Tests.ps1
diff --git a/test/powershell/Clear-EventLog.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Clear-EventLog.Tests.ps1
similarity index 100%
rename from test/powershell/Clear-EventLog.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Clear-EventLog.Tests.ps1
diff --git a/test/powershell/Get-ChildItem.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
similarity index 100%
rename from test/powershell/Get-ChildItem.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
diff --git a/test/powershell/Get-Content.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Content.Tests.ps1
similarity index 100%
rename from test/powershell/Get-Content.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Get-Content.Tests.ps1
diff --git a/test/powershell/Get-EventLog.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-EventLog.Tests.ps1
similarity index 100%
rename from test/powershell/Get-EventLog.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Get-EventLog.Tests.ps1
diff --git a/test/powershell/Get-Item.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Item.Tests.ps1
similarity index 100%
rename from test/powershell/Get-Item.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Get-Item.Tests.ps1
diff --git a/test/powershell/Get-ItemProperty.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ItemProperty.Tests.ps1
similarity index 100%
rename from test/powershell/Get-ItemProperty.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Get-ItemProperty.Tests.ps1
diff --git a/test/powershell/Get-Location.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Location.Tests.ps1
similarity index 100%
rename from test/powershell/Get-Location.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Get-Location.Tests.ps1
diff --git a/test/powershell/Get-PSDrive.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-PSDrive.Tests.ps1
similarity index 100%
rename from test/powershell/Get-PSDrive.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Get-PSDrive.Tests.ps1
diff --git a/test/powershell/Get-PSProvider.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-PSProvider.Tests.ps1
similarity index 100%
rename from test/powershell/Get-PSProvider.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Get-PSProvider.Tests.ps1
diff --git a/test/powershell/Get-Process.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Process.Tests.ps1
similarity index 100%
rename from test/powershell/Get-Process.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Get-Process.Tests.ps1
diff --git a/test/powershell/Hierarchical-Path.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Hierarchical-Path.Tests.ps1
similarity index 100%
rename from test/powershell/Hierarchical-Path.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Hierarchical-Path.Tests.ps1
diff --git a/test/powershell/Join-Path.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Join-Path.Tests.ps1
similarity index 100%
rename from test/powershell/Join-Path.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Join-Path.Tests.ps1
diff --git a/test/powershell/New-EventLog.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/New-EventLog.Tests.ps1
similarity index 100%
rename from test/powershell/New-EventLog.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/New-EventLog.Tests.ps1
diff --git a/test/powershell/New-Item.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/New-Item.Tests.ps1
similarity index 100%
rename from test/powershell/New-Item.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/New-Item.Tests.ps1
diff --git a/test/powershell/Pop-Location.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Pop-Location.Tests.ps1
similarity index 100%
rename from test/powershell/Pop-Location.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Pop-Location.Tests.ps1
diff --git a/test/powershell/Push-Location.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Push-Location.Tests.ps1
similarity index 100%
rename from test/powershell/Push-Location.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Push-Location.Tests.ps1
diff --git a/test/powershell/Remove-EventLog.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Remove-EventLog.Tests.ps1
similarity index 100%
rename from test/powershell/Remove-EventLog.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Remove-EventLog.Tests.ps1
diff --git a/test/powershell/Remove-Item.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Remove-Item.Tests.ps1
similarity index 100%
rename from test/powershell/Remove-Item.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Remove-Item.Tests.ps1
diff --git a/test/powershell/Set-Content.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Set-Content.Tests.ps1
similarity index 100%
rename from test/powershell/Set-Content.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Set-Content.Tests.ps1
diff --git a/test/powershell/Set-Location.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Set-Location.Tests.ps1
similarity index 100%
rename from test/powershell/Set-Location.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Set-Location.Tests.ps1
diff --git a/test/powershell/Split-Path.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Split-Path.Tests.ps1
similarity index 100%
rename from test/powershell/Split-Path.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Split-Path.Tests.ps1
diff --git a/test/powershell/Start-Process.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Start-Process.Tests.ps1
similarity index 100%
rename from test/powershell/Start-Process.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Start-Process.Tests.ps1
diff --git a/test/powershell/Test-Path.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Path.Tests.ps1
similarity index 100%
rename from test/powershell/Test-Path.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Management/Test-Path.Tests.ps1
diff --git a/test/powershell/assets/SortTest.txt b/test/powershell/Modules/Microsoft.PowerShell.Management/assets/SortTest.txt
similarity index 100%
rename from test/powershell/assets/SortTest.txt
rename to test/powershell/Modules/Microsoft.PowerShell.Management/assets/SortTest.txt
diff --git a/test/powershell/ExecutionPolicy.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/ExecutionPolicy.Tests.ps1
similarity index 100%
rename from test/powershell/ExecutionPolicy.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Security/ExecutionPolicy.Tests.ps1
diff --git a/test/powershell/Add-Member.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Add-Member.Tests.ps1
similarity index 100%
rename from test/powershell/Add-Member.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Add-Member.Tests.ps1
diff --git a/test/powershell/Add-Type.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Add-Type.Tests.ps1
similarity index 100%
rename from test/powershell/Add-Type.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Add-Type.Tests.ps1
diff --git a/test/powershell/Clear-Variable.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Clear-Variable.Tests.ps1
similarity index 100%
rename from test/powershell/Clear-Variable.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Clear-Variable.Tests.ps1
diff --git a/test/powershell/Compare-Object.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Compare-Object.Tests.ps1
similarity index 100%
rename from test/powershell/Compare-Object.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Compare-Object.Tests.ps1
diff --git a/test/powershell/ConvertFrom-Csv.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-Csv.Tests.ps1
similarity index 100%
rename from test/powershell/ConvertFrom-Csv.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-Csv.Tests.ps1
diff --git a/test/powershell/ConvertFrom-StringData.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-StringData.Tests.ps1
similarity index 100%
rename from test/powershell/ConvertFrom-StringData.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-StringData.Tests.ps1
diff --git a/test/powershell/ConvertTo-Csv.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Csv.Tests.ps1
similarity index 100%
rename from test/powershell/ConvertTo-Csv.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Csv.Tests.ps1
diff --git a/test/powershell/ConvertTo-SecureString.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-SecureString.Tests.ps1
similarity index 100%
rename from test/powershell/ConvertTo-SecureString.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-SecureString.Tests.ps1
diff --git a/test/powershell/ConvertTo-Xml.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Xml.Tests.ps1
similarity index 100%
rename from test/powershell/ConvertTo-Xml.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Xml.Tests.ps1
diff --git a/test/powershell/Default-Aliases.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Default-Aliases.Tests.ps1
similarity index 100%
rename from test/powershell/Default-Aliases.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Default-Aliases.Tests.ps1
diff --git a/test/powershell/Environment-Variables.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Environment-Variables.Tests.ps1
similarity index 100%
rename from test/powershell/Environment-Variables.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Environment-Variables.Tests.ps1
diff --git a/test/powershell/Export-Alias.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Export-Alias.Tests.ps1
similarity index 100%
rename from test/powershell/Export-Alias.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Export-Alias.Tests.ps1
diff --git a/test/powershell/Export-Csv.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Export-Csv.Tests.ps1
similarity index 100%
rename from test/powershell/Export-Csv.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Export-Csv.Tests.ps1
diff --git a/test/powershell/Export-FormatData.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Export-FormatData.Tests.ps1
similarity index 100%
rename from test/powershell/Export-FormatData.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Export-FormatData.Tests.ps1
diff --git a/test/powershell/Format-Custom.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Custom.Tests.ps1
similarity index 100%
rename from test/powershell/Format-Custom.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Custom.Tests.ps1
diff --git a/test/powershell/Format-List.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1
similarity index 100%
rename from test/powershell/Format-List.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1
diff --git a/test/powershell/Format-Table.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Table.Tests.ps1
similarity index 100%
rename from test/powershell/Format-Table.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Table.Tests.ps1
diff --git a/test/powershell/Format-Wide.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Wide.Tests.ps1
similarity index 100%
rename from test/powershell/Format-Wide.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Wide.Tests.ps1
diff --git a/test/powershell/Get-Alias.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Alias.Tests.ps1
similarity index 100%
rename from test/powershell/Get-Alias.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Alias.Tests.ps1
diff --git a/test/powershell/Get-Culture.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Culture.Tests.ps1
similarity index 100%
rename from test/powershell/Get-Culture.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Culture.Tests.ps1
diff --git a/test/powershell/Get-Date.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Date.Tests.ps1
similarity index 100%
rename from test/powershell/Get-Date.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Date.Tests.ps1
diff --git a/test/powershell/Get-Event.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Event.Tests.ps1
similarity index 100%
rename from test/powershell/Get-Event.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Event.Tests.ps1
diff --git a/test/powershell/Get-EventSubscriber.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-EventSubscriber.Tests.ps1
similarity index 100%
rename from test/powershell/Get-EventSubscriber.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-EventSubscriber.Tests.ps1
diff --git a/test/powershell/Get-FileHash.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-FileHash.Tests.ps1
similarity index 100%
rename from test/powershell/Get-FileHash.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-FileHash.Tests.ps1
diff --git a/test/powershell/Get-FormatData.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-FormatData.Tests.ps1
similarity index 100%
rename from test/powershell/Get-FormatData.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-FormatData.Tests.ps1
diff --git a/test/powershell/Get-Host.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Host.Tests.ps1
similarity index 100%
rename from test/powershell/Get-Host.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Host.Tests.ps1
diff --git a/test/powershell/Get-Member.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Member.Tests.ps1
similarity index 100%
rename from test/powershell/Get-Member.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Member.Tests.ps1
diff --git a/test/powershell/Get-PSBreakpoint.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-PSBreakpoint.Tests.ps1
similarity index 100%
rename from test/powershell/Get-PSBreakpoint.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-PSBreakpoint.Tests.ps1
diff --git a/test/powershell/Get-PSCallStack.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-PSCallStack.Tests.ps1
similarity index 100%
rename from test/powershell/Get-PSCallStack.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-PSCallStack.Tests.ps1
diff --git a/test/powershell/Get-Random.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Random.Tests.ps1
similarity index 100%
rename from test/powershell/Get-Random.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Random.Tests.ps1
diff --git a/test/powershell/Get-RunspaceDebug.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-RunspaceDebug.Tests.ps1
similarity index 100%
rename from test/powershell/Get-RunspaceDebug.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-RunspaceDebug.Tests.ps1
diff --git a/test/powershell/Get-TraceSource.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-TraceSource.Tests.ps1
similarity index 100%
rename from test/powershell/Get-TraceSource.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-TraceSource.Tests.ps1
diff --git a/test/powershell/Get-UICulture.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-UICulture.Tests.ps1
similarity index 100%
rename from test/powershell/Get-UICulture.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-UICulture.Tests.ps1
diff --git a/test/powershell/Get-Unique.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Unique.Tests.ps1
similarity index 100%
rename from test/powershell/Get-Unique.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Unique.Tests.ps1
diff --git a/test/powershell/Get-Variable.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Variable.Tests.ps1
similarity index 100%
rename from test/powershell/Get-Variable.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Variable.Tests.ps1
diff --git a/test/powershell/Group-Object.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Group-Object.Tests.ps1
similarity index 100%
rename from test/powershell/Group-Object.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Group-Object.Tests.ps1
diff --git a/test/powershell/Import-Alias.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Import-Alias.Tests.ps1
similarity index 100%
rename from test/powershell/Import-Alias.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Import-Alias.Tests.ps1
diff --git a/test/powershell/Import-Csv.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Import-Csv.Tests.ps1
similarity index 100%
rename from test/powershell/Import-Csv.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Import-Csv.Tests.ps1
diff --git a/test/powershell/Import-LocalizedData.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Import-LocalizedData.Tests.ps1
similarity index 100%
rename from test/powershell/Import-LocalizedData.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Import-LocalizedData.Tests.ps1
diff --git a/test/powershell/Invoke-Expression.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Invoke-Expression.Tests.ps1
similarity index 100%
rename from test/powershell/Invoke-Expression.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Invoke-Expression.Tests.ps1
diff --git a/test/powershell/Measure-Command.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Measure-Command.Tests.ps1
similarity index 100%
rename from test/powershell/Measure-Command.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Measure-Command.Tests.ps1
diff --git a/test/powershell/Measure-Object.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Measure-Object.Tests.ps1
similarity index 100%
rename from test/powershell/Measure-Object.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Measure-Object.Tests.ps1
diff --git a/test/powershell/New-Alias.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/New-Alias.Tests.ps1
similarity index 100%
rename from test/powershell/New-Alias.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/New-Alias.Tests.ps1
diff --git a/test/powershell/New-Event.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/New-Event.Tests.ps1
similarity index 100%
rename from test/powershell/New-Event.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/New-Event.Tests.ps1
diff --git a/test/powershell/New-Object.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/New-Object.Tests.ps1
similarity index 100%
rename from test/powershell/New-Object.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/New-Object.Tests.ps1
diff --git a/test/powershell/New-TimeSpan.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/New-TimeSpan.Tests.ps1
similarity index 100%
rename from test/powershell/New-TimeSpan.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/New-TimeSpan.Tests.ps1
diff --git a/test/powershell/New-Variable.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/New-Variable.Tests.ps1
similarity index 100%
rename from test/powershell/New-Variable.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/New-Variable.Tests.ps1
diff --git a/test/powershell/Out-File.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Out-File.Tests.ps1
similarity index 100%
rename from test/powershell/Out-File.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Out-File.Tests.ps1
diff --git a/test/powershell/Out-String.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Out-String.Tests.ps1
similarity index 100%
rename from test/powershell/Out-String.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Out-String.Tests.ps1
diff --git a/test/powershell/Register-EngineEvent.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Register-EngineEvent.Tests.ps1
similarity index 100%
rename from test/powershell/Register-EngineEvent.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Register-EngineEvent.Tests.ps1
diff --git a/test/powershell/Register-ObjectEvent.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Register-ObjectEvent.Tests.ps1
similarity index 100%
rename from test/powershell/Register-ObjectEvent.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Register-ObjectEvent.Tests.ps1
diff --git a/test/powershell/Remove-Event.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Remove-Event.Tests.ps1
similarity index 100%
rename from test/powershell/Remove-Event.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Remove-Event.Tests.ps1
diff --git a/test/powershell/Remove-PSBreakpoint.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Remove-PSBreakpoint.Tests.ps1
similarity index 100%
rename from test/powershell/Remove-PSBreakpoint.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Remove-PSBreakpoint.Tests.ps1
diff --git a/test/powershell/Remove-TypeData.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Remove-TypeData.Tests.ps1
similarity index 100%
rename from test/powershell/Remove-TypeData.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Remove-TypeData.Tests.ps1
diff --git a/test/powershell/Remove-Variable.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Remove-Variable.Tests.ps1
similarity index 100%
rename from test/powershell/Remove-Variable.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Remove-Variable.Tests.ps1
diff --git a/test/powershell/Select-Object.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Select-Object.Tests.ps1
similarity index 100%
rename from test/powershell/Select-Object.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Select-Object.Tests.ps1
diff --git a/test/powershell/Select-String.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Select-String.Tests.ps1
similarity index 100%
rename from test/powershell/Select-String.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Select-String.Tests.ps1
diff --git a/test/powershell/Select-XML.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Select-XML.Tests.ps1
similarity index 100%
rename from test/powershell/Select-XML.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Select-XML.Tests.ps1
diff --git a/test/powershell/Set-Alias.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-Alias.Tests.ps1
similarity index 100%
rename from test/powershell/Set-Alias.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Set-Alias.Tests.ps1
diff --git a/test/powershell/Set-PSBreakpoint.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-PSBreakpoint.Tests.ps1
similarity index 100%
rename from test/powershell/Set-PSBreakpoint.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Set-PSBreakpoint.Tests.ps1
diff --git a/test/powershell/Set-Variable.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-Variable.Tests.ps1
similarity index 100%
rename from test/powershell/Set-Variable.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Set-Variable.Tests.ps1
diff --git a/test/powershell/Sort-Object.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Sort-Object.Tests.ps1
similarity index 100%
rename from test/powershell/Sort-Object.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Sort-Object.Tests.ps1
diff --git a/test/powershell/Start-Sleep.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Start-Sleep.Tests.ps1
similarity index 100%
rename from test/powershell/Start-Sleep.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Start-Sleep.Tests.ps1
diff --git a/test/powershell/Tee-Object.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Tee-Object.Tests.ps1
similarity index 100%
rename from test/powershell/Tee-Object.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Tee-Object.Tests.ps1
diff --git a/test/powershell/Test-Mocks.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Test-Mocks.ps1
similarity index 100%
rename from test/powershell/Test-Mocks.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Test-Mocks.ps1
diff --git a/test/powershell/Trace-Command.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Trace-Command.Tests.ps1
similarity index 100%
rename from test/powershell/Trace-Command.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Trace-Command.Tests.ps1
diff --git a/test/powershell/Update-FormatData.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Update-FormatData.Tests.ps1
similarity index 100%
rename from test/powershell/Update-FormatData.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Update-FormatData.Tests.ps1
diff --git a/test/powershell/Update-TypeData.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Update-TypeData.Tests.ps1
similarity index 100%
rename from test/powershell/Update-TypeData.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Update-TypeData.Tests.ps1
diff --git a/test/powershell/Wait-Event.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Wait-Event.Tests.ps1
similarity index 100%
rename from test/powershell/Wait-Event.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Wait-Event.Tests.ps1
diff --git a/test/powershell/Write-Error.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Error.Tests.ps1
similarity index 100%
rename from test/powershell/Write-Error.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Error.Tests.ps1
diff --git a/test/powershell/Write-Host.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Host.Tests.ps1
similarity index 100%
rename from test/powershell/Write-Host.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Host.Tests.ps1
diff --git a/test/powershell/Write-Output.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Output.Tests.ps1
similarity index 100%
rename from test/powershell/Write-Output.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Output.Tests.ps1
diff --git a/test/powershell/Write-Progress.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Progress.Tests.ps1
similarity index 100%
rename from test/powershell/Write-Progress.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Progress.Tests.ps1
diff --git a/test/powershell/Write-Stream.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Stream.Tests.ps1
similarity index 100%
rename from test/powershell/Write-Stream.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Stream.Tests.ps1
diff --git a/test/powershell/Write-Verbose.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Verbose.Tests.ps1
similarity index 100%
rename from test/powershell/Write-Verbose.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Verbose.Tests.ps1
diff --git a/test/powershell/XMLCommand.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/XMLCommand.Tests.ps1
similarity index 100%
rename from test/powershell/XMLCommand.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/XMLCommand.Tests.ps1
diff --git a/test/powershell/assets/TestCsv.csv b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestCsv.csv
similarity index 100%
rename from test/powershell/assets/TestCsv.csv
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestCsv.csv
diff --git a/test/powershell/assets/TestCsv2.csv b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestCsv2.csv
similarity index 100%
rename from test/powershell/assets/TestCsv2.csv
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestCsv2.csv
diff --git a/test/powershell/assets/de-DE/localized.psd1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/de-DE/localized.psd1
similarity index 100%
rename from test/powershell/assets/de-DE/localized.psd1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/assets/de-DE/localized.psd1
diff --git a/test/powershell/assets/en-US/localized.psd1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/en-US/localized.psd1
similarity index 100%
rename from test/powershell/assets/en-US/localized.psd1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/assets/en-US/localized.psd1
diff --git a/test/powershell/assets/localized.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/localized.ps1
similarity index 100%
rename from test/powershell/assets/localized.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/assets/localized.ps1
diff --git a/test/powershell/assets/pesteralias.txt b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/pesteralias.txt
similarity index 100%
rename from test/powershell/assets/pesteralias.txt
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/assets/pesteralias.txt
diff --git a/test/powershell/assets/testablescript.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/testablescript.ps1
similarity index 100%
rename from test/powershell/assets/testablescript.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/assets/testablescript.ps1
diff --git a/test/powershell/PSReadLine.Tests.ps1 b/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1
similarity index 100%
rename from test/powershell/PSReadLine.Tests.ps1
rename to test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1
diff --git a/test/powershell/SDK/CmdletExample.Tests.ps1 b/test/powershell/SDK/CmdletExample.Tests.ps1
new file mode 100644
index 000000000..517d7a51a
--- /dev/null
+++ b/test/powershell/SDK/CmdletExample.Tests.ps1
@@ -0,0 +1,9 @@
+try {
+    $enlistmentRoot = git rev-parse --show-toplevel
+
+    $docLocation = [io.path]::Combine($enlistmentRoot, "docs","cmdlet-example")
+    Push-Location $docLocation
+    ./SendGreeting.Tests.ps1
+} finally {
+    Pop-Location
+}
diff --git a/test/powershell/Json.Tests.ps1 b/test/powershell/SDK/Json.Tests.ps1
similarity index 100%
rename from test/powershell/Json.Tests.ps1
rename to test/powershell/SDK/Json.Tests.ps1
diff --git a/test/powershell/PSDebugging.Tests.ps1 b/test/powershell/SDK/PSDebugging.Tests.ps1
similarity index 100%
rename from test/powershell/PSDebugging.Tests.ps1
rename to test/powershell/SDK/PSDebugging.Tests.ps1
diff --git a/test/powershell/assets/TestJson.json b/test/powershell/SDK/assets/TestJson.json
similarity index 100%
rename from test/powershell/assets/TestJson.json
rename to test/powershell/SDK/assets/TestJson.json
diff --git a/test/powershell/NativeLinuxCommands.Tests.ps1 b/test/powershell/Scripting/NativeExecution/NativeLinuxCommands.Tests.ps1
similarity index 100%
rename from test/powershell/NativeLinuxCommands.Tests.ps1
rename to test/powershell/Scripting/NativeExecution/NativeLinuxCommands.Tests.ps1