diff --git a/root/s6-overlay/s6-rc.d/ci-service-check/dependencies.d/legacy-services b/root/etc/s6-overlay/s6-rc.d/ci-service-check/dependencies.d/legacy-services
similarity index 100%
rename from root/s6-overlay/s6-rc.d/ci-service-check/dependencies.d/legacy-services
rename to root/etc/s6-overlay/s6-rc.d/ci-service-check/dependencies.d/legacy-services
diff --git a/root/s6-overlay/s6-rc.d/ci-service-check/type b/root/etc/s6-overlay/s6-rc.d/ci-service-check/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/ci-service-check/type
rename to root/etc/s6-overlay/s6-rc.d/ci-service-check/type
diff --git a/root/s6-overlay/s6-rc.d/ci-service-check/up b/root/etc/s6-overlay/s6-rc.d/ci-service-check/up
similarity index 100%
rename from root/s6-overlay/s6-rc.d/ci-service-check/up
rename to root/etc/s6-overlay/s6-rc.d/ci-service-check/up
diff --git a/root/s6-overlay/s6-rc.d/init-adduser/branding b/root/etc/s6-overlay/s6-rc.d/init-adduser/branding
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-adduser/branding
rename to root/etc/s6-overlay/s6-rc.d/init-adduser/branding
diff --git a/root/s6-overlay/s6-rc.d/init-adduser/dependencies.d/init-migrations b/root/etc/s6-overlay/s6-rc.d/init-adduser/dependencies.d/init-migrations
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-adduser/dependencies.d/init-migrations
rename to root/etc/s6-overlay/s6-rc.d/init-adduser/dependencies.d/init-migrations
diff --git a/root/s6-overlay/s6-rc.d/init-adduser/run b/root/etc/s6-overlay/s6-rc.d/init-adduser/run
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-adduser/run
rename to root/etc/s6-overlay/s6-rc.d/init-adduser/run
diff --git a/root/s6-overlay/s6-rc.d/init-adduser/type b/root/etc/s6-overlay/s6-rc.d/init-adduser/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-adduser/type
rename to root/etc/s6-overlay/s6-rc.d/init-adduser/type
diff --git a/root/s6-overlay/s6-rc.d/init-adduser/up b/root/etc/s6-overlay/s6-rc.d/init-adduser/up
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-adduser/up
rename to root/etc/s6-overlay/s6-rc.d/init-adduser/up
diff --git a/root/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-config
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-config
rename to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-config
diff --git a/root/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config
rename to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config
diff --git a/root/s6-overlay/s6-rc.d/init-config-end/type b/root/etc/s6-overlay/s6-rc.d/init-config-end/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-config-end/type
rename to root/etc/s6-overlay/s6-rc.d/init-config-end/type
diff --git a/root/s6-overlay/s6-rc.d/init-config-end/up b/root/etc/s6-overlay/s6-rc.d/init-config-end/up
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-config-end/up
rename to root/etc/s6-overlay/s6-rc.d/init-config-end/up
diff --git a/root/s6-overlay/s6-rc.d/init-config/dependencies.d/init-os-end b/root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-os-end
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-config/dependencies.d/init-os-end
rename to root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-os-end
diff --git a/root/s6-overlay/s6-rc.d/init-config/type b/root/etc/s6-overlay/s6-rc.d/init-config/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-config/type
rename to root/etc/s6-overlay/s6-rc.d/init-config/type
diff --git a/root/s6-overlay/s6-rc.d/init-config/up b/root/etc/s6-overlay/s6-rc.d/init-config/up
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-config/up
rename to root/etc/s6-overlay/s6-rc.d/init-config/up
diff --git a/root/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-config
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-config
rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-config
diff --git a/root/s6-overlay/s6-rc.d/init-crontab-config/run b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-crontab-config/run
rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/run
diff --git a/root/s6-overlay/s6-rc.d/init-crontab-config/type b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-crontab-config/type
rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/type
diff --git a/root/s6-overlay/s6-rc.d/init-crontab-config/up b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/up
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-crontab-config/up
rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/up
diff --git a/root/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/init-mods-end b/root/etc/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/init-mods-end
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/init-mods-end
rename to root/etc/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/init-mods-end
diff --git a/root/s6-overlay/s6-rc.d/init-custom-files/run b/root/etc/s6-overlay/s6-rc.d/init-custom-files/run
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-custom-files/run
rename to root/etc/s6-overlay/s6-rc.d/init-custom-files/run
diff --git a/root/s6-overlay/s6-rc.d/init-custom-files/type b/root/etc/s6-overlay/s6-rc.d/init-custom-files/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-custom-files/type
rename to root/etc/s6-overlay/s6-rc.d/init-custom-files/type
diff --git a/root/s6-overlay/s6-rc.d/init-custom-files/up b/root/etc/s6-overlay/s6-rc.d/init-custom-files/up
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-custom-files/up
rename to root/etc/s6-overlay/s6-rc.d/init-custom-files/up
diff --git a/root/s6-overlay/s6-rc.d/init-device-perms/dependencies.d/init-adduser b/root/etc/s6-overlay/s6-rc.d/init-device-perms/dependencies.d/init-adduser
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-device-perms/dependencies.d/init-adduser
rename to root/etc/s6-overlay/s6-rc.d/init-device-perms/dependencies.d/init-adduser
diff --git a/root/s6-overlay/s6-rc.d/init-device-perms/run b/root/etc/s6-overlay/s6-rc.d/init-device-perms/run
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-device-perms/run
rename to root/etc/s6-overlay/s6-rc.d/init-device-perms/run
diff --git a/root/s6-overlay/s6-rc.d/init-device-perms/type b/root/etc/s6-overlay/s6-rc.d/init-device-perms/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-device-perms/type
rename to root/etc/s6-overlay/s6-rc.d/init-device-perms/type
diff --git a/root/s6-overlay/s6-rc.d/init-device-perms/up b/root/etc/s6-overlay/s6-rc.d/init-device-perms/up
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-device-perms/up
rename to root/etc/s6-overlay/s6-rc.d/init-device-perms/up
diff --git a/root/s6-overlay/s6-rc.d/init-envfile/run b/root/etc/s6-overlay/s6-rc.d/init-envfile/run
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-envfile/run
rename to root/etc/s6-overlay/s6-rc.d/init-envfile/run
diff --git a/root/s6-overlay/s6-rc.d/init-envfile/type b/root/etc/s6-overlay/s6-rc.d/init-envfile/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-envfile/type
rename to root/etc/s6-overlay/s6-rc.d/init-envfile/type
diff --git a/root/s6-overlay/s6-rc.d/init-envfile/up b/root/etc/s6-overlay/s6-rc.d/init-envfile/up
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-envfile/up
rename to root/etc/s6-overlay/s6-rc.d/init-envfile/up
diff --git a/root/s6-overlay/s6-rc.d/init-migrations/run b/root/etc/s6-overlay/s6-rc.d/init-migrations/run
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-migrations/run
rename to root/etc/s6-overlay/s6-rc.d/init-migrations/run
diff --git a/root/s6-overlay/s6-rc.d/init-migrations/type b/root/etc/s6-overlay/s6-rc.d/init-migrations/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-migrations/type
rename to root/etc/s6-overlay/s6-rc.d/init-migrations/type
diff --git a/root/s6-overlay/s6-rc.d/init-migrations/up b/root/etc/s6-overlay/s6-rc.d/init-migrations/up
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-migrations/up
rename to root/etc/s6-overlay/s6-rc.d/init-migrations/up
diff --git a/root/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-package-install
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-package-install
rename to root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-package-install
diff --git a/root/s6-overlay/s6-rc.d/init-mods-end/type b/root/etc/s6-overlay/s6-rc.d/init-mods-end/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-mods-end/type
rename to root/etc/s6-overlay/s6-rc.d/init-mods-end/type
diff --git a/root/s6-overlay/s6-rc.d/init-mods-end/up b/root/etc/s6-overlay/s6-rc.d/init-mods-end/up
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-mods-end/up
rename to root/etc/s6-overlay/s6-rc.d/init-mods-end/up
diff --git a/root/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods
rename to root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods
diff --git a/root/s6-overlay/s6-rc.d/init-mods-package-install/type b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-mods-package-install/type
rename to root/etc/s6-overlay/s6-rc.d/init-mods-package-install/type
diff --git a/root/s6-overlay/s6-rc.d/init-mods-package-install/up b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/up
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-mods-package-install/up
rename to root/etc/s6-overlay/s6-rc.d/init-mods-package-install/up
diff --git a/root/s6-overlay/s6-rc.d/init-mods/dependencies.d/init-config-end b/root/etc/s6-overlay/s6-rc.d/init-mods/dependencies.d/init-config-end
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-mods/dependencies.d/init-config-end
rename to root/etc/s6-overlay/s6-rc.d/init-mods/dependencies.d/init-config-end
diff --git a/root/s6-overlay/s6-rc.d/init-mods/type b/root/etc/s6-overlay/s6-rc.d/init-mods/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-mods/type
rename to root/etc/s6-overlay/s6-rc.d/init-mods/type
diff --git a/root/s6-overlay/s6-rc.d/init-mods/up b/root/etc/s6-overlay/s6-rc.d/init-mods/up
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-mods/up
rename to root/etc/s6-overlay/s6-rc.d/init-mods/up
diff --git a/root/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-adduser b/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-adduser
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-adduser
rename to root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-adduser
diff --git a/root/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-device-perms b/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-device-perms
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-device-perms
rename to root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-device-perms
diff --git a/root/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-envfile b/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-envfile
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-envfile
rename to root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-envfile
diff --git a/root/s6-overlay/s6-rc.d/init-os-end/type b/root/etc/s6-overlay/s6-rc.d/init-os-end/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-os-end/type
rename to root/etc/s6-overlay/s6-rc.d/init-os-end/type
diff --git a/root/s6-overlay/s6-rc.d/init-os-end/up b/root/etc/s6-overlay/s6-rc.d/init-os-end/up
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-os-end/up
rename to root/etc/s6-overlay/s6-rc.d/init-os-end/up
diff --git a/root/s6-overlay/s6-rc.d/init-services/dependencies.d/init-custom-files b/root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d/init-custom-files
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-services/dependencies.d/init-custom-files
rename to root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d/init-custom-files
diff --git a/root/s6-overlay/s6-rc.d/init-services/type b/root/etc/s6-overlay/s6-rc.d/init-services/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-services/type
rename to root/etc/s6-overlay/s6-rc.d/init-services/type
diff --git a/root/s6-overlay/s6-rc.d/init-services/up b/root/etc/s6-overlay/s6-rc.d/init-services/up
similarity index 100%
rename from root/s6-overlay/s6-rc.d/init-services/up
rename to root/etc/s6-overlay/s6-rc.d/init-services/up
diff --git a/root/s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services
similarity index 100%
rename from root/s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services
rename to root/etc/s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services
diff --git a/root/s6-overlay/s6-rc.d/svc-cron/run b/root/etc/s6-overlay/s6-rc.d/svc-cron/run
similarity index 100%
rename from root/s6-overlay/s6-rc.d/svc-cron/run
rename to root/etc/s6-overlay/s6-rc.d/svc-cron/run
diff --git a/root/s6-overlay/s6-rc.d/svc-cron/type b/root/etc/s6-overlay/s6-rc.d/svc-cron/type
similarity index 100%
rename from root/s6-overlay/s6-rc.d/svc-cron/type
rename to root/etc/s6-overlay/s6-rc.d/svc-cron/type
diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-adduser b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-adduser
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user/contents.d/init-adduser
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-adduser
diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-config
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user/contents.d/init-config
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-config
diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-config-end b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-config-end
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user/contents.d/init-config-end
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-config-end
diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config
diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-custom-files b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-custom-files
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user/contents.d/init-custom-files
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-custom-files
diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-device-perms b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-device-perms
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user/contents.d/init-device-perms
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-device-perms
diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-envfile b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-envfile
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user/contents.d/init-envfile
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-envfile
diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-migrations b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-migrations
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user/contents.d/init-migrations
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-migrations
diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-mods b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user/contents.d/init-mods
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods
diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-mods-end b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-end
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user/contents.d/init-mods-end
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-end
diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-package-install
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user/contents.d/init-mods-package-install
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-package-install
diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-os-end b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-os-end
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user/contents.d/init-os-end
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-os-end
diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-services b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-services
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user/contents.d/init-services
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-services
diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/svc-cron b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-cron
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user/contents.d/svc-cron
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-cron
diff --git a/root/s6-overlay/s6-rc.d/user2/contents.d/ci-service-check b/root/etc/s6-overlay/s6-rc.d/user2/contents.d/ci-service-check
similarity index 100%
rename from root/s6-overlay/s6-rc.d/user2/contents.d/ci-service-check
rename to root/etc/s6-overlay/s6-rc.d/user2/contents.d/ci-service-check