diff --git a/packages/user-access-policy/src/index.ts b/packages/user-access-policy/src/index.ts
index a2b27a780..3cdaadf79 100644
--- a/packages/user-access-policy/src/index.ts
+++ b/packages/user-access-policy/src/index.ts
@@ -17,8 +17,8 @@ import type { RequestInspector } from "@blacklist/inspector/requestInspector.js"
 import { createExpressRuleRouter } from "@rules/api/createExpressRuleRouter.js";
 import { getExpressApiRuleRateLimits } from "@rules/api/getExpressApiRuleRateLimits.js";
 import type { Rule } from "@rules/rule/rule.js";
-import { createMongooseRulesStorage } from "@rules/storage/mongoose/createMongooseRulesStorage.js";
-import { getMongooseRuleRecordSchema } from "@rules/storage/mongoose/getMongooseRuleRecordSchema.js";
+import { createMongooseRulesStorage } from "@rules/storage/createMongooseRulesStorage.js";
+import { getMongooseRuleRecordSchema } from "@rules/storage/record/getMongooseRuleRecordSchema.js";
 import type { RulesStorage } from "@rules/storage/rulesStorage.js";
 
 export {
diff --git a/packages/user-access-policy/src/rules/storage/mongoose/createMongooseRulesStorage.ts b/packages/user-access-policy/src/rules/storage/createMongooseRulesStorage.ts
similarity index 92%
rename from packages/user-access-policy/src/rules/storage/mongoose/createMongooseRulesStorage.ts
rename to packages/user-access-policy/src/rules/storage/createMongooseRulesStorage.ts
index 02e0d90cf..7221397b1 100644
--- a/packages/user-access-policy/src/rules/storage/mongoose/createMongooseRulesStorage.ts
+++ b/packages/user-access-policy/src/rules/storage/createMongooseRulesStorage.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 import type { Model } from "mongoose";
 import type {Rule} from "@rules/rule/rule.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import type {RulesStorage} from "@rules/storage/rulesStorage.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 const createMongooseRulesStorage = (
 	readingModel: Model<Rule> | null,
diff --git a/packages/user-access-policy/src/rules/storage/mongoose/mongooseRulesStorage.ts b/packages/user-access-policy/src/rules/storage/mongooseRulesStorage.ts
similarity index 100%
rename from packages/user-access-policy/src/rules/storage/mongoose/mongooseRulesStorage.ts
rename to packages/user-access-policy/src/rules/storage/mongooseRulesStorage.ts
diff --git a/packages/user-access-policy/src/rules/storage/mongoose/getMongooseRuleRecordSchema.ts b/packages/user-access-policy/src/rules/storage/record/getMongooseRuleRecordSchema.ts
similarity index 82%
rename from packages/user-access-policy/src/rules/storage/mongoose/getMongooseRuleRecordSchema.ts
rename to packages/user-access-policy/src/rules/storage/record/getMongooseRuleRecordSchema.ts
index aade58cbd..7d4f8a767 100644
--- a/packages/user-access-policy/src/rules/storage/mongoose/getMongooseRuleRecordSchema.ts
+++ b/packages/user-access-policy/src/rules/storage/record/getMongooseRuleRecordSchema.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 import type { Schema } from "mongoose";
 import type {Rule} from "@rules/rule/rule.js";
-import {mongoosePerformanceRuleIndexes} from "@rules/storage/mongoose/indexes/mongoosePerformanceRuleIndexes.js";
-import {mongooseUniqueRuleIndexes} from "@rules/storage/mongoose/indexes/mongooseUniqueRuleIndexes.js";
+import {mongoosePerformanceRuleIndexes} from "@rules/storage/record/indexes/performance/mongoosePerformanceRuleIndexes.js";
+import {mongooseUniqueRuleIndexes} from "@rules/storage/record/indexes/unique/mongooseUniqueRuleIndexes.js";
 import {mongooseRule} from "@rules/rule/mongooseRule.js";
 
 const getMongooseRuleRecordSchema = (): Schema<Rule> => {
diff --git a/packages/user-access-policy/src/rules/storage/mongoose/indexes/mongooseIndex.ts b/packages/user-access-policy/src/rules/storage/record/indexes/mongooseIndex.ts
similarity index 100%
rename from packages/user-access-policy/src/rules/storage/mongoose/indexes/mongooseIndex.ts
rename to packages/user-access-policy/src/rules/storage/record/indexes/mongooseIndex.ts
diff --git a/packages/user-access-policy/src/rules/storage/mongoose/indexes/mongoosePerformanceRuleIndexes.ts b/packages/user-access-policy/src/rules/storage/record/indexes/performance/mongoosePerformanceRuleIndexes.ts
similarity index 94%
rename from packages/user-access-policy/src/rules/storage/mongoose/indexes/mongoosePerformanceRuleIndexes.ts
rename to packages/user-access-policy/src/rules/storage/record/indexes/performance/mongoosePerformanceRuleIndexes.ts
index f5c4cc7d1..7f023fe2d 100644
--- a/packages/user-access-policy/src/rules/storage/mongoose/indexes/mongoosePerformanceRuleIndexes.ts
+++ b/packages/user-access-policy/src/rules/storage/record/indexes/performance/mongoosePerformanceRuleIndexes.ts
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import type {MongooseIndex} from "@rules/storage/mongoose/indexes/mongooseIndex.js";
+import type {MongooseIndex} from "@rules/storage/record/indexes/mongooseIndex.js";
 
 const userIpIndexes: MongooseIndex[] = [
 	{
diff --git a/packages/user-access-policy/src/rules/storage/mongoose/indexes/mongooseUniqueRuleIndexes.ts b/packages/user-access-policy/src/rules/storage/record/indexes/unique/mongooseUniqueRuleIndexes.ts
similarity index 97%
rename from packages/user-access-policy/src/rules/storage/mongoose/indexes/mongooseUniqueRuleIndexes.ts
rename to packages/user-access-policy/src/rules/storage/record/indexes/unique/mongooseUniqueRuleIndexes.ts
index 1d37cf4ad..5791de382 100644
--- a/packages/user-access-policy/src/rules/storage/mongoose/indexes/mongooseUniqueRuleIndexes.ts
+++ b/packages/user-access-policy/src/rules/storage/record/indexes/unique/mongooseUniqueRuleIndexes.ts
@@ -11,8 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-
-import type {MongooseIndex} from "@rules/storage/mongoose/indexes/mongooseIndex.js";
+import type {MongooseIndex} from "@rules/storage/record/indexes/mongooseIndex.js";
 
 const globalIpIndexes: MongooseIndex[] = [
 	{
diff --git a/packages/user-access-policy/src/tests/benchmark/storageFactory/mongooseRulesStorageFactory.ts b/packages/user-access-policy/src/tests/benchmark/storageFactory/mongooseRulesStorageFactory.ts
index b45aeca7d..f24b85545 100644
--- a/packages/user-access-policy/src/tests/benchmark/storageFactory/mongooseRulesStorageFactory.ts
+++ b/packages/user-access-policy/src/tests/benchmark/storageFactory/mongooseRulesStorageFactory.ts
@@ -13,10 +13,10 @@
 // limitations under the License.
 import mongoose, { type Model } from "mongoose";
 import type {RulesStorageFactory} from "@tests/benchmark/storageFactory/rulesStorageFactory.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import type {RulesStorage} from "@rules/storage/rulesStorage.js";
 import type {Rule} from "@rules/rule/rule.js";
-import {getMongooseRuleRecordSchema} from "@rules/storage/mongoose/getMongooseRuleRecordSchema.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
+import {getMongooseRuleRecordSchema} from "@rules/storage/record/getMongooseRuleRecordSchema.js";
 
 class MongooseRulesStorageFactory implements RulesStorageFactory {
 	async createRulesStorage(dbUrl: string): Promise<RulesStorage> {
diff --git a/packages/user-access-policy/src/tests/rules/storage/createTestMongooseRuleModel.ts b/packages/user-access-policy/src/tests/rules/storage/createTestMongooseRuleModel.ts
index 6b7af5c8e..c6abf60c2 100644
--- a/packages/user-access-policy/src/tests/rules/storage/createTestMongooseRuleModel.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/createTestMongooseRuleModel.ts
@@ -14,8 +14,8 @@
 import { MongoMemoryServer } from "mongodb-memory-server";
 import mongoose, { type Model } from "mongoose";
 import { afterAll, beforeEach } from "vitest";
-import {getMongooseRuleRecordSchema} from "@rules/storage/mongoose/getMongooseRuleRecordSchema.js";
 import type {Rule} from "@rules/rule/rule.js";
+import {getMongooseRuleRecordSchema} from "@rules/storage/record/getMongooseRuleRecordSchema.js";
 
 const createTestMongooseRuleModel = async (): Promise<Model<Rule>> => {
 	const mongoServer = await MongoMemoryServer.create();
diff --git a/packages/user-access-policy/src/tests/rules/storage/filters/search/generic/testMongooseFindRule.spec.ts b/packages/user-access-policy/src/tests/rules/storage/filters/search/generic/testMongooseFindRule.spec.ts
index d821cfa0d..da9bb59d6 100644
--- a/packages/user-access-policy/src/tests/rules/storage/filters/search/generic/testMongooseFindRule.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/filters/search/generic/testMongooseFindRule.spec.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {TestFindRule} from "@tests/rules/storage/filters/search/generic/testFindRule.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseFindRule", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/filters/search/generic/testMongooseFindRuleByUserId.spec.ts b/packages/user-access-policy/src/tests/rules/storage/filters/search/generic/testMongooseFindRuleByUserId.spec.ts
index 24a5b8537..4c627f6f9 100644
--- a/packages/user-access-policy/src/tests/rules/storage/filters/search/generic/testMongooseFindRuleByUserId.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/filters/search/generic/testMongooseFindRuleByUserId.spec.ts
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { describe } from "vitest";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {TestFindRuleByUserId} from "@tests/rules/storage/filters/search/generic/testFindRuleByUserId.js";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseFindRuleByUserId", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/mask/maskRange/max/testMongooseFindByMaskV4RangeMax.spec.ts b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/mask/maskRange/max/testMongooseFindByMaskV4RangeMax.spec.ts
index 95573e60a..ebbcc9405 100644
--- a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/mask/maskRange/max/testMongooseFindByMaskV4RangeMax.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/mask/maskRange/max/testMongooseFindByMaskV4RangeMax.spec.ts
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { describe } from "vitest";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {
 	TestFindByMaskV4RangeMax
 } from "@tests/rules/storage/filters/search/ip/v4/mask/maskRange/max/testFindByMaskV4RangeMax.js";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseFindByMaskV4RangeMax", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/mask/maskRange/min/testMongooseFindByMaskV4RangeMin.spec.ts b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/mask/maskRange/min/testMongooseFindByMaskV4RangeMin.spec.ts
index 65e74e3de..538302af0 100644
--- a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/mask/maskRange/min/testMongooseFindByMaskV4RangeMin.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/mask/maskRange/min/testMongooseFindByMaskV4RangeMin.spec.ts
@@ -13,10 +13,10 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {
 	TestFindByMaskV4RangeMin
 } from "@tests/rules/storage/filters/search/ip/v4/mask/maskRange/min/testFindByMaskV4RangeMin.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseFindByMaskV4RangeMin", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/mask/testMongooseFindByMaskV4.spec.ts b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/mask/testMongooseFindByMaskV4.spec.ts
index ef7ad2b54..535efe5b2 100644
--- a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/mask/testMongooseFindByMaskV4.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/mask/testMongooseFindByMaskV4.spec.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {TestFindByMaskV4} from "@tests/rules/storage/filters/search/ip/v4/mask/testFindByMaskV4.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseFindByMaskV4", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/testMongooseFindByIpV4.spec.ts b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/testMongooseFindByIpV4.spec.ts
index 0f7ba31ae..1e244040d 100644
--- a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/testMongooseFindByIpV4.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v4/testMongooseFindByIpV4.spec.ts
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { describe } from "vitest";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
 import {TestFindByIpV4} from "@tests/rules/storage/filters/search/ip/v4/testFindByIpV4.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseFindByIpV4", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/mask/maskRange/max/testMongooseFindByIpMaskV6RangeMax.spec.ts b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/mask/maskRange/max/testMongooseFindByIpMaskV6RangeMax.spec.ts
index ee3d35eec..f9e12e23c 100644
--- a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/mask/maskRange/max/testMongooseFindByIpMaskV6RangeMax.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/mask/maskRange/max/testMongooseFindByIpMaskV6RangeMax.spec.ts
@@ -13,10 +13,10 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {
 	TestFindByIpMaskV6RangeMax
 } from "@tests/rules/storage/filters/search/ip/v6/mask/maskRange/max/testFindByIpMaskV6RangeMax.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseFindByIpMaskV6RangeMax", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/mask/maskRange/min/testMongooseFindByIpMaskV6RangeMin.spec.ts b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/mask/maskRange/min/testMongooseFindByIpMaskV6RangeMin.spec.ts
index f89a635f3..9e01c5776 100644
--- a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/mask/maskRange/min/testMongooseFindByIpMaskV6RangeMin.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/mask/maskRange/min/testMongooseFindByIpMaskV6RangeMin.spec.ts
@@ -13,10 +13,10 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {
 	TestFindByIpMaskV6RangeMin
 } from "@tests/rules/storage/filters/search/ip/v6/mask/maskRange/min/testFindByIpMaskV6RangeMin.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseFindByIpMaskV6RangeMin", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/mask/testMongooseFindByIpMaskV6.spec.ts b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/mask/testMongooseFindByIpMaskV6.spec.ts
index 2fe59ea6c..d0947df79 100644
--- a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/mask/testMongooseFindByIpMaskV6.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/mask/testMongooseFindByIpMaskV6.spec.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {TestFindByIpMaskV6} from "@tests/rules/storage/filters/search/ip/v6/mask/testFindByIpMaskV6.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseFindByIpMaskV6", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/mask/maskRange/max/testMongooseFindByIpMaskV6ShortRangeMax.spec.ts b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/mask/maskRange/max/testMongooseFindByIpMaskV6ShortRangeMax.spec.ts
index 7c711c56d..97d38b12b 100644
--- a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/mask/maskRange/max/testMongooseFindByIpMaskV6ShortRangeMax.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/mask/maskRange/max/testMongooseFindByIpMaskV6ShortRangeMax.spec.ts
@@ -15,8 +15,8 @@ import { describe } from "vitest";
 import {
 	TestFindByIpMaskV6ShortRangeMax
 } from "@tests/rules/storage/filters/search/ip/v6/short/mask/maskRange/max/testFindByIpMaskV6ShortRangeMax.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseFindByIpV6MaskV6ShortRangeMax", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/mask/maskRange/min/testMongooseFindByIpMaskV6ShortRangeMix.spec.ts b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/mask/maskRange/min/testMongooseFindByIpMaskV6ShortRangeMix.spec.ts
index e9f07e8df..c7bbeafbe 100644
--- a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/mask/maskRange/min/testMongooseFindByIpMaskV6ShortRangeMix.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/mask/maskRange/min/testMongooseFindByIpMaskV6ShortRangeMix.spec.ts
@@ -13,10 +13,10 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {
 	TestFindByIpMaskV6ShortRangeMin
 } from "@tests/rules/storage/filters/search/ip/v6/short/mask/maskRange/min/testFindByIpMaskV6ShortRangeMin.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseFindByIpMaskV6ShortRangeMin", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/mask/testMongooseFindByIpMaskV6Short.spec.ts b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/mask/testMongooseFindByIpMaskV6Short.spec.ts
index f09191385..d1de2a0ca 100644
--- a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/mask/testMongooseFindByIpMaskV6Short.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/mask/testMongooseFindByIpMaskV6Short.spec.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {TestFindByIpMaskV6Short} from "@tests/rules/storage/filters/search/ip/v6/short/mask/testFindByIpMaskV6Short.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseFindByIpMaskV6Short", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/testMongooseFindByIpV6Short.spec.ts b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/testMongooseFindByIpV6Short.spec.ts
index 5c8b1cb8b..32a1f92e2 100644
--- a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/testMongooseFindByIpV6Short.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/short/testMongooseFindByIpV6Short.spec.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {TestFindByIpV6Short} from "@tests/rules/storage/filters/search/ip/v6/short/testFindByIpV6Short.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseFindByIpV6Short", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/testMongooseFindByIpV6.spec.ts b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/testMongooseFindByIpV6.spec.ts
index 6611c9fa0..2af33a1b9 100644
--- a/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/testMongooseFindByIpV6.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/filters/search/ip/v6/testMongooseFindByIpV6.spec.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {TestFindByIpV6} from "@tests/rules/storage/filters/search/ip/v6/testFindByIpV6.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseFindByIpV6", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v4/mask/testMongooseIpV4MaskUniqueIndex.spec.ts b/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v4/mask/testMongooseIpV4MaskUniqueIndex.spec.ts
index 6b4c8b02c..fb0565756 100644
--- a/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v4/mask/testMongooseIpV4MaskUniqueIndex.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v4/mask/testMongooseIpV4MaskUniqueIndex.spec.ts
@@ -15,8 +15,8 @@ import { describe } from "vitest";
 import {
 	TestIpV4MaskUniqueIndex
 } from "@tests/rules/storage/mongoose/indexes/unique/ip/v4/mask/testIpV4MaskUniqueIndex.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseIpV4MaskUniqueIndex", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v4/testMongooseIpV4UniqueIndex.spec.ts b/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v4/testMongooseIpV4UniqueIndex.spec.ts
index 2fa5d5c16..02908699c 100644
--- a/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v4/testMongooseIpV4UniqueIndex.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v4/testMongooseIpV4UniqueIndex.spec.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {TestIpV4UniqueIndex} from "@tests/rules/storage/mongoose/indexes/unique/ip/v4/testIpV4UniqueIndex.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseIpV4UniqueIndex", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v6/mask/testMongooseIpV6MaskUniqueIndex.spec.ts b/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v6/mask/testMongooseIpV6MaskUniqueIndex.spec.ts
index 342b2dc0e..50ef8f3fa 100644
--- a/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v6/mask/testMongooseIpV6MaskUniqueIndex.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v6/mask/testMongooseIpV6MaskUniqueIndex.spec.ts
@@ -15,8 +15,8 @@ import { describe } from "vitest";
 import {
 	TestIpV6MaskUniqueIndex
 } from "@tests/rules/storage/mongoose/indexes/unique/ip/v6/mask/testIpV6MaskUniqueIndex.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseIpV6MaskUniqueIndex", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v6/testMongooseIpV6UniqueIndex.spec.ts b/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v6/testMongooseIpV6UniqueIndex.spec.ts
index d35dbd84f..cb1ef259f 100644
--- a/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v6/testMongooseIpV6UniqueIndex.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/mongoose/indexes/unique/ip/v6/testMongooseIpV6UniqueIndex.spec.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {TestIpV6UniqueIndex} from "@tests/rules/storage/mongoose/indexes/unique/ip/v6/testIpV6UniqueIndex.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseIpV6UniqueIndex", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/ipV6Formatting/mask/testMongooseIpV6MaskFormatting.spec.ts b/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/ipV6Formatting/mask/testMongooseIpV6MaskFormatting.spec.ts
index e25c8fc23..06868d1d3 100644
--- a/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/ipV6Formatting/mask/testMongooseIpV6MaskFormatting.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/ipV6Formatting/mask/testMongooseIpV6MaskFormatting.spec.ts
@@ -13,10 +13,10 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {
 	TestIpV6MaskFormatting
 } from "@tests/rules/storage/record/fieldTests/ipV6Formatting/mask/testIpV6MaskFormatting.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseIpV6MaskFormatting", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/ipV6Formatting/testMongooseIpV6Formatting.spec.ts b/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/ipV6Formatting/testMongooseIpV6Formatting.spec.ts
index dfa3cb7fc..60937761c 100644
--- a/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/ipV6Formatting/testMongooseIpV6Formatting.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/ipV6Formatting/testMongooseIpV6Formatting.spec.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {TestIpV6Formatting} from "@tests/rules/storage/record/fieldTests/ipV6Formatting/testIpV6Formatting.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseIpV6Formatting", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/optional/testMongooseOptionalFieldsValidation.spec.ts b/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/optional/testMongooseOptionalFieldsValidation.spec.ts
index afd78e9fb..0136a4afe 100644
--- a/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/optional/testMongooseOptionalFieldsValidation.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/optional/testMongooseOptionalFieldsValidation.spec.ts
@@ -13,10 +13,10 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {
 	TestOptionalFieldsValidation
 } from "@tests/rules/storage/record/fieldTests/validation/optional/testOptionalFieldsValidation.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseOptionalFieldsValidation", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/userId/testMongooseUserIdValidation.spec.ts b/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/userId/testMongooseUserIdValidation.spec.ts
index 86a77f131..9ac45f99e 100644
--- a/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/userId/testMongooseUserIdValidation.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/userId/testMongooseUserIdValidation.spec.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {TestUserIdValidation} from "@tests/rules/storage/record/fieldTests/validation/userId/testUserIdValidation.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseUserIdValidation", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/userIp/testMongooseUserIdValidation.spec.ts b/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/userIp/testMongooseUserIdValidation.spec.ts
index 34fb64bca..4999ae472 100644
--- a/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/userIp/testMongooseUserIdValidation.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/userIp/testMongooseUserIdValidation.spec.ts
@@ -13,8 +13,8 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {TestUserIpValidation} from "@tests/rules/storage/record/fieldTests/validation/userIp/testUserIpValidation.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseUserIPValidation", async () => {
 	const testModel = await createTestMongooseRuleModel();
diff --git a/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/userIpVersion/testMongooseUserIpVersionValidation.spec.ts b/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/userIpVersion/testMongooseUserIpVersionValidation.spec.ts
index 32faa78b5..c9c130a07 100644
--- a/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/userIpVersion/testMongooseUserIpVersionValidation.spec.ts
+++ b/packages/user-access-policy/src/tests/rules/storage/record/fieldTests/validation/userIpVersion/testMongooseUserIpVersionValidation.spec.ts
@@ -13,10 +13,10 @@
 // limitations under the License.
 import { describe } from "vitest";
 import {createTestMongooseRuleModel} from "@tests/rules/storage/createTestMongooseRuleModel.js";
-import {MongooseRulesStorage} from "@rules/storage/mongoose/mongooseRulesStorage.js";
 import {
 	TestUserIpVersionValidation
 } from "@tests/rules/storage/record/fieldTests/validation/userIpVersion/testUserIpVersionValidation.js";
+import {MongooseRulesStorage} from "@rules/storage/mongooseRulesStorage.js";
 
 describe("MongooseUserIpVersionValidation", async () => {
 	const testModel = await createTestMongooseRuleModel();