NetworkPkg: Move Network library and drivers from MdeModulePkg to NetworkPkg

Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Siyuan Fu <siyuan.fu@intel.com>

147 files changed, 24 insertions, 24 deletions

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c b/NetworkPkg/ArpDxe/ArpDriver.c
index 632d691d75..632d691d75 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
+++ b/NetworkPkg/ArpDxe/ArpDriver.c
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h b/NetworkPkg/ArpDxe/ArpDriver.h
index 0b5b06ee37..0b5b06ee37 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h
+++ b/NetworkPkg/ArpDxe/ArpDriver.h
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf b/NetworkPkg/ArpDxe/ArpDxe.inf
index 78344edf90..78344edf90 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+++ b/NetworkPkg/ArpDxe/ArpDxe.inf
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni b/NetworkPkg/ArpDxe/ArpDxe.uni
index f72063dd43..f72063dd43 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni
+++ b/NetworkPkg/ArpDxe/ArpDxe.uni
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni b/NetworkPkg/ArpDxe/ArpDxeExtra.uni
index be612d002e..be612d002e 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni
+++ b/NetworkPkg/ArpDxe/ArpDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c b/NetworkPkg/ArpDxe/ArpImpl.c
index 0e9ef103ef..0e9ef103ef 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
+++ b/NetworkPkg/ArpDxe/ArpImpl.c
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h b/NetworkPkg/ArpDxe/ArpImpl.h
index 47eedc1cb6..47eedc1cb6 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h
+++ b/NetworkPkg/ArpDxe/ArpImpl.h
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c b/NetworkPkg/ArpDxe/ArpMain.c
index f06121fed4..f06121fed4 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
+++ b/NetworkPkg/ArpDxe/ArpMain.c
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c b/NetworkPkg/ArpDxe/ComponentName.c
index bcee1e1444..bcee1e1444 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
+++ b/NetworkPkg/ArpDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c b/NetworkPkg/Dhcp4Dxe/ComponentName.c
index 7c404fa267..7c404fa267 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
+++ b/NetworkPkg/Dhcp4Dxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c b/NetworkPkg/Dhcp4Dxe/Dhcp4Driver.c
index e891b68883..e891b68883 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
+++ b/NetworkPkg/Dhcp4Dxe/Dhcp4Driver.c
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h b/NetworkPkg/Dhcp4Dxe/Dhcp4Driver.h
index cebde20dca..cebde20dca 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h
+++ b/NetworkPkg/Dhcp4Dxe/Dhcp4Driver.h
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf b/NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf
index 62883518b2..62883518b2 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
+++ b/NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni b/NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.uni
index 5405b88d25..5405b88d25 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni
+++ b/NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.uni
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni b/NetworkPkg/Dhcp4Dxe/Dhcp4DxeExtra.uni
index ca62553f8b..ca62553f8b 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni
+++ b/NetworkPkg/Dhcp4Dxe/Dhcp4DxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c b/NetworkPkg/Dhcp4Dxe/Dhcp4Impl.c
index 0b35bdf4df..0b35bdf4df 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
+++ b/NetworkPkg/Dhcp4Dxe/Dhcp4Impl.c
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h b/NetworkPkg/Dhcp4Dxe/Dhcp4Impl.h
index 8c2cd3dae1..8c2cd3dae1 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
+++ b/NetworkPkg/Dhcp4Dxe/Dhcp4Impl.h
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c b/NetworkPkg/Dhcp4Dxe/Dhcp4Io.c
index 4728b94c58..4728b94c58 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
+++ b/NetworkPkg/Dhcp4Dxe/Dhcp4Io.c
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h b/NetworkPkg/Dhcp4Dxe/Dhcp4Io.h
index 01283e5e17..01283e5e17 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
+++ b/NetworkPkg/Dhcp4Dxe/Dhcp4Io.h
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c b/NetworkPkg/Dhcp4Dxe/Dhcp4Option.c
index 3adbf55d06..3adbf55d06 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c
+++ b/NetworkPkg/Dhcp4Dxe/Dhcp4Option.c
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h b/NetworkPkg/Dhcp4Dxe/Dhcp4Option.h
index 9e25386507..9e25386507 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h
+++ b/NetworkPkg/Dhcp4Dxe/Dhcp4Option.h
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c b/NetworkPkg/DpcDxe/Dpc.c
index 8a490949dc..8a490949dc 100644
--- a/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c
+++ b/NetworkPkg/DpcDxe/Dpc.c
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/Dpc.h b/NetworkPkg/DpcDxe/Dpc.h
index 2017a215e3..2017a215e3 100644
--- a/MdeModulePkg/Universal/Network/DpcDxe/Dpc.h
+++ b/NetworkPkg/DpcDxe/Dpc.h
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf b/NetworkPkg/DpcDxe/DpcDxe.inf
index 8c241d7f46..8c241d7f46 100644
--- a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
+++ b/NetworkPkg/DpcDxe/DpcDxe.inf
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni b/NetworkPkg/DpcDxe/DpcDxe.uni
index 34ad24b255..34ad24b255 100644
--- a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni
+++ b/NetworkPkg/DpcDxe/DpcDxe.uni
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni b/NetworkPkg/DpcDxe/DpcDxeExtra.uni
index 82a93190d6..82a93190d6 100644
--- a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni
+++ b/NetworkPkg/DpcDxe/DpcDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c b/NetworkPkg/Ip4Dxe/ComponentName.c
index 3461ab2a89..3461ab2a89 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
+++ b/NetworkPkg/Ip4Dxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.c b/NetworkPkg/Ip4Dxe/Ip4Common.c
index c756a2dbf7..c756a2dbf7 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.c
+++ b/NetworkPkg/Ip4Dxe/Ip4Common.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h b/NetworkPkg/Ip4Dxe/Ip4Common.h
index 8fbfd54872..8fbfd54872 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h
+++ b/NetworkPkg/Ip4Dxe/Ip4Common.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2.vfr b/NetworkPkg/Ip4Dxe/Ip4Config2.vfr
index d85a99180e..d85a99180e 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2.vfr
+++ b/NetworkPkg/Ip4Dxe/Ip4Config2.vfr
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c b/NetworkPkg/Ip4Dxe/Ip4Config2Impl.c
index 9dca48ddd6..9dca48ddd6 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c
+++ b/NetworkPkg/Ip4Dxe/Ip4Config2Impl.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h b/NetworkPkg/Ip4Dxe/Ip4Config2Impl.h
index 1716dde399..1716dde399 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h
+++ b/NetworkPkg/Ip4Dxe/Ip4Config2Impl.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c b/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c
index a4d2996a60..a4d2996a60 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c
+++ b/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.h b/NetworkPkg/Ip4Dxe/Ip4Config2Nv.h
index f453e19e9b..f453e19e9b 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.h
+++ b/NetworkPkg/Ip4Dxe/Ip4Config2Nv.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c b/NetworkPkg/Ip4Dxe/Ip4Driver.c
index ebd4dec1df..ebd4dec1df 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
+++ b/NetworkPkg/Ip4Dxe/Ip4Driver.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h b/NetworkPkg/Ip4Dxe/Ip4Driver.h
index be37471570..be37471570 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h
+++ b/NetworkPkg/Ip4Dxe/Ip4Driver.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf b/NetworkPkg/Ip4Dxe/Ip4Dxe.inf
index ff9f32174e..ff9f32174e 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+++ b/NetworkPkg/Ip4Dxe/Ip4Dxe.inf
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni b/NetworkPkg/Ip4Dxe/Ip4Dxe.uni
index 380d07da0f..380d07da0f 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni
+++ b/NetworkPkg/Ip4Dxe/Ip4Dxe.uni
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni b/NetworkPkg/Ip4Dxe/Ip4DxeExtra.uni
index dbbf9d5f90..dbbf9d5f90 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni
+++ b/NetworkPkg/Ip4Dxe/Ip4DxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeStrings.uni b/NetworkPkg/Ip4Dxe/Ip4DxeStrings.uni
index c262298f00..c262298f00 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeStrings.uni
+++ b/NetworkPkg/Ip4Dxe/Ip4DxeStrings.uni
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c b/NetworkPkg/Ip4Dxe/Ip4Icmp.c
index 052d6b77f7..052d6b77f7 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c
+++ b/NetworkPkg/Ip4Dxe/Ip4Icmp.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h b/NetworkPkg/Ip4Dxe/Ip4Icmp.h
index 922886a96e..922886a96e 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h
+++ b/NetworkPkg/Ip4Dxe/Ip4Icmp.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/NetworkPkg/Ip4Dxe/Ip4If.c
index 44b8d9fc8f..44b8d9fc8f 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/NetworkPkg/Ip4Dxe/Ip4If.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h b/NetworkPkg/Ip4Dxe/Ip4If.h
index d73bb5285f..d73bb5285f 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
+++ b/NetworkPkg/Ip4Dxe/Ip4If.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c b/NetworkPkg/Ip4Dxe/Ip4Igmp.c
index 41d9bce971..41d9bce971 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
+++ b/NetworkPkg/Ip4Dxe/Ip4Igmp.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.h b/NetworkPkg/Ip4Dxe/Ip4Igmp.h
index 0cc9445944..0cc9445944 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.h
+++ b/NetworkPkg/Ip4Dxe/Ip4Igmp.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/NetworkPkg/Ip4Dxe/Ip4Impl.c
index ec6f037077..ec6f037077 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/NetworkPkg/Ip4Dxe/Ip4Impl.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h b/NetworkPkg/Ip4Dxe/Ip4Impl.h
index a322a85981..a322a85981 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
+++ b/NetworkPkg/Ip4Dxe/Ip4Impl.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/NetworkPkg/Ip4Dxe/Ip4Input.c
index 24c5846588..24c5846588 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
+++ b/NetworkPkg/Ip4Dxe/Ip4Input.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h b/NetworkPkg/Ip4Dxe/Ip4Input.h
index f4d45d1613..f4d45d1613 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h
+++ b/NetworkPkg/Ip4Dxe/Ip4Input.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4NvData.h b/NetworkPkg/Ip4Dxe/Ip4NvData.h
index d161c1c8c5..d161c1c8c5 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4NvData.h
+++ b/NetworkPkg/Ip4Dxe/Ip4NvData.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c b/NetworkPkg/Ip4Dxe/Ip4Option.c
index f1c10014e8..f1c10014e8 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
+++ b/NetworkPkg/Ip4Dxe/Ip4Option.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h b/NetworkPkg/Ip4Dxe/Ip4Option.h
index 57a5a58725..57a5a58725 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h
+++ b/NetworkPkg/Ip4Dxe/Ip4Option.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c b/NetworkPkg/Ip4Dxe/Ip4Output.c
index 5eb3814089..5eb3814089 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
+++ b/NetworkPkg/Ip4Dxe/Ip4Output.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.h b/NetworkPkg/Ip4Dxe/Ip4Output.h
index ae54f8b485..ae54f8b485 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.h
+++ b/NetworkPkg/Ip4Dxe/Ip4Output.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c b/NetworkPkg/Ip4Dxe/Ip4Route.c
index 124c0730ad..124c0730ad 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c
+++ b/NetworkPkg/Ip4Dxe/Ip4Route.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h b/NetworkPkg/Ip4Dxe/Ip4Route.h
index 4b0b5282ab..4b0b5282ab 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h
+++ b/NetworkPkg/Ip4Dxe/Ip4Route.h
diff --git a/MdeModulePkg/Library/DxeDpcLib/DpcLib.c b/NetworkPkg/Library/DxeDpcLib/DpcLib.c
index 29d810776e..29d810776e 100644
--- a/MdeModulePkg/Library/DxeDpcLib/DpcLib.c
+++ b/NetworkPkg/Library/DxeDpcLib/DpcLib.c
diff --git a/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf b/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf
index 1c23729ce3..1c23729ce3 100644
--- a/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
+++ b/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf
diff --git a/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni b/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.uni
index 3105bbcfe0..3105bbcfe0 100644
--- a/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni
+++ b/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.uni
diff --git a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.c b/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.c
index 8b74554cd9..8b74554cd9 100644
--- a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.c
+++ b/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.c
diff --git a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.h b/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.h
index d064a98438..d064a98438 100644
--- a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.h
+++ b/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.h
diff --git a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf b/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf
index c613dc1718..c613dc1718 100644
--- a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
+++ b/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf
diff --git a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.uni b/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.uni
index a2954c023e..a2954c023e 100644
--- a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.uni
+++ b/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.uni
diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c b/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.c
index d45f0070b3..d45f0070b3 100644
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
+++ b/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.c
diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf b/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf
index a789d80de6..a789d80de6 100644
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
+++ b/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf
diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.uni b/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.uni
index 4af043cfe9..4af043cfe9 100644
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.uni
+++ b/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.uni
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/NetworkPkg/Library/DxeNetLib/DxeNetLib.c
index 8e2f720666..8e2f720666 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/NetworkPkg/Library/DxeNetLib/DxeNetLib.c
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf b/NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
index 35a8247517..35a8247517 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+++ b/NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.uni b/NetworkPkg/Library/DxeNetLib/DxeNetLib.uni
index 0c9f1fddde..0c9f1fddde 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.uni
+++ b/NetworkPkg/Library/DxeNetLib/DxeNetLib.uni
diff --git a/MdeModulePkg/Library/DxeNetLib/NetBuffer.c b/NetworkPkg/Library/DxeNetLib/NetBuffer.c
index 2408e9a104..2408e9a104 100644
--- a/MdeModulePkg/Library/DxeNetLib/NetBuffer.c
+++ b/NetworkPkg/Library/DxeNetLib/NetBuffer.c
diff --git a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c b/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.c
index 341295d0b7..341295d0b7 100644
--- a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c
+++ b/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.c
diff --git a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf b/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
index 66873d7837..66873d7837 100644
--- a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
+++ b/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
diff --git a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni b/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni
index 79ad484a65..79ad484a65 100644
--- a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni
+++ b/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni
diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c b/NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
index 155cb31049..155cb31049 100644
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
+++ b/NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf b/NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
index 483c2cda02..483c2cda02 100644
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
+++ b/NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni b/NetworkPkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni
index bc94905995..bc94905995 100644
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni
+++ b/NetworkPkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c b/NetworkPkg/MnpDxe/ComponentName.c
index fe85c3bc23..fe85c3bc23 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
+++ b/NetworkPkg/MnpDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.h b/NetworkPkg/MnpDxe/ComponentName.h
index 201c6da11a..201c6da11a 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.h
+++ b/NetworkPkg/MnpDxe/ComponentName.h
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c b/NetworkPkg/MnpDxe/MnpConfig.c
index 5906ad546f..5906ad546f 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
+++ b/NetworkPkg/MnpDxe/MnpConfig.c
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c b/NetworkPkg/MnpDxe/MnpDriver.c
index e99e7c5a61..e99e7c5a61 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
+++ b/NetworkPkg/MnpDxe/MnpDriver.c
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h b/NetworkPkg/MnpDxe/MnpDriver.h
index 150d21e9ec..150d21e9ec 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h
+++ b/NetworkPkg/MnpDxe/MnpDriver.h
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf b/NetworkPkg/MnpDxe/MnpDxe.inf
index d4685b3e6a..d4685b3e6a 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+++ b/NetworkPkg/MnpDxe/MnpDxe.inf
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni b/NetworkPkg/MnpDxe/MnpDxe.uni
index 04be3cd7fe..04be3cd7fe 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni
+++ b/NetworkPkg/MnpDxe/MnpDxe.uni
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni b/NetworkPkg/MnpDxe/MnpDxeExtra.uni
index 504ad2d8ad..504ad2d8ad 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni
+++ b/NetworkPkg/MnpDxe/MnpDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h b/NetworkPkg/MnpDxe/MnpImpl.h
index 7d54240346..7d54240346 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h
+++ b/NetworkPkg/MnpDxe/MnpImpl.h
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/NetworkPkg/MnpDxe/MnpIo.c
index 56405d62b5..56405d62b5 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
+++ b/NetworkPkg/MnpDxe/MnpIo.c
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c b/NetworkPkg/MnpDxe/MnpMain.c
index d96178a1d9..d96178a1d9 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
+++ b/NetworkPkg/MnpDxe/MnpMain.c
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.c b/NetworkPkg/MnpDxe/MnpVlan.c
index 54fb189502..54fb189502 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.c
+++ b/NetworkPkg/MnpDxe/MnpVlan.c
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.h b/NetworkPkg/MnpDxe/MnpVlan.h
index 4e0ddef2df..4e0ddef2df 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.h
+++ b/NetworkPkg/MnpDxe/MnpVlan.h
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c b/NetworkPkg/Mtftp4Dxe/ComponentName.c
index 8b84caf113..8b84caf113 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
+++ b/NetworkPkg/Mtftp4Dxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c b/NetworkPkg/Mtftp4Dxe/Mtftp4Driver.c
index ae9e65544a..ae9e65544a 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Driver.c
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h b/NetworkPkg/Mtftp4Dxe/Mtftp4Driver.h
index c90e690186..c90e690186 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Driver.h
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf b/NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf
index 6e5335ca23..6e5335ca23 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni b/NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.uni
index 1c2c80bcd1..1c2c80bcd1 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.uni
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni b/NetworkPkg/Mtftp4Dxe/Mtftp4DxeExtra.uni
index cd685c452d..cd685c452d 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4DxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/NetworkPkg/Mtftp4Dxe/Mtftp4Impl.c
index 70bd693e4e..70bd693e4e 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Impl.c
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h b/NetworkPkg/Mtftp4Dxe/Mtftp4Impl.h
index 33393d4247..33393d4247 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Impl.h
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c b/NetworkPkg/Mtftp4Dxe/Mtftp4Option.c
index d97f157f17..d97f157f17 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Option.c
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h b/NetworkPkg/Mtftp4Dxe/Mtftp4Option.h
index fcc4cbe8fd..fcc4cbe8fd 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Option.h
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c b/NetworkPkg/Mtftp4Dxe/Mtftp4Rrq.c
index 24c965afb5..24c965afb5 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Rrq.c
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c b/NetworkPkg/Mtftp4Dxe/Mtftp4Support.c
index ad2ff7bf3a..ad2ff7bf3a 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Support.c
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h b/NetworkPkg/Mtftp4Dxe/Mtftp4Support.h
index cfa7582faa..cfa7582faa 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Support.h
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c b/NetworkPkg/Mtftp4Dxe/Mtftp4Wrq.c
index 14156b801e..14156b801e 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Wrq.c
diff --git a/NetworkPkg/Network.fdf.inc b/NetworkPkg/Network.fdf.inc
index 92e2c56cb8..803a0d64fd 100644
--- a/NetworkPkg/Network.fdf.inc
+++ b/NetworkPkg/Network.fdf.inc
@@ -11,24 +11,24 @@
 #

 

 !if $(NETWORK_ENABLE) == TRUE

