diff --git a/tests/FSharp.Compiler.ComponentTests/AttributeUsage.fs b/tests/FSharp.Compiler.ComponentTests/AttributeUsage.fs
index 58d88d8aa6f..1cd8ad68771 100644
--- a/tests/FSharp.Compiler.ComponentTests/AttributeUsage.fs
+++ b/tests/FSharp.Compiler.ComponentTests/AttributeUsage.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.Conformance.DeclarationElements.CustomAttributes.AttributeUsage
+namespace Conformance.Conformance.DeclarationElements.CustomAttributes.AttributeUsage
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/checked/checked.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/checked/checked.fs
index 899e063a68d..4e4902c63d3 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/checked/checked.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/checked/checked.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions
+namespace CompilerOptions.Fsc
 
 open FSharp.Test
 open FSharp.Test.Compiler
@@ -10,7 +10,7 @@ module Checked =
 
     //  SOURCE=unchecked01.fs       # fsc-default
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
-    let ``fsc-unchecked - unchecked01.fs``  compilation =
+    let ``fsc-unchecked - unchecked01_fs``  compilation =
         compilation
         |> asFs
         |> compile
@@ -18,7 +18,7 @@ module Checked =
 
     //  SOURCE=checked01.fs   SCFLAGS="--checked"       # fsc-checked
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
-    let ``fsc-unchecked - unchecked01.fs --checked``  compilation =
+    let ``fsc-unchecked - unchecked01_fs --checked``  compilation =
         compilation
         |> asFs
         |> withOptions["--checked"]
@@ -27,7 +27,7 @@ module Checked =
 
     //  SOURCE=checked01.fs   SCFLAGS="--checked+"      # fsc-checked+
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
-    let ``fsc-unchecked - unchecked01.fs --checked+``  compilation =
+    let ``fsc-unchecked - unchecked01_fs --checked+``  compilation =
         compilation
         |> asFs
         |> withOptions["--checked+"]
@@ -36,7 +36,7 @@ module Checked =
 
     //  SOURCE=unchecked01.fs SCFLAGS="--checked-"      # fsc-checked-
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
-    let ``fsc-unchecked - unchecked01.fs --checked-``  compilation =
+    let ``fsc-unchecked - unchecked01_fs --checked-``  compilation =
         compilation
         |> asFs
         |> withOptions["--checked-"]
@@ -45,7 +45,7 @@ module Checked =
 
     //  SOURCE=unchecked01.fs SCFLAGS="--checked-"      # fsc-checked-
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
-    let ``fsi-unchecked - unchecked01.fs --checked-``  compilation =
+    let ``fsi-unchecked - unchecked01_fs --checked-``  compilation =
         compilation
         |> asFsx
         |> withOptions["--checked-"]
@@ -54,7 +54,7 @@ module Checked =
 
     //  SOURCE=checked01.fs   SCFLAGS="--checked"  FSIMODE=EXEC COMPILE_ONLY=1  # fsi-checked
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
-    let ``fsi-checked - checked01.fs --checked``  compilation =
+    let ``fsi-checked - checked01_fs --checked``  compilation =
         compilation
         |> asFsx
         |> withOptions["--checked"]
@@ -63,7 +63,7 @@ module Checked =
 
     //  SOURCE=checked01.fs   SCFLAGS="--checked+" FSIMODE=EXEC COMPILE_ONLY=1  # fsi-checked+
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
-    let ``fsi-checked - checked01.fs --checked+``  compilation =
+    let ``fsi-checked - checked01_fs --checked+``  compilation =
         compilation
         |> asFsx
         |> withOptions["--checked+"]
@@ -72,7 +72,7 @@ module Checked =
 
     //  SOURCE=checked01.fs   SCFLAGS="--checked-" FSIMODE=EXEC COMPILE_ONLY=1  # fsi-checked+
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
-    let ``fsi-checked - checked01.fs --checked-``  compilation =
+    let ``fsi-checked - checked01_fs --checked-``  compilation =
         compilation
         |> asFsx
         |> withOptions["--checked-"]
@@ -84,7 +84,7 @@ module Checked =
 
     //  SOURCE=checked01.fs   SCFLAGS="--checked  --checked+"   # fsc-checkedchecked+
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
-    let ``fsc-checked - checked01.fs --checked  --checked+``  compilation =
+    let ``fsc-checked - checked01_fs --checked  --checked+``  compilation =
         compilation
         |> asFs
         |> withOptions["--checked"; "--checked+"]
@@ -93,7 +93,7 @@ module Checked =
 
     //  SOURCE=checked01.fs   SCFLAGS="--checked- --checked+"   # fsc-checked-checked+
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
-    let ``fsc-checked - checked01.fs --checked- --checked+``  compilation =
+    let ``fsc-checked - checked01_fs --checked- --checked+``  compilation =
         compilation
         |> asFs
         |> withOptions["--checked-"; "--checked+"]
@@ -102,7 +102,7 @@ module Checked =
 
     //  SOURCE=unchecked01.fs SCFLAGS="--checked+ --checked-"   # fsc-checked+checked-
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
-    let ``fsc-checked - unchecked01.fs --checked+ --checked-``  compilation =
+    let ``fsc-checked - unchecked01_fs --checked+ --checked-``  compilation =
         compilation
         |> asFs
         |> withOptions["--checked+"; "--checked-"]
@@ -111,7 +111,7 @@ module Checked =
 
     //  SOURCE=checked01.fs   SCFLAGS="--checked  --checked+"   # fsc-checkedchecked+
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
-    let ``fsi-checked - checked01.fs --checked  --checked+``  compilation =
+    let ``fsi-checked - checked01_fs --checked  --checked+``  compilation =
         compilation
         |> asFsx
         |> withOptions["--checked"; "--checked+"]
@@ -120,7 +120,7 @@ module Checked =
 
     //  SOURCE=checked01.fs   SCFLAGS="--checked- --checked+"   # fsc-checked-checked+
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
-    let ``fsi-checked - checked01.fs --checked- --checked+``  compilation =
+    let ``fsi-checked - checked01_fs --checked- --checked+``  compilation =
         compilation
         |> asFsx
         |> withOptions["--checked-"; "--checked+"]
@@ -129,7 +129,7 @@ module Checked =
 
     //  SOURCE=unchecked01.fs SCFLAGS="--checked+ --checked-"   # fsc-checked+checked-
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
-    let ``fsi-checked - unchecked01.fs --checked+ --checked-``  compilation =
+    let ``fsi-checked - unchecked01_fs --checked+ --checked-``  compilation =
         compilation
         |> asFsx
         |> withOptions["--checked+"; "--checked-"]
@@ -139,7 +139,7 @@ module Checked =
     //# Unrecognized argument
     //  SOURCE=unrecogarg.fs  SCFLAGS="--Checked"   # fsc--Checked
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unrecogarg.fs"|])>]
-    let ``fsc-checked - unchecked01.fs Checked``  compilation =
+    let ``fsc-checked - unchecked01_fs Checked``  compilation =
         compilation
         |> asFs
         |> withOptions["--Checked"]
@@ -151,7 +151,7 @@ module Checked =
 
     //  SOURCE=unrecogarg.fs  SCFLAGS="--checked*"  # fsc--checked*
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unrecogarg.fs"|])>]
-    let ``fsc-checked - unchecked01.fs --checked-star``  compilation =
+    let ``fsc-checked - unchecked01_fs --checked-star``  compilation =
         compilation
         |> asFs
         |> withOptions["--checked*"]
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/cliversion.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/cliversion.fs
index 281bfe88e41..ed7912c14c2 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/cliversion.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/cliversion.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions
+namespace CompilerOptions.Fsc
 
 open Xunit
 open FSharp.Test
@@ -10,7 +10,7 @@ module cliversion =
 
     //#   SOURCE=E_fsc_cliversion.fs  SCFLAGS="--cliversion:2.0"                              # fsc --cliversion:2.0
     [<Fact>]
-    let ``fsc --cliversion:2.0``() =
+    let ``fsc --cliversion:2_0``() =
         FSharp """
         """
         |> asExe
@@ -23,7 +23,7 @@ module cliversion =
 
     //#   SOURCE=E_fsi_cliversion.fs  SCFLAGS="--cliversion:2.0" FSIMODE=EXEC COMPILE_ONLY=1  # fsi --cliversion:2.0
     [<Fact>]
-    let ``fsi --cliversion:2.0``() =
+    let ``fsi --cliversion:2_0``() =
         FSharp """
         """
         |> asFsx
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/codepage/codepage.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/codepage/codepage.fs
index 5145fa4dcd0..1ad955c4b90 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/codepage/codepage.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/codepage/codepage.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions.fsc
+namespace CompilerOptions.Fsc
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/crossoptimize.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/crossoptimize.fs
index 2304e1da339..fa640ae2b6a 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/crossoptimize.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/crossoptimize.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions
+namespace CompilerOptions.Fsc
 
 open System
 
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/debug.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/debug.fs
index 335566ef175..e1c397687f1 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/debug.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/debug.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions
+namespace CompilerOptions.Fsc
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/determinism/determinism.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/determinism/determinism.fs
index 85941cafccc..54915e18518 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/determinism/determinism.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/determinism/determinism.fs
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-namespace FSharp.Compiler.ComponentTests.CompilerOptions
+namespace CompilerOptions.Fsc
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/flaterrors.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/flaterrors.fs
index 4f4142a76f1..92f2f30b14f 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/flaterrors.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/flaterrors.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions
+namespace CompilerOptions.Fsc
 
 open Xunit
 open System
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/highentropyva.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/highentropyva.fs
index 9c205f213a7..f86d1ad038c 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/highentropyva.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/highentropyva.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions
+namespace CompilerOptions.Fsc
 
 open System
 open System.Reflection.PortableExecutable
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/langversion.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/langversion.fs
index cfb18abb7eb..7b004b32296 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/langversion.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/langversion.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions
+namespace CompilerOptions.Fsc
 
 open Xunit
 open FSharp.Test
@@ -64,7 +64,7 @@ printfn "Hello, World"
         |> ignore
 
     [<Fact>]
-    let ``fsc langversion supports full version number - --langversion:5.0``() =
+    let ``fsc langversion supports full version number - --langversion:5_0``() =
         FSharp """
     printfn "Hello, World"
         """
@@ -88,7 +88,7 @@ printfn "Hello, World"
         |> ignore
 
     [<Fact>]
-    let ``fsc langversion fails with invalid version number - --langversion:4.1 which never existed``() =
+    let ``fsc langversion fails with invalid version number - --langversion:4_1 which never existed``() =
         FSharp """
     printfn "Hello, World"
         """
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/misc/misc.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/misc/misc.fs
index af341cf3685..b1339c507f6 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/misc/misc.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/misc/misc.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions.fsc
+namespace CompilerOptions.Fsc
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/noframework/noframework.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/noframework/noframework.fs
index 5b988ceb6e9..7847debd5a7 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/noframework/noframework.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/noframework/noframework.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions.fsc
+namespace CompilerOptions.Fsc
 
 open Xunit
 open FSharp.Test
@@ -11,7 +11,7 @@ module noframework =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/noframework)
     //<Expects status="success"></Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"noframework02.fs"|])>]
-    let ``noframework - noframework02.fs - --noframework`` compilation =
+    let ``noframework - noframework02_fs - --noframework`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--noframework"]
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/platform.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/platform.fs
index 5f5e803c0bc..c125ee64e38 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/platform.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/platform.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions.fsc
+namespace CompilerOptions.Fsc
 
 open Xunit
 open FSharp.Test
@@ -11,7 +11,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS3150" status="error">The 'anycpu32bitpreferred' platform can only be used with EXE targets\. You must use 'anycpu' instead\.</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_16.fs"|])>]
-    let ``platform - error_16.fs - --target:library --platform:anycpu32bitpreferred`` compilation =
+    let ``platform - error_16_fs - --target:library --platform:anycpu32bitpreferred`` compilation =
         compilation
         |> asFs
         |> withOptions ["--target:library"; "--platform:anycpu32bitpreferred"]
@@ -24,7 +24,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS0243" status="error">Unrecognized option: '--PLATFORM'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_01.fs"|])>]
-    let ``platform - error_01.fs - --PLATFORM:anycpu`` compilation =
+    let ``platform - error_01_fs - --PLATFORM:anycpu`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--PLATFORM:anycpu"]
@@ -37,7 +37,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS0243" status="error">Unrecognized option: '--PlatForm'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_02.fs"|])>]
-    let ``platform - error_02.fs - --PlatForm:anycpu`` compilation =
+    let ``platform - error_02_fs - --PlatForm:anycpu`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--PlatForm:anycpu"]
@@ -50,7 +50,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS1064" status="error">Unrecognized platform 'ITANIUM', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_03.fs"|])>]
-    let ``platform - error_03.fs - --platform:ITANIUM`` compilation =
+    let ``platform - error_03_fs - --platform:ITANIUM`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--platform:ITANIUM"]
@@ -63,7 +63,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS1064" status="error">Unrecognized platform 'ANYCPU', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_04.fs"|])>]
-    let ``platform - error_04.fs - --platform:ANYCPU`` compilation =
+    let ``platform - error_04_fs - --platform:ANYCPU`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--platform:ANYCPU"]
@@ -76,7 +76,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS1064" status="error">Unrecognized platform 'X86', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_05.fs"|])>]
-    let ``platform - error_05.fs - --platform:X86`` compilation =
+    let ``platform - error_05_fs - --platform:X86`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--platform:X86"]
@@ -89,7 +89,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS1064" status="error">Unrecognized platform 'X64', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_06.fs"|])>]
-    let ``platform - error_06.fs - --platform:X64`` compilation =
+    let ``platform - error_06_fs - --platform:X64`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--platform:X64"]
@@ -102,7 +102,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS1064" status="error">Unrecognized platform 'IA64', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_07.fs"|])>]
-    let ``platform - error_07.fs - --platform:IA64`` compilation =
+    let ``platform - error_07_fs - --platform:IA64`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--platform:IA64"]
@@ -115,7 +115,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS1064" status="error">Unrecognized platform 'i386', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_08.fs"|])>]
-    let ``platform - error_08.fs - --platform:i386`` compilation =
+    let ``platform - error_08_fs - --platform:i386`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--platform:i386"]
@@ -128,7 +128,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS1064" status="error">Unrecognized platform 'AMD64', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_09.fs"|])>]
-    let ``platform - error_09.fs - --platform:AMD64`` compilation =
+    let ``platform - error_09_fs - --platform:AMD64`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--platform:AMD64"]
@@ -141,7 +141,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS1064" status="error">Unrecognized platform 'PPC', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_10.fs"|])>]
-    let ``platform - error_10.fs - --platform:PPC`` compilation =
+    let ``platform - error_10_fs - --platform:PPC`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--platform:PPC"]
@@ -154,7 +154,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS1064" status="error">Unrecognized platform 'ARM', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_15.fs"|])>]
-    let ``platform - error_15.fs - --platform:ARM`` compilation =
+    let ``platform - error_15_fs - --platform:ARM`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--platform:ARM"]
@@ -167,7 +167,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS0243" status="error">Unrecognized option: '--platform-'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_11.fs"|])>]
-    let ``platform - error_11.fs - --platform-:anycpu`` compilation =
+    let ``platform - error_11_fs - --platform-:anycpu`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--platform-:anycpu"]
@@ -180,7 +180,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS0243" status="error">Unrecognized option: '--PLATFORM\+'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_12.fs"|])>]
-    let ``platform - error_12.fs - --PLATFORM+:anycpu`` compilation =
+    let ``platform - error_12_fs - --PLATFORM+:anycpu`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--PLATFORM+:anycpu"]
@@ -193,7 +193,7 @@ module platform =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
     //<Expects id="FS0243" status="error">Unrecognized option: '---platform'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_13.fs"|])>]
-    let ``platform - error_13.fs - ---platform:anycpu`` compilation =
+    let ``platform - error_13_fs - ---platform:anycpu`` compilation =
         compilation
         |> asFsx
         |> withOptions ["---platform:anycpu"]
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/reference.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/reference.fs
index 4eb4968788b..39232a2672d 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/reference.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/reference.fs
@@ -2,7 +2,7 @@
 
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions.fsc
+namespace CompilerOptions.Fsc
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/reflectionfree.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/reflectionfree.fs
index 2cffacf65cf..65b96d7d9c8 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/reflectionfree.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/reflectionfree.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-module FSharp.Compiler.ComponentTests.CompilerOptions.ReflectionFree
+module CompilerOptions.Fsc.ReflectionFree
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/refonlyrefout.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/refonlyrefout.fs
index e4d576f894a..d9bb0996e13 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/refonlyrefout.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/refonlyrefout.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions
+namespace CompilerOptions.Fsc
 
 open Xunit
 open FSharp.Test
@@ -34,7 +34,7 @@ module RefOnlyRefOut =
         ]
 
     [<Fact>]
-    let ``fsc --refout:. --standalone``() =
+    let ``fsc --refout:_ --standalone``() =
         FSharp """
         """
         |> asExe
@@ -46,7 +46,7 @@ module RefOnlyRefOut =
         ]
 
     [<Fact>]
-    let ``fsc --standalone --refout:.``() =
+    let ``fsc --standalone --refout:_``() =
         FSharp """
         """
         |> asExe
@@ -59,7 +59,7 @@ module RefOnlyRefOut =
 
     // Test refout/refonly alongside staticlink
     [<Fact>]
-    let ``fsc --refonly --staticlink:.``() =
+    let ``fsc --refonly --staticlink:_``() =
         FSharp """
         """
         |> asExe
@@ -71,7 +71,7 @@ module RefOnlyRefOut =
         ]
 
     [<Fact>]
-    let ``fsc --staticlink:. --refonly ``() =
+    let ``fsc --staticlink:_ --refonly ``() =
         FSharp """
         """
         |> asExe
@@ -83,7 +83,7 @@ module RefOnlyRefOut =
         ]
 
     [<Fact>]
-    let ``fsc --refout:. --staticlink:.``() =
+    let ``fsc --refout:_ --staticlink:_``() =
         FSharp """
         """
         |> asExe
@@ -95,7 +95,7 @@ module RefOnlyRefOut =
         ]
 
     [<Fact>]
-    let ``fsc --staticlink:. --refout:.``() =
+    let ``fsc --staticlink:_ --refout:_``() =
         FSharp """
         """
         |> asExe
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/sourceFiles.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/sourceFiles.fs
index 9f467df00cd..37543e02e37 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/sourceFiles.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/sourceFiles.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-module FSharp.Compiler.ComponentTests.CompilerOptions.FscSourceFilesArguments
+module CompilerOptions.Fsc.FscSourceFilesArguments
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/times.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/times.fs
index a7136b32d0a..a52aa63cf15 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/times.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/times.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions.fsc
+namespace CompilerOptions.Fsc
 
 open Xunit
 open FSharp.Test
@@ -13,7 +13,7 @@ module times =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/times)
     //<Expects id="FS0243" status="error">Unrecognized option: '--Times'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_01.fs"|])>]
-    let ``times - error_01.fs - --Times`` compilation =
+    let ``times - error_01_fs - --Times`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--Times"]
@@ -26,7 +26,7 @@ module times =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/times)
     //<Expects id="FS0243" status="error">Unrecognized option: '--times-'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_02.fs"|])>]
-    let ``times - error_02.fs - --times-`` compilation =
+    let ``times - error_02_fs - --times-`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--times-"]
@@ -39,7 +39,7 @@ module times =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/times)
     //<Expects id="FS0243" status="error">Unrecognized option: '--times\+'</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"error_03.fs"|])>]
-    let ``times - error_03.fs - --times+`` compilation =
+    let ``times - error_03_fs - --times+`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--times+"]
@@ -83,4 +83,3 @@ module times =
         Assert.Contains("Name,StartTime,EndTime,Duration(s),Id,ParentId,RootId",csvContents[0])
         Assert.Contains(csvContents, fun row -> row.Contains("Typecheck"))
         Assert.Contains(csvContents, fun row -> row.Contains("Parse inputs"))
-
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/warn.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/warn.fs
index 63fc7382a5a..e2e857a0ddb 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/warn.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/warn.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions.fsc
+namespace CompilerOptions.Fsc
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warnon/warnon.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warnon/warnon.fs
index 6c23e82e288..130c7058c6f 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warnon/warnon.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warnon/warnon.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerOptions.fsc
+namespace CompilerOptions.Fsc
 
 open Xunit
 open FSharp.Test
@@ -11,7 +11,7 @@ module warnon =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/warnon)
     //<Expects status="warning" span="(18,11-18,12)" id="FS1182">The value 'n' is unused$</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"warnon01.fs"|])>]
-    let ``warnon - warnon01.fs - --warnon:1182 --test:ErrorRanges`` compilation =
+    let ``warnon - warnon01_fs - --warnon:1182 --test:ErrorRanges`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--warnon:1182"; "--test:ErrorRanges"]
@@ -24,7 +24,7 @@ module warnon =
     // This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/warnon)
     //<Expects status="warning" span="(18,11-18,12)" id="FS1182">The value 'n' is unused$</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"warnon01.fs"|])>]
