 +    echo "do_configure: Modifying edk2/ShellPkg/ShellPkg.dsc to build SBSA."
 +    if ! grep -q SbsaPalLib "${WORKDIR}/edk2/ShellPkg/ShellPkg.dsc"
 +    then
-+        sed -i '/LibraryClasses.common/ a \ \ SbsaPalLib|AppPkg/Applications/Sbsa/pal/SbsaPalLib.inf' ${WORKDIR}/edk2/ShellPkg/ShellPkg.dsc
++        sed -i '/LibraryClasses.common/ a \ \ SbsaPalLib|AppPkg/Applications/sbsa-acs/platform/pal_uefi/SbsaPalLib.inf' ${WORKDIR}/edk2/ShellPkg/ShellPkg.dsc
 +    fi
 +    if ! grep -q SbsaValLib "${WORKDIR}/edk2/ShellPkg/ShellPkg.dsc"
 +    then
-+        sed -i '/LibraryClasses.common/ a \ \ SbsaValLib|AppPkg/Applications/Sbsa/val/SbsaValLib.inf' ${WORKDIR}/edk2/ShellPkg/ShellPkg.dsc
++        sed -i '/LibraryClasses.common/ a \ \ SbsaValLib|AppPkg/Applications/sbsa-acs/val/SbsaValLib.inf' ${WORKDIR}/edk2/ShellPkg/ShellPkg.dsc
 +    fi
 +    if ! grep -q SbsaAvs "${WORKDIR}/edk2/ShellPkg/ShellPkg.dsc"
 +    then
-+        sed -i '/Components/ a \ \ AppPkg/Applications/Sbsa/SbsaAvs.inf' ${WORKDIR}/edk2/ShellPkg/ShellPkg.dsc
++        sed -i '/Components/ a \ \ AppPkg/Applications/sbsa-acs/uefi_app/SbsaAvs.inf' ${WORKDIR}/edk2/ShellPkg/ShellPkg.dsc
 +    fi
 +}
 +

+        rm test_pool
+    fi
+    cd ${WORKDIR}/edk2/AppPkg/Applications
+    if [ -d Sbsa ]
+    then
+        echo "do_configure: Existing Sbsa found, deleted."
+        rm Sbsa
+    fi
+    cd ${WORKDIR}/git
+    set -- "${WORKDIR}/git" "${WORKDIR}/edk2"

+
+    # Linking SBSA and EDK2.
+    echo "do_configure: Linking SBSA to EDK2."
+    cd ${WORKDIR}/git/uefi_app
+    if [ -d val ]
+    then
+        echo "do_configure: Existing val found, deleted."
