diff --git a/.gitignore b/.gitignore
index 4867c4e..9a60e94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,306 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+.vs/
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+/BTCPayServer/Build/dockerfiles
+
+# Bundling JS/CSS
+BTCPayServer/wwwroot/bundles/*
+!BTCPayServer/wwwroot/bundles/.gitignore
+
+.vscode/*
+!.vscode/launch.json
+!.vscode/tasks.json
+!.vscode/extensions.json
+BTCPayServer/testpwd
+.DS_Store
+Packed Plugins
+
+
 bin/
 obj/
 /packages/
diff --git a/BIP78.Receiver/BIP78.Receiver.csproj b/BIP78.Receiver/BTCPayServer.BIP78.Receiver.csproj
similarity index 77%
rename from BIP78.Receiver/BIP78.Receiver.csproj
rename to BIP78.Receiver/BTCPayServer.BIP78.Receiver.csproj
index d7e4204..0991d40 100644
--- a/BIP78.Receiver/BIP78.Receiver.csproj
+++ b/BIP78.Receiver/BTCPayServer.BIP78.Receiver.csproj
@@ -8,16 +8,16 @@
         <RepositoryUrl>https://github.com/BTCPayServer/BTCPayServer.BIP78</RepositoryUrl>
         <PackageTags>NBitcoin Bitcoin Payjoin BIP78 Privacy</PackageTags>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageId>BIP78.Receiver</PackageId>
+        <PackageId>BTCPayServer.BIP78.Receiver</PackageId>
         <Description>A library to help you add BIP78 payjoin receiving support in your bitcoin wallet.</Description>
         <PackageProjectUrl>https://github.com/BTCPayServer/BTCPayServer.BIP78</PackageProjectUrl>
-        <PackageLicenseUrl>https://raw.githubusercontent.com/BTCPayServer/BTCPayServer.BIP78/master/LICENSE</PackageLicenseUrl>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageVersion>0.1.0</PackageVersion>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\BIP78.Sender\BIP78.Sender.csproj" />
+      <ProjectReference Include="..\BIP78.Sender\BTCPayServer.BIP78.Sender.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/BIP78.Receiver/PayjoinProposalContext.cs b/BIP78.Receiver/PayjoinProposalContext.cs
index 3f24ef0..07156dd 100644
--- a/BIP78.Receiver/PayjoinProposalContext.cs
+++ b/BIP78.Receiver/PayjoinProposalContext.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using BIP78.Sender;
+using BTCPayServer.BIP78.Sender;
 using NBitcoin;
 
-namespace BIP78.Receiver
+namespace BTCPayServer.BIP78.Receiver
 {
     public class PayjoinProposalContext
     {
diff --git a/BIP78.Receiver/PayjoinReceiverWallet.cs b/BIP78.Receiver/PayjoinReceiverWallet.cs
index 6352a8d..471b003 100644
--- a/BIP78.Receiver/PayjoinReceiverWallet.cs
+++ b/BIP78.Receiver/PayjoinReceiverWallet.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using BIP78.Sender;
+using BTCPayServer.BIP78.Sender;
 using NBitcoin;
 
-namespace BIP78.Receiver
+namespace BTCPayServer.BIP78.Receiver
 {
     public class PayjoinPaymentRequest
     {
diff --git a/BIP78.Receiver/PayjoinReceiverWalletProposal.cs b/BIP78.Receiver/PayjoinReceiverWalletProposal.cs
index 387616c..aa86190 100644
--- a/BIP78.Receiver/PayjoinReceiverWalletProposal.cs
+++ b/BIP78.Receiver/PayjoinReceiverWalletProposal.cs
@@ -1,6 +1,6 @@
 using NBitcoin;
 
-namespace BIP78.Receiver
+namespace BTCPayServer.BIP78.Receiver
 {
     public class PayjoinReceiverWalletProposal 
     {
diff --git a/BIP78.Sender/BIP78.Sender.csproj b/BIP78.Sender/BTCPayServer.BIP78.Sender.csproj
similarity index 77%
rename from BIP78.Sender/BIP78.Sender.csproj
rename to BIP78.Sender/BTCPayServer.BIP78.Sender.csproj
index fcd5b64..357442a 100644
--- a/BIP78.Sender/BIP78.Sender.csproj
+++ b/BIP78.Sender/BTCPayServer.BIP78.Sender.csproj
@@ -5,12 +5,12 @@
         <Authors>Andrew Camilleri / Kukks / BTCPay Server</Authors>
         <Copyright>MIT</Copyright>
         <RepositoryUrl>https://github.com/BTCPayServer/BTCPayServer.BIP78</RepositoryUrl>
-        <PackageTags>NBitcoin Bitcoin Payjoin BIP78 Privacy</PackageTags>
+        <PackageTags>BTCPayServer Bitcoin Payjoin BIP78 Privacy</PackageTags>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageId>BIP78.Sender</PackageId>
+        <PackageId>BTCPayServer.BIP78.Sender</PackageId>
         <Description>A library to help you add BIP78 payjoin sending support in your bitcoin wallet.</Description>
         <PackageProjectUrl>https://github.com/BTCPayServer/BTCPayServer.BIP78</PackageProjectUrl>
-        <PackageLicenseUrl>https://raw.githubusercontent.com/BTCPayServer/BTCPayServer.BIP78/master/LICENSE</PackageLicenseUrl>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageVersion>0.1.0</PackageVersion>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
diff --git a/BIP78.Sender/IPayjoinServerCommunicator.cs b/BIP78.Sender/IPayjoinServerCommunicator.cs
index 2599bb7..4436dd2 100644
--- a/BIP78.Sender/IPayjoinServerCommunicator.cs
+++ b/BIP78.Sender/IPayjoinServerCommunicator.cs
@@ -3,7 +3,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using NBitcoin;
 
-namespace BIP78.Sender
+namespace BTCPayServer.BIP78.Sender
 {
     public interface IPayjoinServerCommunicator
     {
diff --git a/BIP78.Sender/IPayjoinWallet.cs b/BIP78.Sender/IPayjoinWallet.cs
index 464b9c0..f720599 100644
--- a/BIP78.Sender/IPayjoinWallet.cs
+++ b/BIP78.Sender/IPayjoinWallet.cs
@@ -1,6 +1,6 @@
 using NBitcoin;
 
-namespace BIP78.Sender
+namespace BTCPayServer.BIP78.Sender
 {
     public interface IPayjoinWallet: IHDScriptPubKey
     {
diff --git a/BIP78.Sender/PSBTExtensions.cs b/BIP78.Sender/PSBTExtensions.cs
index d24d6b8..1a7f202 100644
--- a/BIP78.Sender/PSBTExtensions.cs
+++ b/BIP78.Sender/PSBTExtensions.cs
@@ -3,7 +3,7 @@ using System.Linq;
 using NBitcoin;
 using NBitcoin.Payment;
 
-namespace BIP78.Sender
+namespace BTCPayServer.BIP78.Sender
 {
     public static class PSBTExtensions
     {
diff --git a/BIP78.Sender/PayjoinClient.cs b/BIP78.Sender/PayjoinClient.cs
index f55b915..53859f7 100644
--- a/BIP78.Sender/PayjoinClient.cs
+++ b/BIP78.Sender/PayjoinClient.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using NBitcoin;
 using NBitcoin.Payment;
 
-namespace BIP78.Sender
+namespace BTCPayServer.BIP78.Sender
 {
     public class PayjoinClient
     {
diff --git a/BIP78.Sender/PayjoinClientParameters.cs b/BIP78.Sender/PayjoinClientParameters.cs
index 2547c8d..63e1073 100644
--- a/BIP78.Sender/PayjoinClientParameters.cs
+++ b/BIP78.Sender/PayjoinClientParameters.cs
@@ -1,6 +1,6 @@
 using NBitcoin;
 
-namespace BIP78.Sender
+namespace BTCPayServer.BIP78.Sender
 {
     public class PayjoinClientParameters
     {
diff --git a/BIP78.Sender/PayjoinException.cs b/BIP78.Sender/PayjoinException.cs
index 2f39afb..c7bff11 100644
--- a/BIP78.Sender/PayjoinException.cs
+++ b/BIP78.Sender/PayjoinException.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace BIP78.Sender
+namespace BTCPayServer.BIP78.Sender
 {
     public class PayjoinException : Exception
     {
diff --git a/BIP78.Sender/PayjoinReceiverException.cs b/BIP78.Sender/PayjoinReceiverException.cs
index 64e59dd..bf70da8 100644
--- a/BIP78.Sender/PayjoinReceiverException.cs
+++ b/BIP78.Sender/PayjoinReceiverException.cs
@@ -1,4 +1,4 @@
-namespace BIP78.Sender
+namespace BTCPayServer.BIP78.Sender
 {
     public class PayjoinReceiverException : PayjoinException
     {
diff --git a/BIP78.Sender/PayjoinReceiverHelper.cs b/BIP78.Sender/PayjoinReceiverHelper.cs
index 33018d9..57950ca 100644
--- a/BIP78.Sender/PayjoinReceiverHelper.cs
+++ b/BIP78.Sender/PayjoinReceiverHelper.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace BIP78.Sender
+namespace BTCPayServer.BIP78.Sender
 {
     public class PayjoinReceiverHelper
     {
diff --git a/BIP78.Sender/PayjoinReceiverWellknownErrors.cs b/BIP78.Sender/PayjoinReceiverWellknownErrors.cs
index 1c7e276..c241717 100644
--- a/BIP78.Sender/PayjoinReceiverWellknownErrors.cs
+++ b/BIP78.Sender/PayjoinReceiverWellknownErrors.cs
@@ -1,4 +1,4 @@
-namespace BIP78.Sender
+namespace BTCPayServer.BIP78.Sender
 {
     public enum PayjoinReceiverWellknownErrors
     {
diff --git a/BIP78.Sender/PayjoinSenderException.cs b/BIP78.Sender/PayjoinSenderException.cs
index b1c1ee8..89d1508 100644
--- a/BIP78.Sender/PayjoinSenderException.cs
+++ b/BIP78.Sender/PayjoinSenderException.cs
@@ -1,4 +1,4 @@
-namespace BIP78.Sender
+namespace BTCPayServer.BIP78.Sender
 {
     public class PayjoinSenderException : PayjoinException
     {
diff --git a/BTCPayServer.BIP78.sln b/BTCPayServer.BIP78.sln
index 8243745..e2f8c78 100644
--- a/BTCPayServer.BIP78.sln
+++ b/BTCPayServer.BIP78.sln
@@ -1,8 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BIP78.Sender", "BIP78.Sender\BIP78.Sender.csproj", "{068BAE62-52DE-4200-BB20-FF4D84B007D5}"
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30104.148
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTCPayServer.BIP78.Sender", "BIP78.Sender\BTCPayServer.BIP78.Sender.csproj", "{068BAE62-52DE-4200-BB20-FF4D84B007D5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BIP78.Receiver", "BIP78.Receiver\BIP78.Receiver.csproj", "{4EAFF42C-8424-4BBB-93E5-4E0A7DF7EFCC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTCPayServer.BIP78.Receiver", "BIP78.Receiver\BTCPayServer.BIP78.Receiver.csproj", "{4EAFF42C-8424-4BBB-93E5-4E0A7DF7EFCC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,4 +22,10 @@ Global
 		{4EAFF42C-8424-4BBB-93E5-4E0A7DF7EFCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4EAFF42C-8424-4BBB-93E5-4E0A7DF7EFCC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C3F91CF3-2D53-43A4-A401-F18563F33971}
+	EndGlobalSection
 EndGlobal