-    let ``warnon - warnon01.fs - --warnon:NU0001;FS1182;NU0001 --test:ErrorRanges`` compilation =
+    let ``warnon - warnon01_fs - --warnon:NU0001;FS1182;NU0001 --test:ErrorRanges`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--warnon:NU0001;FS1182;NU0001"; "--test:ErrorRanges"]
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerService/RangeModule.fs b/tests/FSharp.Compiler.ComponentTests/CompilerService/RangeModule.fs
index 61aa5af53d6..b539ef13a63 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerService/RangeModule.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerService/RangeModule.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CompilerService
+namespace CompilerService
 
 open Xunit
 open System
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/Basic.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/Basic.fs
similarity index 98%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/Basic.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/Basic.fs
index 3101f6d2047..37add29d802 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/Basic.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/Basic.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.AccessibilityAnnotations
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module Basic =
+module AccessibilityAnnotations_Basic =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_BaseIFaceLessAccessible01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_BaseIFaceLessAccessible01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_BaseIFaceLessAccessible01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_BaseIFaceLessAccessible01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_ExposeLessVisible01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_ExposeLessVisible01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_ExposeLessVisible01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_ExposeLessVisible01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_LocalLetBinding02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_LocalLetBinding02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_LocalLetBinding02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_LocalLetBinding02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_PrivateImplicitCtor01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_PrivateImplicitCtor01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_PrivateImplicitCtor01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_PrivateImplicitCtor01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_ProtectedThingsInaccessible01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_ProtectedThingsInaccessible01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_ProtectedThingsInaccessible01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_ProtectedThingsInaccessible01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible04.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible04.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible04.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible05.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible05.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible05.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible05.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/InterfaceImplementationVisibility.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/InterfaceImplementationVisibility.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/InterfaceImplementationVisibility.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/InterfaceImplementationVisibility.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/InternalMethodsWorkCorrectly.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/InternalMethodsWorkCorrectly.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/InternalMethodsWorkCorrectly.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/InternalMethodsWorkCorrectly.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/InternalizedIFaces02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/InternalizedIFaces02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/InternalizedIFaces02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/InternalizedIFaces02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/LessOrMoreAccessibleCode01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/LessOrMoreAccessibleCode01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/LessOrMoreAccessibleCode01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/LessOrMoreAccessibleCode01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/LocalLetBinding01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/LocalLetBinding01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/Basic/LocalLetBinding01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/LocalLetBinding01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_InterfaceImpl01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_InterfaceImpl01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_InterfaceImpl01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_InterfaceImpl01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides04.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides04.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides04.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides05.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides05.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides05.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides05.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/OnOverridesAndIFaceImpl.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/OnOverridesAndIFaceImpl.fs
similarity index 97%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/OnOverridesAndIFaceImpl.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/OnOverridesAndIFaceImpl.fs
index 5e549a03086..d60a82f8f62 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/OnOverridesAndIFaceImpl.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/OnOverridesAndIFaceImpl.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.AccessibilityAnnotations
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module OnOverridesAndIFaceImpl =
+module AccessibilityAnnotations_OnOverridesAndIFaceImpl =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/AccessProtectedInstance01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/AccessProtectedInstance01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/AccessProtectedInstance01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/AccessProtectedInstance01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/AccessProtectedStatic01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/AccessProtectedStatic01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/AccessProtectedStatic01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/AccessProtectedStatic01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/BaseClass.cs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/BaseClass.cs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/BaseClass.cs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/BaseClass.cs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/E_AccessPrivateMember01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/E_AccessPrivateMember01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/E_AccessPrivateMember01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/E_AccessPrivateMember01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/E_AccessProtectedInstance01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/E_AccessProtectedInstance01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/E_AccessProtectedInstance01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/E_AccessProtectedInstance01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/E_OnProperty01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/E_OnProperty01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/E_OnProperty01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/E_OnProperty01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/E_OnProperty02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/E_OnProperty02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/E_OnProperty02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/E_OnProperty02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/OnProperty01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/OnProperty01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/OnProperty01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/OnProperty01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/OnTypeMembers.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/OnTypeMembers.fs
similarity index 98%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/OnTypeMembers.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/OnTypeMembers.fs
index 66dede8fded..b59132ae142 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/OnTypeMembers/OnTypeMembers.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/OnTypeMembers.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.AccessibilityAnnotations
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module OnTypeMembers =
+module AccessibilityAnnotations_OnTypeMembers =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface04.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface04.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface04.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface05.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface05.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface05.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface05.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface06.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface06.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface06.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnInterface06.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_let01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_let01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_let01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_let01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_member01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_member01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_member01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_member01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_module01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_module01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_module01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_module01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_type01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_type01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_type01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_type01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/PermittedLocations.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/PermittedLocations.fs
similarity index 98%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/PermittedLocations.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/PermittedLocations.fs
index cd9ddeecf4c..f76cbdb9dea 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/AccessibilityAnnotations/PermittedLocations/PermittedLocations.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/PermittedLocations.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.AccessibilityAnnotations
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module PermittedLocations =
+module AccessibilityAnnotations_PermittedLocations =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/ArgumentsOfAllTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/ArgumentsOfAllTypes.fs
similarity index 98%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/ArgumentsOfAllTypes.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/ArgumentsOfAllTypes.fs
index 8320001fa86..0441cec5f39 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/ArgumentsOfAllTypes.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/ArgumentsOfAllTypes.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.CustomAttributes
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module ArgumentsOfAllTypes =
+module CustomAttributes_ArgumentsOfAllTypes =
 
     let csLibraryWithAttributes =
         CSharpFromPath (__SOURCE_DIRECTORY__ ++ "CSLibraryWithAttributes.cs")
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/CSLibraryWithAttributes.cs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/CSLibraryWithAttributes.cs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/CSLibraryWithAttributes.cs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/CSLibraryWithAttributes.cs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/CSharpConsumer.cs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/CSharpConsumer.cs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/CSharpConsumer.cs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/CSharpConsumer.cs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/FSharpAttrLibrary.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/FSharpAttrLibrary.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/FSharpAttrLibrary.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/FSharpAttrLibrary.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/Generator/Generator.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/Generator/Generator.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/Generator/Generator.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/Generator/Generator.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Byte.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Byte.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Byte.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Byte.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Byte_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Byte_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Byte_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Byte_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Char.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Char.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Char.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Char.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Char_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Char_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Char_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Char_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_DateTimeKind.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_DateTimeKind.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_DateTimeKind.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_DateTimeKind.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_DateTimeKind_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_DateTimeKind_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_DateTimeKind_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_DateTimeKind_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Double.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Double.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Double.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Double.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Double_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Double_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Double_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Double_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Int16.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Int16.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Int16.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Int16.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Int16_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Int16_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Int16_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Int16_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Int32.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Int32.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Int32.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Int32.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Int32_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Int32_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Int32_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Int32_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Int64.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Int64.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Int64.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Int64.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Int64_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Int64_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Int64_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Int64_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Object.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Object.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Object.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Object.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Object_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Object_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Object_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Object_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_SByte.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_SByte.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_SByte.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_SByte.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_SByte_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_SByte_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_SByte_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_SByte_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Single.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Single.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Single.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Single.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Single_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Single_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Single_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Single_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_String.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_String.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_String.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_String.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_String_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_String_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_String_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_String_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Type.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Type.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Type.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Type.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_TypeArray.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_TypeArray.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_TypeArray.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_TypeArray.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_TypeArray_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_TypeArray_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_TypeArray_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_TypeArray_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Type_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Type_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_Type_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_Type_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt16.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt16.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt16.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt16.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt16_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt16_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt16_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt16_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt32.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt32.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt32.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt32.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt32_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt32_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt32_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt32_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt64.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt64.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt64.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt64.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt64_Consumer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt64_Consumer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt64_Consumer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/System_UInt64_Consumer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/dummy.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/dummy.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/dummy.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/dummy.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/keep.lst b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/keep.lst
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ArgumentsOfAllTypes/keep.lst
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ArgumentsOfAllTypes/keep.lst
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeInheritance/AttributeInheritance.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/AttributeInheritance.fs
similarity index 90%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeInheritance/AttributeInheritance.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/AttributeInheritance.fs
index 64e4fd6a0e2..b8da6bc61b2 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeInheritance/AttributeInheritance.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/AttributeInheritance.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.CustomAttributes
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module AttributeInheritance =
+module CustomAttributes_AttributeInheritance =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeInheritance/InheritedAttribute_001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/InheritedAttribute_001.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeInheritance/InheritedAttribute_001.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/InheritedAttribute_001.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeInheritance/InheritedAttribute_002.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/InheritedAttribute_002.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeInheritance/InheritedAttribute_002.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/InheritedAttribute_002.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AssemblyVersion01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AssemblyVersion01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AssemblyVersion01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AssemblyVersion01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AssemblyVersion02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AssemblyVersion02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AssemblyVersion02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AssemblyVersion02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AssemblyVersion03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AssemblyVersion03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AssemblyVersion03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AssemblyVersion03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AssemblyVersion04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AssemblyVersion04.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AssemblyVersion04.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AssemblyVersion04.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AttributeTargetsIsCtor01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AttributeTargetsIsCtor01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AttributeTargetsIsCtor01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AttributeTargetsIsCtor01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AttributeTargetsIsMethod01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AttributeTargetsIsMethod01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AttributeTargetsIsMethod01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AttributeTargetsIsMethod01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AttributeUsage.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AttributeUsage.fs
similarity index 98%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AttributeUsage.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AttributeUsage.fs
index 52c055d71a4..cddee9f80ab 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AttributeUsage.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AttributeUsage.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.CustomAttributes
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module AttributeUsage =
+module CustomAttributes_AttributeUsage =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AttributesWithArrays.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AttributesWithArrays.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/AttributesWithArrays.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AttributesWithArrays.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/ConditionalAttribute.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/ConditionalAttribute.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/ConditionalAttribute.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/ConditionalAttribute.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/E_AttributeTargets01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_AttributeTargets01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/E_AttributeTargets01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_AttributeTargets01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/E_AttributeTargets02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_AttributeTargets02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/E_AttributeTargets02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_AttributeTargets02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/E_ConditionalAttribute.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_ConditionalAttribute.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/E_ConditionalAttribute.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_ConditionalAttribute.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/E_RequiresExplicitTypeArguments01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_RequiresExplicitTypeArguments01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/E_RequiresExplicitTypeArguments01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_RequiresExplicitTypeArguments01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/E_RequiresExplicitTypeArguments02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_RequiresExplicitTypeArguments02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/E_RequiresExplicitTypeArguments02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_RequiresExplicitTypeArguments02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/E_WithBitwiseOr01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_WithBitwiseOr01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/E_WithBitwiseOr01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_WithBitwiseOr01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/MarshalAsAttribute.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/MarshalAsAttribute.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/MarshalAsAttribute.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/MarshalAsAttribute.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/RequiresExplicitTypeArguments01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/RequiresExplicitTypeArguments01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/RequiresExplicitTypeArguments01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/RequiresExplicitTypeArguments01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/RequiresExplicitTypeArguments02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/RequiresExplicitTypeArguments02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/RequiresExplicitTypeArguments02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/RequiresExplicitTypeArguments02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/W_AssemblyVersion01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/W_AssemblyVersion01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/W_AssemblyVersion01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/W_AssemblyVersion01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/W_AssemblyVersion02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/W_AssemblyVersion02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/W_AssemblyVersion02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/W_AssemblyVersion02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/WithBitwiseOr02a.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/WithBitwiseOr02a.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/WithBitwiseOr02a.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/WithBitwiseOr02a.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/WithBitwiseOr02b.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/WithBitwiseOr02b.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/WithBitwiseOr02b.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/WithBitwiseOr02b.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/X_AssemblyVersion01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/X_AssemblyVersion01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/X_AssemblyVersion01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/X_AssemblyVersion01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/X_AssemblyVersion02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/X_AssemblyVersion02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/X_AssemblyVersion02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/X_AssemblyVersion02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/ArrayParam.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/ArrayParam.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/ArrayParam.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/ArrayParam.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/AttribWithEnumFlags01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/AttribWithEnumFlags01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/AttribWithEnumFlags01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/AttribWithEnumFlags01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/Basic.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/Basic.fs
similarity index 99%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/Basic.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/Basic.fs
index 1dd5c1e070f..f90c9b30e3e 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/Basic.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/Basic.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.CustomAttributes
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module Basic =
+module CustomAttributes_Basic =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeApplication01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeApplication01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeApplication02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeApplication02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeApplication03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeApplication03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeApplication04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication04.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeApplication04.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication04.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeApplication05.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication05.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeApplication05.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication05.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeApplication06.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication06.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeApplication06.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication06.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeApplication07.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication07.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeApplication07.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication07.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeTargetSpecifications.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeTargetSpecifications.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_AttributeTargetSpecifications.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeTargetSpecifications.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_StructLayout.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_StructLayout.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_StructLayout.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_StructLayout.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_AbstractClass.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_AbstractClass.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_AbstractClass.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_AbstractClass.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_DU1.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_DU1.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_DU1.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_DU1.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_DU2.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_DU2.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_DU2.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_DU2.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_Delegate.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_Delegate.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_Delegate.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_Delegate.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_Interface.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_Interface.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_Interface.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_StructLayoutSequentialNeg_Interface.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_UseNullAsTrueValue01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_UseNullAsTrueValue01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/E_UseNullAsTrueValue01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_UseNullAsTrueValue01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/EnsureValidCustomAttributeBlob.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/EnsureValidCustomAttributeBlob.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/EnsureValidCustomAttributeBlob.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/EnsureValidCustomAttributeBlob.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/FreeTypeVariable01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/FreeTypeVariable01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/FreeTypeVariable01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/FreeTypeVariable01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/Function01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/Function01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/Function01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/Function01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/FunctionArg01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/FunctionArg01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/FunctionArg01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/FunctionArg01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/InExternDecl.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/InExternDecl.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/InExternDecl.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/InExternDecl.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/ParamArrayAttrUsage.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/ParamArrayAttrUsage.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/ParamArrayAttrUsage.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/ParamArrayAttrUsage.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/ReturnType01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/ReturnType01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/ReturnType01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/ReturnType01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/ReturnType02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/ReturnType02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/ReturnType02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/ReturnType02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/ReturnType03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/ReturnType03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/ReturnType03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/ReturnType03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/SanityCheck01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/SanityCheck01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/SanityCheck01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/SanityCheck01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/StructLayout.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/StructLayout.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/StructLayout.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/StructLayout.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/StructLayoutSequentialPos_Exception.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/StructLayoutSequentialPos_Exception.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/StructLayoutSequentialPos_Exception.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/StructLayoutSequentialPos_Exception.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/TypeofTypedefofInAttribute.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/TypeofTypedefofInAttribute.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/TypeofTypedefofInAttribute.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/TypeofTypedefofInAttribute.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/TypesAsAttrArgs01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/TypesAsAttrArgs01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/TypesAsAttrArgs01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/TypesAsAttrArgs01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/W_ReturnType03b.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_ReturnType03b.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/W_ReturnType03b.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_ReturnType03b.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/W_StructLayoutExplicit01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_StructLayoutExplicit01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/W_StructLayoutExplicit01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_StructLayoutExplicit01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_AbstractClass.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_AbstractClass.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_AbstractClass.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_AbstractClass.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_ClassExpliCtr.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_ClassExpliCtr.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_ClassExpliCtr.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_ClassExpliCtr.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_ClassnoCtr.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_ClassnoCtr.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_ClassnoCtr.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_ClassnoCtr.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_Record.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_Record.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_Record.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_StructLayoutSequentialPos_Record.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ImportedAttributes/FieldOffset01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ImportedAttributes/FieldOffset01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ImportedAttributes/FieldOffset01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ImportedAttributes/FieldOffset01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ImportedAttributes/ImportedAttributes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ImportedAttributes/ImportedAttributes.fs
similarity index 86%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ImportedAttributes/ImportedAttributes.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ImportedAttributes/ImportedAttributes.fs
index 26044d2701e..96ad0bbd722 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/ImportedAttributes/ImportedAttributes.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/ImportedAttributes/ImportedAttributes.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.CustomAttributes
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module ImportedAttributes =
+module CustomAttributes_ImportedAttributes =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DelegateTypes/DelegateDefinition.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/DelegateTypes/DelegateDefinition.fs
similarity index 94%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DelegateTypes/DelegateDefinition.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/DelegateTypes/DelegateDefinition.fs
index 3e01c1723fd..b14bc83ce3f 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DelegateTypes/DelegateDefinition.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/DelegateTypes/DelegateDefinition.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DelegateTypes
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/CompilingToALibrary01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/CompilingToALibrary01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/CompilingToALibrary01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/CompilingToALibrary01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/CompilingToAModule01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/CompilingToAModule01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/CompilingToAModule01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/CompilingToAModule01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/E_InvalidSignature02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_InvalidSignature02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/E_InvalidSignature02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_InvalidSignature02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/E_invalidsignature001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_invalidsignature001.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/E_invalidsignature001.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_invalidsignature001.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/E_oninvalidlanguageelement001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_oninvalidlanguageelement001.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/E_oninvalidlanguageelement001.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_oninvalidlanguageelement001.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/E_twoattributesonsamefunction001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twoattributesonsamefunction001.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/E_twoattributesonsamefunction001.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twoattributesonsamefunction001.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/E_twoentrypoints001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twoentrypoints001.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/E_twoentrypoints001.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twoentrypoints001.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/E_twofiles_002a.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twofiles_002a.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/E_twofiles_002a.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twofiles_002a.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/E_twofiles_002b.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twofiles_002b.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/E_twofiles_002b.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twofiles_002b.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/EntryPoint.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/EntryPoint.fs
similarity index 98%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/EntryPoint.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/EntryPoint.fs
index 711910e5a3d..509fe8c9adb 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/EntryPoint.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/EntryPoint.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
@@ -127,7 +127,7 @@ but here has type
 
     //NoMT	SOURCE=entrypointandFSI.fs    SCFLAGS="--multiemit-" FSIMODE=PIPE COMPILE_ONLY=1				# entrypointandFSI.fs
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"entrypointandFSI.fs"|])>]
-    let ``entrypointandFSI.fs`` compilation =
+    let ``entrypointandFSI_fs`` compilation =
         compilation
         |> asExe
         |> compile
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/EntryPointAndAssemblyCulture.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/EntryPointAndAssemblyCulture.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/EntryPointAndAssemblyCulture.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/EntryPointAndAssemblyCulture.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/W_NoEntryPointInLastModuleInsideMultipleNamespace.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointInLastModuleInsideMultipleNamespace.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/W_NoEntryPointInLastModuleInsideMultipleNamespace.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointInLastModuleInsideMultipleNamespace.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/W_NoEntryPointModuleInNamespace.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointModuleInNamespace.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/W_NoEntryPointModuleInNamespace.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointModuleInNamespace.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/W_NoEntryPointMultipleModules.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointMultipleModules.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/W_NoEntryPointMultipleModules.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointMultipleModules.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/W_NoEntryPointTypeInNamespace.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointTypeInNamespace.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/W_NoEntryPointTypeInNamespace.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointTypeInNamespace.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/behavior001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/behavior001.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/behavior001.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/behavior001.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/entrypointandFSI.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/entrypointandFSI.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/entrypointandFSI.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/entrypointandFSI.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/entrypointandFSI02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/entrypointandFSI02.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/entrypointandFSI02.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/entrypointandFSI02.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/entrypointfunctionnotmain001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/entrypointfunctionnotmain001.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/entrypointfunctionnotmain001.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/entrypointfunctionnotmain001.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/inamodule001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/inamodule001.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/inamodule001.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/inamodule001.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/noarguments001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/noarguments001.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/noarguments001.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/noarguments001.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/oneargument001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/oneargument001.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/oneargument001.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/oneargument001.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/twofiles_001a.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/twofiles_001a.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/twofiles_001a.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/twofiles_001a.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/twofiles_001b.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/twofiles_001b.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/EntryPoint/twofiles_001b.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/twofiles_001b.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/Basic.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/Basic.fs
similarity index 97%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/Basic.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/Basic.fs
index cd36fc9fdaf..87d12baea7c 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/Basic.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/Basic.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.Events
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module Basic =
+module Events =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/CLIEvent01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/CLIEvent01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/CLIEvent01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/CLIEvent01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/EventWithGenericTypeAsUnit01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/EventWithGenericTypeAsUnit01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/EventWithGenericTypeAsUnit01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/EventWithGenericTypeAsUnit01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/EventsOnInterface01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/EventsOnInterface01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/EventsOnInterface01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/EventsOnInterface01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/Regression01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/Regression01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/Regression01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/Regression01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/Regression02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/Regression02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/Regression02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/Regression02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/Regression02b.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/Regression02b.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/Regression02b.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/Regression02b.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/Regression03.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/Regression03.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/Regression03.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/Regression03.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/SanityCheck.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/SanityCheck.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/SanityCheck.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/SanityCheck.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/SanityCheck02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/SanityCheck02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/SanityCheck02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/Events/Basic/SanityCheck02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/Abbreviation01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/Abbreviation01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/Abbreviation01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/Abbreviation01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/AbbreviationForSystemException.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/AbbreviationForSystemException.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/AbbreviationForSystemException.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/AbbreviationForSystemException.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/Abbreviation_SampleCodeFromSpec01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/Abbreviation_SampleCodeFromSpec01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/Abbreviation_SampleCodeFromSpec01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/Abbreviation_SampleCodeFromSpec01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ActiveRecognizer.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ActiveRecognizer.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ActiveRecognizer.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ActiveRecognizer.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/AddMessageProperty.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/AddMessageProperty.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/AddMessageProperty.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/AddMessageProperty.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/AddMethsProps01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/AddMethsProps01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/AddMethsProps01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/AddMethsProps01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/CSharpException.cs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/CSharpException.cs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/CSharpException.cs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/CSharpException.cs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/CatchWOTypecheck01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/CatchWOTypecheck01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/CatchWOTypecheck01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/CatchWOTypecheck01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_Abbreviation_NonMatchingObjConstructor.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_Abbreviation_NonMatchingObjConstructor.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_Abbreviation_NonMatchingObjConstructor.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_Abbreviation_NonMatchingObjConstructor.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_AssertionFailureExn.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_AssertionFailureExn.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_AssertionFailureExn.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_AssertionFailureExn.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_BeginWithUppercase01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_BeginWithUppercase01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_BeginWithUppercase02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase02.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_BeginWithUppercase02.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase02.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_BeginWithUppercase03.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase03.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_BeginWithUppercase03.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase03.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_BeginWithUppercase04.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase04.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_BeginWithUppercase04.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase04.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_DynamicInvocationNotSupported.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_DynamicInvocationNotSupported.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_DynamicInvocationNotSupported.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_DynamicInvocationNotSupported.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_ExnAsDiscriminatedUnion01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnAsDiscriminatedUnion01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_ExnAsDiscriminatedUnion01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnAsDiscriminatedUnion01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_ExnConstructorBadFieldName.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnConstructorBadFieldName.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_ExnConstructorBadFieldName.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnConstructorBadFieldName.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_ExnFieldConflictingName.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnFieldConflictingName.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_ExnFieldConflictingName.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnFieldConflictingName.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_FieldMemberClash.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_FieldMemberClash.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_FieldMemberClash.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_FieldMemberClash.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_FieldNameUsedMulti.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_FieldNameUsedMulti.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_FieldNameUsedMulti.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_FieldNameUsedMulti.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_GeneratedTypeName01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_GeneratedTypeName01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_GeneratedTypeName01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_GeneratedTypeName01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_GeneratedTypeNameClash02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_GeneratedTypeNameClash02.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_GeneratedTypeNameClash02.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_GeneratedTypeNameClash02.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_InheritException.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_InheritException.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_InheritException.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_InheritException.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_MatchFailure.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_MatchFailure.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_MatchFailure.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_MatchFailure.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_MustStartWithCap01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_MustStartWithCap01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_MustStartWithCap01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_MustStartWithCap01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_Undefined.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_Undefined.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/E_Undefined.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_Undefined.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/EqualAndBoxing01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/EqualAndBoxing01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/EqualAndBoxing01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/EqualAndBoxing01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ExceptionAsDerivedFromSystemException01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ExceptionAsDerivedFromSystemException01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ExceptionAsDerivedFromSystemException01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ExceptionAsDerivedFromSystemException01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ExceptionDefinitions.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ExceptionDefinitions.fs
similarity index 99%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ExceptionDefinitions.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ExceptionDefinitions.fs
index cf6b9e71f86..56d629166ad 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ExceptionDefinitions.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ExceptionDefinitions.fs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.BasicTypeAndModuleDefinitions
-
+namespace Conformance.BasicGrammarElements
 open System.IO
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ExnAsDiscriminatedUnion01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ExnAsDiscriminatedUnion01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ExnAsDiscriminatedUnion01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ExnAsDiscriminatedUnion01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/GeneratedTypeNameNoClash01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/GeneratedTypeNameNoClash01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/GeneratedTypeNameNoClash01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/GeneratedTypeNameNoClash01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ImportCSharpException01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ImportCSharpException01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ImportCSharpException01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ImportCSharpException01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/LowercaseIdentifier01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/LowercaseIdentifier01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/LowercaseIdentifier01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/LowercaseIdentifier01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ManualMessagePropertyWinsOverAutomaticOne.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ManualMessagePropertyWinsOverAutomaticOne.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ManualMessagePropertyWinsOverAutomaticOne.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ManualMessagePropertyWinsOverAutomaticOne.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/NamedFields01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/NamedFields01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/NamedFields01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/NamedFields01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/Override01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/Override01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/Override01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/Override01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/PatternMatch_SampleCodeFromSpec01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/PatternMatch_SampleCodeFromSpec01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/PatternMatch_SampleCodeFromSpec01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/PatternMatch_SampleCodeFromSpec01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/PrivateMessagePropertyIsNotReplacingBuiltinMessage.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/PrivateMessagePropertyIsNotReplacingBuiltinMessage.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/PrivateMessagePropertyIsNotReplacingBuiltinMessage.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/PrivateMessagePropertyIsNotReplacingBuiltinMessage.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ReflectionAPI.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ReflectionAPI.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ExceptionDefinitions/ReflectionAPI.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/ReflectionAPI.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ExplicitObjectConstructors/ExplicitObjectConstructors.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/ExplicitObjectConstructors.fs
similarity index 96%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ExplicitObjectConstructors/ExplicitObjectConstructors.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/ExplicitObjectConstructors.fs
index 2394cbeea0d..18af78f58c4 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ExplicitObjectConstructors/ExplicitObjectConstructors.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/ExplicitObjectConstructors.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.ClassTypes
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ExplicitObjectConstructors/WithAttribute01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/WithAttribute01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ExplicitObjectConstructors/WithAttribute01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/WithAttribute01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ExplicitObjectConstructors/WithAttribute02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/WithAttribute02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ExplicitObjectConstructors/WithAttribute02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/WithAttribute02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ExplicitObjectConstructors/new_while_01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/new_while_01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ExplicitObjectConstructors/new_while_01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/new_while_01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/DefaultValue01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/DefaultValue01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/DefaultValue01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/DefaultValue01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/E_StaticField01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/E_StaticField01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/E_StaticField01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/E_StaticField01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/E_StaticField02a.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/E_StaticField02a.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/E_StaticField02a.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/E_StaticField02a.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/FieldMembers.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/FieldMembers.fs
similarity index 97%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/FieldMembers.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/FieldMembers.fs
index 39df397e555..4ccc4a9b8cd 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/FieldMembers.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/FieldMembers.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/StaticField01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/StaticField01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/StaticField01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/StaticField01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/StaticField02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/StaticField02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/StaticField02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/StaticField02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/Staticfield03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/Staticfield03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/FieldMembers/Staticfield03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/FieldMembers/Staticfield03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ImplicitObjectConstructors/ImplicitObjectConstructors.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImplicitObjectConstructors/ImplicitObjectConstructors.fs
similarity index 92%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ImplicitObjectConstructors/ImplicitObjectConstructors.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImplicitObjectConstructors/ImplicitObjectConstructors.fs
index 94015ee9d6b..168451ca348 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ImplicitObjectConstructors/ImplicitObjectConstructors.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImplicitObjectConstructors/ImplicitObjectConstructors.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.ClassTypes
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ImplicitObjectConstructors/WithAttribute.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImplicitObjectConstructors/WithAttribute.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ImplicitObjectConstructors/WithAttribute.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImplicitObjectConstructors/WithAttribute.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/E_OpenTwice.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/E_OpenTwice.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/E_OpenTwice.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/E_OpenTwice.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/E_OpenUnknownNS.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/E_OpenUnknownNS.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/E_OpenUnknownNS.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/E_OpenUnknownNS.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/E_openEnum.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/E_openEnum.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/E_openEnum.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/E_openEnum.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/E_openInTypeDecl.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/E_openInTypeDecl.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/E_openInTypeDecl.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/E_openInTypeDecl.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/E_openModInFun.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/E_openModInFun.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/E_openModInFun.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/E_openModInFun.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/ImportDeclarations.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/ImportDeclarations.fs
similarity index 98%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/ImportDeclarations.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/ImportDeclarations.fs
index b84a21cfc90..1f93d4b3bab 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/ImportDeclarations.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/ImportDeclarations.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/OpenNestedModule01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/OpenNestedModule01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/OpenNestedModule01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/OpenNestedModule01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/W_OpenUnqualifiedNamespace01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/W_OpenUnqualifiedNamespace01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/W_OpenUnqualifiedNamespace01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/W_OpenUnqualifiedNamespace01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/openDU.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/openDU.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/openDU.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/openDU.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/openSystem01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/openSystem01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ImportDeclarations/openSystem01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/openSystem01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/InterfaceSpecificationsAndImplementations/ConcreteUnitOnInterface01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/InterfaceSpecificationsAndImplementations/ConcreteUnitOnInterface01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/InterfaceSpecificationsAndImplementations/ConcreteUnitOnInterface01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/InterfaceSpecificationsAndImplementations/ConcreteUnitOnInterface01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/InterfaceSpecificationsAndImplementations/GenericMethodsOnInterface01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/InterfaceSpecificationsAndImplementations/GenericMethodsOnInterface01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/InterfaceSpecificationsAndImplementations/GenericMethodsOnInterface01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/InterfaceSpecificationsAndImplementations/GenericMethodsOnInterface01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/InterfaceSpecificationsAndImplementations/GenericMethodsOnInterface02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/InterfaceSpecificationsAndImplementations/GenericMethodsOnInterface02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/InterfaceSpecificationsAndImplementations/GenericMethodsOnInterface02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/InterfaceSpecificationsAndImplementations/GenericMethodsOnInterface02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/InterfaceSpecificationsAndImplementations/InterfaceSpecificationsAndImplementations.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/InterfaceSpecificationsAndImplementations/InterfaceSpecificationsAndImplementations.fs
similarity index 95%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/InterfaceSpecificationsAndImplementations/InterfaceSpecificationsAndImplementations.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/InterfaceSpecificationsAndImplementations/InterfaceSpecificationsAndImplementations.fs
index 406f194e3b4..fd591472bac 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/InterfaceSpecificationsAndImplementations/InterfaceSpecificationsAndImplementations.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/InterfaceSpecificationsAndImplementations/InterfaceSpecificationsAndImplementations.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ActivePatternBindings/ActivePatternBindings.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ActivePatternBindings/ActivePatternBindings.fs
similarity index 92%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ActivePatternBindings/ActivePatternBindings.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ActivePatternBindings/ActivePatternBindings.fs
index 6be37330dd4..141975790a6 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ActivePatternBindings/ActivePatternBindings.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ActivePatternBindings/ActivePatternBindings.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.LetBindings
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module ActivePatternBindings =
+module LetBindings_ActivePatternBindings =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ActivePatternBindings/SanityCheck.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ActivePatternBindings/SanityCheck.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ActivePatternBindings/SanityCheck.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ActivePatternBindings/SanityCheck.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ActivePatternBindings/parameterizedActivePattern.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ActivePatternBindings/parameterizedActivePattern.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ActivePatternBindings/parameterizedActivePattern.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ActivePatternBindings/parameterizedActivePattern.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ActivePatternBindings/partialActivePattern.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ActivePatternBindings/partialActivePattern.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ActivePatternBindings/partialActivePattern.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ActivePatternBindings/partialActivePattern.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/AsPat01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/AsPat01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/AsPat01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/AsPat01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/AsPat02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/AsPat02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/AsPat02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/AsPat02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/Basic.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/Basic.fs
similarity index 99%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/Basic.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/Basic.fs
index 6d09e9320f2..a639d2dfa3f 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/Basic.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/Basic.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.LetBindings
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module Basic =
+module LetBindings_Basic =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_AsPat01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_AsPat01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_AsPat01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_AsPat01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_AttributesOnLet01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_AttributesOnLet01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_AttributesOnLet01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_AttributesOnLet01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_ErrorsForInlineValue.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_ErrorsForInlineValue.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_ErrorsForInlineValue.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_ErrorsForInlineValue.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_ErrorsforIncompleteTryWith.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_ErrorsforIncompleteTryWith.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_ErrorsforIncompleteTryWith.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_ErrorsforIncompleteTryWith.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_GenericTypeAnnotations01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_GenericTypeAnnotations01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_GenericTypeAnnotations01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_GenericTypeAnnotations01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_InvalidInnerRecursiveBinding.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_InvalidInnerRecursiveBinding.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_InvalidInnerRecursiveBinding.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_InvalidInnerRecursiveBinding.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_InvalidInnerRecursiveBinding2.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_InvalidInnerRecursiveBinding2.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_InvalidInnerRecursiveBinding2.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_InvalidInnerRecursiveBinding2.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Literals02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Literals02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Literals02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Literals02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Literals02.fsi b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Literals02.fsi
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Literals02.fsi
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Literals02.fsi
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Literals03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Literals03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Literals03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Literals03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Literals03.fsi b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Literals03.fsi
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Literals03.fsi
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Literals03.fsi
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Literals04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Literals04.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Literals04.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Literals04.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Pathological01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Pathological01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Pathological03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Pathological03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Pathological05.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological05.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Pathological05.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological05.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Pathological06.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological06.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/E_Pathological06.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological06.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/Literals01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/Literals01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/Literals01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/Literals01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/ManyLetBindings.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/ManyLetBindings.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/ManyLetBindings.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/ManyLetBindings.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/Pathological02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/Pathological02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/Pathological02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/Pathological02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/Pathological04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/Pathological04.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/Pathological04.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/Pathological04.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/RecursiveBindingGroup.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/RecursiveBindingGroup.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/RecursiveBindingGroup.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/RecursiveBindingGroup.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/SanityCheck.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/SanityCheck.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/SanityCheck.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/SanityCheck.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/W_DoBindingsNotUnit01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/W_DoBindingsNotUnit01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/W_DoBindingsNotUnit01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/W_DoBindingsNotUnit01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/W_DoBindingsNotUnit02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/W_DoBindingsNotUnit02.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/W_DoBindingsNotUnit02.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/W_DoBindingsNotUnit02.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/nestedLetBindings.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/nestedLetBindings.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/Basic/nestedLetBindings.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/nestedLetBindings.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ExplicitTypeParameters/ExplicitTypeParameters.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ExplicitTypeParameters/ExplicitTypeParameters.fs
similarity index 94%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ExplicitTypeParameters/ExplicitTypeParameters.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ExplicitTypeParameters/ExplicitTypeParameters.fs
index 40ed8492122..53c618c99ea 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ExplicitTypeParameters/ExplicitTypeParameters.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ExplicitTypeParameters/ExplicitTypeParameters.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.LetBindings
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module ExplicitTypeParameters =
+module LetBindings_ExplicitTypeParameters =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ExplicitTypeParameters/SanityCheck.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ExplicitTypeParameters/SanityCheck.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ExplicitTypeParameters/SanityCheck.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ExplicitTypeParameters/SanityCheck.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ExplicitTypeParameters/SanityCheck2.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ExplicitTypeParameters/SanityCheck2.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ExplicitTypeParameters/SanityCheck2.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ExplicitTypeParameters/SanityCheck2.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ExplicitTypeParameters/W_TypeParamsWhenNotNeeded.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ExplicitTypeParameters/W_TypeParamsWhenNotNeeded.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/ExplicitTypeParameters/W_TypeParamsWhenNotNeeded.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ExplicitTypeParameters/W_TypeParamsWhenNotNeeded.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/E_NoTypeFuncsInTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_NoTypeFuncsInTypes.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/E_NoTypeFuncsInTypes.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_NoTypeFuncsInTypes.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/E_typeof_measure_01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_typeof_measure_01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/E_typeof_measure_01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_typeof_measure_01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/E_typeof_undefined_01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_typeof_undefined_01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/E_typeof_undefined_01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_typeof_undefined_01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/SizeOf01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/SizeOf01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/SizeOf01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/SizeOf01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/TypeFunctions.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/TypeFunctions.fs
similarity index 97%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/TypeFunctions.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/TypeFunctions.fs
index c75acf25e60..66e2276a0be 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/TypeFunctions.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/TypeFunctions.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.LetBindings
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module TypeFunctions =
+module LetBindings_TypeFunctions =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/typeofAsArgument.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/typeofAsArgument.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/typeofAsArgument.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/typeofAsArgument.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/typeofBasic001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/typeofBasic001.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/typeofBasic001.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/typeofBasic001.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/typeofInCustomAttributes001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/typeofInCustomAttributes001.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/typeofInCustomAttributes001.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/typeofInCustomAttributes001.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/typeof_anonymous_01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/typeof_anonymous_01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/typeof_anonymous_01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/typeof_anonymous_01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/typeof_class_01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/typeof_class_01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/typeof_class_01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/typeof_class_01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/typeof_interface_01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/typeof_interface_01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/typeof_interface_01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/typeof_interface_01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/typeof_struct_01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/typeof_struct_01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions/typeof_struct_01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/typeof_struct_01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/BasicMembers.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/BasicMembers.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/BasicMembers.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/BasicMembers.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/ImplementingDispatchSlots/ImplementingDispatchSlots.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/ImplementingDispatchSlots/ImplementingDispatchSlots.fs
similarity index 84%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/ImplementingDispatchSlots/ImplementingDispatchSlots.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/ImplementingDispatchSlots/ImplementingDispatchSlots.fs
index 15847f61670..2b0a31608da 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/ImplementingDispatchSlots/ImplementingDispatchSlots.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/ImplementingDispatchSlots/ImplementingDispatchSlots.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.MemberDefinitions
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module ImplementingDispatchSlots =
+module MemberDefinitions_ImplementingDispatchSlots =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/ImplementingDispatchSlots/SanityCheck.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/ImplementingDispatchSlots/SanityCheck.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/ImplementingDispatchSlots/SanityCheck.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/ImplementingDispatchSlots/SanityCheck.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MemberDefinitions.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MemberDefinitions.fs
similarity index 91%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MemberDefinitions.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MemberDefinitions.fs
index 1b88a58975e..c34ea1101c8 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MemberDefinitions.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MemberDefinitions.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/AbstractProperties01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/AbstractProperties01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/AbstractProperties01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/AbstractProperties01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_AbstractAndConcereteProp.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractAndConcereteProp.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_AbstractAndConcereteProp.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractAndConcereteProp.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_ActivePatternMember01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_ActivePatternMember01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_ActivePatternMember01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_ActivePatternMember01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_ActivePatternMember02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_ActivePatternMember02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_ActivePatternMember02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_ActivePatternMember02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_DeclarePropertyTwice01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_DeclarePropertyTwice01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_DeclarePropertyTwice01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_DeclarePropertyTwice01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_DuplicateProperty01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_DuplicateProperty01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_DuplicateProperty01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_DuplicateProperty01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_IndexerIndeterminateType01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerIndeterminateType01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_IndexerIndeterminateType01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerIndeterminateType01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_IndexerNotSpecified01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerNotSpecified01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_IndexerNotSpecified01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerNotSpecified01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_OutscopeThisPtr01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_OutscopeThisPtr01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_OutscopeThisPtr01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_OutscopeThisPtr01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_Properties02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_Properties02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_Properties02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_Properties02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_Properties06.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_Properties06.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_Properties06.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_Properties06.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_UndefinedThisVariable.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_UndefinedThisVariable.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_UndefinedThisVariable.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_UndefinedThisVariable.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_UndefinedThisVariable02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_UndefinedThisVariable02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_UndefinedThisVariable02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_UndefinedThisVariable02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_useInstMethodThroughStatic.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_useInstMethodThroughStatic.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_useInstMethodThroughStatic.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_useInstMethodThroughStatic.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_useStaticMethodThroughInstance.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_useStaticMethodThroughInstance.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_useStaticMethodThroughInstance.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_useStaticMethodThroughInstance.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/GetAndSetKeywords01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/GetAndSetKeywords01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/GetAndSetKeywords01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/GetAndSetKeywords01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/GetterSetterDiff01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/GetterSetterDiff01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/GetterSetterDiff01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/GetterSetterDiff01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Indexer01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Indexer01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Indexer01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Indexer01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Indexer02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Indexer02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Indexer02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Indexer02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Indexer03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Indexer03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Indexer03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Indexer03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/MethodsAndProperties.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/MethodsAndProperties.fs
similarity index 99%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/MethodsAndProperties.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/MethodsAndProperties.fs
index fee65b3ad49..47b05507538 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/MethodsAndProperties.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/MethodsAndProperties.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.MemberDefinitions
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module MethodsAndProperties =
+module MemberDefinitions_MethodsAndProperties =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Properties01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Properties01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Properties01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Properties01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Properties02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Properties02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Properties02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Properties02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Properties03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Properties03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Properties03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Properties03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Properties04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Properties04.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Properties04.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Properties04.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Properties05.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Properties05.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/Properties05.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/Properties05.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/RecursiveLetValues.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/RecursiveLetValues.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/RecursiveLetValues.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/RecursiveLetValues.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/StaticGenericField01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/StaticGenericField01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/StaticGenericField01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/StaticGenericField01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/TupledIndexer.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/TupledIndexer.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/TupledIndexer.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/TupledIndexer.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/genericGenericClass.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/genericGenericClass.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/genericGenericClass.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/genericGenericClass.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/instMembers-DU.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/instMembers-DU.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/instMembers-DU.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/instMembers-DU.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/instMembers-Records.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/instMembers-Records.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/instMembers-Records.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/instMembers-Records.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/instMembers-class.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/instMembers-class.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/instMembers-class.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/instMembers-class.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/multiParamIndexer.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/multiParamIndexer.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/multiParamIndexer.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/multiParamIndexer.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/staticMembers-DU.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/staticMembers-DU.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/staticMembers-DU.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/staticMembers-DU.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/staticMembers-Records.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/staticMembers-Records.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/staticMembers-Records.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/staticMembers-Records.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/staticMembers-class.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/staticMembers-class.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/staticMembers-class.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/staticMembers-class.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/staticMembers-instance.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/staticMembers-instance.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/staticMembers-instance.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/staticMembers-instance.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/tupesAndFuncsAsArgs.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/tupesAndFuncsAsArgs.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/tupesAndFuncsAsArgs.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/tupesAndFuncsAsArgs.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/tupledValueProperties01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/tupledValueProperties01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/tupledValueProperties01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/tupledValueProperties01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/tupledValueProperties02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/tupledValueProperties02.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/tupledValueProperties02.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/tupledValueProperties02.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/typeMethodsCurrable.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/typeMethodsCurrable.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/typeMethodsCurrable.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/typeMethodsCurrable.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/E_MisspeltParam01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_MisspeltParam01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/E_MisspeltParam01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_MisspeltParam01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/E_MustBePrefix.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_MustBePrefix.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/E_MustBePrefix.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_MustBePrefix.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/E_NonNamedAfterNamed.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_NonNamedAfterNamed.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/E_NonNamedAfterNamed.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_NonNamedAfterNamed.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/E_NumParamMismatch01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_NumParamMismatch01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/E_NumParamMismatch01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_NumParamMismatch01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/E_ReusedParam.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_ReusedParam.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/E_ReusedParam.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_ReusedParam.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/E_SyntaxErrors01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_SyntaxErrors01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/E_SyntaxErrors01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_SyntaxErrors01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/NamedArguments.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/NamedArguments.fs
similarity index 98%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/NamedArguments.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/NamedArguments.fs
index 071bd4812ad..21176ac005c 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/NamedArguments.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/NamedArguments.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.MemberDefinitions
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module NamedArguments =
+module MemberDefinitions_NamedArguments =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01NamedExt.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01NamedExt.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01NamedExt.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01NamedExt.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01NamedExtInherit.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01NamedExtInherit.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01NamedExtInherit.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01NamedExtInherit.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01NamedExtOpt.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01NamedExtOpt.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01NamedExtOpt.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn01NamedExtOpt.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn02NamedExt.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn02NamedExt.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn02NamedExt.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/PropSetAfterConstrn02NamedExt.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/SanityCheck.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/SanityCheck.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/SanityCheck.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/SanityCheck.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/genericNamedParams.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/genericNamedParams.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/genericNamedParams.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/genericNamedParams.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/mixNamedNonNamed.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/mixNamedNonNamed.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/mixNamedNonNamed.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/mixNamedNonNamed.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/refLibsHaveNamedParams.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/refLibsHaveNamedParams.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/NamedArguments/refLibsHaveNamedParams.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/refLibsHaveNamedParams.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/E_OptionalNamedArgs.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_OptionalNamedArgs.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/E_OptionalNamedArgs.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_OptionalNamedArgs.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/E_SanityCheck.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_SanityCheck.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/E_SanityCheck.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_SanityCheck.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/E_SanityCheck02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_SanityCheck02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/E_SanityCheck02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_SanityCheck02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/NullOptArgsFromCS.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/NullOptArgsFromCS.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/NullOptArgsFromCS.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/NullOptArgsFromCS.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/NullOptArgsFromVB.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/NullOptArgsFromVB.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/NullOptArgsFromVB.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/NullOptArgsFromVB.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/OptArgsFromCOM.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/OptArgsFromCOM.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/OptArgsFromCOM.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/OptArgsFromCOM.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/OptionalArgOnAbstract01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/OptionalArgOnAbstract01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/OptionalArgOnAbstract01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/OptionalArgOnAbstract01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/OptionalArguments.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/OptionalArguments.fs
similarity index 97%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/OptionalArguments.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/OptionalArguments.fs
index d2038d93655..48cbd63e1e2 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/OptionalArguments.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/OptionalArguments.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.MemberDefinitions
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module OptionalArguments =
+module MemberDefinitions_OptionalArguments =
 
     let csTestLib =
         CSharpFromPath (__SOURCE_DIRECTORY__ ++ "TestLib.cs")
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/SanityCheck.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/SanityCheck.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/SanityCheck.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/SanityCheck.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/SanityCheck02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/SanityCheck02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/SanityCheck02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/SanityCheck02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/SanityCheck03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/SanityCheck03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/SanityCheck03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/SanityCheck03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/SanityOptArgsFromCS.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/SanityOptArgsFromCS.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/SanityOptArgsFromCS.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/SanityOptArgsFromCS.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/TestLib.cs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/TestLib.cs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/TestLib.cs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/TestLib.cs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/TestLibVB.vb b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/TestLibVB.vb
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/TestLibVB.vb
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/TestLibVB.vb
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/optionalOfOptOptA.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/optionalOfOptOptA.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalArguments/optionalOfOptOptA.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/optionalOfOptOptA.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/CallFSharpMethods.cs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/CallFSharpMethods.cs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/CallFSharpMethods.cs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/CallFSharpMethods.cs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/CallMethods.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/CallMethods.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/CallMethods.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/CallMethods.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/E_OnlyDefault.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/E_OnlyDefault.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/E_OnlyDefault.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/E_OnlyDefault.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/InterfaceMethod.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/InterfaceMethod.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/InterfaceMethod.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/InterfaceMethod.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/Library.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/Library.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/Library.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/Library.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/OptionalDefaultParamArgs.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/OptionalDefaultParamArgs.fs
similarity index 95%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/OptionalDefaultParamArgs.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/OptionalDefaultParamArgs.fs
index 7bbb6cce392..ae25dc72198 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/OptionalDefaultParamArgs.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/OptionalDefaultParamArgs.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.MemberDefinitions
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module OptionalDefaultParamArgs =
+module MemberDefinitions_OptionalDefaultParamArgs =
 
     let fsLibrary =
         FsFromPath (__SOURCE_DIRECTORY__ ++ "Library.fs")
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/Sanity.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/Sanity.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/Sanity.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/Sanity.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/W_WrongDefaultType.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/W_WrongDefaultType.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OptionalDefaultParamArgs/W_WrongDefaultType.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/W_WrongDefaultType.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/ConsumeOverloadGenericMethods.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/ConsumeOverloadGenericMethods.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/ConsumeOverloadGenericMethods.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/ConsumeOverloadGenericMethods.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/E_InferredTypeNotUnique01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_InferredTypeNotUnique01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/E_InferredTypeNotUnique01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_InferredTypeNotUnique01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/E_OperatorOverloading01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_OperatorOverloading01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/E_OperatorOverloading01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_OperatorOverloading01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/E_OverloadCurriedFunc.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_OverloadCurriedFunc.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/E_OverloadCurriedFunc.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_OverloadCurriedFunc.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/E_OverloadMismatch.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_OverloadMismatch.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/E_OverloadMismatch.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_OverloadMismatch.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/E_ReturnGenericUnit01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_ReturnGenericUnit01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/E_ReturnGenericUnit01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_ReturnGenericUnit01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/E_UnsolvableConstraints01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_UnsolvableConstraints01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/E_UnsolvableConstraints01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_UnsolvableConstraints01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/InferenceForLambdaArgs.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/InferenceForLambdaArgs.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/InferenceForLambdaArgs.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/InferenceForLambdaArgs.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/MethodOverloadUnambiguous.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/MethodOverloadUnambiguous.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/MethodOverloadUnambiguous.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/MethodOverloadUnambiguous.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/NoOverloadIDSpecified.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/NoOverloadIDSpecified.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/NoOverloadIDSpecified.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/NoOverloadIDSpecified.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/NoWarningWhenDoingDispatchSlotInference01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/NoWarningWhenDoingDispatchSlotInference01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/NoWarningWhenDoingDispatchSlotInference01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/NoWarningWhenDoingDispatchSlotInference01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/NoWarningWhenOverloadingInSubClass01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/NoWarningWhenOverloadingInSubClass01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/NoWarningWhenOverloadingInSubClass01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/NoWarningWhenOverloadingInSubClass01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OnAllOverloads01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OnAllOverloads01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OnAllOverloads01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OnAllOverloads01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OperatorOverloading01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OperatorOverloading01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OperatorOverloading01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OperatorOverloading01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OperatorOverloading02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OperatorOverloading02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OperatorOverloading02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OperatorOverloading02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OperatorOverloading03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OperatorOverloading03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OperatorOverloading03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OperatorOverloading03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OperatorOverloading04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OperatorOverloading04.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OperatorOverloading04.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OperatorOverloading04.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OverloadingAndExtensionMethodsForGenericTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OverloadingAndExtensionMethodsForGenericTypes.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OverloadingAndExtensionMethodsForGenericTypes.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OverloadingAndExtensionMethodsForGenericTypes.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OverloadingMembers.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OverloadingMembers.fs
similarity index 98%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OverloadingMembers.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OverloadingMembers.fs
index 4edc3a49bdc..1bc2d332247 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/OverloadingMembers.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/OverloadingMembers.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.MemberDefinitions
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module OverloadingMembers =
+module MemberDefinitions_OverloadingMembers =
 
     let verifyCompile compilation =
         compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/SanityCheck.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/SanityCheck.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/SanityCheck.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/SanityCheck.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/TieBreakerRule01a.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/TieBreakerRule01a.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/TieBreakerRule01a.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/TieBreakerRule01a.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/TieBreakerRule01b.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/TieBreakerRule01b.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/TieBreakerRule01b.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/TieBreakerRule01b.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/TieBreakerRule02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/TieBreakerRule02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/TieBreakerRule02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/TieBreakerRule02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/TieBreakerRule03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/TieBreakerRule03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/TieBreakerRule03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/TieBreakerRule03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/TooGeneric.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/TooGeneric.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/TooGeneric.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/TooGeneric.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/diffNumArguments.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/diffNumArguments.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/diffNumArguments.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/diffNumArguments.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/lib.cs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/lib.cs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/lib.cs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/lib.cs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/reuseOverloadIDs.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/reuseOverloadIDs.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/MemberDefinitions/OverloadingMembers/reuseOverloadIDs.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/reuseOverloadIDs.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/MethodResolution/ParametersResolution.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MethodResolution.fs
similarity index 98%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/MethodResolution/ParametersResolution.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MethodResolution.fs
index 5cf79baa88b..af9a6eb8d0b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/MethodResolution/ParametersResolution.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MethodResolution.fs
@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.MethodResolution
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test.Compiler
 
-module ParametersResolution =
+module MethodResolution =
 
     [<Fact>]
-    let ``Method with optional and out parameters resolves correctly`` () =
+    let ``Method with optional and out parameters resolves correctly (sanity test)`` () =
         FSharp """
 open System.Runtime.InteropServices
 
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/E_AbbreviationOnNamespace01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_AbbreviationOnNamespace01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/E_AbbreviationOnNamespace01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_AbbreviationOnNamespace01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/E_InvalidAbbrevName01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_InvalidAbbrevName01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/E_InvalidAbbrevName01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_InvalidAbbrevName01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/E_InvalidAbbrevName02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_InvalidAbbrevName02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/E_InvalidAbbrevName02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_InvalidAbbrevName02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/E_NameConflict01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_NameConflict01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/E_NameConflict01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_NameConflict01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/E_UseInsideFunc.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_UseInsideFunc.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/E_UseInsideFunc.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_UseInsideFunc.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/ModuleAbbreviations.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/ModuleAbbreviations.fs
similarity index 98%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/ModuleAbbreviations.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/ModuleAbbreviations.fs
index 2b6f6dab612..6f457f7c5e4 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/ModuleAbbreviations.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/ModuleAbbreviations.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/SanityCheck.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/SanityCheck.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/SanityCheck.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/SanityCheck.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/SanityCheck02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/SanityCheck02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/SanityCheck02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/SanityCheck02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/useInsideModuleDef.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/useInsideModuleDef.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/useInsideModuleDef.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/useInsideModuleDef.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/useInsideNamespaceDef.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/useInsideNamespaceDef.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/useInsideNamespaceDef.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/useInsideNamespaceDef.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/useInsideNamespaceDefExternal.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/useInsideNamespaceDefExternal.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/useInsideNamespaceDefExternal.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/useInsideNamespaceDefExternal.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/useInsideNamespaceDefExternal_DLL.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/useInsideNamespaceDefExternal_DLL.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/ModuleAbbreviations/useInsideNamespaceDefExternal_DLL.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/useInsideNamespaceDefExternal_DLL.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/AutoOpen01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/AutoOpen01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/AutoOpen01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/AutoOpen01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/AutoOpen02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/AutoOpen02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/AutoOpen02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/AutoOpen02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/AutoOpen03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/AutoOpen03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/AutoOpen03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/AutoOpen03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/DefineModule01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/DefineModule01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/DefineModule01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/DefineModule01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_CannotAccessPrivateMembersOfAnotherType.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_CannotAccessPrivateMembersOfAnotherType.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_CannotAccessPrivateMembersOfAnotherType.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_CannotAccessPrivateMembersOfAnotherType.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ModuleSuffix01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleSuffix01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ModuleSuffix01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleSuffix01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ModuleSuffix_NameClash01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleSuffix_NameClash01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ModuleSuffix_NameClash01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleSuffix_NameClash01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ModuleWithExpression02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithExpression02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ModuleWithExpression02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithExpression02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ModuleWithSameNameInNamespace01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ModuleWithSameNameInNamespace01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ModuleWithSameNameInNamespace02a.exe b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace02a.exe
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ModuleWithSameNameInNamespace02a.exe
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace02a.exe
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ModuleWithSameNameInNamespace02a.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace02a.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ModuleWithSameNameInNamespace02a.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace02a.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ModuleWithSameNameInNamespace02b.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace02b.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ModuleWithSameNameInNamespace02b.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace02b.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ObsoleteAttribOnModules01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ObsoleteAttribOnModules01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/E_ObsoleteAttribOnModules01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ObsoleteAttribOnModules01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/FullyQualify01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/FullyQualify01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/FullyQualify01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/FullyQualify01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/LibFoo1.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/LibFoo1.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/LibFoo1.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/LibFoo1.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/LibFoo2.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/LibFoo2.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/LibFoo2.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/LibFoo2.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/LightSyntax01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/LightSyntax01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/LightSyntax01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/LightSyntax01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleAbbreviationWithModule01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleAbbreviationWithModule01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleAbbreviationWithModule01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleAbbreviationWithModule01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleDefinitions.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleDefinitions.fs
similarity index 99%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleDefinitions.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleDefinitions.fs
index d1094604953..a476739a680 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleDefinitions.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleDefinitions.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.BasicTypeAndModuleDefinitions
+namespace Conformance.BasicGrammarElements
 
 open System.IO
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleSuffix02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleSuffix02.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleSuffix02.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleSuffix02.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleSuffix03.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleSuffix03.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleSuffix03.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleSuffix03.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleSuffix03Lib.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleSuffix03Lib.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleSuffix03Lib.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleSuffix03Lib.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleSuffix04.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleSuffix04.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleSuffix04.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleSuffix04.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleWithExpression01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleWithExpression01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleWithExpression01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleWithExpression01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleWithExpression02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleWithExpression02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/ModuleWithExpression02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/ModuleWithExpression02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Module_internal01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Module_internal01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Module_internal01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Module_internal01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Module_internalConsumer01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Module_internalConsumer01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Module_internalConsumer01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Module_internalConsumer01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_ExceptionDefinition.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_ExceptionDefinition.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_ExceptionDefinition.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_ExceptionDefinition.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_ImportDeclaration.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_ImportDeclaration.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_ImportDeclaration.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_ImportDeclaration.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_LetBindings_Binding.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_LetBindings_Binding.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_LetBindings_Binding.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_LetBindings_Binding.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_LetBindings_SideEff.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_LetBindings_SideEff.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_LetBindings_SideEff.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_LetBindings_SideEff.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_ModuleAbbreviation.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_ModuleAbbreviation.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_ModuleAbbreviation.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_ModuleAbbreviation.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_ModuleDefinition.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_ModuleDefinition.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_ModuleDefinition.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_ModuleDefinition.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_OCamlCompat.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_OCamlCompat.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_OCamlCompat.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_OCamlCompat.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_TypeDefinitions.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_TypeDefinitions.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/Production_TypeDefinitions.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/Production_TypeDefinitions.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/SameTypeInTwoReferences01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/SameTypeInTwoReferences01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/SameTypeInTwoReferences01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/SameTypeInTwoReferences01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/SameTypeInTwoReferences02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/SameTypeInTwoReferences02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/SameTypeInTwoReferences02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/SameTypeInTwoReferences02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/W_ModuleAbbreviationWithNamespace01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/W_ModuleAbbreviationWithNamespace01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/W_ModuleAbbreviationWithNamespace01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/W_ModuleAbbreviationWithNamespace01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/W_Production_OCamlCompat.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/W_Production_OCamlCompat.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/ModuleDefinitions/W_Production_OCamlCompat.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/W_Production_OCamlCompat.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/E_BeginWithNamespace01a.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/E_BeginWithNamespace01a.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/E_BeginWithNamespace01a.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/E_BeginWithNamespace01a.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/E_BeginWithNamespace01b.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/E_BeginWithNamespace01b.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/E_BeginWithNamespace01b.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/E_BeginWithNamespace01b.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/FooGlobal.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/FooGlobal.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/FooGlobal.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/FooGlobal.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/NamespaceDeclGroups.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/NamespaceDeclGroups.fs
similarity index 97%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/NamespaceDeclGroups.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/NamespaceDeclGroups.fs
index 356156d1b3c..994aa9f1b79 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/NamespaceDeclGroups.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/NamespaceDeclGroups.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.BasicTypeAndModuleDefinitions
+namespace Conformance.BasicGrammarElements
 
 open System.IO
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/NoWarnOnJustNamespace.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/NoWarnOnJustNamespace.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/NoWarnOnJustNamespace.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/NoWarnOnJustNamespace.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/TypeInGlobalNamespace01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/TypeInGlobalNamespace01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/TypeInGlobalNamespace01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/TypeInGlobalNamespace01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/TypeInGlobalNamespace02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/TypeInGlobalNamespace02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NamespaceDeclGroups/TypeInGlobalNamespace02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NamespaceDeclGroups/TypeInGlobalNamespace02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NullRepresentations/E_NullInvalidForFSTypes01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NullRepresentations/E_NullInvalidForFSTypes01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NullRepresentations/E_NullInvalidForFSTypes01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NullRepresentations/E_NullInvalidForFSTypes01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NullRepresentations/NullRepresentations.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NullRepresentations/NullRepresentations.fs
similarity index 93%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NullRepresentations/NullRepresentations.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NullRepresentations/NullRepresentations.fs
index a52816d8b71..3f28000ed64 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/NullRepresentations/NullRepresentations.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NullRepresentations/NullRepresentations.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.BasicTypeAndModuleDefinitions
+namespace Conformance.BasicGrammarElements
 
 open System.IO
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/OperatorNames/OperatorNames.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/OperatorNames/OperatorNames.fs
index d2ba68ff83e..e9cd52bafba 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/OperatorNames/OperatorNames.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/OperatorNames/OperatorNames.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.BasicGrammarElements
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/PrecedenceAndOperators/PrecedenceAndOperators.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/PrecedenceAndOperators/PrecedenceAndOperators.fs
index 7aac485b839..b6f0d7982ae 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/PrecedenceAndOperators/PrecedenceAndOperators.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/PrecedenceAndOperators/PrecedenceAndOperators.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.BasicGrammarElements
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/AbbreviatedTypeSameAsValueId.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/AbbreviatedTypeSameAsValueId.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/AbbreviatedTypeSameAsValueId.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/AbbreviatedTypeSameAsValueId.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/Constraints_SampleFromSpec01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/Constraints_SampleFromSpec01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/Constraints_SampleFromSpec01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/Constraints_SampleFromSpec01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_AbbreviatedTypeAlreadyUsed01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_AbbreviatedTypeAlreadyUsed01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_AbbreviatedTypeAlreadyUsed01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_AbbreviatedTypeAlreadyUsed01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_AbbreviatedTypeDoesNotExist01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_AbbreviatedTypeDoesNotExist01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_AbbreviatedTypeDoesNotExist01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_AbbreviatedTypeDoesNotExist01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_Constraints_SampleFromSpec02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Constraints_SampleFromSpec02.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_Constraints_SampleFromSpec02.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Constraints_SampleFromSpec02.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_DroppedTypeVariable01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_DroppedTypeVariable01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_DroppedTypeVariable01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_DroppedTypeVariable01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_FlexibleType01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleType01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_FlexibleType01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleType01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_FlexibleTypeInSignature01.fsi b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleTypeInSignature01.fsi
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_FlexibleTypeInSignature01.fsi
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleTypeInSignature01.fsi
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_FlexibleTypeInSignature01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleTypeInSignature01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_FlexibleTypeInSignature01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleTypeInSignature01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_IncorrectRightSide_Hash.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Hash.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_IncorrectRightSide_Hash.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Hash.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_IncorrectRightSide_Keyword.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Keyword.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_IncorrectRightSide_Keyword.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Keyword.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_IncorrectRightSide_Quotation.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Quotation.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_IncorrectRightSide_Quotation.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Quotation.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_InfiniteAbbreviation01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InfiniteAbbreviation01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_InfiniteAbbreviation01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InfiniteAbbreviation01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_InfiniteAbbreviation02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InfiniteAbbreviation02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_InfiniteAbbreviation02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InfiniteAbbreviation02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_InheritTypeAbrev.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InheritTypeAbrev.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_InheritTypeAbrev.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InheritTypeAbrev.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_PrivateTypeAbbreviation02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_PrivateTypeAbbreviation02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_PrivateTypeAbbreviation02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_PrivateTypeAbbreviation02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_Recursive01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_Recursive01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_Recursive02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive02.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_Recursive02.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive02.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_Recursive03.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive03.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_Recursive03.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive03.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_UnexpectedCharInTypeName01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_UnexpectedCharInTypeName01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/E_UnexpectedCharInTypeName01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_UnexpectedCharInTypeName01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/Identity01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/Identity01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/Identity01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/Identity01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/PrivateTypeAbbreviation01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/PrivateTypeAbbreviation01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/PrivateTypeAbbreviation01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/PrivateTypeAbbreviation01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/ReorderingTypeVariables01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/ReorderingTypeVariables01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/ReorderingTypeVariables01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/ReorderingTypeVariables01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/TypeAbbreviationAfterForwardRef.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/TypeAbbreviationAfterForwardRef.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/TypeAbbreviationAfterForwardRef.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/TypeAbbreviationAfterForwardRef.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/TypeAbbreviations.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/TypeAbbreviations.fs
similarity index 99%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/TypeAbbreviations.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/TypeAbbreviations.fs
index 24226316fcc..a584aa2ca21 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/TypeAbbreviations.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/TypeAbbreviations.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.BasicTypeAndModuleDefinitions
+namespace Conformance.BasicGrammarElements
 
 open System.IO
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/TypeNestedInModules01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/TypeNestedInModules01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/TypeNestedInModules01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/TypeNestedInModules01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/WarnForAutoOpenAttributeAlias.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/WarnForAutoOpenAttributeAlias.fs
similarity index 80%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/WarnForAutoOpenAttributeAlias.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/WarnForAutoOpenAttributeAlias.fs
index 7f9e5edf053..f15f6199d3c 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/TypeAbbreviations/WarnForAutoOpenAttributeAlias.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/WarnForAutoOpenAttributeAlias.fs
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.BasicTypeAndModuleDefinitions
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test.Compiler
 
 module WarnForAutoOpenAttributeAlias =
     [<Fact>]
-    let ``Warn user when aliasing FSharp.Core.AutoOpenAttribute`` () =
+    let ``Warn user when aliasing FSharp_Core_AutoOpenAttribute`` () =
         Fsx """
 type ByItsOwnNatureUnBottledAttribute = Microsoft.FSharp.Core.AutoOpenAttribute
 
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/UseBindings/UseBindingDiscard01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/UseBindings/UseBindingDiscard01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/UseBindings/UseBindingDiscard01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/UseBindings/UseBindingDiscard01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/UseBindings/UseBindings.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/UseBindings/UseBindings.fs
similarity index 96%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/UseBindings/UseBindings.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/UseBindings/UseBindings.fs
index ab71a657e13..09c9e18c12a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/UseBindings/UseBindings.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/UseBindings/UseBindings.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/E_NotMemberOrFunction01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/E_NotMemberOrFunction01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/E_NotMemberOrFunction01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/E_NotMemberOrFunction01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/MemberOrFunction01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/MemberOrFunction01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/MemberOrFunction01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/MemberOrFunction01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/MemberOrFunction01Gen.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/MemberOrFunction01Gen.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/MemberOrFunction01Gen.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/MemberOrFunction01Gen.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/MemberOrFunction02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/MemberOrFunction02.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/MemberOrFunction02.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/MemberOrFunction02.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/MemberOrFunction02Gen.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/MemberOrFunction02Gen.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/MemberOrFunction02Gen.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/MemberOrFunction02Gen.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/TypeArgs01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/TypeArgs01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/TypeArgs01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/TypeArgs01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/TypeFunction01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/TypeFunction01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/TypeFunction01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/TypeFunction01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/TypeInferenceVariable01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/TypeInferenceVariable01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/TypeInferenceVariable01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/TypeInferenceVariable01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/ValueRestriction.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/ValueRestriction.fs
similarity index 97%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/ValueRestriction.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/ValueRestriction.fs
index 3e521a2dd46..cfce73a0198 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/ClassTypes/ValueRestriction/ValueRestriction.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/ValueRestriction.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.ClassTypes
+namespace Conformance.BasicGrammarElements
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ApplicationExpressions/BasicApplication/BasicApplication.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ApplicationExpressions/BasicApplication/BasicApplication.fs
index 720f74976b2..21505f43355 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ApplicationExpressions/BasicApplication/BasicApplication.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ApplicationExpressions/BasicApplication/BasicApplication.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.Expressions.ApplicationExpressions
+namespace Conformance.Expressions
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/BindingExpressions.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/BindingExpressions.fs
index 89b2383dd86..4aa7ff3999a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/BindingExpressions.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/BindingExpressions.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.Expressions
+namespace Conformance.Expressions
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/PatternMatching.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/PatternMatching.fs
index a85221771af..729bc351ab3 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/PatternMatching.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/PatternMatching.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.Expressions.ControlFlowExpressions
+namespace Conformance.Expressions
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration/SequenceIteration.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration/SequenceIteration.fs
index fedf8dc609d..1a991a53f63 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration/SequenceIteration.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration/SequenceIteration.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.Expressions.ControlFlowExpressions
+namespace Conformance.Expressions
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/Type-relatedExpressions/Type-relatedExpressions.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/Type-relatedExpressions/Type-relatedExpressions.fs
index 112d51f4b33..40199c38d3a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/Type-relatedExpressions/Type-relatedExpressions.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/Type-relatedExpressions/Type-relatedExpressions.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.Expressions
+namespace Conformance.Expressions
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Diags/Diags.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Diags/Attributes_Diags.fs
similarity index 90%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Diags/Diags.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Diags/Attributes_Diags.fs
index 95fe85e3678..47e9d048841 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Diags/Diags.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Diags/Attributes_Diags.fs
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.BasicTypeAndModuleDefinitions.GeneratedEqualityHashingComparison.Attributes
+namespace Conformance.GeneratedEqualityHashingComparison
 
 open System.IO
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module Diags =
+module Attributes_Diags =
 
     // SOURCE=E_AdjustUses01a.fs SCFLAGS=--test:ErrorRanges                 # E_AdjustUses01a.fs
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"E_AdjustUses01a.fs"|])>]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Diags/E_AdjustUses01a.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Diags/E_AdjustUses01a.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Diags/E_AdjustUses01a.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Diags/E_AdjustUses01a.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Diags/E_AdjustUses01b.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Diags/E_AdjustUses01b.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Diags/E_AdjustUses01b.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Diags/E_AdjustUses01b.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Legacy.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Attributes_Legacy.fs
similarity index 99%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Legacy.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Attributes_Legacy.fs
index af9e9f3472e..9f45c66a2ca 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Legacy.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Attributes_Legacy.fs
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.BasicTypeAndModuleDefinitions.GeneratedEqualityHashingComparison.Attributes
+namespace Conformance.GeneratedEqualityHashingComparison
 
 open System.IO
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module Legacy =
+module AttributesLegacy =
 
     // SOURCE=Test01.fs SCFLAGS="--test:ErrorRanges"        # Test01.fs
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"Test01.fs"|])>]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test04.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test04.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test04.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test05.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test05.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test05.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test05.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test06.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test06.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test06.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test06.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test07.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test07.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test07.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test07.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test08.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test08.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test08.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test08.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test09.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test09.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test09.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test09.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test10.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test10.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test10.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test10.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test11.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test11.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test11.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test11.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test12.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test12.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test12.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test12.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test13.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test13.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test13.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test13.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test14.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test14.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test14.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test14.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test15.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test15.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test15.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test15.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test16.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test16.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test16.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test16.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test17.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test17.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test17.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test17.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test18.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test18.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test18.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test18.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test19.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test19.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test19.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test19.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test20.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test20.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test20.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test20.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test21.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test21.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test21.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test21.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test22.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test22.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test22.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test22.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test23.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test23.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test23.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test23.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test24.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test24.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test24.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test24.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test25.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test25.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test25.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test25.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test26.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test26.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test26.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test26.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test27.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test27.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test27.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test27.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test28.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test28.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/Legacy/Test28.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/Legacy/Test28.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/New.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Attributes_New.fs
similarity index 99%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/New.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Attributes_New.fs
index 45ac0f346e3..8797695481d 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/New.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Attributes_New.fs
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.BasicTypeAndModuleDefinitions.GeneratedEqualityHashingComparison.Attributes
+namespace Conformance.GeneratedEqualityHashingComparison.Attribute
 
 open System.IO
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
 
-module New =
+module AttributesNew =
 
     // SOURCE=Test01.fs SCFLAGS="--test:ErrorRanges"        # Test01.fs
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"Test01.fs"|])>]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test04.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test04.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test04.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test05.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test05.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test05.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test05.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test06.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test06.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test06.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test06.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test07.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test07.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test07.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test07.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test08.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test08.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test08.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test08.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test09.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test09.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test09.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test09.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test10.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test10.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test10.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test10.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test11.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test11.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test11.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test11.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test12.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test12.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test12.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test12.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test13.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test13.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test13.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test13.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test14.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test14.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test14.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test14.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test15.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test15.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test15.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test15.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test16.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test16.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test16.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test16.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test17.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test17.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test17.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test17.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test18.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test18.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test18.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test18.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test19.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test19.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test19.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test19.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test20.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test20.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test20.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test20.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test21.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test21.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test21.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test21.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test22.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test22.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test22.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test22.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test23.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test23.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test23.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test23.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test24.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test24.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test24.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test24.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test25.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test25.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test25.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test25.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test26.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test26.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test26.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test26.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test27.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test27.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test27.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test27.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test28.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test28.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test28.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Attributes/New/Test28.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Arrays.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Arrays.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Arrays.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Arrays.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Basic.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Basic.fs
similarity index 98%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Basic.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Basic.fs
index 44bd4622adc..76203d10cda 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Basic.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Basic.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.BasicTypeAndModuleDefinitions.GeneratedEqualityHashingComparison
+namespace Conformance.GeneratedEqualityHashingComparison
 
 open System.IO
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Comparison01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Comparison01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Comparison01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Comparison01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/CustomEquality01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/CustomEquality01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/CustomEquality01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/CustomEquality01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityEquals01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityEquals01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityEquals01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityEquals01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityGetHashCode01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityGetHashCode01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityGetHashCode01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityGetHashCode01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/E_ExceptionsNoComparison.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/E_ExceptionsNoComparison.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/E_ExceptionsNoComparison.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/E_ExceptionsNoComparison.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/EqualOnTuples01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/EqualOnTuples01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/EqualOnTuples01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/EqualOnTuples01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Equality01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Equality01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Equality01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Equality01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Exceptions.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Exceptions.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Exceptions.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Exceptions.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Generated_Record.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Generated_Record.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Generated_Record.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Generated_Record.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Hashing01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Hashing01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Hashing01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Hashing01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Lists.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Lists.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Lists.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Lists.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Class.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Class.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Class.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Class.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Delegate.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Delegate.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Delegate.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Delegate.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Enum.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Enum.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Enum.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Enum.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Interface.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Interface.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Interface.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/NeverGenerated_Interface.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Options.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Options.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Options.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Options.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Sample_Records.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Sample_Records.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Sample_Records.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Sample_Records.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Sample_Tuples.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Sample_Tuples.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Sample_Tuples.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Sample_Tuples.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Structs.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Structs.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Structs.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Structs.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Unions.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Unions.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Basic/Unions.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/Unions.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/IComparison/DU.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/DU.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/IComparison/DU.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/DU.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/IComparison/IComparison.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/IComparison.fs
similarity index 94%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/IComparison/IComparison.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/IComparison.fs
index 2c26deb7c9c..f35a1720fe3 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/IComparison/IComparison.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/IComparison.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.BasicTypeAndModuleDefinitions.GeneratedEqualityHashingComparison
+namespace Conformance.GeneratedEqualityHashingComparison
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/IComparison/Record.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/Record.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/IComparison/Record.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/Record.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/IComparison/Struct.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/Struct.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/IComparison/Struct.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/Struct.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/IComparison/W_ImplIComparable.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/W_ImplIComparable.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/IComparison/W_ImplIComparable.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/W_ImplIComparable.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/ByrefSafetyAnalysis.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/ByrefSafetyAnalysis.fs
index f171e659fb3..6517e0a7734 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/ByrefSafetyAnalysis.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/ByrefSafetyAnalysis.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.InferenceProcedures
+namespace Conformance.InferenceProcedures
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/RecursiveSafetyAnalysis.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/RecursiveSafetyAnalysis.fs
index 39ad13a3e9e..52bf8601869 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/RecursiveSafetyAnalysis.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/RecursiveSafetyAnalysis.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.InferenceProcedures
+namespace Conformance.InferenceProcedures
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Comments.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Comments.fs
index 88a6c8dec08..3e83c2d85d9 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Comments.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Comments.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.LexicalAnalysis
+namespace Conformance.LexicalAnalysis
 
 open Xunit
 open FSharp.Test
@@ -11,7 +11,7 @@ module Comments =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/Comments)
     //<Expects status="success"></Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/Comments", Includes=[|"star01.fs"|])>]
-    let ``Comments - star01.fs - --test:ErrorRanges`` compilation =
+    let ``Comments - star01_fs - --test:ErrorRanges`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--test:ErrorRanges"]
@@ -22,7 +22,7 @@ module Comments =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/Comments)
     
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/Comments", Includes=[|"E_star02.fs"|])>]
-    let ``Comments - E_star02.fs - --test:ErrorRanges`` compilation =
+    let ``Comments - E_star02_fs - --test:ErrorRanges`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--test:ErrorRanges"]
@@ -35,11 +35,10 @@ module Comments =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/Comments)
     //<Expects status="success"></Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/Comments", Includes=[|"star03.fs"|])>]
-    let ``Comments - star03.fs - --test:ErrorRanges`` compilation =
+    let ``Comments - star03_fs - --test:ErrorRanges`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--test:ErrorRanges"]
         |> compile
         |> shouldSucceed
         |> ignore
