diff --git a/Directory.Build.props b/Directory.Build.props
index 6373b26..a6b23ae 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,18 +3,26 @@
   <!-- Common properties -->
   <PropertyGroup>
     <!-- SolutionDir is not defined when building projects explicitly -->
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+
+    <ProjectRoot Condition="Exists('$(MSBuildProjectDirectory)/Mycoshiro.Dataverse.LINQPad.sln')">$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)))</ProjectRoot>
+    <ProjectRoot Condition="Exists('$(MSBuildProjectDirectory)/../Mycoshiro.Dataverse.LINQPad.sln')">$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)/../'))</ProjectRoot>
+
+    <ProjectRootPrefix Condition="HasTrailingSlash('$(ProjectRoot)')">$(ProjectRoot)</ProjectRootPrefix>
+    <ProjectRootPrefix Condition="!HasTrailingSlash('$(ProjectRoot)')">$(ProjectRoot)/</ProjectRootPrefix>
+
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(ProjectRoot)</SolutionDir>
+    <Deterministic>true</Deterministic>
     <SolutionDir Condition=" '$(SolutionDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), README.md))\</SolutionDir>
-    <!-- Output paths -->
-    <!--
-        <OutputPath>$(SolutionDir)../Output/bin/$(MSBuildProjectName)</OutputPath>
-        <IntermediateOutputPath>$(SolutionDir)../Output/obj/$(MSBuildProjectName)</IntermediateOutputPath>
-        <BaseIntermediateOutputPath>$(IntermediateOutputPath)</BaseIntermediateOutputPath>
-    !-->
 
-    <OutputPath>$(SolutionDir).build\out\$(Configuration)\$(Platform)\</OutputPath>
-    <IntermediateOutputPath>$(SolutionDir).build\obj\$(Configuration)\$(Platform)\$(MSBuildProjectName)\</IntermediateOutputPath>
-    <BaseIntermediateOutputPath>$(SolutionDir).build\obj\$(Configuration)\$(Platform)\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
-    <OutDir>$(OutputPath)</OutDir>
-    <DocumentationFile>$(SolutionDir).build\doc\$(Configuration)\$(Platform)\$(MSBuildProjectName).xml</DocumentationFile>
+    <OutputPath>$(ProjectRootPrefix)bin/$(Configuration)/</OutputPath>
+    <OutDir>$(OutputPath)/</OutDir>
+    <BaseIntermediateOutputPath>$(ProjectRootPrefix).build/$(MSBuildProjectName)/</BaseIntermediateOutputPath>
+    <BaseOutputPath>$(BaseIntermediateOutputPath)</BaseOutputPath>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)/$(Platform)/</IntermediateOutputPath>
+    <IntDir>$(BaseIntermediateOutputPath)$(Configuration)/$(Platform)/</IntDir>
+    <UseCommonOutputDirectory>false</UseCommonOutputDirectory>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+
   </PropertyGroup>
 </Project>
diff --git a/src/Mycoshiro.Dataverse.LINQPad.sln b/Mycoshiro.Dataverse.LINQPad.sln
similarity index 83%
rename from src/Mycoshiro.Dataverse.LINQPad.sln
rename to Mycoshiro.Dataverse.LINQPad.sln
index 21a6f92..50f570e 100644
--- a/src/Mycoshiro.Dataverse.LINQPad.sln
+++ b/Mycoshiro.Dataverse.LINQPad.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34511.84
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mycoshiro.Dataverse.LINQPad", "Mycoshiro.Dataverse.LINQPad.csproj", "{1AEC13A1-A7A0-4E31-8C55-E9E0A2C54511}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mycoshiro.Dataverse.LINQPad", "src/Mycoshiro.Dataverse.LINQPad.csproj", "{1AEC13A1-A7A0-4E31-8C55-E9E0A2C54511}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MarkMpn.FetchXmlToWebAPI", "MarkMpn.FetchXmlToWebAPI\MarkMpn.FetchXmlToWebAPI\MarkMpn.FetchXmlToWebAPI.shproj", "{543E6D79-2913-4B00-AAAC-5661F6ADB1A5}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MarkMpn.FetchXmlToWebAPI", "src/MarkMpn.FetchXmlToWebAPI/MarkMpn.FetchXmlToWebAPI/MarkMpn.FetchXmlToWebAPI.shproj", "{543E6D79-2913-4B00-AAAC-5661F6ADB1A5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MarkMpn.FetchXmlToWebAPI.Tests", "MarkMpn.FetchXmlToWebAPI\MarkMpn.FetchXmlToWebAPI.Tests\MarkMpn.FetchXmlToWebAPI.Tests.csproj", "{2F49870B-5B83-468D-9DA7-C7D0299CAE81}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MarkMpn.FetchXmlToWebAPI.Tests", "src/MarkMpn.FetchXmlToWebAPI/MarkMpn.FetchXmlToWebAPI.Tests/MarkMpn.FetchXmlToWebAPI.Tests.csproj", "{2F49870B-5B83-468D-9DA7-C7D0299CAE81}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -71,8 +71,8 @@ Global
 		SolutionGuid = {DE088616-0D66-4525-A34F-4D36042A5B1C}
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		MarkMpn.FetchXmlToWebAPI\MarkMpn.FetchXmlToWebAPI\MarkMpn.FetchXmlToWebAPI.projitems*{1aec13a1-a7a0-4e31-8c55-e9e0a2c54511}*SharedItemsImports = 5
-		MarkMpn.FetchXmlToWebAPI\MarkMpn.FetchXmlToWebAPI\MarkMpn.FetchXmlToWebAPI.projitems*{2f49870b-5b83-468d-9da7-c7d0299cae81}*SharedItemsImports = 5
-		MarkMpn.FetchXmlToWebAPI\MarkMpn.FetchXmlToWebAPI\MarkMpn.FetchXmlToWebAPI.projitems*{543e6d79-2913-4b00-aaac-5661f6adb1a5}*SharedItemsImports = 13
+		src/MarkMpn.FetchXmlToWebAPI/MarkMpn.FetchXmlToWebAPI/MarkMpn.FetchXmlToWebAPI.projitems*{1aec13a1-a7a0-4e31-8c55-e9e0a2c54511}*SharedItemsImports = 5
+		src/MarkMpn.FetchXmlToWebAPI/MarkMpn.FetchXmlToWebAPI/MarkMpn.FetchXmlToWebAPI.projitems*{2f49870b-5b83-468d-9da7-c7d0299cae81}*SharedItemsImports = 5
+		src/MarkMpn.FetchXmlToWebAPI/MarkMpn.FetchXmlToWebAPI/MarkMpn.FetchXmlToWebAPI.projitems*{543e6d79-2913-4b00-aaac-5661f6adb1a5}*SharedItemsImports = 13
 	EndGlobalSection
 EndGlobal