Index: recipes-bsp/manufacturing/leahi-manufacturing_1.0.bb
===================================================================
diff -u -r384b338e3e21c87bcd761587e52fa982c622181f -r2df48ce106115bdffce459d6bd6f4913bc404c33
--- recipes-bsp/manufacturing/leahi-manufacturing_1.0.bb	(.../leahi-manufacturing_1.0.bb)	(revision 384b338e3e21c87bcd761587e52fa982c622181f)
+++ recipes-bsp/manufacturing/leahi-manufacturing_1.0.bb	(.../leahi-manufacturing_1.0.bb)	(revision 2df48ce106115bdffce459d6bd6f4913bc404c33)
@@ -22,27 +22,36 @@
 do_install() {
     bbplain    " ---------- Leahi: Install "
     # build the required folders
-    install -d                              ${D}/opt/leahi/
-    install -d                              ${D}/opt/leahi/scripts/
-    install -d                              ${D}/opt/leahi/translations/
-    install -d                              ${D}/mnt/data/
+    install -d                              ${D}/opt/leahi
+    install -d                              ${D}/opt/leahi/scripts
+    install -d                              ${D}/opt/leahi/translations
+    install -d                              ${D}/opt/leahi/configurations
 
     # installing the required files
     install -m 0644 ${S}/leahi              ${D}/opt/leahi/
     install -m 0644 ${S}/run.sh             ${D}/opt/leahi/
-    install -m 0644 ${S}/eglfs.json         ${D}/opt/leahi/eglfs.json
+    install -m 0644 ${S}/eglfs.json         ${D}/opt/leahi/
     install -m 0644 ${S}/scripts/*.sh       ${D}/opt/leahi/scripts/
     install -m 0644 ${S}/translations/*.qm  ${D}/opt/leahi/translations/
-    install -m 0644 ${S}/configurations     ${D}/mnt/data/
 
+    CONFS="${S}/configurations"
+    CONFD="${D}/opt/leahi/configurations"
+    for d in $(find ${CONFS}/* -type d);do
+        directory=`basename ${d}`
+        install -d ${CONFD}/${directory};
+        find ${CONFS}/${directory}/* ! -name *.*~ -type f -exec   \
+            install -m 644 {} ${CONFD}/${directory}/              \
+        \;
+    done
+
     # give the execution permission to owner
     chmod 755 ${D}/opt/leahi/leahi
     chmod 755 ${D}/opt/leahi/run.sh
     chmod 755 ${D}/opt/leahi/scripts/*.sh
 
     # setting up the leahi service
     install -d ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/leahi.service ${D}${systemd_system_unitdir}
+    install -m 644 ${S}/leahi.service ${D}${systemd_system_unitdir}
 }
 
 FILES:${PN} += "/opt/leahi/*"