diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8ad92c39..9b86da48 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 env:
-  PACKAGE_PATH: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg
+  NUGET_DIR: '${{ github.workspace }}/nuget'
 
 jobs:
   publish-pkg:
@@ -18,38 +18,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    # - name: Extract Version
-    #   id: version
-    #   uses: battila7/get-version-action@v2
+      - name: Pack Blazor.Diagrams.Core
+        working-directory: src/Blazor.Diagrams.Core
+        run: 'dotnet pack -p:GeneratePackageOnBuild=false --configuration Release --output ${{ env.NUGET_DIR }}'
 
-    - name: Checkout
-      uses: actions/checkout@v3
+      - name: Pack Blazor.Diagrams
+        working-directory: src/Blazor.Diagrams
+        run: 'dotnet pack -p:GeneratePackageOnBuild=false --configuration Release --output ${{ env.NUGET_DIR }}'
 
-    - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: |
-            6.0.x
-            3.1.x
-
-    - name: Install dependencies
-      run: dotnet restore
-
-    - name: Build
-      run: dotnet build --no-restore --configuration Release
-
-    - name: Create NuGet Packages
-      run: dotnet pack --no-restore --no-build --configuration Release /p:CommitID=${{ github.sha }} /p:TagVersion=${{ github.sha }}
-
-    # Upload package as an atrifact to the GitHub action
-    - name: Upload packages
-      uses: actions/upload-artifact@v3
-      with:
-        name: package
-        path: ${{ env.PACKAGE_PATH }}
-        retention-days: 5
-
-    # - name: Publish NuGet Package to NuGet Gallery
-    #   run: |
-    #     nuget setapikey ${{ secrets.NUGET_API_KEY }}
-    #     nuget push bin/WTG.Z.Blazor.Diagrams.${{ steps.tag_name.outputs.result }}.nupkg -Source https://api.nuget.org/v3/index.json
+      - name: Pack Blazor.Diagrams.Algorithms
+        working-directory: src/Blazor.Diagrams.Algorithms
+        run: 'dotnet pack -p:GeneratePackageOnBuild=false --configuration Release --output ${{ env.NUGET_DIR }}'
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
deleted file mode 100644
index 8d4e146f..00000000
--- a/src/Directory.Build.targets
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(NuspecFile)' != ''">
-    <IsPackable>true</IsPackable>
-    <NuspecProperties>
-      id=$(PackageId);
-      version=$(ShortVersion)$(VersionSuffix);
-      company=$(Company);
-      copyright=$(Copyright);
-      commitid=$(CommitID);
-    </NuspecProperties>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/WTG.Z.Blazor.Diagrams.nuspec b/src/WTG.Z.Blazor.Diagrams.nuspec
deleted file mode 100644
index 43ee2fec..00000000
--- a/src/WTG.Z.Blazor.Diagrams.nuspec
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <metadata>
-        <id>WTG.Analyzers</id>
-        <version>$version$</version>
-        <authors>$company$</authors>
-        <owners>$company$</owners>
-        <license type="file">LICENSE</license>
-        <projectUrl>https://github.com/WiseTechGlobal/Blazor.Diagrams</projectUrl>
-        <description>Z.Blazor.Diagrams is a fully customizable and extensible all-purpose diagrams
-            library for Blazor (both Server Side and WASM). It was first inspired by the popular
-            React library react-diagrams, but then evolved into something much bigger. ZBD can be
-            used to make advanced diagrams with a custom design. Even the behavior of the library is
-            "hackable" and can be changed to suit your needs.</description>
-        <copyright>$copyright$</copyright>
-        <repository type="git" url="https://github.com/WiseTechGlobal/Blazor.Diagrams"
-            commit="$commitid$" />
-        <!-- <icon>images\icon.png</icon> -->
-        <developmentDependency>true</developmentDependency>
-    </metadata>
-
-    <files>
-        <!-- Binaries -->
-        <file src="bin\netstandard2.0\WTG.Analyzers.dll" target="analyzers\dotnet\cs" />
-        <file src="bin\netstandard2.0\WTG.Analyzers.Utils.dll" target="analyzers\dotnet\cs" />
-
-        <!-- MSBuild Properties and Targets -->
-        <file src="src\WTG.Analyzers\build\WTG.Analyzers.props" target="build\" />
-        <file src="src\WTG.Analyzers\build\WarnAll.editorconfig" target="build\" />
-
-        <!-- Other -->
-        <file src="LICENSE" target="" />
-        <!-- <file src="icon.png" target="images" /> -->
-    </files>
-</package>
\ No newline at end of file