-  INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf

+  INF  NetworkPkg/DpcDxe/DpcDxe.inf

 

   !if $(NETWORK_SNP_ENABLE) == TRUE

-    INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf

+    INF  NetworkPkg/SnpDxe/SnpDxe.inf

   !endif

 

   !if $(NETWORK_VLAN_ENABLE) == TRUE

-    INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

+    INF  NetworkPkg/VlanConfigDxe/VlanConfigDxe.inf

   !endif

 

-  INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf

+  INF  NetworkPkg/MnpDxe/MnpDxe.inf

 

   !if $(NETWORK_IP4_ENABLE) == TRUE

-    INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf

-    INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

-    INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

-    INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

-    INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

+    INF  NetworkPkg/ArpDxe/ArpDxe.inf

+    INF  NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf

+    INF  NetworkPkg/Ip4Dxe/Ip4Dxe.inf

+    INF  NetworkPkg/Udp4Dxe/Udp4Dxe.inf

+    INF  NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf

   !endif

 

   !if $(NETWORK_IP6_ENABLE) == TRUE

diff --git a/NetworkPkg/NetworkComponents.dsc.inc b/NetworkPkg/NetworkComponents.dsc.inc
index aede5ea8be..40cb8ee18e 100644
--- a/NetworkPkg/NetworkComponents.dsc.inc
+++ b/NetworkPkg/NetworkComponents.dsc.inc
@@ -13,24 +13,24 @@
 ##

 

 !if $(NETWORK_ENABLE) == TRUE

