diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 4636900..6df2973 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -19,7 +19,7 @@ jobs:
       with:
         go-version: ${{ env.GO_VERSION }}
     - name: Write version
-      run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
+      run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
     - name: Install libfido2-dev
       run: sudo apt-get install -y libfido2-dev
     - name: Build Debug
@@ -38,7 +38,7 @@ jobs:
       with:
         go-version: ${{ env.GO_VERSION }}
     - name: Write version
-      run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
+      run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
     - name: Install libfido2-dev
       run: sudo apt-get install -y libfido2-dev
     - name: Build
@@ -57,7 +57,7 @@ jobs:
       with:
         go-version: ${{ env.GO_VERSION }}
     - name: Write version
-      run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
+      run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
     - name: Install libfido2-dev
       run: sudo apt-get install -y libfido2-dev
     - name: Build
@@ -76,7 +76,7 @@ jobs:
       with:
         go-version: ${{ env.GO_VERSION }}
     - name: Write version
-      run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
+      run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
     - name: Build
       run: GOARCH=386 go build -tags nofido2 -o goldwarden_linux_x86 -v .
     - uses: actions/upload-artifact@v3
@@ -94,7 +94,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Write version
-        run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
+        run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
       - name: Set up Homebrew
         id: set-up-homebrew
         uses: Homebrew/actions/setup-homebrew@master
@@ -117,7 +117,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Write version
-        run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
+        run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
       - name: Set up Homebrew
         id: set-up-homebrew
         uses: Homebrew/actions/setup-homebrew@master
@@ -140,7 +140,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Write version
-        run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
+        run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
       - uses: MinoruSekine/setup-scoop@v2
       - name: Fido2
         run: |
@@ -163,7 +163,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Write version
-        run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
+        run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
       - name: Build
         run: set GOARCH=arm64 && go build -tags nofido2 -o "goldwarden_windows_aarch64.exe" -v .
       - uses: actions/upload-artifact@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 67f8c09..2f2c27f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
       with:
         go-version: ${{ env.GO_VERSION }}
     - name: Write version
-      run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
+      run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
     - name: Install libfido2-dev
       run: sudo apt-get install -y libfido2-dev
     - name: Build
@@ -84,7 +84,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Write version
-      run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
+      run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
@@ -101,7 +101,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Write version
-      run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
+      run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
@@ -119,7 +119,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Write version
-        run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
+        run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
@@ -142,7 +142,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Write version
-        run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
+        run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
@@ -165,7 +165,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Write version
-        run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
+        run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
@@ -188,7 +188,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Write version
-        run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
+        run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
@@ -206,7 +206,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Write version
-        run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
+        run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
       - name: Replace version in PKGBUILD
         run: sed -i "s/pkgver=.*/pkgver=${GITHUB_REF#refs\/tags\//}/" ./.github/workflows/PKGBUILD
       - name: Publish AUR package