diff --git a/llvm/lib/Target/RISCV/CMakeLists.txt b/llvm/lib/Target/RISCV/CMakeLists.txt
index 3e4c3c62a34df..cbe6e9c0489cb 100644
--- a/llvm/lib/Target/RISCV/CMakeLists.txt
+++ b/llvm/lib/Target/RISCV/CMakeLists.txt
@@ -20,7 +20,6 @@ add_public_tablegen_target(RISCVCommonTableGen)
 
 add_llvm_target(RISCVCodeGen
   RISCVAsmPrinter.cpp
-  RISCVCallLowering.cpp
   RISCVCodeGenPrepare.cpp
   RISCVMakeCompressible.cpp
   RISCVExpandAtomicPseudoInsts.cpp
@@ -29,22 +28,23 @@ add_llvm_target(RISCVCodeGen
   RISCVGatherScatterLowering.cpp
   RISCVInsertVSETVLI.cpp
   RISCVInstrInfo.cpp
-  RISCVInstructionSelector.cpp
   RISCVISelDAGToDAG.cpp
   RISCVISelLowering.cpp
-  RISCVLegalizerInfo.cpp
   RISCVMachineFunctionInfo.cpp
   RISCVMacroFusion.cpp
   RISCVMCInstLower.cpp
   RISCVMergeBaseOffset.cpp
   RISCVRedundantCopyElimination.cpp
-  RISCVRegisterBankInfo.cpp
   RISCVRegisterInfo.cpp
   RISCVSExtWRemoval.cpp
   RISCVSubtarget.cpp
   RISCVTargetMachine.cpp
   RISCVTargetObjectFile.cpp
   RISCVTargetTransformInfo.cpp
+  GISel/RISCVCallLowering.cpp
+  GISel/RISCVInstructionSelector.cpp
+  GISel/RISCVLegalizerInfo.cpp
+  GISel/RISCVRegisterBankInfo.cpp
 
   LINK_COMPONENTS
   Analysis
diff --git a/llvm/lib/Target/RISCV/RISCVCallLowering.cpp b/llvm/lib/Target/RISCV/GISel/RISCVCallLowering.cpp
similarity index 100%
rename from llvm/lib/Target/RISCV/RISCVCallLowering.cpp
rename to llvm/lib/Target/RISCV/GISel/RISCVCallLowering.cpp
diff --git a/llvm/lib/Target/RISCV/RISCVCallLowering.h b/llvm/lib/Target/RISCV/GISel/RISCVCallLowering.h
similarity index 100%
rename from llvm/lib/Target/RISCV/RISCVCallLowering.h
rename to llvm/lib/Target/RISCV/GISel/RISCVCallLowering.h
diff --git a/llvm/lib/Target/RISCV/RISCVInstructionSelector.cpp b/llvm/lib/Target/RISCV/GISel/RISCVInstructionSelector.cpp
similarity index 100%
rename from llvm/lib/Target/RISCV/RISCVInstructionSelector.cpp
rename to llvm/lib/Target/RISCV/GISel/RISCVInstructionSelector.cpp
diff --git a/llvm/lib/Target/RISCV/RISCVLegalizerInfo.cpp b/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
similarity index 100%
rename from llvm/lib/Target/RISCV/RISCVLegalizerInfo.cpp
rename to llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
diff --git a/llvm/lib/Target/RISCV/RISCVLegalizerInfo.h b/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.h
similarity index 100%
rename from llvm/lib/Target/RISCV/RISCVLegalizerInfo.h
rename to llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.h
diff --git a/llvm/lib/Target/RISCV/RISCVRegisterBankInfo.cpp b/llvm/lib/Target/RISCV/GISel/RISCVRegisterBankInfo.cpp
similarity index 100%
rename from llvm/lib/Target/RISCV/RISCVRegisterBankInfo.cpp
rename to llvm/lib/Target/RISCV/GISel/RISCVRegisterBankInfo.cpp
diff --git a/llvm/lib/Target/RISCV/RISCVRegisterBankInfo.h b/llvm/lib/Target/RISCV/GISel/RISCVRegisterBankInfo.h
similarity index 100%
rename from llvm/lib/Target/RISCV/RISCVRegisterBankInfo.h
rename to llvm/lib/Target/RISCV/GISel/RISCVRegisterBankInfo.h
diff --git a/llvm/lib/Target/RISCV/RISCVRegisterBanks.td b/llvm/lib/Target/RISCV/GISel/RISCVRegisterBanks.td
similarity index 100%
rename from llvm/lib/Target/RISCV/RISCVRegisterBanks.td
rename to llvm/lib/Target/RISCV/GISel/RISCVRegisterBanks.td
diff --git a/llvm/lib/Target/RISCV/RISCV.td b/llvm/lib/Target/RISCV/RISCV.td
index 3742eb06fc8e6..4400f5271d6e3 100644
--- a/llvm/lib/Target/RISCV/RISCV.td
+++ b/llvm/lib/Target/RISCV/RISCV.td
@@ -518,7 +518,7 @@ include "RISCVSchedule.td"
 include "RISCVRegisterInfo.td"
 include "RISCVCallingConv.td"
 include "RISCVInstrInfo.td"
-include "RISCVRegisterBanks.td"
+include "GISel/RISCVRegisterBanks.td"
 include "RISCVSchedRocket.td"
 include "RISCVSchedSiFive7.td"
 
diff --git a/llvm/lib/Target/RISCV/RISCVSubtarget.cpp b/llvm/lib/Target/RISCV/RISCVSubtarget.cpp
index 84848cf046aa4..6d4d9469cec5b 100644
--- a/llvm/lib/Target/RISCV/RISCVSubtarget.cpp
+++ b/llvm/lib/Target/RISCV/RISCVSubtarget.cpp
@@ -12,12 +12,12 @@
 
 #include "RISCVSubtarget.h"
 #include "RISCV.h"
-#include "RISCVCallLowering.h"
 #include "RISCVFrameLowering.h"
-#include "RISCVLegalizerInfo.h"
 #include "RISCVMacroFusion.h"
-#include "RISCVRegisterBankInfo.h"
 #include "RISCVTargetMachine.h"
+#include "GISel/RISCVCallLowering.h"
+#include "GISel/RISCVLegalizerInfo.h"
+#include "GISel/RISCVRegisterBankInfo.h"
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/Support/ErrorHandling.h"