diff --git a/samples/microkernel/apps/network/coap_observe_client/Makefile b/samples/microkernel/apps/net/coap_observe_client/Makefile
similarity index 92%
rename from samples/microkernel/apps/network/coap_observe_client/Makefile
rename to samples/microkernel/apps/net/coap_observe_client/Makefile
index 7c78ffae69e..eaf711bdc1a 100644
--- a/samples/microkernel/apps/network/coap_observe_client/Makefile
+++ b/samples/microkernel/apps/net/coap_observe_client/Makefile
@@ -20,7 +20,7 @@ MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 PLATFORM_CONFIG ?= basic_minuteia
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/network/coap_observe_client/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/coap_observe_client/src/
 
 QEMU_EXTRA_FLAGS = -serial none -serial unix:/tmp/slip.sock
 
diff --git a/samples/microkernel/apps/network/coap_observe_client/prj.mdef b/samples/microkernel/apps/net/coap_observe_client/prj.mdef
similarity index 100%
rename from samples/microkernel/apps/network/coap_observe_client/prj.mdef
rename to samples/microkernel/apps/net/coap_observe_client/prj.mdef
diff --git a/samples/microkernel/apps/network/coap_observe_client/prj_arm.conf b/samples/microkernel/apps/net/coap_observe_client/prj_arm.conf
similarity index 100%
rename from samples/microkernel/apps/network/coap_observe_client/prj_arm.conf
rename to samples/microkernel/apps/net/coap_observe_client/prj_arm.conf
diff --git a/samples/microkernel/apps/network/coap_observe_client/prj_x86.conf b/samples/microkernel/apps/net/coap_observe_client/prj_x86.conf
similarity index 100%
rename from samples/microkernel/apps/network/coap_observe_client/prj_x86.conf
rename to samples/microkernel/apps/net/coap_observe_client/prj_x86.conf
diff --git a/samples/microkernel/apps/network/coap_server/Makefile b/samples/microkernel/apps/net/coap_server/Makefile
similarity index 93%
rename from samples/microkernel/apps/network/coap_server/Makefile
rename to samples/microkernel/apps/net/coap_server/Makefile
index 362978188d1..2cd8ad43e0a 100644
--- a/samples/microkernel/apps/network/coap_server/Makefile
+++ b/samples/microkernel/apps/net/coap_server/Makefile
@@ -20,7 +20,7 @@ MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 PLATFORM_CONFIG ?= basic_minuteia
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/network/coap_server/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/coap_server/src/
 
 QEMU_EXTRA_FLAGS = -serial none -serial unix:/tmp/slip.sock
 
diff --git a/samples/microkernel/apps/network/coap_server/prj.mdef b/samples/microkernel/apps/net/coap_server/prj.mdef
similarity index 100%
rename from samples/microkernel/apps/network/coap_server/prj.mdef
rename to samples/microkernel/apps/net/coap_server/prj.mdef
diff --git a/samples/microkernel/apps/network/coap_server/prj_arm.conf b/samples/microkernel/apps/net/coap_server/prj_arm.conf
similarity index 100%
rename from samples/microkernel/apps/network/coap_server/prj_arm.conf
rename to samples/microkernel/apps/net/coap_server/prj_arm.conf
diff --git a/samples/microkernel/apps/network/coap_server/prj_x86.conf b/samples/microkernel/apps/net/coap_server/prj_x86.conf
similarity index 100%
rename from samples/microkernel/apps/network/coap_server/prj_x86.conf
rename to samples/microkernel/apps/net/coap_server/prj_x86.conf
diff --git a/samples/microkernel/apps/network/dtls_client/Makefile b/samples/microkernel/apps/net/dtls_client/Makefile
similarity index 93%
rename from samples/microkernel/apps/network/dtls_client/Makefile
rename to samples/microkernel/apps/net/dtls_client/Makefile
index 24d1f4a0c0f..e8c3c32267e 100644
--- a/samples/microkernel/apps/network/dtls_client/Makefile
+++ b/samples/microkernel/apps/net/dtls_client/Makefile
@@ -20,7 +20,7 @@ MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 PLATFORM_CONFIG ?= basic_minuteia
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/network/dtls_client/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/dtls_client/src/
 
 QEMU_EXTRA_FLAGS = -serial none -serial unix:/tmp/slip.sock
 
