You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/06/16 14:03:23 UTC

[incubator-nuttx-apps] 08/17: examples: fix relative path CI error

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git

commit 2ac8589a25b5a64b075eb25a3b58e170dac5bcab
Author: Alin Jerpelea <al...@sony.com>
AuthorDate: Wed Jun 16 09:22:16 2021 +0200

    examples: fix relative path CI error
    
    error: Path relative to repository other than nuttx must begin with the root directory
    Signed-off-by: Alin Jerpelea <al...@sony.com>
---
 examples/abntcodi/abntcodi_main.c                    | 2 +-
 examples/adc/adc.h                                   | 2 +-
 examples/adc/adc_main.c                              | 2 +-
 examples/adxl372_test/adxl372_test_main.c            | 2 +-
 examples/apa102/apa102_main.c                        | 2 +-
 examples/apds9960/apds9960_main.c                    | 2 +-
 examples/battery/batt_main.c                         | 2 +-
 examples/bmi160/sixaxis_main.c                       | 2 +-
 examples/bmp180/bmp180_main.c                        | 2 +-
 examples/bridge/bridge_main.c                        | 2 +-
 examples/bridge/host_main.c                          | 2 +-
 examples/bridge/host_net1.c                          | 2 +-
 examples/bridge/host_net2.c                          | 2 +-
 examples/calib_udelay/calib_udelay_main.c            | 2 +-
 examples/can/can.h                                   | 2 +-
 examples/can/can_main.c                              | 2 +-
 examples/canard/canard_main.c                        | 2 +-
 examples/charger/charger_main.c                      | 2 +-
 examples/chrono/chrono_main.c                        | 2 +-
 examples/configdata/configdata_main.c                | 2 +-
 examples/dac/dac_main.c                              | 2 +-
 examples/dhcpd/dhcpd_daemon.c                        | 2 +-
 examples/dhcpd/dhcpd_start.c                         | 2 +-
 examples/dhcpd/dhcpd_stop.c                          | 2 +-
 examples/dhcpd/host.c                                | 2 +-
 examples/dhcpd/target.c                              | 2 +-
 examples/discover/discover_main.c                    | 2 +-
 examples/elf/tests/errno/errno.c                     | 2 +-
 examples/elf/tests/hello/hello.c                     | 2 +-
 examples/elf/tests/longjmp/longjmp.c                 | 2 +-
 examples/elf/tests/mutex/mutex.c                     | 2 +-
 examples/elf/tests/pthread/pthread.c                 | 2 +-
 examples/elf/tests/signal/signal.c                   | 2 +-
 examples/elf/tests/struct/struct.h                   | 2 +-
 examples/elf/tests/struct/struct_dummy.c             | 2 +-
 examples/elf/tests/struct/struct_main.c              | 2 +-
 examples/elf/tests/task/task.c                       | 2 +-
 examples/fb/fb_main.c                                | 2 +-
 examples/fboverlay/fboverlay_main.c                  | 2 +-
 examples/flash_test/flash_test.c                     | 2 +-
 examples/flowc/flowc.h                               | 2 +-
 examples/flowc/flowc_host.c                          | 2 +-
 examples/flowc/flowc_mktestdata.c                    | 2 +-
 examples/flowc/flowc_receiver.c                      | 2 +-
 examples/flowc/flowc_sender.c                        | 2 +-
 examples/flowc/flowc_target1.c                       | 2 +-
 examples/flowc/flowc_target2.c                       | 2 +-
 examples/ft80x/ft80x_bitmaps.c                       | 2 +-
 examples/ft80x/ft80x_coprocessor.c                   | 2 +-
 examples/ft80x/ft80x_main.c                          | 2 +-
 examples/ft80x/ft80x_primitives.c                    | 2 +-
 examples/ftpc/ftpc_cmds.c                            | 2 +-
 examples/ftpd/ftpd_main.c                            | 2 +-
 examples/fxos8700cq_test/fxos8700cq_main.c           | 2 +-
 examples/gpio/gpio_main.c                            | 2 +-
 examples/gps/gps_main.c                              | 2 +-
 examples/hello/hello_main.c                          | 2 +-
 examples/hts221_reader/hts221_reader_main.c          | 2 +-
 examples/i2schar/i2schar.h                           | 2 +-
 examples/i2schar/i2schar_main.c                      | 2 +-
 examples/i2schar/i2schar_receiver.c                  | 2 +-
 examples/i2schar/i2schar_transmitter.c               | 2 +-
 examples/i2sloop/i2sloop_main.c                      | 2 +-
 examples/igmp/igmp.c                                 | 2 +-
 examples/igmp/igmp.h                                 | 2 +-
 examples/ina219/ina219_main.c                        | 2 +-
 examples/ina226/ina226_main.c                        | 2 +-
 examples/ipcfg/ipcfg_main.c                          | 2 +-
 examples/lsm303_reader/lsm303_reader_main.c          | 2 +-
 examples/lsm330spi_test/lsm330spi_test_main.c        | 2 +-
 examples/lsm6dsl_reader/lsm6dsl_reader_main.c        | 2 +-
 examples/lvgldemo/tp_cal.c                           | 2 +-
 examples/lvgldemo/tp_cal.h                           | 2 +-
 examples/max31855/max31855_main.c                    | 2 +-
 examples/media/media_main.c                          | 2 +-
 examples/mld/mld.h                                   | 2 +-
 examples/mld/mld_main.c                              | 2 +-
 examples/mlx90614/mlx90614_main.c                    | 2 +-
 examples/modbus/modbus_main.c                        | 2 +-
 examples/mount/mount.h                               | 2 +-
 examples/mount/mount_main.c                          | 2 +-
 examples/mount/ramdisk.c                             | 2 +-
 examples/mtdpart/mtdpart_main.c                      | 2 +-
 examples/netlink_route/netlink_route_main.c          | 2 +-
 examples/netloop/lo_listener.c                       | 2 +-
 examples/netloop/lo_main.c                           | 2 +-
 examples/netloop/netloop.h                           | 2 +-
 examples/nettest/nettest.h                           | 2 +-
 examples/nettest/nettest_client.c                    | 2 +-
 examples/nettest/nettest_cmdline.c                   | 2 +-
 examples/nettest/nettest_host.c                      | 2 +-
 examples/nettest/nettest_netinit.c                   | 2 +-
 examples/nettest/nettest_server.c                    | 2 +-
 examples/nettest/nettest_target1.c                   | 2 +-
 examples/nettest/nettest_target2.c                   | 2 +-
 examples/nrf24l01_btle/nrf24l01_btle.c               | 2 +-
 examples/nrf24l01_btle/nrf24l01_btle.h               | 2 +-
 examples/nrf24l01_term/nrf24l01_term.c               | 2 +-
 examples/null/null_main.c                            | 2 +-
 examples/nx/nx_events.c                              | 2 +-
 examples/nx/nx_internal.h                            | 2 +-
 examples/nx/nx_kbdin.c                               | 2 +-
 examples/nx/nx_main.c                                | 2 +-
 examples/nxdemo/images.h                             | 2 +-
 examples/nxdemo/nxdemo.h                             | 2 +-
 examples/nxdemo/nxdemo_bkgd.c                        | 2 +-
 examples/nxdemo/nxdemo_listener.c                    | 2 +-
 examples/nxdemo/nxdemo_main.c                        | 2 +-
 examples/nxflat/tests/errno/errno.c                  | 2 +-
 examples/nxflat/tests/hello/hello.c                  | 2 +-
 examples/nxflat/tests/longjmp/longjmp.c              | 2 +-
 examples/nxflat/tests/mutex/mutex.c                  | 2 +-
 examples/nxflat/tests/pthread/pthread.c              | 2 +-
 examples/nxflat/tests/signal/signal.c                | 2 +-
 examples/nxflat/tests/struct/struct.h                | 2 +-
 examples/nxflat/tests/struct/struct_dummy.c          | 2 +-
 examples/nxflat/tests/struct/struct_main.c           | 2 +-
 examples/nxflat/tests/task/task.c                    | 2 +-
 examples/nxhello/nxhello.h                           | 2 +-
 examples/nxhello/nxhello_bkgd.c                      | 2 +-
 examples/nxhello/nxhello_listener.c                  | 2 +-
 examples/nxhello/nxhello_main.c                      | 2 +-
 examples/nximage/nximage.h                           | 2 +-
 examples/nximage/nximage_bitmap.c                    | 2 +-
 examples/nximage/nximage_bkgd.c                      | 2 +-
 examples/nximage/nximage_listener.c                  | 2 +-
 examples/nximage/nximage_main.c                      | 2 +-
 examples/nxlines/nxlines.h                           | 2 +-
 examples/nxlines/nxlines_bkgd.c                      | 2 +-
 examples/nxlines/nxlines_listener.c                  | 2 +-
 examples/nxlines/nxlines_main.c                      | 2 +-
 examples/nxterm/nxterm_internal.h                    | 2 +-
 examples/nxterm/nxterm_listener.c                    | 2 +-
 examples/nxterm/nxterm_main.c                        | 2 +-
 examples/nxterm/nxterm_toolbar.c                     | 2 +-
 examples/nxterm/nxterm_wndo.c                        | 2 +-
 examples/nxtext/nxtext_bkgd.c                        | 2 +-
 examples/nxtext/nxtext_internal.h                    | 2 +-
 examples/nxtext/nxtext_listener.c                    | 2 +-
 examples/nxtext/nxtext_main.c                        | 2 +-
 examples/nxtext/nxtext_popup.c                       | 2 +-
 examples/nxtext/nxtext_putc.c                        | 2 +-
 examples/obd2/obd2_main.c                            | 2 +-
 examples/pca9635/pca9635_main.c                      | 2 +-
 examples/pf_ieee802154/pf_client.c                   | 2 +-
 examples/pf_ieee802154/pf_cmdline.c                  | 2 +-
 examples/pf_ieee802154/pf_server.c                   | 2 +-
 examples/pf_ieee802154/pfieee802154.h                | 2 +-
 examples/pipe/interlock_test.c                       | 2 +-
 examples/pipe/pipe.h                                 | 2 +-
 examples/pipe/pipe_main.c                            | 2 +-
 examples/pipe/redirect_test.c                        | 2 +-
 examples/pipe/transfer_test.c                        | 2 +-
 examples/poll/host.c                                 | 2 +-
 examples/poll/net_listener.c                         | 2 +-
 examples/poll/net_reader.c                           | 2 +-
 examples/poll/poll_internal.h                        | 2 +-
 examples/poll/poll_listener.c                        | 2 +-
 examples/poll/poll_main.c                            | 2 +-
 examples/poll/select_listener.c                      | 2 +-
 examples/popen/popen_main.c                          | 2 +-
 examples/posix_spawn/filesystem/hello/hello.c        | 2 +-
 examples/posix_spawn/filesystem/redirect/redirect.c  | 2 +-
 examples/powerled/powerled_main.c                    | 2 +-
 examples/powermonitor/powermonitor_main.c            | 2 +-
 examples/pppd/pppd_main.c                            | 2 +-
 examples/pty_test/pty_test.c                         | 2 +-
 examples/pwfb/pwfb_events.c                          | 2 +-
 examples/pwfb/pwfb_internal.h                        | 2 +-
 examples/pwfb/pwfb_main.c                            | 2 +-
 examples/pwfb/pwfb_motion.c                          | 2 +-
 examples/pwlines/pwlines_events.c                    | 2 +-
 examples/pwlines/pwlines_internal.h                  | 2 +-
 examples/pwlines/pwlines_main.c                      | 2 +-
 examples/pwlines/pwlines_motion.c                    | 2 +-
 examples/pwlines/pwlines_update.c                    | 2 +-
 examples/pwm/pwm.h                                   | 2 +-
 examples/qencoder/qe.h                               | 2 +-
 examples/random/random_main.c                        | 2 +-
 examples/relays/relays_main.c                        | 2 +-
 examples/rfid_readuid/rfid_readuid.c                 | 2 +-
 examples/rgbled/rgbled.c                             | 2 +-
 examples/sendmail/sendmail_main.c                    | 2 +-
 examples/serialblaster/serialblaster_main.c          | 2 +-
 examples/serialrx/serialrx_main.c                    | 2 +-
 examples/serloop/serloop_main.c                      | 2 +-
 examples/slcd/slcd_main.c                            | 2 +-
 examples/smps/smps_main.c                            | 2 +-
 examples/stat/stat_main.c                            | 2 +-
 examples/sx127x_demo/sx127x_demo.c                   | 2 +-
 examples/system/system_main.c                        | 2 +-
 examples/tcpblaster/tcpblaster.h                     | 2 +-
 examples/tcpblaster/tcpblaster_client.c              | 2 +-
 examples/tcpblaster/tcpblaster_cmdline.c             | 2 +-
 examples/tcpblaster/tcpblaster_host.c                | 2 +-
 examples/tcpblaster/tcpblaster_netinit.c             | 2 +-
 examples/tcpblaster/tcpblaster_server.c              | 2 +-
 examples/tcpblaster/tcpblaster_target1.c             | 2 +-
 examples/tcpblaster/tcpblaster_target2.c             | 2 +-
 examples/tcpecho/tcpecho_main.c                      | 2 +-
 examples/telnetd/telnetd.c                           | 2 +-
 examples/thttpd/content/hello/hello.c                | 2 +-
 examples/thttpd/content/tasks/tasks.c                | 2 +-
 examples/timer/timer_main.c                          | 2 +-
 examples/touchscreen/tc.h                            | 2 +-
 examples/udgram/udgram.h                             | 2 +-
 examples/udgram/udgram_client.c                      | 2 +-
 examples/udgram/udgram_server.c                      | 2 +-
 examples/udp/udp.h                                   | 2 +-
 examples/udp/udp_client.c                            | 2 +-
 examples/udp/udp_cmdline.c                           | 2 +-
 examples/udp/udp_host.c                              | 2 +-
 examples/udp/udp_netinit.c                           | 2 +-
 examples/udp/udp_server.c                            | 2 +-
 examples/udp/udp_target1.c                           | 2 +-
 examples/udp/udp_target2.c                           | 2 +-
 examples/udpblaster/udpblaster_host.c                | 2 +-
 examples/udpblaster/udpblaster_target.c              | 2 +-
 examples/udpblaster/udpblaster_text.c                | 2 +-
 examples/uid/uid_main.c                              | 2 +-
 examples/usbserial/host.c                            | 2 +-
 examples/usbserial/usbserial_main.c                  | 2 +-
 examples/userfs/userfs_main.c                        | 2 +-
 examples/usrsocktest/defines.h                       | 2 +-
 examples/usrsocktest/usrsocktest_basic_connect.c     | 2 +-
 examples/usrsocktest/usrsocktest_basic_daemon.c      | 2 +-
 examples/usrsocktest/usrsocktest_basic_getsockname.c | 2 +-
 examples/usrsocktest/usrsocktest_basic_getsockopt.c  | 2 +-
 examples/usrsocktest/usrsocktest_basic_send.c        | 2 +-
 examples/usrsocktest/usrsocktest_basic_setsockopt.c  | 2 +-
 examples/usrsocktest/usrsocktest_block_recv.c        | 2 +-
 examples/usrsocktest/usrsocktest_block_send.c        | 2 +-
 examples/usrsocktest/usrsocktest_chardev.c           | 2 +-
 examples/usrsocktest/usrsocktest_daemon.c            | 2 +-
 examples/usrsocktest/usrsocktest_multi_thread.c      | 2 +-
 examples/usrsocktest/usrsocktest_noblock_connect.c   | 2 +-
 examples/usrsocktest/usrsocktest_noblock_recv.c      | 2 +-
 examples/usrsocktest/usrsocktest_noblock_send.c      | 2 +-
 examples/usrsocktest/usrsocktest_nodaemon.c          | 2 +-
 examples/usrsocktest/usrsocktest_poll.c              | 2 +-
 examples/usrsocktest/usrsocktest_wake_with_signal.c  | 2 +-
 examples/ustream/ustream.h                           | 2 +-
 examples/ustream/ustream_client.c                    | 2 +-
 examples/ustream/ustream_server.c                    | 2 +-
 examples/veml6070/veml6070_main.c                    | 2 +-
 examples/watchdog/watchdog.h                         | 2 +-
 examples/watchdog/watchdog_main.c                    | 2 +-
 examples/watcher/ramdisk.c                           | 2 +-
 examples/watcher/ramdisk.h                           | 2 +-
 examples/watcher/task_mn.h                           | 2 +-
 examples/watcher/wdt.h                               | 2 +-
 examples/webserver/webserver_main.c                  | 2 +-
 examples/wget/wget_main.c                            | 2 +-
 examples/wgetjson/wgetjson_main.c                    | 2 +-
 examples/xbc_test/xbc_test_main.c                    | 2 +-
 255 files changed, 255 insertions(+), 255 deletions(-)

