diff --git a/master-based-workflow/setup.sh b/master-based-workflow/setup.sh
index 1dec6ded..c2c4a8b3 100644
--- a/master-based-workflow/setup.sh
+++ b/master-based-workflow/setup.sh
@@ -3,9 +3,8 @@ source ../utils/utils.sh
 
 rm -rf exercise
 
-mkdir exercise
-cp fitzgerald-pushes-before-we-do.sh ./exercise/
-cd exercise
+make-exercise-repo
+cp ../fitzgerald-pushes-before-we-do.sh .
 
 git  -c init.defaultBranch="$DEFAULT_BRANCH" init fake-remote-repository
 pushd fake-remote-repository 
diff --git a/submodules/setup.sh b/submodules/setup.sh
index 5f8f14ef..76c0fc6c 100755
--- a/submodules/setup.sh
+++ b/submodules/setup.sh
@@ -8,8 +8,7 @@ source ../utils/utils.sh
 rm -rf exercise
 
 # Create exercise folder & go there
-mkdir exercise
-cd exercise
+make-exercise-repo
 
 # Create remote repo
 make-bare-remote-repo