diff --git a/app/Database/Migrations/20170501150000_upgrade_to_3_1_1.php b/app/Database/Migrations/20170501150000_upgrade_to_3_1_1.php
index e2570db75..6a7779dcb 100644
--- a/app/Database/Migrations/20170501150000_upgrade_to_3_1_1.php
+++ b/app/Database/Migrations/20170501150000_upgrade_to_3_1_1.php
@@ -13,7 +13,7 @@ class Migration_Upgrade_To_3_1_1 extends Migration
 
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.0.2_to_3.1.1.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.0.2_to_3.1.1.sql');
 	}
 
 	public function down(): void
diff --git a/app/Database/Migrations/20180225100000_upgrade_to_3_2_0.php b/app/Database/Migrations/20180225100000_upgrade_to_3_2_0.php
index dfa02430d..964cd58ba 100644
--- a/app/Database/Migrations/20180225100000_upgrade_to_3_2_0.php
+++ b/app/Database/Migrations/20180225100000_upgrade_to_3_2_0.php
@@ -8,7 +8,7 @@ class Migration_Upgrade_To_3_2_0 extends Migration
 {
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.1.1_to_3.2.0.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.1.1_to_3.2.0.sql');
 	}
 
 	public function down(): void
diff --git a/app/Database/Migrations/20180501100000_upgrade_to_3_2_1.php b/app/Database/Migrations/20180501100000_upgrade_to_3_2_1.php
index e585c1cc0..468eb5f12 100644
--- a/app/Database/Migrations/20180501100000_upgrade_to_3_2_1.php
+++ b/app/Database/Migrations/20180501100000_upgrade_to_3_2_1.php
@@ -8,7 +8,7 @@ class Migration_Upgrade_To_3_2_1 extends Migration
 {
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.2.0_to_3.2.1.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.2.0_to_3.2.1.sql');
 	}
 
 	public function down(): void
diff --git a/app/Database/Migrations/20181015100000_attributes.php b/app/Database/Migrations/20181015100000_attributes.php
index 4a55521ed..b27bbc2e2 100644
--- a/app/Database/Migrations/20181015100000_attributes.php
+++ b/app/Database/Migrations/20181015100000_attributes.php
@@ -8,7 +8,7 @@ class Migration_Attributes extends Migration
 {
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_attributes.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_attributes.sql');
 	}
 
 	public function down(): void
diff --git a/app/Database/Migrations/20190111270000_upgrade_to_3_3_0.php b/app/Database/Migrations/20190111270000_upgrade_to_3_3_0.php
index 6d2d31afe..c2c21c8bb 100644
--- a/app/Database/Migrations/20190111270000_upgrade_to_3_3_0.php
+++ b/app/Database/Migrations/20190111270000_upgrade_to_3_3_0.php
@@ -8,7 +8,7 @@ class Migration_Upgrade_To_3_3_0 extends Migration
 {
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.2.1_to_3.3.0.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.2.1_to_3.3.0.sql');
 	}
 
 	public function down(): void
diff --git a/app/Database/Migrations/20190129212600_indiagst.php b/app/Database/Migrations/20190129212600_indiagst.php
index af08b7387..7ee8fd9d3 100644
--- a/app/Database/Migrations/20190129212600_indiagst.php
+++ b/app/Database/Migrations/20190129212600_indiagst.php
@@ -14,7 +14,7 @@ class Migration_IndiaGST extends Migration
 		}
 
 		// If number of entries is greater than zero then the tax data needs to be migrated
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_indiagst.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_indiagst.sql');
 
 		error_log('Migrating tax configuration');
 
