diff --git a/Zitadel.sln b/Zitadel.sln
deleted file mode 100644
index db9890de..00000000
--- a/Zitadel.sln
+++ /dev/null
@@ -1,75 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2462186B-61A8-476C-9674-176570BBEC35}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Directory.Build.props = tests\Directory.Build.props
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{47CEB49C-56A9-4BDF-BC66-54E407391D49}"
-	ProjectSection(SolutionItems) = preProject
-		src\Directory.Build.props = src\Directory.Build.props
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zitadel", "src\Zitadel\Zitadel.csproj", "{F6769E50-6690-4E96-8DD7-EA4EB4CDA91C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution", "solution", "{4533ABEB-FB66-4EF8-95D5-FD7F624A95EB}"
-ProjectSection(SolutionItems) = preProject
-	LICENSE = LICENSE
-	README.md = README.md
-	justfile = justfile
-	buf.gen.yaml = buf.gen.yaml
-EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{2342B4AF-413F-4A67-80D5-3EDEF2DA435F}"
-ProjectSection(SolutionItems) = preProject
-	.gitignore = .gitignore
-	.releaserc.json = .releaserc.json
-	renovate.json = renovate.json
-	.editorconfig = .editorconfig
-EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zitadel.Test", "tests\Zitadel.Test\Zitadel.Test.csproj", "{44543DC1-97C5-4525-8EE4-16E5389FDF4E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{F64814BA-005A-42D8-953C-676D9F814408}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zitadel.AspNet.AuthN", "examples\Zitadel.AspNet.AuthN\Zitadel.AspNet.AuthN.csproj", "{17758FFE-92C6-42D0-917B-EDF11F64BBAA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zitadel.ApiAccess", "examples\Zitadel.ApiAccess\Zitadel.ApiAccess.csproj", "{5D1B3EA7-ED4F-401C-9362-D825A074CA50}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zitadel.WebApi", "examples\Zitadel.WebApi\Zitadel.WebApi.csproj", "{48F68486-4E14-417E-B75D-DECF1ED576A5}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{F6769E50-6690-4E96-8DD7-EA4EB4CDA91C} = {47CEB49C-56A9-4BDF-BC66-54E407391D49}
-		{44543DC1-97C5-4525-8EE4-16E5389FDF4E} = {2462186B-61A8-476C-9674-176570BBEC35}
-		{17758FFE-92C6-42D0-917B-EDF11F64BBAA} = {F64814BA-005A-42D8-953C-676D9F814408}
-		{5D1B3EA7-ED4F-401C-9362-D825A074CA50} = {F64814BA-005A-42D8-953C-676D9F814408}
-		{48F68486-4E14-417E-B75D-DECF1ED576A5} = {F64814BA-005A-42D8-953C-676D9F814408}
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F6769E50-6690-4E96-8DD7-EA4EB4CDA91C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6769E50-6690-4E96-8DD7-EA4EB4CDA91C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6769E50-6690-4E96-8DD7-EA4EB4CDA91C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6769E50-6690-4E96-8DD7-EA4EB4CDA91C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44543DC1-97C5-4525-8EE4-16E5389FDF4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44543DC1-97C5-4525-8EE4-16E5389FDF4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44543DC1-97C5-4525-8EE4-16E5389FDF4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44543DC1-97C5-4525-8EE4-16E5389FDF4E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17758FFE-92C6-42D0-917B-EDF11F64BBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17758FFE-92C6-42D0-917B-EDF11F64BBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17758FFE-92C6-42D0-917B-EDF11F64BBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17758FFE-92C6-42D0-917B-EDF11F64BBAA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D1B3EA7-ED4F-401C-9362-D825A074CA50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D1B3EA7-ED4F-401C-9362-D825A074CA50}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D1B3EA7-ED4F-401C-9362-D825A074CA50}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D1B3EA7-ED4F-401C-9362-D825A074CA50}.Release|Any CPU.Build.0 = Release|Any CPU
-		{48F68486-4E14-417E-B75D-DECF1ED576A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48F68486-4E14-417E-B75D-DECF1ED576A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48F68486-4E14-417E-B75D-DECF1ED576A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48F68486-4E14-417E-B75D-DECF1ED576A5}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal
diff --git a/Zitadel.slnx b/Zitadel.slnx
new file mode 100644
index 00000000..7cc97802
--- /dev/null
+++ b/Zitadel.slnx
@@ -0,0 +1,27 @@
+<Solution>
+  <Folder Name="/config/">
+    <File Path=".editorconfig" />
+    <File Path=".gitignore" />
+    <File Path=".releaserc.json" />
+    <File Path="renovate.json" />
+  </Folder>
+  <Folder Name="/examples/">
+    <Project Path="examples/Zitadel.ApiAccess/Zitadel.ApiAccess.csproj" />
+    <Project Path="examples/Zitadel.AspNet.AuthN/Zitadel.AspNet.AuthN.csproj" />
+    <Project Path="examples/Zitadel.WebApi/Zitadel.WebApi.csproj" />
+  </Folder>
+  <Folder Name="/solution/">
+    <File Path="buf.gen.yaml" />
+    <File Path="justfile" />
+    <File Path="LICENSE" />
+    <File Path="README.md" />
+  </Folder>
+  <Folder Name="/src/">
+    <File Path="src/Directory.Build.props" />
+    <Project Path="src/Zitadel/Zitadel.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <File Path="tests/Directory.Build.props" />
+    <Project Path="tests/Zitadel.Test/Zitadel.Test.csproj" />
+  </Folder>
+</Solution>