-
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/ElseIfBug14761.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/ElseIfBug14761.fs
index 22c81b735b5..5887a9b82ac 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/ElseIfBug14761.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/ElseIfBug14761.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.LexicalAnalysis
+namespace Conformance.LexicalAnalysis
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Shift/Generics.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Generics.fs
similarity index 59%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Shift/Generics.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Generics.fs
index c3977a8f8c3..454f66b99fc 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Shift/Generics.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Generics.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.LexicalAnalysis.Shift
+namespace Conformance.LexicalAnalysis
 
 open Xunit
 open FSharp.Test
@@ -10,8 +10,8 @@ module Generics =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/Shift/Generics)
     //<Expects status="success"></Expects>
-    [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../../resources/tests/Conformance/LexicalAnalysis/Shift/Generics", Includes=[|"RightShift001.fs"|])>]
-    let ``Generics - RightShift001.fs - `` compilation =
+    [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/Shift/Generics", Includes=[|"RightShift001.fs"|])>]
+    let ``Generics - RightShift001_fs`` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -20,8 +20,8 @@ module Generics =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/Shift/Generics)
     //<Expects status="success"></Expects>
-    [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../../resources/tests/Conformance/LexicalAnalysis/Shift/Generics", Includes=[|"RightShift002.fs"|])>]
-    let ``Generics - RightShift002.fs - `` compilation =
+    [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/Shift/Generics", Includes=[|"RightShift002.fs"|])>]
+    let ``Generics - RightShift002_fs`` compilation =
         compilation
         |> asFsx
         |> typecheck
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/NumericLiterals.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/NumericLiterals.fs
index 6692541089b..52c9daf49da 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/NumericLiterals.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/NumericLiterals.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.LexicalAnalysis
+namespace Conformance.LexicalAnalysis
 
 open Xunit
 open FSharp.Test
@@ -10,7 +10,7 @@ module NumericLiterals =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/NumericLiterals)
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/NumericLiterals", Includes=[|"enumNegativeLiterals001.fs"|])>]
-    let ``NumericLiterals - enumNegativeLiterals001.fs - `` compilation =
+    let ``NumericLiterals - enumNegativeLiterals001_fs - `` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -20,7 +20,7 @@ module NumericLiterals =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/NumericLiterals)
     //<Expects status="error" span="(8,30)" id="FS0010">Unexpected symbol '-' in union case$</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/NumericLiterals", Includes=[|"E_enumNegativeLiterals001.fs"|])>]
-    let ``NumericLiterals - E_enumNegativeLiterals001.fs - `` compilation =
+    let ``NumericLiterals - E_enumNegativeLiterals001_fs - `` compilation =
         compilation
         |> asFsx
         |> compile
@@ -32,7 +32,7 @@ module NumericLiterals =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/NumericLiterals)
     //<Expects status="error" span="(8,30)" id="FS0010">Unexpected symbol '-' in union case$</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/NumericLiterals", Includes=[|"E_enumNegativeLiterals002.fs"|])>]
