diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/a.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/a.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/a.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/a.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/b.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/b.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/b.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/b.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/clang-c/c.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/clang-c/c.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/clang-c/c.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/clang-c/c.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/clang/b.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/clang/b.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/clang/b.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/clang/b.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/cross-file-a.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/cross-file-a.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/cross-file-a.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/cross-file-a.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/cross-file-b.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/cross-file-b.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/cross-file-b.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/cross-file-b.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/cross-file-c.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/cross-file-c.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/cross-file-c.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/cross-file-c.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/gtest/foo.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/gtest/foo.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/gtest/foo.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/gtest/foo.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/i.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/i.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/i.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/i.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/j.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/j.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/j.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/j.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/llvm-c/d.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/llvm-c/d.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/llvm-c/d.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/llvm-c/d.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/llvm/a.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/llvm/a.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/llvm/a.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/llvm/a.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/s.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/s.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/s.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/s.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/system-header-simulation.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/system-header-simulation.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/system-header-simulation.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/system-header-simulation.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/absl/external-file.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/external-file.h
rename from clang-tools-extra/test/clang-tidy/Inputs/absl/external-file.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/external-file.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/absl/flags/internal-file.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/flags/internal-file.h
rename from clang-tools-extra/test/clang-tidy/Inputs/absl/flags/internal-file.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/flags/internal-file.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/absl/strings/internal-file.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/strings/internal-file.h
rename from clang-tools-extra/test/clang-tidy/Inputs/absl/strings/internal-file.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/strings/internal-file.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/absl/time/time.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/time/time.h
rename from clang-tools-extra/test/clang-tidy/Inputs/absl/time/time.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/time/time.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/a.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/a.h
rename from clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/a.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/a.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/cstdarg.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/cstdarg.h
rename from clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/cstdarg.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/cstdarg.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/cstdlib.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/cstdlib.h
rename from clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/cstdlib.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/cstdlib.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/j.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/j.h
rename from clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/j.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/j.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/r.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/r.h
rename from clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/r.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/r.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/s.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/s.h
rename from clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/s.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/s.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/t.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/t.h
rename from clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/t.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/t.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/transitive.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/transitive.h
rename from clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/transitive.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/transitive.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/transitive2.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/transitive2.h
rename from clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/transitive2.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/transitive2.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/google-namespaces.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/google-namespaces.h
rename from clang-tools-extra/test/clang-tidy/Inputs/google-namespaces.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/google-namespaces.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/gtest/gtest-typed-test.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/gtest-typed-test.h
rename from clang-tools-extra/test/clang-tidy/Inputs/gtest/gtest-typed-test.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/gtest-typed-test.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/gtest/gtest.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/gtest.h
rename from clang-tools-extra/test/clang-tidy/Inputs/gtest/gtest.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/gtest.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/gtest/nosuite/gtest/gtest-typed-test.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/nosuite/gtest/gtest-typed-test.h
rename from clang-tools-extra/test/clang-tidy/Inputs/gtest/nosuite/gtest/gtest-typed-test.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/nosuite/gtest/gtest-typed-test.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/gtest/nosuite/gtest/gtest.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/nosuite/gtest/gtest.h
rename from clang-tools-extra/test/clang-tidy/Inputs/gtest/nosuite/gtest/gtest.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/nosuite/gtest/gtest.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/assert.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/assert.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/assert.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/assert.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/complex.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/complex.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/complex.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/complex.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/ctype.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/ctype.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/ctype.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/ctype.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/errno.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/errno.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/errno.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/errno.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/fenv.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/fenv.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/fenv.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/fenv.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/float.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/float.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/float.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/float.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/inttypes.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/inttypes.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/inttypes.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/inttypes.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/iso646.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/iso646.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/iso646.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/iso646.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/limits.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/limits.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/limits.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/limits.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/locale.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/locale.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/locale.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/locale.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/math.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/math.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/math.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/math.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/setjmp.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/setjmp.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/setjmp.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/setjmp.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/signal.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/signal.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/signal.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/signal.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdalign.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdalign.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdalign.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdalign.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdarg.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdarg.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdarg.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdarg.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdbool.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdbool.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdbool.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdbool.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stddef.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stddef.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stddef.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stddef.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdint.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdint.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdint.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdint.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdio.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdio.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdio.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdio.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdlib.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdlib.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdlib.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdlib.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/string.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/string.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/string.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/string.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/tgmath.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/tgmath.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/tgmath.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/tgmath.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/time.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/time.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/time.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/time.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/uchar.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/uchar.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/uchar.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/uchar.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/wchar.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/wchar.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/wchar.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/wchar.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/wctype.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/wctype.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/wctype.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/wctype.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-loop-convert/structures.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-loop-convert/structures.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-loop-convert/structures.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-loop-convert/structures.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-pass-by-value/header-with-fix.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-pass-by-value/header-with-fix.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-pass-by-value/header-with-fix.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-pass-by-value/header-with-fix.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-pass-by-value/header.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-pass-by-value/header.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-pass-by-value/header.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-pass-by-value/header.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-replace-auto-ptr/memory.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-replace-auto-ptr/memory.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-replace-auto-ptr/memory.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-replace-auto-ptr/memory.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-smart-ptr/initializer_list.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/initializer_list.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-smart-ptr/initializer_list.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/initializer_list.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-smart-ptr/shared_ptr.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/shared_ptr.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-smart-ptr/shared_ptr.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/shared_ptr.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-smart-ptr/unique_ptr.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/unique_ptr.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-smart-ptr/unique_ptr.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/unique_ptr.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-use-auto/containers.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-use-auto/containers.h
rename from clang-tools-extra/test/clang-tidy/Inputs/modernize-use-auto/containers.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-use-auto/containers.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/mpi-type-mismatch/mpimock.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/mpi-type-mismatch/mpimock.h
rename from clang-tools-extra/test/clang-tidy/Inputs/mpi-type-mismatch/mpimock.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/mpi-type-mismatch/mpimock.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/performance-unnecessary-value-param/header-fixed.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/performance-unnecessary-value-param/header-fixed.h
rename from clang-tools-extra/test/clang-tidy/Inputs/performance-unnecessary-value-param/header-fixed.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/performance-unnecessary-value-param/header-fixed.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/performance-unnecessary-value-param/header.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/performance-unnecessary-value-param/header.h
rename from clang-tools-extra/test/clang-tidy/Inputs/performance-unnecessary-value-param/header.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/performance-unnecessary-value-param/header.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/readability-identifier-naming/system/system-header.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/system/system-header.h
rename from clang-tools-extra/test/clang-tidy/Inputs/readability-identifier-naming/system/system-header.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/system/system-header.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/readability-identifier-naming/user-header.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/user-header.h
rename from clang-tools-extra/test/clang-tidy/Inputs/readability-identifier-naming/user-header.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/user-header.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/unused-using-decls.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/unused-using-decls.h
rename from clang-tools-extra/test/clang-tidy/Inputs/unused-using-decls.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/unused-using-decls.h
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-addition.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-addition.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-duration-addition.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-duration-addition.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-comparison.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-comparison.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-duration-comparison.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-duration-comparison.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-conversion-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-conversion-cast.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-duration-conversion-cast.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-duration-conversion-cast.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-division.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-division.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-duration-division.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-duration-division.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-factory-float.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-factory-float.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-duration-factory-float.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-duration-factory-float.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-factory-scale.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-factory-scale.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-duration-factory-scale.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-duration-factory-scale.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-subtraction.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-subtraction.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-duration-subtraction.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-duration-subtraction.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-unnecessary-conversion.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-unnecessary-conversion.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-duration-unnecessary-conversion.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-duration-unnecessary-conversion.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-faster-strsplit-delimiter.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-faster-strsplit-delimiter.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-faster-strsplit-delimiter.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-faster-strsplit-delimiter.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-no-internal-dependencies.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-no-internal-dependencies.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-no-internal-dependencies.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-no-internal-dependencies.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-no-namespace.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-no-namespace.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-no-namespace.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-no-namespace.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-redundant-strcat-calls.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-redundant-strcat-calls.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-redundant-strcat-calls.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-redundant-strcat-calls.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-str-cat-append.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-str-cat-append.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-str-cat-append.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-str-cat-append.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-string-find-startswith.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-string-find-startswith.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-string-find-startswith.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-string-find-startswith.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-time-comparison.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-time-comparison.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-time-comparison.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-time-comparison.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-time-subtraction.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-time-subtraction.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-time-subtraction.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-time-subtraction.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-upgrade-duration-conversions.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-upgrade-duration-conversions.cpp
rename from clang-tools-extra/test/clang-tidy/abseil-upgrade-duration-conversions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil-upgrade-duration-conversions.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-accept.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-accept.cpp
rename from clang-tools-extra/test/clang-tidy/android-cloexec-accept.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android-cloexec-accept.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-accept4.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-accept4.cpp
rename from clang-tools-extra/test/clang-tidy/android-cloexec-accept4.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android-cloexec-accept4.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-creat.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-creat.cpp
rename from clang-tools-extra/test/clang-tidy/android-cloexec-creat.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android-cloexec-creat.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-dup.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-dup.cpp
rename from clang-tools-extra/test/clang-tidy/android-cloexec-dup.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android-cloexec-dup.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-epoll-create.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-epoll-create.cpp
rename from clang-tools-extra/test/clang-tidy/android-cloexec-epoll-create.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android-cloexec-epoll-create.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-epoll-create1.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-epoll-create1.cpp
rename from clang-tools-extra/test/clang-tidy/android-cloexec-epoll-create1.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android-cloexec-epoll-create1.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-fopen.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-fopen.cpp
rename from clang-tools-extra/test/clang-tidy/android-cloexec-fopen.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android-cloexec-fopen.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-inotify-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-inotify-init.cpp
rename from clang-tools-extra/test/clang-tidy/android-cloexec-inotify-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android-cloexec-inotify-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-inotify-init1.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-inotify-init1.cpp
rename from clang-tools-extra/test/clang-tidy/android-cloexec-inotify-init1.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android-cloexec-inotify-init1.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-memfd-create.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-memfd-create.cpp
rename from clang-tools-extra/test/clang-tidy/android-cloexec-memfd-create.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android-cloexec-memfd-create.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-open.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-open.cpp
rename from clang-tools-extra/test/clang-tidy/android-cloexec-open.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android-cloexec-open.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-pipe.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-pipe.cpp
rename from clang-tools-extra/test/clang-tidy/android-cloexec-pipe.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android-cloexec-pipe.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-pipe2.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-pipe2.cpp
rename from clang-tools-extra/test/clang-tidy/android-cloexec-pipe2.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android-cloexec-pipe2.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-socket.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-socket.cpp
rename from clang-tools-extra/test/clang-tidy/android-cloexec-socket.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android-cloexec-socket.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-comparison-in-temp-failure-retry.c b/clang-tools-extra/test/clang-tidy/checkers/android-comparison-in-temp-failure-retry.c
rename from clang-tools-extra/test/clang-tidy/android-comparison-in-temp-failure-retry.c
rename to clang-tools-extra/test/clang-tidy/checkers/android-comparison-in-temp-failure-retry.c
diff --git a/clang-tools-extra/test/clang-tidy/boost-use-to-string.cpp b/clang-tools-extra/test/clang-tidy/checkers/boost-use-to-string.cpp
rename from clang-tools-extra/test/clang-tidy/boost-use-to-string.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/boost-use-to-string.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-gmock.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-gmock.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-argument-comment-gmock.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-gmock.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-ignore-single-argument.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-ignore-single-argument.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-argument-comment-ignore-single-argument.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-ignore-single-argument.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-literals.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-literals.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-argument-comment-literals.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-literals.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-strict.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-argument-comment-strict.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-strict.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-argument-comment.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-assert-side-effect.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-assert-side-effect.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-bool-pointer-implicit-conversion.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-bool-pointer-implicit-conversion.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-bool-pointer-implicit-conversion.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-bool-pointer-implicit-conversion.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-branch-clone-macro-crash.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone-macro-crash.c
rename from clang-tools-extra/test/clang-tidy/bugprone-branch-clone-macro-crash.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone-macro-crash.c
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-branch-clone.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-branch-clone.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-copy-constructor-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-copy-constructor-init.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-copy-constructor-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-copy-constructor-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-dangling-handle.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-dangling-handle.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-dangling-handle.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-dangling-handle.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-dynamic-static-initializers.hpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-dynamic-static-initializers.hpp
rename from clang-tools-extra/test/clang-tidy/bugprone-dynamic-static-initializers.hpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-dynamic-static-initializers.hpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-exception-escape-openmp.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-exception-escape-openmp.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-exception-escape-openmp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-exception-escape-openmp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-exception-escape.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-exception-escape.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-exception-escape.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-exception-escape.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-fold-init-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-fold-init-type.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-fold-init-type.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-fold-init-type.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-forward-declaration-namespace.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-forward-declaration-namespace.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-forward-declaration-namespace.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-forward-declaration-namespace.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-forwarding-reference-overload.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-forwarding-reference-overload.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-forwarding-reference-overload.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-forwarding-reference-overload.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-inaccurate-erase.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-inaccurate-erase.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-inaccurate-erase.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-inaccurate-erase.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-incorrect-roundings.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-incorrect-roundings.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-incorrect-roundings.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-incorrect-roundings.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-infinite-loop.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-infinite-loop.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-infinite-loop.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-infinite-loop.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-integer-division.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-integer-division.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-integer-division.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-integer-division.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-lambda-function-name.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-lambda-function-name.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-lambda-function-name.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-lambda-function-name.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-macro-parentheses-cmdline.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses-cmdline.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-macro-parentheses-cmdline.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses-cmdline.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-macro-parentheses.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-macro-parentheses.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-macro-repeated-side-effects.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-repeated-side-effects.c
rename from clang-tools-extra/test/clang-tidy/bugprone-macro-repeated-side-effects.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-repeated-side-effects.c
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-misplaced-operator-in-strlen-in-alloc.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-operator-in-strlen-in-alloc.c
rename from clang-tools-extra/test/clang-tidy/bugprone-misplaced-operator-in-strlen-in-alloc.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-operator-in-strlen-in-alloc.c
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-misplaced-operator-in-strlen-in-alloc.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-operator-in-strlen-in-alloc.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-misplaced-operator-in-strlen-in-alloc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-operator-in-strlen-in-alloc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-misplaced-widening-cast-explicit-only.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-widening-cast-explicit-only.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-misplaced-widening-cast-explicit-only.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-widening-cast-explicit-only.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-misplaced-widening-cast-implicit-enabled.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-widening-cast-implicit-enabled.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-misplaced-widening-cast-implicit-enabled.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-widening-cast-implicit-enabled.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-move-forwarding-reference.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-move-forwarding-reference.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-move-forwarding-reference.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-move-forwarding-reference.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-multiple-statement-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-multiple-statement-macro.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-multiple-statement-macro.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-multiple-statement-macro.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-parent-virtual-call.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-parent-virtual-call.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-parent-virtual-call.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-parent-virtual-call.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-posix-return.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-posix-return.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-posix-return.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-posix-return.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-sizeof-container.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-sizeof-container.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-sizeof-container.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-sizeof-container.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-sizeof-expression.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-sizeof-expression.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-sizeof-expression.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-sizeof-expression.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-string-constructor.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-string-constructor.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-string-constructor.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-string-constructor.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-string-integer-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-string-integer-assignment.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-string-integer-assignment.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-string-integer-assignment.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-string-literal-with-embedded-nul.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-string-literal-with-embedded-nul.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-string-literal-with-embedded-nul.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-string-literal-with-embedded-nul.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-enum-usage-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-enum-usage-strict.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-suspicious-enum-usage-strict.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-enum-usage-strict.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-enum-usage.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-enum-usage.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-suspicious-enum-usage.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-enum-usage.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-memset-usage.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memset-usage.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-suspicious-memset-usage.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memset-usage.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-missing-comma.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-missing-comma.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-suspicious-missing-comma.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-missing-comma.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon-fail.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon-fail.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon-fail.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon-fail.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-string-compare.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-string-compare.c
rename from clang-tools-extra/test/clang-tidy/bugprone-suspicious-string-compare.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-string-compare.c
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-string-compare.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-string-compare.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-suspicious-string-compare.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-string-compare.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-swapped-arguments.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-swapped-arguments.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-swapped-arguments.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-swapped-arguments.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-terminating-continue.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-terminating-continue.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-terminating-continue.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-terminating-continue.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-throw-keyword-missing.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-throw-keyword-missing.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-throw-keyword-missing.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-throw-keyword-missing.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-too-small-loop-variable-magniute-bits-upper-limit.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-too-small-loop-variable-magniute-bits-upper-limit.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-too-small-loop-variable-magniute-bits-upper-limit.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-too-small-loop-variable-magniute-bits-upper-limit.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-too-small-loop-variable.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-too-small-loop-variable.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-too-small-loop-variable.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-too-small-loop-variable.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-undefined-memory-manipulation.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-undefined-memory-manipulation.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-undefined-memory-manipulation.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-undefined-memory-manipulation.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-undelegated-constructor-cxx98.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-undelegated-constructor-cxx98.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-undelegated-constructor-cxx98.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-undelegated-constructor-cxx98.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-undelegated-constructor.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-undelegated-constructor.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-undelegated-constructor.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-undelegated-constructor.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-unhandled-self-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-self-assignment.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-unhandled-self-assignment.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-self-assignment.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-unused-raii.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-raii.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-unused-raii.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-raii.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-unused-return-value-custom.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-return-value-custom.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-unused-return-value-custom.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-return-value-custom.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-unused-return-value.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-return-value.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-unused-return-value.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-return-value.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-use-after-move.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-use-after-move.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-use-after-move.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-use-after-move.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-virtual-near-miss.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-virtual-near-miss.cpp
rename from clang-tools-extra/test/clang-tidy/bugprone-virtual-near-miss.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-virtual-near-miss.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-dcl21-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-dcl21-cpp.cpp
rename from clang-tools-extra/test/clang-tidy/cert-dcl21-cpp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert-dcl21-cpp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-dcl58-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-dcl58-cpp.cpp
rename from clang-tools-extra/test/clang-tidy/cert-dcl58-cpp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert-dcl58-cpp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-env33-c.c b/clang-tools-extra/test/clang-tidy/checkers/cert-env33-c.c
rename from clang-tools-extra/test/clang-tidy/cert-env33-c.c
rename to clang-tools-extra/test/clang-tidy/checkers/cert-env33-c.c
diff --git a/clang-tools-extra/test/clang-tidy/cert-err34-c.c b/clang-tools-extra/test/clang-tidy/checkers/cert-err34-c.c
rename from clang-tools-extra/test/clang-tidy/cert-err34-c.c
rename to clang-tools-extra/test/clang-tidy/checkers/cert-err34-c.c
diff --git a/clang-tools-extra/test/clang-tidy/cert-err34-c.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-err34-c.cpp
rename from clang-tools-extra/test/clang-tidy/cert-err34-c.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert-err34-c.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-flp30-c.c b/clang-tools-extra/test/clang-tidy/checkers/cert-flp30-c.c
rename from clang-tools-extra/test/clang-tidy/cert-flp30-c.c
rename to clang-tools-extra/test/clang-tidy/checkers/cert-flp30-c.c
diff --git a/clang-tools-extra/test/clang-tidy/cert-limited-randomness.c b/clang-tools-extra/test/clang-tidy/checkers/cert-limited-randomness.c
rename from clang-tools-extra/test/clang-tidy/cert-limited-randomness.c
rename to clang-tools-extra/test/clang-tidy/checkers/cert-limited-randomness.c
diff --git a/clang-tools-extra/test/clang-tidy/cert-limited-randomness.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-limited-randomness.cpp
rename from clang-tools-extra/test/clang-tidy/cert-limited-randomness.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert-limited-randomness.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-msc32-c.c b/clang-tools-extra/test/clang-tidy/checkers/cert-msc32-c.c
rename from clang-tools-extra/test/clang-tidy/cert-msc32-c.c
rename to clang-tools-extra/test/clang-tidy/checkers/cert-msc32-c.c
diff --git a/clang-tools-extra/test/clang-tidy/cert-msc51-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-msc51-cpp.cpp
rename from clang-tools-extra/test/clang-tidy/cert-msc51-cpp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert-msc51-cpp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-oop11-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-oop11-cpp.cpp
rename from clang-tools-extra/test/clang-tidy/cert-oop11-cpp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert-oop11-cpp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-oop54-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-oop54-cpp.cpp
rename from clang-tools-extra/test/clang-tidy/cert-oop54-cpp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert-oop54-cpp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-setlongjmp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-setlongjmp.cpp
rename from clang-tools-extra/test/clang-tidy/cert-setlongjmp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert-setlongjmp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-static-object-exception.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-static-object-exception.cpp
rename from clang-tools-extra/test/clang-tidy/cert-static-object-exception.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert-static-object-exception.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-throw-exception-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-throw-exception-type.cpp
rename from clang-tools-extra/test/clang-tidy/cert-throw-exception-type.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert-throw-exception-type.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-uppercase-literal-suffix-integer.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-uppercase-literal-suffix-integer.cpp
rename from clang-tools-extra/test/clang-tidy/cert-uppercase-literal-suffix-integer.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert-uppercase-literal-suffix-integer.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-variadic-function-def.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-variadic-function-def.cpp
rename from clang-tools-extra/test/clang-tidy/cert-variadic-function-def.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert-variadic-function-def.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-avoid-goto.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-avoid-goto.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-avoid-goto.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-avoid-goto.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-init-variables.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-init-variables.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-init-variables.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-init-variables.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-interfaces-global-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-interfaces-global-init.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-interfaces-global-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-interfaces-global-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage-caps-only.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-caps-only.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage-caps-only.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-caps-only.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage-command-line-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-command-line-macros.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage-command-line-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-command-line-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage-custom.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-custom.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage-custom.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-custom.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-long-is-32bits.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-long-is-32bits.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-long-is-32bits.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-long-is-32bits.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-narrowingfloatingpoint-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-narrowingfloatingpoint-option.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-narrowingfloatingpoint-option.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-narrowingfloatingpoint-option.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-pedanticmode-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-pedanticmode-option.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-pedanticmode-option.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-pedanticmode-option.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-unsigned-char.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-unsigned-char.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-unsigned-char.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-unsigned-char.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-no-malloc-custom.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc-custom.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-no-malloc-custom.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc-custom.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-no-malloc-no-functions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc-no-functions.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-no-malloc-no-functions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc-no-functions.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-no-malloc.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-no-malloc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory-containers.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory-containers.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory-containers.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory-containers.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory-legacy-functions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory-legacy-functions.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory-legacy-functions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory-legacy-functions.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-array-to-pointer-decay.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-array-to-pointer-decay.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-array-to-pointer-decay.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-array-to-pointer-decay.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index-c++03.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index-c++03.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index-c++03.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index-c++03.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index-gslheader.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index-gslheader.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index-gslheader.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index-gslheader.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-pointer-arithmetic-pr36489.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-pointer-arithmetic-pr36489.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-pointer-arithmetic-pr36489.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-pointer-arithmetic-pr36489.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-pointer-arithmetic.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-pointer-arithmetic.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-pointer-arithmetic.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-pointer-arithmetic.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-const-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-const-cast.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-const-cast.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-const-cast.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-cstyle-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-cstyle-cast.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-cstyle-cast.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-cstyle-cast.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-cxx2a.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-cxx2a.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-cxx2a.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-cxx2a.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-cxx98.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-cxx98.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-cxx98.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-cxx98.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-delayed.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-delayed.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-delayed.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-delayed.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-no-crash.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-no-crash.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-no-crash.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-no-crash.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-use-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-use-assignment.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-use-assignment.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-use-assignment.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-reinterpret-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-reinterpret-cast.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-reinterpret-cast.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-reinterpret-cast.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-static-cast-downcast.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-static-cast-downcast.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-static-cast-downcast.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-static-cast-downcast.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-union-access.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-union-access.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-union-access.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-union-access.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-vararg.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-vararg.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-vararg.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-vararg.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-slicing.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-slicing.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-slicing.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-slicing.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-special-member-functions-cxx-03.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-cxx-03.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-special-member-functions-cxx-03.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-cxx-03.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-special-member-functions-relaxed.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-relaxed.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-special-member-functions-relaxed.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-relaxed.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-special-member-functions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions.cpp
rename from clang-tools-extra/test/clang-tidy/cppcoreguidelines-special-member-functions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions.cpp
diff --git a/clang-tools-extra/test/clang-tidy/darwin-avoid-spinlock.m b/clang-tools-extra/test/clang-tidy/checkers/darwin-avoid-spinlock.m
rename from clang-tools-extra/test/clang-tidy/darwin-avoid-spinlock.m
rename to clang-tools-extra/test/clang-tidy/checkers/darwin-avoid-spinlock.m
diff --git a/clang-tools-extra/test/clang-tidy/darwin-dispatch-once-nonstatic.mm b/clang-tools-extra/test/clang-tidy/checkers/darwin-dispatch-once-nonstatic.mm
rename from clang-tools-extra/test/clang-tidy/darwin-dispatch-once-nonstatic.mm
rename to clang-tools-extra/test/clang-tidy/checkers/darwin-dispatch-once-nonstatic.mm
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-default-arguments-calls.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-default-arguments-calls.cpp
rename from clang-tools-extra/test/clang-tidy/fuchsia-default-arguments-calls.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia-default-arguments-calls.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-default-arguments-declarations.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-default-arguments-declarations.cpp
rename from clang-tools-extra/test/clang-tidy/fuchsia-default-arguments-declarations.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia-default-arguments-declarations.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-multiple-inheritance.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-multiple-inheritance.cpp
rename from clang-tools-extra/test/clang-tidy/fuchsia-multiple-inheritance.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia-multiple-inheritance.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-overloaded-operator.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-overloaded-operator.cpp
rename from clang-tools-extra/test/clang-tidy/fuchsia-overloaded-operator.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia-overloaded-operator.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes-all.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes-all.cpp
rename from clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes-all.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes-all.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes-glob.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes-glob.cpp
rename from clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes-glob.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes-glob.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes-headers.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes-headers.cpp
rename from clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes-headers.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes-headers.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes.cpp
rename from clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-statically-constructed-objects.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-statically-constructed-objects.cpp
rename from clang-tools-extra/test/clang-tidy/fuchsia-statically-constructed-objects.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia-statically-constructed-objects.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-trailing-return.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-trailing-return.cpp
rename from clang-tools-extra/test/clang-tidy/fuchsia-trailing-return.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia-trailing-return.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-virtual-inheritance.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-virtual-inheritance.cpp
rename from clang-tools-extra/test/clang-tidy/fuchsia-virtual-inheritance.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia-virtual-inheritance.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-build-explicit-make-pair.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-build-explicit-make-pair.cpp
rename from clang-tools-extra/test/clang-tidy/google-build-explicit-make-pair.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google-build-explicit-make-pair.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-default-arguments.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-default-arguments.cpp
rename from clang-tools-extra/test/clang-tidy/google-default-arguments.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google-default-arguments.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-explicit-constructor.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-explicit-constructor.cpp
rename from clang-tools-extra/test/clang-tidy/google-explicit-constructor.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google-explicit-constructor.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-module.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-module.cpp
rename from clang-tools-extra/test/clang-tidy/google-module.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google-module.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-namespaces.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-namespaces.cpp
rename from clang-tools-extra/test/clang-tidy/google-namespaces.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google-namespaces.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-objc-avoid-nsobject-new.m b/clang-tools-extra/test/clang-tidy/checkers/google-objc-avoid-nsobject-new.m
rename from clang-tools-extra/test/clang-tidy/google-objc-avoid-nsobject-new.m
rename to clang-tools-extra/test/clang-tidy/checkers/google-objc-avoid-nsobject-new.m
diff --git a/clang-tools-extra/test/clang-tidy/google-objc-avoid-throwing-exception.m b/clang-tools-extra/test/clang-tidy/checkers/google-objc-avoid-throwing-exception.m
rename from clang-tools-extra/test/clang-tidy/google-objc-avoid-throwing-exception.m
rename to clang-tools-extra/test/clang-tidy/checkers/google-objc-avoid-throwing-exception.m
diff --git a/clang-tools-extra/test/clang-tidy/google-objc-function-naming.m b/clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.m
rename from clang-tools-extra/test/clang-tidy/google-objc-function-naming.m
rename to clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.m
diff --git a/clang-tools-extra/test/clang-tidy/google-objc-function-naming.mm b/clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.mm
rename from clang-tools-extra/test/clang-tidy/google-objc-function-naming.mm
rename to clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.mm
diff --git a/clang-tools-extra/test/clang-tidy/google-objc-global-variable-declaration.m b/clang-tools-extra/test/clang-tidy/checkers/google-objc-global-variable-declaration.m
rename from clang-tools-extra/test/clang-tidy/google-objc-global-variable-declaration.m
rename to clang-tools-extra/test/clang-tidy/checkers/google-objc-global-variable-declaration.m
diff --git a/clang-tools-extra/test/clang-tidy/google-objc-global-variable-declaration.mm b/clang-tools-extra/test/clang-tidy/checkers/google-objc-global-variable-declaration.mm
rename from clang-tools-extra/test/clang-tidy/google-objc-global-variable-declaration.mm
rename to clang-tools-extra/test/clang-tidy/checkers/google-objc-global-variable-declaration.mm
diff --git a/clang-tools-extra/test/clang-tidy/google-overloaded-unary-and.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-overloaded-unary-and.cpp
rename from clang-tools-extra/test/clang-tidy/google-overloaded-unary-and.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google-overloaded-unary-and.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-readability-casting.c b/clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.c
rename from clang-tools-extra/test/clang-tidy/google-readability-casting.c
rename to clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.c
diff --git a/clang-tools-extra/test/clang-tidy/google-readability-casting.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.cpp
rename from clang-tools-extra/test/clang-tidy/google-readability-casting.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-readability-casting.mm b/clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.mm
rename from clang-tools-extra/test/clang-tidy/google-readability-casting.mm
rename to clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.mm
diff --git a/clang-tools-extra/test/clang-tidy/google-readability-namespace-comments.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-readability-namespace-comments.cpp
rename from clang-tools-extra/test/clang-tidy/google-readability-namespace-comments.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google-readability-namespace-comments.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-readability-nested-namespace-comments.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-readability-nested-namespace-comments.cpp
rename from clang-tools-extra/test/clang-tidy/google-readability-nested-namespace-comments.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google-readability-nested-namespace-comments.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-readability-todo.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-readability-todo.cpp
rename from clang-tools-extra/test/clang-tidy/google-readability-todo.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google-readability-todo.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-runtime-int-std.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int-std.cpp
rename from clang-tools-extra/test/clang-tidy/google-runtime-int-std.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google-runtime-int-std.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-runtime-int.c b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.c
rename from clang-tools-extra/test/clang-tidy/google-runtime-int.c
rename to clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.c
diff --git a/clang-tools-extra/test/clang-tidy/google-runtime-int.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.cpp
rename from clang-tools-extra/test/clang-tidy/google-runtime-int.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-runtime-int.m b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.m
rename from clang-tools-extra/test/clang-tidy/google-runtime-int.m
rename to clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.m
diff --git a/clang-tools-extra/test/clang-tidy/google-runtime-references.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-references.cpp
rename from clang-tools-extra/test/clang-tidy/google-runtime-references.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google-runtime-references.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-upgrade-googletest-case.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-upgrade-googletest-case.cpp
rename from clang-tools-extra/test/clang-tidy/google-upgrade-googletest-case.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google-upgrade-googletest-case.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-exception-baseclass.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-exception-baseclass.cpp
rename from clang-tools-extra/test/clang-tidy/hicpp-exception-baseclass.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp-exception-baseclass.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-multiway-paths-covered-else.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-multiway-paths-covered-else.cpp
rename from clang-tools-extra/test/clang-tidy/hicpp-multiway-paths-covered-else.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp-multiway-paths-covered-else.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-multiway-paths-covered.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-multiway-paths-covered.cpp
rename from clang-tools-extra/test/clang-tidy/hicpp-multiway-paths-covered.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp-multiway-paths-covered.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-no-assembler-msvc.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-no-assembler-msvc.cpp
rename from clang-tools-extra/test/clang-tidy/hicpp-no-assembler-msvc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp-no-assembler-msvc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-no-assembler.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-no-assembler.cpp
rename from clang-tools-extra/test/clang-tidy/hicpp-no-assembler.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp-no-assembler.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise-bug34747.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-bug34747.cpp
rename from clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise-bug34747.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-bug34747.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise-standard-types.h b/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.h
rename from clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise-standard-types.h
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.h
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise-standard-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.cpp
rename from clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise-standard-types.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise.cpp
rename from clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise.cpp
diff --git a/clang-tools-extra/test/clang-tidy/linuxkernel-must-check-errs.c b/clang-tools-extra/test/clang-tidy/checkers/linuxkernel-must-check-errs.c
rename from clang-tools-extra/test/clang-tidy/linuxkernel-must-check-errs.c
rename to clang-tools-extra/test/clang-tidy/checkers/linuxkernel-must-check-errs.c
diff --git a/clang-tools-extra/test/clang-tidy/llvm-include-order.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm-include-order.cpp
rename from clang-tools-extra/test/clang-tidy/llvm-include-order.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvm-include-order.cpp
diff --git a/clang-tools-extra/test/clang-tidy/llvm-prefer-isa-or-dyn-cast-in-conditionals.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-isa-or-dyn-cast-in-conditionals.cpp
rename from clang-tools-extra/test/clang-tidy/llvm-prefer-isa-or-dyn-cast-in-conditionals.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-isa-or-dyn-cast-in-conditionals.cpp
diff --git a/clang-tools-extra/test/clang-tidy/llvm-prefer-register-over-unsigned.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned.cpp
rename from clang-tools-extra/test/clang-tidy/llvm-prefer-register-over-unsigned.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned.cpp
diff --git a/clang-tools-extra/test/clang-tidy/llvm-prefer-register-over-unsigned2.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned2.cpp
rename from clang-tools-extra/test/clang-tidy/llvm-prefer-register-over-unsigned2.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned2.cpp
diff --git a/clang-tools-extra/test/clang-tidy/llvm-prefer-register-over-unsigned3.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned3.cpp
rename from clang-tools-extra/test/clang-tidy/llvm-prefer-register-over-unsigned3.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned3.cpp
diff --git a/clang-tools-extra/test/clang-tidy/llvm-twine-local.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm-twine-local.cpp
rename from clang-tools-extra/test/clang-tidy/llvm-twine-local.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvm-twine-local.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-definitions-in-headers-1z.hpp b/clang-tools-extra/test/clang-tidy/checkers/misc-definitions-in-headers-1z.hpp
rename from clang-tools-extra/test/clang-tidy/misc-definitions-in-headers-1z.hpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-definitions-in-headers-1z.hpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-definitions-in-headers.hpp b/clang-tools-extra/test/clang-tidy/checkers/misc-definitions-in-headers.hpp
rename from clang-tools-extra/test/clang-tidy/misc-definitions-in-headers.hpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-definitions-in-headers.hpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-misplaced-const-cxx17.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const-cxx17.cpp
rename from clang-tools-extra/test/clang-tidy/misc-misplaced-const-cxx17.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const-cxx17.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-misplaced-const.c b/clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const.c
rename from clang-tools-extra/test/clang-tidy/misc-misplaced-const.c
rename to clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const.c
diff --git a/clang-tools-extra/test/clang-tidy/misc-misplaced-const.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const.cpp
rename from clang-tools-extra/test/clang-tidy/misc-misplaced-const.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-new-delete-overloads-sized-dealloc.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-new-delete-overloads-sized-dealloc.cpp
rename from clang-tools-extra/test/clang-tidy/misc-new-delete-overloads-sized-dealloc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-new-delete-overloads-sized-dealloc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-new-delete-overloads.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-new-delete-overloads.cpp
rename from clang-tools-extra/test/clang-tidy/misc-new-delete-overloads.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-new-delete-overloads.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-non-copyable-objects.c b/clang-tools-extra/test/clang-tidy/checkers/misc-non-copyable-objects.c
rename from clang-tools-extra/test/clang-tidy/misc-non-copyable-objects.c
rename to clang-tools-extra/test/clang-tidy/checkers/misc-non-copyable-objects.c
diff --git a/clang-tools-extra/test/clang-tidy/misc-non-copyable-objects.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-non-copyable-objects.cpp
rename from clang-tools-extra/test/clang-tidy/misc-non-copyable-objects.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-non-copyable-objects.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-non-private-member-variables-in-classes.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-non-private-member-variables-in-classes.cpp
rename from clang-tools-extra/test/clang-tidy/misc-non-private-member-variables-in-classes.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-non-private-member-variables-in-classes.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-redundant-expression.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-redundant-expression.cpp
rename from clang-tools-extra/test/clang-tidy/misc-redundant-expression.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-redundant-expression.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-static-assert.c b/clang-tools-extra/test/clang-tidy/checkers/misc-static-assert.c
rename from clang-tools-extra/test/clang-tidy/misc-static-assert.c
rename to clang-tools-extra/test/clang-tidy/checkers/misc-static-assert.c
diff --git a/clang-tools-extra/test/clang-tidy/misc-static-assert.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-static-assert.cpp
rename from clang-tools-extra/test/clang-tidy/misc-static-assert.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-static-assert.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-throw-by-value-catch-by-reference.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-throw-by-value-catch-by-reference.cpp
rename from clang-tools-extra/test/clang-tidy/misc-throw-by-value-catch-by-reference.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-throw-by-value-catch-by-reference.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-unconventional-assign-operator-cxx17.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator-cxx17.cpp
rename from clang-tools-extra/test/clang-tidy/misc-unconventional-assign-operator-cxx17.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator-cxx17.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-unconventional-assign-operator.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator.cpp
rename from clang-tools-extra/test/clang-tidy/misc-unconventional-assign-operator.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-uniqueptr-reset-release.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-uniqueptr-reset-release.cpp
rename from clang-tools-extra/test/clang-tidy/misc-uniqueptr-reset-release.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-uniqueptr-reset-release.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-unused-alias-decls.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-alias-decls.cpp
rename from clang-tools-extra/test/clang-tidy/misc-unused-alias-decls.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-unused-alias-decls.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-unused-parameters-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters-strict.cpp
rename from clang-tools-extra/test/clang-tidy/misc-unused-parameters-strict.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters-strict.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-unused-parameters.c b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.c
rename from clang-tools-extra/test/clang-tidy/misc-unused-parameters.c
rename to clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.c
diff --git a/clang-tools-extra/test/clang-tidy/misc-unused-parameters.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.cpp
rename from clang-tools-extra/test/clang-tidy/misc-unused-parameters.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-unused-using-decls-errors.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls-errors.cpp
rename from clang-tools-extra/test/clang-tidy/misc-unused-using-decls-errors.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls-errors.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-unused-using-decls.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls.cpp
rename from clang-tools-extra/test/clang-tidy/misc-unused-using-decls.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-avoid-bind.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-bind.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-avoid-bind.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-bind.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-avoid-c-arrays-ignores-main.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays-ignores-main.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-avoid-c-arrays-ignores-main.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays-ignores-main.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-avoid-c-arrays-ignores-three-arg-main.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays-ignores-three-arg-main.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-avoid-c-arrays-ignores-three-arg-main.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays-ignores-three-arg-main.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-avoid-c-arrays.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-avoid-c-arrays.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-concat-nested-namespaces.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-concat-nested-namespaces.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-concat-nested-namespaces.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-concat-nested-namespaces.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-deprecated-headers-cxx03.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx03.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-deprecated-headers-cxx03.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx03.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-deprecated-headers-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx11.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-deprecated-headers-cxx11.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx11.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-deprecated-ios-base-aliases.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-ios-base-aliases.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-deprecated-ios-base-aliases.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-ios-base-aliases.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-assert-failure.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-assert-failure.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-loop-convert-assert-failure.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-assert-failure.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-basic.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-basic.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-loop-convert-basic.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-basic.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-camelback.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-camelback.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-loop-convert-camelback.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-camelback.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-const.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-const.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-loop-convert-const.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-const.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-extra.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-extra.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-loop-convert-extra.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-extra.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-lowercase.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-lowercase.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-loop-convert-lowercase.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-lowercase.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-negative.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-negative.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-loop-convert-negative.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-negative.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-uppercase.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-uppercase.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-loop-convert-uppercase.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-uppercase.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert.c b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert.c
rename from clang-tools-extra/test/clang-tidy/modernize-loop-convert.c
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert.c
diff --git a/clang-tools-extra/test/clang-tidy/modernize-make-shared-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared-header.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-make-shared-header.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared-header.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-make-shared.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-make-shared.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-make-unique-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-cxx11.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-make-unique-cxx11.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-cxx11.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-make-unique-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-header.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-make-unique-header.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-header.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-make-unique-inaccessible-ctors.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-inaccessible-ctors.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-make-unique-inaccessible-ctors.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-inaccessible-ctors.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-make-unique-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-macros.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-make-unique-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-make-unique.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-make-unique.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-pass-by-value-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-header.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-pass-by-value-header.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-header.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-pass-by-value-macro-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-macro-header.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-pass-by-value-macro-header.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-macro-header.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-pass-by-value-multi-fixes.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-multi-fixes.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-pass-by-value-multi-fixes.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-multi-fixes.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-pass-by-value.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-pass-by-value.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-raw-string-literal-delimiter.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal-delimiter.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-raw-string-literal-delimiter.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal-delimiter.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-raw-string-literal-replace-shorter.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal-replace-shorter.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-raw-string-literal-replace-shorter.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal-replace-shorter.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-raw-string-literal.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-raw-string-literal.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-redundant-void-arg-delayed.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg-delayed.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-redundant-void-arg-delayed.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg-delayed.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-redundant-void-arg.c b/clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg.c
rename from clang-tools-extra/test/clang-tidy/modernize-redundant-void-arg.c
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg.c
diff --git a/clang-tools-extra/test/clang-tidy/modernize-redundant-void-arg.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-redundant-void-arg.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-replace-auto-ptr.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-replace-auto-ptr.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-replace-auto-ptr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-replace-auto-ptr.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-replace-random-shuffle.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-replace-random-shuffle.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-replace-random-shuffle.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-replace-random-shuffle.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-return-braced-init-list.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-return-braced-init-list.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-return-braced-init-list.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-return-braced-init-list.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-shrink-to-fit.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-shrink-to-fit.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-shrink-to-fit.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-shrink-to-fit.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-unary-static-assert.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-unary-static-assert.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-unary-static-assert.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-unary-static-assert.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-auto-cast-remove-stars.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast-remove-stars.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-auto-cast-remove-stars.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast-remove-stars.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-auto-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-auto-cast.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-auto-iterator.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-iterator.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-auto-iterator.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-iterator.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-auto-min-type-name-length.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-min-type-name-length.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-auto-min-type-name-length.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-min-type-name-length.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-auto-new-remove-stars.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-new-remove-stars.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-auto-new-remove-stars.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-new-remove-stars.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-auto-new.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-new.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-auto-new.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-new.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-bool-literals-ignore-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-bool-literals-ignore-macros.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-bool-literals-ignore-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-bool-literals-ignore-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-bool-literals.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-bool-literals.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-bool-literals.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-bool-literals.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-default-member-init-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-assignment.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-default-member-init-assignment.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-assignment.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-default-member-init-bitfield.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-bitfield.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-default-member-init-bitfield.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-bitfield.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-default-member-init-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-macros.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-default-member-init-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-default-member-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-default-member-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-emplace-ignore-implicit-constructors.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-emplace-ignore-implicit-constructors.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-emplace-ignore-implicit-constructors.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-emplace-ignore-implicit-constructors.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-emplace.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-emplace.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-emplace.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-emplace.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-equals-default-copy.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-copy.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-equals-default-copy.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-copy.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-equals-default-delayed.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-delayed.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-equals-default-delayed.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-delayed.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-equals-default-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-macros.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-equals-default-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-equals-default.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-equals-default.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-equals-delete-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-delete-macros.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-equals-delete-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-delete-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-equals-delete.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-delete.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-equals-delete.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-delete.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-clang-unused.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-clang-unused.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-clang-unused.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-clang-unused.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-cxx11.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-cxx11.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-cxx11.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-gcc-unused.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-gcc-unused.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-gcc-unused.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-gcc-unused.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-no-macro-inscope-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-no-macro-inscope-cxx11.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-no-macro-inscope-cxx11.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-no-macro-inscope-cxx11.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-no-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-no-macro.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-no-macro.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-no-macro.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-nodiscard.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-noexcept-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-macro.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-noexcept-macro.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-macro.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-noexcept-opt.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-opt.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-noexcept-opt.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-opt.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-noexcept.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-noexcept.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nullptr-basic.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr-basic.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-nullptr-basic.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr-basic.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nullptr.c b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr.c
rename from clang-tools-extra/test/clang-tidy/modernize-use-nullptr.c
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr.c
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nullptr.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-nullptr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-override-cxx98.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-cxx98.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-override-cxx98.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-cxx98.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-override-ms.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-ms.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-override-ms.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-ms.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-override-no-destructors.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-no-destructors.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-override-no-destructors.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-no-destructors.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-override-with-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-with-macro.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-override-with-macro.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-with-macro.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-override-with-no-macro-inscope.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-with-no-macro-inscope.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-override-with-no-macro-inscope.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-with-no-macro-inscope.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-override.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-override.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-override.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-trailing-return-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-trailing-return-type.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-trailing-return-type.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-trailing-return-type.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-transparent-functors.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-transparent-functors.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-transparent-functors.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-transparent-functors.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-uncaught-exceptions.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-uncaught-exceptions.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-uncaught-exceptions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-uncaught-exceptions.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-using-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-using-macros.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-using-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-using-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-using.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-using.cpp
rename from clang-tools-extra/test/clang-tidy/modernize-use-using.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize-use-using.cpp
diff --git a/clang-tools-extra/test/clang-tidy/mpi-buffer-deref.cpp b/clang-tools-extra/test/clang-tidy/checkers/mpi-buffer-deref.cpp
rename from clang-tools-extra/test/clang-tidy/mpi-buffer-deref.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/mpi-buffer-deref.cpp
diff --git a/clang-tools-extra/test/clang-tidy/mpi-type-mismatch.cpp b/clang-tools-extra/test/clang-tidy/checkers/mpi-type-mismatch.cpp
rename from clang-tools-extra/test/clang-tidy/mpi-type-mismatch.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/mpi-type-mismatch.cpp
diff --git a/clang-tools-extra/test/clang-tidy/objc-avoid-nserror-init.m b/clang-tools-extra/test/clang-tidy/checkers/objc-avoid-nserror-init.m
rename from clang-tools-extra/test/clang-tidy/objc-avoid-nserror-init.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc-avoid-nserror-init.m
diff --git a/clang-tools-extra/test/clang-tidy/objc-forbidden-subclassing-custom.m b/clang-tools-extra/test/clang-tidy/checkers/objc-forbidden-subclassing-custom.m
rename from clang-tools-extra/test/clang-tidy/objc-forbidden-subclassing-custom.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc-forbidden-subclassing-custom.m
diff --git a/clang-tools-extra/test/clang-tidy/objc-forbidden-subclassing.m b/clang-tools-extra/test/clang-tidy/checkers/objc-forbidden-subclassing.m
rename from clang-tools-extra/test/clang-tidy/objc-forbidden-subclassing.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc-forbidden-subclassing.m
diff --git a/clang-tools-extra/test/clang-tidy/objc-missing-hash.m b/clang-tools-extra/test/clang-tidy/checkers/objc-missing-hash.m
rename from clang-tools-extra/test/clang-tidy/objc-missing-hash.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc-missing-hash.m
diff --git a/clang-tools-extra/test/clang-tidy/objc-property-declaration.m b/clang-tools-extra/test/clang-tidy/checkers/objc-property-declaration.m
rename from clang-tools-extra/test/clang-tidy/objc-property-declaration.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc-property-declaration.m
diff --git a/clang-tools-extra/test/clang-tidy/objc-super-self.m b/clang-tools-extra/test/clang-tidy/checkers/objc-super-self.m
rename from clang-tools-extra/test/clang-tidy/objc-super-self.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc-super-self.m
diff --git a/clang-tools-extra/test/clang-tidy/openmp-exception-escape.cpp b/clang-tools-extra/test/clang-tidy/checkers/openmp-exception-escape.cpp
rename from clang-tools-extra/test/clang-tidy/openmp-exception-escape.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/openmp-exception-escape.cpp
diff --git a/clang-tools-extra/test/clang-tidy/openmp-use-default-none.cpp b/clang-tools-extra/test/clang-tidy/checkers/openmp-use-default-none.cpp
rename from clang-tools-extra/test/clang-tidy/openmp-use-default-none.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/openmp-use-default-none.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-faster-string-find.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-faster-string-find.cpp
rename from clang-tools-extra/test/clang-tidy/performance-faster-string-find.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-faster-string-find.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-for-range-copy-allowed-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy-allowed-types.cpp
rename from clang-tools-extra/test/clang-tidy/performance-for-range-copy-allowed-types.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy-allowed-types.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-for-range-copy-warn-on-all-auto-copies.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy-warn-on-all-auto-copies.cpp
rename from clang-tools-extra/test/clang-tidy/performance-for-range-copy-warn-on-all-auto-copies.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy-warn-on-all-auto-copies.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-for-range-copy.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy.cpp
rename from clang-tools-extra/test/clang-tidy/performance-for-range-copy.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-implicit-conversion-in-loop.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-implicit-conversion-in-loop.cpp
rename from clang-tools-extra/test/clang-tidy/performance-implicit-conversion-in-loop.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-implicit-conversion-in-loop.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-inefficient-algorithm.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-algorithm.cpp
rename from clang-tools-extra/test/clang-tidy/performance-inefficient-algorithm.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-algorithm.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-inefficient-string-concatenation.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-string-concatenation.cpp
rename from clang-tools-extra/test/clang-tidy/performance-inefficient-string-concatenation.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-string-concatenation.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-inefficient-vector-operation.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-vector-operation.cpp
rename from clang-tools-extra/test/clang-tidy/performance-inefficient-vector-operation.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-vector-operation.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-move-const-arg-trivially-copyable.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg-trivially-copyable.cpp
rename from clang-tools-extra/test/clang-tidy/performance-move-const-arg-trivially-copyable.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg-trivially-copyable.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-move-const-arg.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg.cpp
rename from clang-tools-extra/test/clang-tidy/performance-move-const-arg.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-move-constructor-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-move-constructor-init.cpp
rename from clang-tools-extra/test/clang-tidy/performance-move-constructor-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-move-constructor-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-noexcept-move-constructor-fix.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-noexcept-move-constructor-fix.cpp
rename from clang-tools-extra/test/clang-tidy/performance-noexcept-move-constructor-fix.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-noexcept-move-constructor-fix.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-noexcept-move-constructor.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-noexcept-move-constructor.cpp
rename from clang-tools-extra/test/clang-tidy/performance-noexcept-move-constructor.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-noexcept-move-constructor.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-type-promotion-in-math-fn.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-type-promotion-in-math-fn.cpp
rename from clang-tools-extra/test/clang-tidy/performance-type-promotion-in-math-fn.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-type-promotion-in-math-fn.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-copy-initialization-allowed-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization-allowed-types.cpp
rename from clang-tools-extra/test/clang-tidy/performance-unnecessary-copy-initialization-allowed-types.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization-allowed-types.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-copy-initialization.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization.cpp
rename from clang-tools-extra/test/clang-tidy/performance-unnecessary-copy-initialization.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-allowed-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-allowed-types.cpp
rename from clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-allowed-types.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-allowed-types.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-arc.m b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-arc.m
rename from clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-arc.m
rename to clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-arc.m
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-arc.mm b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-arc.mm
rename from clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-arc.mm
rename to clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-arc.mm
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-delayed.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-delayed.cpp
rename from clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-delayed.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-delayed.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-header.cpp
rename from clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-header.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-header.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-incomplete-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-incomplete-type.cpp
rename from clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-incomplete-type.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-incomplete-type.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param.cpp
rename from clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param.cpp
diff --git a/clang-tools-extra/test/clang-tidy/portability-simd-intrinsics-ppc.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability-simd-intrinsics-ppc.cpp
rename from clang-tools-extra/test/clang-tidy/portability-simd-intrinsics-ppc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/portability-simd-intrinsics-ppc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/portability-simd-intrinsics-x86.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability-simd-intrinsics-x86.cpp
rename from clang-tools-extra/test/clang-tidy/portability-simd-intrinsics-x86.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/portability-simd-intrinsics-x86.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-avoid-const-params-in-decls.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-avoid-const-params-in-decls.cpp
rename from clang-tools-extra/test/clang-tidy/readability-avoid-const-params-in-decls.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-avoid-const-params-in-decls.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-avoid-underscore-in-googletest-name.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-avoid-underscore-in-googletest-name.cpp
rename from clang-tools-extra/test/clang-tidy/readability-avoid-underscore-in-googletest-name.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-avoid-underscore-in-googletest-name.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-assert-failure.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-assert-failure.cpp
rename from clang-tools-extra/test/clang-tidy/readability-braces-around-statements-assert-failure.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-assert-failure.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-few-lines.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-few-lines.cpp
rename from clang-tools-extra/test/clang-tidy/readability-braces-around-statements-few-lines.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-few-lines.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-format.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-format.cpp
rename from clang-tools-extra/test/clang-tidy/readability-braces-around-statements-format.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-format.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-same-line.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-same-line.cpp
rename from clang-tools-extra/test/clang-tidy/readability-braces-around-statements-same-line.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-same-line.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-single-line.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-single-line.cpp
rename from clang-tools-extra/test/clang-tidy/readability-braces-around-statements-single-line.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-single-line.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements.cpp
rename from clang-tools-extra/test/clang-tidy/readability-braces-around-statements.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-const-return-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-const-return-type.cpp
rename from clang-tools-extra/test/clang-tidy/readability-const-return-type.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-const-return-type.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-container-size-empty.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-container-size-empty.cpp
rename from clang-tools-extra/test/clang-tidy/readability-container-size-empty.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-container-size-empty.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-convert-member-functions-to-static.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-convert-member-functions-to-static.cpp
rename from clang-tools-extra/test/clang-tidy/readability-convert-member-functions-to-static.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-convert-member-functions-to-static.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-delete-null-pointer.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-delete-null-pointer.cpp
rename from clang-tools-extra/test/clang-tidy/readability-delete-null-pointer.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-delete-null-pointer.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-deleted-default.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-deleted-default.cpp
rename from clang-tools-extra/test/clang-tidy/readability-deleted-default.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-deleted-default.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-else-after-return-if-constexpr.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-if-constexpr.cpp
rename from clang-tools-extra/test/clang-tidy/readability-else-after-return-if-constexpr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-if-constexpr.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-else-after-return.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return.cpp
rename from clang-tools-extra/test/clang-tidy/readability-else-after-return.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-function-size-variables-c++17.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-function-size-variables-c++17.cpp
rename from clang-tools-extra/test/clang-tidy/readability-function-size-variables-c++17.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-function-size-variables-c++17.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-function-size.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-function-size.cpp
rename from clang-tools-extra/test/clang-tidy/readability-function-size.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-function-size.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-identifier-naming-bugfix.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-bugfix.cpp
rename from clang-tools-extra/test/clang-tidy/readability-identifier-naming-bugfix.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-bugfix.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-identifier-naming-objc.m b/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-objc.m
rename from clang-tools-extra/test/clang-tidy/readability-identifier-naming-objc.m
rename to clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-objc.m
diff --git a/clang-tools-extra/test/clang-tidy/readability-identifier-naming.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
rename from clang-tools-extra/test/clang-tidy/readability-identifier-naming.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-implicit-bool-conversion-allow-in-conditions.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion-allow-in-conditions.cpp
rename from clang-tools-extra/test/clang-tidy/readability-implicit-bool-conversion-allow-in-conditions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion-allow-in-conditions.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-implicit-bool-conversion-cxx98.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion-cxx98.cpp
rename from clang-tools-extra/test/clang-tidy/readability-implicit-bool-conversion-cxx98.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion-cxx98.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-implicit-bool-conversion.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion.cpp
rename from clang-tools-extra/test/clang-tidy/readability-implicit-bool-conversion.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-inconsistent-declaration-parameter-name-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name-macros.cpp
rename from clang-tools-extra/test/clang-tidy/readability-inconsistent-declaration-parameter-name-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-inconsistent-declaration-parameter-name-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name-strict.cpp
rename from clang-tools-extra/test/clang-tidy/readability-inconsistent-declaration-parameter-name-strict.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name-strict.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-inconsistent-declaration-parameter-name.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name.cpp
rename from clang-tools-extra/test/clang-tidy/readability-inconsistent-declaration-parameter-name.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration-cxx17.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-cxx17.cpp
rename from clang-tools-extra/test/clang-tidy/readability-isolate-declaration-cxx17.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-cxx17.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration-fixing.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-fixing.cpp
rename from clang-tools-extra/test/clang-tidy/readability-isolate-declaration-fixing.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-fixing.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration-no-infinite-loop.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-no-infinite-loop.cpp
rename from clang-tools-extra/test/clang-tidy/readability-isolate-declaration-no-infinite-loop.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-no-infinite-loop.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration.c b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration.c
rename from clang-tools-extra/test/clang-tidy/readability-isolate-declaration.c
rename to clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration.c
diff --git a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration.cpp
rename from clang-tools-extra/test/clang-tidy/readability-isolate-declaration.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-magic-numbers.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers.cpp
rename from clang-tools-extra/test/clang-tidy/readability-magic-numbers.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-misleading-indentation.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-misleading-indentation.cpp
rename from clang-tools-extra/test/clang-tidy/readability-misleading-indentation.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-misleading-indentation.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-misplaced-array-index.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-misplaced-array-index.cpp
rename from clang-tools-extra/test/clang-tidy/readability-misplaced-array-index.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-misplaced-array-index.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-named-parameter.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-named-parameter.cpp
rename from clang-tools-extra/test/clang-tidy/readability-named-parameter.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-named-parameter.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-non-const-parameter.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-non-const-parameter.cpp
rename from clang-tools-extra/test/clang-tidy/readability-non-const-parameter.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-non-const-parameter.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-control-flow.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-control-flow.cpp
rename from clang-tools-extra/test/clang-tidy/readability-redundant-control-flow.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-control-flow.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-declaration-ignore-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration-ignore-macros.cpp
rename from clang-tools-extra/test/clang-tidy/readability-redundant-declaration-ignore-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration-ignore-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-declaration.c b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration.c
rename from clang-tools-extra/test/clang-tidy/readability-redundant-declaration.c
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration.c
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-declaration.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration.cpp
rename from clang-tools-extra/test/clang-tidy/readability-redundant-declaration.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-function-ptr-dereference.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-function-ptr-dereference.cpp
rename from clang-tools-extra/test/clang-tidy/readability-redundant-function-ptr-dereference.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-function-ptr-dereference.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-member-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-member-init.cpp
rename from clang-tools-extra/test/clang-tidy/readability-redundant-member-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-member-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-preprocessor-ifdef.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor-ifdef.cpp
rename from clang-tools-extra/test/clang-tidy/readability-redundant-preprocessor-ifdef.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor-ifdef.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-preprocessor.h b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.h
rename from clang-tools-extra/test/clang-tidy/readability-redundant-preprocessor.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.h
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-preprocessor.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.cpp
rename from clang-tools-extra/test/clang-tidy/readability-redundant-preprocessor.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-smartptr-get-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get-macros.cpp
rename from clang-tools-extra/test/clang-tidy/readability-redundant-smartptr-get-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-smartptr-get-msvc.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get-msvc.cpp
rename from clang-tools-extra/test/clang-tidy/readability-redundant-smartptr-get-msvc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get-msvc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-smartptr-get.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get.cpp
rename from clang-tools-extra/test/clang-tidy/readability-redundant-smartptr-get.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-string-cstr-msvc.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-cstr-msvc.cpp
rename from clang-tools-extra/test/clang-tidy/readability-redundant-string-cstr-msvc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-cstr-msvc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-string-cstr.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-cstr.cpp
rename from clang-tools-extra/test/clang-tidy/readability-redundant-string-cstr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-cstr.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-string-init-msvc.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp
rename from clang-tools-extra/test/clang-tidy/readability-redundant-string-init-msvc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-string-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp
rename from clang-tools-extra/test/clang-tidy/readability-redundant-string-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr-chained-conditional-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-chained-conditional-assignment.cpp
rename from clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr-chained-conditional-assignment.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-chained-conditional-assignment.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr-chained-conditional-return.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-chained-conditional-return.cpp
rename from clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr-chained-conditional-return.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-chained-conditional-return.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr-members.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-members.cpp
rename from clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr-members.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-members.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr.cpp
rename from clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-simplify-subscript-expr.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-subscript-expr.cpp
rename from clang-tools-extra/test/clang-tidy/readability-simplify-subscript-expr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-simplify-subscript-expr.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-static-accessed-through-instance-nesting-threshold.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance-nesting-threshold.cpp
rename from clang-tools-extra/test/clang-tidy/readability-static-accessed-through-instance-nesting-threshold.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance-nesting-threshold.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-static-accessed-through-instance.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance.cpp
rename from clang-tools-extra/test/clang-tidy/readability-static-accessed-through-instance.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-static-definition-in-anonymous-namespace.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-static-definition-in-anonymous-namespace.cpp
rename from clang-tools-extra/test/clang-tidy/readability-static-definition-in-anonymous-namespace.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-static-definition-in-anonymous-namespace.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-string-compare.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-string-compare.cpp
rename from clang-tools-extra/test/clang-tidy/readability-string-compare.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-string-compare.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uniqueptr-delete-release.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uniqueptr-delete-release.cpp
rename from clang-tools-extra/test/clang-tidy/readability-uniqueptr-delete-release.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-uniqueptr-delete-release.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-float16.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-float16.cpp
rename from clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-float16.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-float16.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-floating-point-opencl-half.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point-opencl-half.cpp
rename from clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-floating-point-opencl-half.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point-opencl-half.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-floating-point.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point.cpp
rename from clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-floating-point.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-hexadecimal-floating-point.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-hexadecimal-floating-point.cpp
rename from clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-hexadecimal-floating-point.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-hexadecimal-floating-point.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer-custom-list.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-custom-list.cpp
rename from clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer-custom-list.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-custom-list.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-macro.cpp
rename from clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer-macro.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-macro.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer-ms.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-ms.cpp
rename from clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer-ms.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-ms.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer.cpp
rename from clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix.h b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix.h
rename from clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix.h
diff --git a/clang-tools-extra/test/clang-tidy/zircon-temporary-objects.cpp b/clang-tools-extra/test/clang-tidy/checkers/zircon-temporary-objects.cpp
rename from clang-tools-extra/test/clang-tidy/zircon-temporary-objects.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/zircon-temporary-objects.cpp
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/a.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/a.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/a.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/a.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/b.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/b.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/b.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/b.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/s.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/s.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/s.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/s.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/stdio.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/stdio.h
rename from clang-tools-extra/test/clang-tidy/Inputs/Headers/stdio.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/stdio.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/compilation-database/template.json b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/compilation-database/template.json
rename from clang-tools-extra/test/clang-tidy/Inputs/compilation-database/template.json
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/compilation-database/template.json
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/config-files/.clang-tidy b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/.clang-tidy
rename from clang-tools-extra/test/clang-tidy/Inputs/config-files/.clang-tidy
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/.clang-tidy
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/config-files/1/.clang-tidy b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/1/.clang-tidy
rename from clang-tools-extra/test/clang-tidy/Inputs/config-files/1/.clang-tidy
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/1/.clang-tidy
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/empty-database/compile_commands.json b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/empty-database/compile_commands.json
rename from clang-tools-extra/test/clang-tidy/Inputs/empty-database/compile_commands.json
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/empty-database/compile_commands.json
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/a.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/a.h
rename from clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/a.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/a.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/b.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/b.h
rename from clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/b.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/b.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/c.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/c.h
rename from clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/c.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/c.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/module.modulemap b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/module.modulemap
rename from clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/module.modulemap
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/module.modulemap
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/explain-config/.clang-tidy b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/explain-config/.clang-tidy
rename from clang-tools-extra/test/clang-tidy/Inputs/explain-config/.clang-tidy
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/explain-config/.clang-tidy
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/file-filter/header1.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/file-filter/header1.h
rename from clang-tools-extra/test/clang-tidy/Inputs/file-filter/header1.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/file-filter/header1.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/file-filter/header2.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/file-filter/header2.h
rename from clang-tools-extra/test/clang-tidy/Inputs/file-filter/header2.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/file-filter/header2.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/file-filter/system/system-header.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/file-filter/system/system-header.h
rename from clang-tools-extra/test/clang-tidy/Inputs/file-filter/system/system-header.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/file-filter/system/system-header.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/line-filter/header1.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/line-filter/header1.h
rename from clang-tools-extra/test/clang-tidy/Inputs/line-filter/header1.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/line-filter/header1.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/line-filter/header2.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/line-filter/header2.h
rename from clang-tools-extra/test/clang-tidy/Inputs/line-filter/header2.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/line-filter/header2.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/line-filter/header3.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/line-filter/header3.h
rename from clang-tools-extra/test/clang-tidy/Inputs/line-filter/header3.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/line-filter/header3.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/mock-libcxx/bin/clang b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/mock-libcxx/bin/clang
rename from clang-tools-extra/test/clang-tidy/Inputs/mock-libcxx/bin/clang
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/mock-libcxx/bin/clang
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/mock-libcxx/include/c++/v1/mock_vector b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/mock-libcxx/include/c++/v1/mock_vector
rename from clang-tools-extra/test/clang-tidy/Inputs/mock-libcxx/include/c++/v1/mock_vector
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/mock-libcxx/include/c++/v1/mock_vector
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/nolint/trigger_warning.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/nolint/trigger_warning.h
rename from clang-tools-extra/test/clang-tidy/Inputs/nolint/trigger_warning.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/nolint/trigger_warning.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/overlapping/o.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/overlapping/o.h
rename from clang-tools-extra/test/clang-tidy/Inputs/overlapping/o.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/overlapping/o.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/vfsoverlay/actual_header.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/vfsoverlay/actual_header.h
rename from clang-tools-extra/test/clang-tidy/Inputs/vfsoverlay/actual_header.h
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/vfsoverlay/actual_header.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/vfsoverlay/vfsoverlay.yaml b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/vfsoverlay/vfsoverlay.yaml
rename from clang-tools-extra/test/clang-tidy/Inputs/vfsoverlay/vfsoverlay.yaml
rename to clang-tools-extra/test/clang-tidy/infrastructure/Inputs/vfsoverlay/vfsoverlay.yaml
diff --git a/clang-tools-extra/test/clang-tidy/alternative-fixes.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/alternative-fixes.cpp
rename from clang-tools-extra/test/clang-tidy/alternative-fixes.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/alternative-fixes.cpp
diff --git a/clang-tools-extra/test/clang-tidy/basic.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/basic.cpp
rename from clang-tools-extra/test/clang-tidy/basic.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/basic.cpp
diff --git a/clang-tools-extra/test/clang-tidy/check_clang_tidy.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/check_clang_tidy.cpp
rename from clang-tools-extra/test/clang-tidy/check_clang_tidy.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/check_clang_tidy.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-__clang_analyzer__macro.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-__clang_analyzer__macro.cpp
rename from clang-tools-extra/test/clang-tidy/clang-tidy-__clang_analyzer__macro.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-__clang_analyzer__macro.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-diff.cpp
rename from clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-diff.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-enable-check-profile-one-tu.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-enable-check-profile-one-tu.cpp
rename from clang-tools-extra/test/clang-tidy/clang-tidy-enable-check-profile-one-tu.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-enable-check-profile-one-tu.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-enable-check-profile-two-tu.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-enable-check-profile-two-tu.cpp
rename from clang-tools-extra/test/clang-tidy/clang-tidy-enable-check-profile-two-tu.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-enable-check-profile-two-tu.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-mac-libcxx.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-mac-libcxx.cpp
rename from clang-tools-extra/test/clang-tidy/clang-tidy-mac-libcxx.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-mac-libcxx.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-run-with-database.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-run-with-database.cpp
rename from clang-tools-extra/test/clang-tidy/clang-tidy-run-with-database.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-run-with-database.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-store-check-profile-one-tu.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-store-check-profile-one-tu.cpp
rename from clang-tools-extra/test/clang-tidy/clang-tidy-store-check-profile-one-tu.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-store-check-profile-one-tu.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clean-up-code.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clean-up-code.cpp
rename from clang-tools-extra/test/clang-tidy/clean-up-code.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/clean-up-code.cpp
diff --git a/clang-tools-extra/test/clang-tidy/config-files.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/config-files.cpp
rename from clang-tools-extra/test/clang-tidy/config-files.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/config-files.cpp
diff --git a/clang-tools-extra/test/clang-tidy/custom-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/custom-diagnostics.cpp
rename from clang-tools-extra/test/clang-tidy/custom-diagnostics.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/custom-diagnostics.cpp
diff --git a/clang-tools-extra/test/clang-tidy/deduplication.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/deduplication.cpp
rename from clang-tools-extra/test/clang-tidy/deduplication.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/deduplication.cpp
diff --git a/clang-tools-extra/test/clang-tidy/diagnostic.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/diagnostic.cpp
rename from clang-tools-extra/test/clang-tidy/diagnostic.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/diagnostic.cpp
diff --git a/clang-tools-extra/test/clang-tidy/duplicate-reports.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/duplicate-reports.cpp
rename from clang-tools-extra/test/clang-tidy/duplicate-reports.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/duplicate-reports.cpp
diff --git a/clang-tools-extra/test/clang-tidy/empty-database.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/empty-database.cpp
rename from clang-tools-extra/test/clang-tidy/empty-database.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/empty-database.cpp
diff --git a/clang-tools-extra/test/clang-tidy/enable-alpha-checks.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/enable-alpha-checks.cpp
rename from clang-tools-extra/test/clang-tidy/enable-alpha-checks.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/enable-alpha-checks.cpp
diff --git a/clang-tools-extra/test/clang-tidy/expand-modular-headers-ppcallbacks.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/expand-modular-headers-ppcallbacks.cpp
rename from clang-tools-extra/test/clang-tidy/expand-modular-headers-ppcallbacks.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/expand-modular-headers-ppcallbacks.cpp
diff --git a/clang-tools-extra/test/clang-tidy/explain-checks.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/explain-checks.cpp
rename from clang-tools-extra/test/clang-tidy/explain-checks.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/explain-checks.cpp
diff --git a/clang-tools-extra/test/clang-tidy/export-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-diagnostics.cpp
rename from clang-tools-extra/test/clang-tidy/export-diagnostics.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/export-diagnostics.cpp
diff --git a/clang-tools-extra/test/clang-tidy/export-relpath.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-relpath.cpp
rename from clang-tools-extra/test/clang-tidy/export-relpath.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/export-relpath.cpp
diff --git a/clang-tools-extra/test/clang-tidy/extra-args.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/extra-args.cpp
rename from clang-tools-extra/test/clang-tidy/extra-args.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/extra-args.cpp
diff --git a/clang-tools-extra/test/clang-tidy/file-filter-symlinks.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/file-filter-symlinks.cpp
rename from clang-tools-extra/test/clang-tidy/file-filter-symlinks.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/file-filter-symlinks.cpp
diff --git a/clang-tools-extra/test/clang-tidy/file-filter.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/file-filter.cpp
rename from clang-tools-extra/test/clang-tidy/file-filter.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/file-filter.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fix-errors.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/fix-errors.cpp
rename from clang-tools-extra/test/clang-tidy/fix-errors.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/fix-errors.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fix.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/fix.cpp
rename from clang-tools-extra/test/clang-tidy/fix.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/fix.cpp
diff --git a/clang-tools-extra/test/clang-tidy/line-filter.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/line-filter.cpp
rename from clang-tools-extra/test/clang-tidy/line-filter.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/line-filter.cpp
diff --git a/clang-tools-extra/test/clang-tidy/list-checks.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/list-checks.cpp
rename from clang-tools-extra/test/clang-tidy/list-checks.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/list-checks.cpp
diff --git a/clang-tools-extra/test/clang-tidy/macros.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/macros.cpp
rename from clang-tools-extra/test/clang-tidy/macros.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/nolint-plugin.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/nolint-plugin.cpp
rename from clang-tools-extra/test/clang-tidy/nolint-plugin.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/nolint-plugin.cpp
diff --git a/clang-tools-extra/test/clang-tidy/nolint.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/nolint.cpp
rename from clang-tools-extra/test/clang-tidy/nolint.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/nolint.cpp
diff --git a/clang-tools-extra/test/clang-tidy/nolintnextline-plugin.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/nolintnextline-plugin.cpp
rename from clang-tools-extra/test/clang-tidy/nolintnextline-plugin.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/nolintnextline-plugin.cpp
diff --git a/clang-tools-extra/test/clang-tidy/nolintnextline.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/nolintnextline.cpp
rename from clang-tools-extra/test/clang-tidy/nolintnextline.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/nolintnextline.cpp
diff --git a/clang-tools-extra/test/clang-tidy/nonstandard-file-extension.test b/clang-tools-extra/test/clang-tidy/infrastructure/nonstandard-file-extension.test
rename from clang-tools-extra/test/clang-tidy/nonstandard-file-extension.test
rename to clang-tools-extra/test/clang-tidy/infrastructure/nonstandard-file-extension.test
diff --git a/clang-tools-extra/test/clang-tidy/objc-arc-and-properties.m b/clang-tools-extra/test/clang-tidy/infrastructure/objc-arc-and-properties.m
rename from clang-tools-extra/test/clang-tidy/objc-arc-and-properties.m
rename to clang-tools-extra/test/clang-tidy/infrastructure/objc-arc-and-properties.m
diff --git a/clang-tools-extra/test/clang-tidy/objc-no-arc-or-properties.m b/clang-tools-extra/test/clang-tidy/infrastructure/objc-no-arc-or-properties.m
rename from clang-tools-extra/test/clang-tidy/objc-no-arc-or-properties.m
rename to clang-tools-extra/test/clang-tidy/infrastructure/objc-no-arc-or-properties.m
diff --git a/clang-tools-extra/test/clang-tidy/overlapping.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/overlapping.cpp
rename from clang-tools-extra/test/clang-tidy/overlapping.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/overlapping.cpp
diff --git a/clang-tools-extra/test/clang-tidy/pr37091.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/pr37091.cpp
rename from clang-tools-extra/test/clang-tidy/pr37091.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/pr37091.cpp
diff --git a/clang-tools-extra/test/clang-tidy/read_file_config.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/read_file_config.cpp
rename from clang-tools-extra/test/clang-tidy/read_file_config.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/read_file_config.cpp
diff --git a/clang-tools-extra/test/clang-tidy/run-clang-tidy.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/run-clang-tidy.cpp
rename from clang-tools-extra/test/clang-tidy/run-clang-tidy.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/run-clang-tidy.cpp
diff --git a/clang-tools-extra/test/clang-tidy/select-checks.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/select-checks.cpp
rename from clang-tools-extra/test/clang-tidy/select-checks.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/select-checks.cpp
diff --git a/clang-tools-extra/test/clang-tidy/serialize-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/serialize-diagnostics.cpp
rename from clang-tools-extra/test/clang-tidy/serialize-diagnostics.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/serialize-diagnostics.cpp
diff --git a/clang-tools-extra/test/clang-tidy/static-analyzer-config.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/static-analyzer-config.cpp
rename from clang-tools-extra/test/clang-tidy/static-analyzer-config.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/static-analyzer-config.cpp
diff --git a/clang-tools-extra/test/clang-tidy/static-analyzer.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/static-analyzer.cpp
rename from clang-tools-extra/test/clang-tidy/static-analyzer.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/static-analyzer.cpp
diff --git a/clang-tools-extra/test/clang-tidy/temporaries.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/temporaries.cpp
rename from clang-tools-extra/test/clang-tidy/temporaries.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/temporaries.cpp
diff --git a/clang-tools-extra/test/clang-tidy/validate-check-names.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/validate-check-names.cpp
rename from clang-tools-extra/test/clang-tidy/validate-check-names.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/validate-check-names.cpp
diff --git a/clang-tools-extra/test/clang-tidy/vfsoverlay.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/vfsoverlay.cpp
rename from clang-tools-extra/test/clang-tidy/vfsoverlay.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/vfsoverlay.cpp
diff --git a/clang-tools-extra/test/clang-tidy/warnings-as-errors-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/warnings-as-errors-diagnostics.cpp
rename from clang-tools-extra/test/clang-tidy/warnings-as-errors-diagnostics.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/warnings-as-errors-diagnostics.cpp
diff --git a/clang-tools-extra/test/clang-tidy/warnings-as-errors-plural.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/warnings-as-errors-plural.cpp
rename from clang-tools-extra/test/clang-tidy/warnings-as-errors-plural.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/warnings-as-errors-plural.cpp
diff --git a/clang-tools-extra/test/clang-tidy/warnings-as-errors.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/warnings-as-errors.cpp
rename from clang-tools-extra/test/clang-tidy/warnings-as-errors.cpp
rename to clang-tools-extra/test/clang-tidy/infrastructure/warnings-as-errors.cpp