diff --git a/erpnext/accounts/doctype/sales_invoice/regional/india.js b/erpnext/accounts/doctype/sales_invoice/regional/india.js
index e97671ad6e0..ba672c9368d 100644
--- a/erpnext/accounts/doctype/sales_invoice/regional/india.js
+++ b/erpnext/accounts/doctype/sales_invoice/regional/india.js
@@ -1,5 +1,5 @@
 {% include "erpnext/regional/india/taxes.js" %}
-{% include "erpnext/regional/india/einvoice.js" %}
+{% include "erpnext/regional/india/e_invoice/einvoice.js" %}
 
 erpnext.setup_auto_gst_taxation('Sales Invoice');
 erpnext.setup_einvoice_actions('Sales Invoice')
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index f70533ea38b..6b1935f2397 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -361,7 +361,7 @@ regional_overrides = {
 		'erpnext.hr.utils.calculate_annual_eligible_hra_exemption': 'erpnext.regional.india.utils.calculate_annual_eligible_hra_exemption',
 		'erpnext.hr.utils.calculate_hra_exemption_for_period': 'erpnext.regional.india.utils.calculate_hra_exemption_for_period',
 		'erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_regional_gl_entries': 'erpnext.regional.india.utils.make_regional_gl_entries',
-		'erpnext.controllers.accounts_controller.validate_einvoice_fields': 'erpnext.regional.india.e_invoice_utils.validate_einvoice_fields',
+		'erpnext.controllers.accounts_controller.validate_einvoice_fields': 'erpnext.regional.india.e_invoice.e_invoice_utils.validate_einvoice_fields',
 	},
 	'United Arab Emirates': {
 		'erpnext.controllers.taxes_and_totals.update_itemised_tax_data': 'erpnext.regional.united_arab_emirates.utils.update_itemised_tax_data'
diff --git a/erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.js b/erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.js
index 1b7efeeeddf..e9fb622b6b6 100644
--- a/erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.js
+++ b/erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.js
@@ -15,7 +15,7 @@ frappe.ui.form.on('E Invoice Settings', {
 			frm.add_custom_button(__("Fetch Token"),
 				() => {
 					frm.call({
-						method: 'erpnext.regional.india.e_invoice_utils.fetch_token',
+						method: 'erpnext.regional.india.e_invoice.e_invoice_utils.fetch_token',
 						freeze: true,
 						callback: () => frm.refresh()
 					});
diff --git a/erpnext/regional/india/e_invoice_utils.py b/erpnext/regional/india/e_invoice/e_invoice_utils.py
similarity index 100%
rename from erpnext/regional/india/e_invoice_utils.py
rename to erpnext/regional/india/e_invoice/e_invoice_utils.py
diff --git a/erpnext/regional/india/einv_item_template.json b/erpnext/regional/india/e_invoice/einv_item_template.json
similarity index 100%
rename from erpnext/regional/india/einv_item_template.json
rename to erpnext/regional/india/e_invoice/einv_item_template.json
diff --git a/erpnext/regional/india/einv_template.json b/erpnext/regional/india/e_invoice/einv_template.json
similarity index 100%
rename from erpnext/regional/india/einv_template.json
rename to erpnext/regional/india/e_invoice/einv_template.json
diff --git a/erpnext/regional/india/einv_validation.json b/erpnext/regional/india/e_invoice/einv_validation.json
similarity index 100%
rename from erpnext/regional/india/einv_validation.json
rename to erpnext/regional/india/e_invoice/einv_validation.json
diff --git a/erpnext/regional/india/einvoice.js b/erpnext/regional/india/e_invoice/einvoice.js
similarity index 89%
rename from erpnext/regional/india/einvoice.js
rename to erpnext/regional/india/e_invoice/einvoice.js
index f30e81a500c..8191bea82fc 100644
--- a/erpnext/regional/india/einvoice.js
+++ b/erpnext/regional/india/e_invoice/einvoice.js
@@ -12,7 +12,7 @@ erpnext.setup_einvoice_actions = (doctype) => {
 			// 		"Generate IRN",
 			// 		() => {
 			// 			frappe.call({
-			// 				method: 'erpnext.regional.india.e_invoice_utils.generate_irn',
+			// 				method: 'erpnext.regional.india.e_invoice.e_invoice_utils.generate_irn',
 			// 				args: { doctype: frm.doc.doctype, name: frm.doc.name },
 			// 				freeze: true,
 			// 				callback: (res) => {
@@ -43,7 +43,7 @@ erpnext.setup_einvoice_actions = (doctype) => {
 			// 				primary_action: function() {
 			// 					const data = d.get_values();
 			// 					frappe.call({
-			// 						method: 'erpnext.regional.india.e_invoice_utils.cancel_irn',
+			// 						method: 'erpnext.regional.india.e_invoice.e_invoice_utils.cancel_irn',
 			// 						args: { irn: frm.doc.irn, reason: data.reason.split('-')[0], remark: data.remark },
 			// 						freeze: true,
 			// 						callback: () => {
@@ -75,7 +75,7 @@ erpnext.setup_einvoice_actions = (doctype) => {
 			// 				primary_action: function() {
 			// 					const data = d.get_values();
 			// 					frappe.call({
-			// 						method: 'erpnext.regional.india.e_invoice_utils.cancel_eway_bill',
+			// 						method: 'erpnext.regional.india.e_invoice.e_invoice_utils.cancel_eway_bill',
 			// 						args: { eway_bill: frm.doc.ewaybill, reason: data.reason.split('-')[0], remark: data.remark },
 			// 						freeze: true,
 			// 						callback: () => {
@@ -98,13 +98,13 @@ erpnext.setup_einvoice_actions = (doctype) => {
 					"Download E-Invoice",
 					() => {
 						frappe.call({
-							method: 'erpnext.regional.india.e_invoice_utils.make_e_invoice',
+							method: 'erpnext.regional.india.e_invoice.e_invoice_utils.make_e_invoice',
 							args: { doctype: frm.doc.doctype, name: frm.doc.name },
 							freeze: true,
 							callback: (res) => {
 								if (!res.exc) {
 									const args = {
-										cmd: 'erpnext.regional.india.e_invoice_utils.download_einvoice',
+										cmd: 'erpnext.regional.india.e_invoice.e_invoice_utils.download_einvoice',
 										einvoice: res.message.einvoice,
 										name: frm.doc.name
 									};
@@ -117,7 +117,7 @@ erpnext.setup_einvoice_actions = (doctype) => {
 					"Upload Signed E-Invoice",
 					() => {
 						new frappe.ui.FileUploader({
-							method: 'erpnext.regional.india.e_invoice_utils.upload_einvoice',
+							method: 'erpnext.regional.india.e_invoice.e_invoice_utils.upload_einvoice',
 							allow_multiple: 0,
 							doctype: frm.doc.doctype,
 							docname: frm.doc.name,
@@ -148,7 +148,7 @@ erpnext.setup_einvoice_actions = (doctype) => {
 							primary_action: function() {
 								const data = d.get_values();
 								const args = {
-									cmd: 'erpnext.regional.india.e_invoice_utils.download_cancel_einvoice',
+									cmd: 'erpnext.regional.india.e_invoice.e_invoice_utils.download_cancel_einvoice',
 									irn: frm.doc.irn, reason: data.reason.split('-')[0], remark: data.remark, name: frm.doc.name
 								};
 								open_url_post(frappe.request.url, args);
@@ -163,7 +163,7 @@ erpnext.setup_einvoice_actions = (doctype) => {
 					"Upload Cancel JSON",
 					() => {
 						new frappe.ui.FileUploader({
-							method: 'erpnext.regional.india.e_invoice_utils.upload_cancel_ack',
+							method: 'erpnext.regional.india.e_invoice.e_invoice_utils.upload_cancel_ack',
 							allow_multiple: 0,
 							doctype: frm.doc.doctype,
 							docname: frm.doc.name,