diff --git a/samples/microkernel/apps/network/dtls_client/prj.mdef b/samples/microkernel/apps/net/dtls_client/prj.mdef
similarity index 100%
rename from samples/microkernel/apps/network/dtls_client/prj.mdef
rename to samples/microkernel/apps/net/dtls_client/prj.mdef
diff --git a/samples/microkernel/apps/network/dtls_client/prj_arm.conf b/samples/microkernel/apps/net/dtls_client/prj_arm.conf
similarity index 100%
rename from samples/microkernel/apps/network/dtls_client/prj_arm.conf
rename to samples/microkernel/apps/net/dtls_client/prj_arm.conf
diff --git a/samples/microkernel/apps/network/dtls_client/prj_x86.conf b/samples/microkernel/apps/net/dtls_client/prj_x86.conf
similarity index 100%
rename from samples/microkernel/apps/network/dtls_client/prj_x86.conf
rename to samples/microkernel/apps/net/dtls_client/prj_x86.conf
diff --git a/samples/microkernel/apps/network/dtls_server/Makefile b/samples/microkernel/apps/net/dtls_server/Makefile
similarity index 93%
rename from samples/microkernel/apps/network/dtls_server/Makefile
rename to samples/microkernel/apps/net/dtls_server/Makefile
index 8d6898aefb2..b8cd2242fc1 100644
--- a/samples/microkernel/apps/network/dtls_server/Makefile
+++ b/samples/microkernel/apps/net/dtls_server/Makefile
@@ -20,7 +20,7 @@ MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 PLATFORM_CONFIG ?= basic_minuteia
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/network/dtls_server/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/dtls_server/src/
 
 QEMU_EXTRA_FLAGS = -serial none -serial unix:/tmp/slip.sock
 
diff --git a/samples/microkernel/apps/network/dtls_server/prj.mdef b/samples/microkernel/apps/net/dtls_server/prj.mdef
similarity index 100%
rename from samples/microkernel/apps/network/dtls_server/prj.mdef
rename to samples/microkernel/apps/net/dtls_server/prj.mdef
diff --git a/samples/microkernel/apps/network/dtls_server/prj_arm.conf b/samples/microkernel/apps/net/dtls_server/prj_arm.conf
similarity index 100%
rename from samples/microkernel/apps/network/dtls_server/prj_arm.conf
rename to samples/microkernel/apps/net/dtls_server/prj_arm.conf
diff --git a/samples/microkernel/apps/network/dtls_server/prj_x86.conf b/samples/microkernel/apps/net/dtls_server/prj_x86.conf
similarity index 100%
rename from samples/microkernel/apps/network/dtls_server/prj_x86.conf
rename to samples/microkernel/apps/net/dtls_server/prj_x86.conf
diff --git a/samples/microkernel/apps/network/echo_client/Makefile b/samples/microkernel/apps/net/echo_client/Makefile
similarity index 93%
rename from samples/microkernel/apps/network/echo_client/Makefile
rename to samples/microkernel/apps/net/echo_client/Makefile
index 1c9ebd265ac..2bb06fd5f35 100644
--- a/samples/microkernel/apps/network/echo_client/Makefile
+++ b/samples/microkernel/apps/net/echo_client/Makefile
@@ -20,7 +20,7 @@ MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 PLATFORM_CONFIG ?= basic_atom
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/network/echo_client/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/echo_client/src/
 
 QEMU_EXTRA_FLAGS = -serial none -serial unix:/tmp/slip.sock
 
