diff --git a/Makefile.util.def b/Makefile.util.def
index 5fd53680d..68c105a9b 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -30,7 +30,7 @@ library = {
   common = grub-core/commands/blocklist.c;
   common = grub-core/commands/extcmd.c;
   common = grub-core/commands/ls.c;
-  common = grub-core/commands/net.c;
+  common = grub-core/net/net.c;
   common = grub-core/disk/dmraid_nvidia.c;
   common = grub-core/disk/host.c;
   common = grub-core/disk/loopback.c;
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index fb68f344c..bd5d78160 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -930,7 +930,7 @@ module = {
 
 module = {
   name = pxe;
-  i386_pc = fs/i386/pc/pxe.c;
+  i386_pc = net/i386/pc/pxe.c;
   enable = i386_pc;
 };
 
@@ -1379,5 +1379,5 @@ module = {
 
 module = {
   name = net;
-  common = commands/net.c;
+  common = net/net.c;
 };
\ No newline at end of file
diff --git a/grub-core/fs/i386/pc/pxe.c b/grub-core/net/i386/pc/pxe.c
similarity index 100%
rename from grub-core/fs/i386/pc/pxe.c
rename to grub-core/net/i386/pc/pxe.c
diff --git a/grub-core/commands/net.c b/grub-core/net/net.c
similarity index 100%
rename from grub-core/commands/net.c
rename to grub-core/net/net.c