Index: include/lld/Core/Alias.h
===================================================================
--- include/lld/Core/Alias.h
+++ include/lld/Core/Alias.h
@@ -1,4 +1,4 @@
-//===- lld/ReaderWriter/Alias.h - Alias atoms -----------------------------===//
+//===- lld/Core/Alias.h - Alias atoms -------------------------------------===//
 //
 //                             The LLVM Linker
 //
@@ -12,11 +12,11 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_ALIAS_H
-#define LLD_READER_WRITER_ALIAS_H
+#ifndef LLD_CORE_ALIAS_H
+#define LLD_CORE_ALIAS_H
 
 #include "lld/Core/LLVM.h"
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Simple.h"
 #include "llvm/ADT/Optional.h"
 
 #include <string>
Index: include/lld/Core/Simple.h
===================================================================
--- include/lld/Core/Simple.h
+++ include/lld/Core/Simple.h
@@ -1,4 +1,4 @@
-//===- lld/ReaderWriter/Simple.h - Simple implementations of Atom and File ===//
+//===- lld/Core/Simple.h - Simple implementations of Atom and File --------===//
 //
 //                             The LLVM Linker
 //
@@ -12,8 +12,8 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_SIMPLE_H
-#define LLD_READER_WRITER_SIMPLE_H
+#ifndef LLD_CORE_SIMPLE_H
+#define LLD_CORE_SIMPLE_H
 
 #include "lld/Core/DefinedAtom.h"
 #include "lld/Core/File.h"
@@ -21,6 +21,7 @@
 #include "lld/Core/UndefinedAtom.h"
 
 namespace lld {
+
 class SimpleFile : public MutableFile {
 public:
   SimpleFile(StringRef path) : MutableFile(path) {}
@@ -199,6 +200,7 @@
   const File &_file;
   StringRef _name;
 };
+
 } // end namespace lld
 
 #endif
Index: lib/Core/LinkingContext.cpp
===================================================================
--- lib/Core/LinkingContext.cpp
+++ lib/Core/LinkingContext.cpp
@@ -7,10 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "lld/Core/Alias.h"
 #include "lld/Core/LinkingContext.h"
 #include "lld/Core/Resolver.h"
-#include "lld/ReaderWriter/Alias.h"
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Simple.h"
 #include "lld/ReaderWriter/Writer.h"
 #include "llvm/ADT/Triple.h"
 
Index: lib/Passes/RoundTripNativePass.cpp
===================================================================
--- lib/Passes/RoundTripNativePass.cpp
+++ lib/Passes/RoundTripNativePass.cpp
@@ -8,8 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "lld/Core/Instrumentation.h"
+#include "lld/Core/Simple.h"
 #include "lld/Passes/RoundTripNativePass.h"
-#include "lld/ReaderWriter/Simple.h"
 #include "lld/ReaderWriter/Writer.h"
 
 #include "llvm/Support/Debug.h"
Index: lib/Passes/RoundTripYAMLPass.cpp
===================================================================
--- lib/Passes/RoundTripYAMLPass.cpp
+++ lib/Passes/RoundTripYAMLPass.cpp
@@ -6,9 +6,10 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+
 #include "lld/Core/Instrumentation.h"
+#include "lld/Core/Simple.h"
 #include "lld/Passes/RoundTripYAMLPass.h"
-#include "lld/ReaderWriter/Simple.h"
 #include "lld/ReaderWriter/Writer.h"
 
 #include "llvm/Support/Debug.h"
Index: lib/ReaderWriter/CoreLinkingContext.cpp
===================================================================
--- lib/ReaderWriter/CoreLinkingContext.cpp
+++ lib/ReaderWriter/CoreLinkingContext.cpp
@@ -11,9 +11,9 @@
 
 #include "lld/Core/Pass.h"
 #include "lld/Core/PassManager.h"
+#include "lld/Core/Simple.h"
 #include "lld/Passes/LayoutPass.h"
 #include "lld/Passes/RoundTripYAMLPass.h"
-#include "lld/ReaderWriter/Simple.h"
 
 #include "llvm/ADT/ArrayRef.h"
 
Index: lib/ReaderWriter/ELF/Atoms.h
===================================================================
--- lib/ReaderWriter/ELF/Atoms.h
+++ lib/ReaderWriter/ELF/Atoms.h
@@ -13,7 +13,7 @@
 #include "TargetHandler.h"
 
 #include "lld/Core/LLVM.h"
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Simple.h"
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringSwitch.h"
Index: lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp
===================================================================
--- lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp
+++ lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp
@@ -14,7 +14,7 @@
 #include "lld/Core/File.h"
 #include "lld/Core/Pass.h"
 #include "lld/Core/PassManager.h"
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Simple.h"
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
Index: lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp
===================================================================
--- lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp
+++ lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp
@@ -21,7 +21,7 @@
 
 #include "X86_64RelocationPass.h"
 
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Simple.h"
 
 #include "llvm/ADT/DenseMap.h"
 
