diff --git a/src/panfrost/ci/gitlab-ci-inc.yml b/src/panfrost/ci/gitlab-ci-inc.yml
index 0716f058262..e9bb5fe6eda 100644
--- a/src/panfrost/ci/gitlab-ci-inc.yml
+++ b/src/panfrost/ci/gitlab-ci-inc.yml
@@ -25,7 +25,7 @@
         - src/panfrost/util/*
       when: on_success
     - changes:
-        - src/panfrost/midgard/**/*
+        - src/panfrost/compiler/midgard/**/*
       when: on_success
 
 .panfrost-midgard-manual-rules:
@@ -40,7 +40,7 @@
     - changes: *panfrost_common_file_list
       when: manual
     - changes:
-        - src/panfrost/midgard/**/*
+        - src/panfrost/compiler/midgard/**/*
       when: manual
 
 .panfrost-bifrost-gl-rules:
diff --git a/src/panfrost/compiler/meson.build b/src/panfrost/compiler/meson.build
index ebd6309cfad..fe78be0e4df 100644
--- a/src/panfrost/compiler/meson.build
+++ b/src/panfrost/compiler/meson.build
@@ -2,3 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 subdir('bifrost')
+subdir('midgard')
diff --git a/src/panfrost/midgard/compiler.h b/src/panfrost/compiler/midgard/compiler.h
similarity index 100%
rename from src/panfrost/midgard/compiler.h
rename to src/panfrost/compiler/midgard/compiler.h
diff --git a/src/panfrost/midgard/disassemble.c b/src/panfrost/compiler/midgard/disassemble.c
similarity index 100%
rename from src/panfrost/midgard/disassemble.c
rename to src/panfrost/compiler/midgard/disassemble.c
diff --git a/src/panfrost/midgard/disassemble.h b/src/panfrost/compiler/midgard/disassemble.h
similarity index 100%
rename from src/panfrost/midgard/disassemble.h
rename to src/panfrost/compiler/midgard/disassemble.h
diff --git a/src/panfrost/midgard/helpers.h b/src/panfrost/compiler/midgard/helpers.h
similarity index 100%
rename from src/panfrost/midgard/helpers.h
rename to src/panfrost/compiler/midgard/helpers.h
diff --git a/src/panfrost/midgard/meson.build b/src/panfrost/compiler/midgard/meson.build
similarity index 100%
rename from src/panfrost/midgard/meson.build
rename to src/panfrost/compiler/midgard/meson.build
diff --git a/src/panfrost/midgard/midgard.h b/src/panfrost/compiler/midgard/midgard.h
similarity index 100%
rename from src/panfrost/midgard/midgard.h
rename to src/panfrost/compiler/midgard/midgard.h
diff --git a/src/panfrost/midgard/midgard_address.c b/src/panfrost/compiler/midgard/midgard_address.c
similarity index 100%
rename from src/panfrost/midgard/midgard_address.c
rename to src/panfrost/compiler/midgard/midgard_address.c
diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/compiler/midgard/midgard_compile.c
similarity index 100%
rename from src/panfrost/midgard/midgard_compile.c
rename to src/panfrost/compiler/midgard/midgard_compile.c
diff --git a/src/panfrost/midgard/midgard_compile.h b/src/panfrost/compiler/midgard/midgard_compile.h
similarity index 100%
rename from src/panfrost/midgard/midgard_compile.h
rename to src/panfrost/compiler/midgard/midgard_compile.h
diff --git a/src/panfrost/midgard/midgard_derivatives.c b/src/panfrost/compiler/midgard/midgard_derivatives.c
similarity index 100%
rename from src/panfrost/midgard/midgard_derivatives.c
rename to src/panfrost/compiler/midgard/midgard_derivatives.c
diff --git a/src/panfrost/midgard/midgard_emit.c b/src/panfrost/compiler/midgard/midgard_emit.c
similarity index 100%
rename from src/panfrost/midgard/midgard_emit.c
rename to src/panfrost/compiler/midgard/midgard_emit.c
diff --git a/src/panfrost/midgard/midgard_errata_lod.c b/src/panfrost/compiler/midgard/midgard_errata_lod.c
similarity index 100%
rename from src/panfrost/midgard/midgard_errata_lod.c
rename to src/panfrost/compiler/midgard/midgard_errata_lod.c
diff --git a/src/panfrost/midgard/midgard_helper_invocations.c b/src/panfrost/compiler/midgard/midgard_helper_invocations.c
similarity index 100%
rename from src/panfrost/midgard/midgard_helper_invocations.c
rename to src/panfrost/compiler/midgard/midgard_helper_invocations.c
diff --git a/src/panfrost/midgard/midgard_liveness.c b/src/panfrost/compiler/midgard/midgard_liveness.c
similarity index 100%
rename from src/panfrost/midgard/midgard_liveness.c
rename to src/panfrost/compiler/midgard/midgard_liveness.c
diff --git a/src/panfrost/midgard/midgard_nir.h b/src/panfrost/compiler/midgard/midgard_nir.h
similarity index 100%
rename from src/panfrost/midgard/midgard_nir.h
rename to src/panfrost/compiler/midgard/midgard_nir.h
diff --git a/src/panfrost/midgard/midgard_nir_algebraic.py b/src/panfrost/compiler/midgard/midgard_nir_algebraic.py
similarity index 100%
rename from src/panfrost/midgard/midgard_nir_algebraic.py
rename to src/panfrost/compiler/midgard/midgard_nir_algebraic.py
diff --git a/src/panfrost/midgard/midgard_nir_lower_image_bitsize.c b/src/panfrost/compiler/midgard/midgard_nir_lower_image_bitsize.c
similarity index 100%
rename from src/panfrost/midgard/midgard_nir_lower_image_bitsize.c
rename to src/panfrost/compiler/midgard/midgard_nir_lower_image_bitsize.c
diff --git a/src/panfrost/midgard/midgard_nir_type_csel.c b/src/panfrost/compiler/midgard/midgard_nir_type_csel.c
similarity index 100%
rename from src/panfrost/midgard/midgard_nir_type_csel.c
rename to src/panfrost/compiler/midgard/midgard_nir_type_csel.c
diff --git a/src/panfrost/midgard/midgard_ops.c b/src/panfrost/compiler/midgard/midgard_ops.c
similarity index 100%
rename from src/panfrost/midgard/midgard_ops.c
rename to src/panfrost/compiler/midgard/midgard_ops.c
diff --git a/src/panfrost/midgard/midgard_ops.h b/src/panfrost/compiler/midgard/midgard_ops.h
similarity index 100%
rename from src/panfrost/midgard/midgard_ops.h
rename to src/panfrost/compiler/midgard/midgard_ops.h
diff --git a/src/panfrost/midgard/midgard_opt_copy_prop.c b/src/panfrost/compiler/midgard/midgard_opt_copy_prop.c
similarity index 100%
rename from src/panfrost/midgard/midgard_opt_copy_prop.c
rename to src/panfrost/compiler/midgard/midgard_opt_copy_prop.c
diff --git a/src/panfrost/midgard/midgard_opt_dce.c b/src/panfrost/compiler/midgard/midgard_opt_dce.c
similarity index 100%
rename from src/panfrost/midgard/midgard_opt_dce.c
rename to src/panfrost/compiler/midgard/midgard_opt_dce.c
diff --git a/src/panfrost/midgard/midgard_opt_perspective.c b/src/panfrost/compiler/midgard/midgard_opt_perspective.c
similarity index 100%
rename from src/panfrost/midgard/midgard_opt_perspective.c
rename to src/panfrost/compiler/midgard/midgard_opt_perspective.c
diff --git a/src/panfrost/midgard/midgard_opt_prop.c b/src/panfrost/compiler/midgard/midgard_opt_prop.c
similarity index 100%
rename from src/panfrost/midgard/midgard_opt_prop.c
rename to src/panfrost/compiler/midgard/midgard_opt_prop.c
diff --git a/src/panfrost/midgard/midgard_print.c b/src/panfrost/compiler/midgard/midgard_print.c
similarity index 100%
rename from src/panfrost/midgard/midgard_print.c
rename to src/panfrost/compiler/midgard/midgard_print.c
diff --git a/src/panfrost/midgard/midgard_print_constant.c b/src/panfrost/compiler/midgard/midgard_print_constant.c
similarity index 100%
rename from src/panfrost/midgard/midgard_print_constant.c
rename to src/panfrost/compiler/midgard/midgard_print_constant.c
diff --git a/src/panfrost/midgard/midgard_quirks.h b/src/panfrost/compiler/midgard/midgard_quirks.h
similarity index 100%
rename from src/panfrost/midgard/midgard_quirks.h
rename to src/panfrost/compiler/midgard/midgard_quirks.h
diff --git a/src/panfrost/midgard/midgard_ra.c b/src/panfrost/compiler/midgard/midgard_ra.c
similarity index 100%
rename from src/panfrost/midgard/midgard_ra.c
rename to src/panfrost/compiler/midgard/midgard_ra.c
diff --git a/src/panfrost/midgard/midgard_ra_pipeline.c b/src/panfrost/compiler/midgard/midgard_ra_pipeline.c
similarity index 100%
rename from src/panfrost/midgard/midgard_ra_pipeline.c
rename to src/panfrost/compiler/midgard/midgard_ra_pipeline.c
diff --git a/src/panfrost/midgard/midgard_schedule.c b/src/panfrost/compiler/midgard/midgard_schedule.c
similarity index 100%
rename from src/panfrost/midgard/midgard_schedule.c
rename to src/panfrost/compiler/midgard/midgard_schedule.c
diff --git a/src/panfrost/midgard/mir.c b/src/panfrost/compiler/midgard/mir.c
similarity index 100%
rename from src/panfrost/midgard/mir.c
rename to src/panfrost/compiler/midgard/mir.c
diff --git a/src/panfrost/midgard/mir_promote_uniforms.c b/src/panfrost/compiler/midgard/mir_promote_uniforms.c
similarity index 100%
rename from src/panfrost/midgard/mir_promote_uniforms.c
rename to src/panfrost/compiler/midgard/mir_promote_uniforms.c
diff --git a/src/panfrost/midgard/mir_squeeze.c b/src/panfrost/compiler/midgard/mir_squeeze.c
similarity index 100%
rename from src/panfrost/midgard/mir_squeeze.c
rename to src/panfrost/compiler/midgard/mir_squeeze.c
diff --git a/src/panfrost/midgard/nir_fuse_io_16.c b/src/panfrost/compiler/midgard/nir_fuse_io_16.c
similarity index 100%
rename from src/panfrost/midgard/nir_fuse_io_16.c
rename to src/panfrost/compiler/midgard/nir_fuse_io_16.c
diff --git a/src/panfrost/genxml/decode.c b/src/panfrost/genxml/decode.c
index ac22721ff92..87085ba49f5 100644
--- a/src/panfrost/genxml/decode.c
+++ b/src/panfrost/genxml/decode.c
@@ -34,7 +34,6 @@
 #include <genxml/gen_macros.h>
 #include <sys/mman.h>
 
