diff --git a/lldb/lit/Modules/Breakpad/Inputs/bad-module-id-1.syms b/lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-1.syms
similarity index 100%
rename from lldb/lit/Modules/Breakpad/Inputs/bad-module-id-1.syms
rename to lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-1.syms
diff --git a/lldb/lit/Modules/Breakpad/Inputs/bad-module-id-2.syms b/lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-2.syms
similarity index 100%
rename from lldb/lit/Modules/Breakpad/Inputs/bad-module-id-2.syms
rename to lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-2.syms
diff --git a/lldb/lit/Modules/Breakpad/Inputs/bad-module-id-3.syms b/lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-3.syms
similarity index 100%
rename from lldb/lit/Modules/Breakpad/Inputs/bad-module-id-3.syms
rename to lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-3.syms
diff --git a/lldb/lit/Modules/Breakpad/Inputs/discontiguous-sections.syms b/lldb/lit/ObjectFile/Breakpad/Inputs/discontiguous-sections.syms
similarity index 100%
rename from lldb/lit/Modules/Breakpad/Inputs/discontiguous-sections.syms
rename to lldb/lit/ObjectFile/Breakpad/Inputs/discontiguous-sections.syms
diff --git a/lldb/lit/Modules/Breakpad/Inputs/identification-linux.syms b/lldb/lit/ObjectFile/Breakpad/Inputs/identification-linux.syms
similarity index 100%
rename from lldb/lit/Modules/Breakpad/Inputs/identification-linux.syms
rename to lldb/lit/ObjectFile/Breakpad/Inputs/identification-linux.syms
diff --git a/lldb/lit/Modules/Breakpad/Inputs/identification-macosx-arm64e.syms b/lldb/lit/ObjectFile/Breakpad/Inputs/identification-macosx-arm64e.syms
similarity index 100%
rename from lldb/lit/Modules/Breakpad/Inputs/identification-macosx-arm64e.syms
rename to lldb/lit/ObjectFile/Breakpad/Inputs/identification-macosx-arm64e.syms
diff --git a/lldb/lit/Modules/Breakpad/Inputs/identification-macosx.syms b/lldb/lit/ObjectFile/Breakpad/Inputs/identification-macosx.syms
similarity index 100%
rename from lldb/lit/Modules/Breakpad/Inputs/identification-macosx.syms
rename to lldb/lit/ObjectFile/Breakpad/Inputs/identification-macosx.syms
diff --git a/lldb/lit/Modules/Breakpad/Inputs/identification-windows.syms b/lldb/lit/ObjectFile/Breakpad/Inputs/identification-windows.syms
similarity index 100%
rename from lldb/lit/Modules/Breakpad/Inputs/identification-windows.syms
rename to lldb/lit/ObjectFile/Breakpad/Inputs/identification-windows.syms
diff --git a/lldb/lit/Modules/Breakpad/Inputs/sections-trailing-func.syms b/lldb/lit/ObjectFile/Breakpad/Inputs/sections-trailing-func.syms
similarity index 100%
rename from lldb/lit/Modules/Breakpad/Inputs/sections-trailing-func.syms
rename to lldb/lit/ObjectFile/Breakpad/Inputs/sections-trailing-func.syms
diff --git a/lldb/lit/Modules/Breakpad/Inputs/sections.syms b/lldb/lit/ObjectFile/Breakpad/Inputs/sections.syms
similarity index 100%
rename from lldb/lit/Modules/Breakpad/Inputs/sections.syms
rename to lldb/lit/ObjectFile/Breakpad/Inputs/sections.syms
diff --git a/lldb/lit/Modules/Breakpad/Inputs/uuid-matching-mac.syms b/lldb/lit/ObjectFile/Breakpad/Inputs/uuid-matching-mac.syms
similarity index 100%
rename from lldb/lit/Modules/Breakpad/Inputs/uuid-matching-mac.syms
rename to lldb/lit/ObjectFile/Breakpad/Inputs/uuid-matching-mac.syms
diff --git a/lldb/lit/Modules/Breakpad/Inputs/uuid-matching-mac.yaml b/lldb/lit/ObjectFile/Breakpad/Inputs/uuid-matching-mac.yaml
similarity index 100%
rename from lldb/lit/Modules/Breakpad/Inputs/uuid-matching-mac.yaml
rename to lldb/lit/ObjectFile/Breakpad/Inputs/uuid-matching-mac.yaml
diff --git a/lldb/lit/Modules/Breakpad/breakpad-identification.test b/lldb/lit/ObjectFile/Breakpad/breakpad-identification.test
similarity index 100%
rename from lldb/lit/Modules/Breakpad/breakpad-identification.test
rename to lldb/lit/ObjectFile/Breakpad/breakpad-identification.test
diff --git a/lldb/lit/Modules/Breakpad/discontiguous-sections.test b/lldb/lit/ObjectFile/Breakpad/discontiguous-sections.test
similarity index 100%
rename from lldb/lit/Modules/Breakpad/discontiguous-sections.test
rename to lldb/lit/ObjectFile/Breakpad/discontiguous-sections.test
diff --git a/lldb/lit/Modules/Breakpad/lit.local.cfg b/lldb/lit/ObjectFile/Breakpad/lit.local.cfg
similarity index 100%
rename from lldb/lit/Modules/Breakpad/lit.local.cfg
rename to lldb/lit/ObjectFile/Breakpad/lit.local.cfg
diff --git a/lldb/lit/Modules/Breakpad/sections-trailing-func.test b/lldb/lit/ObjectFile/Breakpad/sections-trailing-func.test
similarity index 100%
rename from lldb/lit/Modules/Breakpad/sections-trailing-func.test
rename to lldb/lit/ObjectFile/Breakpad/sections-trailing-func.test
diff --git a/lldb/lit/Modules/Breakpad/sections.test b/lldb/lit/ObjectFile/Breakpad/sections.test
similarity index 100%
rename from lldb/lit/Modules/Breakpad/sections.test
rename to lldb/lit/ObjectFile/Breakpad/sections.test
diff --git a/lldb/lit/Modules/Breakpad/uuid-matching-mac.test b/lldb/lit/ObjectFile/Breakpad/uuid-matching-mac.test
similarity index 100%
rename from lldb/lit/Modules/Breakpad/uuid-matching-mac.test
rename to lldb/lit/ObjectFile/Breakpad/uuid-matching-mac.test
diff --git a/lldb/lit/Modules/ELF/Inputs/PT_LOAD-overlap-section.elf b/lldb/lit/ObjectFile/ELF/Inputs/PT_LOAD-overlap-section.elf
similarity index 100%
rename from lldb/lit/Modules/ELF/Inputs/PT_LOAD-overlap-section.elf
rename to lldb/lit/ObjectFile/ELF/Inputs/PT_LOAD-overlap-section.elf
diff --git a/lldb/lit/Modules/ELF/Inputs/netbsd-amd64.core b/lldb/lit/ObjectFile/ELF/Inputs/netbsd-amd64.core
similarity index 100%
rename from lldb/lit/Modules/ELF/Inputs/netbsd-amd64.core
rename to lldb/lit/ObjectFile/ELF/Inputs/netbsd-amd64.core
diff --git a/lldb/lit/Modules/ELF/PT_LOAD-empty.yaml b/lldb/lit/ObjectFile/ELF/PT_LOAD-empty.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/PT_LOAD-empty.yaml
rename to lldb/lit/ObjectFile/ELF/PT_LOAD-empty.yaml
diff --git a/lldb/lit/Modules/ELF/PT_LOAD-overlap-PT_INTERP.yaml b/lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/PT_LOAD-overlap-PT_INTERP.yaml
rename to lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml
diff --git a/lldb/lit/Modules/ELF/PT_LOAD-overlap-PT_TLS.yaml b/lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/PT_LOAD-overlap-PT_TLS.yaml
rename to lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml
diff --git a/lldb/lit/Modules/ELF/PT_LOAD-overlap-section.yaml b/lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-section.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/PT_LOAD-overlap-section.yaml
rename to lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-section.yaml
diff --git a/lldb/lit/Modules/ELF/PT_LOAD-overlap.yaml b/lldb/lit/ObjectFile/ELF/PT_LOAD-overlap.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/PT_LOAD-overlap.yaml
rename to lldb/lit/ObjectFile/ELF/PT_LOAD-overlap.yaml
diff --git a/lldb/lit/Modules/ELF/PT_LOAD.yaml b/lldb/lit/ObjectFile/ELF/PT_LOAD.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/PT_LOAD.yaml
rename to lldb/lit/ObjectFile/ELF/PT_LOAD.yaml
diff --git a/lldb/lit/Modules/ELF/PT_TLS-overlap-PT_LOAD.yaml b/lldb/lit/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/PT_TLS-overlap-PT_LOAD.yaml
rename to lldb/lit/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml
diff --git a/lldb/lit/Modules/ELF/aarch64-relocations.yaml b/lldb/lit/ObjectFile/ELF/aarch64-relocations.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/aarch64-relocations.yaml
rename to lldb/lit/ObjectFile/ELF/aarch64-relocations.yaml
diff --git a/lldb/lit/Modules/ELF/base-address.yaml b/lldb/lit/ObjectFile/ELF/base-address.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/base-address.yaml
rename to lldb/lit/ObjectFile/ELF/base-address.yaml
diff --git a/lldb/lit/Modules/ELF/basic-info.yaml b/lldb/lit/ObjectFile/ELF/basic-info.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/basic-info.yaml
rename to lldb/lit/ObjectFile/ELF/basic-info.yaml
diff --git a/lldb/lit/Modules/ELF/build-id-case.yaml b/lldb/lit/ObjectFile/ELF/build-id-case.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/build-id-case.yaml
rename to lldb/lit/ObjectFile/ELF/build-id-case.yaml
diff --git a/lldb/lit/Modules/ELF/compressed-sections.yaml b/lldb/lit/ObjectFile/ELF/compressed-sections.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/compressed-sections.yaml
rename to lldb/lit/ObjectFile/ELF/compressed-sections.yaml
diff --git a/lldb/lit/Modules/ELF/duplicate-section.yaml b/lldb/lit/ObjectFile/ELF/duplicate-section.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/duplicate-section.yaml
rename to lldb/lit/ObjectFile/ELF/duplicate-section.yaml
diff --git a/lldb/lit/Modules/ELF/gnu-debuglink.yaml b/lldb/lit/ObjectFile/ELF/gnu-debuglink.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/gnu-debuglink.yaml
rename to lldb/lit/ObjectFile/ELF/gnu-debuglink.yaml
diff --git a/lldb/lit/Modules/ELF/many-sections.s b/lldb/lit/ObjectFile/ELF/many-sections.s
similarity index 100%
rename from lldb/lit/Modules/ELF/many-sections.s
rename to lldb/lit/ObjectFile/ELF/many-sections.s
diff --git a/lldb/lit/Modules/ELF/netbsd-core-amd64.test b/lldb/lit/ObjectFile/ELF/netbsd-core-amd64.test
similarity index 100%
rename from lldb/lit/Modules/ELF/netbsd-core-amd64.test
rename to lldb/lit/ObjectFile/ELF/netbsd-core-amd64.test
diff --git a/lldb/lit/Modules/ELF/netbsd-exec-8.99.30-amd64.yaml b/lldb/lit/ObjectFile/ELF/netbsd-exec-8.99.30-amd64.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/netbsd-exec-8.99.30-amd64.yaml
rename to lldb/lit/ObjectFile/ELF/netbsd-exec-8.99.30-amd64.yaml
diff --git a/lldb/lit/Modules/ELF/section-addresses.yaml b/lldb/lit/ObjectFile/ELF/section-addresses.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/section-addresses.yaml
rename to lldb/lit/ObjectFile/ELF/section-addresses.yaml
diff --git a/lldb/lit/Modules/ELF/section-overlap.yaml b/lldb/lit/ObjectFile/ELF/section-overlap.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/section-overlap.yaml
rename to lldb/lit/ObjectFile/ELF/section-overlap.yaml
diff --git a/lldb/lit/Modules/ELF/section-permissions.yaml b/lldb/lit/ObjectFile/ELF/section-permissions.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/section-permissions.yaml
rename to lldb/lit/ObjectFile/ELF/section-permissions.yaml
diff --git a/lldb/lit/Modules/ELF/section-types-edgecases.yaml b/lldb/lit/ObjectFile/ELF/section-types-edgecases.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/section-types-edgecases.yaml
rename to lldb/lit/ObjectFile/ELF/section-types-edgecases.yaml
diff --git a/lldb/lit/Modules/ELF/section-types.yaml b/lldb/lit/ObjectFile/ELF/section-types.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/section-types.yaml
rename to lldb/lit/ObjectFile/ELF/section-types.yaml
diff --git a/lldb/lit/Modules/ELF/short-build-id.yaml b/lldb/lit/ObjectFile/ELF/short-build-id.yaml
similarity index 100%
rename from lldb/lit/Modules/ELF/short-build-id.yaml
rename to lldb/lit/ObjectFile/ELF/short-build-id.yaml
diff --git a/lldb/lit/Modules/MachO/lc_build_version.yaml b/lldb/lit/ObjectFile/MachO/lc_build_version.yaml
similarity index 100%
rename from lldb/lit/Modules/MachO/lc_build_version.yaml
rename to lldb/lit/ObjectFile/MachO/lc_build_version.yaml
diff --git a/lldb/lit/Modules/MachO/lc_build_version_notools.yaml b/lldb/lit/ObjectFile/MachO/lc_build_version_notools.yaml
similarity index 100%
rename from lldb/lit/Modules/MachO/lc_build_version_notools.yaml
rename to lldb/lit/ObjectFile/MachO/lc_build_version_notools.yaml
diff --git a/lldb/lit/Modules/MachO/lc_version_min.yaml b/lldb/lit/ObjectFile/MachO/lc_version_min.yaml
similarity index 100%
rename from lldb/lit/Modules/MachO/lc_version_min.yaml
rename to lldb/lit/ObjectFile/MachO/lc_version_min.yaml
diff --git a/lldb/lit/Modules/MachO/subsections.yaml b/lldb/lit/ObjectFile/MachO/subsections.yaml
similarity index 100%
rename from lldb/lit/Modules/MachO/subsections.yaml
rename to lldb/lit/ObjectFile/MachO/subsections.yaml
diff --git a/lldb/lit/Modules/PECOFF/basic-info.yaml b/lldb/lit/ObjectFile/PECOFF/basic-info.yaml
similarity index 100%
rename from lldb/lit/Modules/PECOFF/basic-info.yaml
rename to lldb/lit/ObjectFile/PECOFF/basic-info.yaml
diff --git a/lldb/lit/Modules/PECOFF/dep-modules.yaml b/lldb/lit/ObjectFile/PECOFF/dep-modules.yaml
similarity index 100%
rename from lldb/lit/Modules/PECOFF/dep-modules.yaml
rename to lldb/lit/ObjectFile/PECOFF/dep-modules.yaml
diff --git a/lldb/lit/Modules/PECOFF/export-dllfunc.yaml b/lldb/lit/ObjectFile/PECOFF/export-dllfunc.yaml
similarity index 100%
rename from lldb/lit/Modules/PECOFF/export-dllfunc.yaml
rename to lldb/lit/ObjectFile/PECOFF/export-dllfunc.yaml
diff --git a/lldb/lit/Modules/PECOFF/lit.local.cfg b/lldb/lit/ObjectFile/PECOFF/lit.local.cfg
similarity index 100%
rename from lldb/lit/Modules/PECOFF/lit.local.cfg
rename to lldb/lit/ObjectFile/PECOFF/lit.local.cfg
diff --git a/lldb/lit/Modules/PECOFF/sections-names.yaml b/lldb/lit/ObjectFile/PECOFF/sections-names.yaml
similarity index 100%
rename from lldb/lit/Modules/PECOFF/sections-names.yaml
rename to lldb/lit/ObjectFile/PECOFF/sections-names.yaml
diff --git a/lldb/lit/Modules/PECOFF/subsections.yaml b/lldb/lit/ObjectFile/PECOFF/subsections.yaml
similarity index 100%
rename from lldb/lit/Modules/PECOFF/subsections.yaml
rename to lldb/lit/ObjectFile/PECOFF/subsections.yaml
diff --git a/lldb/lit/Modules/PECOFF/uuid.yaml b/lldb/lit/ObjectFile/PECOFF/uuid.yaml
similarity index 100%
rename from lldb/lit/Modules/PECOFF/uuid.yaml
rename to lldb/lit/ObjectFile/PECOFF/uuid.yaml
diff --git a/lldb/lit/Modules/lit.local.cfg b/lldb/lit/ObjectFile/lit.local.cfg
similarity index 100%
rename from lldb/lit/Modules/lit.local.cfg
rename to lldb/lit/ObjectFile/lit.local.cfg