diff --git a/frontends/nextjs/src/lib/security/secure-db/audit-log-store.ts b/frontends/nextjs/src/lib/security/secure-db/audit/audit-log-store.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/audit-log-store.ts
rename to frontends/nextjs/src/lib/security/secure-db/audit/audit-log-store.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/log-operation.ts b/frontends/nextjs/src/lib/security/secure-db/audit/log-operation.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/log-operation.ts
rename to frontends/nextjs/src/lib/security/secure-db/audit/log-operation.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/create-login-security-context.ts b/frontends/nextjs/src/lib/security/secure-db/login/create-login-security-context.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/create-login-security-context.ts
rename to frontends/nextjs/src/lib/security/secure-db/login/create-login-security-context.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/get-login-lockout-info.test.ts b/frontends/nextjs/src/lib/security/secure-db/login/get-login-lockout-info.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/get-login-lockout-info.test.ts
rename to frontends/nextjs/src/lib/security/secure-db/login/get-login-lockout-info.test.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/get-login-lockout-info.ts b/frontends/nextjs/src/lib/security/secure-db/login/get-login-lockout-info.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/get-login-lockout-info.ts
rename to frontends/nextjs/src/lib/security/secure-db/login/get-login-lockout-info.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/login-attempt-tracker.ts b/frontends/nextjs/src/lib/security/secure-db/login/login-attempt-tracker.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/login-attempt-tracker.ts
rename to frontends/nextjs/src/lib/security/secure-db/login/login-attempt-tracker.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/access-rules.ts b/frontends/nextjs/src/lib/security/secure-db/query/access-rules.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/access-rules.ts
rename to frontends/nextjs/src/lib/security/secure-db/query/access-rules.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/check-access.ts b/frontends/nextjs/src/lib/security/secure-db/query/check-access.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/check-access.ts
rename to frontends/nextjs/src/lib/security/secure-db/query/check-access.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/execute-query.ts b/frontends/nextjs/src/lib/security/secure-db/query/execute-query.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/execute-query.ts
rename to frontends/nextjs/src/lib/security/secure-db/query/execute-query.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/sanitize-input.ts b/frontends/nextjs/src/lib/security/secure-db/query/sanitize-input.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/sanitize-input.ts
rename to frontends/nextjs/src/lib/security/secure-db/query/sanitize-input.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/check-rate-limit.test.ts b/frontends/nextjs/src/lib/security/secure-db/rate-limiting/check-rate-limit.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/check-rate-limit.test.ts
rename to frontends/nextjs/src/lib/security/secure-db/rate-limiting/check-rate-limit.test.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/check-rate-limit.ts b/frontends/nextjs/src/lib/security/secure-db/rate-limiting/check-rate-limit.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/check-rate-limit.ts
rename to frontends/nextjs/src/lib/security/secure-db/rate-limiting/check-rate-limit.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/clear-all-rate-limits.ts b/frontends/nextjs/src/lib/security/secure-db/rate-limiting/clear-all-rate-limits.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/clear-all-rate-limits.ts
rename to frontends/nextjs/src/lib/security/secure-db/rate-limiting/clear-all-rate-limits.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/clear-rate-limit.ts b/frontends/nextjs/src/lib/security/secure-db/rate-limiting/clear-rate-limit.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/clear-rate-limit.ts
rename to frontends/nextjs/src/lib/security/secure-db/rate-limiting/clear-rate-limit.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/rate-limit-store.test.ts b/frontends/nextjs/src/lib/security/secure-db/rate-limiting/store/rate-limit-store.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/rate-limit-store.test.ts
rename to frontends/nextjs/src/lib/security/secure-db/rate-limiting/store/rate-limit-store.test.ts
diff --git a/frontends/nextjs/src/lib/security/secure-db/rate-limit-store.ts b/frontends/nextjs/src/lib/security/secure-db/rate-limiting/store/rate-limit-store.ts
similarity index 100%
rename from frontends/nextjs/src/lib/security/secure-db/rate-limit-store.ts
rename to frontends/nextjs/src/lib/security/secure-db/rate-limiting/store/rate-limit-store.ts