diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/instruction_selection/aco_instruction_selection.cpp
similarity index 100%
rename from src/amd/compiler/aco_instruction_selection.cpp
rename to src/amd/compiler/instruction_selection/aco_instruction_selection.cpp
diff --git a/src/amd/compiler/aco_instruction_selection.h b/src/amd/compiler/instruction_selection/aco_instruction_selection.h
similarity index 100%
rename from src/amd/compiler/aco_instruction_selection.h
rename to src/amd/compiler/instruction_selection/aco_instruction_selection.h
diff --git a/src/amd/compiler/aco_isel_setup.cpp b/src/amd/compiler/instruction_selection/aco_isel_setup.cpp
similarity index 100%
rename from src/amd/compiler/aco_isel_setup.cpp
rename to src/amd/compiler/instruction_selection/aco_isel_setup.cpp
diff --git a/src/amd/compiler/meson.build b/src/amd/compiler/meson.build
index 21265334cac..05304bb1779 100644
--- a/src/amd/compiler/meson.build
+++ b/src/amd/compiler/meson.build
@@ -31,11 +31,11 @@ aco_builder_h = custom_target(
 )
 
 libaco_files = files(
+  'instruction_selection/aco_instruction_selection.cpp',
+  'instruction_selection/aco_instruction_selection.h',
+  'instruction_selection/aco_isel_setup.cpp',
   'aco_dead_code_analysis.cpp',
   'aco_dominance.cpp',
-  'aco_instruction_selection.cpp',
-  'aco_instruction_selection.h',
-  'aco_isel_setup.cpp',
   'aco_interface.cpp',
   'aco_interface.h',
   'aco_ir.cpp',