diff --git a/reactos/base/applications/net/arp/arp.c b/reactos/base/applications/network/arp/arp.c
similarity index 100%
rename from reactos/base/applications/net/arp/arp.c
rename to reactos/base/applications/network/arp/arp.c
diff --git a/reactos/base/applications/net/arp/arp.rbuild b/reactos/base/applications/network/arp/arp.rbuild
similarity index 100%
rename from reactos/base/applications/net/arp/arp.rbuild
rename to reactos/base/applications/network/arp/arp.rbuild
diff --git a/reactos/base/applications/net/arp/arp.rc b/reactos/base/applications/network/arp/arp.rc
similarity index 100%
rename from reactos/base/applications/net/arp/arp.rc
rename to reactos/base/applications/network/arp/arp.rc
diff --git a/reactos/base/applications/net/finger/LICENSE.txt b/reactos/base/applications/network/finger/LICENSE.txt
similarity index 100%
rename from reactos/base/applications/net/finger/LICENSE.txt
rename to reactos/base/applications/network/finger/LICENSE.txt
diff --git a/reactos/base/applications/net/finger/err.c b/reactos/base/applications/network/finger/err.c
similarity index 100%
rename from reactos/base/applications/net/finger/err.c
rename to reactos/base/applications/network/finger/err.c
diff --git a/reactos/base/applications/net/finger/err.h b/reactos/base/applications/network/finger/err.h
similarity index 100%
rename from reactos/base/applications/net/finger/err.h
rename to reactos/base/applications/network/finger/err.h
diff --git a/reactos/base/applications/net/finger/finger.c b/reactos/base/applications/network/finger/finger.c
similarity index 100%
rename from reactos/base/applications/net/finger/finger.c
rename to reactos/base/applications/network/finger/finger.c
diff --git a/reactos/base/applications/net/finger/finger.rbuild b/reactos/base/applications/network/finger/finger.rbuild
similarity index 100%
rename from reactos/base/applications/net/finger/finger.rbuild
rename to reactos/base/applications/network/finger/finger.rbuild
diff --git a/reactos/base/applications/net/finger/finger.rc b/reactos/base/applications/network/finger/finger.rc
similarity index 100%
rename from reactos/base/applications/net/finger/finger.rc
rename to reactos/base/applications/network/finger/finger.rc
diff --git a/reactos/base/applications/net/finger/getopt.c b/reactos/base/applications/network/finger/getopt.c
similarity index 100%
rename from reactos/base/applications/net/finger/getopt.c
rename to reactos/base/applications/network/finger/getopt.c
diff --git a/reactos/base/applications/net/finger/getopt.h b/reactos/base/applications/network/finger/getopt.h
similarity index 100%
rename from reactos/base/applications/net/finger/getopt.h
rename to reactos/base/applications/network/finger/getopt.h
diff --git a/reactos/base/applications/net/finger/net.c b/reactos/base/applications/network/finger/net.c
similarity index 100%
rename from reactos/base/applications/net/finger/net.c
rename to reactos/base/applications/network/finger/net.c
diff --git a/reactos/base/applications/net/finger/various.h b/reactos/base/applications/network/finger/various.h
similarity index 100%
rename from reactos/base/applications/net/finger/various.h
rename to reactos/base/applications/network/finger/various.h
diff --git a/reactos/base/applications/net/ftp/cmds.c b/reactos/base/applications/network/ftp/cmds.c
similarity index 100%
rename from reactos/base/applications/net/ftp/cmds.c
rename to reactos/base/applications/network/ftp/cmds.c
diff --git a/reactos/base/applications/net/ftp/cmdtab.c b/reactos/base/applications/network/ftp/cmdtab.c
similarity index 100%
rename from reactos/base/applications/net/ftp/cmdtab.c
rename to reactos/base/applications/network/ftp/cmdtab.c
diff --git a/reactos/base/applications/net/ftp/domacro.c b/reactos/base/applications/network/ftp/domacro.c
similarity index 100%
rename from reactos/base/applications/net/ftp/domacro.c
rename to reactos/base/applications/network/ftp/domacro.c
diff --git a/reactos/base/applications/net/ftp/fake.c b/reactos/base/applications/network/ftp/fake.c
similarity index 100%
rename from reactos/base/applications/net/ftp/fake.c
rename to reactos/base/applications/network/ftp/fake.c
diff --git a/reactos/base/applications/net/ftp/fake.h b/reactos/base/applications/network/ftp/fake.h
similarity index 100%
rename from reactos/base/applications/net/ftp/fake.h
rename to reactos/base/applications/network/ftp/fake.h
diff --git a/reactos/base/applications/net/ftp/ftp.c b/reactos/base/applications/network/ftp/ftp.c
similarity index 100%
rename from reactos/base/applications/net/ftp/ftp.c
rename to reactos/base/applications/network/ftp/ftp.c
diff --git a/reactos/base/applications/net/ftp/ftp.mak b/reactos/base/applications/network/ftp/ftp.mak
similarity index 100%
rename from reactos/base/applications/net/ftp/ftp.mak
rename to reactos/base/applications/network/ftp/ftp.mak
diff --git a/reactos/base/applications/net/ftp/ftp.mak.orig b/reactos/base/applications/network/ftp/ftp.mak.orig
similarity index 100%
rename from reactos/base/applications/net/ftp/ftp.mak.orig
rename to reactos/base/applications/network/ftp/ftp.mak.orig
diff --git a/reactos/base/applications/net/ftp/ftp.rbuild b/reactos/base/applications/network/ftp/ftp.rbuild
similarity index 100%
rename from reactos/base/applications/net/ftp/ftp.rbuild
rename to reactos/base/applications/network/ftp/ftp.rbuild
diff --git a/reactos/base/applications/net/ftp/ftp.rc b/reactos/base/applications/network/ftp/ftp.rc
similarity index 100%
rename from reactos/base/applications/net/ftp/ftp.rc
rename to reactos/base/applications/network/ftp/ftp.rc
diff --git a/reactos/base/applications/net/ftp/ftp_var.h b/reactos/base/applications/network/ftp/ftp_var.h
similarity index 100%
rename from reactos/base/applications/net/ftp/ftp_var.h
rename to reactos/base/applications/network/ftp/ftp_var.h
diff --git a/reactos/base/applications/net/ftp/main.c b/reactos/base/applications/network/ftp/main.c
similarity index 100%
rename from reactos/base/applications/net/ftp/main.c
rename to reactos/base/applications/network/ftp/main.c
diff --git a/reactos/base/applications/net/ftp/pathnames.h b/reactos/base/applications/network/ftp/pathnames.h
similarity index 100%
rename from reactos/base/applications/net/ftp/pathnames.h
rename to reactos/base/applications/network/ftp/pathnames.h
diff --git a/reactos/base/applications/net/ftp/prototypes.h b/reactos/base/applications/network/ftp/prototypes.h
similarity index 100%
rename from reactos/base/applications/net/ftp/prototypes.h
rename to reactos/base/applications/network/ftp/prototypes.h
diff --git a/reactos/base/applications/net/ftp/ruserpass.c b/reactos/base/applications/network/ftp/ruserpass.c
similarity index 100%
rename from reactos/base/applications/net/ftp/ruserpass.c
rename to reactos/base/applications/network/ftp/ruserpass.c
diff --git a/reactos/base/applications/net/ipconfig/ipconfig.c b/reactos/base/applications/network/ipconfig/ipconfig.c
similarity index 100%
rename from reactos/base/applications/net/ipconfig/ipconfig.c
rename to reactos/base/applications/network/ipconfig/ipconfig.c
diff --git a/reactos/base/applications/net/ipconfig/ipconfig.rbuild b/reactos/base/applications/network/ipconfig/ipconfig.rbuild
similarity index 100%
rename from reactos/base/applications/net/ipconfig/ipconfig.rbuild
rename to reactos/base/applications/network/ipconfig/ipconfig.rbuild
diff --git a/reactos/base/applications/net/ipconfig/ipconfig.rc b/reactos/base/applications/network/ipconfig/ipconfig.rc
similarity index 100%
rename from reactos/base/applications/net/ipconfig/ipconfig.rc
rename to reactos/base/applications/network/ipconfig/ipconfig.rc
diff --git a/reactos/base/applications/net/net.rbuild b/reactos/base/applications/network/net.rbuild
similarity index 100%
rename from reactos/base/applications/net/net.rbuild
rename to reactos/base/applications/network/net.rbuild
diff --git a/reactos/base/applications/net/netstat/netstat.c b/reactos/base/applications/network/netstat/netstat.c
similarity index 100%
rename from reactos/base/applications/net/netstat/netstat.c
rename to reactos/base/applications/network/netstat/netstat.c
diff --git a/reactos/base/applications/net/netstat/netstat.h b/reactos/base/applications/network/netstat/netstat.h
similarity index 100%
rename from reactos/base/applications/net/netstat/netstat.h
rename to reactos/base/applications/network/netstat/netstat.h
diff --git a/reactos/base/applications/net/netstat/netstat.rbuild b/reactos/base/applications/network/netstat/netstat.rbuild
similarity index 100%
rename from reactos/base/applications/net/netstat/netstat.rbuild
rename to reactos/base/applications/network/netstat/netstat.rbuild
diff --git a/reactos/base/applications/net/netstat/netstat.rc b/reactos/base/applications/network/netstat/netstat.rc
similarity index 100%
rename from reactos/base/applications/net/netstat/netstat.rc
rename to reactos/base/applications/network/netstat/netstat.rc
diff --git a/reactos/base/applications/net/ping/ping.c b/reactos/base/applications/network/ping/ping.c
similarity index 100%
rename from reactos/base/applications/net/ping/ping.c
rename to reactos/base/applications/network/ping/ping.c
diff --git a/reactos/base/applications/net/ping/ping.rbuild b/reactos/base/applications/network/ping/ping.rbuild
similarity index 100%
rename from reactos/base/applications/net/ping/ping.rbuild
rename to reactos/base/applications/network/ping/ping.rbuild
diff --git a/reactos/base/applications/net/ping/ping.rc b/reactos/base/applications/network/ping/ping.rc
similarity index 100%
rename from reactos/base/applications/net/ping/ping.rc
rename to reactos/base/applications/network/ping/ping.rc
diff --git a/reactos/base/applications/net/roshttpd/common/list.cpp b/reactos/base/applications/network/roshttpd/common/list.cpp
similarity index 100%
rename from reactos/base/applications/net/roshttpd/common/list.cpp
rename to reactos/base/applications/network/roshttpd/common/list.cpp
diff --git a/reactos/base/applications/net/roshttpd/common/roshttpd.rc b/reactos/base/applications/network/roshttpd/common/roshttpd.rc
similarity index 100%
rename from reactos/base/applications/net/roshttpd/common/roshttpd.rc
rename to reactos/base/applications/network/roshttpd/common/roshttpd.rc
diff --git a/reactos/base/applications/net/roshttpd/common/socket.cpp b/reactos/base/applications/network/roshttpd/common/socket.cpp
similarity index 100%
rename from reactos/base/applications/net/roshttpd/common/socket.cpp
rename to reactos/base/applications/network/roshttpd/common/socket.cpp
diff --git a/reactos/base/applications/net/roshttpd/common/thread.cpp b/reactos/base/applications/network/roshttpd/common/thread.cpp
similarity index 100%
rename from reactos/base/applications/net/roshttpd/common/thread.cpp
rename to reactos/base/applications/network/roshttpd/common/thread.cpp
diff --git a/reactos/base/applications/net/roshttpd/config.cpp b/reactos/base/applications/network/roshttpd/config.cpp
similarity index 100%
rename from reactos/base/applications/net/roshttpd/config.cpp
rename to reactos/base/applications/network/roshttpd/config.cpp
diff --git a/reactos/base/applications/net/roshttpd/error.cpp b/reactos/base/applications/network/roshttpd/error.cpp
similarity index 100%
rename from reactos/base/applications/net/roshttpd/error.cpp
rename to reactos/base/applications/network/roshttpd/error.cpp
diff --git a/reactos/base/applications/net/roshttpd/http.cpp b/reactos/base/applications/network/roshttpd/http.cpp
similarity index 100%
rename from reactos/base/applications/net/roshttpd/http.cpp
rename to reactos/base/applications/network/roshttpd/http.cpp
diff --git a/reactos/base/applications/net/roshttpd/httpd.cpp b/reactos/base/applications/network/roshttpd/httpd.cpp
similarity index 100%
rename from reactos/base/applications/net/roshttpd/httpd.cpp
rename to reactos/base/applications/network/roshttpd/httpd.cpp
diff --git a/reactos/base/applications/net/roshttpd/include/config.h b/reactos/base/applications/network/roshttpd/include/config.h
similarity index 100%
rename from reactos/base/applications/net/roshttpd/include/config.h
rename to reactos/base/applications/network/roshttpd/include/config.h
diff --git a/reactos/base/applications/net/roshttpd/include/debug.h b/reactos/base/applications/network/roshttpd/include/debug.h
similarity index 100%
rename from reactos/base/applications/net/roshttpd/include/debug.h
rename to reactos/base/applications/network/roshttpd/include/debug.h
diff --git a/reactos/base/applications/net/roshttpd/include/error.h b/reactos/base/applications/network/roshttpd/include/error.h
similarity index 100%
rename from reactos/base/applications/net/roshttpd/include/error.h
rename to reactos/base/applications/network/roshttpd/include/error.h
diff --git a/reactos/base/applications/net/roshttpd/include/http.h b/reactos/base/applications/network/roshttpd/include/http.h
similarity index 100%
rename from reactos/base/applications/net/roshttpd/include/http.h
rename to reactos/base/applications/network/roshttpd/include/http.h
diff --git a/reactos/base/applications/net/roshttpd/include/httpd.h b/reactos/base/applications/network/roshttpd/include/httpd.h
similarity index 100%
rename from reactos/base/applications/net/roshttpd/include/httpd.h
rename to reactos/base/applications/network/roshttpd/include/httpd.h
diff --git a/reactos/base/applications/net/roshttpd/include/iterator.h b/reactos/base/applications/network/roshttpd/include/iterator.h
similarity index 100%
rename from reactos/base/applications/net/roshttpd/include/iterator.h
rename to reactos/base/applications/network/roshttpd/include/iterator.h
diff --git a/reactos/base/applications/net/roshttpd/include/list.h b/reactos/base/applications/network/roshttpd/include/list.h
similarity index 100%
rename from reactos/base/applications/net/roshttpd/include/list.h
rename to reactos/base/applications/network/roshttpd/include/list.h
diff --git a/reactos/base/applications/net/roshttpd/include/socket.h b/reactos/base/applications/network/roshttpd/include/socket.h
similarity index 100%
rename from reactos/base/applications/net/roshttpd/include/socket.h
rename to reactos/base/applications/network/roshttpd/include/socket.h
diff --git a/reactos/base/applications/net/roshttpd/include/thread.h b/reactos/base/applications/network/roshttpd/include/thread.h
similarity index 100%
rename from reactos/base/applications/net/roshttpd/include/thread.h
rename to reactos/base/applications/network/roshttpd/include/thread.h
diff --git a/reactos/base/applications/net/roshttpd/roshttpd.cpp b/reactos/base/applications/network/roshttpd/roshttpd.cpp
similarity index 100%
rename from reactos/base/applications/net/roshttpd/roshttpd.cpp
rename to reactos/base/applications/network/roshttpd/roshttpd.cpp
diff --git a/reactos/base/applications/net/route/route.c b/reactos/base/applications/network/route/route.c
similarity index 100%
rename from reactos/base/applications/net/route/route.c
rename to reactos/base/applications/network/route/route.c
diff --git a/reactos/base/applications/net/route/route.rbuild b/reactos/base/applications/network/route/route.rbuild
similarity index 100%
rename from reactos/base/applications/net/route/route.rbuild
rename to reactos/base/applications/network/route/route.rbuild
diff --git a/reactos/base/applications/net/route/route.rc b/reactos/base/applications/network/route/route.rc
similarity index 100%
rename from reactos/base/applications/net/route/route.rc
rename to reactos/base/applications/network/route/route.rc
diff --git a/reactos/base/applications/net/telnet/Makefile.mingw b/reactos/base/applications/network/telnet/Makefile.mingw
similarity index 100%
rename from reactos/base/applications/net/telnet/Makefile.mingw
rename to reactos/base/applications/network/telnet/Makefile.mingw
diff --git a/reactos/base/applications/net/telnet/doc/00readme.avs b/reactos/base/applications/network/telnet/doc/00readme.avs
similarity index 100%
rename from reactos/base/applications/net/telnet/doc/00readme.avs
rename to reactos/base/applications/network/telnet/doc/00readme.avs
diff --git a/reactos/base/applications/net/telnet/doc/bugs.txt b/reactos/base/applications/network/telnet/doc/bugs.txt
similarity index 100%
rename from reactos/base/applications/net/telnet/doc/bugs.txt
rename to reactos/base/applications/network/telnet/doc/bugs.txt
diff --git a/reactos/base/applications/net/telnet/doc/changes.txt b/reactos/base/applications/network/telnet/doc/changes.txt
similarity index 100%
rename from reactos/base/applications/net/telnet/doc/changes.txt
rename to reactos/base/applications/network/telnet/doc/changes.txt
diff --git a/reactos/base/applications/net/telnet/doc/license.txt b/reactos/base/applications/network/telnet/doc/license.txt
similarity index 100%
rename from reactos/base/applications/net/telnet/doc/license.txt
rename to reactos/base/applications/network/telnet/doc/license.txt
diff --git a/reactos/base/applications/net/telnet/doc/options.txt b/reactos/base/applications/network/telnet/doc/options.txt
similarity index 100%
rename from reactos/base/applications/net/telnet/doc/options.txt
rename to reactos/base/applications/network/telnet/doc/options.txt
diff --git a/reactos/base/applications/net/telnet/doc/readme.txt b/reactos/base/applications/network/telnet/doc/readme.txt
similarity index 100%
rename from reactos/base/applications/net/telnet/doc/readme.txt
rename to reactos/base/applications/network/telnet/doc/readme.txt
diff --git a/reactos/base/applications/net/telnet/doc/ssh.txt b/reactos/base/applications/network/telnet/doc/ssh.txt
similarity index 100%
rename from reactos/base/applications/net/telnet/doc/ssh.txt
rename to reactos/base/applications/network/telnet/doc/ssh.txt
diff --git a/reactos/base/applications/net/telnet/resource/tnmsg.h b/reactos/base/applications/network/telnet/resource/tnmsg.h
similarity index 100%
rename from reactos/base/applications/net/telnet/resource/tnmsg.h
rename to reactos/base/applications/network/telnet/resource/tnmsg.h
diff --git a/reactos/base/applications/net/telnet/resource/tnmsg.rc b/reactos/base/applications/network/telnet/resource/tnmsg.rc
similarity index 100%
rename from reactos/base/applications/net/telnet/resource/tnmsg.rc
rename to reactos/base/applications/network/telnet/resource/tnmsg.rc
diff --git a/reactos/base/applications/net/telnet/src/ansiprsr.cpp b/reactos/base/applications/network/telnet/src/ansiprsr.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/ansiprsr.cpp
rename to reactos/base/applications/network/telnet/src/ansiprsr.cpp
diff --git a/reactos/base/applications/net/telnet/src/ansiprsr.h b/reactos/base/applications/network/telnet/src/ansiprsr.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/ansiprsr.h
rename to reactos/base/applications/network/telnet/src/ansiprsr.h
diff --git a/reactos/base/applications/net/telnet/src/keytrans.cpp b/reactos/base/applications/network/telnet/src/keytrans.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/keytrans.cpp
rename to reactos/base/applications/network/telnet/src/keytrans.cpp
diff --git a/reactos/base/applications/net/telnet/src/keytrans.h b/reactos/base/applications/network/telnet/src/keytrans.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/keytrans.h
rename to reactos/base/applications/network/telnet/src/keytrans.h
diff --git a/reactos/base/applications/net/telnet/src/stl_bids.h b/reactos/base/applications/network/telnet/src/stl_bids.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/stl_bids.h
rename to reactos/base/applications/network/telnet/src/stl_bids.h
diff --git a/reactos/base/applications/net/telnet/src/tcharmap.cpp b/reactos/base/applications/network/telnet/src/tcharmap.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tcharmap.cpp
rename to reactos/base/applications/network/telnet/src/tcharmap.cpp
diff --git a/reactos/base/applications/net/telnet/src/tcharmap.h b/reactos/base/applications/network/telnet/src/tcharmap.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tcharmap.h
rename to reactos/base/applications/network/telnet/src/tcharmap.h
diff --git a/reactos/base/applications/net/telnet/src/tconsole.cpp b/reactos/base/applications/network/telnet/src/tconsole.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tconsole.cpp
rename to reactos/base/applications/network/telnet/src/tconsole.cpp
diff --git a/reactos/base/applications/net/telnet/src/tconsole.h b/reactos/base/applications/network/telnet/src/tconsole.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tconsole.h
rename to reactos/base/applications/network/telnet/src/tconsole.h
diff --git a/reactos/base/applications/net/telnet/src/telnet.h b/reactos/base/applications/network/telnet/src/telnet.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/telnet.h
rename to reactos/base/applications/network/telnet/src/telnet.h
diff --git a/reactos/base/applications/net/telnet/src/tkeydef.cpp b/reactos/base/applications/network/telnet/src/tkeydef.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tkeydef.cpp
rename to reactos/base/applications/network/telnet/src/tkeydef.cpp
diff --git a/reactos/base/applications/net/telnet/src/tkeydef.h b/reactos/base/applications/network/telnet/src/tkeydef.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tkeydef.h
rename to reactos/base/applications/network/telnet/src/tkeydef.h
diff --git a/reactos/base/applications/net/telnet/src/tkeymap.cpp b/reactos/base/applications/network/telnet/src/tkeymap.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tkeymap.cpp
rename to reactos/base/applications/network/telnet/src/tkeymap.cpp
diff --git a/reactos/base/applications/net/telnet/src/tkeymap.h b/reactos/base/applications/network/telnet/src/tkeymap.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tkeymap.h
rename to reactos/base/applications/network/telnet/src/tkeymap.h
diff --git a/reactos/base/applications/net/telnet/src/tmapldr.cpp b/reactos/base/applications/network/telnet/src/tmapldr.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tmapldr.cpp
rename to reactos/base/applications/network/telnet/src/tmapldr.cpp
diff --git a/reactos/base/applications/net/telnet/src/tmapldr.h b/reactos/base/applications/network/telnet/src/tmapldr.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tmapldr.h
rename to reactos/base/applications/network/telnet/src/tmapldr.h
diff --git a/reactos/base/applications/net/telnet/src/tmouse.cpp b/reactos/base/applications/network/telnet/src/tmouse.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tmouse.cpp
rename to reactos/base/applications/network/telnet/src/tmouse.cpp
diff --git a/reactos/base/applications/net/telnet/src/tmouse.h b/reactos/base/applications/network/telnet/src/tmouse.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tmouse.h
rename to reactos/base/applications/network/telnet/src/tmouse.h
diff --git a/reactos/base/applications/net/telnet/src/tnclass.cpp b/reactos/base/applications/network/telnet/src/tnclass.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnclass.cpp
rename to reactos/base/applications/network/telnet/src/tnclass.cpp
diff --git a/reactos/base/applications/net/telnet/src/tnclass.h b/reactos/base/applications/network/telnet/src/tnclass.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnclass.h
rename to reactos/base/applications/network/telnet/src/tnclass.h
diff --git a/reactos/base/applications/net/telnet/src/tnclip.cpp b/reactos/base/applications/network/telnet/src/tnclip.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnclip.cpp
rename to reactos/base/applications/network/telnet/src/tnclip.cpp
diff --git a/reactos/base/applications/net/telnet/src/tnclip.h b/reactos/base/applications/network/telnet/src/tnclip.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnclip.h
rename to reactos/base/applications/network/telnet/src/tnclip.h
diff --git a/reactos/base/applications/net/telnet/src/tncon.cpp b/reactos/base/applications/network/telnet/src/tncon.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tncon.cpp
rename to reactos/base/applications/network/telnet/src/tncon.cpp
diff --git a/reactos/base/applications/net/telnet/src/tncon.h b/reactos/base/applications/network/telnet/src/tncon.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tncon.h
rename to reactos/base/applications/network/telnet/src/tncon.h
diff --git a/reactos/base/applications/net/telnet/src/tnconfig.cpp b/reactos/base/applications/network/telnet/src/tnconfig.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnconfig.cpp
rename to reactos/base/applications/network/telnet/src/tnconfig.cpp
diff --git a/reactos/base/applications/net/telnet/src/tnconfig.h b/reactos/base/applications/network/telnet/src/tnconfig.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnconfig.h
rename to reactos/base/applications/network/telnet/src/tnconfig.h
diff --git a/reactos/base/applications/net/telnet/src/tnerror.cpp b/reactos/base/applications/network/telnet/src/tnerror.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnerror.cpp
rename to reactos/base/applications/network/telnet/src/tnerror.cpp
diff --git a/reactos/base/applications/net/telnet/src/tnerror.h b/reactos/base/applications/network/telnet/src/tnerror.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnerror.h
rename to reactos/base/applications/network/telnet/src/tnerror.h
diff --git a/reactos/base/applications/net/telnet/src/tnetwork.cpp b/reactos/base/applications/network/telnet/src/tnetwork.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnetwork.cpp
rename to reactos/base/applications/network/telnet/src/tnetwork.cpp
diff --git a/reactos/base/applications/net/telnet/src/tnetwork.h b/reactos/base/applications/network/telnet/src/tnetwork.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnetwork.h
rename to reactos/base/applications/network/telnet/src/tnetwork.h
diff --git a/reactos/base/applications/net/telnet/src/tnmain.cpp b/reactos/base/applications/network/telnet/src/tnmain.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnmain.cpp
rename to reactos/base/applications/network/telnet/src/tnmain.cpp
diff --git a/reactos/base/applications/net/telnet/src/tnmain.h b/reactos/base/applications/network/telnet/src/tnmain.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnmain.h
rename to reactos/base/applications/network/telnet/src/tnmain.h
diff --git a/reactos/base/applications/net/telnet/src/tnmisc.cpp b/reactos/base/applications/network/telnet/src/tnmisc.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnmisc.cpp
rename to reactos/base/applications/network/telnet/src/tnmisc.cpp
diff --git a/reactos/base/applications/net/telnet/src/tnmisc.h b/reactos/base/applications/network/telnet/src/tnmisc.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnmisc.h
rename to reactos/base/applications/network/telnet/src/tnmisc.h
diff --git a/reactos/base/applications/net/telnet/src/tnmsg.h b/reactos/base/applications/network/telnet/src/tnmsg.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tnmsg.h
rename to reactos/base/applications/network/telnet/src/tnmsg.h
diff --git a/reactos/base/applications/net/telnet/src/tparams.h b/reactos/base/applications/network/telnet/src/tparams.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tparams.h
rename to reactos/base/applications/network/telnet/src/tparams.h
diff --git a/reactos/base/applications/net/telnet/src/tparser.h b/reactos/base/applications/network/telnet/src/tparser.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tparser.h
rename to reactos/base/applications/network/telnet/src/tparser.h
diff --git a/reactos/base/applications/net/telnet/src/tscript.cpp b/reactos/base/applications/network/telnet/src/tscript.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tscript.cpp
rename to reactos/base/applications/network/telnet/src/tscript.cpp
diff --git a/reactos/base/applications/net/telnet/src/tscript.h b/reactos/base/applications/network/telnet/src/tscript.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tscript.h
rename to reactos/base/applications/network/telnet/src/tscript.h
diff --git a/reactos/base/applications/net/telnet/src/tscroll.cpp b/reactos/base/applications/network/telnet/src/tscroll.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tscroll.cpp
rename to reactos/base/applications/network/telnet/src/tscroll.cpp
diff --git a/reactos/base/applications/net/telnet/src/tscroll.h b/reactos/base/applications/network/telnet/src/tscroll.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/tscroll.h
rename to reactos/base/applications/network/telnet/src/tscroll.h
diff --git a/reactos/base/applications/net/telnet/src/ttelhndl.cpp b/reactos/base/applications/network/telnet/src/ttelhndl.cpp
similarity index 100%
rename from reactos/base/applications/net/telnet/src/ttelhndl.cpp
rename to reactos/base/applications/network/telnet/src/ttelhndl.cpp
diff --git a/reactos/base/applications/net/telnet/src/ttelhndl.h b/reactos/base/applications/network/telnet/src/ttelhndl.h
similarity index 100%
rename from reactos/base/applications/net/telnet/src/ttelhndl.h
rename to reactos/base/applications/network/telnet/src/ttelhndl.h
diff --git a/reactos/base/applications/net/telnet/telnet.cfg b/reactos/base/applications/network/telnet/telnet.cfg
similarity index 100%
rename from reactos/base/applications/net/telnet/telnet.cfg
rename to reactos/base/applications/network/telnet/telnet.cfg
diff --git a/reactos/base/applications/net/telnet/telnet.ico b/reactos/base/applications/network/telnet/telnet.ico
similarity index 100%
rename from reactos/base/applications/net/telnet/telnet.ico
rename to reactos/base/applications/network/telnet/telnet.ico
diff --git a/reactos/base/applications/net/telnet/telnet.ini b/reactos/base/applications/network/telnet/telnet.ini
similarity index 100%
rename from reactos/base/applications/net/telnet/telnet.ini
rename to reactos/base/applications/network/telnet/telnet.ini
diff --git a/reactos/base/applications/net/telnet/telnet.rbuild b/reactos/base/applications/network/telnet/telnet.rbuild
similarity index 100%
rename from reactos/base/applications/net/telnet/telnet.rbuild
rename to reactos/base/applications/network/telnet/telnet.rbuild
diff --git a/reactos/base/applications/net/telnet/telnet.rc b/reactos/base/applications/network/telnet/telnet.rc
similarity index 100%
rename from reactos/base/applications/net/telnet/telnet.rc
rename to reactos/base/applications/network/telnet/telnet.rc
diff --git a/reactos/base/applications/net/tracert/tracert.c b/reactos/base/applications/network/tracert/tracert.c
similarity index 100%
rename from reactos/base/applications/net/tracert/tracert.c
rename to reactos/base/applications/network/tracert/tracert.c
diff --git a/reactos/base/applications/net/tracert/tracert.h b/reactos/base/applications/network/tracert/tracert.h
similarity index 100%
rename from reactos/base/applications/net/tracert/tracert.h
rename to reactos/base/applications/network/tracert/tracert.h
diff --git a/reactos/base/applications/net/tracert/tracert.rbuild b/reactos/base/applications/network/tracert/tracert.rbuild
similarity index 100%
rename from reactos/base/applications/net/tracert/tracert.rbuild
rename to reactos/base/applications/network/tracert/tracert.rbuild
diff --git a/reactos/base/applications/net/tracert/tracert.rc b/reactos/base/applications/network/tracert/tracert.rc
similarity index 100%
rename from reactos/base/applications/net/tracert/tracert.rc
rename to reactos/base/applications/network/tracert/tracert.rc
diff --git a/reactos/base/applications/net/whois/LICENSE.txt b/reactos/base/applications/network/whois/LICENSE.txt
similarity index 100%
rename from reactos/base/applications/net/whois/LICENSE.txt
rename to reactos/base/applications/network/whois/LICENSE.txt
diff --git a/reactos/base/applications/net/whois/whois.c b/reactos/base/applications/network/whois/whois.c
similarity index 100%
rename from reactos/base/applications/net/whois/whois.c
rename to reactos/base/applications/network/whois/whois.c
diff --git a/reactos/base/applications/net/whois/whois.rbuild b/reactos/base/applications/network/whois/whois.rbuild
similarity index 100%
rename from reactos/base/applications/net/whois/whois.rbuild
rename to reactos/base/applications/network/whois/whois.rbuild
diff --git a/reactos/base/applications/net/whois/whois.rc b/reactos/base/applications/network/whois/whois.rc
similarity index 100%
rename from reactos/base/applications/net/whois/whois.rc
rename to reactos/base/applications/network/whois/whois.rc