diff --git a/docs/troubleshooting/CORS-BYPASS-EXPLANATION.md b/docs/troubleshooting/network/CORS-BYPASS-EXPLANATION.md
similarity index 100%
rename from docs/troubleshooting/CORS-BYPASS-EXPLANATION.md
rename to docs/troubleshooting/network/CORS-BYPASS-EXPLANATION.md
diff --git a/docs/troubleshooting/SCREENSHOT_ANALYZER.md b/docs/troubleshooting/network/SCREENSHOT_ANALYZER.md
similarity index 100%
rename from docs/troubleshooting/SCREENSHOT_ANALYZER.md
rename to docs/troubleshooting/network/SCREENSHOT_ANALYZER.md
diff --git a/docs/troubleshooting/PACKAGE_TESTS.md b/docs/troubleshooting/testing/PACKAGE_TESTS.md
similarity index 100%
rename from docs/troubleshooting/PACKAGE_TESTS.md
rename to docs/troubleshooting/testing/PACKAGE_TESTS.md
diff --git a/docs/troubleshooting/PHASE5_TESTING_REPORT.md b/docs/troubleshooting/testing/PHASE5_TESTING_REPORT.md
similarity index 100%
rename from docs/troubleshooting/PHASE5_TESTING_REPORT.md
rename to docs/troubleshooting/testing/PHASE5_TESTING_REPORT.md
diff --git a/docs/troubleshooting/TEST_COVERAGE_SUMMARY.md b/docs/troubleshooting/testing/TEST_COVERAGE_SUMMARY.md
similarity index 100%
rename from docs/troubleshooting/TEST_COVERAGE_SUMMARY.md
rename to docs/troubleshooting/testing/TEST_COVERAGE_SUMMARY.md
diff --git a/docs/troubleshooting/WORKFLOW_FAILURE_DIAGNOSIS.md b/docs/troubleshooting/testing/WORKFLOW_FAILURE_DIAGNOSIS.md
similarity index 100%
rename from docs/troubleshooting/WORKFLOW_FAILURE_DIAGNOSIS.md
rename to docs/troubleshooting/testing/WORKFLOW_FAILURE_DIAGNOSIS.md
diff --git a/frontends/nextjs/src/lib/db/auth/authenticate-user.ts b/frontends/nextjs/src/lib/db/auth/queries/authenticate-user.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/auth/authenticate-user.ts
rename to frontends/nextjs/src/lib/db/auth/queries/authenticate-user.ts
diff --git a/frontends/nextjs/src/lib/db/auth/get-user-by-email.ts b/frontends/nextjs/src/lib/db/auth/queries/get-user-by-email.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/auth/get-user-by-email.ts
rename to frontends/nextjs/src/lib/db/auth/queries/get-user-by-email.ts
diff --git a/frontends/nextjs/src/lib/db/auth/get-user-by-username.ts b/frontends/nextjs/src/lib/db/auth/queries/get-user-by-username.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/auth/get-user-by-username.ts
rename to frontends/nextjs/src/lib/db/auth/queries/get-user-by-username.ts
diff --git a/frontends/nextjs/src/lib/db/auth/authenticate-user.test.ts b/frontends/nextjs/src/lib/db/auth/tests/authenticate-user.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/auth/authenticate-user.test.ts
rename to frontends/nextjs/src/lib/db/auth/tests/authenticate-user.test.ts
diff --git a/frontends/nextjs/src/lib/db/auth/get-user-by-email.test.ts b/frontends/nextjs/src/lib/db/auth/tests/get-user-by-email.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/auth/get-user-by-email.test.ts
rename to frontends/nextjs/src/lib/db/auth/tests/get-user-by-email.test.ts
diff --git a/frontends/nextjs/src/lib/db/auth/get-user-by-username.test.ts b/frontends/nextjs/src/lib/db/auth/tests/get-user-by-username.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/auth/get-user-by-username.test.ts
rename to frontends/nextjs/src/lib/db/auth/tests/get-user-by-username.test.ts