diff --git a/src/panfrost/compiler/bi_opt_message_preload.c b/src/panfrost/compiler/bifrost/bi_opt_message_preload.c
similarity index 100%
rename from src/panfrost/compiler/bi_opt_message_preload.c
rename to src/panfrost/compiler/bifrost/bi_opt_message_preload.c
diff --git a/src/panfrost/compiler/bi_pack.c b/src/panfrost/compiler/bifrost/bi_pack.c
similarity index 100%
rename from src/panfrost/compiler/bi_pack.c
rename to src/panfrost/compiler/bifrost/bi_pack.c
diff --git a/src/panfrost/compiler/bi_schedule.c b/src/panfrost/compiler/bifrost/bi_schedule.c
similarity index 100%
rename from src/panfrost/compiler/bi_schedule.c
rename to src/panfrost/compiler/bifrost/bi_schedule.c
diff --git a/src/panfrost/compiler/bi_scoreboard.c b/src/panfrost/compiler/bifrost/bi_scoreboard.c
similarity index 100%
rename from src/panfrost/compiler/bi_scoreboard.c
rename to src/panfrost/compiler/bifrost/bi_scoreboard.c
diff --git a/src/panfrost/compiler/disassemble.c b/src/panfrost/compiler/bifrost/disassemble.c
similarity index 100%
rename from src/panfrost/compiler/disassemble.c
rename to src/panfrost/compiler/bifrost/disassemble.c
diff --git a/src/panfrost/compiler/disassemble.h b/src/panfrost/compiler/bifrost/disassemble.h
similarity index 98%
rename from src/panfrost/compiler/disassemble.h
rename to src/panfrost/compiler/bifrost/disassemble.h
index bf023a732a4..2bcb96296e1 100644
--- a/src/panfrost/compiler/disassemble.h
+++ b/src/panfrost/compiler/bifrost/disassemble.h
@@ -30,7 +30,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
-#include "bifrost.h"
+#include "../bifrost.h"
 
 void disassemble_bifrost(FILE *fp, uint8_t *code, size_t size, bool verbose);
 
diff --git a/src/panfrost/compiler/bifrost_compile.c b/src/panfrost/compiler/bifrost_compile.c
index 1aafda25483..ebcd30a382d 100644
--- a/src/panfrost/compiler/bifrost_compile.c
+++ b/src/panfrost/compiler/bifrost_compile.c
@@ -31,6 +31,7 @@
 #include "compiler/nir_types.h"
 #include "util/u_debug.h"
 
+#include "bifrost/disassemble.h"
 #include "valhall/disassemble.h"
 #include "valhall/va_compiler.h"
 #include "bi_builder.h"
@@ -38,7 +39,6 @@
 #include "bifrost_compile.h"
 #include "bifrost_nir.h"
 #include "compiler.h"
-#include "disassemble.h"
 
 /* clang-format off */
 static const struct debug_named_value bifrost_debug_options[] = {
diff --git a/src/panfrost/compiler/cmdline.c b/src/panfrost/compiler/cmdline.c
index 6b4be84fd50..4e6eb6632ee 100644
--- a/src/panfrost/compiler/cmdline.c
+++ b/src/panfrost/compiler/cmdline.c
@@ -26,9 +26,9 @@
 
 #include <getopt.h>
 #include <string.h>
+#include "bifrost/disassemble.h"
 #include "util/macros.h"
 #include "valhall/disassemble.h"
-#include "disassemble.h"
 
 unsigned gpu_id = 0x7212;
 int verbose = 0;
diff --git a/src/panfrost/compiler/gen_disasm.py b/src/panfrost/compiler/gen_disasm.py
index 505c61cc029..5b699930e3b 100644
--- a/src/panfrost/compiler/gen_disasm.py
+++ b/src/panfrost/compiler/gen_disasm.py
@@ -348,7 +348,7 @@ def disasm_op(name, op):
     return disasm_op_template.render(c_name = opname_to_c(name), body = body)
 
 print('#include "util/macros.h"')
-print('#include "disassemble.h"')
+print('#include "bifrost/disassemble.h"')
 
 states = expand_states(instructions)
 print('#define _BITS(bits, pos, width) (((bits) >> (pos)) & ((1 << (width)) - 1))')
diff --git a/src/panfrost/compiler/meson.build b/src/panfrost/compiler/meson.build
index 63d1560cc8d..ed620ffbfd1 100644
--- a/src/panfrost/compiler/meson.build
+++ b/src/panfrost/compiler/meson.build
@@ -35,17 +35,17 @@ libpanfrost_bifrost_files = files(
   'bi_opt_dce.c',
   'bi_opt_cse.c',
   'bi_opt_push_ubo.c',
-  'bi_opt_message_preload.c',
   'bi_opt_mod_props.c',
   'bi_opt_dual_tex.c',
   'bi_pressure_schedule.c',
-  'bi_pack.c',
   'bi_ra.c',
-  'bi_schedule.c',
-  'bi_scoreboard.c',
   'bi_validate.c',
   'bir.c',
   'bifrost_compile.c',
+  'bifrost/bi_opt_message_preload.c',
+  'bifrost/bi_pack.c',
+  'bifrost/bi_schedule.c',
+  'bifrost/bi_scoreboard.c',
   'valhall/va_insert_flow.c',
   'valhall/va_lower_constants.c',
   'valhall/va_lower_isel.c',
@@ -135,7 +135,7 @@ bifrost_nir_algebraic_c = custom_target(
 
 libpanfrost_bifrost_disasm = static_library(
   'panfrost_bifrost_disasm',
-  ['disassemble.c', 'bi_print_common.c', bifrost_gen_disasm_c],
+  ['bifrost/disassemble.c', 'bi_print_common.c', bifrost_gen_disasm_c],
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
   dependencies: [idep_nir],
   link_with: [libpanfrost_util],
diff --git a/src/panfrost/lib/genxml/decode.c b/src/panfrost/lib/genxml/decode.c
index db214f31b88..26fb7092d25 100644
--- a/src/panfrost/lib/genxml/decode.c
+++ b/src/panfrost/lib/genxml/decode.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <genxml/gen_macros.h>
 
-#include "compiler/disassemble.h"
+#include "compiler/bifrost/disassemble.h"
 #include "compiler/valhall/disassemble.h"
 #include "midgard/disassemble.h"
 #include "util/set.h"