diff --git a/docs/layer/rpi-connect-lite.html b/docs/layer/rpi-connect-lite.html
index 234d551d..f7974877 100644
--- a/docs/layer/rpi-connect-lite.html
+++ b/docs/layer/rpi-connect-lite.html
@@ -350,7 +350,7 @@ <h3>Packages</h3>
 
     <div class="section">
         <h2>Attributes</h2>
-        <p><strong>File:</strong> <code>rpi/services/rpi-connect-lite.yaml</code></p>
+        <p><strong>File:</strong> <code>rpi/device/services/rpi-connect-lite.yaml</code></p>
         
     </div>
 </body>
diff --git a/docs/layer/rpi-connect.html b/docs/layer/rpi-connect.html
index c48c8b26..7aeef0d7 100644
--- a/docs/layer/rpi-connect.html
+++ b/docs/layer/rpi-connect.html
@@ -353,7 +353,7 @@ <h3>Packages</h3>
 
     <div class="section">
         <h2>Attributes</h2>
-        <p><strong>File:</strong> <code>rpi/services/rpi-connect.yaml</code></p>
+        <p><strong>File:</strong> <code>rpi/device/services/rpi-connect.yaml</code></p>
         
     </div>
 </body>
diff --git a/layer/rpi/services/rpi-connect-common.adoc b/layer/rpi/device/services/rpi-connect-common.adoc
similarity index 100%
rename from layer/rpi/services/rpi-connect-common.adoc
rename to layer/rpi/device/services/rpi-connect-common.adoc
diff --git a/layer/rpi/services/rpi-connect-lite.adoc b/layer/rpi/device/services/rpi-connect-lite.adoc
similarity index 100%
rename from layer/rpi/services/rpi-connect-lite.adoc
rename to layer/rpi/device/services/rpi-connect-lite.adoc
diff --git a/layer/rpi/services/rpi-connect-lite.yaml b/layer/rpi/device/services/rpi-connect-lite.yaml
similarity index 100%
rename from layer/rpi/services/rpi-connect-lite.yaml
rename to layer/rpi/device/services/rpi-connect-lite.yaml
diff --git a/layer/rpi/services/rpi-connect.adoc b/layer/rpi/device/services/rpi-connect.adoc
similarity index 100%
rename from layer/rpi/services/rpi-connect.adoc
rename to layer/rpi/device/services/rpi-connect.adoc
diff --git a/layer/rpi/services/rpi-connect.yaml b/layer/rpi/device/services/rpi-connect.yaml
similarity index 100%
rename from layer/rpi/services/rpi-connect.yaml
rename to layer/rpi/device/services/rpi-connect.yaml