diff --git a/examples/ipv6/rpl-tsch/Makefile b/examples/ipv6/rpl-tsch/Makefile
index eeb22a379..a1620979b 100644
--- a/examples/ipv6/rpl-tsch/Makefile
+++ b/examples/ipv6/rpl-tsch/Makefile
@@ -9,8 +9,7 @@ MAKE_WITH_ORCHESTRA ?= 0 # force Orchestra from command line
 MAKE_WITH_SECURITY ?= 0 # force Security from command line
 MAKE_WITH_PERIODIC_ROUTES_PRINT ?= 0 # print #routes periodically, used for regression tests
 
-APPS += orchestra
-MODULES += os/net/mac/tsch os/services/shell
+MODULES += os/net/mac/tsch os/services/shell os/services/orchestra
 
 ifeq ($(MAKE_WITH_ORCHESTRA),1)
 CFLAGS += -DWITH_ORCHESTRA=1
diff --git a/examples/ipv6/rpl-tsch/project-conf.h b/examples/ipv6/rpl-tsch/project-conf.h
index e1b99f576..66708659d 100644
--- a/examples/ipv6/rpl-tsch/project-conf.h
+++ b/examples/ipv6/rpl-tsch/project-conf.h
@@ -125,7 +125,7 @@
 
 #if WITH_ORCHESTRA
 
-/* See apps/orchestra/README.md for more Orchestra configuration options */
+/* See os/services//orchestra/README.md for more Orchestra configuration options */
 #define TSCH_SCHEDULE_CONF_WITH_6TISCH_MINIMAL 0 /* No 6TiSCH minimal schedule */
 #define TSCH_CONF_WITH_LINK_SELECTOR 1 /* Orchestra requires per-packet link selection */
 /* Orchestra callbacks */
diff --git a/examples/platform-specific/jn516x/rpl/common-conf.h b/examples/platform-specific/jn516x/rpl/common-conf.h
index a759dcab0..96c8a8c42 100644
--- a/examples/platform-specific/jn516x/rpl/common-conf.h
+++ b/examples/platform-specific/jn516x/rpl/common-conf.h
@@ -88,7 +88,7 @@
 
 #if WITH_ORCHESTRA
 
-/* See apps/orchestra/README.md for more Orchestra configuration options */
+/* See os/services/orchestra/README.md for more Orchestra configuration options */
 #define TSCH_SCHEDULE_CONF_WITH_6TISCH_MINIMAL 0 /* No 6TiSCH minimal schedule */
 #define TSCH_CONF_WITH_LINK_SELECTOR 1 /* Orchestra requires per-packet link selection */
 /* Orchestra callbacks */
diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
index da1004f11..f49bdff34 100644
--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
@@ -13,11 +13,10 @@ PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
 CFLAGS += -DUIP_CONF_TCP=0
-APPS += orchestra
 APPS += json
 APPS += er-coap
 
-MODULES += os/net/mac/tsch
+MODULES += os/net/mac/tsch os/services/orchestra
 
 all: $(CONTIKI_PROJECT)
 
diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
index b9c45b783..5c284a82d 100644
--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
@@ -15,11 +15,10 @@ PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
 CFLAGS += -DUIP_CONF_TCP=0
-APPS += orchestra
 APPS += json
 APPS += er-coap
 
-MODULES += os/net/mac/tsch
+MODULES += os/net/mac/tsch os/services/orchestra
 
 all: $(CONTIKI_PROJECT)
 include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
index b2c1fdada..3fef027dd 100644
--- a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
@@ -13,11 +13,10 @@ PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
 CFLAGS += -DUIP_CONF_TCP=0
-APPS += orchestra
 APPS += json
 APPS += er-coap
 
-MODULES += os/net/mac/tsch
+MODULES += os/net/mac/tsch os/services/orchestra
 
 all: $(CONTIKI_PROJECT)
 
diff --git a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
index 74ce6ea69..48cc65d97 100644
--- a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
@@ -16,11 +16,10 @@ PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
 CFLAGS += -DUIP_CONF_TCP=0
-APPS += orchestra
 APPS += json
 APPS += er-coap
 
-MODULES += os/net/mac/tsch
+MODULES += os/net/mac/tsch os/services/orchestra
 
 all: $(CONTIKI_PROJECT)
 include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile b/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
index a16347c80..2880d9625 100644
--- a/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
@@ -14,11 +14,10 @@ PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
 CFLAGS += -DUIP_CONF_TCP=0
-APPS += orchestra
 APPS += json
 APPS += er-coap
 
-MODULES += os/net/mac/tsch
+MODULES += os/net/mac/tsch os/services/orchestra
 
 all: $(CONTIKI_PROJECT)
 
diff --git a/apps/orchestra/README.md b/os/services/orchestra/README.md
similarity index 100%
rename from apps/orchestra/README.md
rename to os/services/orchestra/README.md
diff --git a/apps/orchestra/orchestra-conf.h b/os/services/orchestra/orchestra-conf.h
similarity index 100%
rename from apps/orchestra/orchestra-conf.h
rename to os/services/orchestra/orchestra-conf.h
diff --git a/apps/orchestra/orchestra-rule-default-common.c b/os/services/orchestra/orchestra-rule-default-common.c
similarity index 100%
rename from apps/orchestra/orchestra-rule-default-common.c
rename to os/services/orchestra/orchestra-rule-default-common.c
diff --git a/apps/orchestra/orchestra-rule-eb-per-time-source.c b/os/services/orchestra/orchestra-rule-eb-per-time-source.c
similarity index 100%
rename from apps/orchestra/orchestra-rule-eb-per-time-source.c
rename to os/services/orchestra/orchestra-rule-eb-per-time-source.c
diff --git a/apps/orchestra/orchestra-rule-unicast-per-neighbor-rpl-ns.c b/os/services/orchestra/orchestra-rule-unicast-per-neighbor-rpl-ns.c
similarity index 100%
rename from apps/orchestra/orchestra-rule-unicast-per-neighbor-rpl-ns.c
rename to os/services/orchestra/orchestra-rule-unicast-per-neighbor-rpl-ns.c
diff --git a/apps/orchestra/orchestra-rule-unicast-per-neighbor-rpl-storing.c b/os/services/orchestra/orchestra-rule-unicast-per-neighbor-rpl-storing.c
similarity index 100%
rename from apps/orchestra/orchestra-rule-unicast-per-neighbor-rpl-storing.c
rename to os/services/orchestra/orchestra-rule-unicast-per-neighbor-rpl-storing.c
diff --git a/apps/orchestra/orchestra.c b/os/services/orchestra/orchestra.c
similarity index 100%
rename from apps/orchestra/orchestra.c
rename to os/services/orchestra/orchestra.c
diff --git a/apps/orchestra/orchestra.h b/os/services/orchestra/orchestra.h
similarity index 100%
rename from apps/orchestra/orchestra.h
rename to os/services/orchestra/orchestra.h