diff --git a/examples/abntcodi/abntcodi_main.c b/examples/abntcodi/abntcodi_main.c
index fb4f0a7..27faaa6 100644
--- a/examples/abntcodi/abntcodi_main.c
+++ b/examples/abntcodi/abntcodi_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/hello/abntcodi_main.c
+ * apps/examples/hello/abntcodi_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/adc/adc.h b/examples/adc/adc.h
index 1bb9686..ca136a9 100644
--- a/examples/adc/adc.h
+++ b/examples/adc/adc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/examples/adc/adc.h
+ * apps/examples/examples/adc/adc.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/adc/adc_main.c b/examples/adc/adc_main.c
index f22925d..1db9817 100644
--- a/examples/adc/adc_main.c
+++ b/examples/adc/adc_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/adc/adc_main.c
+ * apps/examples/adc/adc_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/adxl372_test/adxl372_test_main.c b/examples/adxl372_test/adxl372_test_main.c
index 61e3b95..9af5df9 100644
--- a/examples/adxl372_test/adxl372_test_main.c
+++ b/examples/adxl372_test/adxl372_test_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/adxl372_test/adxl372_test_main.c
+ * apps/examples/adxl372_test/adxl372_test_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/apa102/apa102_main.c b/examples/apa102/apa102_main.c
index fdc0104..0d23706 100644
--- a/examples/apa102/apa102_main.c
+++ b/examples/apa102/apa102_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/apa102/apa102_main.c
+ * apps/examples/apa102/apa102_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/apds9960/apds9960_main.c b/examples/apds9960/apds9960_main.c
index fb50aa7..a4cc309 100644
--- a/examples/apds9960/apds9960_main.c
+++ b/examples/apds9960/apds9960_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/apds9960/apds9960_main.c
+ * apps/examples/apds9960/apds9960_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/battery/batt_main.c b/examples/battery/batt_main.c
index 3f4b30a..019b381 100644
--- a/examples/battery/batt_main.c
+++ b/examples/battery/batt_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/batt/batt_main.c
+ * apps/examples/batt/batt_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/bmi160/sixaxis_main.c b/examples/bmi160/sixaxis_main.c
index 6f057aa..d798ab7 100644
--- a/examples/bmi160/sixaxis_main.c
+++ b/examples/bmi160/sixaxis_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/bmi160/sixaxis_main.c
+ * apps/examples/bmi160/sixaxis_main.c
  *
  *   Copyright 2018 Sony Semiconductor Solutions Corporation
  *
diff --git a/examples/bmp180/bmp180_main.c b/examples/bmp180/bmp180_main.c
index 036ebcf..0b5b98c 100644
--- a/examples/bmp180/bmp180_main.c
+++ b/examples/bmp180/bmp180_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/bmp180/bmp180_main.c
+ * apps/examples/bmp180/bmp180_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/bridge/bridge_main.c b/examples/bridge/bridge_main.c
index dca6763..d7a6885 100644
--- a/examples/bridge/bridge_main.c
+++ b/examples/bridge/bridge_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/bridge/bridge_main.c
+ * apps/examples/bridge/bridge_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/bridge/host_main.c b/examples/bridge/host_main.c
index a5edf89..2970539 100644
--- a/examples/bridge/host_main.c
+++ b/examples/bridge/host_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/bridge/host_main.c
+ * apps/examples/bridge/host_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/bridge/host_net1.c b/examples/bridge/host_net1.c
index 5275242..7584643 100644
--- a/examples/bridge/host_net1.c
+++ b/examples/bridge/host_net1.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/bridge/host_net1.c
+ * apps/examples/bridge/host_net1.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/bridge/host_net2.c b/examples/bridge/host_net2.c
index 0d67f71..b12cc13 100644
--- a/examples/bridge/host_net2.c
+++ b/examples/bridge/host_net2.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/bridge/host_net2.c
+ * apps/examples/bridge/host_net2.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/calib_udelay/calib_udelay_main.c b/examples/calib_udelay/calib_udelay_main.c
index c6abce7..fa0dd51 100644
--- a/examples/calib_udelay/calib_udelay_main.c
+++ b/examples/calib_udelay/calib_udelay_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/calib_udelay/calib_udelay_main.c
+ * apps/examples/calib_udelay/calib_udelay_main.c
  *
  *   Copyright (C) 2017 Haltian Ltd All rights reserved.
  *   Author: Jussi Kivilinna <ju...@haltian.com>
diff --git a/examples/can/can.h b/examples/can/can.h
index 38049fd..b9446c5 100644
--- a/examples/can/can.h
+++ b/examples/can/can.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/examples/can/can.h
+ * apps/examples/examples/can/can.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/can/can_main.c b/examples/can/can_main.c
index 601a40d..95e414a 100644
--- a/examples/can/can_main.c
+++ b/examples/can/can_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/can/can_main.c
+ * apps/examples/can/can_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/canard/canard_main.c b/examples/canard/canard_main.c
index 792080e..87ba602 100644
--- a/examples/canard/canard_main.c
+++ b/examples/canard/canard_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/canard/canard_main.c
+ * apps/examples/canard/canard_main.c
  *
  *   Copyright (C) 2016 ETH Zuerich. All rights reserved.
  *   Author: Matthias Renner <re...@ethz.ch>
diff --git a/examples/charger/charger_main.c b/examples/charger/charger_main.c
index c21e98d..038a674 100644
--- a/examples/charger/charger_main.c
+++ b/examples/charger/charger_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/charger/charger_main.c
+ * apps/examples/charger/charger_main.c
  *
  *   Copyright 2018 Sony Semiconductor Solutions Corporation
  *