-    let ``NumericLiterals - E_enumNegativeLiterals002.fs - `` compilation =
+    let ``NumericLiterals - E_enumNegativeLiterals002_fs - `` compilation =
         compilation
         |> asFsx
         |> compile
@@ -44,7 +44,7 @@ module NumericLiterals =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/NumericLiterals)
     //<Expects status="error" span="(8,30)" id="FS0010">Unexpected symbol '-' in union case$</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/NumericLiterals", Includes=[|"E_enumNegativeLiterals003.fs"|])>]
-    let ``NumericLiterals - E_enumNegativeLiterals003.fs - `` compilation =
+    let ``NumericLiterals - E_enumNegativeLiterals003_fs - `` compilation =
         compilation
         |> asFsx
         |> compile
@@ -56,7 +56,7 @@ module NumericLiterals =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/NumericLiterals)
     //<Expects status="error" span="(8,30)" id="FS0010">Unexpected symbol '-' in union case$</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/NumericLiterals", Includes=[|"E_enumNegativeLiterals004.fs"|])>]
-    let ``NumericLiterals - E_enumNegativeLiterals004.fs - `` compilation =
+    let ``NumericLiterals - E_enumNegativeLiterals004_fs - `` compilation =
         compilation
         |> asFsx
         |> compile
@@ -68,7 +68,7 @@ module NumericLiterals =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/NumericLiterals)
     //<Expects status="error" span="(8,30)" id="FS0010">Unexpected symbol '-' in union case$</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/NumericLiterals", Includes=[|"E_enumNegativeLiterals005.fs"|])>]
-    let ``NumericLiterals - E_enumNegativeLiterals005.fs - `` compilation =
+    let ``NumericLiterals - E_enumNegativeLiterals005_fs - `` compilation =
         compilation
         |> asFsx
         |> compile
@@ -80,7 +80,7 @@ module NumericLiterals =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/NumericLiterals)
     //<Expects status="error" span="(8,30)" id="FS0010">Unexpected symbol '-' in union case$</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/NumericLiterals", Includes=[|"E_enumNegativeLiterals006.fs"|])>]
-    let ``NumericLiterals - E_enumNegativeLiterals006.fs - `` compilation =
+    let ``NumericLiterals - E_enumNegativeLiterals006_fs - `` compilation =
         compilation
         |> asFsx
         |> compile
@@ -92,7 +92,7 @@ module NumericLiterals =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/NumericLiterals)
     //<Expects status="error" span="(8,30)" id="FS0010">Unexpected symbol '-' in union case$</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/NumericLiterals", Includes=[|"E_enumNegativeLiterals007.fs"|])>]
-    let ``NumericLiterals - E_enumNegativeLiterals007.fs - `` compilation =
+    let ``NumericLiterals - E_enumNegativeLiterals007_fs - `` compilation =
         compilation
         |> asFsx
         |> compile
@@ -104,7 +104,7 @@ module NumericLiterals =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/NumericLiterals)
     //<Expects status="error" span="(8,23)" id="FS0951">Literal enumerations must have type int, uint, int16, uint16, int64, uint64, byte, sbyte or char</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/NumericLiterals", Includes=[|"E_enumNegativeLiterals008.fs"|])>]
-    let ``NumericLiterals - E_enumNegativeLiterals008.fs - `` compilation =
+    let ``NumericLiterals - E_enumNegativeLiterals008_fs - `` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -116,7 +116,7 @@ module NumericLiterals =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/NumericLiterals)
     //<Expects id="FS0951" span="(11,23-11,35)" status="error">Literal enumerations must have type int, uint, int16, uint16, int64, uint64, byte, sbyte or char</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/NumericLiterals", Includes=[|"E_enumNegativeLiterals009.fs"|])>]
-    let ``NumericLiterals - E_enumNegativeLiterals009.fs - --test:ErrorRanges`` compilation =
+    let ``NumericLiterals - E_enumNegativeLiterals009_fs - --test:ErrorRanges`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--test:ErrorRanges"]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicKeywords.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicKeywords.fs
index 3ce82e03521..998b961df7e 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicKeywords.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicKeywords.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.LexicalAnalysis
+namespace Conformance.LexicalAnalysis
 
 open Xunit
 open FSharp.Test
@@ -11,7 +11,7 @@ module SymbolicKeywords =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/SymbolicKeywords)
     //<Expects status="success"></Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/SymbolicKeywords", Includes=[|"GreaterThanClosedCurly01.fs"|])>]
-    let ``SymbolicKeywords - GreaterThanClosedCurly01.fs - `` compilation =
+    let ``SymbolicKeywords - GreaterThanClosedCurly01_fs - `` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -21,7 +21,7 @@ module SymbolicKeywords =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/SymbolicKeywords)
     //<Expects status="success"></Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/SymbolicKeywords", Includes=[|"GreaterThanClosedCurly02.fs"|])>]
-    let ``SymbolicKeywords - GreaterThanClosedCurly02.fs - `` compilation =
+    let ``SymbolicKeywords - GreaterThanClosedCurly02_fs - `` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -31,7 +31,7 @@ module SymbolicKeywords =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/SymbolicKeywords)
     //<Expects status="success"></Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/SymbolicKeywords", Includes=[|"GreaterThanClosedCurly03.fs"|])>]
-    let ``SymbolicKeywords - GreaterThanClosedCurly03.fs - `` compilation =
+    let ``SymbolicKeywords - GreaterThanClosedCurly03_fs - `` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -41,7 +41,7 @@ module SymbolicKeywords =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/SymbolicKeywords)
     //<Expects status="success"></Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/SymbolicKeywords", Includes=[|"GreaterThanClosedCurly04.fs"|])>]
-    let ``SymbolicKeywords - GreaterThanClosedCurly04.fs - `` compilation =
+    let ``SymbolicKeywords - GreaterThanClosedCurly04_fs - `` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -51,7 +51,7 @@ module SymbolicKeywords =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/SymbolicKeywords)
     //<Expects status="success"></Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/SymbolicKeywords", Includes=[|"GreaterThanClosedCurly05.fs"|])>]
-    let ``SymbolicKeywords - GreaterThanClosedCurly05.fs - `` compilation =
+    let ``SymbolicKeywords - GreaterThanClosedCurly05_fs - `` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -61,7 +61,7 @@ module SymbolicKeywords =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/SymbolicKeywords)
     //<Expects status="success"></Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/SymbolicKeywords", Includes=[|"GreaterThanClosedSquare01.fs"|])>]
-    let ``SymbolicKeywords - GreaterThanClosedSquare01.fs - `` compilation =
+    let ``SymbolicKeywords - GreaterThanClosedSquare01_fs - `` compilation =
         compilation
         |> asFsx
         |> typecheck
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicOperators.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicOperators.fs
index 20729626a3b..331086d940a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicOperators.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicOperators.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.LexicalAnalysis
+namespace Conformance.LexicalAnalysis
 
 open Xunit
 open FSharp.Test
@@ -10,7 +10,7 @@ module SymbolicOperators =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/SymbolicOperators)
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/SymbolicOperators", Includes=[|"GreaterThanDotParen01.fs"|])>]
-    let ``SymbolicOperators - GreaterThanDotParen01.fs - `` compilation =
+    let ``SymbolicOperators - GreaterThanDotParen01_fs - `` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -20,7 +20,7 @@ module SymbolicOperators =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/SymbolicOperators)
     //<Expects status="error" span="(13,7)" id="FS1208">Invalid operator definition\. Prefix operator definitions must use a valid prefix operator name\.$</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/SymbolicOperators", Includes=[|"E_GreaterThanDotParen01.fs"|])>]
-    let ``SymbolicOperators - E_GreaterThanDotParen01.fs - `` compilation =
+    let ``SymbolicOperators - E_GreaterThanDotParen01_fs - `` compilation =
         compilation
         |> asFsx
         |> compile
@@ -32,7 +32,7 @@ module SymbolicOperators =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/SymbolicOperators)
     //<Expects status="error" id="FS0670">This code is not sufficiently generic\. The type variable  \^T when  \^T : \(static member \( \+ \) :  \^T \*  \^T ->  \^a\) could not be generalized because it would escape its scope</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/SymbolicOperators", Includes=[|"E_LessThanDotOpenParen001.fs"|])>]
-    let ``SymbolicOperators - E_LessThanDotOpenParen001.fs - --flaterrors`` compilation =
+    let ``SymbolicOperators - E_LessThanDotOpenParen001_fs - --flaterrors`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--flaterrors"]
@@ -45,7 +45,7 @@ module SymbolicOperators =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/SymbolicOperators)
     //<Expects status="success"></Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/SymbolicOperators", Includes=[|"GreaterThanColon001.fs"|])>]
-    let ``SymbolicOperators - GreaterThanColon001.fs - `` compilation =
+    let ``SymbolicOperators - GreaterThanColon001_fs - `` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -55,7 +55,7 @@ module SymbolicOperators =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/SymbolicOperators)
     //<Expects status="success"></Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/LexicalAnalysis/SymbolicOperators", Includes=[|"E_GreaterThanColon002.fs"|])>]
-    let ``SymbolicOperators - E_GreaterThanColon002.fs - `` compilation =
+    let ``SymbolicOperators - E_GreaterThanColon002_fs - `` compilation =
         compilation
         |> asFsx
         |> typecheck
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HashLight/HashLight.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HashLight/HashLight.fs
index 472206028bb..8602b1e5633 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HashLight/HashLight.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HashLight/HashLight.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.LexicalFiltering
+namespace Conformance.LexicalFiltering
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HighPrecedenceApplication/HighPrecedenceApplication.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HighPrecedenceApplication/HighPrecedenceApplication.fs
index 9f96a5f5562..5665bbcd675 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HighPrecedenceApplication/HighPrecedenceApplication.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HighPrecedenceApplication/HighPrecedenceApplication.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.LexicalFiltering
+namespace Conformance.LexicalFiltering
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/OffsideExceptions/OffsideExceptions.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/OffsideExceptions/OffsideExceptions.fs
index ffc44b00032..c032a5bc19a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/OffsideExceptions/OffsideExceptions.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/OffsideExceptions/OffsideExceptions.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.LexicalFiltering.Basic
+namespace Conformance.LexicalFiltering
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple.fs
index 2d7f884d746..f5990494364 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.PatternMatching
+namespace Conformance.PatternMatching
 
 open Xunit
 open FSharp.Test
@@ -11,7 +11,7 @@ module Simple =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/PatternMatching/Simple)
     //<Expects id="FS0025" span="(92,13-92,14)" status="warning">Incomplete pattern matches on this expression. For example, the value 'Result \(_\)' may indicate a case not covered by the pattern\(s\)</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/PatternMatching/Simple", Includes=[|"W_Incomplete01.fs"|])>]
-    let ``Simple - W_Incomplete01.fs - --test:ErrorRanges`` compilation =
+    let ``Simple - W_Incomplete01_fs - --test:ErrorRanges`` compilation =
         compilation
         |> asFs
         |> withOptions ["--test:ErrorRanges"]
@@ -24,7 +24,7 @@ module Simple =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/PatternMatching/Simple)
     //<Expects id="FS0026" span="(32,11-32,13)" status="warning">This rule will never be matched</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/PatternMatching/Simple", Includes=[|"W_Incomplete02.fs"|])>]
-    let ``Simple - W_Incomplete02.fs - --test:ErrorRanges`` compilation =
+    let ``Simple - W_Incomplete02_fs - --test:ErrorRanges`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--test:ErrorRanges"]
@@ -37,7 +37,7 @@ module Simple =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/PatternMatching/Simple)
     //<Expects id="FS0049" span="(10,16-10,19)" status="warning">Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/PatternMatching/Simple", Includes=[|"W_BindCaptialIdent.fs"|])>]
-    let ``Simple - W_BindCaptialIdent.fs - --test:ErrorRanges`` compilation =
+    let ``Simple - W_BindCaptialIdent_fs - --test:ErrorRanges`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--test:ErrorRanges"]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Printing/Printing.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Printing/Printing.fs
index c7612e1576b..95c45c6f607 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Printing/Printing.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Printing/Printing.fs
@@ -1,5 +1,7 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-module FSharp.Compiler.ComponentTests.Conformance.Printing
+namespace Conformance.Printing
+
+module Basic =
 
     open Xunit
     open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PseudoCustomAttributes/PseudoCustomAttributes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PseudoCustomAttributes/PseudoCustomAttributes.fs
index e8d7dbe864e..f372668b108 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PseudoCustomAttributes/PseudoCustomAttributes.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PseudoCustomAttributes/PseudoCustomAttributes.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Globalization
+namespace Globalization
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/StructTypes/StructActivePatterns.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/StructTypes/StructActivePatterns.fs
deleted file mode 100644
index 1c0e4e63aed..00000000000
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/StructTypes/StructActivePatterns.fs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-
-module FSharp.Compiler.ComponentTests.Conformance.StructActivePatterns
-
-open Xunit
-open FSharp.Test
-open FSharp.Test.Compiler
-
-
-[<Fact>]
-let ``Struct active pattern is possible`` () =
-    Fs """
-[<return: Struct>]
-let rec (|IsOne|_|) someNumber = 
-    match someNumber with
-    | 1 -> ValueSome 1
-    | _ -> ValueNone   
-"""
-    |> withOptions ["--warnaserror+"]
-    |> typecheck
-    |> shouldSucceed
-
-[<Fact>]
-let ``Struct active pattern must not lie about its return value when using Struct attribute`` () =
-    Fs """
-[<return: Struct>]
-let rec (|IsOne|_|) someNumber = 
-    match someNumber with
-    | 1 -> Some 1
-    | _ -> None   
-"""
-    |> withOptions ["--warnaserror+"]
-    |> typecheck
-    |> shouldFail
-    |> withSingleDiagnostic (Error 1,Line 2, Col 1 , Line 3, Col 31, """This expression was expected to have type
-    ''a voption'    
-but here has type
-    'int option'    """)
-
-[<Fact>]
-let ``Voption active pattern fails if not using return:Struct attribute`` () =
-    Fs """
-let rec (|IsOne|_|) someNumber = 
-    match someNumber with
-    | 1 -> ValueSome 1
-    | _ -> ValueNone   
-"""
-    |> withOptions ["--warnaserror+"]
-    |> typecheck
-    |> shouldFail
-    |> withSingleDiagnostic (Error 1,Line 2, Col 9 , Line 2, Col 31, """This expression was expected to have type
-    ''a option'    
-but here has type
-    'int voption'    """)
-
-[<Fact>]
-let ``Rec struct active pattern is possible`` () =
-    Fs """
-[<return: Struct>]
-let rec (|HasOne|_|) xs = 
-    match xs with
-    | [] -> ValueNone
-    | h::_ when h = 1 -> ValueSome true
-    | _::tail ->
-        match tail with
-        | HasOne x -> ValueSome x
-        | _ -> ValueNone
-"""
-    |> withOptions ["--warnaserror+"]
-    |> typecheck
-    |> shouldSucceed
\ No newline at end of file
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/AnonymousRecords.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/AnonymousRecords.fs
similarity index 93%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/AnonymousRecords.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/AnonymousRecords.fs
index a45c92751a2..32ec8b2962e 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/AnonymousRecords.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/AnonymousRecords.fs
@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance
+namespace Conformance.Types
 
 open Xunit
-open FSharp.Test
 open FSharp.Test.Compiler
 
 module AnonymousRecord =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/BigRecord01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/BigRecord01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/BigRecord01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/BigRecord01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/DispatchSlot_Equals01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/DispatchSlot_Equals01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/DispatchSlot_Equals01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/DispatchSlot_Equals01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/DispatchSlot_GetHashCode.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/DispatchSlot_GetHashCode.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/DispatchSlot_GetHashCode.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/DispatchSlot_GetHashCode.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/DuckTypingRecords01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/DuckTypingRecords01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/DuckTypingRecords01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/DuckTypingRecords01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_InheritRecord01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_InheritRecord01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_InheritRecord01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_InheritRecord01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_Interface_IComparable.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Interface_IComparable.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_Interface_IComparable.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Interface_IComparable.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_Interface_IStructuralHash.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Interface_IStructuralHash.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_Interface_IStructuralHash.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Interface_IStructuralHash.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_MutableFields01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_MutableFields01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_MutableFields01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_MutableFields01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_RecordCloning01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_RecordCloning01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_RecordCloning01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_RecordCloning01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_RecordsNotNull01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_RecordsNotNull01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_RecordsNotNull01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_RecordsNotNull01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_RecordsNotNull02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_RecordsNotNull02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_RecordsNotNull02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_RecordsNotNull02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_Scoping01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Scoping01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_Scoping01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Scoping01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_Scoping02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Scoping02.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_Scoping02.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Scoping02.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_TypeInference01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_TypeInference01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_TypeInference01b.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference01b.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_TypeInference01b.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference01b.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_TypeInference02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_TypeInference02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_UnitType01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_UnitType01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/E_UnitType01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_UnitType01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/EqualAndBoxing01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/EqualAndBoxing01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/EqualAndBoxing01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/EqualAndBoxing01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/FieldBindingAfterWith01a.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/FieldBindingAfterWith01a.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/FieldBindingAfterWith01a.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/FieldBindingAfterWith01a.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/FieldBindingAfterWith01b.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/FieldBindingAfterWith01b.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/FieldBindingAfterWith01b.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/FieldBindingAfterWith01b.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/FullyQualify01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/FullyQualify01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/FullyQualify01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/FullyQualify01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/ImplicitEquals01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/ImplicitEquals01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/ImplicitEquals01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/ImplicitEquals01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Interface01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Interface01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Interface01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Interface01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Interface_Empty.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Interface_Empty.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Interface_Empty.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Interface_Empty.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Interface_IComparable.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Interface_IComparable.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Interface_IComparable.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Interface_IComparable.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/LongIdentifiers01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/LongIdentifiers01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/LongIdentifiers01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/LongIdentifiers01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Member01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Member01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Member01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Member01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/MutableFields01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/MutableFields01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/MutableFields01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/MutableFields01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/MutableFields_SampleFromSpec02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/MutableFields_SampleFromSpec02.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/MutableFields_SampleFromSpec02.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/MutableFields_SampleFromSpec02.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/NoClashMemberIFaceMember.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/NoClashMemberIFaceMember.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/NoClashMemberIFaceMember.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/NoClashMemberIFaceMember.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Overload_Equals.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Overload_Equals.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Overload_Equals.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Overload_Equals.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Overload_GetHashCode.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Overload_GetHashCode.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Overload_GetHashCode.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Overload_GetHashCode.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Overload_ToString.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Overload_ToString.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Overload_ToString.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Overload_ToString.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/RecordCloning01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/RecordCloning01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/RecordCloning01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/RecordCloning01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/RecordCloning02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/RecordCloning02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/RecordCloning02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/RecordCloning02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/RecordCloning03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/RecordCloning03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/RecordCloning03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/RecordCloning03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/RecordTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/RecordTypes.fs
