diff --git a/.run/Pack Test Extension.run.xml b/.run/Pack Test Extension.run.xml
index dd89cb00d..ca96376de 100644
--- a/.run/Pack Test Extension.run.xml	
+++ b/.run/Pack Test Extension.run.xml	
@@ -14,8 +14,8 @@
     <option name="PROJECT_KIND" value="DotNetCore" />
     <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
     <method v="2">
-      <option name="Build" default="false" projectName="BTCPayServer.Plugins.Test" projectPath="C:\Git\btcpayserver\BTCPayServer.Plugins.Test\BTCPayServer.Plugins.Test.csproj" />
+      <option name="Build" default="false" projectName="BTCPayServer.Plugins.Test" projectPath="C:\Git\btcpayserver\Plugins\BTCPayServer.Plugins.Test\BTCPayServer.Plugins.Test.csproj" />
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/BTCPayServer.Plugins.Test/Views/Shared/TestExtensionNavExtension.cshtml b/BTCPayServer.Plugins.Test/Views/Shared/TestExtensionNavExtension.cshtml
deleted file mode 100644
index 9a7c63ae5..000000000
--- a/BTCPayServer.Plugins.Test/Views/Shared/TestExtensionNavExtension.cshtml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-<li class="nav-item"><a asp-controller="UITestExtension" asp-action="Index" class="nav-link js-scroll-trigger" >Dear Nicolas Dorier</a></li>
diff --git a/BTCPayServer/Components/MainNav/Default.cshtml b/BTCPayServer/Components/MainNav/Default.cshtml
index 13d13b850..c0bd6a732 100644
--- a/BTCPayServer/Components/MainNav/Default.cshtml
+++ b/BTCPayServer/Components/MainNav/Default.cshtml
@@ -27,13 +27,13 @@
                     <div class="accordion-body">
                         <ul class="navbar-nav">
                             <li class="nav-item">
-                                <a asp-area="" asp-controller="UIStores" asp-action="Dashboard" asp-route-storeId="@Model.Store.Id" class="nav-link js-scroll-trigger @ViewData.IsActivePage(StoreNavPages.Dashboard)" id="StoreNav-Dashboard">
+                                <a asp-area="" asp-controller="UIStores" asp-action="Dashboard" asp-route-storeId="@Model.Store.Id" class="nav-link @ViewData.IsActivePage(StoreNavPages.Dashboard)" id="StoreNav-Dashboard">
                                     <vc:icon symbol="home"/>
                                     <span>Dashboard</span>
                                 </a>
                             </li>
                             <li class="nav-item">
-                                <a asp-area="" asp-controller="UIStores" asp-action="GeneralSettings" asp-route-storeId="@Model.Store.Id" class="nav-link js-scroll-trigger @ViewData.IsActivePage(new [] {StoreNavPages.Rates, StoreNavPages.CheckoutAppearance, StoreNavPages.General, StoreNavPages.Tokens, StoreNavPages.Users, StoreNavPages.Plugins, StoreNavPages.Webhooks, StoreNavPages.PayoutProcessors, StoreNavPages.Emails})" id="StoreNav-StoreSettings">
+                                <a asp-area="" asp-controller="UIStores" asp-action="GeneralSettings" asp-route-storeId="@Model.Store.Id" class="nav-link @ViewData.IsActivePage(new [] {StoreNavPages.Rates, StoreNavPages.CheckoutAppearance, StoreNavPages.General, StoreNavPages.Tokens, StoreNavPages.Users, StoreNavPages.Plugins, StoreNavPages.Webhooks, StoreNavPages.PayoutProcessors, StoreNavPages.Emails})" id="StoreNav-StoreSettings">
                                     <vc:icon symbol="settings"/>
                                     <span>Settings</span>
                                 </a>