diff --git a/examples/chrono/chrono_main.c b/examples/chrono/chrono_main.c
index 5d57fb7..906ee82 100644
--- a/examples/chrono/chrono_main.c
+++ b/examples/chrono/chrono_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/chrono/chrono_main.c
+ * apps/examples/chrono/chrono_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/configdata/configdata_main.c b/examples/configdata/configdata_main.c
index 46ad21c..700b864 100644
--- a/examples/configdata/configdata_main.c
+++ b/examples/configdata/configdata_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/configdata/configdata_main.c
+ * apps/examples/configdata/configdata_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/dac/dac_main.c b/examples/dac/dac_main.c
index d3eddc7..4355c6a 100644
--- a/examples/dac/dac_main.c
+++ b/examples/dac/dac_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/dac/dac_main.c
+ * apps/examples/dac/dac_main.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Juha Niskanen <ju...@haltian.com>
diff --git a/examples/dhcpd/dhcpd_daemon.c b/examples/dhcpd/dhcpd_daemon.c
index 332ba75..7ed38bb 100644
--- a/examples/dhcpd/dhcpd_daemon.c
+++ b/examples/dhcpd/dhcpd_daemon.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/dhcpd/dhcpd_daemon.c
+ * apps/examples/dhcpd/dhcpd_daemon.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/dhcpd/dhcpd_start.c b/examples/dhcpd/dhcpd_start.c
index ed90ec6..1ab56aa 100644
--- a/examples/dhcpd/dhcpd_start.c
+++ b/examples/dhcpd/dhcpd_start.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/dhcpd/dhcpd_start.c
+ * apps/examples/dhcpd/dhcpd_start.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/dhcpd/dhcpd_stop.c b/examples/dhcpd/dhcpd_stop.c
index aa6b212..7d6795d 100644
--- a/examples/dhcpd/dhcpd_stop.c
+++ b/examples/dhcpd/dhcpd_stop.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/dhcpd/dhcpd_stop.c
+ * apps/examples/dhcpd/dhcpd_stop.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/dhcpd/host.c b/examples/dhcpd/host.c
index 5520a90..89c4885 100644
--- a/examples/dhcpd/host.c
+++ b/examples/dhcpd/host.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/dhcpd/host.c
+ * apps/examples/dhcpd/host.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/dhcpd/target.c b/examples/dhcpd/target.c
index 93fa959..574a6b6 100644
--- a/examples/dhcpd/target.c
+++ b/examples/dhcpd/target.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/dhcpd/target.c
+ * apps/examples/dhcpd/target.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/discover/discover_main.c b/examples/discover/discover_main.c
index 36ee189..6280408 100644
--- a/examples/discover/discover_main.c
+++ b/examples/discover/discover_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/discover/discover_main.c
+ * apps/examples/discover/discover_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/elf/tests/errno/errno.c b/examples/elf/tests/errno/errno.c
index 3be8502..e75659f 100644
--- a/examples/elf/tests/errno/errno.c
+++ b/examples/elf/tests/errno/errno.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/elf/tests/errno/errno.c
+ * apps/examples/elf/tests/errno/errno.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/elf/tests/hello/hello.c b/examples/elf/tests/hello/hello.c
index 527a04f..dc5f392 100644
--- a/examples/elf/tests/hello/hello.c
+++ b/examples/elf/tests/hello/hello.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/elf/tests/hello/hello.c
+ * apps/examples/elf/tests/hello/hello.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/elf/tests/longjmp/longjmp.c b/examples/elf/tests/longjmp/longjmp.c
index 75b4873..ca36b95 100644
--- a/examples/elf/tests/longjmp/longjmp.c
+++ b/examples/elf/tests/longjmp/longjmp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/elf/tests/longjmp/longjmp.c
+ * apps/examples/elf/tests/longjmp/longjmp.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/elf/tests/mutex/mutex.c b/examples/elf/tests/mutex/mutex.c
index a050bf1..752941c 100644
--- a/examples/elf/tests/mutex/mutex.c
+++ b/examples/elf/tests/mutex/mutex.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/elf/tests/mutex/mutex.c
+ * apps/examples/elf/tests/mutex/mutex.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/elf/tests/pthread/pthread.c b/examples/elf/tests/pthread/pthread.c
index bf1df7b..4e5e8f8 100644
--- a/examples/elf/tests/pthread/pthread.c
+++ b/examples/elf/tests/pthread/pthread.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/elf/tests/pthread/pthread.c
+ * apps/examples/elf/tests/pthread/pthread.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/elf/tests/signal/signal.c b/examples/elf/tests/signal/signal.c
index b72e31a..a55070f 100644
--- a/examples/elf/tests/signal/signal.c
+++ b/examples/elf/tests/signal/signal.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/elf/tests/signal/signal.c
+ * apps/examples/elf/tests/signal/signal.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/elf/tests/struct/struct.h b/examples/elf/tests/struct/struct.h
index db908c6..ec96db7 100644
--- a/examples/elf/tests/struct/struct.h
+++ b/examples/elf/tests/struct/struct.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/elf/tests/struct/struct.h
+ * apps/examples/elf/tests/struct/struct.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/elf/tests/struct/struct_dummy.c b/examples/elf/tests/struct/struct_dummy.c
index ba7fcb5..d337641 100644
--- a/examples/elf/tests/struct/struct_dummy.c
+++ b/examples/elf/tests/struct/struct_dummy.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/elf/tests/struct/struct_dummy.c
+ * apps/examples/elf/tests/struct/struct_dummy.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/elf/tests/struct/struct_main.c b/examples/elf/tests/struct/struct_main.c
index 69128b2..2cb707e 100644
--- a/examples/elf/tests/struct/struct_main.c
+++ b/examples/elf/tests/struct/struct_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/elf/tests/struct/struct_main.c
+ * apps/examples/elf/tests/struct/struct_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/elf/tests/task/task.c b/examples/elf/tests/task/task.c
index eee73d0..8bbc819 100644
--- a/examples/elf/tests/task/task.c
+++ b/examples/elf/tests/task/task.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/elf/tests/task/parent.c
+ * apps/examples/elf/tests/task/parent.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/fb/fb_main.c b/examples/fb/fb_main.c
index f8c2273..eb5f614 100644
--- a/examples/fb/fb_main.c
+++ b/examples/fb/fb_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/fb/fb_main.c
+ * apps/examples/fb/fb_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/fboverlay/fboverlay_main.c b/examples/fboverlay/fboverlay_main.c
index ad13466..b9cc9bf 100644
--- a/examples/fboverlay/fboverlay_main.c
+++ b/examples/fboverlay/fboverlay_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/fboverlay/fboverlay_main.c
+ * apps/examples/fboverlay/fboverlay_main.c
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Marco Krahl <oc...@gmail.com>
diff --git a/examples/flash_test/flash_test.c b/examples/flash_test/flash_test.c
index 2decd78..a0832a7 100644
--- a/examples/flash_test/flash_test.c
+++ b/examples/flash_test/flash_test.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/system/flash_test/flash_test.c
+ * apps/examples/flash_test/flash_test.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/flowc/flowc.h b/examples/flowc/flowc.h
index 4e15ac6..0129dc3 100644
--- a/examples/flowc/flowc.h
+++ b/examples/flowc/flowc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/flowc/flowc.h
+ * apps/examples/flowc/flowc.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/flowc/flowc_host.c b/examples/flowc/flowc_host.c
index ddf2648..a2d97bb 100644
--- a/examples/flowc/flowc_host.c
+++ b/examples/flowc/flowc_host.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/flowc/flowc_host.c
+ * apps/examples/flowc/flowc_host.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/flowc/flowc_mktestdata.c b/examples/flowc/flowc_mktestdata.c
index aa251fd..ae31cf8 100644
--- a/examples/flowc/flowc_mktestdata.c
+++ b/examples/flowc/flowc_mktestdata.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/flowc/flowc_mktestdata.c
+ * apps/examples/flowc/flowc_mktestdata.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/flowc/flowc_receiver.c b/examples/flowc/flowc_receiver.c
index e761695..165dd75 100644
--- a/examples/flowc/flowc_receiver.c
+++ b/examples/flowc/flowc_receiver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/flowc/flowc_receiver.c
+ * apps/examples/flowc/flowc_receiver.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/flowc/flowc_sender.c b/examples/flowc/flowc_sender.c
index c70b435..986d5b2 100644
--- a/examples/flowc/flowc_sender.c
+++ b/examples/flowc/flowc_sender.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/flowc/flowc_sender.c
+ * apps/examples/flowc/flowc_sender.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/flowc/flowc_target1.c b/examples/flowc/flowc_target1.c
index 3d3be4f..80790b3 100644
--- a/examples/flowc/flowc_target1.c
+++ b/examples/flowc/flowc_target1.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/flowc/flowc_target1.c
+ * apps/examples/flowc/flowc_target1.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/flowc/flowc_target2.c b/examples/flowc/flowc_target2.c
index d770add..4488308 100644
--- a/examples/flowc/flowc_target2.c
+++ b/examples/flowc/flowc_target2.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/flowc/flowc_target2.c
+ * apps/examples/flowc/flowc_target2.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/ft80x/ft80x_bitmaps.c b/examples/ft80x/ft80x_bitmaps.c
index f02affc..735239c 100644
--- a/examples/ft80x/ft80x_bitmaps.c
+++ b/examples/ft80x/ft80x_bitmaps.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/ft80x/ft80x_bitmaps.c
+ * apps/examples/ft80x/ft80x_bitmaps.c
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gn...@nuttx.org>
diff --git a/examples/ft80x/ft80x_coprocessor.c b/examples/ft80x/ft80x_coprocessor.c
index 7bdc0c7..6d57b88 100644
--- a/examples/ft80x/ft80x_coprocessor.c
+++ b/examples/ft80x/ft80x_coprocessor.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/ft80x/ft80x_coprocessor.c
+ * apps/examples/ft80x/ft80x_coprocessor.c
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gn...@nuttx.org>
diff --git a/examples/ft80x/ft80x_main.c b/examples/ft80x/ft80x_main.c
index 212bf0b..da79bf9 100644
--- a/examples/ft80x/ft80x_main.c
+++ b/examples/ft80x/ft80x_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/ft80x/ft80x_main.c
+ * apps/examples/ft80x/ft80x_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/ft80x/ft80x_primitives.c b/examples/ft80x/ft80x_primitives.c
index f15764e..be14b7c 100644
--- a/examples/ft80x/ft80x_primitives.c
+++ b/examples/ft80x/ft80x_primitives.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/ft80x/ft80x_primitives.c
+ * apps/examples/ft80x/ft80x_primitives.c
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gn...@nuttx.org>
diff --git a/examples/ftpc/ftpc_cmds.c b/examples/ftpc/ftpc_cmds.c
index 488ef03..a3abd17 100644
--- a/examples/ftpc/ftpc_cmds.c
+++ b/examples/ftpc/ftpc_cmds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/ftpc/ftpc_cmds.c
+ * apps/examples/ftpc/ftpc_cmds.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/ftpd/ftpd_main.c b/examples/ftpd/ftpd_main.c
index bb526d9..f154681 100644
--- a/examples/ftpd/ftpd_main.c
+++ b/examples/ftpd/ftpd_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/ftpd/ftpd_main.c
+ * apps/examples/ftpd/ftpd_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/fxos8700cq_test/fxos8700cq_main.c b/examples/fxos8700cq_test/fxos8700cq_main.c
index 415f267..b738197 100644
--- a/examples/fxos8700cq_test/fxos8700cq_main.c
+++ b/examples/fxos8700cq_test/fxos8700cq_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/fxos8700cq/fxos8700cq_main.c
+ * apps/examples/fxos8700cq/fxos8700cq_main.c
  * fxos8700cq motion sensor sample application
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/examples/gpio/gpio_main.c b/examples/gpio/gpio_main.c
index b41875b..d6aa13e 100644
--- a/examples/gpio/gpio_main.c
+++ b/examples/gpio/gpio_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/gpio/gpio_main.c
+ * apps/examples/gpio/gpio_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/gps/gps_main.c b/examples/gps/gps_main.c
index 2a7128f..5db2f11 100644
--- a/examples/gps/gps_main.c
+++ b/examples/gps/gps_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/hello/gps_main.c
+ * apps/examples/hello/gps_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/hello/hello_main.c b/examples/hello/hello_main.c
index fcc0411..2cd6cb4 100644
--- a/examples/hello/hello_main.c
+++ b/examples/hello/hello_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/hello/hello_main.c
+ * apps/examples/hello/hello_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/hts221_reader/hts221_reader_main.c b/examples/hts221_reader/hts221_reader_main.c
index 6b65060..89affb8 100644
--- a/examples/hts221_reader/hts221_reader_main.c
+++ b/examples/hts221_reader/hts221_reader_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/hts221_reader/hts221_reader_main.c
+ * apps/examples/hts221_reader/hts221_reader_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/i2schar/i2schar.h b/examples/i2schar/i2schar.h
index 92548c0..194e588 100644
--- a/examples/i2schar/i2schar.h
+++ b/examples/i2schar/i2schar.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/examples/i2schar/i2schar.h
+ * apps/examples/i2schar/i2schar.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/i2schar/i2schar_main.c b/examples/i2schar/i2schar_main.c
index 6c0a351..71d590c 100644
--- a/examples/i2schar/i2schar_main.c
+++ b/examples/i2schar/i2schar_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/i2schar/i2schar_main.c
+ * apps/examples/i2schar/i2schar_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/i2schar/i2schar_receiver.c b/examples/i2schar/i2schar_receiver.c
index af58766..8bff12c 100644
--- a/examples/i2schar/i2schar_receiver.c
+++ b/examples/i2schar/i2schar_receiver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/i2schar/i2schar_receiver.c
+ * apps/examples/i2schar/i2schar_receiver.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/i2schar/i2schar_transmitter.c b/examples/i2schar/i2schar_transmitter.c
index e784e07..f7173c8 100644
--- a/examples/i2schar/i2schar_transmitter.c
+++ b/examples/i2schar/i2schar_transmitter.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/i2schar/i2schar_transmitter.c
+ * apps/examples/i2schar/i2schar_transmitter.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/i2sloop/i2sloop_main.c b/examples/i2sloop/i2sloop_main.c
index 85c1cda..a6279c3 100644
--- a/examples/i2sloop/i2sloop_main.c
+++ b/examples/i2sloop/i2sloop_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/i2sloop/i2sloop_main.c
+ * apps/examples/i2sloop/i2sloop_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/igmp/igmp.c b/examples/igmp/igmp.c
index 4987689..4822227 100644
--- a/examples/igmp/igmp.c
+++ b/examples/igmp/igmp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/igmp/igmp.c
+ * apps/examples/igmp/igmp.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/igmp/igmp.h b/examples/igmp/igmp.h
index e963a6a..3d9ac64 100644
--- a/examples/igmp/igmp.h
+++ b/examples/igmp/igmp.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/igmp/igmp.h
+ * apps/examples/igmp/igmp.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/ina219/ina219_main.c b/examples/ina219/ina219_main.c
index d6c5237..a82064c 100644
--- a/examples/ina219/ina219_main.c
+++ b/examples/ina219/ina219_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/ina219/ina219_main.c
+ * apps/examples/ina219/ina219_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/ina226/ina226_main.c b/examples/ina226/ina226_main.c
index 73db3b6..e760397 100644
--- a/examples/ina226/ina226_main.c
+++ b/examples/ina226/ina226_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/ina226/ina226_main.c
+ * apps/examples/ina226/ina226_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/ipcfg/ipcfg_main.c b/examples/ipcfg/ipcfg_main.c
index bf42b43..3428daa 100644
--- a/examples/ipcfg/ipcfg_main.c
+++ b/examples/ipcfg/ipcfg_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/ipcfg/ipcfg_main.c
+ * apps/examples/ipcfg/ipcfg_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/lsm303_reader/lsm303_reader_main.c b/examples/lsm303_reader/lsm303_reader_main.c
index f299cbd..7c5c2e7 100644
--- a/examples/lsm303_reader/lsm303_reader_main.c
+++ b/examples/lsm303_reader/lsm303_reader_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/lsm303_reader/lsm303_reader_main.c
+ * apps/examples/lsm303_reader/lsm303_reader_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/lsm330spi_test/lsm330spi_test_main.c b/examples/lsm330spi_test/lsm330spi_test_main.c
index 0f7c6c9..6f6fbbf 100644
--- a/examples/lsm330spi_test/lsm330spi_test_main.c
+++ b/examples/lsm330spi_test/lsm330spi_test_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/lsm330spi_test/lsm330spi_test_main.c
+ * apps/examples/lsm330spi_test/lsm330spi_test_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/lsm6dsl_reader/lsm6dsl_reader_main.c b/examples/lsm6dsl_reader/lsm6dsl_reader_main.c
index 252aef6..6fea70d 100644
--- a/examples/lsm6dsl_reader/lsm6dsl_reader_main.c
+++ b/examples/lsm6dsl_reader/lsm6dsl_reader_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/lsm6dsl_reader/lsm6dsl_reader_main.c
+ * apps/examples/lsm6dsl_reader/lsm6dsl_reader_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/lvgldemo/tp_cal.c b/examples/lvgldemo/tp_cal.c
index db96770..393fc11 100644
--- a/examples/lvgldemo/tp_cal.c
+++ b/examples/lvgldemo/tp_cal.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/touchscreen/tp_cal.c
+ * apps/examples/touchscreen/tp_cal.c
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Gábor Kiss-Vámosi <ki...@gmail.com>
diff --git a/examples/lvgldemo/tp_cal.h b/examples/lvgldemo/tp_cal.h
index d7c6b39..e7dbb99 100644
--- a/examples/lvgldemo/tp_cal.h
+++ b/examples/lvgldemo/tp_cal.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/touchscreen/tp_cal.h
+ * apps/examples/lvgldemo/tp_cal.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Gábor Kiss-Vámosi <ki...@gmail.com>
diff --git a/examples/max31855/max31855_main.c b/examples/max31855/max31855_main.c
index b82ca98..a0b89d7 100644
--- a/examples/max31855/max31855_main.c
+++ b/examples/max31855/max31855_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/max31855/max31855_main.c
+ * apps/examples/max31855/max31855_main.c
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Tiago Almeida <ti...@gmail.com>
diff --git a/examples/media/media_main.c b/examples/media/media_main.c
index 864c94e..69a8fe2 100644
--- a/examples/media/media_main.c
+++ b/examples/media/media_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/media/hello_main.c
+ * apps/examples/media/hello_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/mld/mld.h b/examples/mld/mld.h
index e702d24..c2d5afb 100644
--- a/examples/mld/mld.h
+++ b/examples/mld/mld.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/mld/mld.h
+ * apps/examples/mld/mld.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/mld/mld_main.c b/examples/mld/mld_main.c
index f187503..dd7a894 100644
--- a/examples/mld/mld_main.c
+++ b/examples/mld/mld_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/mld/mld_main.c
+ * apps/examples/mld/mld_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/mlx90614/mlx90614_main.c b/examples/mlx90614/mlx90614_main.c
index 023c1e6..6015452 100644
--- a/examples/mlx90614/mlx90614_main.c
+++ b/examples/mlx90614/mlx90614_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/mlx90614/mlx90614_main.c
+ * apps/examples/mlx90614/mlx90614_main.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Copyright (c) 2015-2017 Pololu Corporation.
diff --git a/examples/modbus/modbus_main.c b/examples/modbus/modbus_main.c
index 7065687..59c9cc0 100644
--- a/examples/modbus/modbus_main.c
+++ b/examples/modbus/modbus_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/modbus/main.c
+ * apps/examples/modbus/main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/mount/mount.h b/examples/mount/mount.h
index e0900de..d8a4c98 100644
--- a/examples/mount/mount.h
+++ b/examples/mount/mount.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/mount/mount.h
+ * apps/examples/mount/mount.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/mount/mount_main.c b/examples/mount/mount_main.c
index 3b6ea24..510e5bb 100644
--- a/examples/mount/mount_main.c
+++ b/examples/mount/mount_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/mount/mount_main.c
+ * apps/examples/mount/mount_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/mount/ramdisk.c b/examples/mount/ramdisk.c
index fa55880..f732c28 100644
--- a/examples/mount/ramdisk.c
+++ b/examples/mount/ramdisk.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/mount/ramdisk.c
+ * apps/examples/mount/ramdisk.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/mtdpart/mtdpart_main.c b/examples/mtdpart/mtdpart_main.c
index 80ab2c8..4749793 100644
--- a/examples/mtdpart/mtdpart_main.c
+++ b/examples/mtdpart/mtdpart_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/mtdpart/mtdpart_main.c
+ * apps/examples/mtdpart/mtdpart_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/netlink_route/netlink_route_main.c b/examples/netlink_route/netlink_route_main.c
index 2b8d4e3..0c6aef1 100644
--- a/examples/netlink_route/netlink_route_main.c
+++ b/examples/netlink_route/netlink_route_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/netlink_route/netlink_route_main.c
+ * apps/examples/netlink_route/netlink_route_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/netloop/lo_listener.c b/examples/netloop/lo_listener.c
index cf8e605..e1d2831 100644
--- a/examples/netloop/lo_listener.c
+++ b/examples/netloop/lo_listener.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/netloop/lo_listener.c
+ * apps/examples/netloop/lo_listener.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/netloop/lo_main.c b/examples/netloop/lo_main.c
index 9a9eaa8..12dede1 100644
--- a/examples/netloop/lo_main.c
+++ b/examples/netloop/lo_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/netloop/lo_main.c
+ * apps/examples/netloop/lo_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/netloop/netloop.h b/examples/netloop/netloop.h
index df106f6..e6788f0 100644
--- a/examples/netloop/netloop.h
+++ b/examples/netloop/netloop.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/netloop/netloop.h
+ * apps/examples/netloop/netloop.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nettest/nettest.h b/examples/nettest/nettest.h
index b69a1a0..03cc674 100644
--- a/examples/nettest/nettest.h
+++ b/examples/nettest/nettest.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nettest/nettest.h
+ * apps/examples/nettest/nettest.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nettest/nettest_client.c b/examples/nettest/nettest_client.c
index f125fdf..c63877f 100644
--- a/examples/nettest/nettest_client.c
+++ b/examples/nettest/nettest_client.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nettest/nettest_client.c
+ * apps/examples/nettest/nettest_client.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nettest/nettest_cmdline.c b/examples/nettest/nettest_cmdline.c
index 7cf47f1..76736d7 100644
--- a/examples/nettest/nettest_cmdline.c
+++ b/examples/nettest/nettest_cmdline.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nettest/netest_cmdline.c
+ * apps/examples/nettest/netest_cmdline.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nettest/nettest_host.c b/examples/nettest/nettest_host.c
index f0c5d84..6e6ce25 100644
--- a/examples/nettest/nettest_host.c
+++ b/examples/nettest/nettest_host.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nettest/nettest_host.c
+ * apps/examples/nettest/nettest_host.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nettest/nettest_netinit.c b/examples/nettest/nettest_netinit.c
index c9aa07e..481a773 100644
--- a/examples/nettest/nettest_netinit.c
+++ b/examples/nettest/nettest_netinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nettest/nettest_netinit.c
+ * apps/examples/nettest/nettest_netinit.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nettest/nettest_server.c b/examples/nettest/nettest_server.c
index 782acd3..aa2dd1b 100644
--- a/examples/nettest/nettest_server.c
+++ b/examples/nettest/nettest_server.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nettest/nettest-server.c
+ * apps/examples/nettest/nettest-server.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nettest/nettest_target1.c b/examples/nettest/nettest_target1.c
index d969d72..9a14f3f 100644
--- a/examples/nettest/nettest_target1.c
+++ b/examples/nettest/nettest_target1.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nettest/nettest_target1.c
+ * apps/examples/nettest/nettest_target1.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nettest/nettest_target2.c b/examples/nettest/nettest_target2.c
index 5865c9c..43e4e08 100644
--- a/examples/nettest/nettest_target2.c
+++ b/examples/nettest/nettest_target2.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nettest/nettest_target2.c
+ * apps/examples/nettest/nettest_target2.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nrf24l01_btle/nrf24l01_btle.c b/examples/nrf24l01_btle/nrf24l01_btle.c
index 9916265..bc976e4 100644
--- a/examples/nrf24l01_btle/nrf24l01_btle.c
+++ b/examples/nrf24l01_btle/nrf24l01_btle.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nrf24l01_btle/nrf24l01_btle.c
+ * apps/examples/nrf24l01_btle/nrf24l01_btle.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nrf24l01_btle/nrf24l01_btle.h b/examples/nrf24l01_btle/nrf24l01_btle.h
index f1d75c2..888cf91 100644
--- a/examples/nrf24l01_btle/nrf24l01_btle.h
+++ b/examples/nrf24l01_btle/nrf24l01_btle.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nrf24l01_btle/nrf24l01_btle.h
+ * apps/examples/nrf24l01_btle/nrf24l01_btle.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nrf24l01_term/nrf24l01_term.c b/examples/nrf24l01_term/nrf24l01_term.c
index c739f10..80cec95 100644
--- a/examples/nrf24l01_term/nrf24l01_term.c
+++ b/examples/nrf24l01_term/nrf24l01_term.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nrf24l01_term/nrf24l01_term.c
+ * apps/examples/nrf24l01_term/nrf24l01_term.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/null/null_main.c b/examples/null/null_main.c
index 35964c2..43702b2 100644
--- a/examples/null/null_main.c
+++ b/examples/null/null_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/null/null_main.c
+ * apps/examples/null/null_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nx/nx_events.c b/examples/nx/nx_events.c
index f4968bd..7aaf127 100644
--- a/examples/nx/nx_events.c
+++ b/examples/nx/nx_events.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nx/nx_events.c
+ * apps/examples/nx/nx_events.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nx/nx_internal.h b/examples/nx/nx_internal.h
index 7cde3a2..beb806f 100644
--- a/examples/nx/nx_internal.h
+++ b/examples/nx/nx_internal.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nx/nx_internal.h
+ * apps/examples/nx/nx_internal.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nx/nx_kbdin.c b/examples/nx/nx_kbdin.c
index 879fb7b..137207f 100644
--- a/examples/nx/nx_kbdin.c
+++ b/examples/nx/nx_kbdin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nx/nx_kbdin.c
+ * apps/examples/nx/nx_kbdin.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nx/nx_main.c b/examples/nx/nx_main.c
index a7ef2e9..674d914 100644
--- a/examples/nx/nx_main.c
+++ b/examples/nx/nx_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nx/nx_main.c
+ * apps/examples/nx/nx_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxdemo/images.h b/examples/nxdemo/images.h
index e16302f..969e00b 100644
--- a/examples/nxdemo/images.h
+++ b/examples/nxdemo/images.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxdemo/nxdemo.h
+ * apps/examples/nxdemo/nxdemo.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Cherciu Mihail <m_...@yahoo.com>
diff --git a/examples/nxdemo/nxdemo.h b/examples/nxdemo/nxdemo.h
index a3de3db..60781a8 100644
--- a/examples/nxdemo/nxdemo.h
+++ b/examples/nxdemo/nxdemo.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxdemo/nxdemo.h
+ * apps/examples/nxdemo/nxdemo.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxdemo/nxdemo_bkgd.c b/examples/nxdemo/nxdemo_bkgd.c
index 6d357d9..5ae599c 100644
--- a/examples/nxdemo/nxdemo_bkgd.c
+++ b/examples/nxdemo/nxdemo_bkgd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxdemo/nxdemo_bkgd.c
+ * apps/examples/nxdemo/nxdemo_bkgd.c
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gn...@nuttx.org>
diff --git a/examples/nxdemo/nxdemo_listener.c b/examples/nxdemo/nxdemo_listener.c
index 77b17fa..a5042a0 100644
--- a/examples/nxdemo/nxdemo_listener.c
+++ b/examples/nxdemo/nxdemo_listener.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxterm/nxdemo_listener.c
+ * apps/examples/nxterm/nxdemo_listener.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxdemo/nxdemo_main.c b/examples/nxdemo/nxdemo_main.c
index fdf0f7d..918b564 100644
--- a/examples/nxdemo/nxdemo_main.c
+++ b/examples/nxdemo/nxdemo_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxdemo/nxdemo_main.c
+ * apps/examples/nxdemo/nxdemo_main.c
  *
  *   Copyright (C) 2018-2019 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gn...@nuttx.org>
