diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-dangling-embed/go.mod b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/dangling-embed/go.mod
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-dangling-embed/go.mod
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/dangling-embed/go.mod
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-dangling-embed/main.go b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/dangling-embed/main.go
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-dangling-embed/main.go
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/dangling-embed/main.go
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/go.mod b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/gomod/go.mod
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/go.mod
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/gomod/go.mod
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/go.sum b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/gomod/go.sum
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/go.sum
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/gomod/go.sum
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/main.go b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/gomod/main.go
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/main.go
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/gomod/main.go
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/main_test.go b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/gomod/main_test.go
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/main_test.go
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/gomod/main_test.go
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-no-deps/go.mod b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/no-deps/go.mod
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-no-deps/go.mod
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/no-deps/go.mod
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-submodules/app/go.mod b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules/app/go.mod
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-submodules/app/go.mod
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules/app/go.mod
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-submodules/app/go.sum b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules/app/go.sum
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-submodules/app/go.sum
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules/app/go.sum
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-submodules/app/main.go b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules/app/main.go
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-submodules/app/main.go
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules/app/main.go
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-submodules/utils/go.mod b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules/utils/go.mod
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-submodules/utils/go.mod
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules/utils/go.mod
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-submodules/utils/go.sum b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules/utils/go.sum
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-submodules/utils/go.sum
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules/utils/go.sum
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-submodules/utils/texts.go b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules/utils/texts.go
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-submodules/utils/texts.go
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules/utils/texts.go
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-subpkg/cmd/main.go b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg/cmd/main.go
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-subpkg/cmd/main.go
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg/cmd/main.go
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-subpkg/go.mod b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg/go.mod
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-subpkg/go.mod
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg/go.mod
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-subpkg/go.sum b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg/go.sum
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-subpkg/go.sum
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg/go.sum
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-unused-deps/go.mod b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/unused-deps/go.mod
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-unused-deps/go.mod
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/unused-deps/go.mod
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-unused-deps/go.sum b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/unused-deps/go.sum
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-unused-deps/go.sum
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/unused-deps/go.sum
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/go.mod b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/go.mod
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/go.mod
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/go.mod
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/go.sum b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/go.sum
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/go.sum
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/go.sum
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/go.work b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/go.work
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/go.work
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/go.work
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/go.work.sum b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/go.work.sum
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/go.work.sum
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/go.work.sum
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/main.go b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/main.go
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/main.go
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/main.go
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/other-module/go.mod b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/other-module/go.mod
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/other-module/go.mod
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/other-module/go.mod
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/other-module/go.sum b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/other-module/go.sum
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/other-module/go.sum
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/other-module/go.sum
diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/other-module/main.go b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/other-module/main.go
similarity index 100%
rename from plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod-workspaces/other-module/main.go
rename to plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces/other-module/main.go
diff --git a/plugins/package-managers/go/src/funTest/kotlin/GoModFunTest.kt b/plugins/package-managers/go/src/funTest/kotlin/GoModFunTest.kt
index c483a962df656..9ec2516924ff6 100644
--- a/plugins/package-managers/go/src/funTest/kotlin/GoModFunTest.kt
+++ b/plugins/package-managers/go/src/funTest/kotlin/GoModFunTest.kt
@@ -36,7 +36,7 @@ class GoModFunTest : StringSpec({
     val testDir = getAssetFile("projects/synthetic")
 
     "Project dependencies are detected correctly" {
-        val definitionFile = testDir.resolve("gomod/go.mod")
+        val definitionFile = testDir.resolve("gomod/gomod/go.mod")
         val expectedResultFile = testDir.resolve("gomod-expected-output.yml")
 
         val result = create("GoMod").resolveSingleProject(definitionFile)
@@ -45,7 +45,7 @@ class GoModFunTest : StringSpec({
     }
 
     "Project dependencies are detected correctly if the main package does not contain any code" {
-        val definitionFile = testDir.resolve("gomod-subpkg/go.mod")
+        val definitionFile = testDir.resolve("gomod/subpkg/go.mod")
         val expectedResultFile = testDir.resolve("gomod-subpkg-expected-output.yml")
 
         val result = create("GoMod").resolveSingleProject(definitionFile)
@@ -54,7 +54,7 @@ class GoModFunTest : StringSpec({
     }
 
     "Project dependencies are detected correctly if there are no dependencies" {
-        val definitionFile = testDir.resolve("gomod-no-deps/go.mod")
+        val definitionFile = testDir.resolve("gomod/no-deps/go.mod")
         val expectedResultFile = testDir.resolve("gomod-no-deps-expected-output.yml")
 
         val result = create("GoMod").resolveSingleProject(definitionFile)
@@ -63,7 +63,7 @@ class GoModFunTest : StringSpec({
     }
 
     "Project dependencies of a main module in a multi-module workspaces are detected correctly" {
-        val definitionFile = testDir.resolve("gomod-workspaces/go.mod")
+        val definitionFile = testDir.resolve("gomod/workspaces/go.mod")
         val expectedResultFile = testDir.resolve("gomod-workspaces-main-module-expected-output.yml")
 
         val result = create("GoMod").resolveSingleProject(definitionFile)
@@ -72,7 +72,7 @@ class GoModFunTest : StringSpec({
     }
 
     "Project dependencies of a submodule in a multi-module workspaces are detected correctly" {
-        val definitionFile = testDir.resolve("gomod-workspaces/other-module/go.mod")
+        val definitionFile = testDir.resolve("gomod/workspaces/other-module/go.mod")
         val expectedResultFile = testDir.resolve("gomod-workspaces-sub-module-expected-output.yml")
 
         val result = create("GoMod").resolveSingleProject(definitionFile)
@@ -81,7 +81,7 @@ class GoModFunTest : StringSpec({
     }
 
     "Unused dependencies are not contained in the result" {
-        val definitionFile = testDir.resolve("gomod-unused-deps/go.mod")
+        val definitionFile = testDir.resolve("gomod/unused-deps/go.mod")
         val expectedResultFile = testDir.resolve("gomod-unused-deps-expected-output.yml")
 
         val result = create("GoMod").resolveSingleProject(definitionFile)
@@ -90,7 +90,7 @@ class GoModFunTest : StringSpec({
     }
 
     "Source files with dangling embed directives do not yield issues" {
-        val definitionFile = testDir.resolve("gomod-dangling-embed/go.mod")
+        val definitionFile = testDir.resolve("gomod/dangling-embed/go.mod")
         val expectedResultFile = testDir.resolve("gomod-dangling-embed-expected-output.yml")
 
         val result = create("GoMod").resolveSingleProject(definitionFile)
@@ -99,8 +99,8 @@ class GoModFunTest : StringSpec({
     }
 
     "Project dependencies with a (relative) local module dependency are detected correctly" {
-        val definitionFileApp = testDir.resolve("gomod-submodules/app/go.mod")
-        val definitionFileUtils = testDir.resolve("gomod-submodules/utils/go.mod")
+        val definitionFileApp = testDir.resolve("gomod/submodules/app/go.mod")
+        val definitionFileUtils = testDir.resolve("gomod/submodules/utils/go.mod")
         val expectedResultFile = testDir.resolve("gomod-submodules-expected-output.yml")
         val expectedDefinitionFilePathUtils = getDefinitionFilePath(definitionFileUtils)