diff --git a/samples/microkernel/apps/network/echo_client/prj.mdef b/samples/microkernel/apps/net/echo_client/prj.mdef
similarity index 100%
rename from samples/microkernel/apps/network/echo_client/prj.mdef
rename to samples/microkernel/apps/net/echo_client/prj.mdef
diff --git a/samples/microkernel/apps/network/echo_client/prj_arm.conf b/samples/microkernel/apps/net/echo_client/prj_arm.conf
similarity index 100%
rename from samples/microkernel/apps/network/echo_client/prj_arm.conf
rename to samples/microkernel/apps/net/echo_client/prj_arm.conf
diff --git a/samples/microkernel/apps/network/echo_client/prj_x86.conf b/samples/microkernel/apps/net/echo_client/prj_x86.conf
similarity index 100%
rename from samples/microkernel/apps/network/echo_client/prj_x86.conf
rename to samples/microkernel/apps/net/echo_client/prj_x86.conf
diff --git a/samples/microkernel/apps/network/echo_server/Makefile b/samples/microkernel/apps/net/echo_server/Makefile
similarity index 93%
rename from samples/microkernel/apps/network/echo_server/Makefile
rename to samples/microkernel/apps/net/echo_server/Makefile
index 2f3c62d0275..52873d9c501 100644
--- a/samples/microkernel/apps/network/echo_server/Makefile
+++ b/samples/microkernel/apps/net/echo_server/Makefile
@@ -21,7 +21,7 @@ MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 PLATFORM_CONFIG ?= basic_atom
 CONF_FILE = prj_$(ARCH)_$(NET_INTF).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/network/echo_server/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/echo_server/src/
 QEMU_EXTRA_FLAGS = -serial unix:/tmp/slip.sock
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/apps/network/echo_server/prj.mdef b/samples/microkernel/apps/net/echo_server/prj.mdef
similarity index 100%
rename from samples/microkernel/apps/network/echo_server/prj.mdef
rename to samples/microkernel/apps/net/echo_server/prj.mdef
diff --git a/samples/microkernel/apps/network/echo_server/prj_arm_slip.conf b/samples/microkernel/apps/net/echo_server/prj_arm_slip.conf
similarity index 100%
rename from samples/microkernel/apps/network/echo_server/prj_arm_slip.conf
rename to samples/microkernel/apps/net/echo_server/prj_arm_slip.conf
diff --git a/samples/microkernel/apps/network/echo_server/prj_x86_ethernet.conf b/samples/microkernel/apps/net/echo_server/prj_x86_ethernet.conf
similarity index 100%
rename from samples/microkernel/apps/network/echo_server/prj_x86_ethernet.conf
rename to samples/microkernel/apps/net/echo_server/prj_x86_ethernet.conf
diff --git a/samples/microkernel/apps/network/echo_server/prj_x86_slip.conf b/samples/microkernel/apps/net/echo_server/prj_x86_slip.conf
similarity index 100%
rename from samples/microkernel/apps/network/echo_server/prj_x86_slip.conf
rename to samples/microkernel/apps/net/echo_server/prj_x86_slip.conf
diff --git a/samples/microkernel/apps/network/listener/Makefile b/samples/microkernel/apps/net/listener/Makefile
similarity index 93%
rename from samples/microkernel/apps/network/listener/Makefile
rename to samples/microkernel/apps/net/listener/Makefile
index 2b0284ccabf..65cf0a81c0a 100644
--- a/samples/microkernel/apps/network/listener/Makefile
+++ b/samples/microkernel/apps/net/listener/Makefile
@@ -20,7 +20,7 @@ MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 PLATFORM_CONFIG ?= basic_atom
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/network/listener/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/listener/src/
 QEMU_EXTRA_FLAGS = -serial unix:/tmp/slip.sock
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/apps/network/listener/prj.mdef b/samples/microkernel/apps/net/listener/prj.mdef
similarity index 100%
rename from samples/microkernel/apps/network/listener/prj.mdef
rename to samples/microkernel/apps/net/listener/prj.mdef
diff --git a/samples/microkernel/apps/network/listener/prj_arm.conf b/samples/microkernel/apps/net/listener/prj_arm.conf
similarity index 100%
rename from samples/microkernel/apps/network/listener/prj_arm.conf
rename to samples/microkernel/apps/net/listener/prj_arm.conf
diff --git a/samples/microkernel/apps/network/listener/prj_x86.conf b/samples/microkernel/apps/net/listener/prj_x86.conf
similarity index 100%
rename from samples/microkernel/apps/network/listener/prj_x86.conf
rename to samples/microkernel/apps/net/listener/prj_x86.conf
diff --git a/samples/microkernel/apps/network/test/test_15_4/Makefile b/samples/microkernel/apps/net/test/test_15_4/Makefile
similarity index 86%
rename from samples/microkernel/apps/network/test/test_15_4/Makefile
rename to samples/microkernel/apps/net/test/test_15_4/Makefile
index a4290d93874..29cbfc09d33 100644
--- a/samples/microkernel/apps/network/test/test_15_4/Makefile
+++ b/samples/microkernel/apps/net/test/test_15_4/Makefile
@@ -20,7 +20,7 @@ MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 PLATFORM_CONFIG ?= basic_atom
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/network/test_15_4/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/test_15_4/src/
 
 include $(ZEPHYR_BASE)/Makefile.inc