diff --git a/examples/nxflat/tests/errno/errno.c b/examples/nxflat/tests/errno/errno.c
index b809634..bb5acd3 100644
--- a/examples/nxflat/tests/errno/errno.c
+++ b/examples/nxflat/tests/errno/errno.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxflat/tests/errno/errno.c
+ * apps/examples/nxflat/tests/errno/errno.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/hello/hello.c b/examples/nxflat/tests/hello/hello.c
index 48ef63f..f55565b 100644
--- a/examples/nxflat/tests/hello/hello.c
+++ b/examples/nxflat/tests/hello/hello.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxflat/tests/hello/hello.c
+ * apps/examples/nxflat/tests/hello/hello.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/longjmp/longjmp.c b/examples/nxflat/tests/longjmp/longjmp.c
index b82024f..c27518f 100644
--- a/examples/nxflat/tests/longjmp/longjmp.c
+++ b/examples/nxflat/tests/longjmp/longjmp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxflat/tests/longjmp/longjmp.c
+ * apps/examples/nxflat/tests/longjmp/longjmp.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/mutex/mutex.c b/examples/nxflat/tests/mutex/mutex.c
index b1a6c91..9ca14fc 100644
--- a/examples/nxflat/tests/mutex/mutex.c
+++ b/examples/nxflat/tests/mutex/mutex.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxflat/tests/mutex/mutex.c
+ * apps/examples/nxflat/tests/mutex/mutex.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/pthread/pthread.c b/examples/nxflat/tests/pthread/pthread.c
index 3c15ff1..200de0a 100644
--- a/examples/nxflat/tests/pthread/pthread.c
+++ b/examples/nxflat/tests/pthread/pthread.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxflat/tests/pthread/pthread.c
+ * apps/examples/nxflat/tests/pthread/pthread.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/signal/signal.c b/examples/nxflat/tests/signal/signal.c
index 9f266d0..7cf4732 100644
--- a/examples/nxflat/tests/signal/signal.c
+++ b/examples/nxflat/tests/signal/signal.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxflat/tests/signal/signal.c
+ * apps/examples/nxflat/tests/signal/signal.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/struct/struct.h b/examples/nxflat/tests/struct/struct.h
index 1048ecc..9fcf53e 100644
--- a/examples/nxflat/tests/struct/struct.h
+++ b/examples/nxflat/tests/struct/struct.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxflat/tests/struct/struct.h
+ * apps/examples/nxflat/tests/struct/struct.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/struct/struct_dummy.c b/examples/nxflat/tests/struct/struct_dummy.c
index 64bedbf..c1444a4 100644
--- a/examples/nxflat/tests/struct/struct_dummy.c
+++ b/examples/nxflat/tests/struct/struct_dummy.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxflat/tests/struct/struct_dummy.c
+ * apps/examples/nxflat/tests/struct/struct_dummy.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/struct/struct_main.c b/examples/nxflat/tests/struct/struct_main.c
index 7f8f052..f8abc2a 100644
--- a/examples/nxflat/tests/struct/struct_main.c
+++ b/examples/nxflat/tests/struct/struct_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxflat/tests/struct/struct_main.c
+ * apps/examples/nxflat/tests/struct/struct_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/task/task.c b/examples/nxflat/tests/task/task.c
index 9881c2b..f543dc1 100644
--- a/examples/nxflat/tests/task/task.c
+++ b/examples/nxflat/tests/task/task.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxflat/tests/task/parent.c
+ * apps/examples/nxflat/tests/task/parent.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxhello/nxhello.h b/examples/nxhello/nxhello.h
index 7096612..44c461c 100644
--- a/examples/nxhello/nxhello.h
+++ b/examples/nxhello/nxhello.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxhello/nxhello.h
+ * apps/examples/nxhello/nxhello.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxhello/nxhello_bkgd.c b/examples/nxhello/nxhello_bkgd.c
index 78a9413..1a18925 100644
--- a/examples/nxhello/nxhello_bkgd.c
+++ b/examples/nxhello/nxhello_bkgd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxhello/nxhello_bkgd.c
+ * apps/examples/nxhello/nxhello_bkgd.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxhello/nxhello_listener.c b/examples/nxhello/nxhello_listener.c
index 8b2e54d..06273af 100644
--- a/examples/nxhello/nxhello_listener.c
+++ b/examples/nxhello/nxhello_listener.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxterm/nxhello_listener.c
+ * apps/examples/nxterm/nxhello_listener.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxhello/nxhello_main.c b/examples/nxhello/nxhello_main.c
index 0370951..097134e 100644
--- a/examples/nxhello/nxhello_main.c
+++ b/examples/nxhello/nxhello_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxhello/nxhello_main.c
+ * apps/examples/nxhello/nxhello_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nximage/nximage.h b/examples/nximage/nximage.h
index 276735d..14c1ca0 100644
--- a/examples/nximage/nximage.h
+++ b/examples/nximage/nximage.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nximage/nximage.h
+ * apps/examples/nximage/nximage.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nximage/nximage_bitmap.c b/examples/nximage/nximage_bitmap.c
index 55a0243..34d0bce 100644
--- a/examples/nximage/nximage_bitmap.c
+++ b/examples/nximage/nximage_bitmap.c
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * examples/nximage/nximage_bitmap.c
+ * apps/examples/nximage/nximage_bitmap.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nximage/nximage_bkgd.c b/examples/nximage/nximage_bkgd.c
index e951db1..f63ef14 100644
--- a/examples/nximage/nximage_bkgd.c
+++ b/examples/nximage/nximage_bkgd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nximage/nximage_bkgd.c
+ * apps/examples/nximage/nximage_bkgd.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nximage/nximage_listener.c b/examples/nximage/nximage_listener.c
index 5c882a4..84d4e47 100644
--- a/examples/nximage/nximage_listener.c
+++ b/examples/nximage/nximage_listener.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxterm/nximage_listener.c
+ * apps/examples/nxterm/nximage_listener.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nximage/nximage_main.c b/examples/nximage/nximage_main.c
index 169d2a7..96a85b6 100644
--- a/examples/nximage/nximage_main.c
+++ b/examples/nximage/nximage_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nximage/nximage_main.c
+ * apps/examples/nximage/nximage_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxlines/nxlines.h b/examples/nxlines/nxlines.h
index 142f046..de92549 100644
--- a/examples/nxlines/nxlines.h
+++ b/examples/nxlines/nxlines.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxlines/nxlines.h
+ * apps/examples/nxlines/nxlines.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxlines/nxlines_bkgd.c b/examples/nxlines/nxlines_bkgd.c
index c85804c..21a0245 100644
--- a/examples/nxlines/nxlines_bkgd.c
+++ b/examples/nxlines/nxlines_bkgd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxlines/nxlines_bkgd.c
+ * apps/examples/nxlines/nxlines_bkgd.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxlines/nxlines_listener.c b/examples/nxlines/nxlines_listener.c
index 477cb5f..8bb4d9d 100644
--- a/examples/nxlines/nxlines_listener.c
+++ b/examples/nxlines/nxlines_listener.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxterm/nxlines_listener.c
+ * apps/examples/nxterm/nxlines_listener.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxlines/nxlines_main.c b/examples/nxlines/nxlines_main.c
index 3e6cba0..8b6753b 100644
--- a/examples/nxlines/nxlines_main.c
+++ b/examples/nxlines/nxlines_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxlines/nxlines_main.c
+ * apps/examples/nxlines/nxlines_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxterm/nxterm_internal.h b/examples/nxterm/nxterm_internal.h
index 11c0273..9637e7e 100644
--- a/examples/nxterm/nxterm_internal.h
+++ b/examples/nxterm/nxterm_internal.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxterm/nxterm_internal.h
+ * apps/examples/nxterm/nxterm_internal.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxterm/nxterm_listener.c b/examples/nxterm/nxterm_listener.c
index d42748b..de20445 100644
--- a/examples/nxterm/nxterm_listener.c
+++ b/examples/nxterm/nxterm_listener.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxterm/nxterm_listener.c
+ * apps/examples/nxterm/nxterm_listener.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxterm/nxterm_main.c b/examples/nxterm/nxterm_main.c
index 3b3ac72..57c1957 100644
--- a/examples/nxterm/nxterm_main.c
+++ b/examples/nxterm/nxterm_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxterm/nxterm_main.c
+ * apps/examples/nxterm/nxterm_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxterm/nxterm_toolbar.c b/examples/nxterm/nxterm_toolbar.c
index 6712341..63076ac 100644
--- a/examples/nxterm/nxterm_toolbar.c
+++ b/examples/nxterm/nxterm_toolbar.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxterm/nxterm_toolbar.c
+ * apps/examples/nxterm/nxterm_toolbar.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxterm/nxterm_wndo.c b/examples/nxterm/nxterm_wndo.c
index ca50407..227f4db 100644
--- a/examples/nxterm/nxterm_wndo.c
+++ b/examples/nxterm/nxterm_wndo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxterm/nxterm_wndo.c
+ * apps/examples/nxterm/nxterm_wndo.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxtext/nxtext_bkgd.c b/examples/nxtext/nxtext_bkgd.c
index ca64064..98c761b 100644
--- a/examples/nxtext/nxtext_bkgd.c
+++ b/examples/nxtext/nxtext_bkgd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxtext/nxtext_bkgd.c
+ * apps/examples/nxtext/nxtext_bkgd.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxtext/nxtext_internal.h b/examples/nxtext/nxtext_internal.h
index 2a984c6..0d0b07f 100644
--- a/examples/nxtext/nxtext_internal.h
+++ b/examples/nxtext/nxtext_internal.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxtext/nxtext_internal.h
+ * apps/examples/nxtext/nxtext_internal.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxtext/nxtext_listener.c b/examples/nxtext/nxtext_listener.c
index d304aff..7189d68 100644
--- a/examples/nxtext/nxtext_listener.c
+++ b/examples/nxtext/nxtext_listener.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxtext/nxtext_listener.c
+ * apps/examples/nxtext/nxtext_listener.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxtext/nxtext_main.c b/examples/nxtext/nxtext_main.c
index 4990f2c..3814c8d 100644
--- a/examples/nxtext/nxtext_main.c
+++ b/examples/nxtext/nxtext_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxtext/nxtext_main.c
+ * apps/examples/nxtext/nxtext_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxtext/nxtext_popup.c b/examples/nxtext/nxtext_popup.c
index 8cf6889..8e56aeb 100644
--- a/examples/nxtext/nxtext_popup.c
+++ b/examples/nxtext/nxtext_popup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxtext/nxtext_popup.c
+ * apps/examples/nxtext/nxtext_popup.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/nxtext/nxtext_putc.c b/examples/nxtext/nxtext_putc.c
index 0ce4bbd..b272727 100644
--- a/examples/nxtext/nxtext_putc.c
+++ b/examples/nxtext/nxtext_putc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nxtext/nxtext_putc.c
+ * apps/examples/nxtext/nxtext_putc.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/obd2/obd2_main.c b/examples/obd2/obd2_main.c
index d82dcda..eeadebe 100644
--- a/examples/obd2/obd2_main.c
+++ b/examples/obd2/obd2_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/obd2/obd2_main.c
+ * apps/examples/obd2/obd2_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pca9635/pca9635_main.c b/examples/pca9635/pca9635_main.c
index a38f518..956629c 100644
--- a/examples/pca9635/pca9635_main.c
+++ b/examples/pca9635/pca9635_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pca9635/pca9635_main.c
+ * apps/examples/pca9635/pca9635_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pf_ieee802154/pf_client.c b/examples/pf_ieee802154/pf_client.c
index 06cb583..b8cbbae 100644
--- a/examples/pf_ieee802154/pf_client.c
+++ b/examples/pf_ieee802154/pf_client.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pf_ieee802154/pf_client.c
+ * apps/examples/pf_ieee802154/pf_client.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pf_ieee802154/pf_cmdline.c b/examples/pf_ieee802154/pf_cmdline.c
index 399b2f9..1fa6949 100644
--- a/examples/pf_ieee802154/pf_cmdline.c
+++ b/examples/pf_ieee802154/pf_cmdline.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pf_ieee802154/pf_cmdline.c
+ * apps/examples/pf_ieee802154/pf_cmdline.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pf_ieee802154/pf_server.c b/examples/pf_ieee802154/pf_server.c
index ea6c0eb..5996012 100644
--- a/examples/pf_ieee802154/pf_server.c
+++ b/examples/pf_ieee802154/pf_server.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pf_ieee802154/pf_server.c
+ * apps/examples/pf_ieee802154/pf_server.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pf_ieee802154/pfieee802154.h b/examples/pf_ieee802154/pfieee802154.h
index c0a9b17..3668d09 100644
--- a/examples/pf_ieee802154/pfieee802154.h
+++ b/examples/pf_ieee802154/pfieee802154.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pf_ieee802154/pfieee802154.h
+ * apps/examples/pf_ieee802154/pfieee802154.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pipe/interlock_test.c b/examples/pipe/interlock_test.c
index b580e28..8876748 100644
--- a/examples/pipe/interlock_test.c
+++ b/examples/pipe/interlock_test.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pipe/interlock_test.c
+ * apps/examples/pipe/interlock_test.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pipe/pipe.h b/examples/pipe/pipe.h
index dcc0645..59e38c5 100644
--- a/examples/pipe/pipe.h
+++ b/examples/pipe/pipe.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pipe/pipe.h
+ * apps/examples/pipe/pipe.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pipe/pipe_main.c b/examples/pipe/pipe_main.c
index 9764107..224fe03 100644
--- a/examples/pipe/pipe_main.c
+++ b/examples/pipe/pipe_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pipe/pipe_main.c
+ * apps/examples/pipe/pipe_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pipe/redirect_test.c b/examples/pipe/redirect_test.c
index c25950d..5e1dbb2 100644
--- a/examples/pipe/redirect_test.c
+++ b/examples/pipe/redirect_test.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pipe/redirect_test.c
+ * apps/examples/pipe/redirect_test.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pipe/transfer_test.c b/examples/pipe/transfer_test.c
index ffdcc5e..c7162ad 100644
--- a/examples/pipe/transfer_test.c
+++ b/examples/pipe/transfer_test.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pipe/transfer_test.c
+ * apps/examples/pipe/transfer_test.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/poll/host.c b/examples/poll/host.c
index 506f45e..cd6edad 100644
--- a/examples/poll/host.c
+++ b/examples/poll/host.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/poll/host.c
+ * apps/examples/poll/host.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/poll/net_listener.c b/examples/poll/net_listener.c
index a7d261d..3333f69 100644
--- a/examples/poll/net_listener.c
+++ b/examples/poll/net_listener.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/poll/net_listener.c
+ * apps/examples/poll/net_listener.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/poll/net_reader.c b/examples/poll/net_reader.c
index b85e831..34c69da 100644
--- a/examples/poll/net_reader.c
+++ b/examples/poll/net_reader.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/poll/net_reader.c
+ * apps/examples/poll/net_reader.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/poll/poll_internal.h b/examples/poll/poll_internal.h
index 1966203..59bfc8c 100644
--- a/examples/poll/poll_internal.h
+++ b/examples/poll/poll_internal.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/poll/poll_internal.h
+ * apps/examples/poll/poll_internal.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/poll/poll_listener.c b/examples/poll/poll_listener.c
index 3fe45ac..6446bf4 100644
--- a/examples/poll/poll_listener.c
+++ b/examples/poll/poll_listener.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/poll/poll_listener.c
+ * apps/examples/poll/poll_listener.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/poll/poll_main.c b/examples/poll/poll_main.c
index 94314e5..5e801b8 100644
--- a/examples/poll/poll_main.c
+++ b/examples/poll/poll_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/poll/poll_main.c
+ * apps/examples/poll/poll_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/poll/select_listener.c b/examples/poll/select_listener.c
index bb6f899..932bb4a 100644
--- a/examples/poll/select_listener.c
+++ b/examples/poll/select_listener.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/poll/select_listener.c
+ * apps/examples/poll/select_listener.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/popen/popen_main.c b/examples/popen/popen_main.c
index 630e22d..1a6f351 100644
--- a/examples/popen/popen_main.c
+++ b/examples/popen/popen_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/popen/popen_main.c
+ * apps/examples/popen/popen_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/posix_spawn/filesystem/hello/hello.c b/examples/posix_spawn/filesystem/hello/hello.c
index 44cabd4..5269d03 100644
--- a/examples/posix_spawn/filesystem/hello/hello.c
+++ b/examples/posix_spawn/filesystem/hello/hello.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/posix_spawn/filesystem/hello/hello.c
+ * apps/examples/posix_spawn/filesystem/hello/hello.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/posix_spawn/filesystem/redirect/redirect.c b/examples/posix_spawn/filesystem/redirect/redirect.c
index 2f5faf6..fd34d18 100644
--- a/examples/posix_spawn/filesystem/redirect/redirect.c
+++ b/examples/posix_spawn/filesystem/redirect/redirect.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/posix_spawn/filesystem/redirect/redirect.c
+ * apps/examples/posix_spawn/filesystem/redirect/redirect.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/powerled/powerled_main.c b/examples/powerled/powerled_main.c
index bb166af..f559355 100644
--- a/examples/powerled/powerled_main.c
+++ b/examples/powerled/powerled_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/adc/powerled_main.c
+ * apps/examples/adc/powerled_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/powermonitor/powermonitor_main.c b/examples/powermonitor/powermonitor_main.c
index eb91031..022c3f9 100644
--- a/examples/powermonitor/powermonitor_main.c
+++ b/examples/powermonitor/powermonitor_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/powermonitor/powermonitor_main.c
+ * apps/examples/powermonitor/powermonitor_main.c
  *
  *   Copyright (C) 2017 Giorgi Groß. All rights reserved.
  *   Author: Giorgio Groß <gi...@robodev.eu>
