diff --git a/packages/server/src/common/config/system-database.ts b/packages/server/src/common/config/system-database.ts
index 99c8a8c11..b333aba22 100644
--- a/packages/server/src/common/config/system-database.ts
+++ b/packages/server/src/common/config/system-database.ts
@@ -7,6 +7,6 @@ export default registerAs('systemDatabase', () => ({
   user: process.env.SYSTEM_DB_USER || process.env.DB_USER,
   password: process.env.SYSTEM_DB_PASSWORD || process.env.DB_PASSWORD,
   databaseName: process.env.SYSTEM_DB_NAME || process.env.DB_NAME,
-  migrationDir: process.env.SYSTEM_DB_MIGRATION_DIR || './src/database/migrations',
-  seedsDir: process.env.SYSTEM_DB_SEEDS_DIR || './src/database/seeds',
+  migrationDir: process.env.SYSTEM_DB_MIGRATION_DIR || './src/database/system/migrations',
+  seedsDir: process.env.SYSTEM_DB_SEEDS_DIR || './src/database/system/seeds',
 }));
diff --git a/packages/server/src/common/config/tenant-database.ts b/packages/server/src/common/config/tenant-database.ts
index 8c25cdfb4..701b95146 100644
--- a/packages/server/src/common/config/tenant-database.ts
+++ b/packages/server/src/common/config/tenant-database.ts
@@ -8,6 +8,6 @@ export default registerAs('tenantDatabase', () => ({
   user: process.env.TENANT_DB_USER || process.env.DB_USER,
   password: process.env.TENANT_DB_PASSWORD || process.env.DB_PASSWORD,
   dbNamePrefix: process.env.TENANT_DB_NAME_PERFIX || 'bigcapital_tenant_',
-  migrationsDir: path.join(__dirname, '../../database/migrations'),
-  seedsDir: path.join(__dirname, '../../database/seeds/core'),
+  migrationsDir: path.join(__dirname, '../../database/tenant/migrations'),
+  seedsDir: path.join(__dirname, '../../database/tenant/seeds/core'),
 }));
