diff --git a/llvm/lib/Target/AArch64/AArch64Subtarget.cpp b/llvm/lib/Target/AArch64/AArch64Subtarget.cpp
--- a/llvm/lib/Target/AArch64/AArch64Subtarget.cpp
+++ b/llvm/lib/Target/AArch64/AArch64Subtarget.cpp
@@ -13,12 +13,12 @@
 #include "AArch64Subtarget.h"
 
 #include "AArch64.h"
-#include "AArch64CallLowering.h"
 #include "AArch64InstrInfo.h"
-#include "AArch64LegalizerInfo.h"
 #include "AArch64PBQPRegAlloc.h"
 #include "AArch64RegisterBankInfo.h"
 #include "AArch64TargetMachine.h"
+#include "GISel/AArch64CallLowering.h"
+#include "GISel/AArch64LegalizerInfo.h"
 #include "MCTargetDesc/AArch64AddressingModes.h"
 #include "llvm/CodeGen/GlobalISel/InstructionSelect.h"
 #include "llvm/CodeGen/MachineScheduler.h"
diff --git a/llvm/lib/Target/AArch64/CMakeLists.txt b/llvm/lib/Target/AArch64/CMakeLists.txt
--- a/llvm/lib/Target/AArch64/CMakeLists.txt
+++ b/llvm/lib/Target/AArch64/CMakeLists.txt
@@ -24,12 +24,16 @@
 add_public_tablegen_target(AArch64CommonTableGen)
 
 add_llvm_target(AArch64CodeGen
+  GISel/AArch64CallLowering.cpp
+  GISel/AArch64InstructionSelector.cpp
+  GISel/AArch64LegalizerInfo.cpp
+  GISel/AArch64PreLegalizerCombiner.cpp
+  GISel/AArch64PostLegalizerCombiner.cpp
   AArch64A57FPLoadBalancing.cpp
   AArch64AdvSIMDScalarPass.cpp
   AArch64AsmPrinter.cpp
   AArch64BranchTargets.cpp
   AArch64CallingConvention.cpp
-  AArch64CallLowering.cpp
   AArch64CleanupLocalDynamicTLSPass.cpp
   AArch64CollectLOH.cpp
   AArch64CondBrTuning.cpp
@@ -47,14 +51,10 @@
   AArch64ISelDAGToDAG.cpp
   AArch64ISelLowering.cpp
   AArch64InstrInfo.cpp
-  AArch64InstructionSelector.cpp
-  AArch64LegalizerInfo.cpp
   AArch64LoadStoreOptimizer.cpp
   AArch64MachineFunctionInfo.cpp
   AArch64MacroFusion.cpp
   AArch64MCInstLower.cpp
-  AArch64PreLegalizerCombiner.cpp
-  AArch64PostLegalizerCombiner.cpp
   AArch64PromoteConstant.cpp
   AArch64PBQPRegAlloc.cpp
   AArch64RegisterBankInfo.cpp
diff --git a/llvm/lib/Target/AArch64/AArch64CallLowering.h b/llvm/lib/Target/AArch64/GISel/AArch64CallLowering.h
rename from llvm/lib/Target/AArch64/AArch64CallLowering.h
rename to llvm/lib/Target/AArch64/GISel/AArch64CallLowering.h
diff --git a/llvm/lib/Target/AArch64/AArch64CallLowering.cpp b/llvm/lib/Target/AArch64/GISel/AArch64CallLowering.cpp
rename from llvm/lib/Target/AArch64/AArch64CallLowering.cpp
rename to llvm/lib/Target/AArch64/GISel/AArch64CallLowering.cpp
diff --git a/llvm/lib/Target/AArch64/AArch64InstructionSelector.cpp b/llvm/lib/Target/AArch64/GISel/AArch64InstructionSelector.cpp
rename from llvm/lib/Target/AArch64/AArch64InstructionSelector.cpp
rename to llvm/lib/Target/AArch64/GISel/AArch64InstructionSelector.cpp
diff --git a/llvm/lib/Target/AArch64/AArch64LegalizerInfo.h b/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.h
rename from llvm/lib/Target/AArch64/AArch64LegalizerInfo.h
rename to llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.h
diff --git a/llvm/lib/Target/AArch64/AArch64LegalizerInfo.cpp b/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp
rename from llvm/lib/Target/AArch64/AArch64LegalizerInfo.cpp
rename to llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp
diff --git a/llvm/lib/Target/AArch64/AArch64PostLegalizerCombiner.cpp b/llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerCombiner.cpp
rename from llvm/lib/Target/AArch64/AArch64PostLegalizerCombiner.cpp
rename to llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerCombiner.cpp
diff --git a/llvm/lib/Target/AArch64/AArch64PreLegalizerCombiner.cpp b/llvm/lib/Target/AArch64/GISel/AArch64PreLegalizerCombiner.cpp
rename from llvm/lib/Target/AArch64/AArch64PreLegalizerCombiner.cpp
rename to llvm/lib/Target/AArch64/GISel/AArch64PreLegalizerCombiner.cpp