Index: lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h
===================================================================
--- lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h
+++ lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h
@@ -15,7 +15,7 @@
 #include "X86_64RelocationHandler.h"
 #include "TargetLayout.h"
 
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Simple.h"
 
 namespace lld {
 namespace elf {
Index: lib/ReaderWriter/MachO/Atoms.h
===================================================================
--- lib/ReaderWriter/MachO/Atoms.h
+++ lib/ReaderWriter/MachO/Atoms.h
@@ -10,7 +10,7 @@
 #ifndef LLD_READER_WRITER_MACHO_ATOMS_H
 #define LLD_READER_WRITER_MACHO_ATOMS_H
 
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Simple.h"
 
 namespace lld {
 namespace mach_o {
Index: lib/ReaderWriter/MachO/ExecutableAtoms.hpp
===================================================================
--- lib/ReaderWriter/MachO/ExecutableAtoms.hpp
+++ lib/ReaderWriter/MachO/ExecutableAtoms.hpp
@@ -13,11 +13,11 @@
 #include "llvm/Support/MachO.h"
 
 #include "lld/Core/DefinedAtom.h"
-#include "lld/Core/UndefinedAtom.h"
 #include "lld/Core/File.h"
-#include "lld/Core/Reference.h"
 #include "lld/Core/LinkingContext.h"
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Reference.h"
+#include "lld/Core/Simple.h"
+#include "lld/Core/UndefinedAtom.h"
 
 namespace lld {
 namespace mach_o {
Index: lib/ReaderWriter/MachO/File.h
===================================================================
--- lib/ReaderWriter/MachO/File.h
+++ lib/ReaderWriter/MachO/File.h
@@ -12,7 +12,7 @@
 
 #include "Atoms.h"
 
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Simple.h"
 
 namespace lld {
 namespace mach_o {
Index: lib/ReaderWriter/MachO/StubAtoms.hpp
===================================================================
--- lib/ReaderWriter/MachO/StubAtoms.hpp
+++ lib/ReaderWriter/MachO/StubAtoms.hpp
@@ -13,10 +13,10 @@
 #include "llvm/ADT/ArrayRef.h"
 
 #include "lld/Core/DefinedAtom.h"
-#include "lld/Core/SharedLibraryAtom.h"
 #include "lld/Core/File.h"
 #include "lld/Core/Reference.h"
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/SharedLibraryAtom.h"
+#include "lld/Core/Simple.h"
 
 #include "ReferenceKinds.h"
 #include "StubAtoms_x86_64.hpp"
Index: lib/ReaderWriter/MachO/StubsPass.hpp
===================================================================
--- lib/ReaderWriter/MachO/StubsPass.hpp
+++ lib/ReaderWriter/MachO/StubsPass.hpp
@@ -13,11 +13,11 @@
 #include "llvm/ADT/DenseMap.h"
 
 #include "lld/Core/DefinedAtom.h"
-#include "lld/Core/SharedLibraryAtom.h"
 #include "lld/Core/File.h"
-#include "lld/Core/Reference.h"
 #include "lld/Core/Pass.h"
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Reference.h"
+#include "lld/Core/SharedLibraryAtom.h"
+#include "lld/Core/Simple.h"
 
 #include "ReferenceKinds.h"
 #include "StubAtoms.hpp"
Index: lib/ReaderWriter/Native/ReaderNative.cpp
===================================================================
--- lib/ReaderWriter/Native/ReaderNative.cpp
+++ lib/ReaderWriter/Native/ReaderNative.cpp
@@ -9,12 +9,11 @@
 
 #include "NativeFileFormat.h"
 
-#include "lld/ReaderWriter/Reader.h"
-#include "lld/ReaderWriter/Simple.h"
-
 #include "lld/Core/Atom.h"
 #include "lld/Core/Error.h"
 #include "lld/Core/File.h"
+#include "lld/Core/Simple.h"
+#include "lld/ReaderWriter/Reader.h"
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
Index: lib/ReaderWriter/PECOFF/Atoms.h
===================================================================
--- lib/ReaderWriter/PECOFF/Atoms.h
+++ lib/ReaderWriter/PECOFF/Atoms.h
@@ -11,7 +11,7 @@
 #define LLD_READER_WRITER_PE_COFF_ATOMS_H
 
 #include "lld/Core/File.h"
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Simple.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/Object/COFF.h"
 
Index: lib/ReaderWriter/PECOFF/EdataPass.h
===================================================================
--- lib/ReaderWriter/PECOFF/EdataPass.h
+++ lib/ReaderWriter/PECOFF/EdataPass.h
@@ -23,8 +23,8 @@
 
 #include "lld/Core/File.h"
 #include "lld/Core/Pass.h"
+#include "lld/Core/Simple.h"
 #include "lld/ReaderWriter/PECOFFLinkingContext.h"
-#include "lld/ReaderWriter/Simple.h"
 #include "llvm/Support/COFF.h"
 
 #include <map>
Index: lib/ReaderWriter/PECOFF/EdataPass.cpp
===================================================================
--- lib/ReaderWriter/PECOFF/EdataPass.cpp
+++ lib/ReaderWriter/PECOFF/EdataPass.cpp
@@ -12,7 +12,7 @@
 
 #include "lld/Core/File.h"
 #include "lld/Core/Pass.h"
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Simple.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Path.h"
 
Index: lib/ReaderWriter/PECOFF/IdataPass.h
===================================================================
--- lib/ReaderWriter/PECOFF/IdataPass.h
+++ lib/ReaderWriter/PECOFF/IdataPass.h
@@ -23,7 +23,7 @@
 
 #include "lld/Core/File.h"
 #include "lld/Core/Pass.h"
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Simple.h"
 #include "llvm/Support/COFF.h"
 
 #include <algorithm>
Index: lib/ReaderWriter/PECOFF/IdataPass.cpp
===================================================================
--- lib/ReaderWriter/PECOFF/IdataPass.cpp
+++ lib/ReaderWriter/PECOFF/IdataPass.cpp
@@ -12,7 +12,7 @@
 
 #include "lld/Core/File.h"
 #include "lld/Core/Pass.h"
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Simple.h"
 #include "llvm/Support/COFF.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Endian.h"
Index: lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h
===================================================================
--- lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h
+++ lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h
@@ -10,8 +10,8 @@
 #include "Atoms.h"
 
 #include "lld/Core/ArchiveLibraryFile.h"
+#include "lld/Core/Simple.h"
 #include "lld/ReaderWriter/PECOFFLinkingContext.h"
-#include "lld/ReaderWriter/Simple.h"
 #include "llvm/Support/Allocator.h"
 
 #include <mutex>
Index: lib/ReaderWriter/PECOFF/LoadConfigPass.h
===================================================================
--- lib/ReaderWriter/PECOFF/LoadConfigPass.h
+++ lib/ReaderWriter/PECOFF/LoadConfigPass.h
@@ -22,8 +22,8 @@
 
 #include "lld/Core/File.h"
 #include "lld/Core/Pass.h"
+#include "lld/Core/Simple.h"
 #include "lld/ReaderWriter/PECOFFLinkingContext.h"
-#include "lld/ReaderWriter/Simple.h"
 
 #include <map>
 
Index: lib/ReaderWriter/PECOFF/LoadConfigPass.cpp
===================================================================
--- lib/ReaderWriter/PECOFF/LoadConfigPass.cpp
+++ lib/ReaderWriter/PECOFF/LoadConfigPass.cpp
@@ -22,7 +22,7 @@
 
 #include "lld/Core/File.h"
 #include "lld/Core/Pass.h"
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Simple.h"
 #include "llvm/Object/COFF.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Path.h"
Index: lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp
===================================================================
--- lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp
+++ lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp
@@ -16,12 +16,12 @@
 #include "SetSubsystemPass.h"
 
 #include "lld/Core/PassManager.h"
+#include "lld/Core/Simple.h"
 #include "lld/Passes/LayoutPass.h"
 #include "lld/Passes/RoundTripNativePass.h"
 #include "lld/Passes/RoundTripYAMLPass.h"
 #include "lld/ReaderWriter/PECOFFLinkingContext.h"
 #include "lld/ReaderWriter/Reader.h"
-#include "lld/ReaderWriter/Simple.h"
 #include "lld/ReaderWriter/Writer.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/Allocator.h"
Index: lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
===================================================================
--- lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
+++ lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
@@ -10,10 +10,10 @@
 #include "Atoms.h"
 #include "ReaderImportHeader.h"
 
+#include "lld/Core/Alias.h"
 #include "lld/Core/File.h"
 #include "lld/Driver/Driver.h"
 #include "lld/ReaderWriter/PECOFFLinkingContext.h"
-#include "lld/ReaderWriter/Alias.h"
 #include "lld/ReaderWriter/Reader.h"
 
 #include "llvm/ADT/ArrayRef.h"
Index: lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
===================================================================
--- lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
+++ lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
@@ -7,17 +7,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lld/ReaderWriter/Reader.h"
-#include "lld/ReaderWriter/Simple.h"
-#include "lld/ReaderWriter/Writer.h"
-#include "lld/ReaderWriter/YamlContext.h"
-
 #include "lld/Core/ArchiveLibraryFile.h"
 #include "lld/Core/DefinedAtom.h"
 #include "lld/Core/Error.h"
 #include "lld/Core/File.h"
 #include "lld/Core/LLVM.h"
 #include "lld/Core/Reference.h"
+#include "lld/Core/Simple.h"
+#include "lld/ReaderWriter/Reader.h"
+#include "lld/ReaderWriter/Writer.h"
+#include "lld/ReaderWriter/YamlContext.h"
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringMap.h"
Index: unittests/DriverTests/InputGraphTest.cpp
===================================================================
--- unittests/DriverTests/InputGraphTest.cpp
+++ unittests/DriverTests/InputGraphTest.cpp
@@ -16,7 +16,7 @@
 
 #include "lld/Core/InputGraph.h"
 #include "lld/Core/Resolver.h"
-#include "lld/ReaderWriter/Simple.h"
+#include "lld/Core/Simple.h"
 
 using namespace lld;