similarity index 99%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/RecordTypes.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/RecordTypes.fs
index bfd7f87ce75..241e834c8fe 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/RecordTypes.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/RecordTypes.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance
+namespace Conformance.Types
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/SampleFromSpec01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/SampleFromSpec01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/SampleFromSpec01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/SampleFromSpec01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/SampleFromSpec03.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/SampleFromSpec03.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/SampleFromSpec03.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/SampleFromSpec03.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Scoping03.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Scoping03.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Scoping03.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Scoping03.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Scoping04.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Scoping04.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Scoping04.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Scoping04.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/StructRecordCloning01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/StructRecordCloning01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/StructRecordCloning01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/StructRecordCloning01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/StructRecordCloning02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/StructRecordCloning02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/StructRecordCloning02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/StructRecordCloning02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/StructRecordCloning03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/StructRecordCloning03.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/StructRecordCloning03.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/StructRecordCloning03.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Syntax01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Syntax01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/Syntax01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/Syntax01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/TypeInference01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/TypeInference01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/TypeInference01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/TypeInference01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/TypeInference02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/TypeInference02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/TypeInference02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/TypeInference02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/UnitType01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/UnitType01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/UnitType01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/UnitType01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/W_Overrides01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/W_Overrides01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/RecordTypes/W_Overrides01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/W_Overrides01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/StructTypes/Overload_Equals.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/StructTypes/Overload_Equals.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/StructTypes/Overload_Equals.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/StructTypes/Overload_Equals.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/StructTypes/Overload_GetHashCode.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/StructTypes/Overload_GetHashCode.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/StructTypes/Overload_GetHashCode.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/StructTypes/Overload_GetHashCode.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/StructTypes/Overload_ToString.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/StructTypes/Overload_ToString.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/StructTypes/Overload_ToString.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/StructTypes/Overload_ToString.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/StructTypes/StructActivePatterns.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/StructTypes/StructActivePatterns.fs
new file mode 100644
index 00000000000..2d9a31d2c7b
--- /dev/null
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/StructTypes/StructActivePatterns.fs
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+namespace Conformance.Types
+
+module StructActivePatterns =
+
+    open Xunit
+    open FSharp.Test
+    open FSharp.Test.Compiler
+
+
+    [<Fact>]
+    let ``Struct active pattern is possible`` () =
+        Fs """
+[<return: Struct>]
+let rec (|IsOne|_|) someNumber = 
+    match someNumber with
+    | 1 -> ValueSome 1
+    | _ -> ValueNone   
+"""
+        |> withOptions ["--warnaserror+"]
+        |> typecheck
+        |> shouldSucceed
+
+    [<Fact>]
+    let ``Struct active pattern must not lie about its return value when using Struct attribute`` () =
+        Fs """
+[<return: Struct>]
+let rec (|IsOne|_|) someNumber = 
+    match someNumber with
+    | 1 -> Some 1
+    | _ -> None   
+"""
+        |> withOptions ["--warnaserror+"]
+        |> typecheck
+        |> shouldFail
+        |> withSingleDiagnostic (Error 1,Line 2, Col 1 , Line 3, Col 31, """This expression was expected to have type
+    ''a voption'    
+but here has type
+    'int option'    """)
+
+    [<Fact>]
+    let ``Voption active pattern fails if not using return:Struct attribute`` () =
+        Fs """
+let rec (|IsOne|_|) someNumber = 
+    match someNumber with
+    | 1 -> ValueSome 1
+    | _ -> ValueNone   
+"""
+        |> withOptions ["--warnaserror+"]
+        |> typecheck
+        |> shouldFail
+        |> withSingleDiagnostic (Error 1,Line 2, Col 9 , Line 2, Col 31, """This expression was expected to have type
+    ''a option'    
+but here has type
+    'int voption'    """)
+
+    [<Fact>]
+    let ``Rec struct active pattern is possible`` () =
+        Fs """
+[<return: Struct>]
+let rec (|HasOne|_|) xs = 
+    match xs with
+    | [] -> ValueNone
+    | h::_ when h = 1 -> ValueSome true
+    | _::tail ->
+        match tail with
+        | HasOne x -> ValueSome x
+        | _ -> ValueNone
+"""
+        |> withOptions ["--warnaserror+"]
+        |> typecheck
+        |> shouldSucceed
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/StructTypes/StructTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/StructTypes/StructTypes.fs
similarity index 96%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/StructTypes/StructTypes.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/StructTypes/StructTypes.fs
index ae359ef4484..95f228de96a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/StructTypes/StructTypes.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/StructTypes/StructTypes.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance
+namespace Conformance.Types
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/CheckingSyntacticTypes/CheckingSyntacticTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/CheckingSyntacticTypes/CheckingSyntacticTypes.fs
similarity index 95%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/CheckingSyntacticTypes/CheckingSyntacticTypes.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/CheckingSyntacticTypes/CheckingSyntacticTypes.fs
index 5cde8ad2597..60d9132f5e4 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/CheckingSyntacticTypes/CheckingSyntacticTypes.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/CheckingSyntacticTypes/CheckingSyntacticTypes.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.TypesAndTypeConstraints
+namespace Conformance.Types
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/CheckingSyntacticTypes/E_CannotInlineVirtualMethod2.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/CheckingSyntacticTypes/E_CannotInlineVirtualMethod2.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/CheckingSyntacticTypes/E_CannotInlineVirtualMethod2.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/CheckingSyntacticTypes/E_CannotInlineVirtualMethod2.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/CheckingSyntacticTypes/E_CannotInlineVirtualMethods1.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/CheckingSyntacticTypes/E_CannotInlineVirtualMethods1.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/CheckingSyntacticTypes/E_CannotInlineVirtualMethods1.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/CheckingSyntacticTypes/E_CannotInlineVirtualMethods1.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/IWSAMsAndSRTPsTests.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/IWSAMsAndSRTPsTests.fs
similarity index 90%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/IWSAMsAndSRTPsTests.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/IWSAMsAndSRTPsTests.fs
index 2f55c8c7c32..63c78877f81 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/IWSAMsAndSRTPsTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/IWSAMsAndSRTPsTests.fs
@@ -1,37 +1,38 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-module FSharp.Compiler.ComponentTests.Conformance.TypeAndTypeConstraints.IWSAMsAndSRTPs
+namespace Conformance.Types
 
 open Xunit
 open System.IO
 open FSharp.Test
 open FSharp.Test.Compiler
 
-let typesModule =
-    FSharp (loadSourceFromFile (Path.Combine(__SOURCE_DIRECTORY__,  "Types.fs")))
-    |> withName "Types"
-    |> withLangVersion70
-    |> withOptions ["--nowarn:3535"]
+module TypesAndTypeConstraints_IWSAMsAndSRTPs =
 
-let setupCompilation compilation =
-    compilation
-    |> asExe
-    |> withLangVersion70
-    |> withReferences [typesModule]
+    let typesModule =
+        FSharp (loadSourceFromFile (Path.Combine(__SOURCE_DIRECTORY__,  "Types.fs")))
+        |> withName "Types"
+        |> withLangVersion70
+        |> withOptions ["--nowarn:3535"]
 
+    let setupCompilation compilation =
+        compilation
+        |> asExe
+        |> withLangVersion70
+        |> withReferences [typesModule]
 