diff --git a/examples/pppd/pppd_main.c b/examples/pppd/pppd_main.c
index b91b9fd..ce80ae9 100644
--- a/examples/pppd/pppd_main.c
+++ b/examples/pppd/pppd_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pppd/pppd_main.c
+ * apps/examples/pppd/pppd_main.c
  *
  *   Copyright (C) 2015 Brennan Ashton. All rights reserved.
  *   Author: Brennan Ashton <br...@ombitron.com>
diff --git a/examples/pty_test/pty_test.c b/examples/pty_test/pty_test.c
index 454c119..f301645 100644
--- a/examples/pty_test/pty_test.c
+++ b/examples/pty_test/pty_test.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pty_test/pty_test.c
+ * apps/examples/pty_test/pty_test.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pwfb/pwfb_events.c b/examples/pwfb/pwfb_events.c
index d12e045..0dcdfba 100644
--- a/examples/pwfb/pwfb_events.c
+++ b/examples/pwfb/pwfb_events.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pwfb/pwfb_events.c
+ * apps/examples/pwfb/pwfb_events.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pwfb/pwfb_internal.h b/examples/pwfb/pwfb_internal.h
index 26d6a4c..43b5a80 100644
--- a/examples/pwfb/pwfb_internal.h
+++ b/examples/pwfb/pwfb_internal.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pwfb/pwfb_internal.h
+ * apps/examples/pwfb/pwfb_internal.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pwfb/pwfb_main.c b/examples/pwfb/pwfb_main.c
index b6a2dd6..0d05e1a 100644
--- a/examples/pwfb/pwfb_main.c
+++ b/examples/pwfb/pwfb_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pwfb/pwfb_main.c
+ * apps/examples/pwfb/pwfb_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pwfb/pwfb_motion.c b/examples/pwfb/pwfb_motion.c
index e7073a8..b2578ab 100644
--- a/examples/pwfb/pwfb_motion.c
+++ b/examples/pwfb/pwfb_motion.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pwfb/pwfb_motion.c
+ * apps/examples/pwfb/pwfb_motion.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pwlines/pwlines_events.c b/examples/pwlines/pwlines_events.c
index e46d386..2441ae0 100644
--- a/examples/pwlines/pwlines_events.c
+++ b/examples/pwlines/pwlines_events.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pwlines/pwlines_events.c
+ * apps/examples/pwlines/pwlines_events.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pwlines/pwlines_internal.h b/examples/pwlines/pwlines_internal.h
index 058d5f9..023331e 100644
--- a/examples/pwlines/pwlines_internal.h
+++ b/examples/pwlines/pwlines_internal.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pwlines/pwlines_internal.h
+ * apps/examples/pwlines/pwlines_internal.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pwlines/pwlines_main.c b/examples/pwlines/pwlines_main.c
index 535e020..894fd5a 100644
--- a/examples/pwlines/pwlines_main.c
+++ b/examples/pwlines/pwlines_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pwlines/pwlines_main.c
+ * apps/examples/pwlines/pwlines_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pwlines/pwlines_motion.c b/examples/pwlines/pwlines_motion.c
index 576953e..cf33a63 100644
--- a/examples/pwlines/pwlines_motion.c
+++ b/examples/pwlines/pwlines_motion.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pwlines/pwlines_motion.c
+ * apps/examples/pwlines/pwlines_motion.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pwlines/pwlines_update.c b/examples/pwlines/pwlines_update.c
index e79007f..527a963 100644
--- a/examples/pwlines/pwlines_update.c
+++ b/examples/pwlines/pwlines_update.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/pwlines/pwlines_update.c
+ * apps/examples/pwlines/pwlines_update.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/pwm/pwm.h b/examples/pwm/pwm.h
index 19d61e6..93cc1f3 100644
--- a/examples/pwm/pwm.h
+++ b/examples/pwm/pwm.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/examples/pwm/pwm.h
+ * apps/examples/examples/pwm/pwm.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/qencoder/qe.h b/examples/qencoder/qe.h
index fdb96c3..2c001ba 100644
--- a/examples/qencoder/qe.h
+++ b/examples/qencoder/qe.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/examples/qe/qe.h
+ * apps/examples/examples/qe/qe.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/random/random_main.c b/examples/random/random_main.c
index 2f81c28..d75cb6f 100644
--- a/examples/random/random_main.c
+++ b/examples/random/random_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/random/random_main.c
+ * apps/examples/random/random_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/relays/relays_main.c b/examples/relays/relays_main.c
index aa409da..12164a8 100644
--- a/examples/relays/relays_main.c
+++ b/examples/relays/relays_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/relays/relays_main.c
+ * apps/examples/relays/relays_main.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Darcy Gong
diff --git a/examples/rfid_readuid/rfid_readuid.c b/examples/rfid_readuid/rfid_readuid.c
index baa28c7..2f8049c 100644
--- a/examples/rfid_readuid/rfid_readuid.c
+++ b/examples/rfid_readuid/rfid_readuid.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/rfid_readuid/rfid_readuid.c
+ * apps/examples/rfid_readuid/rfid_readuid.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/rgbled/rgbled.c b/examples/rgbled/rgbled.c
index cfd524e..c1d5ab5 100644
--- a/examples/rgbled/rgbled.c
+++ b/examples/rgbled/rgbled.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/rgbled/rgbled.c
+ * apps/examples/rgbled/rgbled.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/sendmail/sendmail_main.c b/examples/sendmail/sendmail_main.c
index 220d9b3..6c68c64 100644
--- a/examples/sendmail/sendmail_main.c
+++ b/examples/sendmail/sendmail_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/sendmail/sendmail_maini.c
+ * apps/examples/sendmail/sendmail_maini.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/serialblaster/serialblaster_main.c b/examples/serialblaster/serialblaster_main.c
index d89b5cf..499e732 100644
--- a/examples/serialblaster/serialblaster_main.c
+++ b/examples/serialblaster/serialblaster_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/serialblaster/serialblaster_main.c
+ * apps/examples/serialblaster/serialblaster_main.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gn...@nuttx.org>
diff --git a/examples/serialrx/serialrx_main.c b/examples/serialrx/serialrx_main.c
index 018053f..71a3b64 100644
--- a/examples/serialrx/serialrx_main.c
+++ b/examples/serialrx/serialrx_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/serialrx/serialrx_main.c
+ * apps/examples/serialrx/serialrx_main.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Copyright (C) 2015 Omni Hoverboards Inc. All rights reserved.
diff --git a/examples/serloop/serloop_main.c b/examples/serloop/serloop_main.c
index 3a5c841..a1e916e 100644
--- a/examples/serloop/serloop_main.c
+++ b/examples/serloop/serloop_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/serloop/serloop_main.c
+ * apps/examples/serloop/serloop_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/slcd/slcd_main.c b/examples/slcd/slcd_main.c
index fbae5f9..34b1dd6 100644
--- a/examples/slcd/slcd_main.c
+++ b/examples/slcd/slcd_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/clcd/slcd_main.c
+ * apps/examples/clcd/slcd_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/smps/smps_main.c b/examples/smps/smps_main.c
index 920957c..3150077 100644
--- a/examples/smps/smps_main.c
+++ b/examples/smps/smps_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/smps/smps_main.c
+ * apps/examples/smps/smps_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/stat/stat_main.c b/examples/stat/stat_main.c
index 8386357..e3b962d 100644
--- a/examples/stat/stat_main.c
+++ b/examples/stat/stat_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/stat/stat_main.c
+ * apps/examples/stat/stat_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/sx127x_demo/sx127x_demo.c b/examples/sx127x_demo/sx127x_demo.c
index 874d859..50b4ee7 100644
--- a/examples/sx127x_demo/sx127x_demo.c
+++ b/examples/sx127x_demo/sx127x_demo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/sx127x_demo/sx127x_demo.c
+ * apps/examples/sx127x_demo/sx127x_demo.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/system/system_main.c b/examples/system/system_main.c
index 550c57a..7b48e5b 100644
--- a/examples/system/system_main.c
+++ b/examples/system/system_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/system/system_main.c
+ * apps/examples/system/system_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/tcpblaster/tcpblaster.h b/examples/tcpblaster/tcpblaster.h
index d5cc14f..c59aed8 100644
--- a/examples/tcpblaster/tcpblaster.h
+++ b/examples/tcpblaster/tcpblaster.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/tcpblaster/tcpblaster.h
+ * apps/examples/tcpblaster/tcpblaster.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/tcpblaster/tcpblaster_client.c b/examples/tcpblaster/tcpblaster_client.c
index e071043..23d14f1 100644
--- a/examples/tcpblaster/tcpblaster_client.c
+++ b/examples/tcpblaster/tcpblaster_client.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/tcpblaster/tcpblaster_client.c
+ * apps/examples/tcpblaster/tcpblaster_client.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/tcpblaster/tcpblaster_cmdline.c b/examples/tcpblaster/tcpblaster_cmdline.c
index 1749b27..d473959 100644
--- a/examples/tcpblaster/tcpblaster_cmdline.c
+++ b/examples/tcpblaster/tcpblaster_cmdline.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/tcpblaster/tcpblaster_cmdline.c
+ * apps/examples/tcpblaster/tcpblaster_cmdline.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/tcpblaster/tcpblaster_host.c b/examples/tcpblaster/tcpblaster_host.c
index f56dc3f..78868c2 100644
--- a/examples/tcpblaster/tcpblaster_host.c
+++ b/examples/tcpblaster/tcpblaster_host.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/tcpblaster/tcpblaster_host.c
+ * apps/examples/tcpblaster/tcpblaster_host.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/tcpblaster/tcpblaster_netinit.c b/examples/tcpblaster/tcpblaster_netinit.c
index f26a179..03fec09 100644
--- a/examples/tcpblaster/tcpblaster_netinit.c
+++ b/examples/tcpblaster/tcpblaster_netinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/tcpblaster/tcpblaster_netinit.c
+ * apps/examples/tcpblaster/tcpblaster_netinit.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/tcpblaster/tcpblaster_server.c b/examples/tcpblaster/tcpblaster_server.c
index 8444a06..ce12f7d 100644
--- a/examples/tcpblaster/tcpblaster_server.c
+++ b/examples/tcpblaster/tcpblaster_server.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/tcpblaster/tcpblaster-server.c
+ * apps/examples/tcpblaster/tcpblaster-server.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/tcpblaster/tcpblaster_target1.c b/examples/tcpblaster/tcpblaster_target1.c
index 2e46f91..fcfdae1 100644
--- a/examples/tcpblaster/tcpblaster_target1.c
+++ b/examples/tcpblaster/tcpblaster_target1.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/tcpblaster/tcpblaster_target1.c
+ * apps/examples/tcpblaster/tcpblaster_target1.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/tcpblaster/tcpblaster_target2.c b/examples/tcpblaster/tcpblaster_target2.c
index ec45e9b..bd32f92 100644
--- a/examples/tcpblaster/tcpblaster_target2.c
+++ b/examples/tcpblaster/tcpblaster_target2.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/tcpblaster/tcpblaster_target2.c
+ * apps/examples/tcpblaster/tcpblaster_target2.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/tcpecho/tcpecho_main.c b/examples/tcpecho/tcpecho_main.c
index 61a5f2e..c6a4ae1 100644
--- a/examples/tcpecho/tcpecho_main.c
+++ b/examples/tcpecho/tcpecho_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/tcpecho/tcpecho_main.c
+ * apps/examples/tcpecho/tcpecho_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/telnetd/telnetd.c b/examples/telnetd/telnetd.c
index 3e9f179..9bbc006 100644
--- a/examples/telnetd/telnetd.c
+++ b/examples/telnetd/telnetd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/telnetd/telnetd.c
+ * apps/examples/telnetd/telnetd.c
  *
  *   Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gn...@nuttx.org>