diff --git a/packages/server/src/database/system/migrations/20190104195900_create_password_resets_table.js b/packages/server/src/database/system/migrations/20190104195900_create_password_resets_table.js
new file mode 100644
index 000000000..9337949c7
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20190104195900_create_password_resets_table.js
@@ -0,0 +1,9 @@
+
+exports.up = (knex) => knex.schema.createTable('password_resets', (table) => {
+  table.increments();
+  table.string('email').index();
+  table.string('token').index();
+  table.timestamp('created_at');
+});
+
+exports.down = (knex) => knex.schema.dropTableIfExists('password_resets');
\ No newline at end of file
diff --git a/packages/server/src/database/system/migrations/20200420134631_create_tenants_table.js b/packages/server/src/database/system/migrations/20200420134631_create_tenants_table.js
new file mode 100644
index 000000000..189afa328
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20200420134631_create_tenants_table.js
@@ -0,0 +1,22 @@
+
+exports.up = function(knex) {
+  return knex.schema.createTable('tenants', (table) => {
+    table.bigIncrements();
+    table.string('organization_id').index();
+
+    table.dateTime('under_maintenance_since').nullable();
+    table.dateTime('initialized_at').nullable();
+    table.dateTime('seeded_at').nullable();
+    table.dateTime('built_at').nullable();
+    table.string('build_job_id');
+
+    table.integer('database_batch');
+    table.string('upgrade_job_id');
+
+    table.timestamps();
+  });
+};
+
+exports.down = function(knex) {
+  return knex.schema.dropTableIfExists('tenants');
+};
diff --git a/packages/server/src/database/system/migrations/20200420134633_create_users_table.js b/packages/server/src/database/system/migrations/20200420134633_create_users_table.js
new file mode 100644
index 000000000..0366df1b1
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20200420134633_create_users_table.js
@@ -0,0 +1,26 @@
+exports.up = (knex) => {
+  return knex.schema.createTable('users', (table) => {
+    table.increments();
+    table.string('first_name');
+    table.string('last_name');
+    table.string('email').index();
+    table.string('phone_number').index();
+    table.string('password');
+    table.boolean('active').index();
+    table.string('language');
+    table
+      .bigInteger('tenant_id')
+      .unsigned()
+      .index()
+      .references('id')
+      .inTable('tenants');
+    table.dateTime('invite_accepted_at').index();
+    table.dateTime('last_login_at').index();
+    table.dateTime('deleted_at').index();
+    table.timestamps();
+  });
+};
+
+exports.down = (knex) => {
+  return knex.schema.dropTableIfExists('users');
+};
diff --git a/packages/server/src/database/system/migrations/20200422225247_create_user_invites_table.js b/packages/server/src/database/system/migrations/20200422225247_create_user_invites_table.js
new file mode 100644
index 000000000..42028ccc7
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20200422225247_create_user_invites_table.js
@@ -0,0 +1,15 @@
+
+exports.up = function(knex) {
+  return knex.schema.createTable('user_invites', (table) => {
+    table.increments();
+    table.string('email').index();
+    table.string('token').unique().index();
+    table.bigInteger('tenant_id').unsigned().index().references('id').inTable('tenants');
+    table.integer('user_id').unsigned().index().references('id').inTable('users');
+    table.datetime('created_at');
+  });
+};
+
+exports.down = function(knex) {
+  return knex.schema.dropTableIfExists('user_invites');
+};
diff --git a/packages/server/src/database/system/migrations/20200527091642_create_subscriptions_plans_table.js b/packages/server/src/database/system/migrations/20200527091642_create_subscriptions_plans_table.js
new file mode 100644
index 000000000..09d890648
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20200527091642_create_subscriptions_plans_table.js
@@ -0,0 +1,22 @@
+
+exports.up = function(knex) {
+  return knex.schema.createTable('subscriptions_plans', table => {
+    table.increments();
+
+    table.string('name');
+    table.string('description');
+    table.decimal('price');
+    table.string('currency', 3);
+
+    table.integer('trial_period');
+    table.string('trial_interval');
+    
+    table.integer('invoice_period');
+    table.string('invoice_interval');
+    table.timestamps();
+  });
+};
+
+exports.down = function(knex) {
+  return knex.schema.dropTableIfExists('subscriptions_plans')
+};
diff --git a/packages/server/src/database/system/migrations/20200823234134_create_plans_table.js b/packages/server/src/database/system/migrations/20200823234134_create_plans_table.js
new file mode 100644
index 000000000..2fc61a43a
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20200823234134_create_plans_table.js
@@ -0,0 +1,30 @@
+
+exports.up = function(knex) {
+  return knex.schema.createTable('subscription_plans', table => {
+    table.increments();
+    table.string('slug');
+    table.string('name');
+    table.string('desc');
+    table.boolean('active');
+
+    table.decimal('price').unsigned();
+    table.string('currency', 3);
+
+    table.decimal('trial_period').nullable();
+    table.string('trial_interval').nullable();
+
+    table.decimal('invoice_period').nullable();
+    table.string('invoice_interval').nullable();
+
+    table.integer('index').unsigned();
+    table.timestamps();
+  }).then(() => {
+    return knex.seed.run({
+      specific: 'seed_subscriptions_plans.js',
+    });
+  });
+};
+
+exports.down = function(knex) {
+  return knex.schema.dropTableIfExists('subscription_plans')
+};
diff --git a/packages/server/src/database/system/migrations/20200823234636_create_subscription_plan_subscription.js b/packages/server/src/database/system/migrations/20200823234636_create_subscription_plan_subscription.js
new file mode 100644
index 000000000..267be4614
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20200823234636_create_subscription_plan_subscription.js
@@ -0,0 +1,22 @@
+
+exports.up = function(knex) {
+  return knex.schema.createTable('subscription_plan_subscriptions', table => {
+    table.increments('id');
+    table.string('slug');
+
+    table.integer('plan_id').unsigned().index().references('id').inTable('subscription_plans');
+    table.bigInteger('tenant_id').unsigned().index().references('id').inTable('tenants');
+
+    table.dateTime('starts_at').nullable();
+    table.dateTime('ends_at').nullable();
+
+    table.dateTime('cancels_at').nullable();
+    table.dateTime('canceled_at').nullable();
+
+    table.timestamps();
+  });
+};
+
+exports.down = function(knex) {
+  return knex.schema.dropTableIfExists('subscription_plan_subscriptions');
+};
diff --git a/packages/server/src/database/system/migrations/20200823235340_create_tenants_metadata_table.js b/packages/server/src/database/system/migrations/20200823235340_create_tenants_metadata_table.js
new file mode 100644
index 000000000..c8f765b6a
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20200823235340_create_tenants_metadata_table.js
@@ -0,0 +1,22 @@
+exports.up = function (knex) {
+  return knex.schema.createTable('tenants_metadata', (table) => {
+    table.bigIncrements();
+    table.integer('tenant_id').unsigned();
+
+    table.string('name');
+    table.string('industry');
+    table.string('location');
+
+    table.string('base_currency');
+    table.string('language');
+
+    table.string('timezone');
+    table.string('date_format');
+
+    table.string('fiscal_year');
+  });
+};
+
+exports.down = function (knex) {
+  return knex.schema.dropTableIfExists('tenants_metadata');
+};
diff --git a/packages/server/src/database/migrations/20230405232607_drop_phone_number_from_users.ts b/packages/server/src/database/system/migrations/20230405011450_drop_phone_number_column_from_users_table.js
similarity index 100%
rename from packages/server/src/database/migrations/20230405232607_drop_phone_number_from_users.ts
rename to packages/server/src/database/system/migrations/20230405011450_drop_phone_number_column_from_users_table.js
diff --git a/packages/server/src/database/system/migrations/20231012112401_add_tax_number_column_to_tenants_metadata_table.js b/packages/server/src/database/system/migrations/20231012112401_add_tax_number_column_to_tenants_metadata_table.js
new file mode 100644
index 000000000..ce7de80f0
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20231012112401_add_tax_number_column_to_tenants_metadata_table.js
@@ -0,0 +1,11 @@
+exports.up = function (knex) {
+  return knex.schema.table('tenants_metadata', (table) => {
+    table.string('tax_number')
+  });
+};
+
+exports.down = function (knex) {
+  return knex.schema.table('tenants_metadata', (table) => {
+    table.dropColumn('tax_number');
+  });
+};
diff --git a/packages/server/src/database/system/migrations/20231209230719_create_imports_table.js b/packages/server/src/database/system/migrations/20231209230719_create_imports_table.js
new file mode 100644
index 000000000..ef3f73cd4
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20231209230719_create_imports_table.js
@@ -0,0 +1,22 @@
+exports.up = function (knex) {
+  return knex.schema.createTable('imports', (table) => {
+    table.increments();
+    table.string('filename');
+    table.string('import_id');
+    table.string('resource');
+    table.json('columns');
+    table.json('mapping');
+    table.json('params');
+    table
+      .bigInteger('tenant_id')
+      .unsigned()
+      .index()
+      .references('id')
+      .inTable('tenants');
+    table.timestamps();
+  });
+};
+
+exports.down = function (knex) {
+  return knex.schema.dropTableIfExists('imports');
+};
diff --git a/packages/server/src/database/system/migrations/20240222134235_create_plaid_items_table.js b/packages/server/src/database/system/migrations/20240222134235_create_plaid_items_table.js
new file mode 100644
index 000000000..4098bccca
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20240222134235_create_plaid_items_table.js
@@ -0,0 +1,15 @@
+exports.up = function (knex) {
+  return knex.schema.createTable('plaid_items', (table) => {
+    table.bigIncrements('id');
+    table
+      .bigInteger('tenant_id')
+      .unsigned()
+      .index()
+      .references('id')
+      .inTable('tenants');
+    table.string('plaid_item_id');
+    table.timestamps();
+  });
+};
+
+exports.down = (knex) => {};
diff --git a/packages/server/src/database/system/migrations/20240222134235_seed_free_subscription_to_tenants.js b/packages/server/src/database/system/migrations/20240222134235_seed_free_subscription_to_tenants.js
new file mode 100644
index 000000000..5368db3c0
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20240222134235_seed_free_subscription_to_tenants.js
@@ -0,0 +1,7 @@
+exports.up = function (knex) {
+  return knex.seed.run({
+    specific: 'seed_tenants_free_subscription.js',
+  });
+};
+
+exports.down = function (knex) {};
diff --git a/packages/server/src/database/system/migrations/20240425100821_add_confirmation_columns_to_users.js b/packages/server/src/database/system/migrations/20240425100821_add_confirmation_columns_to_users.js
new file mode 100644
index 000000000..fada1380f
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20240425100821_add_confirmation_columns_to_users.js
@@ -0,0 +1,12 @@
+exports.up = function (knex) {
+  return knex.schema
+    .table('users', (table) => {
+      table.string('verify_token');
+      table.boolean('verified').defaultTo(false);
+    })
+    .then(() => {
+      return knex('USERS').update({ verified: true });
+    });
+};
+
+exports.down = (knex) => {};
diff --git a/packages/server/src/database/system/migrations/20240714101006_add_lemon_variant_id_to_subscription_plans.js b/packages/server/src/database/system/migrations/20240714101006_add_lemon_variant_id_to_subscription_plans.js
new file mode 100644
index 000000000..eeee3581f
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20240714101006_add_lemon_variant_id_to_subscription_plans.js
@@ -0,0 +1,11 @@
+exports.up = function (knex) {
+  return knex.schema.table('subscription_plans', (table) => {
+    table.string('lemon_variant_id').nullable().index();
+  });
+};
+
+exports.down = (knex) => {
+  return knex.schema.table('subscription_plans', (table) => {
+    table.dropColumn('lemon_variant_id');
+  });
+};
diff --git a/packages/server/src/database/system/migrations/20240714101229_seed_monthly_subscription_plans.js b/packages/server/src/database/system/migrations/20240714101229_seed_monthly_subscription_plans.js
new file mode 100644
index 000000000..7f1e506ac
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20240714101229_seed_monthly_subscription_plans.js
@@ -0,0 +1,96 @@
+exports.up = function (knex) {
+  return knex('subscription_plans').insert([
+    // Capital Basic
+    {
+      name: 'Capital Basic (Monthly)',
+      slug: 'capital-basic-monthly',
+      price: 10,
+      active: true,
+      currency: 'USD',
+      invoice_period: 1,
+      invoice_interval: 'month',
+      lemon_variant_id: '446152',
+      // lemon_variant_id: '450016',
+    },
+    {
+      name: 'Capital Basic (Annually)',
+      slug: 'capital-basic-annually',
+      price: 90,
+      active: true,
+      currency: 'USD',
+      invoice_period: 1,
+      invoice_interval: 'year',
+      lemon_variant_id: '446153',
+      // lemon_variant_id: '450018',
+    },
+
+    // # Capital Essential
+    {
+      name: 'Capital Essential (Monthly)',
+      slug: 'capital-essential-monthly',
+      price: 20,
+      active: true,
+      currency: 'USD',
+      invoice_period: 1,
+      invoice_interval: 'month',
+      lemon_variant_id: '446155',
+      // lemon_variant_id: '450028',
+    },
+    {
+      name: 'Capital Essential (Annually)',
+      slug: 'capital-essential-annually',
+      price: 180,
+      active: true,
+      invoice_period: 1,
+      invoice_interval: 'year',
+      lemon_variant_id: '446156',
+      // lemon_variant_id: '450029',
+    },
+
+    // # Capital Plus
+    {
+      name: 'Capital Plus (Monthly)',
+      slug: 'capital-plus-monthly',
+      price: 25,
+      active: true,
+      invoice_period: 1,
+      invoice_interval: 'month',
+      lemon_variant_id: '446165',
+      // lemon_variant_id: '450031',
+    },
+    {
+      name: 'Capital Plus (Annually)',
+      slug: 'capital-plus-annually',
+      price: 228,
+      active: true,
+      invoice_period: 1,
+      invoice_interval: 'year',
+      lemon_variant_id: '446164',
+      // lemon_variant_id: '450032',
+    },
+
+    // # Capital Big
+    {
+      name: 'Capital Big (Monthly)',
+      slug: 'capital-big-monthly',
+      price: 40,
+      active: true,
+      invoice_period: 1,
+      invoice_interval: 'month',
+      lemon_variant_id: '446167',
+      // lemon_variant_id: '450024',
+    },
+    {
+      name: 'Capital Big (Annually)',
+      slug: 'capital-big-annually',
+      price: 360,
+      active: true,
+      invoice_period: 1,
+      invoice_interval: 'year',
+      lemon_variant_id: '446168',
+      // lemon_variant_id: '450025',
+    },
+  ]);
+};
+
+exports.down = function (knex) {};
diff --git a/packages/server/src/database/system/migrations/20240727094214_add_lemon_subscription_id_to_subscriptions_table.js b/packages/server/src/database/system/migrations/20240727094214_add_lemon_subscription_id_to_subscriptions_table.js
new file mode 100644
index 000000000..29907345a
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20240727094214_add_lemon_subscription_id_to_subscriptions_table.js
@@ -0,0 +1,11 @@
+exports.up = function (knex) {
+  return knex.schema.table('subscription_plan_subscriptions', (table) => {
+    table.string('lemon_subscription_id').nullable();
+  });
+};
+
+exports.down = function (knex) {
+  return knex.schema.table('subscription_plan_subscriptions', (table) => {
+    table.dropColumn('lemon_subscription_id');
+  });
+};
diff --git a/packages/server/src/database/system/migrations/20240728123419_add_trial_columns_to_subscription_table.js b/packages/server/src/database/system/migrations/20240728123419_add_trial_columns_to_subscription_table.js
new file mode 100644
index 000000000..b8addd516
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20240728123419_add_trial_columns_to_subscription_table.js
@@ -0,0 +1,13 @@
+exports.up = function (knex) {
+  return knex.schema.table('subscription_plan_subscriptions', (table) => {
+    table.dateTime('trial_ends_at').nullable();
+    table.dropColumn('cancels_at');
+  });
+};
+
+exports.down = function (knex) {
+  return knex.schema.table('subscription_plan_subscriptions', (table) => {
+    table.dropColumn('trial_ends_at').nullable();
+    table.dateTime('cancels_at').nullable();
+  });
+};
diff --git a/packages/server/src/database/system/migrations/20240819164614_create_oneclick_demos_table.js b/packages/server/src/database/system/migrations/20240819164614_create_oneclick_demos_table.js
new file mode 100644
index 000000000..0586350c2
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20240819164614_create_oneclick_demos_table.js
@@ -0,0 +1,21 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema.createTable('oneclick_demos', (table) => {
+    table.increments('id');
+    table.string('key');
+    table.integer('tenant_id').unsigned();
+    table.integer('user_id').unsigned();
+    table.timestamps();
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.dropTableIfExists('oneclick_demos');
+};
diff --git a/packages/server/src/database/system/migrations/20240824151006_add_payment_status_to_subscriptions_table.js b/packages/server/src/database/system/migrations/20240824151006_add_payment_status_to_subscriptions_table.js
new file mode 100644
index 000000000..b1e70083f
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20240824151006_add_payment_status_to_subscriptions_table.js
@@ -0,0 +1,19 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema.table('subscription_plan_subscriptions', (table) => {
+    table.string('payment_status');
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.table('subscription_plan_subscriptions', (table) => {
+    table.dropColumn('payment_status');
+  });
+};
diff --git a/packages/server/src/database/system/migrations/20240909091320_create_stripe_connect_accounts_table.js b/packages/server/src/database/system/migrations/20240909091320_create_stripe_connect_accounts_table.js
new file mode 100644
index 000000000..9aec8f70c
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20240909091320_create_stripe_connect_accounts_table.js
@@ -0,0 +1,20 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema.createTable('stripe_accounts', (table) => {
+    table.increments('id').primary();
+    table.string('stripe_account_id').notNullable();
+    table.string('tenant_id').notNullable();
+    table.timestamps(true, true); // Adds created_at and updated_at columns
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.dropTableIfExists('stripe_accounts');
+};
diff --git a/packages/server/src/database/system/migrations/20240915070439_create_payment_links_table.js b/packages/server/src/database/system/migrations/20240915070439_create_payment_links_table.js
new file mode 100644
index 000000000..1283052c6
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20240915070439_create_payment_links_table.js
@@ -0,0 +1,24 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema.createTable('payment_links', (table) => {
+    table.increments('id');
+    table.integer('tenant_id');
+    table.integer('resource_id');
+    table.text('resource_type');
+    table.string('linkId');
+    table.string('publicity');
+    table.datetime('expiry_at');
+    table.timestamps();
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.dropTableIfExists('payment_links');
+};
diff --git a/packages/server/src/database/system/migrations/20240928145627_add_logo_key_to_tenant_metadata.js b/packages/server/src/database/system/migrations/20240928145627_add_logo_key_to_tenant_metadata.js
new file mode 100644
index 000000000..c1197335b
--- /dev/null
+++ b/packages/server/src/database/system/migrations/20240928145627_add_logo_key_to_tenant_metadata.js
@@ -0,0 +1,23 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema.table('tenants_metadata', (table) => {
+    table.string('primary_color');
+    table.string('logo_key');
+    table.json('address');
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.table('tenants_metadata', (table) => {
+    table.dropColumn('primary_color');
+    table.dropColumn('logo_key');
+    table.dropColumn('address');
+  });
+};
diff --git a/packages/server/src/database/system/seeds/seed_subscriptions_plans.js b/packages/server/src/database/system/seeds/seed_subscriptions_plans.js
new file mode 100644
index 000000000..b810510bc
--- /dev/null
+++ b/packages/server/src/database/system/seeds/seed_subscriptions_plans.js
@@ -0,0 +1,26 @@
+exports.seed = (knex) => {
+  // Deletes ALL existing entries
+  return knex('subscription_plans')
+    .del()
+    .then(() => {
+      // Inserts seed entries
+      return knex('subscription_plans').insert([
+        {
+          name: 'Free',
+          slug: 'free',
+          price: 0,
+          active: true,
+          currency: 'USD',
+        },
+        {
+          name: 'Early Adaptor',
+          slug: 'early-adaptor',
+          price: 29,
+          active: true,
+          currency: 'USD',
+          invoice_period: 12,
+          invoice_interval: 'month',
+        },
+      ]);
+    });
+};
diff --git a/packages/server/src/database/system/seeds/seed_tenants_free_subscription.js b/packages/server/src/database/system/seeds/seed_tenants_free_subscription.js
new file mode 100644
index 000000000..0c08a41b1
--- /dev/null
+++ b/packages/server/src/database/system/seeds/seed_tenants_free_subscription.js
@@ -0,0 +1,26 @@
+exports.seed = (knex) => {
+  // Deletes ALL existing entries
+  return knex('subscription_plan_subscriptions')
+    .then(async () => {
+      const tenants = await knex('tenants');
+
+      for (const tenant of tenants) {
+        const existingSubscription = await knex('subscription_plan_subscriptions')
+          .where('tenantId', tenant.id)
+          .first();
+
+        if (!existingSubscription) {
+          const freePlan = await knex('subscription_plans').where('slug', 'free').first();
+
+          await knex('subscription_plan_subscriptions').insert({
+            tenantId: tenant.id,
+            planId: freePlan.id,
+            slug: 'main',
+            startsAt: knex.fn.now(),
+            endsAt: null,
+            createdAt: knex.fn.now(),
+          });
+        }
+      }
+    });
+};
diff --git a/packages/server/src/database/migrations/20190822214303_create_accounts_table.ts b/packages/server/src/database/tenant/migrations/20190822214303_create_accounts_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20190822214303_create_accounts_table.ts
rename to packages/server/src/database/tenant/migrations/20190822214303_create_accounts_table.ts
diff --git a/packages/server/src/database/migrations/20190822214304_create_items_categories_table.ts b/packages/server/src/database/tenant/migrations/20190822214304_create_items_categories_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20190822214304_create_items_categories_table.ts
rename to packages/server/src/database/tenant/migrations/20190822214304_create_items_categories_table.ts
diff --git a/packages/server/src/database/migrations/20190822214306_create_items_table.ts b/packages/server/src/database/tenant/migrations/20190822214306_create_items_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20190822214306_create_items_table.ts
rename to packages/server/src/database/tenant/migrations/20190822214306_create_items_table.ts
diff --git a/packages/server/src/database/migrations/20190822214903_create_views_table.ts b/packages/server/src/database/tenant/migrations/20190822214903_create_views_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20190822214903_create_views_table.ts
rename to packages/server/src/database/tenant/migrations/20190822214903_create_views_table.ts
diff --git a/packages/server/src/database/migrations/20190822214904_create_settings_table.ts b/packages/server/src/database/tenant/migrations/20190822214904_create_settings_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20190822214904_create_settings_table.ts
rename to packages/server/src/database/tenant/migrations/20190822214904_create_settings_table.ts
diff --git a/packages/server/src/database/migrations/20190822214905_create_views_columns.ts b/packages/server/src/database/tenant/migrations/20190822214905_create_views_columns.ts
similarity index 100%
rename from packages/server/src/database/migrations/20190822214905_create_views_columns.ts
rename to packages/server/src/database/tenant/migrations/20190822214905_create_views_columns.ts
diff --git a/packages/server/src/database/migrations/20190822214905_create_views_roles_table.ts b/packages/server/src/database/tenant/migrations/20190822214905_create_views_roles_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20190822214905_create_views_roles_table.ts
rename to packages/server/src/database/tenant/migrations/20190822214905_create_views_roles_table.ts
diff --git a/packages/server/src/database/migrations/20200104232644_create_contacts_table.ts b/packages/server/src/database/tenant/migrations/20200104232644_create_contacts_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200104232644_create_contacts_table.ts
rename to packages/server/src/database/tenant/migrations/20200104232644_create_contacts_table.ts
diff --git a/packages/server/src/database/migrations/20200104232647_create_accounts_transactions_table.ts b/packages/server/src/database/tenant/migrations/20200104232647_create_accounts_transactions_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200104232647_create_accounts_transactions_table.ts
rename to packages/server/src/database/tenant/migrations/20200104232647_create_accounts_transactions_table.ts
diff --git a/packages/server/src/database/migrations/20200105014405_create_expenses_table.ts b/packages/server/src/database/tenant/migrations/20200105014405_create_expenses_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200105014405_create_expenses_table.ts
rename to packages/server/src/database/tenant/migrations/20200105014405_create_expenses_table.ts
diff --git a/packages/server/src/database/migrations/20200105195823_create_manual_journals_table.ts b/packages/server/src/database/tenant/migrations/20200105195823_create_manual_journals_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200105195823_create_manual_journals_table.ts
rename to packages/server/src/database/tenant/migrations/20200105195823_create_manual_journals_table.ts
diff --git a/packages/server/src/database/migrations/20200105195825_create_manual_journals_entries_table.ts b/packages/server/src/database/tenant/migrations/20200105195825_create_manual_journals_entries_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200105195825_create_manual_journals_entries_table.ts
rename to packages/server/src/database/tenant/migrations/20200105195825_create_manual_journals_entries_table.ts
diff --git a/packages/server/src/database/migrations/20200419171451_create_currencies_table.ts b/packages/server/src/database/tenant/migrations/20200419171451_create_currencies_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200419171451_create_currencies_table.ts
rename to packages/server/src/database/tenant/migrations/20200419171451_create_currencies_table.ts
diff --git a/packages/server/src/database/migrations/20200419191832_create_exchange_rates_table.ts b/packages/server/src/database/tenant/migrations/20200419191832_create_exchange_rates_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200419191832_create_exchange_rates_table.ts
rename to packages/server/src/database/tenant/migrations/20200419191832_create_exchange_rates_table.ts
diff --git a/packages/server/src/database/migrations/20200423201600_create_media_table.ts b/packages/server/src/database/tenant/migrations/20200423201600_create_media_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200423201600_create_media_table.ts
rename to packages/server/src/database/tenant/migrations/20200423201600_create_media_table.ts
diff --git a/packages/server/src/database/migrations/20200503032011_create_media_links_table.ts b/packages/server/src/database/tenant/migrations/20200503032011_create_media_links_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200503032011_create_media_links_table.ts
rename to packages/server/src/database/tenant/migrations/20200503032011_create_media_links_table.ts
diff --git a/packages/server/src/database/migrations/20200606113848_create_expense_transactions_categories_table.ts b/packages/server/src/database/tenant/migrations/20200606113848_create_expense_transactions_categories_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200606113848_create_expense_transactions_categories_table.ts
rename to packages/server/src/database/tenant/migrations/20200606113848_create_expense_transactions_categories_table.ts
diff --git a/packages/server/src/database/migrations/20200713192127_create_sales_estimates_table.ts b/packages/server/src/database/tenant/migrations/20200713192127_create_sales_estimates_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200713192127_create_sales_estimates_table.ts
rename to packages/server/src/database/tenant/migrations/20200713192127_create_sales_estimates_table.ts
diff --git a/packages/server/src/database/migrations/20200713213303_create_sales_receipt_table.ts b/packages/server/src/database/tenant/migrations/20200713213303_create_sales_receipt_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200713213303_create_sales_receipt_table.ts
rename to packages/server/src/database/tenant/migrations/20200713213303_create_sales_receipt_table.ts
diff --git a/packages/server/src/database/migrations/20200715193633_create_sale_invoices_table.ts b/packages/server/src/database/tenant/migrations/20200715193633_create_sale_invoices_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200715193633_create_sale_invoices_table.ts
rename to packages/server/src/database/tenant/migrations/20200715193633_create_sale_invoices_table.ts
diff --git a/packages/server/src/database/migrations/20200715194514_create_payment_receives_table.ts b/packages/server/src/database/tenant/migrations/20200715194514_create_payment_receives_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200715194514_create_payment_receives_table.ts
rename to packages/server/src/database/tenant/migrations/20200715194514_create_payment_receives_table.ts
diff --git a/packages/server/src/database/migrations/20200718161031_create_payment_receives_entries_table.ts b/packages/server/src/database/tenant/migrations/20200718161031_create_payment_receives_entries_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200718161031_create_payment_receives_entries_table.ts
rename to packages/server/src/database/tenant/migrations/20200718161031_create_payment_receives_entries_table.ts
diff --git a/packages/server/src/database/migrations/20200719152005_create_bills_table.ts b/packages/server/src/database/tenant/migrations/20200719152005_create_bills_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200719152005_create_bills_table.ts
rename to packages/server/src/database/tenant/migrations/20200719152005_create_bills_table.ts
diff --git a/packages/server/src/database/migrations/20200719153909_create_bills_payments_table.ts b/packages/server/src/database/tenant/migrations/20200719153909_create_bills_payments_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200719153909_create_bills_payments_table.ts
rename to packages/server/src/database/tenant/migrations/20200719153909_create_bills_payments_table.ts
diff --git a/packages/server/src/database/migrations/20200722164251_create_inventory_transactions_table.ts b/packages/server/src/database/tenant/migrations/20200722164251_create_inventory_transactions_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200722164251_create_inventory_transactions_table.ts
rename to packages/server/src/database/tenant/migrations/20200722164251_create_inventory_transactions_table.ts
diff --git a/packages/server/src/database/migrations/20200722164252_create_landed_cost_table.ts b/packages/server/src/database/tenant/migrations/20200722164252_create_landed_cost_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200722164252_create_landed_cost_table.ts
rename to packages/server/src/database/tenant/migrations/20200722164252_create_landed_cost_table.ts
diff --git a/packages/server/src/database/migrations/20200722164253_create_landed_cost_entries_table.ts b/packages/server/src/database/tenant/migrations/20200722164253_create_landed_cost_entries_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200722164253_create_landed_cost_entries_table.ts
rename to packages/server/src/database/tenant/migrations/20200722164253_create_landed_cost_entries_table.ts
diff --git a/packages/server/src/database/migrations/20200722164255_create_inventory_transaction_meta_table.ts b/packages/server/src/database/tenant/migrations/20200722164255_create_inventory_transaction_meta_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200722164255_create_inventory_transaction_meta_table.ts
rename to packages/server/src/database/tenant/migrations/20200722164255_create_inventory_transaction_meta_table.ts
diff --git a/packages/server/src/database/migrations/20200722173423_create_items_entries_table.ts b/packages/server/src/database/tenant/migrations/20200722173423_create_items_entries_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200722173423_create_items_entries_table.ts
rename to packages/server/src/database/tenant/migrations/20200722173423_create_items_entries_table.ts
diff --git a/packages/server/src/database/migrations/20200728161617_create_bill_payments_entries.ts b/packages/server/src/database/tenant/migrations/20200728161617_create_bill_payments_entries.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200728161617_create_bill_payments_entries.ts
rename to packages/server/src/database/tenant/migrations/20200728161617_create_bill_payments_entries.ts
diff --git a/packages/server/src/database/migrations/20200810121807_create_inventory_cost_lot_tracker_table.ts b/packages/server/src/database/tenant/migrations/20200810121807_create_inventory_cost_lot_tracker_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200810121807_create_inventory_cost_lot_tracker_table.ts
rename to packages/server/src/database/tenant/migrations/20200810121807_create_inventory_cost_lot_tracker_table.ts
diff --git a/packages/server/src/database/migrations/20200810121809_create_inventory_adjustments_table.ts b/packages/server/src/database/tenant/migrations/20200810121809_create_inventory_adjustments_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200810121809_create_inventory_adjustments_table.ts
rename to packages/server/src/database/tenant/migrations/20200810121809_create_inventory_adjustments_table.ts
diff --git a/packages/server/src/database/migrations/20200810121810_create_inventory_adjustments_entries_table.ts b/packages/server/src/database/tenant/migrations/20200810121810_create_inventory_adjustments_entries_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200810121810_create_inventory_adjustments_entries_table.ts
rename to packages/server/src/database/tenant/migrations/20200810121810_create_inventory_adjustments_entries_table.ts
diff --git a/packages/server/src/database/migrations/20200810121910_create_cashflow_transactions_table.ts b/packages/server/src/database/tenant/migrations/20200810121910_create_cashflow_transactions_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20200810121910_create_cashflow_transactions_table.ts
rename to packages/server/src/database/tenant/migrations/20200810121910_create_cashflow_transactions_table.ts
diff --git a/packages/server/src/database/migrations/20210810121910_create_cashflow_transaction_lines_table.ts b/packages/server/src/database/tenant/migrations/20210810121910_create_cashflow_transaction_lines_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20210810121910_create_cashflow_transaction_lines_table.ts
rename to packages/server/src/database/tenant/migrations/20210810121910_create_cashflow_transaction_lines_table.ts
diff --git a/packages/server/src/database/migrations/20210910121910_add_invoices_writtenoff_columns.ts b/packages/server/src/database/tenant/migrations/20210910121910_add_invoices_writtenoff_columns.ts
similarity index 100%
rename from packages/server/src/database/migrations/20210910121910_add_invoices_writtenoff_columns.ts
rename to packages/server/src/database/tenant/migrations/20210910121910_add_invoices_writtenoff_columns.ts
diff --git a/packages/server/src/database/migrations/20211012121910_add_costable_column_to_account_transactions.ts b/packages/server/src/database/tenant/migrations/20211012121910_add_costable_column_to_account_transactions.ts
similarity index 100%
rename from packages/server/src/database/migrations/20211012121910_add_costable_column_to_account_transactions.ts
rename to packages/server/src/database/tenant/migrations/20211012121910_add_costable_column_to_account_transactions.ts
diff --git a/packages/server/src/database/migrations/20211014121910_add_roles_table.ts b/packages/server/src/database/tenant/migrations/20211014121910_add_roles_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20211014121910_add_roles_table.ts
rename to packages/server/src/database/tenant/migrations/20211014121910_add_roles_table.ts
diff --git a/packages/server/src/database/migrations/20211112121920_create_users_table.ts b/packages/server/src/database/tenant/migrations/20211112121920_create_users_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20211112121920_create_users_table.ts
rename to packages/server/src/database/tenant/migrations/20211112121920_create_users_table.ts
diff --git a/packages/server/src/database/migrations/20211122121920_create_credit_notes_table.ts b/packages/server/src/database/tenant/migrations/20211122121920_create_credit_notes_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20211122121920_create_credit_notes_table.ts
rename to packages/server/src/database/tenant/migrations/20211122121920_create_credit_notes_table.ts
diff --git a/packages/server/src/database/migrations/20211122121920_create_vendor_credits_table.ts b/packages/server/src/database/tenant/migrations/20211122121920_create_vendor_credits_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20211122121920_create_vendor_credits_table.ts
rename to packages/server/src/database/tenant/migrations/20211122121920_create_vendor_credits_table.ts
diff --git a/packages/server/src/database/migrations/20211123121920_create_refund_transactions_table.ts b/packages/server/src/database/tenant/migrations/20211123121920_create_refund_transactions_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20211123121920_create_refund_transactions_table.ts
rename to packages/server/src/database/tenant/migrations/20211123121920_create_refund_transactions_table.ts
diff --git a/packages/server/src/database/migrations/20211124121920_create_credit_note_applies_invoices.ts b/packages/server/src/database/tenant/migrations/20211124121920_create_credit_note_applies_invoices.ts
similarity index 100%
rename from packages/server/src/database/migrations/20211124121920_create_credit_note_applies_invoices.ts
rename to packages/server/src/database/tenant/migrations/20211124121920_create_credit_note_applies_invoices.ts
diff --git a/packages/server/src/database/migrations/20220124121920_create_branches_table.ts b/packages/server/src/database/tenant/migrations/20220124121920_create_branches_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220124121920_create_branches_table.ts
rename to packages/server/src/database/tenant/migrations/20220124121920_create_branches_table.ts
diff --git a/packages/server/src/database/migrations/20220124121920_create_warehouses_table.ts b/packages/server/src/database/tenant/migrations/20220124121920_create_warehouses_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220124121920_create_warehouses_table.ts
rename to packages/server/src/database/tenant/migrations/20220124121920_create_warehouses_table.ts
diff --git a/packages/server/src/database/migrations/20220125021920_create_items_warehouses_quantity.ts b/packages/server/src/database/tenant/migrations/20220125021920_create_items_warehouses_quantity.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220125021920_create_items_warehouses_quantity.ts
rename to packages/server/src/database/tenant/migrations/20220125021920_create_items_warehouses_quantity.ts
diff --git a/packages/server/src/database/migrations/20220125121920_add_branch_column_to_accounts_transactions.ts b/packages/server/src/database/tenant/migrations/20220125121920_add_branch_column_to_accounts_transactions.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220125121920_add_branch_column_to_accounts_transactions.ts
rename to packages/server/src/database/tenant/migrations/20220125121920_add_branch_column_to_accounts_transactions.ts
diff --git a/packages/server/src/database/migrations/20220125121920_add_branch_warehouse_columns_to_purchases.ts b/packages/server/src/database/tenant/migrations/20220125121920_add_branch_warehouse_columns_to_purchases.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220125121920_add_branch_warehouse_columns_to_purchases.ts
rename to packages/server/src/database/tenant/migrations/20220125121920_add_branch_warehouse_columns_to_purchases.ts
diff --git a/packages/server/src/database/migrations/20220125121920_add_branch_warehouse_columns_to_sales.ts b/packages/server/src/database/tenant/migrations/20220125121920_add_branch_warehouse_columns_to_sales.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220125121920_add_branch_warehouse_columns_to_sales.ts
rename to packages/server/src/database/tenant/migrations/20220125121920_add_branch_warehouse_columns_to_sales.ts
diff --git a/packages/server/src/database/migrations/20220125121920_add_warehouse_column_to_inventory_transactions.ts b/packages/server/src/database/tenant/migrations/20220125121920_add_warehouse_column_to_inventory_transactions.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220125121920_add_warehouse_column_to_inventory_transactions.ts
rename to packages/server/src/database/tenant/migrations/20220125121920_add_warehouse_column_to_inventory_transactions.ts
diff --git a/packages/server/src/database/migrations/20220125121920_add_warehouse_column_to_items_entries.ts b/packages/server/src/database/tenant/migrations/20220125121920_add_warehouse_column_to_items_entries.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220125121920_add_warehouse_column_to_items_entries.ts
rename to packages/server/src/database/tenant/migrations/20220125121920_add_warehouse_column_to_items_entries.ts
diff --git a/packages/server/src/database/migrations/20220128121920_add_exchange_rate_to_transactions.ts b/packages/server/src/database/tenant/migrations/20220128121920_add_exchange_rate_to_transactions.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220128121920_add_exchange_rate_to_transactions.ts
rename to packages/server/src/database/tenant/migrations/20220128121920_add_exchange_rate_to_transactions.ts
diff --git a/packages/server/src/database/migrations/20220129121920_add_writtenoff_expense_account_to_invoices.ts b/packages/server/src/database/tenant/migrations/20220129121920_add_writtenoff_expense_account_to_invoices.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220129121920_add_writtenoff_expense_account_to_invoices.ts
rename to packages/server/src/database/tenant/migrations/20220129121920_add_writtenoff_expense_account_to_invoices.ts
diff --git a/packages/server/src/database/migrations/20220229121920_rename_contacts_shipping_billing_addresses.ts b/packages/server/src/database/tenant/migrations/20220229121920_rename_contacts_shipping_billing_addresses.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220229121920_rename_contacts_shipping_billing_addresses.ts
rename to packages/server/src/database/tenant/migrations/20220229121920_rename_contacts_shipping_billing_addresses.ts
diff --git a/packages/server/src/database/migrations/20220329121920_add_cashflow_credit_account.ts b/packages/server/src/database/tenant/migrations/20220329121920_add_cashflow_credit_account.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220329121920_add_cashflow_credit_account.ts
rename to packages/server/src/database/tenant/migrations/20220329121920_add_cashflow_credit_account.ts
diff --git a/packages/server/src/database/migrations/20220329121920_add_seed_at_column_to_accounts.ts b/packages/server/src/database/tenant/migrations/20220329121920_add_seed_at_column_to_accounts.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220329121920_add_seed_at_column_to_accounts.ts
rename to packages/server/src/database/tenant/migrations/20220329121920_add_seed_at_column_to_accounts.ts
diff --git a/packages/server/src/database/migrations/20220429121920_create_projects_table.ts b/packages/server/src/database/tenant/migrations/20220429121920_create_projects_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220429121920_create_projects_table.ts
rename to packages/server/src/database/tenant/migrations/20220429121920_create_projects_table.ts
diff --git a/packages/server/src/database/migrations/20220429121922_add_project_id_to_expense_lines.ts b/packages/server/src/database/tenant/migrations/20220429121922_add_project_id_to_expense_lines.ts
similarity index 100%
rename from packages/server/src/database/migrations/20220429121922_add_project_id_to_expense_lines.ts
rename to packages/server/src/database/tenant/migrations/20220429121922_add_project_id_to_expense_lines.ts
diff --git a/packages/server/src/database/tenant/migrations/20230405232607_drop_phone_number_from_users.ts b/packages/server/src/database/tenant/migrations/20230405232607_drop_phone_number_from_users.ts
new file mode 100644
index 000000000..9ab142779
--- /dev/null
+++ b/packages/server/src/database/tenant/migrations/20230405232607_drop_phone_number_from_users.ts
@@ -0,0 +1,9 @@
+exports.up = function (knex) {
+  return knex.schema.table('users', (table) => {
+    table.dropColumn('phone_number');
+  });
+};
+
+exports.down = function (knex) {
+  return knex.schema.table('users', (table) => {});
+};
diff --git a/packages/server/src/database/migrations/20230810191606_create_tax_rates.ts b/packages/server/src/database/tenant/migrations/20230810191606_create_tax_rates.ts
similarity index 100%
rename from packages/server/src/database/migrations/20230810191606_create_tax_rates.ts
rename to packages/server/src/database/tenant/migrations/20230810191606_create_tax_rates.ts
diff --git a/packages/server/src/database/migrations/20231004012644_add_tax_amount_withheld_to_bills_table.ts b/packages/server/src/database/tenant/migrations/20231004012644_add_tax_amount_withheld_to_bills_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20231004012644_add_tax_amount_withheld_to_bills_table.ts
rename to packages/server/src/database/tenant/migrations/20231004012644_add_tax_amount_withheld_to_bills_table.ts
diff --git a/packages/server/src/database/migrations/20231004020636_add_sell_purchase_tax_to_items_table.ts b/packages/server/src/database/tenant/migrations/20231004020636_add_sell_purchase_tax_to_items_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20231004020636_add_sell_purchase_tax_to_items_table.ts
rename to packages/server/src/database/tenant/migrations/20231004020636_add_sell_purchase_tax_to_items_table.ts
diff --git a/packages/server/src/database/migrations/20231108170207_create_storage_table.ts b/packages/server/src/database/tenant/migrations/20231108170207_create_storage_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20231108170207_create_storage_table.ts
rename to packages/server/src/database/tenant/migrations/20231108170207_create_storage_table.ts
diff --git a/packages/server/src/database/migrations/20231202124014_change_item_entries_rate_to_float.ts b/packages/server/src/database/tenant/migrations/20231202124014_change_item_entries_rate_to_float.ts
similarity index 100%
rename from packages/server/src/database/migrations/20231202124014_change_item_entries_rate_to_float.ts
rename to packages/server/src/database/tenant/migrations/20231202124014_change_item_entries_rate_to_float.ts
diff --git a/packages/server/src/database/migrations/20240201160214_create_plaid_items_Table.ts b/packages/server/src/database/tenant/migrations/20240201160214_create_plaid_items_Table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240201160214_create_plaid_items_Table.ts
rename to packages/server/src/database/tenant/migrations/20240201160214_create_plaid_items_Table.ts
diff --git a/packages/server/src/database/migrations/20240201235818_add_plaid_account_id_to_accounts_table.ts b/packages/server/src/database/tenant/migrations/20240201235818_add_plaid_account_id_to_accounts_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240201235818_add_plaid_account_id_to_accounts_table.ts
rename to packages/server/src/database/tenant/migrations/20240201235818_add_plaid_account_id_to_accounts_table.ts
diff --git a/packages/server/src/database/migrations/20240204180554_add_plaid_transaction_id_to_cashflow_transaction.ts b/packages/server/src/database/tenant/migrations/20240204180554_add_plaid_transaction_id_to_cashflow_transaction.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240204180554_add_plaid_transaction_id_to_cashflow_transaction.ts
rename to packages/server/src/database/tenant/migrations/20240204180554_add_plaid_transaction_id_to_cashflow_transaction.ts
diff --git a/packages/server/src/database/migrations/20240228183404_create_uncateogrized_cashflow_transactions_table.ts b/packages/server/src/database/tenant/migrations/20240228183404_create_uncateogrized_cashflow_transactions_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240228183404_create_uncateogrized_cashflow_transactions_table.ts
rename to packages/server/src/database/tenant/migrations/20240228183404_create_uncateogrized_cashflow_transactions_table.ts
diff --git a/packages/server/src/database/migrations/20240304153926_add_uncategorized_transactions_column_to_accounts_table.ts b/packages/server/src/database/tenant/migrations/20240304153926_add_uncategorized_transactions_column_to_accounts_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240304153926_add_uncategorized_transactions_column_to_accounts_table.ts
rename to packages/server/src/database/tenant/migrations/20240304153926_add_uncategorized_transactions_column_to_accounts_table.ts
diff --git a/packages/server/src/database/migrations/20240308122047_add_uncategorized_transaction_id_to_cashflow_transactions.ts b/packages/server/src/database/tenant/migrations/20240308122047_add_uncategorized_transaction_id_to_cashflow_transactions.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240308122047_add_uncategorized_transaction_id_to_cashflow_transactions.ts
rename to packages/server/src/database/tenant/migrations/20240308122047_add_uncategorized_transaction_id_to_cashflow_transactions.ts
diff --git a/packages/server/src/database/migrations/20240604153938_drop_storage_table.ts b/packages/server/src/database/tenant/migrations/20240604153938_drop_storage_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240604153938_drop_storage_table.ts
rename to packages/server/src/database/tenant/migrations/20240604153938_drop_storage_table.ts
diff --git a/packages/server/src/database/migrations/20240604153951_create_documents_table.ts b/packages/server/src/database/tenant/migrations/20240604153951_create_documents_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240604153951_create_documents_table.ts
rename to packages/server/src/database/tenant/migrations/20240604153951_create_documents_table.ts
diff --git a/packages/server/src/database/migrations/20240604154005_create_documents_links_table.ts b/packages/server/src/database/tenant/migrations/20240604154005_create_documents_links_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240604154005_create_documents_links_table.ts
rename to packages/server/src/database/tenant/migrations/20240604154005_create_documents_links_table.ts
diff --git a/packages/server/src/database/migrations/20240618100137_create_bank_rules_table.ts b/packages/server/src/database/tenant/migrations/20240618100137_create_bank_rules_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240618100137_create_bank_rules_table.ts
rename to packages/server/src/database/tenant/migrations/20240618100137_create_bank_rules_table.ts
diff --git a/packages/server/src/database/migrations/20240618171553_create_recognized_bank_transactions_table.ts b/packages/server/src/database/tenant/migrations/20240618171553_create_recognized_bank_transactions_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240618171553_create_recognized_bank_transactions_table.ts
rename to packages/server/src/database/tenant/migrations/20240618171553_create_recognized_bank_transactions_table.ts
diff --git a/packages/server/src/database/migrations/20240618175241_add_recognized_transaction_id_to_uncategorized_transactins_table.ts b/packages/server/src/database/tenant/migrations/20240618175241_add_recognized_transaction_id_to_uncategorized_transactins_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240618175241_add_recognized_transaction_id_to_uncategorized_transactins_table.ts
rename to packages/server/src/database/tenant/migrations/20240618175241_add_recognized_transaction_id_to_uncategorized_transactins_table.ts
diff --git a/packages/server/src/database/migrations/20240619133733_create_matched_bank_transactions_table.ts b/packages/server/src/database/tenant/migrations/20240619133733_create_matched_bank_transactions_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240619133733_create_matched_bank_transactions_table.ts
rename to packages/server/src/database/tenant/migrations/20240619133733_create_matched_bank_transactions_table.ts
diff --git a/packages/server/src/database/migrations/20240620111308_add_excluded_column_to_uncategorized_cashflow_transactions_table.ts b/packages/server/src/database/tenant/migrations/20240620111308_add_excluded_column_to_uncategorized_cashflow_transactions_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240620111308_add_excluded_column_to_uncategorized_cashflow_transactions_table.ts
rename to packages/server/src/database/tenant/migrations/20240620111308_add_excluded_column_to_uncategorized_cashflow_transactions_table.ts
diff --git a/packages/server/src/database/migrations/20240623154149_add_batch_column_to_uncategorized_cashflow_transactions_table.ts b/packages/server/src/database/tenant/migrations/20240623154149_add_batch_column_to_uncategorized_cashflow_transactions_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240623154149_add_batch_column_to_uncategorized_cashflow_transactions_table.ts
rename to packages/server/src/database/tenant/migrations/20240623154149_add_batch_column_to_uncategorized_cashflow_transactions_table.ts
diff --git a/packages/server/src/database/migrations/20240704064858_change_settings_value_to_text.ts b/packages/server/src/database/tenant/migrations/20240704064858_change_settings_value_to_text.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240704064858_change_settings_value_to_text.ts
rename to packages/server/src/database/tenant/migrations/20240704064858_change_settings_value_to_text.ts
diff --git a/packages/server/src/database/migrations/20240709122347_move_cashflow_transaction_type_to_transaction_type_column.ts b/packages/server/src/database/tenant/migrations/20240709122347_move_cashflow_transaction_type_to_transaction_type_column.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240709122347_move_cashflow_transaction_type_to_transaction_type_column.ts
rename to packages/server/src/database/tenant/migrations/20240709122347_move_cashflow_transaction_type_to_transaction_type_column.ts
diff --git a/packages/server/src/database/migrations/20240716114732_add_plaid_item_id_to_accounts_table.ts b/packages/server/src/database/tenant/migrations/20240716114732_add_plaid_item_id_to_accounts_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240716114732_add_plaid_item_id_to_accounts_table.ts
rename to packages/server/src/database/tenant/migrations/20240716114732_add_plaid_item_id_to_accounts_table.ts
diff --git a/packages/server/src/database/migrations/20240729172403_add_is_syncing_owner_to_accounts_table.ts b/packages/server/src/database/tenant/migrations/20240729172403_add_is_syncing_owner_to_accounts_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240729172403_add_is_syncing_owner_to_accounts_table.ts
rename to packages/server/src/database/tenant/migrations/20240729172403_add_is_syncing_owner_to_accounts_table.ts
diff --git a/packages/server/src/database/migrations/20240801130829_change_tax_amount_withheld_column_precision_in_bills_and_sales_invoices_tables.ts b/packages/server/src/database/tenant/migrations/20240801130829_change_tax_amount_withheld_column_precision_in_bills_and_sales_invoices_tables.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240801130829_change_tax_amount_withheld_column_precision_in_bills_and_sales_invoices_tables.ts
rename to packages/server/src/database/tenant/migrations/20240801130829_change_tax_amount_withheld_column_precision_in_bills_and_sales_invoices_tables.ts
diff --git a/packages/server/src/database/migrations/20240804084709_create_paused_at_column_to_plaid_items_table.ts b/packages/server/src/database/tenant/migrations/20240804084709_create_paused_at_column_to_plaid_items_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240804084709_create_paused_at_column_to_plaid_items_table.ts
rename to packages/server/src/database/tenant/migrations/20240804084709_create_paused_at_column_to_plaid_items_table.ts
diff --git a/packages/server/src/database/migrations/20240811121028_add_pending_column_to_uncategorized_transactions_table.ts b/packages/server/src/database/tenant/migrations/20240811121028_add_pending_column_to_uncategorized_transactions_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240811121028_add_pending_column_to_uncategorized_transactions_table.ts
rename to packages/server/src/database/tenant/migrations/20240811121028_add_pending_column_to_uncategorized_transactions_table.ts
diff --git a/packages/server/src/database/migrations/20240909101051_add_stripe_pintent_id_to_payments_received.ts b/packages/server/src/database/tenant/migrations/20240909101051_add_stripe_pintent_id_to_payments_received.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240909101051_add_stripe_pintent_id_to_payments_received.ts
rename to packages/server/src/database/tenant/migrations/20240909101051_add_stripe_pintent_id_to_payments_received.ts
diff --git a/packages/server/src/database/migrations/20240911112147_create_pdf_templates_table.ts b/packages/server/src/database/tenant/migrations/20240911112147_create_pdf_templates_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240911112147_create_pdf_templates_table.ts
rename to packages/server/src/database/tenant/migrations/20240911112147_create_pdf_templates_table.ts
diff --git a/packages/server/src/database/migrations/20240915155403_payment_integration.ts b/packages/server/src/database/tenant/migrations/20240915155403_payment_integration.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240915155403_payment_integration.ts
rename to packages/server/src/database/tenant/migrations/20240915155403_payment_integration.ts
diff --git a/packages/server/src/database/migrations/20240915163722_creat_transaction_payment_service_table.ts b/packages/server/src/database/tenant/migrations/20240915163722_creat_transaction_payment_service_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240915163722_creat_transaction_payment_service_table.ts
rename to packages/server/src/database/tenant/migrations/20240915163722_creat_transaction_payment_service_table.ts
diff --git a/packages/server/src/database/migrations/20240915195024_seed_standard_pdf_templates.ts b/packages/server/src/database/tenant/migrations/20240915195024_seed_standard_pdf_templates.ts
similarity index 100%
rename from packages/server/src/database/migrations/20240915195024_seed_standard_pdf_templates.ts
rename to packages/server/src/database/tenant/migrations/20240915195024_seed_standard_pdf_templates.ts
diff --git a/packages/server/src/database/migrations/20241113113437_change_quantity_in_items_entries_to_decimal.ts b/packages/server/src/database/tenant/migrations/20241113113437_change_quantity_in_items_entries_to_decimal.ts
similarity index 100%
rename from packages/server/src/database/migrations/20241113113437_change_quantity_in_items_entries_to_decimal.ts
rename to packages/server/src/database/tenant/migrations/20241113113437_change_quantity_in_items_entries_to_decimal.ts
diff --git a/packages/server/src/database/migrations/20241128080734_add_discount_to_invoices_table.ts b/packages/server/src/database/tenant/migrations/20241128080734_add_discount_to_invoices_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20241128080734_add_discount_to_invoices_table.ts
rename to packages/server/src/database/tenant/migrations/20241128080734_add_discount_to_invoices_table.ts
diff --git a/packages/server/src/database/migrations/20241128081259_add_discount_to_estimates_table.ts b/packages/server/src/database/tenant/migrations/20241128081259_add_discount_to_estimates_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20241128081259_add_discount_to_estimates_table.ts
rename to packages/server/src/database/tenant/migrations/20241128081259_add_discount_to_estimates_table.ts
diff --git a/packages/server/src/database/migrations/20241128084550_add_discount_to_receipts_table.ts b/packages/server/src/database/tenant/migrations/20241128084550_add_discount_to_receipts_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20241128084550_add_discount_to_receipts_table.ts
rename to packages/server/src/database/tenant/migrations/20241128084550_add_discount_to_receipts_table.ts
diff --git a/packages/server/src/database/migrations/20241128085243_add_discount_to_bills_table.ts b/packages/server/src/database/tenant/migrations/20241128085243_add_discount_to_bills_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20241128085243_add_discount_to_bills_table.ts
rename to packages/server/src/database/tenant/migrations/20241128085243_add_discount_to_bills_table.ts
diff --git a/packages/server/src/database/migrations/20241128090222_add_discount_to_credit_notes_table.ts b/packages/server/src/database/tenant/migrations/20241128090222_add_discount_to_credit_notes_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20241128090222_add_discount_to_credit_notes_table.ts
rename to packages/server/src/database/tenant/migrations/20241128090222_add_discount_to_credit_notes_table.ts
diff --git a/packages/server/src/database/migrations/20241128160604_add_discount_to_vendor_credits_table.ts b/packages/server/src/database/tenant/migrations/20241128160604_add_discount_to_vendor_credits_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20241128160604_add_discount_to_vendor_credits_table.ts
rename to packages/server/src/database/tenant/migrations/20241128160604_add_discount_to_vendor_credits_table.ts
diff --git a/packages/server/src/database/migrations/20241211103019_add_discount_type_to_items_entries_table.ts b/packages/server/src/database/tenant/migrations/20241211103019_add_discount_type_to_items_entries_table.ts
similarity index 100%
rename from packages/server/src/database/migrations/20241211103019_add_discount_type_to_items_entries_table.ts
rename to packages/server/src/database/tenant/migrations/20241211103019_add_discount_type_to_items_entries_table.ts
diff --git a/packages/server/src/database/seeds/core/20190423085242_seed_accounts.ts b/packages/server/src/database/tenant/seeds/core/20190423085242_seed_accounts.ts
similarity index 100%
rename from packages/server/src/database/seeds/core/20190423085242_seed_accounts.ts
rename to packages/server/src/database/tenant/seeds/core/20190423085242_seed_accounts.ts
diff --git a/packages/server/src/database/seeds/core/20200810121809_seed_settings.ts b/packages/server/src/database/tenant/seeds/core/20200810121809_seed_settings.ts
similarity index 100%
rename from packages/server/src/database/seeds/core/20200810121809_seed_settings.ts
rename to packages/server/src/database/tenant/seeds/core/20200810121809_seed_settings.ts
diff --git a/packages/server/src/database/seeds/core/20200810121909_seed_items_settings.ts b/packages/server/src/database/tenant/seeds/core/20200810121909_seed_items_settings.ts
similarity index 100%
rename from packages/server/src/database/seeds/core/20200810121909_seed_items_settings.ts
rename to packages/server/src/database/tenant/seeds/core/20200810121909_seed_items_settings.ts
diff --git a/packages/server/src/database/seeds/core/20210810121909_seed_roles.ts b/packages/server/src/database/tenant/seeds/core/20210810121909_seed_roles.ts
similarity index 100%
rename from packages/server/src/database/seeds/core/20210810121909_seed_roles.ts
rename to packages/server/src/database/tenant/seeds/core/20210810121909_seed_roles.ts
diff --git a/packages/server/src/database/seeds/core/20210812121909_seed_roles_permissions.ts b/packages/server/src/database/tenant/seeds/core/20210812121909_seed_roles_permissions.ts
similarity index 100%
rename from packages/server/src/database/seeds/core/20210812121909_seed_roles_permissions.ts
rename to packages/server/src/database/tenant/seeds/core/20210812121909_seed_roles_permissions.ts
diff --git a/packages/server/src/database/seeds/core/20210912121909_seed_credit_settings.ts b/packages/server/src/database/tenant/seeds/core/20210912121909_seed_credit_settings.ts
similarity index 100%
rename from packages/server/src/database/seeds/core/20210912121909_seed_credit_settings.ts
rename to packages/server/src/database/tenant/seeds/core/20210912121909_seed_credit_settings.ts
diff --git a/packages/server/src/database/seeds/core/20230912121909_seed_tax_rates.ts b/packages/server/src/database/tenant/seeds/core/20230912121909_seed_tax_rates.ts
similarity index 100%
rename from packages/server/src/database/seeds/core/20230912121909_seed_tax_rates.ts
rename to packages/server/src/database/tenant/seeds/core/20230912121909_seed_tax_rates.ts
diff --git a/packages/server/src/database/seeds/core/20230912121909_update_tax_payable_account.ts b/packages/server/src/database/tenant/seeds/core/20230912121909_update_tax_payable_account.ts
similarity index 100%
rename from packages/server/src/database/seeds/core/20230912121909_update_tax_payable_account.ts
rename to packages/server/src/database/tenant/seeds/core/20230912121909_update_tax_payable_account.ts
diff --git a/packages/server/src/database/seeds/core/index.ts b/packages/server/src/database/tenant/seeds/core/index.ts
similarity index 100%
rename from packages/server/src/database/seeds/core/index.ts
rename to packages/server/src/database/tenant/seeds/core/index.ts
diff --git a/packages/server/src/database/seeds/data/TaxRates.ts b/packages/server/src/database/tenant/seeds/data/TaxRates.ts
similarity index 100%
rename from packages/server/src/database/seeds/data/TaxRates.ts
rename to packages/server/src/database/tenant/seeds/data/TaxRates.ts
diff --git a/packages/server/src/database/seeds/data/accounts.ts b/packages/server/src/database/tenant/seeds/data/accounts.ts
similarity index 100%
rename from packages/server/src/database/seeds/data/accounts.ts
rename to packages/server/src/database/tenant/seeds/data/accounts.ts
diff --git a/packages/server/src/modules/Currencies/commands/InitialCurrenciesSeed.service.ts b/packages/server/src/modules/Currencies/commands/InitialCurrenciesSeed.service.ts
index dac18638c..b4a0868cd 100644
--- a/packages/server/src/modules/Currencies/commands/InitialCurrenciesSeed.service.ts
+++ b/packages/server/src/modules/Currencies/commands/InitialCurrenciesSeed.service.ts
@@ -1,6 +1,6 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { uniq } from 'lodash';
-import Currencies from 'js-money/lib/currency';
+import * as Currencies from 'js-money/lib/currency';
 import { InitialCurrencies } from '../Currencies.constants';
 import { TenantModelProxy } from '../../System/models/TenantBaseModel';
 import { Currency } from '../models/Currency.model';
@@ -10,7 +10,7 @@ export class InitialCurrenciesSeedService {
   constructor(
     @Inject(Currency.name)
     private readonly currencyModel: TenantModelProxy<typeof Currency>,
-  ) {}
+  ) { }
 
   /**
    * Seeds the given base currency to the currencies list.