-[<Fact>]
-let ``Srtp call Zero property returns valid result`` () =
-    Fsx """
+    [<Fact>]
+    let ``Srtp call Zero property returns valid result`` () =
+        Fsx """
 let inline zero<'T when 'T: (static member Zero: 'T)> = 'T.Zero
 let result = zero<int>
 if result <> 0 then failwith $"Something's wrong: {result}"
-    """
-    |> runFsi
-    |> shouldSucceed
+        """
+        |> runFsi
+        |> shouldSucceed
 
-[<Fact>]
-let ``Srtp call to custom property returns valid result`` () =
-    FSharp """
+    [<Fact>]
+    let ``Srtp call to custom property returns valid result`` () =
+        FSharp """
 module Foo
 type Foo = 
     static member Bar = 1
@@ -47,73 +48,72 @@ let main _ =
     if result <> 0 then
         failwith $"Unexpected result: {result}"
     0
-    """
-    |> asExe
-    |> compileAndRun
+        """
+        |> asExe
+        |> compileAndRun
 
 #if !NETCOREAPP
-[<Theory(Skip = "IWSAMs are not supported by NET472.")>]
+    [<Theory(Skip = "IWSAMs are not supported by NET472.")>]
 #else
-[<Theory; Directory(__SOURCE_DIRECTORY__ + "/testFiles")>]
+    [<Theory; Directory(__SOURCE_DIRECTORY__ + "/testFiles")>]
 #endif
-let ``IWSAM test files`` compilation =
-    compilation
-    |> setupCompilation
-    |> withLangVersionPreview
-    |> compileAndRun
-    |> shouldSucceed
-
-[<Theory>]
-[<InlineData("let inline f0 (x: ^T) = x",
-             "val inline f0: x: ^T -> ^T")>]
-[<InlineData("""
-             let inline f0 (x: ^T) = x
-             let g0 (x: 'T) = f0 x""",
-             "val g0: x: 'T -> 'T")>]
-
-[<InlineData("let inline f1 (x: ^T) = (^T : (static member A: int) ())",
-             "val inline f1: x: ^T -> int when ^T: (static member A: int)")>]
-
-[<InlineData("let inline f2 (x: 'T) = ((^T or int) : (static member A: int) ())",
-             "val inline f2: x: ^T -> int when (^T or int) : (static member A: int)")>]
-
-[<InlineData("let inline f3 (x: 'T) = ((^U or 'T) : (static member A: int) ())",
-             "val inline f3: x: ^T -> int when (^U or ^T) : (static member A: int)")>]
-
-[<InlineData("let inline f4 (x: 'T when 'T : (static member A: int) ) = 'T.A",
-             "val inline f4: x: ^T -> int when ^T: (static member A: int)")>]
-[<InlineData("""
+    let ``IWSAM test files`` compilation =
+        compilation
+        |> setupCompilation
+        |> withLangVersionPreview
+        |> compileAndRun
+        |> shouldSucceed
+
+    [<Theory>]
+    [<InlineData("let inline f0 (x: ^T) = x",
+                 "val inline f0: x: ^T -> ^T")>]
+
+    [<InlineData("""
+                 let inline f0 (x: ^T) = x
+                 let g0 (x: 'T) = f0 x""",
+                 "val g0: x: 'T -> 'T")>]
+
+    [<InlineData("let inline f1 (x: ^T) = (^T : (static member A: int) ())",
+                 "val inline f1: x: ^T -> int when ^T: (static member A: int)")>]
+
+    [<InlineData("let inline f2 (x: 'T) = ((^T or int) : (static member A: int) ())",
+                 "val inline f2: x: ^T -> int when (^T or int) : (static member A: int)")>]
+
+    [<InlineData("let inline f3 (x: 'T) = ((^U or 'T) : (static member A: int) ())",
+                 "val inline f3: x: ^T -> int when (^U or ^T) : (static member A: int)")>]
+
+    [<InlineData("let inline f4 (x: 'T when 'T : (static member A: int) ) = 'T.A",
+                "val inline f4: x: ^T -> int when ^T: (static member A: int)")>]
+
+    [<InlineData("""
              let inline f5 (x: ^T) = printfn "%d" x
              let g5 (x: 'T) = f5 x""",
-             "val g5: x: int -> unit")>]
-[<InlineData("""
+                 "val g5: x: int -> unit")>]
+    [<InlineData("""
              let inline f5 (x: ^T) = printfn "%d" x
              let inline h5 (x: 'T) = f5 x""",
-             "val inline h5: x: ^T -> unit when ^T: (byte|int16|int32|int64|sbyte|uint16|uint32|uint64|nativeint|unativeint)")>]
-[<InlineData("""
+                 "val inline h5: x: ^T -> unit when ^T: (byte|int16|int32|int64|sbyte|uint16|uint32|uint64|nativeint|unativeint)")>]
+    [<InlineData("""
              let inline uint32 (value: ^T) = (^T : (static member op_Explicit: ^T -> uint32) (value))
              let inline uint value = uint32 value""",
-             "val inline uint: value: ^a -> uint32 when ^a: (static member op_Explicit: ^a -> uint32)")>]
-
-[<InlineData("let checkReflexive f x y = (f x y = - f y x)",
-             "val checkReflexive: f: ('a -> 'a -> int) -> x: 'a -> y: 'a -> bool")>]
-let ``Check static type parameter inference`` code expectedSignature =
-    FSharp code
-    |> ignoreWarnings
-    |> withLangVersion70
-    |> signaturesShouldContain expectedSignature
+                 "val inline uint: value: ^a -> uint32 when ^a: (static member op_Explicit: ^a -> uint32)")>]
 
+    [<InlineData("let checkReflexive f x y = (f x y = - f y x)",
+                 "val checkReflexive: f: ('a -> 'a -> int) -> x: 'a -> y: 'a -> bool")>]
+    let ``Check static type parameter inference`` code expectedSignature =
+        FSharp code
+        |> ignoreWarnings
+        |> withLangVersion70
+        |> signaturesShouldContain expectedSignature
 
-[<Fact>]
-let ``Static type parameter inference in version 6`` () =
-    FSharp """
+    [<Fact>]
+    let ``Static type parameter inference in version 6`` () =
+        FSharp """
         let inline f0 (x: ^T) = x
         let g0 (x: 'T) = f0 x"""
-    |> withLangVersion60
-    |> signaturesShouldContain "val g0: x: obj -> obj"
-
+        |> withLangVersion60
+        |> signaturesShouldContain "val g0: x: obj -> obj"
 
-module ``Equivalence of properties and getters`` =
 
     [<Theory>]
     [<InlineData("let inline f_StaticProperty<'T when 'T : (static member StaticProperty: int) >() = (^T : (static member StaticProperty: int) ())")>]
@@ -320,8 +320,6 @@ module ``Equivalence of properties and getters`` =
             IL_000e:  ret
           }"""]
 
-module ``Type checking behavior`` =   
-
     #if !NETCOREAPP
     [<Theory(Skip = "IWSAMs are not supported by NET472.")>]
     #else   
@@ -343,8 +341,6 @@ module ``Type checking behavior`` =
         |> compile
         |> shouldSucceed
 
-module Negative =
-
     [<Theory>]
     [<InlineData("let inline f_TraitWithOptional<'T when 'T : (static member StaticMethod: ?x: int -> int) >() = ()")>]
     [<InlineData("let inline f_TraitWithIn<'T when 'T : (static member StaticMethod: x: inref<int> -> int) >() = ()")>]
@@ -373,7 +369,6 @@ module Negative =
         |> withDiagnosticMessage errorMessage
         |> ignore
 
-
     [<FactForNETCOREAPP>]
     let ``IWSAM warning`` () =
         Fsx "let fExpectAWarning(x: Types.ISinOperator<'T>) = ()"
@@ -393,8 +388,6 @@ module Negative =
         |> withDiagnosticMessage "The trait 'A' invoked by this call has multiple support types. This invocation syntax is not permitted for such traits. See https://aka.ms/fsharp-srtp for guidance."
         |> ignore
 
-module InvocationBehavior =
-
     [<Fact>]
     let ``SRTP Delegate conversion not supported`` () =
         Fsx "let inline f_TraitWithDelegate<'T when 'T : (static member StaticMethod: x: System.Func<int,int> -> int) >() =
@@ -461,9 +454,6 @@ module InvocationBehavior =
         |> compile
         |> shouldSucceed
 
-
-module ``SRTP byref tests`` =
-
     [<Fact>]
     let ``Call with old syntax`` () =
         Fsx """
@@ -547,7 +537,7 @@ module ``SRTP byref tests`` =
         |> withDiagnosticMessageMatches "This expression was expected to have type\\s+'byref<C5>'\\s+but here has type\\s+'C5'"
 
     [<Fact>]
-    let ``Byref returns not allowed pt. 2`` () =
+    let ``Byref returns not allowed pt 2`` () =
         Fsx """
         type C6() =
             static member X(p: C6 byref) = &p
@@ -561,9 +551,6 @@ module ``SRTP byref tests`` =
         |> shouldFail
         |> withDiagnosticMessageMatches "This expression was expected to have type\\s+'byref<C6>'\\s+but here has type\\s+'C6'"
 
-
-module ``Implicit conversion`` =
-
     let library =
         FSharp
             """
@@ -639,9 +626,6 @@ module ``Implicit conversion`` =
         |> compile
         |> shouldSucceed
 
-
-module ``Nominal type after or`` =
-
     [<Fact>]
     let ``Nominal type can be used after or`` () =
         Fsx
@@ -701,9 +685,7 @@ module ``Nominal type after or`` =
         |> compileAndRun
         |> shouldSucceed
 
-module ``Active patterns`` =
-
-    let library =
+    let library2 =
         FSharp """
         module Potato.Lib
             type IPotato<'T when 'T :> IPotato<'T>> =
@@ -725,7 +707,7 @@ module ``Active patterns`` =
         |> withOptions ["--nowarn:3535"]
 
     [<FactForNETCOREAPP>]
-    let ``Using IWSAM in active pattern`` () =
+    let ``Active patterns- Using IWSAM in active pattern`` () =
         FSharp """
             module Potato.Test
 
@@ -736,7 +718,7 @@ module ``Active patterns`` =
             match Potato() with GoodPotato -> () | _ -> failwith "Unexpected result"
             match Rock() with GoodPotato -> failwith "Unexpected result" | _ -> ()
             """
-        |> withReferences [library]
+        |> withReferences [library2]
         |> withLangVersion70
         |> compileExeAndRun
         |> shouldSucceed
@@ -755,7 +737,7 @@ module ``Active patterns`` =
         ]
 
     [<FactForNETCOREAPP>]
-    let ``Using IWSAM equality in active pattern uses generic equality intrinsic`` () =
+    let ``Active patterns - Using IWSAM equality in active pattern uses generic equality intrinsic`` () =
         FSharp """
             module Potato.Test
 
@@ -770,7 +752,7 @@ module ``Active patterns`` =
             | IsEqual -> failwith "Unexpected result"
             | IsNonEqual -> ()
             """
-        |> withReferences [library]
+        |> withReferences [library2]
         |> withLangVersion70
         |> asExe
         |> compileAndRun
@@ -790,10 +772,8 @@ module ``Active patterns`` =
             """
         ]
 
-module ``Suppression of System Numerics interfaces on unitized types`` =
-
     [<FactForNETCOREAPP>]
-    let Baseline () =
+    let ``Suppression of System Numerics interfaces on unitized types`` () =
         Fsx """
             open System.Numerics
             let f (x: 'T when 'T :> IMultiplyOperators<'T,'T,'T>) = x;;
@@ -835,7 +815,7 @@ module ``Suppression of System Numerics interfaces on unitized types`` =
     [<InlineData("IUnaryNegationOperators", 2)>]
     [<InlineData("IUnaryPlusOperators", 2)>]
 #endif
-    let ``Unitized type shouldn't be compatible with System.Numerics.I*`` name paramCount =
+    let ``Unitized type shouldn't be compatible with System_Numerics_I*`` name paramCount =
         let typeParams = Seq.replicate paramCount "'T" |> String.concat ","
         let genericType = $"{name}<{typeParams}>"
         let potatoParams = Seq.replicate paramCount "float<potato>" |> String.concat ","
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/Types.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/Types.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/Types.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/Types.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/testFiles/BasicTests.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/testFiles/BasicTests.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/testFiles/BasicTests.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/testFiles/BasicTests.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/testFiles/CheckNewSyntax.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/testFiles/CheckNewSyntax.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/testFiles/CheckNewSyntax.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/testFiles/CheckNewSyntax.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/testFiles/CheckSelfConstrainedIWSAM.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/testFiles/CheckSelfConstrainedIWSAM.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/testFiles/CheckSelfConstrainedIWSAM.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/testFiles/CheckSelfConstrainedIWSAM.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/testFiles/CheckSelfConstrainedSRTP.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/testFiles/CheckSelfConstrainedSRTP.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/testFiles/CheckSelfConstrainedSRTP.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/testFiles/CheckSelfConstrainedSRTP.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/testFiles/TestLegacyThingsThatRegressedDuringRFC.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/testFiles/TestLegacyThingsThatRegressedDuringRFC.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/testFiles/TestLegacyThingsThatRegressedDuringRFC.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/testFiles/TestLegacyThingsThatRegressedDuringRFC.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/testFiles/UseSRTPFromIWSAMGenericCode.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/testFiles/UseSRTPFromIWSAMGenericCode.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/testFiles/UseSRTPFromIWSAMGenericCode.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/IWSAMsAndSRTPs/testFiles/UseSRTPFromIWSAMGenericCode.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/LogicalPropertiesOfTypes/LogicalPropertiesOfTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/LogicalPropertiesOfTypes/LogicalPropertiesOfTypes.fs
similarity index 81%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/LogicalPropertiesOfTypes/LogicalPropertiesOfTypes.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/LogicalPropertiesOfTypes/LogicalPropertiesOfTypes.fs
index 5862e786a3a..e12f72cd76b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/LogicalPropertiesOfTypes/LogicalPropertiesOfTypes.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/LogicalPropertiesOfTypes/LogicalPropertiesOfTypes.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.TypesAndTypeConstraints
+namespace Conformance.Types
 
 open Xunit
 open FSharp.Test
@@ -10,7 +10,7 @@ module LogicalPropertiesOfTypes =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/TypesAndTypeConstraints/LogicalPropertiesOfTypes)
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"TypeWithNullLiteral_NetRef.fsx"|])>]
-    let ``TypeWithNullLiteral_NetRef.fsx`` compilation =
+    let ``TypeWithNullLiteral_NetRef_fsx`` compilation =
         compilation
         |> asFsx
         |> withOptions ["-a"]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/LogicalPropertiesOfTypes/TypeWithNullLiteral_NetRef.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/LogicalPropertiesOfTypes/TypeWithNullLiteral_NetRef.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/LogicalPropertiesOfTypes/TypeWithNullLiteral_NetRef.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/TypeConstraints/LogicalPropertiesOfTypes/TypeWithNullLiteral_NetRef.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/BeginWithUppercase01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/BeginWithUppercase01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/BeginWithUppercase01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/BeginWithUppercase01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/DispatchSlot_Equals01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/DispatchSlot_Equals01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/DispatchSlot_Equals01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/DispatchSlot_Equals01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/DispatchSlot_GetHashCode.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/DispatchSlot_GetHashCode.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/DispatchSlot_GetHashCode.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/DispatchSlot_GetHashCode.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_BeginWithUppercase01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_BeginWithUppercase01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_BeginWithUppercase02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase02.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_BeginWithUppercase02.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase02.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_BeginWithUppercase03.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase03.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_BeginWithUppercase03.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase03.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_BeginWithUppercase04.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase04.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_BeginWithUppercase04.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase04.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_BeginWithUppercaseNoPipe01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercaseNoPipe01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_BeginWithUppercaseNoPipe01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercaseNoPipe01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_DuplicateUnionCase01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_DuplicateUnionCase01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_DuplicateUnionCase01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_DuplicateUnionCase01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_FieldMemberClash.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_FieldMemberClash.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_FieldMemberClash.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_FieldMemberClash.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_FieldNameUsedMulti.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_FieldNameUsedMulti.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_FieldNameUsedMulti.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_FieldNameUsedMulti.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_GenericFunctionValuedStaticProp01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_GenericFunctionValuedStaticProp01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_GenericFunctionValuedStaticProp01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_GenericFunctionValuedStaticProp01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_InheritUnion.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_InheritUnion.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_InheritUnion.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_InheritUnion.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_Interface_IComparable.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Interface_IComparable.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_Interface_IComparable.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Interface_IComparable.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_Interface_IStructuralHash.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Interface_IStructuralHash.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_Interface_IStructuralHash.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Interface_IStructuralHash.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_LowercaseDT.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_LowercaseDT.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_LowercaseDT.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_LowercaseDT.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_LowercaseWhenRequireQualifiedAccess.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_LowercaseWhenRequireQualifiedAccess.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_LowercaseWhenRequireQualifiedAccess.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_LowercaseWhenRequireQualifiedAccess.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_Member_Duplicate01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Member_Duplicate01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_Member_Duplicate01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Member_Duplicate01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_Overload_Equals.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Overload_Equals.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_Overload_Equals.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Overload_Equals.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_Overload_GetHashCode.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Overload_GetHashCode.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_Overload_GetHashCode.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Overload_GetHashCode.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_SampleFromSpec01d.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_SampleFromSpec01d.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_SampleFromSpec01d.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_SampleFromSpec01d.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_SampleFromSpec01d2.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_SampleFromSpec01d2.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_SampleFromSpec01d2.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_SampleFromSpec01d2.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_ScopeAndDataConstrAndPattern01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_ScopeAndDataConstrAndPattern01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_ScopeAndDataConstrAndPattern01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_ScopeAndDataConstrAndPattern01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionConstructorBadFieldName.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionConstructorBadFieldName.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionConstructorBadFieldName.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionConstructorBadFieldName.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionFieldConflictingName.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionFieldConflictingName.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionFieldConflictingName.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionFieldConflictingName.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionFieldNamedTag.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionFieldNamedTag.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionFieldNamedTag.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionFieldNamedTag.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionFieldNamedTagNoDefault.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionFieldNamedTagNoDefault.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionFieldNamedTagNoDefault.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionFieldNamedTagNoDefault.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionMemberNamedTag.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionMemberNamedTag.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionMemberNamedTag.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionMemberNamedTag.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionMemberNamedTagNoDefault.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionMemberNamedTagNoDefault.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionMemberNamedTagNoDefault.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionMemberNamedTagNoDefault.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionMemberNamedTags.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionMemberNamedTags.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionMemberNamedTags.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionMemberNamedTags.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionMemberNamedTagsNoDefault.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionMemberNamedTagsNoDefault.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionMemberNamedTagsNoDefault.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionMemberNamedTagsNoDefault.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionsNotNull01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionsNotNull01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/E_UnionsNotNull01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionsNotNull01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/EqualAndBoxing01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/EqualAndBoxing01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/EqualAndBoxing01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/EqualAndBoxing01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/ImplicitEquals001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/ImplicitEquals001.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/ImplicitEquals001.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/ImplicitEquals001.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Interface01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Interface01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Interface01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Interface01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Interface_IComparable.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Interface_IComparable.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Interface_IComparable.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Interface_IComparable.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/LowercaseWhenRequireQualifiedAccess.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/LowercaseWhenRequireQualifiedAccess.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/LowercaseWhenRequireQualifiedAccess.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/LowercaseWhenRequireQualifiedAccess.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Member01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Member01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Member01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Member01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/NamedFields01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/NamedFields01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/NamedFields01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/NamedFields01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/NamedFields02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/NamedFields02.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/NamedFields02.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/NamedFields02.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/NamedFields03.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/NamedFields03.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/NamedFields03.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/NamedFields03.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Overload_Equals.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Overload_Equals.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Overload_Equals.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Overload_Equals.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Overload_GetHashCode.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Overload_GetHashCode.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Overload_GetHashCode.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Overload_GetHashCode.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Overload_ToString.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Overload_ToString.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Overload_ToString.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Overload_ToString.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Overrides01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Overrides01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Overrides01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Overrides01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Parenthesis01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Parenthesis01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Parenthesis01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Parenthesis01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Parenthesis02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Parenthesis02.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Parenthesis02.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Parenthesis02.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Parenthesis03.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Parenthesis03.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Parenthesis03.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Parenthesis03.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Recursive01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Recursive01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/Recursive01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/Recursive01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/ReflectionOnUnionTypes01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/ReflectionOnUnionTypes01.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/ReflectionOnUnionTypes01.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/ReflectionOnUnionTypes01.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/SampleFromSpec01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/SampleFromSpec01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/SampleFromSpec01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/SampleFromSpec01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/SampleFromSpec01b.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/SampleFromSpec01b.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/SampleFromSpec01b.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/SampleFromSpec01b.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/SampleFromSpec01d.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/SampleFromSpec01d.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/SampleFromSpec01d.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/SampleFromSpec01d.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/ScopeAndDataConstrAndPattern01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/ScopeAndDataConstrAndPattern01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/ScopeAndDataConstrAndPattern01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/ScopeAndDataConstrAndPattern01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/UnionCaseProduction01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionCaseProduction01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/UnionCaseProduction01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionCaseProduction01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/UnionCasesProduction01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionCasesProduction01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/UnionCasesProduction01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionCasesProduction01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/MultiCaseUnionStructTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionStructTypes.fs
similarity index 99%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/MultiCaseUnionStructTypes.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionStructTypes.fs
index 3d06c3704ae..b22653ee742 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/MultiCaseUnionStructTypes.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionStructTypes.fs
@@ -1,10 +1,10 @@
-namespace FSharp.Compiler.ComponentTests.Conformance
+namespace Conformance.Types
 
 open Xunit
 open FSharp.Test.Compiler
 
-module MultiCaseUnionStructTypes =
-  
+module UnionStructTypes =
+
     [<Fact>]
     let ``If a union type has more than one case and is a struct, field must be given unique name 1`` () =
         Fsx """
@@ -618,7 +618,7 @@ type StructUnion =
         |> shouldSucceed
         
     [<Fact>]
-    let ``If a union type has more than one case and is a struct, field must be given unique name. involves an immediate cyclic reference`` () =
+    let ``If a union type has more than one case and is a struct, field must be given unique name involves an immediate cyclic reference`` () =
         Fsx """
 namespace Foo
 [<Struct>]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/UnionTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionTypes.fs
similarity index 99%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/UnionTypes.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionTypes.fs
index 543253ce889..e70d07239d1 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/UnionTypes.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionTypes.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance
+namespace Conformance.Types
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/UnionsNotNull02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionsNotNull02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/UnionsNotNull02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/UnionsNotNull02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/W_GenericFunctionValuedStaticProp02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/W_GenericFunctionValuedStaticProp02.fs
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/W_GenericFunctionValuedStaticProp02.fs
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/W_GenericFunctionValuedStaticProp02.fs
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/W_SampleFromSpec01c.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/W_SampleFromSpec01c.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/W_SampleFromSpec01c.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/W_SampleFromSpec01c.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/W_UnionCaseProduction01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/W_UnionCaseProduction01.fsx
similarity index 100%
rename from tests/FSharp.Compiler.ComponentTests/Conformance/UnionTypes/W_UnionCaseProduction01.fsx
rename to tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/W_UnionCaseProduction01.fsx
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Basic.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Basic.fs
index 4475355f142..da86f949265 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Basic.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Basic.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.UnitsOfMeasure
+namespace Conformance.UnitsOfMeasure
 
 open Xunit
 open FSharp.Test
@@ -10,7 +10,7 @@ module Basic =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/UnitsOfMeasure/Basic)
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/UnitsOfMeasure/Basic", Includes=[|"Misc01.fs"|])>]
-    let ``Basic - Misc01.fs - `` compilation =
+    let ``Basic - Misc01_fs`` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -19,7 +19,7 @@ module Basic =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/UnitsOfMeasure/Basic)
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/UnitsOfMeasure/Basic", Includes=[|"Misc03.fs"|])>]
-    let ``Basic - Misc03.fs - `` compilation =
+    let ``Basic - Misc03_fs`` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -28,7 +28,7 @@ module Basic =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/UnitsOfMeasure/Basic)
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/UnitsOfMeasure/Basic", Includes=[|"Stats.fs"|])>]
-    let ``Basic - Stats.fs - `` compilation =
+    let ``Basic - Stats_fs`` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -37,7 +37,7 @@ module Basic =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/UnitsOfMeasure/Basic)
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/UnitsOfMeasure/Basic", Includes=[|"SI.fs"|])>]
-    let ``Basic - SI.fs - `` compilation =
+    let ``Basic - SI_fs`` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -46,7 +46,7 @@ module Basic =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/UnitsOfMeasure/Basic)
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/UnitsOfMeasure/Basic", Includes=[|"RationalExponents01.fs"|])>]
-    let ``Basic - RationalExponents01.fs - `` compilation =
+    let ``Basic - RationalExponents01_fs`` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -55,7 +55,7 @@ module Basic =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/UnitsOfMeasure/Basic)
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/UnitsOfMeasure/Basic", Includes=[|"Quotation04_hidden.fs"|])>]
-    let ``Basic - Quotation04_hidden.fs - `` compilation =
+    let ``Basic - Quotation04_hidden_fs`` compilation =
         compilation
         |> asFsx
         |> typecheck
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Diagnostics.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Diagnostics.fs
index 486ba532c2e..df101be4a31 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Diagnostics.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Diagnostics.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.UnitsOfMeasure
+namespace Conformance.UnitsOfMeasure
 
 open Xunit
 open FSharp.Test
@@ -11,7 +11,7 @@ module Diagnostics =
     // This test was automatically generated (moved from FSharpQA suite - Conformance/UnitsOfMeasure/Diagnostics)
     //<Expects status="success"></Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/UnitsOfMeasure/Diagnostics", Includes=[|"RangeExpression01.fs"|])>]
-    let ``Diagnostics - RangeExpression01.fs - --test:ErrorRanges`` compilation =
+    let ``Diagnostics - RangeExpression01_fs - --test:ErrorRanges`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--test:ErrorRanges"]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Parsing.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Parsing.fs
index 5ae96be988d..6dc46f8013f 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Parsing.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Parsing.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.UnitsOfMeasure
+namespace Conformance.UnitsOfMeasure
 
 open Xunit
 open FSharp.Test
@@ -10,7 +10,7 @@ module Parsing =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/UnitsOfMeasure/Parsing)
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/UnitsOfMeasure/Parsing", Includes=[|"GreaterBarRBrack01.fs"|])>]
-    let ``Parsing - GreaterBarRBrack01.fs - `` compilation =
+    let ``Parsing - GreaterBarRBrack01_fs`` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -19,7 +19,7 @@ module Parsing =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/UnitsOfMeasure/Parsing)
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/UnitsOfMeasure/Parsing", Includes=[|"Reciprocal01.fs"|])>]
-    let ``Parsing - Reciprocal01.fs - `` compilation =
+    let ``Parsing - Reciprocal01_fs`` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -28,7 +28,7 @@ module Parsing =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/UnitsOfMeasure/Parsing)
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/UnitsOfMeasure/Parsing", Includes=[|"QuotientAssoc.fs"|])>]
-    let ``Parsing - QuotientAssoc.fs - `` compilation =
+    let ``Parsing - QuotientAssoc_fs`` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -37,7 +37,7 @@ module Parsing =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/UnitsOfMeasure/Parsing)
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/UnitsOfMeasure/Parsing", Includes=[|"Quotient.fs"|])>]
-    let ``Parsing - Quotient.fs - `` compilation =
+    let ``Parsing - Quotient_fs`` compilation =
         compilation
         |> asFsx
         |> typecheck
@@ -46,7 +46,7 @@ module Parsing =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/UnitsOfMeasure/Parsing)
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/UnitsOfMeasure/Parsing", Includes=[|"PowerSynonym.fs"|])>]
-    let ``Parsing - PowerSynonym.fs - `` compilation =
+    let ``Parsing - PowerSynonym_fs`` compilation =
         compilation
         |> asFsx
         |> typecheck
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/TypeChecker.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/TypeChecker.fs
index 97f92edec58..34d3de20940 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/TypeChecker.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/TypeChecker.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.UnitsOfMeasure
+namespace Conformance.UnitsOfMeasure
 
 open Xunit
 open FSharp.Test
@@ -10,7 +10,7 @@ module TypeChecker =
 
     // This test was automatically generated (moved from FSharpQA suite - Conformance/UnitsOfMeasure/TypeChecker)
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../../resources/tests/Conformance/UnitsOfMeasure/TypeChecker", Includes=[|"GenericSubType01.fs"|])>]
-    let ``TypeChecker - GenericSubType01.fs - `` compilation =
+    let ``TypeChecker - GenericSubType01_fs`` compilation =
         compilation
         |> asFsx
         |> typecheck
diff --git a/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/MemberConstraints.fs b/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/MemberConstraints.fs
index 91fe1591534..08544356d69 100644
--- a/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/MemberConstraints.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/MemberConstraints.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ConstraintSolver
+namespace ConstraintSolver
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/PrimitiveConstraints.fs b/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/PrimitiveConstraints.fs
index 7f68879a8d9..34942501f1d 100644
--- a/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/PrimitiveConstraints.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/PrimitiveConstraints.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ConstraintSolver
+namespace ConstraintSolver
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Debugger/PortablePdbs.fs b/tests/FSharp.Compiler.ComponentTests/Debugger/PortablePdbs.fs
index 83e28666235..ffd7336997a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Debugger/PortablePdbs.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Debugger/PortablePdbs.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Debugger
+namespace Debugger
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Diagnostics/General.fs b/tests/FSharp.Compiler.ComponentTests/Diagnostics/General.fs
index 5596d5af443..32d65a623ac 100644
--- a/tests/FSharp.Compiler.ComponentTests/Diagnostics/General.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Diagnostics/General.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Diagnostics
+namespace Diagnostics
 
 open Xunit
 open FSharp.Test
@@ -11,7 +11,7 @@ module General =
     // This test was automatically generated (moved from FSharpQA suite - Diagnostics/General)
     //<Expects>\(18,22-18,30\).+warning FS0046: The keyword 'tailcall' is reserved for future use by F#</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../resources/tests/Diagnostics/General", Includes=[|"W_Keyword_tailcall01.fs"|])>]
-    let ``General - W_Keyword_tailcall01.fs - --test:ErrorRanges`` compilation =
+    let ``General - W_Keyword_tailcall01_fs - --test:ErrorRanges`` compilation =
         compilation
         |> asFs
         |> withOptions ["--test:ErrorRanges"]
diff --git a/tests/FSharp.Compiler.ComponentTests/Diagnostics/Records.fs b/tests/FSharp.Compiler.ComponentTests/Diagnostics/Records.fs
index b1f80781c48..298b220c714 100644
--- a/tests/FSharp.Compiler.ComponentTests/Diagnostics/Records.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Diagnostics/Records.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-module FSharp.Compiler.ComponentTests.Diagnostics.Records
+module Diagnostics.Records
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Diagnostics/async.fs b/tests/FSharp.Compiler.ComponentTests/Diagnostics/async.fs
index eef7ffba850..01853ed5dbd 100644
--- a/tests/FSharp.Compiler.ComponentTests/Diagnostics/async.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Diagnostics/async.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Diagnostics
+namespace ComponentTests.Diagnostics
 
 open Xunit
 open FSharp.Test
@@ -11,7 +11,7 @@ module async =
     // This test was automatically generated (moved from FSharpQA suite - Diagnostics/async)
     //<Expects status="error" span="(6,33-6,39)" id="FS0001">Type mismatch\. Expecting a.+''a'.+but given a.+'Async<'a>'.*The types ''a' and 'Async<'a>' cannot be unified.</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../resources/tests/Diagnostics/async", Includes=[|"MissingBangForLoop01.fs"|])>]
-    let ``async - MissingBangForLoop01.fs - --warnaserror+ --test:ErrorRanges --flaterrors`` compilation =
+    let ``async - MissingBangForLoop01_fs - --warnaserror+ --test:ErrorRanges --flaterrors`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--warnaserror+"; "--test:ErrorRanges"; "--flaterrors"]
@@ -24,7 +24,7 @@ module async =
     // This test was automatically generated (moved from FSharpQA suite - Diagnostics/async)
     //<Expects status="error" span="(7,54-7,61)" id="FS0001">Type mismatch\. Expecting a.    ''a'    .but given a.    'Async<'a>'    .The types ''a' and 'Async<'a>' cannot be unified.</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../resources/tests/Diagnostics/async", Includes=[|"MissingBangForLoop02.fs"|])>]
-    let ``async - MissingBangForLoop02.fs - --warnaserror+ --test:ErrorRanges --flaterrors`` compilation =
+    let ``async - MissingBangForLoop02_fs - --warnaserror+ --test:ErrorRanges --flaterrors`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--warnaserror+"; "--test:ErrorRanges"; "--flaterrors"]
@@ -37,7 +37,7 @@ module async =
     // This test was automatically generated (moved from FSharpQA suite - Diagnostics/async)
     //<Expects status="error" span="(7,18-7,19)" id="FS0001">All branches of an 'if' expression must return values implicitly convertible to the type of the first branch</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../resources/tests/Diagnostics/async", Includes=[|"ReturnBangNonAsync_IfThenElse.fs"|])>]
-    let ``async - ReturnBangNonAsync_IfThenElse.fs - --warnaserror+ --test:ErrorRanges --flaterrors`` compilation =
+    let ``async - ReturnBangNonAsync_IfThenElse_fs - --warnaserror+ --test:ErrorRanges --flaterrors`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--warnaserror+"; "--test:ErrorRanges"; "--flaterrors"]
@@ -50,7 +50,7 @@ module async =
     // This test was automatically generated (moved from FSharpQA suite - Diagnostics/async)
     //<Expects status="error" span="(14,16-14,28)" id="FS1228">'use!' bindings must be of the form 'use! <var> = <expr>'$</Expects>
     [<Theory; Directory(__SOURCE_DIRECTORY__ + "/../resources/tests/Diagnostics/async", Includes=[|"UseBindingWrongForm01.fs"|])>]
-    let ``async - UseBindingWrongForm01.fs - --warnaserror+ --test:ErrorRanges --flaterrors`` compilation =
+    let ``async - UseBindingWrongForm01_fs - --warnaserror+ --test:ErrorRanges --flaterrors`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--warnaserror+"; "--test:ErrorRanges"; "--flaterrors"]
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/ArgumentNames.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/ArgumentNames.fs
index f23179b7fa8..5387e979ea4 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/ArgumentNames.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/ArgumentNames.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/AssemblyBoundary/AssemblyBoundary.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/AssemblyBoundary/AssemblyBoundary.fs
index 7b18bc0d1f6..df92ac60f62 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/AssemblyBoundary/AssemblyBoundary.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/AssemblyBoundary/AssemblyBoundary.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionStepping.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionStepping.fs
index 6cbf979a6c7..9f5b523b944 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionStepping.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionStepping.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/AttributeTargets/AttributeTargets.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/AttributeTargets/AttributeTargets.fs
index a650d9f215a..8b7969e5235 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/AttributeTargets/AttributeTargets.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/AttributeTargets/AttributeTargets.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc/byrefTests.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/ByRefTests.fs
similarity index 98%
rename from tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc/byrefTests.fs
rename to tests/FSharp.Compiler.ComponentTests/EmittedIL/ByRefTests.fs
index fce4ebeb856..29e9102c961 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc/byrefTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/ByRefTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Compiler.Diagnostics
@@ -8,10 +8,10 @@ open FSharp.Test
 open FSharp.Test.Utilities
 open FSharp.Test.Compiler
 
-module byrefTests =
+module ByRefTests =
 
     [<Fact>]
-    let ``No defensive copy on .NET struct`` () =
+    let ``No defensive copy on NET struct`` () =
         CompilerAssert.Pass
             """
 open System
@@ -119,7 +119,7 @@ let f5 () =
 #if NETCOREAPP
     // NETCORE makes DateTime a readonly struct; therefore, it should not error.
     [<Fact>]
-    let ``No defensive copy on .NET struct - netcore`` () =
+    let ``No defensive copy on NET struct - netcore`` () =
         CompilerAssert.Pass
             """
 open System
@@ -148,7 +148,7 @@ let test2 () =
 #else
     // Note: Currently this is assuming NET472. That may change which might break these tests. Consider using custom C# code.
     [<Fact>]
-    let ``Defensive copy on .NET struct for inref`` () =
+    let ``Defensive copy on NET struct for inref`` () =
         CompilerAssert.TypeCheckWithErrors
             """
 open System
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/CCtorDUWithMember/CCtorDUWithMember.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/CCtorDUWithMember/CCtorDUWithMember.fs
index 63014121e81..1e7b359998a 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/CCtorDUWithMember/CCtorDUWithMember.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/CCtorDUWithMember/CCtorDUWithMember.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/CompiledNameAttribute/CompiledNameAttribute.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/CompiledNameAttribute/CompiledNameAttribute.fs
index 3af2f1ec758..27aca6b92b4 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/CompiledNameAttribute/CompiledNameAttribute.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/CompiledNameAttribute/CompiledNameAttribute.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/CompilerGeneratedAttributeOnAccessors.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/CompilerGeneratedAttributeOnAccessors.fs
index fdddb6bb6ef..b90ad6a95d4 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/CompilerGeneratedAttributeOnAccessors.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/CompilerGeneratedAttributeOnAccessors.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Microsoft.FSharp.Core
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/ComputationExpressions/ComputationExpressions.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/ComputationExpressions/ComputationExpressions.fs
index 6c00df0e173..e75263be3e9 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/ComputationExpressions/ComputationExpressions.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/ComputationExpressions/ComputationExpressions.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open System.IO
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/DoNotBoxStruct/DoNotBoxStruct.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/DoNotBoxStruct/DoNotBoxStruct.fs
index 18c266df045..883490978dc 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/DoNotBoxStruct/DoNotBoxStruct.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/DoNotBoxStruct/DoNotBoxStruct.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open System.IO
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/EmptyArray.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/EmptyArray.fs
index 65ba109ea3a..9059046cb7c 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/EmptyArray.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/EmptyArray.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Enums.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Enums.fs
index 98df4894328..ae42c56fb21 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Enums.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Enums.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/ForLoop.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/ForLoop.fs
index 1775a580eff..22607c2542c 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/ForLoop.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/ForLoop.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/GeneratedIterators/GeneratedIterators.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/GeneratedIterators/GeneratedIterators.fs
index 980c7f07c3b..b88d553fe4e 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/GeneratedIterators/GeneratedIterators.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/GeneratedIterators/GeneratedIterators.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/GenericComparison/GenericComparison.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/GenericComparison/GenericComparison.fs
index a1d166a6ace..b421ca1bf11 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/GenericComparison/GenericComparison.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/GenericComparison/GenericComparison.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/InequalityComparison/InequalityComparison.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/InequalityComparison/InequalityComparison.fs
index 3b003430304..fb28c1eff54 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/InequalityComparison/InequalityComparison.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/InequalityComparison/InequalityComparison.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Inlining/Inlining.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Inlining/Inlining.fs
index 20e65d2f74c..65f2fa37485 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Inlining/Inlining.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Inlining/Inlining.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/ListExpressionStepping/ListExpressionStepping.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/ListExpressionStepping/ListExpressionStepping.fs
index 5f3fcc14ece..85b40d306f4 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/ListExpressionStepping/ListExpressionStepping.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/ListExpressionStepping/ListExpressionStepping.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Literals.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Literals.fs
index b1614c07ac9..5c0d3211aea 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Literals.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Literals.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/MethodImplAttribute/MethodImplAttribute.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/MethodImplAttribute/MethodImplAttribute.fs
index 183be7e87b9..7acefc4ba54 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/MethodImplAttribute/MethodImplAttribute.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/MethodImplAttribute/MethodImplAttribute.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc/Misc.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc/Misc.fs
index b210b9e9c71..49bd8a47ff5 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc/Misc.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc/Misc.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/NoCompilerInlining.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/NoCompilerInlining.fs
index a85251c036f..b798d155209 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/NoCompilerInlining.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/NoCompilerInlining.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Platform/AssemblyHasMvidSection.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Platform/AssemblyHasMvidSection.fs
index 7c8872ff4e2..c6d1e6c12d9 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Platform/AssemblyHasMvidSection.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Platform/AssemblyHasMvidSection.fs
@@ -3,7 +3,7 @@
 open System
 open System.IO
 open System.Reflection
-open FSharp.Compiler.ComponentTests.EmittedIL
+open EmittedIL
 
 let  pathToDll =
     let d = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Platform/MvidReader.cs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Platform/MvidReader.cs
index e0965929739..3f302e558f3 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Platform/MvidReader.cs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Platform/MvidReader.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 {
     public static class MvidReader
     {
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Platform/Platform.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Platform/Platform.fs
index 1150e43e476..6a914c234ed 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Platform/Platform.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Platform/Platform.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/QueryExpressionStepping/QueryExpressionStepping.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/QueryExpressionStepping/QueryExpressionStepping.fs
index 8cd18bb635e..8cd5778d97f 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/QueryExpressionStepping/QueryExpressionStepping.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/QueryExpressionStepping/QueryExpressionStepping.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/SeqExpressionStepping/SeqExpressionStepping.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/SeqExpressionStepping/SeqExpressionStepping.fs
index c369b5b8f86..b11679b96a6 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/SeqExpressionStepping/SeqExpressionStepping.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/SeqExpressionStepping/SeqExpressionStepping.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls.fs
index 0e3dd2dcb8b..1d6244f9f7b 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/SerializableAttribute/SerializableAttribute.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/SerializableAttribute/SerializableAttribute.fs
index 9f932fb436c..0dd543a2eef 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/SerializableAttribute/SerializableAttribute.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/SerializableAttribute/SerializableAttribute.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/SkipLocalsInit.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/SkipLocalsInit.fs
index 09e4381e7b9..8fd82fec1f6 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/SkipLocalsInit.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/SkipLocalsInit.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StaticInit/StaticInit.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StaticInit/StaticInit.fs
index 7fd8919f432..3cc63ea37e6 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StaticInit/StaticInit.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StaticInit/StaticInit.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/SteppingMatch/SteppingMatch.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/SteppingMatch/SteppingMatch.fs
index bd22ce39faa..d10e4561e56 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/SteppingMatch/SteppingMatch.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/SteppingMatch/SteppingMatch.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormC.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormC.fs
index 3faeadc21dc..f3958dcdcf0 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormC.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormC.fs
@@ -3,7 +3,7 @@ module Program
 open System
 open System.Text
 open System.Collections.Generic
-open FSharp.Compiler.ComponentTests.EmittedIL.StringEncoding.NormalizationForm
+open EmittedIL.StringEncoding.NormalizationForm
 
 let csharpValues1 = (NormalizationFormCCSharp_0000.Values()).GetEnumerator()
 let csharpValues2 = (NormalizationFormCCSharp_0080.Values()).GetEnumerator()
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormD.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormD.fs
index 32ccb4f53a9..f6daba9e466 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormD.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormD.fs
@@ -3,7 +3,7 @@ module Program
 open System
 open System.Text
 open System.Collections.Generic
-open FSharp.Compiler.ComponentTests.EmittedIL.StringEncoding.NormalizationForm
+open EmittedIL.StringEncoding.NormalizationForm
 
 let csharpValues1 = (NormalizationFormDCSharp_0000.Values()).GetEnumerator()
 let csharpValues2 = (NormalizationFormDCSharp_0080.Values()).GetEnumerator()
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormKC.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormKC.fs
index 9079b6bc3dd..fdd07cc0b1c 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormKC.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormKC.fs
@@ -3,7 +3,7 @@ module Program
 open System
 open System.Text
 open System.Collections.Generic
-open FSharp.Compiler.ComponentTests.EmittedIL.StringEncoding.NormalizationForm
+open EmittedIL.StringEncoding.NormalizationForm
 
 let csharpValues1 = (NormalizationFormKCCSharp_0000.Values()).GetEnumerator()
 let csharpValues2 = (NormalizationFormKCCSharp_0080.Values()).GetEnumerator()
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormKD.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormKD.fs
index c5bca9fb097..1d0028e64db 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormKD.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/NormalizationFormKD.fs
@@ -3,7 +3,7 @@ module Program
 open System
 open System.Text
 open System.Collections.Generic
-open FSharp.Compiler.ComponentTests.EmittedIL.StringEncoding.NormalizationForm
+open EmittedIL.StringEncoding.NormalizationForm
 
 let csharpValues1 = (NormalizationFormKDCSharp_0000.Values()).GetEnumerator()
 let csharpValues2 = (NormalizationFormKDCSharp_0080.Values()).GetEnumerator()
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/StringEncoding.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/StringEncoding.fs
index 877ea56f93c..e0d0b1eacef 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/StringEncoding.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringEncoding/StringEncoding.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open System
 open Xunit
@@ -32,7 +32,7 @@ module StringEncoding =
 
     let normalization_CSharp (form:string) start =
         let lines = [|
-            yield "namespace FSharp.Compiler.ComponentTests.EmittedIL.StringEncoding.NormalizationForm"
+            yield "namespace EmittedIL.StringEncoding.NormalizationForm"
             yield "{"
             yield "    using System;"
             yield "    using System.Collections.Generic;"
@@ -56,7 +56,7 @@ module StringEncoding =
     let normalization_FSharp (form:string) start =
 
         let lines = [|
-            yield $"module FSharp.Compiler.ComponentTests.EmittedIL.StringEncoding.NormalizationForm.Normalization{form}FSharp_%04x{start}"
+            yield $"module EmittedIL.StringEncoding.NormalizationForm.Normalization{form}FSharp_%04x{start}"
             yield "open System.Collections.Generic"
             yield "open System.Text"
             yield ""
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringFormatAndInterpolation.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringFormatAndInterpolation.fs
index bb9403d5574..0ef7d23422e 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringFormatAndInterpolation.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringFormatAndInterpolation.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StructDefensiveCopy/StructDefensiveCopy.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StructDefensiveCopy/StructDefensiveCopy.fs
index fe7f88ff74a..2b090932f78 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StructDefensiveCopy/StructDefensiveCopy.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StructDefensiveCopy/StructDefensiveCopy.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.EmittedIL.StructDefensiveCopy
+module EmittedIL.StructDefensiveCopy
 
 open Xunit
 open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StructGettersReadOnly.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StructGettersReadOnly.fs
index 89fa1ffc061..8272d1c0be4 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StructGettersReadOnly.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StructGettersReadOnly.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Microsoft.FSharp.Core
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/StructFieldEquality.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/StructFieldEquality.fs
index 3b72b9ef132..edf76bdf4c8 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/StructFieldEquality.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/StructFieldEquality.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/Structure.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/Structure.fs
index 328e8d8ab5c..ee656354ef8 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/Structure.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/Structure.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TailCalls.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TailCalls.fs
index cbe51a7a381..034ab15f37a 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TailCalls.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TailCalls.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TestFunctions/TestFunctions.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TestFunctions/TestFunctions.fs
index b4c00e10492..7e80b1e622b 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TestFunctions/TestFunctions.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TestFunctions/TestFunctions.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TupleElimination.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TupleElimination.fs
index f4da7c4f364..5c77f15f552 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TupleElimination.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TupleElimination.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Tuples/Tuples.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Tuples/Tuples.fs
index 76ee061f652..b03ccebada0 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Tuples/Tuples.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Tuples/Tuples.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TypeTestsInPatternMatching.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TypeTestsInPatternMatching.fs
index d28bc0f6b2b..7ebd99b4671 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TypeTestsInPatternMatching.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TypeTestsInPatternMatching.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/WhileLoops.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/WhileLoops.fs
index 2bedd358d81..3c4f4d1ab63 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/WhileLoops.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/WhileLoops.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/operators/Operators.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/operators/Operators.fs
index 3b72b9ef132..edf76bdf4c8 100644
--- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/operators/Operators.fs
+++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/operators/Operators.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AccessOfTypeAbbreviationTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AccessOfTypeAbbreviationTests.fs
index 758ef242087..b4ccc6cba35 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AccessOfTypeAbbreviationTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AccessOfTypeAbbreviationTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AssignmentErrorTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AssignmentErrorTests.fs
index cd7265df829..b48744bd66a 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AssignmentErrorTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AssignmentErrorTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs
index 52824cf7278..a1dbbe9f135 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConfusingTypeName.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConfusingTypeName.fs
index 3bdd41b9795..232e26feae2 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConfusingTypeName.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConfusingTypeName.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs
index 32cd7fb6405..ffaf232ae13 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/DontSuggestTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/DontSuggestTests.fs
index c65b02db61f..3c002e3c42b 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/DontSuggestTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/DontSuggestTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ElseBranchHasWrongTypeTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ElseBranchHasWrongTypeTests.fs
index 250fc8f674b..22d4a77745c 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ElseBranchHasWrongTypeTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ElseBranchHasWrongTypeTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/FS0988AtEndOfFile.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/FS0988AtEndOfFile.fs
index fd6f2f1a336..e755d610121 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/FS0988AtEndOfFile.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/FS0988AtEndOfFile.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InterfaceImplInAugmentationsTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InterfaceImplInAugmentationsTests.fs
index 828775a958f..1b113c3d5cc 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InterfaceImplInAugmentationsTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InterfaceImplInAugmentationsTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidLiteralTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidLiteralTests.fs
index a72d93c2743..61381dfbebd 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidLiteralTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidLiteralTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidNumericLiteralTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidNumericLiteralTests.fs
index cb7cafe5aec..01057df5fa9 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidNumericLiteralTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidNumericLiteralTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingElseBranch.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingElseBranch.fs
index ca414c212b5..23f43914260 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingElseBranch.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingElseBranch.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingExpressionTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingExpressionTests.fs
index ec18fb6152d..0ad11adc3e8 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingExpressionTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingExpressionTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ModuleTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ModuleTests.fs
index 25fcfcdf420..08bffbebaa1 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ModuleTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ModuleTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
@@ -56,7 +56,7 @@ module Modules =
                                  "Ignoring attributes on module abbreviation")
                                  
     [<Fact>]
-    let ``Right Attribute Module Abbreviation with version 5.0 (compile)``() =
+    let ``Right Attribute Module Abbreviation with version 5_0 (compile)``() =
         FSharp """module [<Experimental "Hello">] L1 = List"""
         |> withLangVersion50
         |> compile
@@ -182,7 +182,7 @@ AutoOpen>] L1 = do ()
         ]
 
     [<Fact>]
-    let ``Offside rule works for attributes inside module declarations in F# 5.0``() =
+    let ``Offside rule works for attributes inside module declarations in F# 5_0``() =
         Fsx """
 module [<
 AutoOpen>] L1 = do ()
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/NameResolutionTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/NameResolutionTests.fs
index 82143e50547..3b41ae6b6eb 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/NameResolutionTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/NameResolutionTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/Repro1548.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/Repro1548.fs
index 01c8b9ae855..8a8e9dad7d1 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/Repro1548.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/Repro1548.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/SuggestionsTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/SuggestionsTests.fs
index 419b51b66de..50837863d5a 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/SuggestionsTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/SuggestionsTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open System
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeEqualsMissingTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeEqualsMissingTests.fs
index 3dacfbfde6e..39612f2b27b 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeEqualsMissingTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeEqualsMissingTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeMismatchTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeMismatchTests.fs
index 7a64b56dabf..afd228cb5f0 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeMismatchTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeMismatchTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnionCasePatternMatchingErrors.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnionCasePatternMatchingErrors.fs
index 63973ea991a..c6671c81893 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnionCasePatternMatchingErrors.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnionCasePatternMatchingErrors.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.ErrorMessages.UnionCasePatternMatchingErrors
+module ErrorMessages.UnionCasePatternMatchingErrors
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnitGenericAbstactType.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnitGenericAbstactType.fs
index d5674beff82..dab7f865a7d 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnitGenericAbstactType.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnitGenericAbstactType.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnsupportedAttributes.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnsupportedAttributes.fs
index be59b17509b..3eb78de55b4 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnsupportedAttributes.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnsupportedAttributes.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UpcastDowncastTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UpcastDowncastTests.fs
index e336d7b10aa..a25753fdc7c 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UpcastDowncastTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UpcastDowncastTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WarnExpressionTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WarnExpressionTests.fs
index 3e7768efb94..1abfe9918eb 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WarnExpressionTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WarnExpressionTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WarnIfDiscardedInList.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WarnIfDiscardedInList.fs
index 19562a77af2..7927d944da2 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WarnIfDiscardedInList.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WarnIfDiscardedInList.fs
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WrongSyntaxInForLoop.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WrongSyntaxInForLoop.fs
index 774ac1fda65..cd5cf0153c2 100644
--- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WrongSyntaxInForLoop.fs
+++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WrongSyntaxInForLoop.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.ErrorMessages
+namespace ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
index f094c2e6e04..6c5c5f76c2c 100644
--- a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
+++ b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
@@ -25,49 +25,50 @@
     <Compile Include="..\service\FsUnit.fs">
       <Link>FsUnit.fs</Link>
     </Compile>
+    <Compile Include="Conformance\BasicGrammarElements\AccessibilityAnnotations\Basic\Basic.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\AccessibilityAnnotations\OnOverridesAndIFaceImpl\OnOverridesAndIFaceImpl.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\AccessibilityAnnotations\OnTypeMembers\OnTypeMembers.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\AccessibilityAnnotations\PermittedLocations\PermittedLocations.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\CustomAttributes\AttributeInheritance\AttributeInheritance.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\CustomAttributes\AttributeUsage\AttributeUsage.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\CustomAttributes\Basic\Basic.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\CustomAttributes\ImportedAttributes\ImportedAttributes.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\CustomAttributes\ArgumentsOfAllTypes\ArgumentsOfAllTypes.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\DelegateTypes\DelegateDefinition.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\EntryPoint\EntryPoint.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\Events\Basic\Basic.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\ExceptionDefinitions\ExceptionDefinitions.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\ExplicitObjectConstructors\ExplicitObjectConstructors.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\FieldMembers\FieldMembers.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\ImplicitObjectConstructors\ImplicitObjectConstructors.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\ImportDeclarations\ImportDeclarations.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\InterfaceSpecificationsAndImplementations\InterfaceSpecificationsAndImplementations.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\LetBindings\Basic\Basic.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\LetBindings\TypeFunctions\TypeFunctions.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\LetBindings\ActivePatternBindings\ActivePatternBindings.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\LetBindings\ExplicitTypeParameters\ExplicitTypeParameters.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\MemberDefinitions\MemberDefinitions.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\MemberDefinitions\ImplementingDispatchSlots\ImplementingDispatchSlots.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\MemberDefinitions\MethodsAndProperties\MethodsAndProperties.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\MemberDefinitions\NamedArguments\NamedArguments.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\MemberDefinitions\OptionalArguments\OptionalArguments.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\MemberDefinitions\OptionalDefaultParamArgs\OptionalDefaultParamArgs.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\MemberDefinitions\OverloadingMembers\OverloadingMembers.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\MethodResolution.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\ModuleAbbreviations\ModuleAbbreviations.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\ModuleDefinitions\ModuleDefinitions.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\NamespaceDeclGroups\NamespaceDeclGroups.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\NullRepresentations\NullRepresentations.fs" />
     <Compile Include="Conformance\BasicGrammarElements\OperatorNames\OperatorNames.fs" />
     <Compile Include="Conformance\BasicGrammarElements\PrecedenceAndOperators\PrecedenceAndOperators.fs" />
-    <Compile Include="Conformance\BasicTypeAndModuleDefinitions\ExceptionDefinitions\ExceptionDefinitions.fs" />
-    <Compile Include="Conformance\BasicTypeAndModuleDefinitions\GeneratedEqualityHashingComparison\Attributes\Diags\Diags.fs" />
-    <Compile Include="Conformance\BasicTypeAndModuleDefinitions\GeneratedEqualityHashingComparison\Attributes\Legacy\Legacy.fs" />
-    <Compile Include="Conformance\BasicTypeAndModuleDefinitions\GeneratedEqualityHashingComparison\Basic\Basic.fs" />
-    <Compile Include="Conformance\BasicTypeAndModuleDefinitions\GeneratedEqualityHashingComparison\IComparison\IComparison.fs" />
-    <Compile Include="Conformance\BasicTypeAndModuleDefinitions\ModuleDefinitions\ModuleDefinitions.fs" />
-    <Compile Include="Conformance\BasicTypeAndModuleDefinitions\NamespaceDeclGroups\NamespaceDeclGroups.fs" />
-    <Compile Include="Conformance\BasicTypeAndModuleDefinitions\NullRepresentations\NullRepresentations.fs" />
-    <Compile Include="Conformance\BasicTypeAndModuleDefinitions\TypeAbbreviations\TypeAbbreviations.fs" />
-    <Compile Include="Conformance\BasicTypeAndModuleDefinitions\TypeAbbreviations\WarnForAutoOpenAttributeAlias.fs" />
-    <Compile Include="Conformance\ClassTypes\ExplicitObjectConstructors\ExplicitObjectConstructors.fs" />
-    <Compile Include="Conformance\ClassTypes\ImplicitObjectConstructors\ImplicitObjectConstructors.fs" />
-    <Compile Include="Conformance\ClassTypes\ValueRestriction\ValueRestriction.fs" />
-    <Compile Include="Conformance\DelegateTypes\DelegateDefinition.fs" />
-    <Compile Include="Conformance\DeclarationElements\AccessibilityAnnotations\Basic\Basic.fs" />
-    <Compile Include="Conformance\DeclarationElements\AccessibilityAnnotations\OnOverridesAndIFaceImpl\OnOverridesAndIFaceImpl.fs" />
-    <Compile Include="Conformance\DeclarationElements\AccessibilityAnnotations\OnTypeMembers\OnTypeMembers.fs" />
-    <Compile Include="Conformance\DeclarationElements\AccessibilityAnnotations\PermittedLocations\PermittedLocations.fs" />
-    <Compile Include="Conformance\DeclarationElements\CustomAttributes\AttributeInheritance\AttributeInheritance.fs" />
-    <Compile Include="Conformance\DeclarationElements\CustomAttributes\AttributeUsage\AttributeUsage.fs" />
-    <Compile Include="Conformance\DeclarationElements\CustomAttributes\Basic\Basic.fs" />
-    <Compile Include="Conformance\DeclarationElements\CustomAttributes\ImportedAttributes\ImportedAttributes.fs" />
-    <Compile Include="Conformance\DeclarationElements\CustomAttributes\ArgumentsOfAllTypes\ArgumentsOfAllTypes.fs" />
-    <Compile Include="Conformance\DeclarationElements\Events\Basic\Basic.fs" />
-    <Compile Include="Conformance\DeclarationElements\FieldMembers\FieldMembers.fs" />
-    <Compile Include="Conformance\DeclarationElements\ImportDeclarations\ImportDeclarations.fs" />
-    <Compile Include="Conformance\DeclarationElements\InterfaceSpecificationsAndImplementations\InterfaceSpecificationsAndImplementations.fs" />
-    <Compile Include="Conformance\DeclarationElements\LetBindings\Basic\Basic.fs" />
-    <Compile Include="Conformance\DeclarationElements\LetBindings\TypeFunctions\TypeFunctions.fs" />
-    <Compile Include="Conformance\DeclarationElements\LetBindings\ActivePatternBindings\ActivePatternBindings.fs" />
-    <Compile Include="Conformance\DeclarationElements\LetBindings\ExplicitTypeParameters\ExplicitTypeParameters.fs" />
-    <Compile Include="Conformance\DeclarationElements\MemberDefinitions\MemberDefinitions.fs" />
-    <Compile Include="Conformance\DeclarationElements\MemberDefinitions\ImplementingDispatchSlots\ImplementingDispatchSlots.fs" />
-    <Compile Include="Conformance\DeclarationElements\MemberDefinitions\MethodsAndProperties\MethodsAndProperties.fs" />
-    <Compile Include="Conformance\DeclarationElements\MemberDefinitions\NamedArguments\NamedArguments.fs" />
-    <Compile Include="Conformance\DeclarationElements\MemberDefinitions\OptionalArguments\OptionalArguments.fs" />
-    <Compile Include="Conformance\DeclarationElements\MemberDefinitions\OptionalDefaultParamArgs\OptionalDefaultParamArgs.fs" />
-    <Compile Include="Conformance\DeclarationElements\MemberDefinitions\OverloadingMembers\OverloadingMembers.fs" />
-    <Compile Include="Conformance\DeclarationElements\ModuleAbbreviations\ModuleAbbreviations.fs" />
-    <Compile Include="Conformance\DeclarationElements\UseBindings\UseBindings.fs" />
-    <Compile Include="Conformance\EntryPoint\EntryPoint.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\TypeAbbreviations\TypeAbbreviations.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\TypeAbbreviations\WarnForAutoOpenAttributeAlias.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\ValueRestriction\ValueRestriction.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\UseBindings\UseBindings.fs" />
+    <Compile Include="Conformance\GeneratedEqualityHashingComparison\Attributes\Diags\Attributes_Diags.fs" />
+    <Compile Include="Conformance\GeneratedEqualityHashingComparison\Attributes\Legacy\Attributes_Legacy.fs" />
+    <Compile Include="Conformance\GeneratedEqualityHashingComparison\Basic\Basic.fs" />
+    <Compile Include="Conformance\GeneratedEqualityHashingComparison\IComparison\IComparison.fs" />
     <Compile Include="Conformance\Expressions\ApplicationExpressions\BasicApplication\BasicApplication.fs" />
     <Compile Include="Conformance\Expressions\BindingExpressions\BindingExpressions.fs" />
     <Compile Include="Conformance\Expressions\ControlFlowExpressions\PatternMatching\PatternMatching.fs" />
@@ -78,25 +79,24 @@
     <Compile Include="Conformance\LexicalAnalysis\ElseIfBug14761.fs" />
     <Compile Include="Conformance\LexicalAnalysis\Comments.fs" />
     <Compile Include="Conformance\LexicalAnalysis\NumericLiterals.fs" />
-    <Compile Include="Conformance\LexicalAnalysis\Shift\Generics.fs" />
+    <Compile Include="Conformance\LexicalAnalysis\Generics.fs" />
     <Compile Include="Conformance\LexicalAnalysis\SymbolicKeywords.fs" />
     <Compile Include="Conformance\LexicalAnalysis\SymbolicOperators.fs" />
     <Compile Include="Conformance\LexicalFiltering\HashLight\HashLight.fs" />
     <Compile Include="Conformance\LexicalFiltering\HighPrecedenceApplication\HighPrecedenceApplication.fs" />
     <Compile Include="Conformance\LexicalFiltering\OffsideExceptions\OffsideExceptions.fs" />
-    <Compile Include="Conformance\MethodResolution\ParametersResolution.fs" />
     <Compile Include="Conformance\PatternMatching\Simple.fs" />
     <Compile Include="Conformance\Printing\Printing.fs" />
     <Compile Include="Conformance\PseudoCustomAttributes\PseudoCustomAttributes.fs" />
-    <Compile Include="Conformance\RecordTypes\AnonymousRecords.fs" />
-    <Compile Include="Conformance\RecordTypes\RecordTypes.fs" />
-    <Compile Include="Conformance\StructTypes\StructTypes.fs" />
-    <Compile Include="Conformance\StructTypes\StructActivePatterns.fs" />	  
-    <Compile Include="Conformance\TypesAndTypeConstraints\CheckingSyntacticTypes\CheckingSyntacticTypes.fs" />
-    <Compile Include="Conformance\TypesAndTypeConstraints\LogicalPropertiesOfTypes\LogicalPropertiesOfTypes.fs" />
-    <Compile Include="Conformance\TypesAndTypeConstraints\IWSAMsAndSRTPs\IWSAMsAndSRTPsTests.fs" />
-    <Compile Include="Conformance\UnionTypes\UnionTypes.fs" />
-    <Compile Include="Conformance\UnionTypes\MultiCaseUnionStructTypes.fs" />
+    <Compile Include="Conformance\Types\RecordTypes\AnonymousRecords.fs" />
+    <Compile Include="Conformance\Types\RecordTypes\RecordTypes.fs" />
+    <Compile Include="Conformance\Types\StructTypes\StructTypes.fs" />
+    <Compile Include="Conformance\Types\StructTypes\StructActivePatterns.fs" />	  
+    <Compile Include="Conformance\Types\TypeConstraints\CheckingSyntacticTypes\CheckingSyntacticTypes.fs" />
+    <Compile Include="Conformance\Types\TypeConstraints\LogicalPropertiesOfTypes\LogicalPropertiesOfTypes.fs" />
+    <Compile Include="Conformance\Types\TypeConstraints\IWSAMsAndSRTPs\IWSAMsAndSRTPsTests.fs" />
+    <Compile Include="Conformance\Types\UnionTypes\UnionTypes.fs" />
+    <Compile Include="Conformance\Types\UnionTypes\UnionStructTypes.fs" />
     <Compile Include="Conformance\UnitsOfMeasure\Basic.fs" />
     <Compile Include="Conformance\UnitsOfMeasure\Diagnostics.fs" />
     <Compile Include="Conformance\UnitsOfMeasure\Parsing.fs" />
@@ -128,7 +128,7 @@
     <Compile Include="EmittedIL\Inlining\Inlining.fs" />
     <Compile Include="EmittedIL\ListExpressionStepping\ListExpressionStepping.fs" />
     <Compile Include="EmittedIL\MethodImplAttribute\MethodImplAttribute.fs" />
-    <Compile Include="EmittedIL\Misc\byrefTests.fs" />
+    <Compile Include="EmittedIL\ByRefTests.fs" />
     <Compile Include="EmittedIL\Misc\Misc.fs" />
     <Compile Include="EmittedIL\operators\Operators.fs" />
     <Compile Include="EmittedIL\Platform\Platform.fs" />
@@ -289,4 +289,8 @@
     <PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Conformance\DelegateTypes\" />
+  </ItemGroup>
+
 </Project>
diff --git a/tests/FSharp.Compiler.ComponentTests/FSharpChecker/CommonWorkflows.fs b/tests/FSharp.Compiler.ComponentTests/FSharpChecker/CommonWorkflows.fs
index 7aa8dfc25a3..d5d640bed19 100644
--- a/tests/FSharp.Compiler.ComponentTests/FSharpChecker/CommonWorkflows.fs
+++ b/tests/FSharp.Compiler.ComponentTests/FSharpChecker/CommonWorkflows.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.FSharpChecker.CommonWorkflows
+module FSharpChecker.CommonWorkflows
 
 open System
 open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/FSharpChecker/FindReferences.fs b/tests/FSharp.Compiler.ComponentTests/FSharpChecker/FindReferences.fs
index a17d83d7212..8a68ca6b773 100644
--- a/tests/FSharp.Compiler.ComponentTests/FSharpChecker/FindReferences.fs
+++ b/tests/FSharp.Compiler.ComponentTests/FSharpChecker/FindReferences.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.FSharpChecker.FindReferences
+module FSharpChecker.FindReferences
 
 open Xunit
 open FSharp.Compiler.CodeAnalysis
diff --git a/tests/FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs b/tests/FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs
index 720dc0b1271..aa4c8a05266 100644
--- a/tests/FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs
+++ b/tests/FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.FSharpChecker.SymbolUse
+module FSharpChecker.SymbolUse
 
 
 open FSharp.Compiler.CodeAnalysis
diff --git a/tests/FSharp.Compiler.ComponentTests/Globalization/GlobalizationTestCases.fs b/tests/FSharp.Compiler.ComponentTests/Globalization/GlobalizationTestCases.fs
index 34eece06c61..536ad488203 100644
--- a/tests/FSharp.Compiler.ComponentTests/Globalization/GlobalizationTestCases.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Globalization/GlobalizationTestCases.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Globalization
+namespace Globalization
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Interop/DeeplyNestedCSharpClasses.fs b/tests/FSharp.Compiler.ComponentTests/Interop/DeeplyNestedCSharpClasses.fs
index f346743055a..ad09280c78b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Interop/DeeplyNestedCSharpClasses.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Interop/DeeplyNestedCSharpClasses.fs
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-namespace FSharp.Compiler.ComponentTests.Interop
+namespace Interop
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Interop/RequiredAndInitOnlyProperties.fs b/tests/FSharp.Compiler.ComponentTests/Interop/RequiredAndInitOnlyProperties.fs
index 66393325eb3..e0c8b08e188 100644
--- a/tests/FSharp.Compiler.ComponentTests/Interop/RequiredAndInitOnlyProperties.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Interop/RequiredAndInitOnlyProperties.fs
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-namespace FSharp.Compiler.ComponentTests.Interop
+namespace Interop
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Interop/SimpleInteropTests.fs b/tests/FSharp.Compiler.ComponentTests/Interop/SimpleInteropTests.fs
index a2a018a64bb..037e33f1c8c 100644
--- a/tests/FSharp.Compiler.ComponentTests/Interop/SimpleInteropTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Interop/SimpleInteropTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Interop
+namespace Interop
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Interop/StaticsInInterfaces.fs b/tests/FSharp.Compiler.ComponentTests/Interop/StaticsInInterfaces.fs
index c4cd83d5fd2..903e7832065 100644
--- a/tests/FSharp.Compiler.ComponentTests/Interop/StaticsInInterfaces.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Interop/StaticsInInterfaces.fs
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-namespace FSharp.Compiler.ComponentTests.Interop
+namespace Interop
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Interop/VisibilityTests.fs b/tests/FSharp.Compiler.ComponentTests/Interop/VisibilityTests.fs
index ab6425d2052..5c2726bb183 100644
--- a/tests/FSharp.Compiler.ComponentTests/Interop/VisibilityTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Interop/VisibilityTests.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.Interop
+namespace Interop
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/AttributeCheckingTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/AttributeCheckingTests.fs
index 3ab5266f31a..5accb0ee831 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/AttributeCheckingTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/AttributeCheckingTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.AttributeChecking
+namespace Language
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/CastingTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/CastingTests.fs
index c85c571d0fe..04de9b038b1 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/CastingTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/CastingTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests
+namespace Language
 
 open Xunit
 open FSharp.Test.Compiler
@@ -8,7 +8,7 @@ open FSharp.Test.Compiler
 module CastingTests =
 
     [<Fact>]
-    let ``Compile: ValueTuple.Create(1,1) :> IComparable<ValueTuple<int,int>>`` () =
+    let ``Compile: (System.ValueTuple.Create(1,1)) :> IComparable<ValueTuple<int,int>>`` () =
         FSharp """
 module One
 open System
@@ -47,7 +47,7 @@ printfn "%A" y
          |> shouldSucceed
 
     [<Fact>]
-    let ``Script: ValueTuple.Create(0,0) :> IComparable<ValueTuple<int,int>>`` () =
+    let ``Script: (System.ValueTuple.Create(0,0)) :> IComparable<ValueTuple<int,int>>`` () =
         Fsx """
 module One
 open System
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/CodeQuotationTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/CodeQuotationTests.fs
index 45ab0678529..dc98a4be095 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/CodeQuotationTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/CodeQuotationTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Language
+namespace Language
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/CompilerDirectiveTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/CompilerDirectiveTests.fs
index 362e6f06c6c..b19ff83cf95 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/CompilerDirectiveTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/CompilerDirectiveTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Language
+namespace Language
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/ComputationExpressionTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/ComputationExpressionTests.fs
index fa1c8c49b42..03bd579f6a8 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/ComputationExpressionTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/ComputationExpressionTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Language
+namespace Language
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/CopyAndUpdateTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/CopyAndUpdateTests.fs
index ce1eb6b6703..d9777a15b3a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/CopyAndUpdateTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/CopyAndUpdateTests.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.Language.CopyAndUpdateTests
+module Language.CopyAndUpdateTests
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/DynamicAssignmentOperatorTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/DynamicAssignmentOperatorTests.fs
index 69525f0ef38..a1ee025ed6a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/DynamicAssignmentOperatorTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/DynamicAssignmentOperatorTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Language
+namespace Language
 
 open System
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/ExtensionMethodTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/ExtensionMethodTests.fs
index 1ad91f999c3..edae8eed826 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/ExtensionMethodTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/ExtensionMethodTests.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.Language
+namespace Language
 
 open FSharp.Test
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/IndexerSetterParamArray.fs b/tests/FSharp.Compiler.ComponentTests/Language/IndexerSetterParamArray.fs
index 471e8c9c3a8..071eb5f00f9 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/IndexerSetterParamArray.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/IndexerSetterParamArray.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests
+namespace Language
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/InterfaceTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/InterfaceTests.fs
index 97a0798e1da..09fca64fdab 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/InterfaceTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/InterfaceTests.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.Language.InterfaceTests
+module Language.InterfaceTests
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/InterpolatedStringsTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/InterpolatedStringsTests.fs
index 5d1489354cc..a3eed933be6 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/InterpolatedStringsTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/InterpolatedStringsTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Language
+namespace Language
 
 open System
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/MultiDimensionalArrayTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/MultiDimensionalArrayTests.fs
index 7a107e1e910..55768b2a149 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/MultiDimensionalArrayTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/MultiDimensionalArrayTests.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.Language
+namespace Language
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/NameofTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/NameofTests.fs
index 27e7ca95bec..e25be0e550b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/NameofTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/NameofTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Language
+namespace Language
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/ObsoleteAttributeCheckingTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/ObsoleteAttributeCheckingTests.fs
index 8ccbe23126c..1c13d2048da 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/ObsoleteAttributeCheckingTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/ObsoleteAttributeCheckingTests.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.Language
+namespace Language
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/PrintfFormatTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/PrintfFormatTests.fs
index 065ca2070ce..90d76d2b335 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/PrintfFormatTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/PrintfFormatTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-module FSharp.Compiler.ComponentTests.Language.PrintfFormatTests
+module Language.PrintfFormatTests
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/RegressionTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/RegressionTests.fs
index 81e55158788..b29311ba33b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/RegressionTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/RegressionTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Language
+namespace Language
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressionTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressionTests.fs
index 9f87a5078eb..5fe944be088 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressionTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/SequenceExpressionTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-module FSharp.Compiler.ComponentTests.Language.SequenceExpressionTests
+module Language.SequenceExpressionTests
 
 open Xunit
 open FSharp.Test.Compiler
@@ -12,7 +12,7 @@ let fsiSession = getSessionForEval [||] LangVersion.Preview
 let runCode = evalInSharedSession fsiSession
 
 [<Fact>]
-let ``Basic recursive case uses tail. recursion``() =
+let ``Basic recursive case uses tail recursion``() =
     Fsx """
 let rec f () = seq {
     try 
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/StateMachineTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/StateMachineTests.fs
index c2dca0d1fb4..dd031134f63 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/StateMachineTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/StateMachineTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Language
+namespace Language
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/StaticClassTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/StaticClassTests.fs
index aea9ede61a0..7389bbdc697 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/StaticClassTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/StaticClassTests.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.Language
+namespace Language
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Language/XmlComments.fs b/tests/FSharp.Compiler.ComponentTests/Language/XmlComments.fs
index e9e136aa902..941c4f27a9e 100644
--- a/tests/FSharp.Compiler.ComponentTests/Language/XmlComments.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Language/XmlComments.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.XmlComments
+namespace XmlComments
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Literals.fs b/tests/FSharp.Compiler.ComponentTests/Literals.fs
index 40092066b38..bc0b8faeb98 100644
--- a/tests/FSharp.Compiler.ComponentTests/Literals.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Literals.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Misc.fs b/tests/FSharp.Compiler.ComponentTests/Misc.fs
index e54703e961d..f212441ede7 100644
--- a/tests/FSharp.Compiler.ComponentTests/Misc.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Misc.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/FsharpSuiteMigrated.fs b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/FsharpSuiteMigrated.fs
index 1b2c02d4b2b..72af2260eb6 100644
--- a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/FsharpSuiteMigrated.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/FsharpSuiteMigrated.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Miscellaneous.FsharpSuiteMigrated
+namespace Miscellaneous.FsharpSuiteMigrated
 
 open System
 open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/GraphTests.fs b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/GraphTests.fs
index 18fb6194d69..aefac2fb56a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/GraphTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/GraphTests.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.Miscellaneous.GraphTests
+module Miscellaneous.GraphTests
 
 open Xunit
 open FSharp.Compiler.GraphChecking
diff --git a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/ListLiterals.fs b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/ListLiterals.fs
index 62998d31b55..8c560628592 100644
--- a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/ListLiterals.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/ListLiterals.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Miscellaneous
+namespace Miscellaneous
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/MigratedCoreTests.fs b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/MigratedCoreTests.fs
index fe4437af9c8..9776b41b8d7 100644
--- a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/MigratedCoreTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/MigratedCoreTests.fs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-module FSharp.Compiler.ComponentTests.Miscellaneous.FsharpSuiteMigrated.CoreTests
+module Miscellaneous.FsharpSuiteMigrated_CoreTests
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.ScriptHelpers 
-open TestFrameworkAdapter    
-      
+open System.Runtime.InteropServices
+open Miscellaneous.FsharpSuiteMigrated.TestFrameworkAdapter
 
 // These tests are enabled for .NET Framework and .NET Core
 [<Fact>]
@@ -28,13 +28,13 @@ let ``apporder-FSC_OPTIMIZED`` () = singleTestBuildAndRun "core/apporder" FSC_OP
 let ``apporder-FSI`` () = singleTestBuildAndRun "core/apporder" FSI
 
 [<Fact>]
-let ``array-FSC_DEBUG-5.0`` () = singleTestBuildAndRunVersion "core/array" FSC_DEBUG LangVersion.V50
+let ``array-FSC_DEBUG-5_0`` () = singleTestBuildAndRunVersion "core/array" FSC_DEBUG LangVersion.V50
 
 [<Fact>]
-let ``array-FSC_OPTIMIZED-5.0`` () = singleTestBuildAndRunVersion "core/array" FSC_OPTIMIZED LangVersion.V50
+let ``array-FSC_OPTIMIZED-5_0`` () = singleTestBuildAndRunVersion "core/array" FSC_OPTIMIZED LangVersion.V50
 
 [<Fact>]
-let ``array-FSI-5.0`` () = singleTestBuildAndRunVersion "core/array" FSI LangVersion.V50
+let ``array-FSI-5_0`` () = singleTestBuildAndRunVersion "core/array" FSI LangVersion.V50
 
 [<Fact>]
 let ``array-FSC_OPTIMIZED-preview`` () = singleTestBuildAndRunVersion "core/array" FSC_OPTIMIZED LangVersion.Preview
@@ -462,16 +462,14 @@ let ``reflect-FSC_OPTIMIZED`` () = singleTestBuildAndRun "core/reflect" FSC_OPTI
 [<Fact>]
 let ``reflect-FSI`` () = singleTestBuildAndRun "core/reflect" FSI
 
-module PInvokeTests = 
-    open System.Runtime.InteropServices
-    let isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+let isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
 
-    [<Fact()>]
-    let ``pinvoke-FSC_OPTIMIZED`` () =   
-        if isWindows then
-            singleTestBuildAndRun "core/pinvoke" FSC_OPTIMIZED
+[<Fact()>]
+let ``pinvoke-FSC_OPTIMIZED`` () =   
+    if isWindows then
+        singleTestBuildAndRun "core/pinvoke" FSC_OPTIMIZED
 
-    [<Fact>]
-    let ``pinvoke-FSI`` () =
-        if isWindows then
-            singleTestBuildAndRun "core/pinvoke" FSI
\ No newline at end of file
+[<Fact>]
+let ``pinvoke-FSI`` () =
+    if isWindows then
+        singleTestBuildAndRun "core/pinvoke" FSI
diff --git a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/MigratedOverloadTests.fs b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/MigratedOverloadTests.fs
index 55286a6a656..0b3e8f8e6c8 100644
--- a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/MigratedOverloadTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/MigratedOverloadTests.fs
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-module FSharp.Compiler.ComponentTests.Miscellaneous.FsharpSuiteMigrated.OverloadResolution
+module Miscellaneous.FsharpSuiteMigrated_OverloadResolution
 
 open Xunit
 open FSharp.Test
-open TestFrameworkAdapter   
+open Miscellaneous.FsharpSuiteMigrated.TestFrameworkAdapter
 
 module ``fsharpqa migrated tests`` =
     let [<FactForDESKTOP>] ``Conformance\Expressions\SyntacticSugar (E_Slices01_fs)`` () = singleNegTest ( "conformance/expressions/syntacticsugar") "E_Slices01"
diff --git a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/MigratedTypeCheckTests.fs b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/MigratedTypeCheckTests.fs
index 09a287838b3..b52d62858fa 100644
--- a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/MigratedTypeCheckTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/MigratedTypeCheckTests.fs
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-module FSharp.Compiler.ComponentTests.Miscellaneous.FsharpSuiteMigrated.TypeCheckTests
+module Miscellaneous.FsharpSuiteMigrated_TypeCheckTests
 
 open Xunit
 open FSharp.Test
 open FSharp.Test.ScriptHelpers 
-open TestFrameworkAdapter  
+open Miscellaneous.FsharpSuiteMigrated.TestFrameworkAdapter  
 
 [<Fact>]
 let misc () = singleTestBuildAndRunVersion "typecheck/misc" FSC_OPTIMIZED LangVersion.SupportsMl
diff --git a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/SemanticClassificationKeyBuilder.fs b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/SemanticClassificationKeyBuilder.fs
index d7a00d8a133..9778664ba37 100644
--- a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/SemanticClassificationKeyBuilder.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/SemanticClassificationKeyBuilder.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-module FSharp.Compiler.ComponentTests.Miscellaneous.SemanticClassificationKeyStoreBuilder
+module Miscellaneous.SemanticClassificationKeyStoreBuilder
 
 open Xunit
 open FSharp.Compiler.EditorServices
diff --git a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/XmlDoc.fs b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/XmlDoc.fs
index 1fac6e2509c..6a1927ffd84 100644
--- a/tests/FSharp.Compiler.ComponentTests/Miscellaneous/XmlDoc.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Miscellaneous/XmlDoc.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-module FSharp.Compiler.ComponentTests.Miscellaneous.XmlDoc
+module Miscellaneous.XmlDoc
 
 open System.IO
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/OCamlCompat/OCamlCompat.fs b/tests/FSharp.Compiler.ComponentTests/OCamlCompat/OCamlCompat.fs
index e40797ba218..f3155e4c5cb 100644
--- a/tests/FSharp.Compiler.ComponentTests/OCamlCompat/OCamlCompat.fs
+++ b/tests/FSharp.Compiler.ComponentTests/OCamlCompat/OCamlCompat.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.OcamlCompat
+namespace OcamlCompat
 
 open Xunit
 open FSharp.Test
@@ -86,7 +86,7 @@ module ``OCamlCompat test cases`` =
 
     //	SOURCE=E_mlExtension01.ml  COMPILE_ONLY=1 SCFLAGS="--warnaserror --test:ErrorRanges"				# E_mlExtension01.ml
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"E_mlExtension01.ml"|])>]
-    let ``E_mlExtension01.ml --test:ErrorRanges`` compilation =
+    let ``E_mlExtension01_ml --test:ErrorRanges`` compilation =
         compilation
         |> asFsx
         |> withOptions ["--test:ErrorRanges"]
@@ -147,7 +147,7 @@ module ``OCamlCompat test cases`` =
 
     //	SOURCE=W_MultiArgumentGenericType.fs					# W_MultiArgumentGenericType.fs
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"W_MultiArgumentGenericType.fs"|])>]
-    let ``W_MultiArgumentGenericType.fs``compilation =
+    let ``W_MultiArgumentGenericType_fs``compilation =
         compilation
         |> asExe
         |> ignoreWarnings
