diff --git a/Aaru.Server.sln b/Aaru.Server.sln
deleted file mode 100644
index 746ff733..00000000
--- a/Aaru.Server.sln
+++ /dev/null
@@ -1,44 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28922.388
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution files", "Solution files", "{CF9EB732-03B9-4B3B-B96B-E0E685063700}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		.gitignore = .gitignore
-		.gitmodules = .gitmodules
-		codealike.json = codealike.json
-		LICENSE = LICENSE
-		LICENSE.LGPL = LICENSE.LGPL
-		LICENSE.MIT = LICENSE.MIT
-		Directory.Build.props = Directory.Build.props
-		Directory.Packages.props = Directory.Packages.props
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Server", "Aaru.Server\Aaru.Server.csproj", "{032D24BA-EC3B-4BD1-ADD6-9463E2DC5D7E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Server.Database", "Aaru.Server.Database\Aaru.Server.Database.csproj", "{FA830C89-B3C4-4139-B756-B6C0F35C0BB4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{032D24BA-EC3B-4BD1-ADD6-9463E2DC5D7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{032D24BA-EC3B-4BD1-ADD6-9463E2DC5D7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{032D24BA-EC3B-4BD1-ADD6-9463E2DC5D7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{032D24BA-EC3B-4BD1-ADD6-9463E2DC5D7E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA830C89-B3C4-4139-B756-B6C0F35C0BB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA830C89-B3C4-4139-B756-B6C0F35C0BB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA830C89-B3C4-4139-B756-B6C0F35C0BB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA830C89-B3C4-4139-B756-B6C0F35C0BB4}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8A988A8F-0588-4935-AAB6-64E34A68CE30}
-	EndGlobalSection
-EndGlobal
diff --git a/Aaru.Server.slnx b/Aaru.Server.slnx
new file mode 100644
index 00000000..65a3cd39
--- /dev/null
+++ b/Aaru.Server.slnx
@@ -0,0 +1,15 @@
+<Solution>
+  <Folder Name="/Solution files/">
+    <File Path=".editorconfig" />
+    <File Path=".gitignore" />
+    <File Path=".gitmodules" />
+    <File Path="codealike.json" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+    <File Path="LICENSE" />
+    <File Path="LICENSE.LGPL" />
+    <File Path="LICENSE.MIT" />
+  </Folder>
+  <Project Path="Aaru.Server.Database/Aaru.Server.Database.csproj" />
+  <Project Path="Aaru.Server/Aaru.Server.csproj" />
+</Solution>