diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 1e42413..a68393d 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -21,11 +21,6 @@ jobs:
       uses: actions/setup-go@v3
       with:
         go-version: 'stable'
-      
-    - name: Build and Test on Default Platform
-      run: |
-        go build -v ./...
-        go test -v ./...
     
     - name: Delete Existing Release Assets
       run: |
@@ -54,6 +49,7 @@ jobs:
     - name: Build and Release
       run: |
         mkdir -p bin
+        cd cmd
         CGO_ENABLED=0 GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build -o ../bin/gostun-${{ matrix.goos }}-${{ matrix.goarch }} -v -ldflags="-extldflags=-static" .
 
     - name: Upload New Assets
diff --git a/main.go b/cmd/main.go
similarity index 100%
rename from main.go
rename to cmd/main.go
diff --git a/main_test.go b/cmd/main_test.go
similarity index 100%
rename from main_test.go
rename to cmd/main_test.go