diff --git a/tests/FSharp.Compiler.ComponentTests/OnOverridesAndIFaceImpl.fs b/tests/FSharp.Compiler.ComponentTests/OnOverridesAndIFaceImpl.fs
index b14eb81466d..c5d41598aa1 100644
--- a/tests/FSharp.Compiler.ComponentTests/OnOverridesAndIFaceImpl.fs
+++ b/tests/FSharp.Compiler.ComponentTests/OnOverridesAndIFaceImpl.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.AccessibilityAnnotations
+namespace Conformance.DeclarationElements.AccessibilityAnnotations
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Operators.fs b/tests/FSharp.Compiler.ComponentTests/Operators.fs
index de5b5fa9c5a..d80e1480145 100644
--- a/tests/FSharp.Compiler.ComponentTests/Operators.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Operators.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Scripting/Interactive.fs b/tests/FSharp.Compiler.ComponentTests/Scripting/Interactive.fs
index 93f9da6c30a..06eecf708ac 100644
--- a/tests/FSharp.Compiler.ComponentTests/Scripting/Interactive.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Scripting/Interactive.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.Scripting
+namespace Scripting
 
 open Xunit
 open System
diff --git a/tests/FSharp.Compiler.ComponentTests/Signatures/ArrayTests.fs b/tests/FSharp.Compiler.ComponentTests/Signatures/ArrayTests.fs
index da6c65b1c82..7d74903c4eb 100644
--- a/tests/FSharp.Compiler.ComponentTests/Signatures/ArrayTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Signatures/ArrayTests.fs
@@ -1,7 +1,7 @@
-module FSharp.Compiler.ComponentTests.Signatures.SignatureTests
+module Signatures.SignatureTests
 
 open Xunit