@@ -56,7 +56,7 @@
                                     <li class="nav-item">
                                         @if (isSetUp && scheme.WalletSupported)
                                         {
-                                            <a asp-area="" asp-controller="UIWallets" asp-action="WalletTransactions" asp-route-walletId="@scheme.WalletId" class="nav-link js-scroll-trigger @ViewData.IsActiveCategory(typeof(WalletsNavPages), scheme.WalletId.ToString()) @ViewData.IsActivePage(StoreNavPages.OnchainSettings)" id="@($"StoreNav-Wallet{scheme.Crypto}")">
+                                            <a asp-area="" asp-controller="UIWallets" asp-action="WalletTransactions" asp-route-walletId="@scheme.WalletId" class="nav-link @ViewData.IsActiveCategory(typeof(WalletsNavPages), scheme.WalletId.ToString()) @ViewData.IsActivePage(StoreNavPages.OnchainSettings)" id="@($"StoreNav-Wallet{scheme.Crypto}")">
                                                 <span class="me-2 btcpay-status btcpay-status--@(scheme.Enabled ? "enabled" : "pending")"></span>
                                                 <span>@(Model.AltcoinsBuild ? $"{scheme.Crypto} Wallet" : "Bitcoin")</span>
                                             </a>
@@ -97,7 +97,7 @@
                                     @foreach (var custodianAccount in Model.CustodianAccounts)
                                     {
                                         <li class="nav-item">
-                                            <a asp-area="" asp-controller="UICustodianAccounts" asp-action="ViewCustodianAccount" asp-route-storeId="@custodianAccount.StoreId" asp-route-accountId="@custodianAccount.Id" class="nav-link js-scroll-trigger @ViewData.IsActivePage(CustodianAccountsNavPages.View, custodianAccount.Id)" id="@($"StoreNav-CustodianAccount-{custodianAccount.Id}")">
+                                            <a asp-area="" asp-controller="UICustodianAccounts" asp-action="ViewCustodianAccount" asp-route-storeId="@custodianAccount.StoreId" asp-route-accountId="@custodianAccount.Id" class="nav-link @ViewData.IsActivePage(CustodianAccountsNavPages.View, custodianAccount.Id)" id="@($"StoreNav-CustodianAccount-{custodianAccount.Id}")">
                                                 @* TODO which icon should we use? *@
                                                 <span>@custodianAccount.Name</span>
                                                 <span class="badge bg-warning ms-1" style="font-size:10px;">Experimental</span>
@@ -105,7 +105,7 @@
                                         </li>
                                     }
                                     <li class="nav-item">
-                                        <a asp-area="" asp-controller="UICustodianAccounts" asp-action="CreateCustodianAccount" asp-route-storeId="@Model.Store.Id" class="nav-link js-scroll-trigger @ViewData.IsActivePage(CustodianAccountsNavPages.Create)" id="StoreNav-CreateCustodianAccount">
+                                        <a asp-area="" asp-controller="UICustodianAccounts" asp-action="CreateCustodianAccount" asp-route-storeId="@Model.Store.Id" class="nav-link @ViewData.IsActivePage(CustodianAccountsNavPages.Create)" id="StoreNav-CreateCustodianAccount">
                                             <vc:icon symbol="new"/>
                                             <span>Add Custodian</span>
                                             <span class="badge bg-warning ms-1" style="font-size:10px;">Experimental</span>
@@ -127,13 +127,13 @@
                             <div class="accordion-body">
                                 <ul class="navbar-nav">
                                     <li class="nav-item" permission="@Policies.CanViewInvoices">
-                                        <a asp-area="" asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@Model.Store.Id" class="nav-link js-scroll-trigger @ViewData.IsActiveCategory(typeof(InvoiceNavPages))" id="StoreNav-Invoices">
+                                        <a asp-area="" asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@Model.Store.Id" class="nav-link @ViewData.IsActiveCategory(typeof(InvoiceNavPages))" id="StoreNav-Invoices">
                                             <vc:icon symbol="invoice"/>
                                             <span>Invoices</span>
                                         </a>
                                     </li>
                                     <li class="nav-item" permission="@Policies.CanModifyStoreSettings">
-                                        <a asp-area="" asp-controller="UIPaymentRequest" asp-action="GetPaymentRequests" asp-route-storeId="@Model.Store.Id" class="nav-link js-scroll-trigger @ViewData.IsActiveCategory(typeof(PaymentRequestsNavPages))" id="StoreNav-PaymentRequests">
+                                        <a asp-area="" asp-controller="UIPaymentRequest" asp-action="GetPaymentRequests" asp-route-storeId="@Model.Store.Id" class="nav-link @ViewData.IsActiveCategory(typeof(PaymentRequestsNavPages))" id="StoreNav-PaymentRequests">
                                             <vc:icon symbol="payment-requests"/>
                                             <span>Requests</span>
                                         </a>
@@ -170,7 +170,7 @@
                                     <vc:ui-extension-point location="apps-nav" model="@app"/>
                                 }
                                 <li class="nav-item">
