diff --git a/samples/static_lib/Makefile b/samples/application_development/static_lib/Makefile
similarity index 100%
rename from samples/static_lib/Makefile
rename to samples/application_development/static_lib/Makefile
diff --git a/samples/static_lib/README b/samples/application_development/static_lib/README
similarity index 100%
rename from samples/static_lib/README
rename to samples/application_development/static_lib/README
diff --git a/samples/static_lib/hello_world/Kbuild b/samples/application_development/static_lib/hello_world/Kbuild
similarity index 100%
rename from samples/static_lib/hello_world/Kbuild
rename to samples/application_development/static_lib/hello_world/Kbuild
diff --git a/samples/static_lib/hello_world/Makefile b/samples/application_development/static_lib/hello_world/Makefile
similarity index 85%
rename from samples/static_lib/hello_world/Makefile
rename to samples/application_development/static_lib/hello_world/Makefile
index 4f0945099eb..f74c6aa5ddc 100644
--- a/samples/static_lib/hello_world/Makefile
+++ b/samples/application_development/static_lib/hello_world/Makefile
@@ -7,7 +7,7 @@
 BOARD ?= qemu_x86
 CONF_FILE = prj.conf
 
-export SOURCE_DIR = $(ZEPHYR_BASE)/samples/static_lib/hello_world
+export SOURCE_DIR = $(CURDIR)
 export LDFLAGS_zephyr += -L$(O)/mylib/lib
 export ALL_LIBS += mylib
 
diff --git a/samples/static_lib/hello_world/prj.conf b/samples/application_development/static_lib/hello_world/prj.conf
similarity index 100%
rename from samples/static_lib/hello_world/prj.conf
rename to samples/application_development/static_lib/hello_world/prj.conf
diff --git a/samples/static_lib/hello_world/src/Makefile b/samples/application_development/static_lib/hello_world/src/Makefile
similarity index 100%
rename from samples/static_lib/hello_world/src/Makefile
rename to samples/application_development/static_lib/hello_world/src/Makefile
diff --git a/samples/static_lib/hello_world/src/main.c b/samples/application_development/static_lib/hello_world/src/main.c
similarity index 100%
rename from samples/static_lib/hello_world/src/main.c
rename to samples/application_development/static_lib/hello_world/src/main.c
diff --git a/samples/static_lib/mylib/Makefile b/samples/application_development/static_lib/mylib/Makefile
similarity index 100%
rename from samples/static_lib/mylib/Makefile
rename to samples/application_development/static_lib/mylib/Makefile
diff --git a/samples/static_lib/mylib/include/mylib.h b/samples/application_development/static_lib/mylib/include/mylib.h
similarity index 100%
rename from samples/static_lib/mylib/include/mylib.h
rename to samples/application_development/static_lib/mylib/include/mylib.h
diff --git a/samples/static_lib/mylib/src/mylib.c b/samples/application_development/static_lib/mylib/src/mylib.c
similarity index 100%
rename from samples/static_lib/mylib/src/mylib.c
rename to samples/application_development/static_lib/mylib/src/mylib.c
diff --git a/samples/static_lib/prj.conf b/samples/application_development/static_lib/prj.conf
similarity index 100%
rename from samples/static_lib/prj.conf
rename to samples/application_development/static_lib/prj.conf
diff --git a/samples/static_lib/testcase.ini b/samples/application_development/static_lib/testcase.ini
similarity index 100%
rename from samples/static_lib/testcase.ini
rename to samples/application_development/static_lib/testcase.ini