diff --git a/queries/analytics/event/getEventMetrics.js b/queries/analytics/event/getEventMetrics.js
index a3f5c10a..531701e8 100644
--- a/queries/analytics/event/getEventMetrics.js
+++ b/queries/analytics/event/getEventMetrics.js
@@ -1,7 +1,7 @@
 import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
 import clickhouse from 'lib/clickhouse';
 import { getDateQuery, getFilterQuery, rawQuery } from 'lib/relational';
-import { runAnalyticsQuery } from 'lib/db/db';
+import { runAnalyticsQuery } from 'lib/db';
 
 export async function getEventMetrics(...args) {
   return runAnalyticsQuery({
diff --git a/queries/analytics/event/getEvents.js b/queries/analytics/event/getEvents.js
index db529e0e..6bfb6fb8 100644
--- a/queries/analytics/event/getEvents.js
+++ b/queries/analytics/event/getEvents.js
@@ -1,7 +1,7 @@
 import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
 import { prisma, runQuery } from 'lib/relational';
 import clickhouse from 'lib/clickhouse';
-import { runAnalyticsQuery } from 'lib/db/db';
+import { runAnalyticsQuery } from 'lib/db';
 
 export function getEvents(...args) {
   return runAnalyticsQuery({
diff --git a/queries/analytics/event/saveEvent.js b/queries/analytics/event/saveEvent.js
index 52aa8656..036c8e16 100644
--- a/queries/analytics/event/saveEvent.js
+++ b/queries/analytics/event/saveEvent.js
@@ -1,6 +1,6 @@
 import { CLICKHOUSE, KAFKA, RELATIONAL, URL_LENGTH } from 'lib/constants';
 import clickhouse from 'lib/clickhouse';
-import kafka from 'lib/db/kafka';
+import kafka from 'lib/kafka';
 import { prisma, runQuery } from 'lib/relational';
 import { runAnalyticsQuery } from 'lib/db';
 
diff --git a/queries/analytics/pageview/getPageviewMetrics.js b/queries/analytics/pageview/getPageviewMetrics.js
index 92980f3e..40af97d0 100644
--- a/queries/analytics/pageview/getPageviewMetrics.js
+++ b/queries/analytics/pageview/getPageviewMetrics.js
@@ -1,7 +1,7 @@
 import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
 import clickhouse from 'lib/clickhouse';
 import { parseFilters, rawQuery } from 'lib/relational';
-import { runAnalyticsQuery } from 'lib/db/db';
+import { runAnalyticsQuery } from 'lib/db';
 
 export async function getPageviewMetrics(...args) {
   return runAnalyticsQuery({
diff --git a/queries/analytics/pageview/getPageviewStats.js b/queries/analytics/pageview/getPageviewStats.js
index e731318d..aa1618d3 100644
--- a/queries/analytics/pageview/getPageviewStats.js
+++ b/queries/analytics/pageview/getPageviewStats.js
@@ -1,6 +1,6 @@
 import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
 import { getDateQuery, parseFilters, rawQuery } from 'lib/relational';
-import { runAnalyticsQuery } from 'lib/db/db';
+import { runAnalyticsQuery } from 'lib/db';
 import clickhouse from 'lib/clickhouse';
 
 export async function getPageviewStats(...args) {
diff --git a/queries/analytics/pageview/getPageviews.js b/queries/analytics/pageview/getPageviews.js
index ba9a218c..fbbd96f8 100644
--- a/queries/analytics/pageview/getPageviews.js
+++ b/queries/analytics/pageview/getPageviews.js
@@ -1,6 +1,6 @@
 import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
 import { prisma, runQuery } from 'lib/relational';
-import { runAnalyticsQuery } from 'lib/db/db';
+import { runAnalyticsQuery } from 'lib/db';
 import clickhouse from 'lib/clickhouse';
 
 export async function getPageviews(...args) {
diff --git a/queries/analytics/pageview/savePageView.js b/queries/analytics/pageview/savePageView.js
index 56717855..0f93723f 100644
--- a/queries/analytics/pageview/savePageView.js
+++ b/queries/analytics/pageview/savePageView.js
@@ -1,7 +1,7 @@
 import { CLICKHOUSE, KAFKA, RELATIONAL, URL_LENGTH } from 'lib/constants';
 import clickhouse from 'lib/clickhouse';
-import { runAnalyticsQuery } from 'lib/db/db';
-import kafka from 'lib/db/kafka';
+import { runAnalyticsQuery } from 'lib/db';
+import kafka from 'lib/kafka';
 import { prisma, runQuery } from 'lib/relational';
 
 export async function savePageView(...args) {
diff --git a/queries/analytics/session/createSession.js b/queries/analytics/session/createSession.js
index a880ce5b..676aeb48 100644
--- a/queries/analytics/session/createSession.js
+++ b/queries/analytics/session/createSession.js
@@ -1,8 +1,8 @@
 import { CLICKHOUSE, KAFKA, RELATIONAL } from 'lib/constants';
 import { prisma, runQuery } from 'lib/relational';
 import clickhouse from 'lib/clickhouse';
-import kafka from 'lib/db/kafka';
-import { runAnalyticsQuery } from 'lib/db/db';
+import kafka from 'lib/kafka';
+import { runAnalyticsQuery } from 'lib/db';
 
 export async function createSession(...args) {
   return runAnalyticsQuery({
diff --git a/queries/analytics/session/getSessionMetrics.js b/queries/analytics/session/getSessionMetrics.js
index 95a8dc66..e0d5a24c 100644
--- a/queries/analytics/session/getSessionMetrics.js
+++ b/queries/analytics/session/getSessionMetrics.js
@@ -1,6 +1,6 @@
 import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
 import clickhouse from 'lib/clickhouse';
-import { runAnalyticsQuery } from 'lib/db/db';
+import { runAnalyticsQuery } from 'lib/db';
 import { parseFilters, rawQuery } from 'lib/relational';
 
 export async function getSessionMetrics(...args) {
diff --git a/queries/analytics/stats/getActiveVisitors.js b/queries/analytics/stats/getActiveVisitors.js
index af6d3130..4e61d3eb 100644
--- a/queries/analytics/stats/getActiveVisitors.js
+++ b/queries/analytics/stats/getActiveVisitors.js
@@ -1,7 +1,7 @@
 import { subMinutes } from 'date-fns';
 import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
 import { rawQuery } from 'lib/relational';
-import { runAnalyticsQuery } from 'lib/db/db';
+import { runAnalyticsQuery } from 'lib/db';
 import clickhouse from 'lib/clickhouse';
 
 export async function getActiveVisitors(...args) {
diff --git a/queries/analytics/stats/getWebsiteStats.js b/queries/analytics/stats/getWebsiteStats.js
index c8767670..081a16ac 100644
--- a/queries/analytics/stats/getWebsiteStats.js
+++ b/queries/analytics/stats/getWebsiteStats.js
@@ -1,6 +1,6 @@
 import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
 import { getDateQuery, getTimestampInterval, parseFilters, rawQuery } from 'lib/relational';
-import { runAnalyticsQuery } from 'lib/db/db';
+import { runAnalyticsQuery } from 'lib/db';
 import clickhouse from 'lib/clickhouse';
 
 export async function getWebsiteStats(...args) {