-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf

+  NetworkPkg/DpcDxe/DpcDxe.inf

 

   !if $(NETWORK_SNP_ENABLE) == TRUE

-    MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf

+    NetworkPkg/SnpDxe/SnpDxe.inf

   !endif

 

   !if $(NETWORK_VLAN_ENABLE) == TRUE

-    MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

+    NetworkPkg/VlanConfigDxe/VlanConfigDxe.inf

   !endif

 

-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf

+  NetworkPkg/MnpDxe/MnpDxe.inf

 

   !if $(NETWORK_IP4_ENABLE) == TRUE

-    MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf

-    MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

-    MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

-    MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

-    MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

+    NetworkPkg/ArpDxe/ArpDxe.inf

+    NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf

+    NetworkPkg/Ip4Dxe/Ip4Dxe.inf

+    NetworkPkg/Udp4Dxe/Udp4Dxe.inf

+    NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf

   !endif

 

   !if $(NETWORK_IP6_ENABLE) == TRUE

diff --git a/NetworkPkg/NetworkLibs.dsc.inc b/NetworkPkg/NetworkLibs.dsc.inc
index a23f982381..4b99f48085 100644
--- a/NetworkPkg/NetworkLibs.dsc.inc
+++ b/NetworkPkg/NetworkLibs.dsc.inc
@@ -11,10 +11,10 @@
 #

 ##

 