diff --git a/examples/thttpd/content/hello/hello.c b/examples/thttpd/content/hello/hello.c
index 1d782a1..7c6b4b8 100644
--- a/examples/thttpd/content/hello/hello.c
+++ b/examples/thttpd/content/hello/hello.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/thttpd/content/hello/hello.c
+ * apps/examples/thttpd/content/hello/hello.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/thttpd/content/tasks/tasks.c b/examples/thttpd/content/tasks/tasks.c
index a353a20..0b08285 100644
--- a/examples/thttpd/content/tasks/tasks.c
+++ b/examples/thttpd/content/tasks/tasks.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/thttpd/tasks/tasks.c
+ * apps/examples/thttpd/tasks/tasks.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/timer/timer_main.c b/examples/timer/timer_main.c
index 6a690a8..13bc2b3 100644
--- a/examples/timer/timer_main.c
+++ b/examples/timer/timer_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/timer/timer_main.c
+ * apps/examples/timer/timer_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/touchscreen/tc.h b/examples/touchscreen/tc.h
index e25fae8..d525eee 100644
--- a/examples/touchscreen/tc.h
+++ b/examples/touchscreen/tc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/touchscreen/tc.h
+ * apps/examples/touchscreen/tc.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/udgram/udgram.h b/examples/udgram/udgram.h
index f11c605..396a897 100644
--- a/examples/udgram/udgram.h
+++ b/examples/udgram/udgram.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udgram/udgram.h
+ * apps/examples/udgram/udgram.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/udgram/udgram_client.c b/examples/udgram/udgram_client.c
index 4a7e28f..dc7577e 100644
--- a/examples/udgram/udgram_client.c
+++ b/examples/udgram/udgram_client.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udgram/udgram_client.c
+ * apps/examples/udgram/udgram_client.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/udgram/udgram_server.c b/examples/udgram/udgram_server.c
index 2bc2c42..3786600 100644
--- a/examples/udgram/udgram_server.c
+++ b/examples/udgram/udgram_server.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udgram/udgram_server.c
+ * apps/examples/udgram/udgram_server.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/udp/udp.h b/examples/udp/udp.h
index 2949e8d..d80dff1 100644
--- a/examples/udp/udp.h
+++ b/examples/udp/udp.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udp/udp.h
+ * apps/examples/udp/udp.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/udp/udp_client.c b/examples/udp/udp_client.c
index f0e2512..220637b 100644
--- a/examples/udp/udp_client.c
+++ b/examples/udp/udp_client.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udp/udp_client.c
+ * apps/examples/udp/udp_client.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/udp/udp_cmdline.c b/examples/udp/udp_cmdline.c
index f0a3f99..64cb714 100644
--- a/examples/udp/udp_cmdline.c
+++ b/examples/udp/udp_cmdline.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udp/udp_cmdline.c
+ * apps/examples/udp/udp_cmdline.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/udp/udp_host.c b/examples/udp/udp_host.c
index ed2313a..f0bf0a9 100644
--- a/examples/udp/udp_host.c
+++ b/examples/udp/udp_host.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udp/udp_host.c
+ * apps/examples/udp/udp_host.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/udp/udp_netinit.c b/examples/udp/udp_netinit.c
index f34bb6a..e937b0c 100644
--- a/examples/udp/udp_netinit.c
+++ b/examples/udp/udp_netinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udp/udp_netinit.c
+ * apps/examples/udp/udp_netinit.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/udp/udp_server.c b/examples/udp/udp_server.c
index ff8ff6a..abde7ad 100644
--- a/examples/udp/udp_server.c
+++ b/examples/udp/udp_server.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udp/udp_server.c
+ * apps/examples/udp/udp_server.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/udp/udp_target1.c b/examples/udp/udp_target1.c
index fbd377c..3db14c0 100644
--- a/examples/udp/udp_target1.c
+++ b/examples/udp/udp_target1.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udp/udp_target1.c
+ * apps/examples/udp/udp_target1.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/udp/udp_target2.c b/examples/udp/udp_target2.c
index bfd465e..03104ff 100644
--- a/examples/udp/udp_target2.c
+++ b/examples/udp/udp_target2.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udp/udp_target2.c
+ * apps/examples/udp/udp_target2.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/udpblaster/udpblaster_host.c b/examples/udpblaster/udpblaster_host.c
index e7f283c..a39a506 100644
--- a/examples/udpblaster/udpblaster_host.c
+++ b/examples/udpblaster/udpblaster_host.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udpblaster/udpblaster_host.c
+ * apps/examples/udpblaster/udpblaster_host.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/udpblaster/udpblaster_target.c b/examples/udpblaster/udpblaster_target.c
index d10ea89..6611c81 100644
--- a/examples/udpblaster/udpblaster_target.c
+++ b/examples/udpblaster/udpblaster_target.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udpblaster/udpblaster_target.c
+ * apps/examples/udpblaster/udpblaster_target.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/udpblaster/udpblaster_text.c b/examples/udpblaster/udpblaster_text.c
index 586cb6c..0715f86 100644
--- a/examples/udpblaster/udpblaster_text.c
+++ b/examples/udpblaster/udpblaster_text.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udpblaster/udpblaster_text.c
+ * apps/examples/udpblaster/udpblaster_text.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/uid/uid_main.c b/examples/uid/uid_main.c
index 098c2da..f5f6e5f 100644
--- a/examples/uid/uid_main.c
+++ b/examples/uid/uid_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/uid/uid_main.c
+ * apps/examples/uid/uid_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/usbserial/host.c b/examples/usbserial/host.c
index 395de8a..2b158a3 100644
--- a/examples/usbserial/host.c
+++ b/examples/usbserial/host.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usbserial/host.c
+ * apps/examples/usbserial/host.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/usbserial/usbserial_main.c b/examples/usbserial/usbserial_main.c
index ddcc2bb..17c051a 100644
--- a/examples/usbserial/usbserial_main.c
+++ b/examples/usbserial/usbserial_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usbserial/usbserial_main.c
+ * apps/examples/usbserial/usbserial_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/userfs/userfs_main.c b/examples/userfs/userfs_main.c
index 1907352..9909fa1 100644
--- a/examples/userfs/userfs_main.c
+++ b/examples/userfs/userfs_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/userfs/userfs_main.c
+ * apps/examples/userfs/userfs_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/usrsocktest/defines.h b/examples/usrsocktest/defines.h
index 271e39b..cc40571 100644
--- a/examples/usrsocktest/defines.h
+++ b/examples/usrsocktest/defines.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/defines.h
+ * apps/examples/usrsocktest/defines.h
  * Common defines for all usrsock testcases
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_basic_connect.c b/examples/usrsocktest/usrsocktest_basic_connect.c
index fd6cc4a..bd6ceec 100644
--- a/examples/usrsocktest/usrsocktest_basic_connect.c
+++ b/examples/usrsocktest/usrsocktest_basic_connect.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_basic_connect.c
+ * apps/examples/¨usrsocktest/usrsocktest_basic_connect.c
  * Basic connect tests with socket daemon
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_basic_daemon.c b/examples/usrsocktest/usrsocktest_basic_daemon.c
index 8e8fde7..d3a1854 100644
--- a/examples/usrsocktest/usrsocktest_basic_daemon.c
+++ b/examples/usrsocktest/usrsocktest_basic_daemon.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_basic_daemon.c
+ * apps/examples/usrsocktest/usrsocktest_basic_daemon.c
  * Basic tests with socket daemon
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_basic_getsockname.c b/examples/usrsocktest/usrsocktest_basic_getsockname.c
index 522aefa..7bbc437 100644
--- a/examples/usrsocktest/usrsocktest_basic_getsockname.c
+++ b/examples/usrsocktest/usrsocktest_basic_getsockname.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_basic_getsockname.c
+ * apps/examples/usrsocktest/usrsocktest_basic_getsockname.c
  * Basic getsockname tests
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_basic_getsockopt.c b/examples/usrsocktest/usrsocktest_basic_getsockopt.c
index 3efdc6a..31f84a0 100644
--- a/examples/usrsocktest/usrsocktest_basic_getsockopt.c
+++ b/examples/usrsocktest/usrsocktest_basic_getsockopt.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_basic_getsockopt.c
+ * apps/examples/usrsocktest/usrsocktest_basic_getsockopt.c
  * Basic getsockopt tests
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_basic_send.c b/examples/usrsocktest/usrsocktest_basic_send.c
index 0d22509..e35d953 100644
--- a/examples/usrsocktest/usrsocktest_basic_send.c
+++ b/examples/usrsocktest/usrsocktest_basic_send.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_basic_send.c
+ * apps/examples/usrsocktest/usrsocktest_basic_send.c
  * Basic sending tests
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_basic_setsockopt.c b/examples/usrsocktest/usrsocktest_basic_setsockopt.c
index 868e642..460e3d9 100644
--- a/examples/usrsocktest/usrsocktest_basic_setsockopt.c
+++ b/examples/usrsocktest/usrsocktest_basic_setsockopt.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_basic_setsockopt.c
+ * apps/examples/usrsocktest/usrsocktest_basic_setsockopt.c
  * Basic setsockopt tests
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_block_recv.c b/examples/usrsocktest/usrsocktest_block_recv.c
index cbe0b86..fc9870c 100644
--- a/examples/usrsocktest/usrsocktest_block_recv.c
+++ b/examples/usrsocktest/usrsocktest_block_recv.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_block_recv.c
+ * apps/examples/usrsocktest/usrsocktest_block_recv.c
  * Receive from the socket in blocking mode
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_block_send.c b/examples/usrsocktest/usrsocktest_block_send.c
index e918e40..4ac33df 100644
--- a/examples/usrsocktest/usrsocktest_block_send.c
+++ b/examples/usrsocktest/usrsocktest_block_send.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_block_send.c
+ * apps/examples/usrsocktest/usrsocktest_block_send.c
  * Send through the socket in blocking mode
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_chardev.c b/examples/usrsocktest/usrsocktest_chardev.c
index 954760b..27ff6aa 100644
--- a/examples/usrsocktest/usrsocktest_chardev.c
+++ b/examples/usrsocktest/usrsocktest_chardev.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_chardev.c
+ * apps/examples/usrsocktest/usrsocktest_chardev.c
  * Character device node tests
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_daemon.c b/examples/usrsocktest/usrsocktest_daemon.c
index addfa6d..18a1ee4 100644
--- a/examples/usrsocktest/usrsocktest_daemon.c
+++ b/examples/usrsocktest/usrsocktest_daemon.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_daemon.c
+ * apps/examples/usrsocktest/usrsocktest_daemon.c
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
  *    Author: Jussi Kivilinna <ju...@haltian.com>
