diff --git a/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj b/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj
index 2cbaa937..11ad090d 100644
--- a/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj
+++ b/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj
@@ -5,7 +5,7 @@
     <ElectronNetDevMode>true</ElectronNetDevMode>
   </PropertyGroup>
 
-  <Import Project="..\ElectronNET\build\ElectronNET.props" Condition="$(ElectronNetDevMode)" />
+  <Import Project="..\ElectronNET\build\ElectronNET.Core.props" Condition="$(ElectronNetDevMode)" />
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -72,6 +72,6 @@
     <PackageReference Include="ElectronNET.Core" Version="0.2.0" Condition="'$(ElectronNetDevMode)' != 'true'" />
   </ItemGroup>
 
-  <Import Project="..\ElectronNET\build\ElectronNET.targets" Condition="$(ElectronNetDevMode)" />
+  <Import Project="..\ElectronNET\build\ElectronNET.Core.targets" Condition="$(ElectronNetDevMode)" />
 
 </Project>
\ No newline at end of file
diff --git a/src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj b/src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj
index 373440c2..77932967 100644
--- a/src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj
+++ b/src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj
@@ -5,7 +5,7 @@
     <ElectronNetDevMode>true</ElectronNetDevMode>
   </PropertyGroup>
 
-  <Import Project="..\ElectronNET\build\ElectronNET.props" Condition="$(ElectronNetDevMode)" />
+  <Import Project="..\ElectronNET\build\ElectronNET.Core.props" Condition="$(ElectronNetDevMode)" />
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -37,6 +37,6 @@
     <ParallelizeTestCollections>false</ParallelizeTestCollections>
   </PropertyGroup>
 
-  <Import Project="..\ElectronNET\build\ElectronNET.targets" Condition="$(ElectronNetDevMode)" />
+  <Import Project="..\ElectronNET\build\ElectronNET.Core.targets" Condition="$(ElectronNetDevMode)" />
 
 </Project>
diff --git a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
index f24ff669..da46b9e9 100644
--- a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
+++ b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
@@ -5,7 +5,7 @@
     <ElectronNetDevMode>true</ElectronNetDevMode>
   </PropertyGroup>
 
-  <Import Project="..\ElectronNET\build\ElectronNET.props" Condition="$(ElectronNetDevMode)" />
+  <Import Project="..\ElectronNET\build\ElectronNET.Core.props" Condition="$(ElectronNetDevMode)" />
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -76,6 +76,6 @@
     <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.9.3" />
   </ItemGroup>
 
-  <Import Project="..\ElectronNET\build\ElectronNET.targets" Condition="$(ElectronNetDevMode)" />
+  <Import Project="..\ElectronNET\build\ElectronNET.Core.targets" Condition="$(ElectronNetDevMode)" />
 
 </Project>
\ No newline at end of file
diff --git a/src/ElectronNET/build/ElectronNET.Core.props b/src/ElectronNET/build/ElectronNET.Core.props
index c9e1eedf..0234fbb0 100644
--- a/src/ElectronNET/build/ElectronNET.Core.props
+++ b/src/ElectronNET/build/ElectronNET.Core.props
@@ -1,6 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="$(MSBuildThisFileDirectory)ElectronNET.props" />
+  <PropertyGroup Label="ElectronNetCommon">
+    <ElectronVersion>30.4.0</ElectronVersion>
+    <ElectronBuilderVersion>26.0</ElectronBuilderVersion>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <ElectronSingleInstance>true</ElectronSingleInstance>
+    <ElectronSplashScreen></ElectronSplashScreen>
+    <ElectronIcon></ElectronIcon>
+    <PackageIcon></PackageIcon>
+    <PackageId>$(MSBuildProjectName.Replace(".", "-").ToLower())</PackageId>
+    <ElectronBuilderJson>electron-builder.json</ElectronBuilderJson>
+    <Title>$(MSBuildProjectName)</Title>
+  </PropertyGroup>
 
-</Project>
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+    <AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio>
+    <ImportNuGetBuildTasksPackTargetsFromSdk>false</ImportNuGetBuildTasksPackTargetsFromSdk>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <CustomAfterDirectoryBuildTargets>$(MSBuildThisFileDirectory)ElectronNET.LateImport.targets</CustomAfterDirectoryBuildTargets>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <CollectUpToDateCheckBuiltDesignTimeDependsOn>$(CollectUpToDateCheckBuiltDesignTimeDependsOn);ElectronCollectUpToDateCheckBuiltDesignTime</CollectUpToDateCheckBuiltDesignTimeDependsOn>
+    <FileSystemPublishDependsOn>$(FileSystemPublishDependsOn);ElectronFileSystemPublishClearItems</FileSystemPublishDependsOn>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/ElectronNET/build/ElectronNET.Core.targets b/src/ElectronNET/build/ElectronNET.Core.targets
index 4bee5104..04022f71 100644
--- a/src/ElectronNET/build/ElectronNET.Core.targets
+++ b/src/ElectronNET/build/ElectronNET.Core.targets
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="$(MSBuildThisFileDirectory)ElectronNET.targets" />
+  <PropertyGroup Condition="'$(ElectronExecutable)' == ''">
+    <WinPrefix>win</WinPrefix>
+    <ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' == 'true'">$(Title)</ElectronExecutable>
+    <ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' != 'true'">$(PackageId)</ElectronExecutable>
+  </PropertyGroup>
 
