diff --git a/.github/workflows/build-csharp.yml b/.github/workflows/build-csharp.yml
index 149b3fd8..035963e3 100644
--- a/.github/workflows/build-csharp.yml
+++ b/.github/workflows/build-csharp.yml
@@ -37,13 +37,13 @@ jobs:
         run: go run schemas/main.go --schema-next=false
 
       - name: Run generation
-        run: time kiota generate -l csharp --ll trace -o $(pwd)/../dotnet-sdk/GitHub/Octokit -c OctokitClient -n GitHub.Octokit -d schemas/downloaded.json
+        run: time kiota generate -l csharp --ll trace -o $(pwd)/../dotnet-sdk/src/GitHub -c GitHubClient -n GitHub -d schemas/downloaded.json
 
       - name: Build post-processing
         run: go build -o post-processors/csharp/post-processor post-processors/csharp/main.go
 
       - name: Run post-processing
-        run: post-processors/csharp/post-processor $(pwd)/../dotnet-sdk/GitHub/Octokit
+        run: post-processors/csharp/post-processor $(pwd)/../dotnet-sdk/src/GitHub
 
       - name: Build generated and processed SDK
         run: |
diff --git a/.github/workflows/build-go.yml b/.github/workflows/build-go.yml
index c4d7ceab..f01dd6f2 100644
--- a/.github/workflows/build-go.yml
+++ b/.github/workflows/build-go.yml
@@ -37,7 +37,7 @@ jobs:
         run: go run schemas/main.go --schema-next=false
 
       - name: Run generation
-        run: kiota generate -l go --ll trace -o $(pwd)/../go-sdk/github/octokit -n "github.com/octokit/go-sdk/github/octokit/" -d schemas/downloaded.json
+        run: kiota generate -l go --ll trace -o $(pwd)/../go-sdk/pkg/github -n "github.com/octokit/go-sdk/pkg/github/" -d schemas/downloaded.json
 
       - name: Build post-processing
         run: go build -o post-processors/go/post-processor post-processors/go/main.go
diff --git a/scripts/generate-csharp.sh b/scripts/generate-csharp.sh
index 6c8a1f18..0028e3e4 100755
--- a/scripts/generate-csharp.sh
+++ b/scripts/generate-csharp.sh
@@ -5,13 +5,13 @@
 go run schemas/main.go --schema-next=false
 
 # Execute generation
-kiota generate -l csharp --ll trace -o generated/csharp/GitHub/Octokit -c OctokitClient -n GitHub.Octokit -d schemas/downloaded.json --co
+kiota generate -l csharp --ll trace -o generated/csharp/src/GitHub -c GitHubClient -n GitHub -d schemas/downloaded.json --co
 
 # Build and run post-processor
 go build -o $(pwd)/post-processors/csharp/post-processor post-processors/csharp/main.go
-$(pwd)/post-processors/csharp/post-processor $(pwd)/generated/csharp/GitHub/Octokit
+$(pwd)/post-processors/csharp/post-processor $(pwd)/generated/csharp/src/GitHub
 
 # Build and run the generated code and call the API via generated SDK
-cd generated/csharp/GitHub
+cd generated/csharp/src
 dotnet restore
 dotnet run --project GitHub.Octokit.csproj
\ No newline at end of file
diff --git a/scripts/generate-go.sh b/scripts/generate-go.sh
index f05bc82b..745b3632 100755
--- a/scripts/generate-go.sh
+++ b/scripts/generate-go.sh
@@ -9,7 +9,7 @@
 set -ex
 
 go run schemas/main.go --schema-next=false
-kiota generate -l go --ll trace -o $(pwd)/../go-sdk/github/octokit -n octokit -d schemas/downloaded.json
+kiota generate -l go --ll trace -o $(pwd)/../go-sdk/pkg/github -n github.com/octokit/go-sdk/pkg/github -d schemas/downloaded.json
 go build -o post-processors/go/post-processor post-processors/go/main.go
 cd $(pwd)/../go-sdk
 $(pwd)/../source-generator/post-processors/go/post-processor $(pwd)