diff --git a/hw/xbox/mcpx/meson.build b/hw/xbox/mcpx/meson.build
index 35b53a8c0f..3b88a5104d 100644
--- a/hw/xbox/mcpx/meson.build
+++ b/hw/xbox/mcpx/meson.build
@@ -3,5 +3,6 @@ mcpx_ss = ss.source_set()
 mcpx_ss.add(files('aci.c'))
 
 subdir('apu')
+subdir('nvnet')
 
 specific_ss.add_all(mcpx_ss)
diff --git a/hw/xbox/mcpx/nvnet/meson.build b/hw/xbox/mcpx/nvnet/meson.build
new file mode 100644
index 0000000000..ebe20303de
--- /dev/null
+++ b/hw/xbox/mcpx/nvnet/meson.build
@@ -0,0 +1 @@
+mcpx_ss.add(files('nvnet.c'))
diff --git a/hw/xbox/nvnet.c b/hw/xbox/mcpx/nvnet/nvnet.c
similarity index 100%
rename from hw/xbox/nvnet.c
rename to hw/xbox/mcpx/nvnet/nvnet.c
diff --git a/hw/xbox/nvnet_regs.h b/hw/xbox/mcpx/nvnet/nvnet_regs.h
similarity index 100%
rename from hw/xbox/nvnet_regs.h
rename to hw/xbox/mcpx/nvnet/nvnet_regs.h
diff --git a/hw/xbox/trace-events b/hw/xbox/mcpx/nvnet/trace-events
similarity index 100%
rename from hw/xbox/trace-events
rename to hw/xbox/mcpx/nvnet/trace-events
diff --git a/hw/xbox/mcpx/nvnet/trace.h b/hw/xbox/mcpx/nvnet/trace.h
new file mode 100644
index 0000000000..470faee410
--- /dev/null
+++ b/hw/xbox/mcpx/nvnet/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_xbox_mcpx_nvnet.h"
diff --git a/hw/xbox/meson.build b/hw/xbox/meson.build
index dce2d3729e..8cf1ea0bb7 100644
--- a/hw/xbox/meson.build
+++ b/hw/xbox/meson.build
@@ -5,7 +5,6 @@ specific_ss.add(files(
 	# 'chihiro.c',
 	'eeprom_generation.c',
 	'lpc47m157.c',
-	'nvnet.c',
 	'smbus_adm1032.c',
 	'smbus_cx25871.c',
 	'smbus_fs454.c',
diff --git a/hw/xbox/trace.h b/hw/xbox/trace.h
deleted file mode 100644
index f0d1604b1c..0000000000
--- a/hw/xbox/trace.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "trace/trace-hw_xbox.h"
diff --git a/meson.build b/meson.build
index 9027692e62..b9fc4cacb6 100644
--- a/meson.build
+++ b/meson.build
@@ -3773,7 +3773,7 @@ if have_system
     'hw/xbox/nv2a',
     'hw/xbox/mcpx/apu',
     'hw/xbox/mcpx/apu/dsp',
-    'hw/xbox',
+    'hw/xbox/mcpx/nvnet',
   ]
 endif
 if have_system or have_user