-#include "midgard/disassemble.h"
 #include "util/set.h"
 #include "pan_format.h"
 
diff --git a/src/panfrost/lib/pan_shader.c b/src/panfrost/lib/pan_shader.c
index 4519718b7aa..a7fe1b5cfe0 100644
--- a/src/panfrost/lib/pan_shader.c
+++ b/src/panfrost/lib/pan_shader.c
@@ -28,7 +28,7 @@
 #include "pan_format.h"
 
 #include "panfrost/compiler/bifrost/bifrost_compile.h"
-#include "panfrost/midgard/midgard_compile.h"
+#include "panfrost/compiler/midgard/midgard_compile.h"
 
 const nir_shader_compiler_options *
 pan_shader_get_compiler_options(unsigned arch)
diff --git a/src/panfrost/lib/pan_shader.h b/src/panfrost/lib/pan_shader.h
index 87a574be5d0..e497dbcc977 100644
--- a/src/panfrost/lib/pan_shader.h
+++ b/src/panfrost/lib/pan_shader.h
@@ -29,8 +29,8 @@
 #include "genxml/gen_macros.h"
 #include "panfrost/compiler/bifrost/bifrost/disassemble.h"
 #include "panfrost/compiler/bifrost/valhall/disassemble.h"
+#include "panfrost/compiler/midgard/disassemble.h"
 #include "panfrost/lib/pan_props.h"
-#include "panfrost/midgard/disassemble.h"
 #include "panfrost/util/pan_ir.h"
 #include "panfrost/util/pan_lower_framebuffer.h"
 
diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build
index c33fbb172ab..e669d3e10dc 100644
--- a/src/panfrost/meson.build
+++ b/src/panfrost/meson.build
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 inc_panfrost = include_directories([
-   '.', 'shared', 'midgard', 'compiler', 'lib', 'libpan', 'model',
+   '.', 'shared', 'compiler', 'lib', 'libpan', 'model',
 ])
 
 compile_args_panfrost = [
@@ -12,7 +12,6 @@ compile_args_panfrost = [
 
 subdir('shared')
 subdir('util')
-subdir('midgard')
 subdir('model')
 subdir('compiler')