-                                    <a asp-area="" asp-controller="UIApps" asp-action="CreateApp" asp-route-storeId="@Model.Store.Id" class="nav-link js-scroll-trigger @ViewData.IsActivePage(AppsNavPages.Create)" id="StoreNav-CreateApp">
+                                    <a asp-area="" asp-controller="UIApps" asp-action="CreateApp" asp-route-storeId="@Model.Store.Id" class="nav-link @ViewData.IsActivePage(AppsNavPages.Create)" id="StoreNav-CreateApp">
                                         <vc:icon symbol="new"/>
                                         <span>New App</span>
                                     </a>
@@ -196,7 +196,7 @@
                                 <vc:ui-extension-point location="store-integrations-nav" model="@Model"/>
                             }
                             <li class="nav-item" permission="@Policies.CanModifyServerSettings">
-                                <a asp-area="" asp-controller="UIServer" asp-action="ListPlugins" class="nav-link js-scroll-trigger @ViewData.IsActivePage(ServerNavPages.Plugins)" id="Nav-ManagePlugins">
+                                <a asp-area="" asp-controller="UIServer" asp-action="ListPlugins" class="nav-link @ViewData.IsActivePage(ServerNavPages.Plugins)" id="Nav-ManagePlugins">
                                     <vc:icon symbol="new"/>
                                     <span>Manage Plugins</span>
                                 </a>
@@ -234,11 +234,11 @@
                 @if (!PoliciesSettings.LockSubscription)
                 {
                     <li class="nav-item">
-                        <a asp-area="" asp-controller="UIAccount" asp-action="Register" class="nav-link js-scroll-trigger" id="Nav-Register">Register</a>
+                        <a asp-area="" asp-controller="UIAccount" asp-action="Register" class="nav-link" id="Nav-Register">Register</a>
                     </li>
                 }
                 <li class="nav-item">
-                    <a asp-area="" asp-controller="UIAccount" asp-action="Login" class="nav-link js-scroll-trigger" id="Nav-Login">Log in</a>
+                    <a asp-area="" asp-controller="UIAccount" asp-action="Login" class="nav-link" id="Nav-Login">Log in</a>
                 </li>
             </ul>
         }
