diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 18c6c06..34b6404 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,11 +19,11 @@ jobs:
         npm run build:azure
       name: Build code
     - name: Install GitVersion
-      uses: ./setup-gitversion
+      uses: ./gitversion/setup
       with:
         versionSpec: '5.1.2'
     - name: Use GitVersion
       id: gitversion # step id used as reference for output values
-      uses: ./execute-gitversion
+      uses: ./gitversion/execute
     - run: |
         echo "FullSemVer: ${{ steps.gitversion.outputs.fullSemVer }}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index eb16507..48aa30e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,12 +21,12 @@ jobs:
         npm run build:azure
       name: Build code
     - name: Install GitVersion
-      uses: ./setup-gitversion
+      uses: ./gitversion/setup
       with:
         versionSpec: '5.1.2'
     - name: Use GitVersion
       id: gitversion # step id used as reference for output values
-      uses: ./execute-gitversion
+      uses: ./gitversion/execute
     - run: |
         $date = Get-Date -format "yyMMddHHmm"
         $version = "${{steps.gitversion.outputs.majorMinorPatch}}.$date"
diff --git a/setup-gitreleasemanager/action.yml b/gitreleasemanager/setup/action.yml
similarity index 90%
rename from setup-gitreleasemanager/action.yml
rename to gitreleasemanager/setup/action.yml
index bb09927..6799073 100644
--- a/setup-gitreleasemanager/action.yml
+++ b/gitreleasemanager/setup/action.yml
@@ -6,7 +6,7 @@ branding:
   icon: git-pull-request
 runs:
   using: node12
-  main: ../dist/github/setup-gitreleasemanager/bundle.js
+  main: ../../dist/github/setup-gitreleasemanager/bundle.js
 inputs:
   versionSpec:
     description: Required version in the form of 0.10.x or exact version like 0.10.2
diff --git a/execute-gitversion/action.yml b/gitversion/execute/action.yml
similarity index 98%
rename from execute-gitversion/action.yml
rename to gitversion/execute/action.yml
index c729148..6eea7d5 100644
--- a/execute-gitversion/action.yml
+++ b/gitversion/execute/action.yml
@@ -6,7 +6,7 @@ branding:
   icon: git-pull-request
 runs:
   using: node12
-  main: ../dist/github/execute-gitversion/bundle.js
+  main: ../../dist/github/execute-gitversion/bundle.js
 inputs:
   targetPath:
     description: Optionally supply the path to the working directory
diff --git a/setup-gitversion/action.yml b/gitversion/setup/action.yml
similarity index 90%
rename from setup-gitversion/action.yml
rename to gitversion/setup/action.yml
index d4058ca..124d3bc 100644
--- a/setup-gitversion/action.yml
+++ b/gitversion/setup/action.yml
@@ -6,7 +6,7 @@ branding:
   icon: git-pull-request
 runs:
   using: node12
-  main: ../dist/github/setup-gitversion/bundle.js
+  main: ../../dist/github/setup-gitversion/bundle.js
 inputs:
   versionSpec:
     description: Required version in the form of 5.x or exact version like 5.0.0