diff --git a/llvm/lib/Object/CMakeLists.txt b/llvm/lib/Object/CMakeLists.txt
--- a/llvm/lib/Object/CMakeLists.txt
+++ b/llvm/lib/Object/CMakeLists.txt
@@ -1,3 +1,73 @@
+
+source_group("Header Files\\ObjCopy" FILES
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/CommonConfig.h
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/ConfigManager.h
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/MultiFormatConfig.h
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/ObjCopy.h
+)
+
+source_group("Header Files\\ObjCopy\\COFF" FILES
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/COFF/COFFConfig.h
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/COFF/COFFObjcopy.h
+)
+
+source_group("Header Files\\ObjCopy\\ELF" FILES
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/ELF/ELFConfig.h
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/ELF/ELFObjcopy.h
+)
+
+source_group("Header Files\\ObjCopy\\MachO" FILES
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/MachO/MachOConfig.h
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/MachO/MachOObjcopy.h
+)
+
+source_group("Header Files\\ObjCopy\\wasm" FILES
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/wasm/WasmConfig.h
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/wasm/WasmObjcopy.h
+)
+
+macro(add_objcopy_common_folder)
+  list(APPEND OBJCOPY_SOURCES ${ARGN})
+  source_group("Source Files\\ObjCopy" FILES ${ARGN})
+endmacro()
+
+macro(add_objcopy_format_specific_folder group)
+  list(APPEND OBJCOPY_SOURCES ${ARGN})
+  source_group("Source Files\\ObjCopy\\${group}" FILES ${ARGN})
+endmacro()
+
+add_objcopy_common_folder(
+   ObjCopy/ObjCopy.cpp
+   ObjCopy/ConfigManager.cpp
+)
+
+add_objcopy_format_specific_folder(COFF
+   ObjCopy/COFF/COFFObjcopy.cpp
+   ObjCopy/COFF/Object.cpp
+   ObjCopy/COFF/Reader.cpp
+   ObjCopy/COFF/Writer.cpp
+)
+
+add_objcopy_format_specific_folder(ELF
+   ObjCopy/ELF/ELFObjcopy.cpp
+   ObjCopy/ELF/Object.cpp
+)
+
+add_objcopy_format_specific_folder(MachO
+   ObjCopy/MachO/MachOObjcopy.cpp
+   ObjCopy/MachO/MachOReader.cpp
+   ObjCopy/MachO/MachOWriter.cpp
+   ObjCopy/MachO/MachOLayoutBuilder.cpp
+   ObjCopy/MachO/Object.cpp
+)
+
+add_objcopy_format_specific_folder(wasm
+   ObjCopy/wasm/Object.cpp
+   ObjCopy/wasm/Reader.cpp
+   ObjCopy/wasm/Writer.cpp
+   ObjCopy/wasm/WasmObjcopy.cpp
+)
+
 add_llvm_component_library(LLVMObject
   Archive.cpp
   ArchiveWriter.cpp
@@ -29,26 +99,15 @@
   WindowsMachineFlag.cpp
   WindowsResource.cpp
   XCOFFObjectFile.cpp
-  ObjCopy/ObjCopy.cpp
-  ObjCopy/ConfigManager.cpp
-  ObjCopy/COFF/COFFObjcopy.cpp
-  ObjCopy/COFF/Object.cpp
-  ObjCopy/COFF/Reader.cpp
-  ObjCopy/COFF/Writer.cpp
-  ObjCopy/ELF/ELFObjcopy.cpp
-  ObjCopy/ELF/Object.cpp
-  ObjCopy/MachO/MachOObjcopy.cpp
-  ObjCopy/MachO/MachOReader.cpp
-  ObjCopy/MachO/MachOWriter.cpp
-  ObjCopy/MachO/MachOLayoutBuilder.cpp
-  ObjCopy/MachO/Object.cpp
-  ObjCopy/wasm/Object.cpp
-  ObjCopy/wasm/Reader.cpp
-  ObjCopy/wasm/Writer.cpp
-  ObjCopy/wasm/WasmObjcopy.cpp
+  ${OBJCOPY_SOURCES}
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/COFF
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/ELF
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/MachO
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object/ObjCopy/wasm
 
   DEPENDS
   intrinsics_gen