diff --git a/DnsServerWindowsService/DnsServerWindowsService.csproj b/DnsServerWindowsService/DnsServerWindowsService.csproj
new file mode 100644
index 00000000..e9e3fed4
--- /dev/null
+++ b/DnsServerWindowsService/DnsServerWindowsService.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk.Worker">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <RootNamespace>DnsServerWindowsService</RootNamespace>
+    <AssemblyName>DnsService</AssemblyName>
+    <ApplicationIcon>logo2.ico</ApplicationIcon>
+    <Version>6.0</Version>
+    <Authors>Shreyas Zare</Authors>
+    <Company>Technitium</Company>
+    <Product>Technitium DNS Server</Product>
+    <Description>.NET 5</Description>
+    <PackageProjectUrl>https://technitium.com/dns/</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/TechnitiumSoftware/DnsServer</RepositoryUrl>
+    <PackageId>DnsServerWindowsService</PackageId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="TechnitiumLibrary.Net.Firewall">
+      <HintPath>..\..\TechnitiumLibrary\bin\TechnitiumLibrary.Net.Firewall.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DnsServerCore\DnsServerCore.csproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/DnsService/DnsServiceWorker.cs b/DnsServerWindowsService/DnsServiceWorker.cs
similarity index 98%
rename from DnsService/DnsServiceWorker.cs
rename to DnsServerWindowsService/DnsServiceWorker.cs
index 989cf734..29a027da 100644
--- a/DnsService/DnsServiceWorker.cs
+++ b/DnsServerWindowsService/DnsServiceWorker.cs
@@ -23,7 +23,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace DnsService
+namespace DnsServerWindowsService
 {
     public class DnsServiceWorker : BackgroundService
     {
diff --git a/DnsService/Program.cs b/DnsServerWindowsService/Program.cs
similarity index 99%
rename from DnsService/Program.cs
rename to DnsServerWindowsService/Program.cs
index 639546ae..0398d680 100644
--- a/DnsService/Program.cs
+++ b/DnsServerWindowsService/Program.cs
@@ -23,7 +23,7 @@ using System;
 using System.Reflection;
 using TechnitiumLibrary.Net.Firewall;
 
-namespace DnsService
+namespace DnsServerWindowsService
 {
     static class Program
     {
diff --git a/DnsServerWindowsService/Properties/PublishProfiles/FolderProfile.pubxml b/DnsServerWindowsService/Properties/PublishProfiles/FolderProfile.pubxml
new file mode 100644
index 00000000..a073f992
--- /dev/null
+++ b/DnsServerWindowsService/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\DnsServerWindowsSetup\publish</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net5.0</TargetFramework>
+    <SelfContained>false</SelfContained>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/DnsService/logo2.ico b/DnsServerWindowsService/logo2.ico
similarity index 100%
rename from DnsService/logo2.ico
rename to DnsServerWindowsService/logo2.ico
diff --git a/DnsService/DnsService.csproj b/DnsService/DnsService.csproj
deleted file mode 100644
index 10c6cb8a..00000000
--- a/DnsService/DnsService.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows7.0</TargetFramework>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-
-    <RootNamespace>DnsService</RootNamespace>
-    <AssemblyName>DnsService</AssemblyName>
-    <ApplicationIcon>logo2.ico</ApplicationIcon>
-    <Version>2.6.0.0</Version>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="TechnitiumLibrary.Net.Firewall">
-      <HintPath>..\..\TechnitiumLibrary\bin\TechnitiumLibrary.Net.Firewall.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\DnsServerCore\DnsServerCore.csproj">
-      <Project>{4494b79b-588c-41f2-95ad-0897123af154}</Project>
-      <Name>DnsServerCore</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0" />
-  </ItemGroup>
-</Project>
\ No newline at end of file