diff --git a/agent/invoice.php b/agent/invoice.php
index 85a6d98f..106b7765 100644
--- a/agent/invoice.php
+++ b/agent/invoice.php
@@ -247,12 +247,12 @@ if (isset($_GET['invoice_id'])) {
                             <?php if ($invoice_status !== 'Paid' && $invoice_status !== 'Cancelled' && $invoice_status !== 'Draft' && $invoice_status !== 'Non-Billable' && $invoice_amount != 0) { ?>
 
                                 <div class="btn-group">
-                                    <button type="button" class="btn btn-success ajax-modal" data-modal-url="modals/invoice/invoice_pay.php?id=<?= $invoice_id ?>"><i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment</button>
+                                    <button type="button" class="btn btn-success ajax-modal" data-modal-url="modals/payment/payment_add.php?id=<?= $invoice_id ?>"><i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment</button>
 
                                     <?php if (mysqli_num_rows($sql_saved_payment_methods) > 0 && ($invoice_status === 'Sent' || $invoice_status === 'Viewed')) { ?>
                                     <button type="button" class="btn btn-success dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/invoice/invoice_saved_method_pay.php?id=<?= $invoice_id ?>"><i class="fas fa-fw fa-wallet mr-2"></i>Pay with Saved Card</a>                                    
+                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/payment/payment_saved_method_add.php?id=<?= $invoice_id ?>"><i class="fas fa-fw fa-wallet mr-2"></i>Pay with Saved Card</a>                                    
                                     </div>
                                     <?php } ?>
 
diff --git a/agent/invoices.php b/agent/invoices.php
index 2c4aa0dd..9a86a1b3 100644
--- a/agent/invoices.php
+++ b/agent/invoices.php
@@ -375,7 +375,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <div class="dropdown-menu">
                                         <?php if ($invoice_status !== 'Paid' && $invoice_status !== 'Cancelled' && $invoice_status !== 'Draft' && $invoice_status !== 'Non-Billable' && $invoice_amount != 0) { ?>
                                             <a class="dropdown-item ajax-modal" href="#"
-                                                data-modal-url="modals/invoice/invoice_pay.php?id=<?= $invoice_id ?>">
+                                                data-modal-url="modals/payment/payment_add.php?id=<?= $invoice_id ?>">
                                                 <i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment
                                             </a>
                                             <div class="dropdown-divider"></div>
@@ -435,6 +435,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 require_once "modals/invoice/invoice_add.php";
-if ($client_url) { require_once "modals/invoice/invoice_payment_add_bulk.php"; }
+if ($client_url) { require_once "modals/payment/payment_bulk_add.php"; }
 require_once "modals/invoice/invoice_export.php";
 require_once "../includes/footer.php";
diff --git a/agent/modals/invoice/invoice_apply_credit.php b/agent/modals/payment/invoice_apply_credit.php
similarity index 100%
rename from agent/modals/invoice/invoice_apply_credit.php
rename to agent/modals/payment/invoice_apply_credit.php
diff --git a/agent/modals/invoice/invoice_pay.php b/agent/modals/payment/payment_add.php
similarity index 100%
rename from agent/modals/invoice/invoice_pay.php
rename to agent/modals/payment/payment_add.php
diff --git a/agent/modals/invoice/invoice_payment_add_bulk.php b/agent/modals/payment/payment_bulk_add.php
similarity index 100%
rename from agent/modals/invoice/invoice_payment_add_bulk.php
rename to agent/modals/payment/payment_bulk_add.php
diff --git a/agent/modals/invoice/invoice_saved_method_pay.php b/agent/modals/payment/payment_saved_method_add.php
similarity index 100%
rename from agent/modals/invoice/invoice_saved_method_pay.php
rename to agent/modals/payment/payment_saved_method_add.php