-</Project>
+  <PropertyGroup>
+    <_IsMsAspNetProject>False</_IsMsAspNetProject>
+    <_IsMsAspNetProject Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true'">True</_IsMsAspNetProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <AssemblyMetadata Include="ElectronExecutable" Value="$(ElectronExecutable)" />
+    <AssemblyMetadata Include="ElectronVersion" Value="$(ElectronVersion)" />
+    <AssemblyMetadata Include="RuntimeIdentifier" Value="$(RuntimeIdentifier)" />
+    <AssemblyMetadata Include="ElectronSingleInstance" Value="$(ElectronSingleInstance)" />
+    <AssemblyMetadata Include="Title" Value="$(Title)" />
+    <AssemblyMetadata Include="Version" Value="$(Version)" />
+    <AssemblyMetadata Include="BuildConfiguration" Value="$(Configuration)" />
+    <AssemblyMetadata Include="IsAspNet" Value="$(_IsMsAspNetProject)" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/ElectronNET/build/ElectronNET.props b/src/ElectronNET/build/ElectronNET.props
deleted file mode 100644
index f616fbbd..00000000
--- a/src/ElectronNET/build/ElectronNET.props
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="ElectronNetCommon">
-    <ElectronVersion>30.4.0</ElectronVersion>
-    <ElectronBuilderVersion>26.0</ElectronBuilderVersion>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <ElectronSingleInstance>true</ElectronSingleInstance>
-    <ElectronSplashScreen></ElectronSplashScreen>
-    <ElectronIcon></ElectronIcon>
-    <PackageIcon></PackageIcon>
-    <PackageId>$(MSBuildProjectName.Replace(".", "-").ToLower())</PackageId>
-    <ElectronBuilderJson>electron-builder.json</ElectronBuilderJson>
-    <Title>$(MSBuildProjectName)</Title>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio>
-    <ImportNuGetBuildTasksPackTargetsFromSdk>false</ImportNuGetBuildTasksPackTargetsFromSdk>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <CustomAfterDirectoryBuildTargets>$(MSBuildThisFileDirectory)ElectronNET.LateImport.targets</CustomAfterDirectoryBuildTargets>
-  </PropertyGroup>  
-
-  <PropertyGroup>
-    <CollectUpToDateCheckBuiltDesignTimeDependsOn>$(CollectUpToDateCheckBuiltDesignTimeDependsOn);ElectronCollectUpToDateCheckBuiltDesignTime</CollectUpToDateCheckBuiltDesignTimeDependsOn>
-    <FileSystemPublishDependsOn>$(FileSystemPublishDependsOn);ElectronFileSystemPublishClearItems</FileSystemPublishDependsOn>
-  </PropertyGroup>  
-
-</Project>
diff --git a/src/ElectronNET/build/ElectronNET.targets b/src/ElectronNET/build/ElectronNET.targets
deleted file mode 100644
index 518cdb78..00000000
--- a/src/ElectronNET/build/ElectronNET.targets
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Condition="'$(ElectronExecutable)' == ''">
-    <WinPrefix>win</WinPrefix>
-    <ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' == 'true'">$(Title)</ElectronExecutable>
-    <ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' != 'true'">$(PackageId)</ElectronExecutable>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <_IsMsAspNetProject>False</_IsMsAspNetProject>
-    <_IsMsAspNetProject Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true'">True</_IsMsAspNetProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <AssemblyMetadata Include="ElectronExecutable" Value="$(ElectronExecutable)" />
-    <AssemblyMetadata Include="ElectronVersion" Value="$(ElectronVersion)" />
-    <AssemblyMetadata Include="RuntimeIdentifier" Value="$(RuntimeIdentifier)" />
-    <AssemblyMetadata Include="ElectronSingleInstance" Value="$(ElectronSingleInstance)" />
-    <AssemblyMetadata Include="Title" Value="$(Title)" />
-    <AssemblyMetadata Include="Version" Value="$(Version)" />
-    <AssemblyMetadata Include="BuildConfiguration" Value="$(Configuration)" />
-    <AssemblyMetadata Include="IsAspNet" Value="$(_IsMsAspNetProject)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/common.props b/src/common.props
index a9a5b9a0..554f4bf8 100644
--- a/src/common.props
+++ b/src/common.props
@@ -14,16 +14,6 @@
     <PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/main/Changelog.md</PackageReleaseNotes>
     <PackageIcon>PackageIcon.png</PackageIcon>
     <DescriptionFirstPart>Building cross platform electron based desktop apps with .NET Core and - optionally - ASP.NET Core.</DescriptionFirstPart>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(SOFTWORKZ)' == '1'">
-    <Version>50.0.24.0</Version>
-    <PackageNamePrefix>ElectronNET</PackageNamePrefix>
-    <PackageProjectUrl>/</PackageProjectUrl>
-    <PublishRepositoryUrl>false</PublishRepositoryUrl>
-    <PackageReleaseNotes></PackageReleaseNotes>
-    <PackageIcon>PackageIcon.png</PackageIcon>
-  </PropertyGroup>
-  <PropertyGroup>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <Version>$(Version)$(VersionPostFix)</Version>