diff --git a/BTCPayServer.Data/Data/ApplicationDbContext.cs b/BTCPayServer.Data/ApplicationDbContext.cs
similarity index 89%
rename from BTCPayServer.Data/Data/ApplicationDbContext.cs
rename to BTCPayServer.Data/ApplicationDbContext.cs
index c4b11d62e..7de0753a8 100644
--- a/BTCPayServer.Data/Data/ApplicationDbContext.cs
+++ b/BTCPayServer.Data/ApplicationDbContext.cs
@@ -30,37 +30,36 @@ namespace BTCPayServer.Data
             _designTime = designTime;
         }
 
-        public DbSet<InvoiceData> Invoices { get; set; }
-        public DbSet<RefundData> Refunds { get; set; }
-        public DbSet<PlannedTransaction> PlannedTransactions { get; set; }
-        public DbSet<PayjoinLock> PayjoinLocks { get; set; }
+        public DbSet<AddressInvoiceData> AddressInvoices { get; set; }
+        public DbSet<APIKeyData> ApiKeys { get; set; }
         public DbSet<AppData> Apps { get; set; }
-        public DbSet<InvoiceEventData> InvoiceEvents { get; set; }
-        public DbSet<OffchainTransactionData> OffchainTransactions { get; set; }
+        public DbSet<StoredFile> Files { get; set; }
         public DbSet<HistoricalAddressInvoiceData> HistoricalAddressInvoices { get; set; }
-        public DbSet<PendingInvoiceData> PendingInvoices { get; set; }
-        public DbSet<PaymentData> Payments { get; set; }
+        public DbSet<InvoiceEventData> InvoiceEvents { get; set; }
+        public DbSet<InvoiceSearchData> InvoiceSearchDatas { get; set; }
+        public DbSet<InvoiceWebhookDeliveryData> InvoiceWebhookDeliveries { get; set; }
+        public DbSet<InvoiceData> Invoices { get; set; }
+        public DbSet<NotificationData> Notifications { get; set; }
+        public DbSet<OffchainTransactionData> OffchainTransactions { get; set; }
+        public DbSet<PairedSINData> PairedSINData { get; set; }
+        public DbSet<PairingCodeData> PairingCodes { get; set; }
+        public DbSet<PayjoinLock> PayjoinLocks { get; set; }
         public DbSet<PaymentRequestData> PaymentRequests { get; set; }
-        public DbSet<PullPaymentData> PullPayments { get; set; }
+        public DbSet<PaymentData> Payments { get; set; }
         public DbSet<PayoutData> Payouts { get; set; }
+        public DbSet<PendingInvoiceData> PendingInvoices { get; set; }
+        public DbSet<PlannedTransaction> PlannedTransactions { get; set; }
+        public DbSet<PullPaymentData> PullPayments { get; set; }
+        public DbSet<RefundData> Refunds { get; set; }
+        public DbSet<SettingData> Settings { get; set; }
+        public DbSet<StoreWebhookData> StoreWebhooks { get; set; }
+        public DbSet<StoreData> Stores { get; set; }
+        public DbSet<U2FDevice> U2FDevices { get; set; }
+        public DbSet<UserStore> UserStore { get; set; }
         public DbSet<WalletData> Wallets { get; set; }
         public DbSet<WalletTransactionData> WalletTransactions { get; set; }
-        public DbSet<StoreData> Stores { get; set; }
-        public DbSet<UserStore> UserStore { get; set; }
-        public DbSet<AddressInvoiceData> AddressInvoices { get; set; }
-        public DbSet<SettingData> Settings { get; set; }
-        public DbSet<PairingCodeData> PairingCodes { get; set; }
-        public DbSet<PairedSINData> PairedSINData { get; set; }
-        public DbSet<APIKeyData> ApiKeys { get; set; }
-        public DbSet<StoredFile> Files { get; set; }
-        public DbSet<U2FDevice> U2FDevices { get; set; }
-        public DbSet<NotificationData> Notifications { get; set; }
-
-        public DbSet<StoreWebhookData> StoreWebhooks { get; set; }
-        public DbSet<WebhookData> Webhooks { get; set; }
         public DbSet<WebhookDeliveryData> WebhookDeliveries { get; set; }
-        public DbSet<InvoiceWebhookDeliveryData> InvoiceWebhookDeliveries { get; set; }
-        public DbSet<InvoiceSearchData> InvoiceSearchDatas { get; set; }
+        public DbSet<WebhookData> Webhooks { get; set; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
@@ -72,29 +71,40 @@ namespace BTCPayServer.Data
         protected override void OnModelCreating(ModelBuilder builder)
         {
             base.OnModelCreating(builder);
-            Data.UserStore.OnModelCreating(builder);
-            NotificationData.OnModelCreating(builder);
-            InvoiceData.OnModelCreating(builder);
-            InvoiceSearchData.OnModelCreating(builder);
-            PaymentData.OnModelCreating(builder);
+
+            // some of the data models don't have OnModelCreating for now, commenting them
+
+            AddressInvoiceData.OnModelCreating(builder);
             APIKeyData.OnModelCreating(builder);
             AppData.OnModelCreating(builder);
-            AddressInvoiceData.OnModelCreating(builder);
-            PairingCodeData.OnModelCreating(builder);
-            PendingInvoiceData.OnModelCreating(builder);
-            Data.PairedSINData.OnModelCreating(builder);
+            //StoredFile.OnModelCreating(builder);
             HistoricalAddressInvoiceData.OnModelCreating(builder);
             InvoiceEventData.OnModelCreating(builder);
+            InvoiceSearchData.OnModelCreating(builder);
+            InvoiceWebhookDeliveryData.OnModelCreating(builder);
+            InvoiceData.OnModelCreating(builder);
+            NotificationData.OnModelCreating(builder);
+            //OffchainTransactionData.OnModelCreating(builder);
+            Data.PairedSINData.OnModelCreating(builder);
+            PairingCodeData.OnModelCreating(builder);
+            //PayjoinLock.OnModelCreating(builder);
             PaymentRequestData.OnModelCreating(builder);
-            WalletTransactionData.OnModelCreating(builder);
-            PullPaymentData.OnModelCreating(builder);
+            PaymentData.OnModelCreating(builder);
             PayoutData.OnModelCreating(builder);
+            PendingInvoiceData.OnModelCreating(builder);
+            //PlannedTransaction.OnModelCreating(builder);
+            PullPaymentData.OnModelCreating(builder);
             RefundData.OnModelCreating(builder);
+            //SettingData.OnModelCreating(builder);
+            StoreWebhookData.OnModelCreating(builder);
+            //StoreData.OnModelCreating(builder);
             U2FDevice.OnModelCreating(builder);
+            Data.UserStore.OnModelCreating(builder);
+            //WalletData.OnModelCreating(builder);
+            WalletTransactionData.OnModelCreating(builder);
+            WebhookDeliveryData.OnModelCreating(builder);
+            //WebhookData.OnModelCreating(builder);
 
-            Data.WebhookDeliveryData.OnModelCreating(builder);
-            Data.StoreWebhookData.OnModelCreating(builder);
-            Data.InvoiceWebhookDeliveryData.OnModelCreating(builder);
 
             if (Database.IsSqlite() && !_designTime)
             {
diff --git a/BTCPayServer.Data/Data/ApplicationDbContextFactory.cs b/BTCPayServer.Data/ApplicationDbContextFactory.cs
similarity index 100%
rename from BTCPayServer.Data/Data/ApplicationDbContextFactory.cs
rename to BTCPayServer.Data/ApplicationDbContextFactory.cs