-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf

-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf

-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf

-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf

+  DpcLib|NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf

+  NetLib|NetworkPkg/Library/DxeNetLib/DxeNetLib.inf

+  IpIoLib|NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf

+  UdpIoLib|NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf

+  TcpIoLib|NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf

   # HttpLib is used for Http Boot

-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf

+  HttpLib|NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Callback.c b/NetworkPkg/SnpDxe/Callback.c
index 6387dbdb35..6387dbdb35 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Callback.c
+++ b/NetworkPkg/SnpDxe/Callback.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c b/NetworkPkg/SnpDxe/ComponentName.c
index 2139e2a47f..2139e2a47f 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
+++ b/NetworkPkg/SnpDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Get_status.c b/NetworkPkg/SnpDxe/Get_status.c
index be6608a0b3..be6608a0b3 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Get_status.c
+++ b/NetworkPkg/SnpDxe/Get_status.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c b/NetworkPkg/SnpDxe/Initialize.c
index 4d33154241..4d33154241 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c
+++ b/NetworkPkg/SnpDxe/Initialize.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c b/NetworkPkg/SnpDxe/Mcast_ip_to_mac.c
index 9863c1f9ea..9863c1f9ea 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c
+++ b/NetworkPkg/SnpDxe/Mcast_ip_to_mac.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c b/NetworkPkg/SnpDxe/Nvdata.c
index 7010b63a54..7010b63a54 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c
+++ b/NetworkPkg/SnpDxe/Nvdata.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Receive.c b/NetworkPkg/SnpDxe/Receive.c
index 28cea0d2e9..28cea0d2e9 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Receive.c
+++ b/NetworkPkg/SnpDxe/Receive.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c b/NetworkPkg/SnpDxe/Receive_filters.c
index 494d2709b6..494d2709b6 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c
+++ b/NetworkPkg/SnpDxe/Receive_filters.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Reset.c b/NetworkPkg/SnpDxe/Reset.c
index 3069bfde66..3069bfde66 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Reset.c
+++ b/NetworkPkg/SnpDxe/Reset.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c b/NetworkPkg/SnpDxe/Shutdown.c
index aad0fe8493..aad0fe8493 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c
+++ b/NetworkPkg/SnpDxe/Shutdown.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c b/NetworkPkg/SnpDxe/Snp.c
index a23af05078..a23af05078 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
+++ b/NetworkPkg/SnpDxe/Snp.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.h b/NetworkPkg/SnpDxe/Snp.h
index e6b6293039..e6b6293039 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.h
+++ b/NetworkPkg/SnpDxe/Snp.h
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf b/NetworkPkg/SnpDxe/SnpDxe.inf
index eab97d2e9e..eab97d2e9e 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
+++ b/NetworkPkg/SnpDxe/SnpDxe.inf
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni b/NetworkPkg/SnpDxe/SnpDxe.uni
index f37bb17fe0..f37bb17fe0 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni
+++ b/NetworkPkg/SnpDxe/SnpDxe.uni
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni b/NetworkPkg/SnpDxe/SnpDxeExtra.uni
index 5cf6e9d18e..5cf6e9d18e 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni
+++ b/NetworkPkg/SnpDxe/SnpDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Start.c b/NetworkPkg/SnpDxe/Start.c
index 033ca22f66..033ca22f66 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Start.c
+++ b/NetworkPkg/SnpDxe/Start.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c b/NetworkPkg/SnpDxe/Station_address.c
index a5c87d4799..a5c87d4799 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c
+++ b/NetworkPkg/SnpDxe/Station_address.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Statistics.c b/NetworkPkg/SnpDxe/Statistics.c
index 480e261780..480e261780 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Statistics.c
+++ b/NetworkPkg/SnpDxe/Statistics.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Stop.c b/NetworkPkg/SnpDxe/Stop.c
index f1c1bd847c..f1c1bd847c 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Stop.c
+++ b/NetworkPkg/SnpDxe/Stop.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c b/NetworkPkg/SnpDxe/Transmit.c
index 44fdd71f41..44fdd71f41 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
+++ b/NetworkPkg/SnpDxe/Transmit.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c b/NetworkPkg/SnpDxe/WaitForPacket.c
index 866a1e8c0e..866a1e8c0e 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c
+++ b/NetworkPkg/SnpDxe/WaitForPacket.c
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c b/NetworkPkg/Udp4Dxe/ComponentName.c
index 41bd834c6d..41bd834c6d 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
+++ b/NetworkPkg/Udp4Dxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c b/NetworkPkg/Udp4Dxe/Udp4Driver.c
index 63b103b8ef..63b103b8ef 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
+++ b/NetworkPkg/Udp4Dxe/Udp4Driver.c
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h b/NetworkPkg/Udp4Dxe/Udp4Driver.h
index 4e9a0c7356..4e9a0c7356 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h
+++ b/NetworkPkg/Udp4Dxe/Udp4Driver.h
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf b/NetworkPkg/Udp4Dxe/Udp4Dxe.inf
index ba623a6637..ba623a6637 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+++ b/NetworkPkg/Udp4Dxe/Udp4Dxe.inf
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni b/NetworkPkg/Udp4Dxe/Udp4Dxe.uni
index 1e3e4aafe7..1e3e4aafe7 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni
+++ b/NetworkPkg/Udp4Dxe/Udp4Dxe.uni
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni b/NetworkPkg/Udp4Dxe/Udp4DxeExtra.uni
index b048ce31a5..b048ce31a5 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni
+++ b/NetworkPkg/Udp4Dxe/Udp4DxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c b/NetworkPkg/Udp4Dxe/Udp4Impl.c
index fb1951fb13..fb1951fb13 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
+++ b/NetworkPkg/Udp4Dxe/Udp4Impl.c
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h b/NetworkPkg/Udp4Dxe/Udp4Impl.h
index a5dd1ecabe..a5dd1ecabe 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
+++ b/NetworkPkg/Udp4Dxe/Udp4Impl.h
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c b/NetworkPkg/Udp4Dxe/Udp4Main.c
index aa1956cd4b..aa1956cd4b 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
+++ b/NetworkPkg/Udp4Dxe/Udp4Main.c
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/ComponentName.c b/NetworkPkg/VlanConfigDxe/ComponentName.c
index f36d29f8bd..f36d29f8bd 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/ComponentName.c
+++ b/NetworkPkg/VlanConfigDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfig.vfr b/NetworkPkg/VlanConfigDxe/VlanConfig.vfr
index e493325295..e493325295 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfig.vfr
+++ b/NetworkPkg/VlanConfigDxe/VlanConfig.vfr
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c b/NetworkPkg/VlanConfigDxe/VlanConfigDriver.c
index c717d9ea52..c717d9ea52 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c
+++ b/NetworkPkg/VlanConfigDxe/VlanConfigDriver.c
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf b/NetworkPkg/VlanConfigDxe/VlanConfigDxe.inf
index 72af88d695..72af88d695 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
+++ b/NetworkPkg/VlanConfigDxe/VlanConfigDxe.inf
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni b/NetworkPkg/VlanConfigDxe/VlanConfigDxe.uni
index abc5a1ade1..abc5a1ade1 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni
+++ b/NetworkPkg/VlanConfigDxe/VlanConfigDxe.uni
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni b/NetworkPkg/VlanConfigDxe/VlanConfigDxeExtra.uni
index 0c4eada240..0c4eada240 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni
+++ b/NetworkPkg/VlanConfigDxe/VlanConfigDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c b/NetworkPkg/VlanConfigDxe/VlanConfigImpl.c
index 24d844cbf1..24d844cbf1 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
+++ b/NetworkPkg/VlanConfigDxe/VlanConfigImpl.c
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.h b/NetworkPkg/VlanConfigDxe/VlanConfigImpl.h
index 14f99c03b7..14f99c03b7 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.h
+++ b/NetworkPkg/VlanConfigDxe/VlanConfigImpl.h
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigNvData.h b/NetworkPkg/VlanConfigDxe/VlanConfigNvData.h
index 00b5486901..00b5486901 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigNvData.h
+++ b/NetworkPkg/VlanConfigDxe/VlanConfigNvData.h
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni b/NetworkPkg/VlanConfigDxe/VlanConfigStrings.uni
index 1ccfd60016..1ccfd60016 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni
+++ b/NetworkPkg/VlanConfigDxe/VlanConfigStrings.uni