diff --git a/examples/usrsocktest/usrsocktest_multi_thread.c b/examples/usrsocktest/usrsocktest_multi_thread.c
index 39b47ee..3263616 100644
--- a/examples/usrsocktest/usrsocktest_multi_thread.c
+++ b/examples/usrsocktest/usrsocktest_multi_thread.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_multi_thread.c
+ * apps/examples/usrsocktest/usrsocktest_multi_thread.c
  * Multi-threaded access to sockets
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_noblock_connect.c b/examples/usrsocktest/usrsocktest_noblock_connect.c
index 83ff870..a5b5329 100644
--- a/examples/usrsocktest/usrsocktest_noblock_connect.c
+++ b/examples/usrsocktest/usrsocktest_noblock_connect.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_noblock_connect.c
+ * apps/examples/usrsocktest/usrsocktest_noblock_connect.c
  * Socket connect tests in non-blocking mode
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_noblock_recv.c b/examples/usrsocktest/usrsocktest_noblock_recv.c
index fcaf29c..2b0b5b1 100644
--- a/examples/usrsocktest/usrsocktest_noblock_recv.c
+++ b/examples/usrsocktest/usrsocktest_noblock_recv.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_noblock_recv.c
+ * apps/examples/usrsocktest/usrsocktest_noblock_recv.c
  * Receive from the socket in non-blocking mode
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_noblock_send.c b/examples/usrsocktest/usrsocktest_noblock_send.c
index 88c0c6e..feec821 100644
--- a/examples/usrsocktest/usrsocktest_noblock_send.c
+++ b/examples/usrsocktest/usrsocktest_noblock_send.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_noblock_send.c
+ * apps/examples/usrsocktest/usrsocktest_noblock_send.c
  * Send through the socket in non-blocking mode
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_nodaemon.c b/examples/usrsocktest/usrsocktest_nodaemon.c
index 6d13b3d..10ac155 100644
--- a/examples/usrsocktest/usrsocktest_nodaemon.c
+++ b/examples/usrsocktest/usrsocktest_nodaemon.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_nodaemon.c
+ * apps/examples/usrsocktest/usrsocktest_nodaemon.c
  * Tests without user socket daemon
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_poll.c b/examples/usrsocktest/usrsocktest_poll.c
index bfd6454..b440319 100644
--- a/examples/usrsocktest/usrsocktest_poll.c
+++ b/examples/usrsocktest/usrsocktest_poll.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_poll.c
+ * apps/examples/usrsocktest/usrsocktest_poll.c
  * User socket polling tests
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/usrsocktest/usrsocktest_wake_with_signal.c b/examples/usrsocktest/usrsocktest_wake_with_signal.c
index 225ea4c..009cacd 100644
--- a/examples/usrsocktest/usrsocktest_wake_with_signal.c
+++ b/examples/usrsocktest/usrsocktest_wake_with_signal.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usrsocktest/usrsocktest_wake_with_signal.c
+ * apps/examples/usrsocktest/usrsocktest_wake_with_signal.c
  * Wake blocked IO with signal or daemon abort
  *
  *   Copyright (C) 2015, 2017 Haltian Ltd. All rights reserved.
