diff --git a/.github/workflows/docgenerator.yml b/.github/workflows/docgenerator.yml
index 59a4c76419..ae122ae57c 100644
--- a/.github/workflows/docgenerator.yml
+++ b/.github/workflows/docgenerator.yml
@@ -94,10 +94,10 @@ jobs:
         repository: "OWASP/owasp-masvs.git"
         ref: ${{env.MASVS_VERSION}}
         fetch-depth: 1
-        path: src/scripts/owasp-masvs
+        path: owasp-masvs
 
     - name: Get MASVS Current Commit ID
-      run: cd src/scripts/owasp-masvs && echo "MASVS_COMMIT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+      run: cd owasp-masvs && echo "MASVS_COMMIT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
     - name: Confirm MASTG Current Commit ID
       run: echo ${{env.MASVS_COMMIT}}
 
diff --git a/run_web.sh b/run_web.sh
index 8ae021287e..f14f6ec3dd 100755
--- a/run_web.sh
+++ b/run_web.sh
@@ -1,5 +1,8 @@
 # rm -rf docs/MASTG
-rm -rf docs/MASWE
+# rm -rf docs/MASWE
+# rm -rf docs/MASVS
+
+./src/scripts/structure_masvs.sh
 ./src/scripts/structure_mastg.sh
 python3 src/scripts/transform_files.py
 python3 src/scripts/populate_dynamic_pages.py
diff --git a/src/scripts/populate_dynamic_pages.py b/src/scripts/populate_dynamic_pages.py
index 9c89a4dc2e..4ad73184ce 100644
--- a/src/scripts/populate_dynamic_pages.py
+++ b/src/scripts/populate_dynamic_pages.py
@@ -100,7 +100,6 @@ def reorder_dict_keys(original_dict, key_order):
 # tests/index.md
 
 column_titles = {'id': 'ID', 'title': 'Name', 'masvs_v2_id': "MASVS v2 ID", 'masvs_v1_id': "MASVS v1 IDs", 'last_updated': 'Last Updated'} #'id': 'ID',  ... , 'refs': 'Refs', 'techniques': 'Techniques'
-
 tests = get_mastg_components_dict("docs/MASTG/tests")
 test_types = ["android", "ios"]
 for test_type in test_types:
diff --git a/src/scripts/structure_mastg.sh b/src/scripts/structure_mastg.sh
index 9c340c6792..878997a04d 100755
--- a/src/scripts/structure_mastg.sh
+++ b/src/scripts/structure_mastg.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-mkdir -p docs/MASTG
 mkdir -p docs/MASTG/Intro      
 mkdir -p docs/MASTG/General
 mkdir -p docs/MASTG/Android
diff --git a/src/scripts/structure_masvs.sh b/src/scripts/structure_masvs.sh
index ef0c59f594..487357070d 100755
--- a/src/scripts/structure_masvs.sh
+++ b/src/scripts/structure_masvs.sh
@@ -1,11 +1,23 @@
-mkdir docs/MASVS
-mkdir docs/MASVS/Intro
-mkdir docs/MASVS/controls
-cp owasp-masvs/Document/*.md docs/MASVS
+echo "$PWD"
+if [ ! -d "../../owasp-masvs/" ] ; then
+  echo "Error: Clone owasp-masvs to same directory as owasp-mastg"
+  exit
+fi
+
+mkdir -p docs/MASVS/Intro
+mkdir -p docs/MASVS/controls
+cp ../../owasp-masvs/Document/*.md docs/MASVS
 mv docs/MASVS/0[1-4]*.md docs/MASVS/Intro
-mv owasp-masvs/controls/* docs/MASVS/controls
+cp ../../owasp-masvs/controls/* docs/MASVS/controls
+
+if [[ "$(uname)" == "Darwin" ]]; then
+    SED="gsed"
+else
+    SED="sed"
+fi
+
 
-mkdir docs/assets/Images/MASVS
-mv owasp-masvs/Document/images/* docs/assets/Images/MASVS
-sed -i "s#images/#../../../assets/Images/MASVS/#g" docs/MASVS/**/*.md
-sed -i "s#images/#../../assets/Images/MASVS/#g" docs/MASVS/*.md
\ No newline at end of file
+mkdir -p docs/assets/Images/MASVS
+cp ../../owasp-masvs/Document/images/* docs/assets/Images/MASVS
+$SED -i "s#images/#../../../assets/Images/MASVS/#g" docs/MASVS/**/*.md
+$SED -i "s#images/#../../assets/Images/MASVS/#g" docs/MASVS/*.md
\ No newline at end of file