diff --git a/examples/accel-leds/main.c b/examples/accel-leds/main.c
index a4641ee4a..a2b367b00 100644
--- a/examples/accel-leds/main.c
+++ b/examples/accel-leds/main.c
@@ -1,8 +1,8 @@
 #include <limits.h>
 #include <stdio.h>
 
-#include <led.h>
-#include <ninedof.h>
+#include <interface/led.h>
+#include <sensors/ninedof.h>
 
 int main(void) {
   printf("[App] Accelerometer -> LEDs\n");
diff --git a/examples/adc/main.c b/examples/adc/main.c
index 670ed93d1..8ec83d59f 100644
--- a/examples/adc/main.c
+++ b/examples/adc/main.c
@@ -1,5 +1,6 @@
-#include <adc.h>
 #include <stdio.h>
+
+#include <peripherals/adc.h>
 #include <timer.h>
 
 int main(void) {
diff --git a/examples/ble-uart/main.c b/examples/ble-uart/main.c
index dadc6679d..59753d54a 100644
--- a/examples/ble-uart/main.c
+++ b/examples/ble-uart/main.c
@@ -14,7 +14,7 @@
 
 #include <nrf51_serialization.h>
 
-#include <console.h>
+#include <interface/console.h>
 #include <tock.h>
 
 #include "ble_nus.h"
diff --git a/examples/ble_advertising/main.c b/examples/ble_advertising/main.c
index 6b24766ff..3054cef58 100644
--- a/examples/ble_advertising/main.c
+++ b/examples/ble_advertising/main.c
@@ -1,7 +1,9 @@
-#include <ble.h>
-#include <gap.h>
 #include <stdbool.h>
 #include <stdio.h>
+
+#include <gap.h>
+
+#include <net/ble.h>
 #include <tock.h>
 
 // Sizes in bytes
diff --git a/examples/ble_passive_scanning/main.cpp b/examples/ble_passive_scanning/main.cpp
index 32c48f878..4930cc72c 100644
--- a/examples/ble_passive_scanning/main.cpp
+++ b/examples/ble_passive_scanning/main.cpp
@@ -1,7 +1,9 @@
+#include <stdio.h>
+
+#include <net/ble.h>
+
 #include "advertisement.h"
 #include "advertisement_list.h"
-#include <ble.h>
-#include <stdio.h>
 
 /*
  * BLE Demo Application
diff --git a/examples/blink/main.c b/examples/blink/main.c
index b72ab6f47..b1b123ea8 100644
--- a/examples/blink/main.c
+++ b/examples/blink/main.c
@@ -1,4 +1,4 @@
-#include <led.h>
+#include <interface/led.h>
 #include <timer.h>
 
 int main(void) {
diff --git a/examples/buttons/main.c b/examples/buttons/main.c
index 530b7d488..ac68ac376 100644
--- a/examples/buttons/main.c
+++ b/examples/buttons/main.c
@@ -4,8 +4,8 @@
 // button is pressed, the first LED is toggled. If the third button is pressed,
 // the third LED is toggled.
 
-#include <button.h>
-#include <led.h>
+#include <interface/button.h>
+#include <interface/led.h>
 
 // Callback for button presses.
 //   btn_num: The index of the button associated with the callback
diff --git a/examples/c_hello/main.c b/examples/c_hello/main.c
index 5d384c563..d1b2c0d1b 100644
--- a/examples/c_hello/main.c
+++ b/examples/c_hello/main.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <console.h>
+#include <interface/console.h>
 
 char hello[] = "Hello World!\r\n";
 
diff --git a/examples/find_north/main.c b/examples/find_north/main.c
index 232e8b7c9..1041c37f9 100644
--- a/examples/find_north/main.c
+++ b/examples/find_north/main.c
@@ -1,8 +1,8 @@
 #include <math.h>
 #include <stdio.h>
 
-#include <led.h>
-#include <ninedof.h>
+#include <interface/led.h>
+#include <sensors/ninedof.h>
 
 int main(void) {
   int x, y, z;
diff --git a/examples/i2c-usb-bridge/main.c b/examples/i2c-usb-bridge/main.c
index 9b6a58972..f4e4549b0 100644
--- a/examples/i2c-usb-bridge/main.c
+++ b/examples/i2c-usb-bridge/main.c
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <console.h>
-#include <i2c_master.h>
+#include <interface/console.h>
+#include <peripherals/i2c_master.h>
 
 #define DATA_LEN 64
 
diff --git a/examples/ip_sense/main.c b/examples/ip_sense/main.c
index 5d9dc6a98..fb62cfd51 100644
--- a/examples/ip_sense/main.c
+++ b/examples/ip_sense/main.c
@@ -1,13 +1,13 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include <ambient_light.h>
-#include <humidity.h>
-#include <temperature.h>
+#include <sensors/ambient_light.h>
+#include <sensors/humidity.h>
+#include <sensors/temperature.h>
 #include <timer.h>
 
-#include <ieee802154.h>
-#include <udp.h>
+#include <net/ieee802154.h>
+#include <net/udp.h>
 
 static unsigned char BUF_BIND_CFG[2 * sizeof(sock_addr_t)];
 
diff --git a/examples/lora/sensor-receive/main.cc b/examples/lora/sensor-receive/main.cc
index b08ab86d2..96139ec8b 100644
--- a/examples/lora/sensor-receive/main.cc
+++ b/examples/lora/sensor-receive/main.cc
@@ -12,10 +12,6 @@
 // include the hardware abstraction layer
 #include "libtockHal.h"
 
-// Include some libtock-c helpers
-#include <humidity.h>
-#include <temperature.h>
-
 #define BUFFER_LEN 64
 
 // the entry point for the program
diff --git a/examples/lora/sensor-transmit/main.cc b/examples/lora/sensor-transmit/main.cc
index 1a1995d71..1319099e7 100644
--- a/examples/lora/sensor-transmit/main.cc
+++ b/examples/lora/sensor-transmit/main.cc
@@ -13,8 +13,8 @@
 #include "libtockHal.h"
 
 // Include some libtock-c helpers
-#include <humidity.h>
-#include <temperature.h>
+#include <sensors/humidity.h>
+#include <sensors/temperature.h>
 
 #define BUFFER_LEN 64
 
diff --git a/examples/rot13_client/main.c b/examples/rot13_client/main.c
index 3778e329b..26e0a5512 100644
--- a/examples/rot13_client/main.c
+++ b/examples/rot13_client/main.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <string.h>
-#include <timer.h>
 
-#include <ipc.h>
+#include <kernel/ipc.h>
+#include <timer.h>
 
 size_t rot13_svc_num = 0;
 
diff --git a/examples/rot13_service/main.c b/examples/rot13_service/main.c
index aee1a226c..0c8540a56 100644
--- a/examples/rot13_service/main.c
+++ b/examples/rot13_service/main.c
@@ -1,4 +1,4 @@
-#include <ipc.h>
+#include <kernel/ipc.h>
 #include <tock.h>
 
 struct rot13_buf {
diff --git a/examples/rtc_app/main.c b/examples/rtc_app/main.c
index 95ecafd76..a6fb00627 100644
--- a/examples/rtc_app/main.c
+++ b/examples/rtc_app/main.c
@@ -1,4 +1,4 @@
-#include <rtc.h>
+#include <peripheral/rtc.h>
 #include <stdio.h>
 #include <timer.h>
 
diff --git a/examples/screen/main.c b/examples/screen/main.c
index ba8c13d63..6a5b02f60 100644
--- a/examples/screen/main.c
+++ b/examples/screen/main.c
@@ -1,6 +1,7 @@
-#include <screen.h>
 #include <stdio.h>
 #include <stdlib.h>
+
+#include <display/screen.h>
 #include <timer.h>
 
 #define BUFFER_SIZE 10 * 1024
diff --git a/examples/security_app/main.c b/examples/security_app/main.c
index 8b674fd8f..22660a3a2 100644
--- a/examples/security_app/main.c
+++ b/examples/security_app/main.c
@@ -4,10 +4,10 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "console.h"
-#include "gpio.h"
-#include "led.h"
-#include "tock.h"
+#include <interface/console.h>
+#include <interface/led.h>
+#include <peripherals/gpio.h>
+#include <tock.h>
 
 typedef struct {
   uint8_t pir;
diff --git a/examples/sensors/main.c b/examples/sensors/main.c
index a4ac1738e..e68d47be0 100644
--- a/examples/sensors/main.c
+++ b/examples/sensors/main.c
@@ -1,16 +1,16 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include <ambient_light.h>
-#include <humidity.h>
-#include <lps25hb.h>
-#include <ninedof.h>
-#include <proximity.h>
-#include <sound_pressure.h>
-#include <temperature.h>
+#include <chips/lps25hb.h>
+#include <chips/tsl2561.h>
+#include <sensors/ambient_light.h>
+#include <sensors/humidity.h>
+#include <sensors/ninedof.h>
+#include <sensors/proximity.h>
+#include <sensors/sound_pressure.h>
+#include <sensors/temperature.h>
 #include <timer.h>
 #include <tock.h>
-#include <tsl2561.h>
 
 static tock_timer_t timer;
 static bool light          = false;
diff --git a/examples/services/ble-env-sense/main.c b/examples/services/ble-env-sense/main.c
index 224383935..7f911c153 100644
--- a/examples/services/ble-env-sense/main.c
+++ b/examples/services/ble-env-sense/main.c
@@ -6,15 +6,15 @@
 
 #include <ble_advdata.h>
 #include <nordic_common.h>
+#include <nrf.h>
 #include <nrf_error.h>
 
 #include <eddystone.h>
 #include <simple_adv.h>
 #include <simple_ble.h>
 
-#include <ipc.h>
-#include <nrf.h>
-#include <nrf51_serialization.h>
+#include <kernel/ipc.h>
+#include <net/nrf51_serialization.h>
 #include <tock.h>
 
 #include "env_sense_service.h"
diff --git a/examples/touch/main.c b/examples/touch/main.c
index 0c9860858..8718a0c2e 100644
--- a/examples/touch/main.c
+++ b/examples/touch/main.c
@@ -1,8 +1,9 @@
-#include <screen.h>
 #include <stdio.h>
 #include <stdlib.h>
+
+#include <display/screen.h>
+#include <sensor/touch.h>
 #include <timer.h>
-#include <touch.h>
 
 static void touch_event (int status, int x, int y, void *ud __attribute__ ((unused))) {
   switch (status) {
diff --git a/examples/tutorials/02_button_print/main.c b/examples/tutorials/02_button_print/main.c
index 7510ad2ae..c22305d09 100644
--- a/examples/tutorials/02_button_print/main.c
+++ b/examples/tutorials/02_button_print/main.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include <button.h>
+#include <interface/button.h>
 
 // Callback for button presses.
 //   btn_num: The index of the button associated with the callback
diff --git a/examples/tutorials/03_ble_scan/main.c b/examples/tutorials/03_ble_scan/main.c
index 0d711d9de..7b866e74b 100644
--- a/examples/tutorials/03_ble_scan/main.c
+++ b/examples/tutorials/03_ble_scan/main.c
@@ -8,7 +8,7 @@
 // Included in the libnrfserialization.a library.
 #include <simple_ble.h>
 
-#include <led.h>
+#include <interface/led.h>
 
 /*******************************************************************************
  * BLE
diff --git a/examples/tutorials/05_ipc/led/main.c b/examples/tutorials/05_ipc/led/main.c
index 6e1ba2ab5..46d94db0c 100644
--- a/examples/tutorials/05_ipc/led/main.c
+++ b/examples/tutorials/05_ipc/led/main.c
@@ -1,5 +1,5 @@
-#include <ipc.h>
-#include <led.h>
+#include <interface/led.h>
+#include <kernel/ipc.h>
 #include <tock.h>
 
 // This service can control the LEDs on a board.
diff --git a/examples/tutorials/05_ipc/logic/main.c b/examples/tutorials/05_ipc/logic/main.c
index 2cb74b182..f3140c3c9 100644
--- a/examples/tutorials/05_ipc/logic/main.c
+++ b/examples/tutorials/05_ipc/logic/main.c
@@ -1,6 +1,7 @@
-#include <ipc.h>
 #include <stdio.h>
 #include <string.h>
+
+#include <kernel/ipc.h>
 #include <timer.h>
 
 // Every 500 ms use the RNG service to randomly select an LED to turn on or
diff --git a/examples/tutorials/05_ipc/rng/main.c b/examples/tutorials/05_ipc/rng/main.c
index 6df1c5ff6..7399e2eef 100644
--- a/examples/tutorials/05_ipc/rng/main.c
+++ b/examples/tutorials/05_ipc/rng/main.c
@@ -1,5 +1,5 @@
-#include <ipc.h>
-#include <rng.h>
+#include <kernel/ipc.h>
+#include <peripherals/rng.h>
 #include <tock.h>
 
 // Random Number Generator Service
diff --git a/examples/tutorials/hotp/hotp_milestone_one/main.c b/examples/tutorials/hotp/hotp_milestone_one/main.c
index cf7667b6d..b851a6bb1 100644
--- a/examples/tutorials/hotp/hotp_milestone_one/main.c
+++ b/examples/tutorials/hotp/hotp_milestone_one/main.c
@@ -18,13 +18,13 @@
 #include <string.h>
 
 // Libtock includes
-#include <app_state.h>
-#include <button.h>
-#include <console.h>
-#include <hmac.h>
-#include <led.h>
+#include <crypto/hmac.h>
+#include <interface/button.h>
+#include <interface/console.h>
+#include <interface/led.h>
+#include <interface/usb_keyboard_hid.h>
+#include <storage/app_state.h>
 #include <timer.h>
-#include <usb_keyboard_hid.h>
 
 // Local includes
 #include "base32.h"
diff --git a/examples/tutorials/hotp/hotp_milestone_three/main.c b/examples/tutorials/hotp/hotp_milestone_three/main.c
index e59d2d5e7..bd87db02d 100644
--- a/examples/tutorials/hotp/hotp_milestone_three/main.c
+++ b/examples/tutorials/hotp/hotp_milestone_three/main.c
@@ -18,13 +18,13 @@
 #include <string.h>
 
 // Libtock includes
-#include <app_state.h>
-#include <button.h>
-#include <console.h>
-#include <hmac.h>
-#include <led.h>
+#include <crypto/hmac.h>
+#include <interface/button.h>
+#include <interface/console.h>
+#include <interface/led.h>
+#include <interface/usb_keyboard_hid.h>
+#include <storage/app_state.h>
 #include <timer.h>
-#include <usb_keyboard_hid.h>
 
 // Local includes
 #include "base32.h"
diff --git a/examples/tutorials/hotp/hotp_milestone_two/main.c b/examples/tutorials/hotp/hotp_milestone_two/main.c
index 34c49ef2f..b35a2b290 100644
--- a/examples/tutorials/hotp/hotp_milestone_two/main.c
+++ b/examples/tutorials/hotp/hotp_milestone_two/main.c
@@ -18,13 +18,13 @@
 #include <string.h>
 
 // Libtock includes
-#include <app_state.h>
-#include <button.h>
-#include <console.h>
-#include <hmac.h>
-#include <led.h>
+#include <crypto/hmac.h>
+#include <interface/button.h>
+#include <interface/console.h>
+#include <interface/led.h>
+#include <interface/usb_keyboard_hid.h>
+#include <storage/app_state.h>
 #include <timer.h>
-#include <usb_keyboard_hid.h>
 
 // Local includes
 #include "base32.h"
diff --git a/examples/tutorials/hotp/hotp_oracle_complete/main.c b/examples/tutorials/hotp/hotp_oracle_complete/main.c
index 6fcacf8d3..a186ed3db 100644
--- a/examples/tutorials/hotp/hotp_oracle_complete/main.c
+++ b/examples/tutorials/hotp/hotp_oracle_complete/main.c
@@ -18,13 +18,13 @@
 #include <string.h>
 
 // Libtock includes
-#include <button.h>
-#include <console.h>
-#include <hmac.h>
-#include <kv.h>
-#include <led.h>
+#include <crypto/hmac.h>
+#include <interface/button.h>
+#include <interface/console.h>
+#include <interface/led.h>
+#include <interface/usb_keyboard_hid.h>
+#include <storage/app_state.h>
 #include <timer.h>
-#include <usb_keyboard_hid.h>
 
 // Local includes
 #include "base32.h"
diff --git a/examples/tutorials/hotp/hotp_starter/main.c b/examples/tutorials/hotp/hotp_starter/main.c
index 734722bf2..a799f6ca5 100644
--- a/examples/tutorials/hotp/hotp_starter/main.c
+++ b/examples/tutorials/hotp/hotp_starter/main.c
@@ -18,13 +18,13 @@
 #include <string.h>
 
 // Libtock includes
-#include <app_state.h>
-#include <button.h>
-#include <console.h>
-#include <hmac.h>
-#include <led.h>
+#include <crypto/hmac.h>
+#include <interface/button.h>
+#include <interface/console.h>
+#include <interface/led.h>
+#include <interface/usb_keyboard_hid.h>
+#include <storage/app_state.h>
 #include <timer.h>
-#include <usb_keyboard_hid.h>
 
 // Local includes
 #include "base32.h"
diff --git a/examples/unit_tests/nrf52840dk-test/main.c b/examples/unit_tests/nrf52840dk-test/main.c
index 5e463f672..a8c1f5c05 100644
--- a/examples/unit_tests/nrf52840dk-test/main.c
+++ b/examples/unit_tests/nrf52840dk-test/main.c
@@ -1,12 +1,14 @@
-#include <button.h>
-#include <gpio.h>
-#include <led.h>
+#include <stdbool.h>
 #include <stdio.h>
+
+#include <interface/button.h>
+#include <interface/led.h>
+#include <peripherals/gpio.h>
 #include <timer.h>
 #include <tock.h>
 #include <unit_test.h>
 
-#include <stdbool.h>
+
 
 #define GPIO1_IN 0
 #define GPIO1_OUT 1
diff --git a/examples/unit_tests/passfail/main.c b/examples/unit_tests/passfail/main.c
index b4ef581cd..e13befc50 100644
--- a/examples/unit_tests/passfail/main.c
+++ b/examples/unit_tests/passfail/main.c
@@ -1,9 +1,11 @@
+#include <stdbool.h>
 #include <stdio.h>
+
 #include <timer.h>
 #include <tock.h>
 #include <unit_test.h>
 
-#include <stdbool.h>
+
 
 static bool test_pass(void) {
   return true;
diff --git a/examples/unit_tests/timeout/main.c b/examples/unit_tests/timeout/main.c
index ad2390f79..c2e6514a1 100644
--- a/examples/unit_tests/timeout/main.c
+++ b/examples/unit_tests/timeout/main.c
@@ -1,8 +1,9 @@
+#include <stdbool.h>
+
 #include <timer.h>
 #include <tock.h>
 #include <unit_test.h>
 
-#include <stdbool.h>
 
 static bool test_pass(void) {
   delay_ms(100);
diff --git a/examples/witenergy/main.c b/examples/witenergy/main.c
index c9905195c..095e5b187 100644
--- a/examples/witenergy/main.c
+++ b/examples/witenergy/main.c
@@ -17,9 +17,9 @@
 
 #include <nrf51_serialization.h>
 
-#include <button.h>
-#include <console.h>
-#include <led.h>
+#include <interface/button.h>
+#include <interface/console.h>
+#include <interface/led.h>
 #include <timer.h>
 #include <tock.h>