diff --git a/examples/ustream/ustream.h b/examples/ustream/ustream.h
index 73a830a..28f996f 100644
--- a/examples/ustream/ustream.h
+++ b/examples/ustream/ustream.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/ustream/ustream.h
+ * apps/examples/ustream/ustream.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/ustream/ustream_client.c b/examples/ustream/ustream_client.c
index fc751ca..fb92c9a 100644
--- a/examples/ustream/ustream_client.c
+++ b/examples/ustream/ustream_client.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/ustream/ustream_client.c
+ * apps/examples/ustream/ustream_client.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/ustream/ustream_server.c b/examples/ustream/ustream_server.c
index 2439069..e35c831 100644
--- a/examples/ustream/ustream_server.c
+++ b/examples/ustream/ustream_server.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/ustream/ustream_server.c
+ * apps/examples/ustream/ustream_server.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/veml6070/veml6070_main.c b/examples/veml6070/veml6070_main.c
index 0bd5ff5..facacce 100644
--- a/examples/veml6070/veml6070_main.c
+++ b/examples/veml6070/veml6070_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/veml6070/veml6070_main.c
+ * apps/examples/veml6070/veml6070_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/watchdog/watchdog.h b/examples/watchdog/watchdog.h
index 206c28c..4ab44dd 100644
--- a/examples/watchdog/watchdog.h
+++ b/examples/watchdog/watchdog.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/examples/watchdog/watchdog.h
+ * apps/examples/examples/watchdog/watchdog.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/watchdog/watchdog_main.c b/examples/watchdog/watchdog_main.c
index 920c636..6a2c088 100644
--- a/examples/watchdog/watchdog_main.c
+++ b/examples/watchdog/watchdog_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/watchdog/watchdog_main.c
+ * apps/examples/watchdog/watchdog_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/watcher/ramdisk.c b/examples/watcher/ramdisk.c
index 346bf9c..717103e 100644
--- a/examples/watcher/ramdisk.c
+++ b/examples/watcher/ramdisk.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/watcher/ramdisk.c
+ * apps/examples/watcher/ramdisk.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/watcher/ramdisk.h b/examples/watcher/ramdisk.h
index bab2841..ae7448e 100644
--- a/examples/watcher/ramdisk.h
+++ b/examples/watcher/ramdisk.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/watcher/ramdisk.h
+ * apps/examples/watcher/ramdisk.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/watcher/task_mn.h b/examples/watcher/task_mn.h
index a2daa07..4b8c0ca 100644
--- a/examples/watcher/task_mn.h
+++ b/examples/watcher/task_mn.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/watcher/task_mn.h
+ * apps/examples/watcher/task_mn.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/watcher/wdt.h b/examples/watcher/wdt.h
index 95bc20e..7bdef17 100644
--- a/examples/watcher/wdt.h
+++ b/examples/watcher/wdt.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/watcher/wdt.h
+ * apps/examples/watcher/wdt.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/webserver/webserver_main.c b/examples/webserver/webserver_main.c
index 0222190..1c18567 100644
--- a/examples/webserver/webserver_main.c
+++ b/examples/webserver/webserver_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/webserver/webserver_main.c
+ * apps/examples/webserver/webserver_main.c
  *
  *   Copyright (C) 2007, 2009-2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gn...@nuttx.org>
diff --git a/examples/wget/wget_main.c b/examples/wget/wget_main.c
index 23fcbff..cb88f0a 100644
--- a/examples/wget/wget_main.c
+++ b/examples/wget/wget_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/wget/wget_main.c
+ * apps/examples/wget/wget_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/examples/wgetjson/wgetjson_main.c b/examples/wgetjson/wgetjson_main.c
index 8f839ba..d2eb90a 100644
--- a/examples/wgetjson/wgetjson_main.c
+++ b/examples/wgetjson/wgetjson_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/wgetjson/wgetjson_main.c
+ * apps/examples/wgetjson/wgetjson_main.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Darcy Gong
diff --git a/examples/xbc_test/xbc_test_main.c b/examples/xbc_test/xbc_test_main.c
index ddbdb0b..c8ce210 100644
--- a/examples/xbc_test/xbc_test_main.c
+++ b/examples/xbc_test/xbc_test_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/xbc_test/xbc_test_main.c
+ * apps/examples/xbc_test/xbc_test_main.c
  *
  *   Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gn...@nuttx.org>