diff --git a/app/Database/Migrations/20190213210000_indiagst1.php b/app/Database/Migrations/20190213210000_indiagst1.php
index 3c8f0f927..600526904 100644
--- a/app/Database/Migrations/20190213210000_indiagst1.php
+++ b/app/Database/Migrations/20190213210000_indiagst1.php
@@ -8,7 +8,7 @@ class Migration_IndiaGST1 extends Migration
 {
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_indiagst1.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_indiagst1.sql');
 
 		error_log('Fix definition of Supplier.Tax Id');
 
diff --git a/app/Database/Migrations/20190220210000_indiagst2.php b/app/Database/Migrations/20190220210000_indiagst2.php
index 7ed0da1b9..cc9621496 100644
--- a/app/Database/Migrations/20190220210000_indiagst2.php
+++ b/app/Database/Migrations/20190220210000_indiagst2.php
@@ -8,7 +8,7 @@ class Migration_IndiaGST2 extends Migration
 {
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_indiagst2.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_indiagst2.sql');
 	}
 
 	public function down(): void
diff --git a/app/Database/Migrations/20190301124900_decimal_attribute_type.php b/app/Database/Migrations/20190301124900_decimal_attribute_type.php
index ee6a0dfac..9fe67d0e6 100644
--- a/app/Database/Migrations/20190301124900_decimal_attribute_type.php
+++ b/app/Database/Migrations/20190301124900_decimal_attribute_type.php
@@ -8,7 +8,7 @@ class Migration_decimal_attribute_type extends Migration
 {
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_decimal_attribute_type.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_decimal_attribute_type.sql');
 	}
 
 	public function down(): void
diff --git a/app/Database/Migrations/20190317102600_add_iso_4217.php b/app/Database/Migrations/20190317102600_add_iso_4217.php
index 6a9252dfb..349429dec 100644
--- a/app/Database/Migrations/20190317102600_add_iso_4217.php
+++ b/app/Database/Migrations/20190317102600_add_iso_4217.php
@@ -8,7 +8,7 @@ class Migration_add_iso_4217 extends Migration
 {
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_add_iso_4217.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_add_iso_4217.sql');
 	}
 
 	public function down(): void
diff --git a/app/Database/Migrations/20190427100000_paymenttracking.php b/app/Database/Migrations/20190427100000_paymenttracking.php
index 5a1977f18..e496179ec 100644
--- a/app/Database/Migrations/20190427100000_paymenttracking.php
+++ b/app/Database/Migrations/20190427100000_paymenttracking.php
@@ -8,7 +8,7 @@ class Migration_PaymentTracking extends Migration
 {
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_paymenttracking.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_paymenttracking.sql');
 	}
 
 	public function down(): void
diff --git a/app/Database/Migrations/20190502100000_refundtracking.php b/app/Database/Migrations/20190502100000_refundtracking.php
index 8117b871d..42330cb4b 100644
--- a/app/Database/Migrations/20190502100000_refundtracking.php
+++ b/app/Database/Migrations/20190502100000_refundtracking.php
@@ -8,7 +8,7 @@ class Migration_RefundTracking extends Migration
 {
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_refundtracking.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_refundtracking.sql');
 
 		// Add missing cash_refund amounts to payments table
 		$decimals = totals_decimals();
diff --git a/app/Database/Migrations/20190612100000_dbfix.php b/app/Database/Migrations/20190612100000_dbfix.php
index 811e644a0..6c4539715 100644
--- a/app/Database/Migrations/20190612100000_dbfix.php
+++ b/app/Database/Migrations/20190612100000_dbfix.php
@@ -8,7 +8,7 @@ class Migration_DBFix extends Migration
 {
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_dbfix.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_dbfix.sql');
 	}
 
 	public function down(): void
diff --git a/app/Database/Migrations/20190615100000_fix_attribute_datetime.php b/app/Database/Migrations/20190615100000_fix_attribute_datetime.php
index 6b94abda0..ff9641cf6 100644
--- a/app/Database/Migrations/20190615100000_fix_attribute_datetime.php
+++ b/app/Database/Migrations/20190615100000_fix_attribute_datetime.php
@@ -8,7 +8,7 @@ class Migration_fix_attribute_datetime extends Migration
 {
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_fix_attribute_datetime.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_fix_attribute_datetime.sql');
 	}
 
 	public function down(): void
diff --git a/app/Database/Migrations/20191231100000_paymentdatefix.php b/app/Database/Migrations/20191231100000_paymentdatefix.php
index 2c66acc6d..759e2610e 100644
--- a/app/Database/Migrations/20191231100000_paymentdatefix.php
+++ b/app/Database/Migrations/20191231100000_paymentdatefix.php
@@ -8,7 +8,7 @@ class Migration_PaymentDateFix extends Migration
 {
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.2_paymentdatefix.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.2_paymentdatefix.sql');
 	}
 
 	public function down(): void
diff --git a/app/Database/Migrations/20200125100000_saleschangeprice.php b/app/Database/Migrations/20200125100000_saleschangeprice.php
index 6e11fe69a..6a79d4061 100644
--- a/app/Database/Migrations/20200125100000_saleschangeprice.php
+++ b/app/Database/Migrations/20200125100000_saleschangeprice.php
@@ -8,7 +8,7 @@ class Migration_SalesChangePrice extends Migration
 {
 	public function up(): void
 	{
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.2_saleschangeprice.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.2_saleschangeprice.sql');
 	}
 
 	public function down(): void
diff --git a/app/Database/Migrations/20200819000000_modify_attr_links_constraint.php b/app/Database/Migrations/20200819000000_modify_attr_links_constraint.php
index 5e42bdd52..220d10359 100644
--- a/app/Database/Migrations/20200819000000_modify_attr_links_constraint.php
+++ b/app/Database/Migrations/20200819000000_modify_attr_links_constraint.php
@@ -11,7 +11,7 @@ class Migration_modify_attr_links_constraint extends Migration
 		error_log('Migrating modify_attr_links_constraint');
 
 
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.2_modify_attr_links_constraint.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.2_modify_attr_links_constraint.sql');
 
 		error_log('Migrating modify_attr_links_constraint');
 	}
diff --git a/app/Database/Migrations/20201110000000_add_item_kit_number.php b/app/Database/Migrations/20201110000000_add_item_kit_number.php
index 9a1732a26..bee8743aa 100644
--- a/app/Database/Migrations/20201110000000_add_item_kit_number.php
+++ b/app/Database/Migrations/20201110000000_add_item_kit_number.php
@@ -10,7 +10,7 @@ class Migration_add_item_kit_number extends Migration
 	{
 		error_log('Migrating add_item_kit_number');
 
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.3_add_kits_item_number.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.3_add_kits_item_number.sql');
 
 		error_log('Migrating add_item_kit_number');
 	}
diff --git a/app/Database/Migrations/20210103000000_modify_session_datatype.php b/app/Database/Migrations/20210103000000_modify_session_datatype.php
index 932244fc7..93bb5cee0 100644
--- a/app/Database/Migrations/20210103000000_modify_session_datatype.php
+++ b/app/Database/Migrations/20210103000000_modify_session_datatype.php
@@ -10,7 +10,7 @@ class Migration_modify_session_datatype extends Migration
 	{
 		error_log('Migrating modify_session_datatype');
 
-		execute_script(APPPATH . 'migrations/sqlscripts/3.3.4_modify_session_datatype.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.4_modify_session_datatype.sql');
 
 		error_log('Migrating modify_session_datatype');
 	}
diff --git a/app/Database/Migrations/20210422000000_database_optimizations.php b/app/Database/Migrations/20210422000000_database_optimizations.php
index 7a0c0be99..c8bbe1725 100644
--- a/app/Database/Migrations/20210422000000_database_optimizations.php
+++ b/app/Database/Migrations/20210422000000_database_optimizations.php
@@ -72,7 +72,7 @@ class Migration_database_optimizations extends Migration
 		}
 		$this->db->transComplete();
 
-		execute_script(APPPATH . 'migrations/sqlscripts/3.4.0_database_optimizations.sql');
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.4.0_database_optimizations.sql');
 		error_log('Migrating database_optimizations completed');
 	}
 	/**
diff --git a/app/Database/Migrations/20220127000000_convert_to_ci4.php b/app/Database/Migrations/20220127000000_convert_to_ci4.php
new file mode 100644
index 000000000..99a293c63
--- /dev/null
+++ b/app/Database/Migrations/20220127000000_convert_to_ci4.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Convert_to_ci4 extends Migration
+{
+	public function up(): void
+	{
+		error_log('Migrating database to CodeIgniter4 formats');
+
+		execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.4.0_ci4_conversion.sql');
+
+		error_log('Migrating to CodeIgniter4 formats completed');
+	}
+
+	public function down(): void
+	{
+
+	}
+}
diff --git a/app/Database/Migrations/sqlscripts/3.4.0_ci4_conversion.sql b/app/Database/Migrations/sqlscripts/3.4.0_ci4_conversion.sql
new file mode 100644
index 000000000..99ad3a664
--- /dev/null
+++ b/app/Database/Migrations/sqlscripts/3.4.0_ci4_conversion.sql
@@ -0,0 +1,13 @@
+-- creating new column of TIMESTAMP type
+ALTER TABLE `ospos_sessions`
+    ADD COLUMN `temp_timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP();
+
+-- Use FROM_UNIXTIME() to convert from the INT timestamp to a proper datetime type
+-- assigning value from old INT column to it, in hope that it will be recognized as timestamp
+UPDATE `ospos_sessions` SET `temp_timestamp` = FROM_UNIXTIME(`timestamp`);
+
+-- dropping the old INT column
+ALTER TABLE `ospos_sessions` DROP COLUMN `timestamp`;
+
+-- changing the name of the column
+ALTER TABLE `ospos_sessions` CHANGE `temp_timestamp` `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP();
\ No newline at end of file