diff --git a/.gitignore b/.gitignore
index 6b45e70..72e061e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,3 +112,4 @@ src/NmeaParser.sln.ide/
 project.lock.json
 src/.vs/
 artifacts
+.tools
diff --git a/build/GenerateDoc.cmd b/build/GenerateDoc.cmd
index 2961585..882f9ed 100644
--- a/build/GenerateDoc.cmd
+++ b/build/GenerateDoc.cmd
@@ -1,20 +1,18 @@
 @ECHO OFF
 
 SET DocFXVersion=2.48.1
-SET DocFxFolder=%~dp0\..\artifacts\toolset
+SET DocFxFolder=%~dp0\..\.tools\docfx
 
 REM Download DocFx
 powershell -ExecutionPolicy ByPass -command "%~dp0/DownloadDocFX.ps1" -Version %DocFXVersion% -Folder %DocFxFolder%
 
-REM Build metadata for all platforms (uses configuration in docfx.json in this folder)
-%DocFxFolder%\v%DocFXVersion%\docfx.exe %~dp0..\docs\docfx.json metadata
-
 REM Merge output (not implemented)
 REM %DocFxFolder%\v%DocFXVersion%\docfx.exe merge
 
 REM Generate OMD
-dotnet tool install --global dotMorten.OmdGenerator
-generateomd /source=%~dp0../src/NmeaParser /output=%~dp0../artifacts/docs/api/omd.html
+dotnet tool install --tool-path .tools/omd dotMorten.OmdGenerator --version 1.2.0
+mkdir %~dp0../artifacts/docs/api
+.tools\omd\generateomd /source=%~dp0../src/NmeaParser /output=%~dp0../artifacts/docs/api/omd.html /preprocessors=NETSTANDARD1_4;NETSTANDARD
 
 REM Build the output site (HTML) from the generated metadata and input files (uses configuration in docfx.json in this folder)
-%DocFxFolder%\v%DocFXVersion%\docfx.exe %~dp0..\docs\docfx.json build
+%DocFxFolder%\v%DocFXVersion%\docfx.exe %~dp0..\docs\docfx.json 
diff --git a/src/NmeaParser/NmeaParser.csproj b/src/NmeaParser/NmeaParser.csproj
index a749a09..3d6e6e0 100644
--- a/src/NmeaParser/NmeaParser.csproj
+++ b/src/NmeaParser/NmeaParser.csproj
@@ -18,7 +18,7 @@
     <RepositoryUrl>https://github.com/dotMorten/NmeaParser</RepositoryUrl>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Copyright>Copyright © Morten Nielsen 2015-2020</Copyright>
-    <OutputPath>$(MSBuildThisFileDirectory)..\Bin\$(Configuration)</OutputPath>
+    <OutputPath>$(MSBuildThisFileDirectory)..\..\artifacts\NmeaParser\$(Configuration)</OutputPath>
     <PackageOutputPath>$(OutDir)</PackageOutputPath>
     <PackageReleaseNotes>New refined and easier to use v2 API</PackageReleaseNotes>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>