-open FSharp.Compiler.ComponentTests.Signatures.TestHelpers
+open Signatures.TestHelpers
 
 [<Theory>]
 [<InlineData("let a : int[] = [| 1 |]",
diff --git a/tests/FSharp.Compiler.ComponentTests/Signatures/ModuleOrNamespaceTests.fs b/tests/FSharp.Compiler.ComponentTests/Signatures/ModuleOrNamespaceTests.fs
index 0e2f838cf0b..d4d9d408df9 100644
--- a/tests/FSharp.Compiler.ComponentTests/Signatures/ModuleOrNamespaceTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Signatures/ModuleOrNamespaceTests.fs
@@ -1,9 +1,9 @@
-module FSharp.Compiler.ComponentTests.Signatures.ModuleOrNamespaceTests
+module Signatures.ModuleOrNamespaceTests
 
 open Xunit
 open FsUnit
 open FSharp.Test.Compiler
-open FSharp.Compiler.ComponentTests.Signatures.TestHelpers
+open Signatures.TestHelpers
 
 [<Fact>]
 let ``Type from shared namespace`` () =
diff --git a/tests/FSharp.Compiler.ComponentTests/Signatures/NestedTypeTests.fs b/tests/FSharp.Compiler.ComponentTests/Signatures/NestedTypeTests.fs
index 9fb4ee4360c..669faca6d5f 100644
--- a/tests/FSharp.Compiler.ComponentTests/Signatures/NestedTypeTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Signatures/NestedTypeTests.fs
@@ -1,10 +1,10 @@
-module FSharp.Compiler.ComponentTests.Signatures.NestedTypeTests
+module Signatures.NestedTypeTests
 
 open Xunit
 open FsUnit
 open FSharp.Test
 open FSharp.Test.Compiler
-open FSharp.Compiler.ComponentTests.Signatures.TestHelpers
+open Signatures.TestHelpers
 
 [<Fact>]
 let ``Nested type with generics`` () =
@@ -81,7 +81,7 @@ module Sample
 val f: g: Lib.Root<System.TimeSpan,System.TimeSpan,System.TimeSpan,System.TimeSpan,System.TimeSpan>.Foo<int,float,string,System.DateTime>.Bar<char,int,string> -> unit"""
 
 [<FactForNETCOREAPP>]
-let ``ImmutableArray<'T>.Builder roundtrip`` () =
+let ``ImmutableArray<'T> Builder roundtrip`` () =
     let impl =
         """
 module Library
diff --git a/tests/FSharp.Compiler.ComponentTests/Signatures/RecordTests.fs b/tests/FSharp.Compiler.ComponentTests/Signatures/RecordTests.fs
index 3822890a288..27c5159a3f3 100644
--- a/tests/FSharp.Compiler.ComponentTests/Signatures/RecordTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Signatures/RecordTests.fs
@@ -1,9 +1,9 @@
-module FSharp.Compiler.ComponentTests.Signatures.RecordTests
+module Signatures.RecordTests
 
 open Xunit
 open FsUnit
 open FSharp.Test.Compiler
-open FSharp.Compiler.ComponentTests.Signatures.TestHelpers
+open Signatures.TestHelpers
 
 [<Fact>]
 let ``Internal record with xml comment`` () =
diff --git a/tests/FSharp.Compiler.ComponentTests/Signatures/SeqTests.fs b/tests/FSharp.Compiler.ComponentTests/Signatures/SeqTests.fs
index 4ef73013d99..10a0d0b3a25 100644
--- a/tests/FSharp.Compiler.ComponentTests/Signatures/SeqTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Signatures/SeqTests.fs
@@ -1,7 +1,7 @@
-module FSharp.Compiler.ComponentTests.Signatures.SeqTests
+module Signatures.SeqTests
 
 open Xunit
-open FSharp.Compiler.ComponentTests.Signatures.TestHelpers
+open Signatures.TestHelpers
 
 [<Fact>]
 let ``int seq`` () =
diff --git a/tests/FSharp.Compiler.ComponentTests/Signatures/SigGenerationRoundTripTests.fs b/tests/FSharp.Compiler.ComponentTests/Signatures/SigGenerationRoundTripTests.fs
index 0b4be741d50..469fa879b4d 100644
--- a/tests/FSharp.Compiler.ComponentTests/Signatures/SigGenerationRoundTripTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Signatures/SigGenerationRoundTripTests.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.Signatures.SigGenerationRoundTripTests
+module Signatures.SigGenerationRoundTripTests
 
 open Xunit
 open FSharp.Test
diff --git a/tests/FSharp.Compiler.ComponentTests/Signatures/TestHelpers.fs b/tests/FSharp.Compiler.ComponentTests/Signatures/TestHelpers.fs
index b7fd2f13742..8f3d1019ae0 100644
--- a/tests/FSharp.Compiler.ComponentTests/Signatures/TestHelpers.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Signatures/TestHelpers.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.Signatures.TestHelpers
+module Signatures.TestHelpers
 
 open System
 open FsUnit
diff --git a/tests/FSharp.Compiler.ComponentTests/Signatures/TypeTests.fs b/tests/FSharp.Compiler.ComponentTests/Signatures/TypeTests.fs
index 0bf215a0dfd..a4f18d4076f 100644
--- a/tests/FSharp.Compiler.ComponentTests/Signatures/TypeTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Signatures/TypeTests.fs
@@ -1,9 +1,9 @@
-module FSharp.Compiler.ComponentTests.Signatures.TypeTests
+module Signatures.TypeTests
 
 open Xunit
 open FsUnit
 open FSharp.Test.Compiler
-open FSharp.Compiler.ComponentTests.Signatures.TestHelpers
+open Signatures.TestHelpers
 
 [<Fact>]
 let ``Recursive type with attribute`` () =
diff --git a/tests/FSharp.Compiler.ComponentTests/SkipLocalsInit.fs b/tests/FSharp.Compiler.ComponentTests/SkipLocalsInit.fs
index 65ba4655cc2..4f58983e533 100644
--- a/tests/FSharp.Compiler.ComponentTests/SkipLocalsInit.fs
+++ b/tests/FSharp.Compiler.ComponentTests/SkipLocalsInit.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/StaticLinking/StaticLinking.fs b/tests/FSharp.Compiler.ComponentTests/StaticLinking/StaticLinking.fs
index 32fac8da21a..1378dca0a5b 100644
--- a/tests/FSharp.Compiler.ComponentTests/StaticLinking/StaticLinking.fs
+++ b/tests/FSharp.Compiler.ComponentTests/StaticLinking/StaticLinking.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open System.IO
 open Xunit
diff --git a/tests/FSharp.Compiler.ComponentTests/StringFormatAndInterpolation.fs b/tests/FSharp.Compiler.ComponentTests/StringFormatAndInterpolation.fs
index bb9403d5574..0ef7d23422e 100644
--- a/tests/FSharp.Compiler.ComponentTests/StringFormatAndInterpolation.fs
+++ b/tests/FSharp.Compiler.ComponentTests/StringFormatAndInterpolation.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/TailCalls.fs b/tests/FSharp.Compiler.ComponentTests/TailCalls.fs
index cbe51a7a381..034ab15f37a 100644
--- a/tests/FSharp.Compiler.ComponentTests/TailCalls.fs
+++ b/tests/FSharp.Compiler.ComponentTests/TailCalls.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/TupleElimination.fs b/tests/FSharp.Compiler.ComponentTests/TupleElimination.fs
index f4da7c4f364..5c77f15f552 100644
--- a/tests/FSharp.Compiler.ComponentTests/TupleElimination.fs
+++ b/tests/FSharp.Compiler.ComponentTests/TupleElimination.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.EmittedIL
+namespace EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/TypeChecks/CheckDeclarationsTests.fs b/tests/FSharp.Compiler.ComponentTests/TypeChecks/CheckDeclarationsTests.fs
index a884ed51229..1e004bde701 100644
--- a/tests/FSharp.Compiler.ComponentTests/TypeChecks/CheckDeclarationsTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/TypeChecks/CheckDeclarationsTests.fs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.Compiler.ComponentTests.CheckDeclarationsTests
+namespace TypeChecks
 
 open Xunit
 open FSharp.Test
@@ -95,7 +95,7 @@ namespace FSharpTest
         |> ignore
 
     [<Fact>]
-    let ``CheckingExceptionDeclarations - SynMemberDefn.GetSetMember`` () =
+    let ``CheckingExceptionDeclarations - SynMemberDefn GetSetMember`` () =
         FSharp """
 namespace FSharpTest
 
diff --git a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/CompilationFromCmdlineArgsTests.fs b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/CompilationFromCmdlineArgsTests.fs
index 2936ec34fb1..4525d7286f2 100644
--- a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/CompilationFromCmdlineArgsTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/CompilationFromCmdlineArgsTests.fs
@@ -1,56 +1,58 @@
-module FSharp.Compiler.ComponentTests.TypeChecks.Graph.CompilationFromCmdlineArgsTests
-
-open System
-open System.IO
-open FSharp.Compiler.CodeAnalysis
-open NUnit.Framework
-open CompilationTests
-
-// Point to a generated args.txt file.
-// Use scrape.fsx to generate an args.txt from a binary log file.
-// The path needs to be absolute.
-let localProjects: string list =
-    [
-        @"C:\Projects\fantomas\src\Fantomas.Core\Fantomas.Core.args.txt"
-        @"C:\Projects\FsAutoComplete\src\FsAutoComplete\FsAutoComplete.args.txt"
-        @"C:\Projects\fsharp\src\Compiler\FSharp.Compiler.Service.args.txt"
-        @"C:\Projects\fsharp\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.args.txt"
-    ]
-
-let checker = FSharpChecker.Create()
-
-let testCompilerFromArgs (method: Method) (projectArgumentsFilePath: string) : unit =
-    let oldWorkDir = Environment.CurrentDirectory
-
-    try
-        Environment.CurrentDirectory <- FileInfo(projectArgumentsFilePath).Directory.FullName
-
-        let args =
-            let argsFromFile = File.ReadAllLines(projectArgumentsFilePath)
-
-            [|
-                yield "fsc.exe"
-                yield! argsFromFile
-                if not (Array.contains "--times" argsFromFile) then
-                    yield "--times"
-                yield! methodOptions method
-            |]
-
-        let diagnostics, exitCode = checker.Compile(args) |> Async.RunSynchronously
-
-        for diag in diagnostics do
-            printfn "%A" diag
-
-        Assert.That(exitCode, Is.Zero)
-    finally
-        Environment.CurrentDirectory <- oldWorkDir
-
-[<TestCaseSource(nameof localProjects)>]
-[<Explicit("Slow, only useful as a sanity check that the test codebase is sound and type-checks using the old method")>]
-let ``Test sequential type-checking`` (projectArgumentsFilePath: string) =
-    testCompilerFromArgs Method.Sequential projectArgumentsFilePath
-
-[<TestCaseSource(nameof localProjects)>]
-[<Explicit("This only runs with the explicitly mentioned projects above")>]
-let ``Test graph-based type-checking`` (projectArgumentsFilePath: string) =
-    testCompilerFromArgs Method.Graph projectArgumentsFilePath
+namespace TypeChecks
+
+module CompilationFromCmdlineArgsTests =
+
+    open System
+    open System.IO
+    open FSharp.Compiler.CodeAnalysis
+    open NUnit.Framework
+    open CompilationTests
+
+    // Point to a generated args.txt file.
+    // Use scrape.fsx to generate an args.txt from a binary log file.
+    // The path needs to be absolute.
+    let localProjects: string list =
+        [
+            @"C:\Projects\fantomas\src\Fantomas.Core\Fantomas.Core.args.txt"
+            @"C:\Projects\FsAutoComplete\src\FsAutoComplete\FsAutoComplete.args.txt"
+            @"C:\Projects\fsharp\src\Compiler\FSharp.Compiler.Service.args.txt"
+            @"C:\Projects\fsharp\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.args.txt"
+        ]
+
+    let checker = FSharpChecker.Create()
+
+    let testCompilerFromArgs (method: Method) (projectArgumentsFilePath: string) : unit =
+        let oldWorkDir = Environment.CurrentDirectory
+
+        try
+            Environment.CurrentDirectory <- FileInfo(projectArgumentsFilePath).Directory.FullName
+
+            let args =
+                let argsFromFile = File.ReadAllLines(projectArgumentsFilePath)
+
+                [|
+                    yield "fsc.exe"
+                    yield! argsFromFile
+                    if not (Array.contains "--times" argsFromFile) then
+                        yield "--times"
+                    yield! methodOptions method
+                |]
+
+            let diagnostics, exitCode = checker.Compile(args) |> Async.RunSynchronously
+
+            for diag in diagnostics do
+                printfn "%A" diag
+
+            Assert.That(exitCode, Is.Zero)
+        finally
+            Environment.CurrentDirectory <- oldWorkDir
+
+    [<TestCaseSource(nameof localProjects)>]
+    [<Explicit("Slow, only useful as a sanity check that the test codebase is sound and type-checks using the old method")>]
+    let ``Test sequential type-checking`` (projectArgumentsFilePath: string) =
+        testCompilerFromArgs Method.Sequential projectArgumentsFilePath
+
+    [<TestCaseSource(nameof localProjects)>]
+    [<Explicit("This only runs with the explicitly mentioned projects above")>]
+    let ``Test graph-based type-checking`` (projectArgumentsFilePath: string) =
+        testCompilerFromArgs Method.Graph projectArgumentsFilePath
diff --git a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/CompilationTests.fs b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/CompilationTests.fs
index dc5f30df911..829810f3eea 100644
--- a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/CompilationTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/CompilationTests.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.TypeChecks.Graph.CompilationTests
+module TypeChecks.CompilationTests
 
 open FSharp.Test
 open FSharp.Test.Compiler
diff --git a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/DependencyResolutionTests.fs b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/DependencyResolutionTests.fs
index 207a8d2b233..b62a8e0ac21 100644
--- a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/DependencyResolutionTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/DependencyResolutionTests.fs
@@ -1,6 +1,6 @@
-module FSharp.Compiler.ComponentTests.TypeChecks.Graph.DependencyResolutionTests
+module TypeChecks.DependencyResolutionTests
 
-open FSharp.Compiler.ComponentTests.TypeChecks.Graph.TestUtils
+open TypeChecks.TestUtils
 open NUnit.Framework
 open FSharp.Compiler.GraphChecking
 open Scenarios
diff --git a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/FileContentMappingTests.fs b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/FileContentMappingTests.fs
index 78a364cbae7..9504d4b019e 100644
--- a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/FileContentMappingTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/FileContentMappingTests.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.TypeChecks.Graph.FileContentMappingTests
+module TypeChecks.FileContentMappingTests
 
 open NUnit.Framework
 open FSharp.Compiler.GraphChecking
diff --git a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/QueryTrieTests.fs b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/QueryTrieTests.fs
index 4e9fd318ce9..0da67c406f6 100644
--- a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/QueryTrieTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/QueryTrieTests.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.TypeChecks.Graph.QueryTrieTests
+module TypeChecks.QueryTrieTests
 
 open System.Collections.Generic
 open NUnit.Framework
diff --git a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/Scenarios.fs b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/Scenarios.fs
index 1ae135cf442..ed02db8e517 100644
--- a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/Scenarios.fs
+++ b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/Scenarios.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.TypeChecks.Graph.Scenarios
+module TypeChecks.Scenarios
 
 open TestUtils
 
diff --git a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/TrieMappingTests.fs b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/TrieMappingTests.fs
index a3f7508ffe7..d8a2e9da6a6 100644
--- a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/TrieMappingTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/TrieMappingTests.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.TypeChecks.Graph.TrieMappingTests
+module TypeChecks.TrieMappingTests
 
 open NUnit.Framework
 open FSharp.Compiler.GraphChecking
diff --git a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/TypedTreeGraph.fs b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/TypedTreeGraph.fs
index 284946eee9f..2aaf30001df 100644
--- a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/TypedTreeGraph.fs
+++ b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/TypedTreeGraph.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.TypeChecks.Graph.TypedTreeGraphTests
+module TypeChecks.TypedTreeGraphTests
 
 open System
 open System.Collections.Concurrent
@@ -9,7 +9,7 @@ open FSharp.Compiler.Text
 open FSharp.Compiler.Symbols
 open NUnit.Framework
 open FSharp.Compiler.GraphChecking
-open FSharp.Compiler.ComponentTests.TypeChecks.Graph.TestUtils
+open TypeChecks.TestUtils
 
 let localProjects = CompilationFromCmdlineArgsTests.localProjects
 
diff --git a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/Utils.fs b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/Utils.fs
index 397892eccd9..d14ddb44de1 100644
--- a/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/Utils.fs
+++ b/tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/Utils.fs
@@ -1,4 +1,4 @@
-module FSharp.Compiler.ComponentTests.TypeChecks.Graph.TestUtils
+module TypeChecks.TestUtils
 
 open FSharp.Compiler.CodeAnalysis
 open FSharp.Compiler.GraphChecking
diff --git a/tests/FSharp.Compiler.ComponentTests/TypeChecks/TyparNameTests.fs b/tests/FSharp.Compiler.ComponentTests/TypeChecks/TyparNameTests.fs
index 2761fb8cfeb..118ea134ff3 100644
--- a/tests/FSharp.Compiler.ComponentTests/TypeChecks/TyparNameTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/TypeChecks/TyparNameTests.fs
@@ -1,142 +1,143 @@
-module FSharp.Compiler.ComponentTests.TypeChecks.TyparNameTests
-
-open FSharp.Compiler.Symbols
-open Xunit
-open FSharp.Test
-open FSharp.Test.Compiler
-
-let private getGenericParametersNamesFor
-    (cUnit: CompilationUnit)
-    (entityDisplayName: string)
-    (valueDisplayName: string)
-    (additionalFile: SourceCodeFileKind)
-    : string array =
-    let typeCheckResult =
-        cUnit |> withAdditionalSourceFile additionalFile |> typecheckProject false
-
-    assert (Array.isEmpty typeCheckResult.Diagnostics)
-
-    typeCheckResult.AssemblySignature.Entities
-    |> Seq.tryPick (fun (entity: FSharpEntity) ->
-        if entity.DisplayName <> entityDisplayName then
-            None
-        else
-            entity.MembersFunctionsAndValues
-            |> Seq.tryFind (fun mfv -> mfv.DisplayName = valueDisplayName)
-            |> Option.map (fun (mfv: FSharpMemberOrFunctionOrValue) ->
-                mfv.GenericParameters |> Seq.map (fun gp -> gp.DisplayName) |> Seq.toArray))
-    |> Option.defaultValue Array.empty
-
-[<Fact>]
-let ``The call site of a generic function should have no influence on the name of the type parameters`` () =
-    let definitionFile =
-        Fs
-            """
+namespace TypeChecks
+
+module TyparNameTests =
+
+    open FSharp.Compiler.Symbols
+    open Xunit
+    open FSharp.Test
+    open FSharp.Test.Compiler
+
+    let private getGenericParametersNamesFor
+        (cUnit: CompilationUnit)
+        (entityDisplayName: string)
+        (valueDisplayName: string)
+        (additionalFile: SourceCodeFileKind)
+        : string array =
+        let typeCheckResult =
+            cUnit |> withAdditionalSourceFile additionalFile |> typecheckProject false
+
+        assert (Array.isEmpty typeCheckResult.Diagnostics)
+
+        typeCheckResult.AssemblySignature.Entities
+        |> Seq.tryPick (fun (entity: FSharpEntity) ->
+            if entity.DisplayName <> entityDisplayName then
+                None
+            else
+                entity.MembersFunctionsAndValues
+                |> Seq.tryFind (fun mfv -> mfv.DisplayName = valueDisplayName)
+                |> Option.map (fun (mfv: FSharpMemberOrFunctionOrValue) ->
+                    mfv.GenericParameters |> Seq.map (fun gp -> gp.DisplayName) |> Seq.toArray))
+        |> Option.defaultValue Array.empty
+
+    [<Fact>]
+    let ``The call site of a generic function should have no influence on the name of the type parameters`` () =
+        let definitionFile =
+            Fs """
 module A
 
 let someGenericFunction _ = ()
 """
-        |> withFileName "A.fs"
+            |> withFileName "A.fs"
 
-    let usageFile =
-        ("""
+        let usageFile =
+            ("""
 module B
 
 let otherGenericFunction _ _ _ =
     A.someGenericFunction 1
 """
-         |> FsSource)
-            .WithFileName("B.fs")
+             |> FsSource)
+                .WithFileName("B.fs")
 
-    let namesForB =
-        getGenericParametersNamesFor definitionFile "A" "someGenericFunction" usageFile
+        let namesForB =
+            getGenericParametersNamesFor definitionFile "A" "someGenericFunction" usageFile
 
-    let alternativeUsageFile =
-        ("""
+        let alternativeUsageFile =
+            ("""
 module C
 
 let alternateGenericFunction _ =
     A.someGenericFunction 1
 """
-         |> FsSource)
-            .WithFileName("C.fs")
+             |> FsSource)
+                .WithFileName("C.fs")
 
-    let namesForC =
-        getGenericParametersNamesFor definitionFile "A" "someGenericFunction" alternativeUsageFile
+        let namesForC =
+            getGenericParametersNamesFor definitionFile "A" "someGenericFunction" alternativeUsageFile
 
-    Assert.Equal<string array>(namesForB, namesForC)
+        Assert.Equal<string array>(namesForB, namesForC)
 
-[<Fact>]
-let ``Fixed typar name in signature file is still respected`` () =
-    let signatureFile =
-        Fsi
-            """
+    [<Fact>]
+    let ``Fixed typar name in signature file is still respected`` () =
+        let signatureFile =
+            Fsi
+                """
 module A
 
 val someGenericFunction: 'x -> unit
 """
-        |> withFileName "A.fsi"
+            |> withFileName "A.fsi"
 
-    let implementationFile =
-        ("""
+        let implementationFile =
+            ("""
 module A
 
 let someGenericFunction _ = ()
 """
-         |> FsSource)
-            .WithFileName("A.fs")
+             |> FsSource)
+                .WithFileName("A.fs")
 
-    let names =
-        getGenericParametersNamesFor signatureFile "A" "someGenericFunction" implementationFile
+        let names =
+            getGenericParametersNamesFor signatureFile "A" "someGenericFunction" implementationFile
 
-    Assert.Equal<string array>([| "x" |], names)
+        Assert.Equal<string array>([| "x" |], names)
 
-[<Fact>]
-let ``Hash constraint typar in signature file gets pretty name`` () =
-    let signatureFile =
-        Fsi
-            """
+    [<Fact>]
+    let ``Hash constraint typar in signature file gets pretty name`` () =
+        let signatureFile =
+            Fsi
+                """
 module A
 
 val someGenericFunction: #exn list -> unit
 """
-        |> withFileName "A.fsi"
+            |> withFileName "A.fsi"
 
-    let implementationFile =
-        ("""
+        let implementationFile =
+            ("""
 module A
 
 let someGenericFunction (_ : #exn list) = ()
 """
-         |> FsSource)
-            .WithFileName("A.fs")
+             |> FsSource)
+                .WithFileName("A.fs")
 
-    let names =
-        getGenericParametersNamesFor signatureFile "A" "someGenericFunction" implementationFile
+        let names =
+            getGenericParametersNamesFor signatureFile "A" "someGenericFunction" implementationFile
 
-    Assert.Equal<string array>([| "a" |], names)
+        Assert.Equal<string array>([| "a" |], names)
 
-[<Fact>]
-let ``Hash constraint with generic type parameter should have pretty name`` () =
-    let signatureFile =
-        Fsi
-            """
+    [<Fact>]
+    let ``Hash constraint with generic type parameter should have pretty name`` () =
+        let signatureFile =
+            Fsi
+                """
 module A
 
 val array2D: rows: seq<#seq<'T>> -> 'T[,]
 """
-        |> withFileName "A.fsi"
+            |> withFileName "A.fsi"
 
-    let implementationFile =
-        ("""
+        let implementationFile =
+            ("""
 module A
 
 let array2D (rows: seq<#seq<'T>>) : 'T[,] = failwith "todo"
 """
-         |> FsSource)
-            .WithFileName("A.fs")
+             |> FsSource)
+                .WithFileName("A.fs")
 
-    let names =
-        getGenericParametersNamesFor signatureFile "A" "array2D" implementationFile
+        let names =
+            getGenericParametersNamesFor signatureFile "A" "array2D" implementationFile
 
-    Assert.Equal<string array>([| "a"; "T" |], names)
+        Assert.Equal<string array>([| "a"; "T" |], names)