@@ -247,13 +247,13 @@
     {
         <ul id="mainNavSettings" class="navbar-nav border-top p-3 px-lg-4">
             <li class="nav-item" permission="@Policies.CanModifyServerSettings">
-                <a asp-area="" asp-controller="UIServer" asp-action="ListUsers" class="nav-link js-scroll-trigger @ViewData.IsActivePage(ServerNavPages.Users) @ViewData.IsActivePage(ServerNavPages.Emails) @ViewData.IsActivePage(ServerNavPages.Policies) @ViewData.IsActivePage(ServerNavPages.Services) @ViewData.IsActivePage(ServerNavPages.Theme) @ViewData.IsActivePage(ServerNavPages.Maintenance) @ViewData.IsActivePage(ServerNavPages.Logs) @ViewData.IsActivePage(ServerNavPages.Files)" id="Nav-ServerSettings">
+                <a asp-area="" asp-controller="UIServer" asp-action="ListUsers" class="nav-link @ViewData.IsActivePage(ServerNavPages.Users) @ViewData.IsActivePage(ServerNavPages.Emails) @ViewData.IsActivePage(ServerNavPages.Policies) @ViewData.IsActivePage(ServerNavPages.Services) @ViewData.IsActivePage(ServerNavPages.Theme) @ViewData.IsActivePage(ServerNavPages.Maintenance) @ViewData.IsActivePage(ServerNavPages.Logs) @ViewData.IsActivePage(ServerNavPages.Files)" id="Nav-ServerSettings">
                     <vc:icon symbol="server-settings"/>
                     <span>Server Settings</span>
                 </a>
             </li>
             <li class="nav-item dropup">
-                <a class="nav-link js-scroll-trigger @ViewData.IsActiveCategory(typeof(ManageNavPages))" role="button" data-bs-toggle="dropdown" aria-expanded="false" id="Nav-Account">
+                <a class="nav-link @ViewData.IsActiveCategory(typeof(ManageNavPages))" role="button" data-bs-toggle="dropdown" aria-expanded="false" id="Nav-Account">
                     <vc:icon symbol="account"/>
                     <span>Account</span>
                 </a>   
diff --git a/BTCPayServer/Views/Shared/Crowdfund/NavExtension.cshtml b/BTCPayServer/Views/Shared/Crowdfund/NavExtension.cshtml
index 79b726427..7123ecba8 100644
--- a/BTCPayServer/Views/Shared/Crowdfund/NavExtension.cshtml
+++ b/BTCPayServer/Views/Shared/Crowdfund/NavExtension.cshtml
@@ -11,7 +11,7 @@
 @if (store != null && Model.AppType == AppType.Crowdfund)
 {
     <li class="nav-item" permission="@Policies.CanModifyStoreSettings">
-        <a asp-area="" asp-controller="UICrowdfund" asp-action="UpdateCrowdfund" asp-route-appId="@Model.Id" class="nav-link js-scroll-trigger @ViewData.IsActivePage(AppsNavPages.Update, Model.Id)" id="@($"StoreNav-App-{Model.Id}")">
+        <a asp-area="" asp-controller="UICrowdfund" asp-action="UpdateCrowdfund" asp-route-appId="@Model.Id" class="nav-link @ViewData.IsActivePage(AppsNavPages.Update, Model.Id)" id="@($"StoreNav-App-{Model.Id}")">
             <vc:icon symbol="@Model.AppType.ToString().ToLower()"/>
             <span>@Model.AppName</span>
         </a>
diff --git a/BTCPayServer/Views/Shared/LNURL/LightningAddressNav.cshtml b/BTCPayServer/Views/Shared/LNURL/LightningAddressNav.cshtml
index de0b73e4b..4b2e2afb1 100644
--- a/BTCPayServer/Views/Shared/LNURL/LightningAddressNav.cshtml
+++ b/BTCPayServer/Views/Shared/LNURL/LightningAddressNav.cshtml
@@ -15,7 +15,7 @@
 @if (possible)
 {
     <li class="nav-item">
-        <a asp-area="" asp-controller="UILNURL" asp-action="EditLightningAddress" asp-route-storeId="@store.Id" class="nav-link js-scroll-trigger @ViewData.IsActivePage("LightningAddress", nameof(StoreNavPages))" id="StoreNav-LightningAddress">
+        <a asp-area="" asp-controller="UILNURL" asp-action="EditLightningAddress" asp-route-storeId="@store.Id" class="nav-link @ViewData.IsActivePage("LightningAddress", nameof(StoreNavPages))" id="StoreNav-LightningAddress">
             <vc:icon symbol="wallet-lightning"/>
             <span>Lightning Address</span>
         </a>
diff --git a/BTCPayServer/Views/Shared/PointOfSale/NavExtension.cshtml b/BTCPayServer/Views/Shared/PointOfSale/NavExtension.cshtml
index b34ffc6be..5492aa607 100644
--- a/BTCPayServer/Views/Shared/PointOfSale/NavExtension.cshtml
+++ b/BTCPayServer/Views/Shared/PointOfSale/NavExtension.cshtml
@@ -11,7 +11,7 @@
 @if (store != null && Model.AppType == AppType.PointOfSale)
 {
     <li class="nav-item" permission="@Policies.CanModifyStoreSettings">
-        <a asp-area="" asp-controller="UIPointOfSale" asp-action="UpdatePointOfSale" asp-route-appId="@Model.Id" class="nav-link js-scroll-trigger @ViewData.IsActivePage(AppsNavPages.Update, Model.Id)" id="@($"StoreNav-App-{Model.Id}")">
+        <a asp-area="" asp-controller="UIPointOfSale" asp-action="UpdatePointOfSale" asp-route-appId="@Model.Id" class="nav-link @ViewData.IsActivePage(AppsNavPages.Update, Model.Id)" id="@($"StoreNav-App-{Model.Id}")">
             <vc:icon symbol="@Model.AppType.ToString().ToLower()"/>
             <span>@Model.AppName</span>
         </a>
diff --git a/BTCPayServer/Views/Shared/Shopify/StoreIntegrationsNav.cshtml b/BTCPayServer/Views/Shared/Shopify/StoreIntegrationsNav.cshtml
index db2a90617..ac2f8437a 100644
--- a/BTCPayServer/Views/Shared/Shopify/StoreIntegrationsNav.cshtml
+++ b/BTCPayServer/Views/Shared/Shopify/StoreIntegrationsNav.cshtml
@@ -5,7 +5,7 @@
 }
 
 <li class="nav-item">
-    <a asp-area="" asp-controller="UIShopify" asp-action="EditShopify" asp-route-storeId="@store.Id" class="nav-link js-scroll-trigger @ViewData.IsActivePage("shopify", nameof(StoreNavPages))" id="StoreNav-Shopify">
+    <a asp-area="" asp-controller="UIShopify" asp-action="EditShopify" asp-route-storeId="@store.Id" class="nav-link @ViewData.IsActivePage("shopify", nameof(StoreNavPages))" id="StoreNav-Shopify">
         <vc:icon symbol="shopify"/>
         <span>Shopify</span>
     </a>
diff --git a/BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj b/Plugins/BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj
similarity index 88%
rename from BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj
rename to Plugins/BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj
index f20de0256..d0cfd8291 100644
--- a/BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj
+++ b/Plugins/BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
     <ItemGroup>
       <FrameworkReference Include="Microsoft.AspNetCore.App" />
-      <ProjectReference Include="..\BTCPayServer.Abstractions\BTCPayServer.Abstractions.csproj" />
+      <ProjectReference Include="..\..\BTCPayServer.Abstractions\BTCPayServer.Abstractions.csproj" />
       <EmbeddedResource Include="Resources\**" />
     </ItemGroup>
     <ItemGroup>
diff --git a/BTCPayServer.Plugins.Test/Controllers/UITestExtensionController.cs b/Plugins/BTCPayServer.Plugins.Test/Controllers/UITestExtensionController.cs
similarity index 100%
rename from BTCPayServer.Plugins.Test/Controllers/UITestExtensionController.cs
rename to Plugins/BTCPayServer.Plugins.Test/Controllers/UITestExtensionController.cs
diff --git a/BTCPayServer.Plugins.Test/Data/TestPluginData.cs b/Plugins/BTCPayServer.Plugins.Test/Data/TestPluginData.cs
similarity index 100%
rename from BTCPayServer.Plugins.Test/Data/TestPluginData.cs
rename to Plugins/BTCPayServer.Plugins.Test/Data/TestPluginData.cs
diff --git a/BTCPayServer.Plugins.Test/Data/TestPluginDbContext.cs b/Plugins/BTCPayServer.Plugins.Test/Data/TestPluginDbContext.cs
similarity index 100%
rename from BTCPayServer.Plugins.Test/Data/TestPluginDbContext.cs
rename to Plugins/BTCPayServer.Plugins.Test/Data/TestPluginDbContext.cs
diff --git a/BTCPayServer.Plugins.Test/Migrations/20201117154419_Init.cs b/Plugins/BTCPayServer.Plugins.Test/Migrations/20201117154419_Init.cs
similarity index 100%
rename from BTCPayServer.Plugins.Test/Migrations/20201117154419_Init.cs
rename to Plugins/BTCPayServer.Plugins.Test/Migrations/20201117154419_Init.cs
diff --git a/BTCPayServer.Plugins.Test/Migrations/TestPluginDbContextModelSnapshot.cs b/Plugins/BTCPayServer.Plugins.Test/Migrations/TestPluginDbContextModelSnapshot.cs
similarity index 100%
rename from BTCPayServer.Plugins.Test/Migrations/TestPluginDbContextModelSnapshot.cs
rename to Plugins/BTCPayServer.Plugins.Test/Migrations/TestPluginDbContextModelSnapshot.cs
diff --git a/BTCPayServer.Plugins.Test/Resources/img/screengrab.png b/Plugins/BTCPayServer.Plugins.Test/Resources/img/screengrab.png
similarity index 100%
rename from BTCPayServer.Plugins.Test/Resources/img/screengrab.png
rename to Plugins/BTCPayServer.Plugins.Test/Resources/img/screengrab.png
diff --git a/BTCPayServer.Plugins.Test/Services/ApplicationPartsLogger.cs b/Plugins/BTCPayServer.Plugins.Test/Services/ApplicationPartsLogger.cs
similarity index 100%
rename from BTCPayServer.Plugins.Test/Services/ApplicationPartsLogger.cs
rename to Plugins/BTCPayServer.Plugins.Test/Services/ApplicationPartsLogger.cs
diff --git a/BTCPayServer.Plugins.Test/Services/TestPluginDbContextFactory.cs b/Plugins/BTCPayServer.Plugins.Test/Services/TestPluginDbContextFactory.cs
similarity index 100%
rename from BTCPayServer.Plugins.Test/Services/TestPluginDbContextFactory.cs
rename to Plugins/BTCPayServer.Plugins.Test/Services/TestPluginDbContextFactory.cs
diff --git a/BTCPayServer.Plugins.Test/Services/TestPluginService.cs b/Plugins/BTCPayServer.Plugins.Test/Services/TestPluginService.cs
similarity index 100%
rename from BTCPayServer.Plugins.Test/Services/TestPluginService.cs
rename to Plugins/BTCPayServer.Plugins.Test/Services/TestPluginService.cs
diff --git a/BTCPayServer.Plugins.Test/TestExtension.cs b/Plugins/BTCPayServer.Plugins.Test/TestExtension.cs
similarity index 93%
rename from BTCPayServer.Plugins.Test/TestExtension.cs
rename to Plugins/BTCPayServer.Plugins.Test/TestExtension.cs
index eccf52b49..1ee28a06d 100644
--- a/BTCPayServer.Plugins.Test/TestExtension.cs
+++ b/Plugins/BTCPayServer.Plugins.Test/TestExtension.cs
@@ -1,10 +1,7 @@
-using System;
 using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Models;
 using BTCPayServer.Abstractions.Services;
 using BTCPayServer.Plugins.Test.Services;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace BTCPayServer.Plugins.Test
diff --git a/BTCPayServer.Plugins.Test/TestPluginMigrationRunner.cs b/Plugins/BTCPayServer.Plugins.Test/TestPluginMigrationRunner.cs
similarity index 100%
rename from BTCPayServer.Plugins.Test/TestPluginMigrationRunner.cs
rename to Plugins/BTCPayServer.Plugins.Test/TestPluginMigrationRunner.cs
diff --git a/Plugins/BTCPayServer.Plugins.Test/Views/Shared/TestExtensionNavExtension.cshtml b/Plugins/BTCPayServer.Plugins.Test/Views/Shared/TestExtensionNavExtension.cshtml
new file mode 100644
index 000000000..28fc7a06c
--- /dev/null
+++ b/Plugins/BTCPayServer.Plugins.Test/Views/Shared/TestExtensionNavExtension.cshtml
@@ -0,0 +1,2 @@
+
+<li class="nav-item"><a asp-controller="UITestExtension" asp-action="Index" class="nav-link" >Dear Nicolas Dorier</a></li>
diff --git a/BTCPayServer.Plugins.Test/Views/UITestExtension/Index.cshtml b/Plugins/BTCPayServer.Plugins.Test/Views/UITestExtension/Index.cshtml
similarity index 100%
rename from BTCPayServer.Plugins.Test/Views/UITestExtension/Index.cshtml
rename to Plugins/BTCPayServer.Plugins.Test/Views/UITestExtension/Index.cshtml
diff --git a/BTCPayServer.Plugins.Test/Views/_ViewImports.cshtml b/Plugins/BTCPayServer.Plugins.Test/Views/_ViewImports.cshtml
similarity index 100%
rename from BTCPayServer.Plugins.Test/Views/_ViewImports.cshtml
rename to Plugins/BTCPayServer.Plugins.Test/Views/_ViewImports.cshtml
diff --git a/btcpayserver.sln b/btcpayserver.sln
index 5662655bc..92c3d41c0 100644
--- a/btcpayserver.sln
+++ b/btcpayserver.sln
@@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTCPayServer.Client", "BTCP
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTCPayServer.Abstractions", "BTCPayServer.Abstractions\BTCPayServer.Abstractions.csproj", "{A0D50BB6-FE2C-4671-8693-F7582B66178F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTCPayServer.Plugins.Test", "BTCPayServer.Plugins.Test\BTCPayServer.Plugins.Test.csproj", "{545AFC8E-7BC2-43D9-84CA-F9468F4FF295}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTCPayServer.Plugins.Test", "Plugins\BTCPayServer.Plugins.Test\BTCPayServer.Plugins.Test.csproj", "{545AFC8E-7BC2-43D9-84CA-F9468F4FF295}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{1FC7F660-ADF1-4D55-B61A-85C6AB083C33}"
 EndProject