-include $(ZEPHYR_BASE)/samples/network/test_15_4/Makefile.15_4
+include $(ZEPHYR_BASE)/samples/net/test_15_4/Makefile.15_4
diff --git a/samples/microkernel/apps/network/test/test_15_4/README b/samples/microkernel/apps/net/test/test_15_4/README
similarity index 100%
rename from samples/microkernel/apps/network/test/test_15_4/README
rename to samples/microkernel/apps/net/test/test_15_4/README
diff --git a/samples/microkernel/apps/network/test/test_15_4/prj.mdef b/samples/microkernel/apps/net/test/test_15_4/prj.mdef
similarity index 100%
rename from samples/microkernel/apps/network/test/test_15_4/prj.mdef
rename to samples/microkernel/apps/net/test/test_15_4/prj.mdef
diff --git a/samples/microkernel/apps/network/test/test_15_4/prj_arm.conf b/samples/microkernel/apps/net/test/test_15_4/prj_arm.conf
similarity index 100%
rename from samples/microkernel/apps/network/test/test_15_4/prj_arm.conf
rename to samples/microkernel/apps/net/test/test_15_4/prj_arm.conf
diff --git a/samples/microkernel/apps/network/test/test_15_4/prj_x86.conf b/samples/microkernel/apps/net/test/test_15_4/prj_x86.conf
similarity index 100%
rename from samples/microkernel/apps/network/test/test_15_4/prj_x86.conf
rename to samples/microkernel/apps/net/test/test_15_4/prj_x86.conf
diff --git a/samples/microkernel/apps/network/test/test_15_4/testcase.ini b/samples/microkernel/apps/net/test/test_15_4/testcase.ini
similarity index 100%
rename from samples/microkernel/apps/network/test/test_15_4/testcase.ini
rename to samples/microkernel/apps/net/test/test_15_4/testcase.ini
diff --git a/samples/microkernel/apps/network/test_15_4/Makefile b/samples/microkernel/apps/net/test_15_4/Makefile
similarity index 86%
rename from samples/microkernel/apps/network/test_15_4/Makefile
rename to samples/microkernel/apps/net/test_15_4/Makefile
index 41feac7670a..6dfdd0350a0 100644
--- a/samples/microkernel/apps/network/test_15_4/Makefile
+++ b/samples/microkernel/apps/net/test_15_4/Makefile
@@ -20,7 +20,7 @@ MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 PLATFORM_CONFIG ?= basic_atom
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/network/test_15_4/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/test_15_4/src/
 
 include $(ZEPHYR_BASE)/Makefile.inc
-include $(ZEPHYR_BASE)/samples/network/test_15_4/Makefile.15_4
+include $(ZEPHYR_BASE)/samples/net/test_15_4/Makefile.15_4
diff --git a/samples/microkernel/apps/network/test_15_4/prj.mdef b/samples/microkernel/apps/net/test_15_4/prj.mdef
similarity index 100%
rename from samples/microkernel/apps/network/test_15_4/prj.mdef
rename to samples/microkernel/apps/net/test_15_4/prj.mdef
diff --git a/samples/microkernel/apps/network/test_15_4/prj_arm.conf b/samples/microkernel/apps/net/test_15_4/prj_arm.conf
similarity index 100%
rename from samples/microkernel/apps/network/test_15_4/prj_arm.conf
rename to samples/microkernel/apps/net/test_15_4/prj_arm.conf
diff --git a/samples/microkernel/apps/network/test_15_4/prj_x86.conf b/samples/microkernel/apps/net/test_15_4/prj_x86.conf
similarity index 100%
rename from samples/microkernel/apps/network/test_15_4/prj_x86.conf
rename to samples/microkernel/apps/net/test_15_4/prj_x86.conf