diff --git a/src/auth.ts b/src/auth.ts
index de5af9b..287d7c1 100644
--- a/src/auth.ts
+++ b/src/auth.ts
@@ -1,7 +1,7 @@
 import { RefreshingAuthProvider, exchangeCode, type AccessToken } from "@twurple/auth";
-import { createAuthRecord, deleteAuthRecord, getAuthRecord, updateAuthRecord } from "./db/dbAuth";
+import { createAuthRecord, deleteAuthRecord, getAuthRecord, updateAuthRecord } from "db/dbAuth";
 
-import logger from "./lib/logger";
+import logger from "lib/logger";
 import kleur from "kleur";
 
 async function initAuth(userId: string, clientId: string, clientSecret: string, requestedIntents: string[], streamer: boolean): Promise<AccessToken> {
diff --git a/src/cheers/execute.ts b/src/cheers/execute.ts
index 28c8d2f..59f6d25 100644
--- a/src/cheers/execute.ts
+++ b/src/cheers/execute.ts
@@ -1,10 +1,10 @@
-import { Cheer, handleNoTarget } from ".";
-import { sendMessage } from "../commands";
-import { getUserRecord } from "../db/dbUser";
-import { User } from "../user";
-import { timeout } from "../lib/timeout";
-import { createTimeoutRecord } from "../db/dbTimeouts";
-import { parseCheerArgs } from "../lib/parseCommandArgs";
+import { Cheer, handleNoTarget } from "cheers";
+import { sendMessage } from "commands";
+import { getUserRecord } from "db/dbUser";
+import User from "user";
+import { timeout } from "lib/timeout";
+import { createTimeoutRecord } from "db/dbTimeouts";
+import { parseCheerArgs } from "lib/parseCommandArgs";
 
 const ITEMNAME = 'silverbullet';
 
diff --git a/src/cheers/grenade.ts b/src/cheers/grenade.ts
index f787dda..d795cf7 100644
--- a/src/cheers/grenade.ts
+++ b/src/cheers/grenade.ts
@@ -1,10 +1,10 @@
 import { redis } from "bun";
-import { sendMessage } from "../commands";
-import { timeout } from "../lib/timeout";
-import { User } from "../user";
-import { getUserRecord } from "../db/dbUser";
-import { createTimeoutRecord } from "../db/dbTimeouts";
-import { Cheer, handleNoTarget } from ".";
+import { sendMessage } from "commands";
+import { timeout } from "lib/timeout";
+import User from "user";
+import { getUserRecord } from "db/dbUser";
+import { createTimeoutRecord } from "db/dbTimeouts";
+import { Cheer, handleNoTarget } from "cheers";
 
 const ITEMNAME = 'grenade';
 
diff --git a/src/cheers/index.ts b/src/cheers/index.ts
index 9469f00..4b28a26 100644
--- a/src/cheers/index.ts
+++ b/src/cheers/index.ts
@@ -1,4 +1,4 @@
-import { User } from '../user';
+import User from 'user';
 import { EventSubChannelChatMessageEvent } from "@twurple/eventsub-base";
 
 export class Cheer {
@@ -28,10 +28,10 @@ for (const file of files) {
 export default cheers;
 export { namedcheers };
 
-import { sendMessage } from '../commands';
-import logger from '../lib/logger';
-import { getUserRecord } from '../db/dbUser';
-import { changeItemCount } from '../items';
+import { sendMessage } from 'commands';
+import logger from 'lib/logger';
+import { getUserRecord } from 'db/dbUser';
+import { changeItemCount } from 'items';
 
 export async function handleNoTarget(msg: EventSubChannelChatMessageEvent, user: User, itemname: string, silent = true) {
   if (await user.itemLock()) {
diff --git a/src/cheers/timeout.ts b/src/cheers/timeout.ts
index c2c458d..7b21243 100644
--- a/src/cheers/timeout.ts
+++ b/src/cheers/timeout.ts
@@ -1,10 +1,10 @@
-import { Cheer, handleNoTarget } from ".";
-import { sendMessage } from "../commands";
-import { getUserRecord } from "../db/dbUser";
-import { User } from "../user";
-import { timeout } from "../lib/timeout";
-import { createTimeoutRecord } from "../db/dbTimeouts";
-import { parseCheerArgs } from "../lib/parseCommandArgs";
+import { Cheer, handleNoTarget } from "cheers";
+import { sendMessage } from "commands";
+import { getUserRecord } from "db/dbUser";
+import User from "user";
+import { timeout } from "lib/timeout";
+import { createTimeoutRecord } from "db/dbTimeouts";
+import { parseCheerArgs } from "lib/parseCommandArgs";
 
 const ITEMNAME = 'blaster';
 
diff --git a/src/cheers/tnt.ts b/src/cheers/tnt.ts
index e3b488d..8de92e7 100644
--- a/src/cheers/tnt.ts
+++ b/src/cheers/tnt.ts
@@ -1,10 +1,10 @@
-import { Cheer, handleNoTarget } from ".";
-import { sendMessage } from "../commands";
-import { getUserRecord } from "../db/dbUser";
-import { User } from "../user";
-import { timeout } from "../lib/timeout";
-import { createTimeoutRecord } from "../db/dbTimeouts";
-import { getTNTTargets } from "../items/tnt";
+import { Cheer, handleNoTarget } from "cheers";
+import { sendMessage } from "commands";
+import { getUserRecord } from "db/dbUser";
+import User from "user";
+import { timeout } from "lib/timeout";
+import { createTimeoutRecord } from "db/dbTimeouts";
+import { getTNTTargets } from "items/tnt";
 import { redis } from "bun";
 
 const ITEMNAME = 'tnt';
diff --git a/src/commands/addadmin.ts b/src/commands/addadmin.ts
index de41032..34f286a 100644
--- a/src/commands/addadmin.ts
+++ b/src/commands/addadmin.ts
@@ -1,7 +1,7 @@
-import { Command, sendMessage } from ".";
-import { addAdmin } from "../lib/admins";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { User } from "../user";
+import { Command, sendMessage } from "commands";
+import { addAdmin } from "lib/admins";
+import parseCommandArgs from "lib/parseCommandArgs";
+import User from "user";
 
 export default new Command('addadmin', ['addadmin'], 'streamer', async msg => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/addinvuln.ts b/src/commands/addinvuln.ts
index 7074911..b8fedf4 100644
--- a/src/commands/addinvuln.ts
+++ b/src/commands/addinvuln.ts
@@ -1,7 +1,7 @@
-import { Command, sendMessage } from ".";
-import { addInvuln } from "../lib/invuln";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { User } from "../user";
+import { Command, sendMessage } from "commands";
+import { addInvuln } from "lib/invuln";
+import parseCommandArgs from "lib/parseCommandArgs";
+import User from "user";
 
 export default new Command('addinvuln', ['addinvuln'], 'streamer', async msg => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/admindonate.ts b/src/commands/admindonate.ts
index 25fa008..9e86f32 100644
--- a/src/commands/admindonate.ts
+++ b/src/commands/admindonate.ts
@@ -1,8 +1,8 @@
-import { Command, sendMessage } from ".";
-import { getUserRecord } from "../db/dbUser";
-import { changeBalance } from "../lib/changeBalance";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { User } from "../user";
+import { Command, sendMessage } from "commands";
+import { getUserRecord } from "db/dbUser";
+import { changeBalance } from "lib/changeBalance";
+import parseCommandArgs from "lib/parseCommandArgs";
+import User from "user";
 
 export default new Command('admindonate', ['admindonate'], 'admin', async msg => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/admingive.ts b/src/commands/admingive.ts
index 4e350dd..b97d547 100644
--- a/src/commands/admingive.ts
+++ b/src/commands/admingive.ts
@@ -1,8 +1,8 @@
-import { Command, sendMessage } from ".";
-import { getUserRecord } from "../db/dbUser";
-import items, { changeItemCount } from "../items";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { User } from "../user";
+import { Command, sendMessage } from "commands";
+import { getUserRecord } from "db/dbUser";
+import items, { changeItemCount } from "items";
+import parseCommandArgs from "lib/parseCommandArgs";
+import User from "user";
 
 export default new Command('admingive', ['admingive'], 'admin', async msg => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/backshot.ts b/src/commands/backshot.ts
index 0ef37ff..c475b69 100644
--- a/src/commands/backshot.ts
+++ b/src/commands/backshot.ts
@@ -1,5 +1,5 @@
-import { Command, sendMessage } from ".";
-import { User } from "../user";
+import { Command, sendMessage } from "commands";
+import User from "user";
 import { redis } from "bun";
 
 export default new Command('backshot', ['backshot'], 'chatter', async (msg, user) => {
diff --git a/src/commands/disablecheer.ts b/src/commands/disablecheer.ts
index 1380f18..df3a784 100644
--- a/src/commands/disablecheer.ts
+++ b/src/commands/disablecheer.ts
@@ -1,7 +1,7 @@
 import { redis } from "bun";
-import { Command, sendMessage } from ".";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { namedcheers } from "../cheers";
+import { Command, sendMessage } from "commands";
+import parseCommandArgs from "lib/parseCommandArgs";
+import { namedcheers } from "cheers";
 
 export default new Command('disablecheer', ['disablecheer'], 'admin', async msg => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/disablecommand.ts b/src/commands/disablecommand.ts
index 428fb63..d7306af 100644
--- a/src/commands/disablecommand.ts
+++ b/src/commands/disablecommand.ts
@@ -1,6 +1,6 @@
 import { redis } from "bun";
-import commands, { Command, sendMessage } from ".";
-import parseCommandArgs from "../lib/parseCommandArgs";
+import commands, { Command, sendMessage } from "commands";
+import parseCommandArgs from "lib/parseCommandArgs";
 
 export default new Command('disablecommand', ['disablecommand'], 'admin', async msg => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/donateqbucks.ts b/src/commands/donateqbucks.ts
index 13b19a0..fac7782 100644
--- a/src/commands/donateqbucks.ts
+++ b/src/commands/donateqbucks.ts
@@ -1,10 +1,10 @@
-import { Command, sendMessage } from ".";
-import type { userRecord } from "../db/connection";
-import { getUserRecord } from "../db/dbUser";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { changeBalance } from "../lib/changeBalance";
-import { User } from "../user";
-import logger from "../lib/logger";
+import { Command, sendMessage } from "commands";
+import type { userRecord } from "db/connection";
+import { getUserRecord } from "db/dbUser";
+import parseCommandArgs from "lib/parseCommandArgs";
+import { changeBalance } from "lib/changeBalance";
+import User from "user";
+import logger from "lib/logger";
 
 export default new Command('donate', ['donate'], 'chatter', async (msg, user) => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/enablecheer.ts b/src/commands/enablecheer.ts
index c222a76..593fc0f 100644
--- a/src/commands/enablecheer.ts
+++ b/src/commands/enablecheer.ts
@@ -1,7 +1,7 @@
 import { redis } from "bun";
-import { Command, sendMessage } from ".";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { namedcheers } from "../cheers";
+import { Command, sendMessage } from "commands";
+import parseCommandArgs from "lib/parseCommandArgs";
+import { namedcheers } from "cheers";
 
 export default new Command('enablecheer', ['enablecheer'], 'admin', async msg => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/enablecommand.ts b/src/commands/enablecommand.ts
index 903221d..c85e810 100644
--- a/src/commands/enablecommand.ts
+++ b/src/commands/enablecommand.ts
@@ -1,6 +1,6 @@
 import { redis } from "bun";
-import commands, { Command, sendMessage } from ".";
-import parseCommandArgs from "../lib/parseCommandArgs";
+import commands, { Command, sendMessage } from "commands";
+import parseCommandArgs from "lib/parseCommandArgs";
 
 export default new Command('enablecommand', ['enablecommand'], 'admin', async msg => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/getadmins.ts b/src/commands/getadmins.ts
index e38de6a..dcef4ec 100644
--- a/src/commands/getadmins.ts
+++ b/src/commands/getadmins.ts
@@ -1,6 +1,6 @@
-import { Command, sendMessage } from ".";
-import { getAdmins } from "../lib/admins";
-import { User } from "../user";
+import { Command, sendMessage } from "commands";
+import { getAdmins } from "lib/admins";
+import User from "user";
 
 export default new Command('getadmins', ['getadmins'], 'chatter', async msg => {
   const admins = await getAdmins()
diff --git a/src/commands/getbalance.ts b/src/commands/getbalance.ts
index af29ce3..65e88ff 100644
--- a/src/commands/getbalance.ts
+++ b/src/commands/getbalance.ts
@@ -1,7 +1,7 @@
-import { Command, sendMessage } from ".";
-import { getUserRecord } from "../db/dbUser";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { User } from "../user";
+import { Command, sendMessage } from "commands";
+import { getUserRecord } from "db/dbUser";
+import parseCommandArgs from "lib/parseCommandArgs";
+import User from "user";
 
 export default new Command('getbalance', ['getbalance', 'balance', 'qbucks', 'qweribucks', 'wallet', 'getwallet'], 'chatter', async (msg, user) => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/getcheers.ts b/src/commands/getcheers.ts
index 6cbc4b9..1dbe1f0 100644
--- a/src/commands/getcheers.ts
+++ b/src/commands/getcheers.ts
@@ -1,7 +1,7 @@
 import { redis } from "bun";
-import { Command, sendMessage } from ".";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { namedcheers } from "../cheers";
+import { Command, sendMessage } from "commands";
+import parseCommandArgs from "lib/parseCommandArgs";
+import { namedcheers } from "cheers";
 
 export default new Command('getcheers', ['getcheers', 'getcheer'], 'chatter', async msg => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/getcommands.ts b/src/commands/getcommands.ts
index ec37de5..b9fe994 100644
--- a/src/commands/getcommands.ts
+++ b/src/commands/getcommands.ts
@@ -1,6 +1,6 @@
 import { redis } from "bun";
-import { basecommands, Command, sendMessage } from ".";
-import parseCommandArgs from "../lib/parseCommandArgs";
+import { basecommands, Command, sendMessage } from "commands";
+import parseCommandArgs from "lib/parseCommandArgs";
 
 export default new Command('getcommands', ['getcommands', 'getc'], 'chatter', async msg => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/getinventory.ts b/src/commands/getinventory.ts
index 9978e1b..98f6778 100644
--- a/src/commands/getinventory.ts
+++ b/src/commands/getinventory.ts
@@ -1,8 +1,8 @@
-import { Command, sendMessage } from ".";
-import { getUserRecord } from "../db/dbUser";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { User } from "../user";
-import items from "../items";
+import { Command, sendMessage } from "commands";
+import { getUserRecord } from "db/dbUser";
+import parseCommandArgs from "lib/parseCommandArgs";
+import User from "user";
+import items from "items";
 
 export default new Command('inventory', ['inv', 'inventory'], 'chatter', async (msg, user) => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/getinvulns.ts b/src/commands/getinvulns.ts
index eb646fb..d470537 100644
--- a/src/commands/getinvulns.ts
+++ b/src/commands/getinvulns.ts
@@ -1,6 +1,6 @@
-import { Command, sendMessage } from ".";
-import { getInvulns } from "../lib/invuln";
-import { User } from "../user";
+import { Command, sendMessage } from "commands";
+import { getInvulns } from "lib/invuln";
+import User from "user";
 
 export default new Command('getinvulns', ['getinvulns'], 'chatter', async msg => {
   const invulns = await getInvulns()
diff --git a/src/commands/gettimeout.ts b/src/commands/gettimeout.ts
index cca7a9f..65d95c6 100644
--- a/src/commands/gettimeout.ts
+++ b/src/commands/gettimeout.ts
@@ -1,8 +1,8 @@
-import { Command, sendMessage } from ".";
-import { streamerApi, streamerId } from "..";
-import { buildTimeString } from "../lib/dateManager";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { User } from "../user";
+import { Command, sendMessage } from "commands";
+import { streamerApi, streamerId } from "main";
+import { buildTimeString } from "lib/dateManager";
+import parseCommandArgs from "lib/parseCommandArgs";
+import User from "user";
 
 export default new Command('gettimeout', ['gett', 'gettimeout'], 'chatter', async msg => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/giveitem.ts b/src/commands/giveitem.ts
index afc46de..63316f9 100644
--- a/src/commands/giveitem.ts
+++ b/src/commands/giveitem.ts
@@ -1,10 +1,10 @@
-import { Command, sendMessage } from ".";
-import type { userRecord } from "../db/connection";
-import { getUserRecord } from "../db/dbUser";
-import items, { changeItemCount } from "../items";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { User } from "../user";
-import logger from "../lib/logger";
+import { Command, sendMessage } from "commands";
+import type { userRecord } from "db/connection";
+import { getUserRecord } from "db/dbUser";
+import items, { changeItemCount } from "items";
+import parseCommandArgs from "lib/parseCommandArgs";
+import User from "user";
+import logger from "lib/logger";
 
 export default new Command('give', ['give'], 'chatter', async (msg, user) => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/index.ts b/src/commands/index.ts
index ec95ac3..ce26ba2 100644
--- a/src/commands/index.ts
+++ b/src/commands/index.ts
@@ -1,5 +1,5 @@
 import { EventSubChannelChatMessageEvent } from "@twurple/eventsub-base";
-import { User } from "../user";
+import User from "user";
 
 export type userType = 'chatter' | 'admin' | 'streamer';
 
@@ -34,7 +34,7 @@ for (const file of files) {
   };
 };
 
-import items from "../items";
+import items from "items";
 for (const [name, item] of Array.from(items)) {
   commands.set(name, item); // As Item is basically just Command but with more parameters, this should work fine
 };
@@ -42,7 +42,7 @@ for (const [name, item] of Array.from(items)) {
 export default commands;
 export { basecommands };
 
-import { singleUserMode, chatterApi, chatterId, streamerId } from "..";
+import { singleUserMode, chatterApi, chatterId, streamerId } from "main";
 
 /** Helper function to send a message to the stream */
 export const sendMessage = async (message: string, replyParentMessageId?: string) => {
diff --git a/src/commands/iteminfo.ts b/src/commands/iteminfo.ts
index accb3c7..af4b24c 100644
--- a/src/commands/iteminfo.ts
+++ b/src/commands/iteminfo.ts
@@ -1,6 +1,6 @@
-import { Command, sendMessage } from ".";
-import items from "../items";
-import parseCommandArgs from "../lib/parseCommandArgs";
+import { Command, sendMessage } from "commands";
+import items from "items";
+import parseCommandArgs from "lib/parseCommandArgs";
 
 export default new Command('iteminfo', ['iteminfo', 'itemhelp', 'info'], 'chatter', async msg => {
   const messagequery = parseCommandArgs(msg.messageText).join(' ');
diff --git a/src/commands/itemlock.ts b/src/commands/itemlock.ts
index 5477155..b8854f0 100644
--- a/src/commands/itemlock.ts
+++ b/src/commands/itemlock.ts
@@ -1,6 +1,6 @@
-import { Command, sendMessage } from ".";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { User } from "../user";
+import { Command, sendMessage } from "commands";
+import parseCommandArgs from "lib/parseCommandArgs";
+import User from "user";
 
 export default new Command('itemlock', ['itemlock'], 'admin', async msg => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/removeadmin.ts b/src/commands/removeadmin.ts
index a745db5..860cd32 100644
--- a/src/commands/removeadmin.ts
+++ b/src/commands/removeadmin.ts
@@ -1,8 +1,8 @@
-import { Command, sendMessage } from ".";
-import { streamerUsers } from "..";
-import { removeAdmin } from "../lib/admins";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { User } from "../user";
+import { Command, sendMessage } from "commands";
+import { streamerUsers } from "main";
+import { removeAdmin } from "lib/admins";
+import parseCommandArgs from "lib/parseCommandArgs";
+import User from "user";
 
 export default new Command('removeadmin', ['removeadmin'], 'streamer', async msg => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/removeinvuln.ts b/src/commands/removeinvuln.ts
index f96eef6..9a38084 100644
--- a/src/commands/removeinvuln.ts
+++ b/src/commands/removeinvuln.ts
@@ -1,8 +1,8 @@
-import { Command, sendMessage } from ".";
-import { streamerUsers } from "..";
-import { removeInvuln } from "../lib/invuln";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { User } from "../user";
+import { Command, sendMessage } from "commands";
+import { streamerUsers } from "main";
+import { removeInvuln } from "lib/invuln";
+import parseCommandArgs from "lib/parseCommandArgs";
+import User from "user";
 
 export default new Command('removeinvuln', ['removeinvuln'], 'streamer', async msg => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/roulette.ts b/src/commands/roulette.ts
index 0298e8e..a4632e0 100644
--- a/src/commands/roulette.ts
+++ b/src/commands/roulette.ts
@@ -1,6 +1,6 @@
-import { Command, sendMessage } from ".";
+import { Command, sendMessage } from "commands";
 import { redis } from "bun";
-import { timeout } from "../lib/timeout";
+import { timeout } from "lib/timeout";
 
 const barrelCount = 6;
 
diff --git a/src/commands/seiso.ts b/src/commands/seiso.ts
index 842332f..56c0ea4 100644
--- a/src/commands/seiso.ts
+++ b/src/commands/seiso.ts
@@ -1,5 +1,5 @@
-import { Command, sendMessage } from ".";
-import { timeout } from "../lib/timeout";
+import { Command, sendMessage } from "commands";
+import { timeout } from "lib/timeout";
 
 export default new Command('seiso', ['seiso'], 'chatter', async (msg, user) => {
   const rand = Math.floor(Math.random() * 101);
diff --git a/src/commands/testcheer.ts b/src/commands/testcheer.ts
index 3ecf97f..4ffb104 100644
--- a/src/commands/testcheer.ts
+++ b/src/commands/testcheer.ts
@@ -1,6 +1,6 @@
-import { Command, sendMessage } from ".";
-import { handleCheer } from "../events/message";
-import parseCommandArgs from "../lib/parseCommandArgs";
+import { Command, sendMessage } from "commands";
+import { handleCheer } from "events/message";
+import parseCommandArgs from "lib/parseCommandArgs";
 
 export default new Command('testcheer', ['testcheer'], 'streamer', async (msg, user) => {
   const args = parseCommandArgs(msg.messageText);
diff --git a/src/commands/timeout.ts b/src/commands/timeout.ts
index 0bb7838..5130386 100644
--- a/src/commands/timeout.ts
+++ b/src/commands/timeout.ts
@@ -1,10 +1,10 @@
-import { Command, sendMessage } from ".";
-import { getUserRecord } from "../db/dbUser";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { User } from "../user";
-import { timeout } from "../lib/timeout";
-import { changeBalance } from "../lib/changeBalance";
-import { createTimeoutRecord } from "../db/dbTimeouts";
+import { Command, sendMessage } from "commands";
+import { getUserRecord } from "db/dbUser";
+import parseCommandArgs from "lib/parseCommandArgs";
+import User from "user";
+import { timeout } from "lib/timeout";
+import { changeBalance } from "lib/changeBalance";
+import { createTimeoutRecord } from "db/dbTimeouts";
 
 export default new Command('timeout', ['timeout'], 'chatter', async (msg, user) => {
   const userObj = await getUserRecord(user);
diff --git a/src/commands/useitem.ts b/src/commands/useitem.ts
index ed3761e..655bd4c 100644
--- a/src/commands/useitem.ts
+++ b/src/commands/useitem.ts
@@ -1,6 +1,6 @@
 import { redis } from "bun";
-import { Command, sendMessage } from ".";
-import items from "../items";
+import { Command, sendMessage } from "commands";
+import items from "items";
 
 export default new Command('use', ['use'], 'chatter', async (msg, user) => {
   const messagequery = msg.messageText.trim().split(' ').slice(1);
diff --git a/src/commands/vulnchatters.ts b/src/commands/vulnchatters.ts
index 5d509bd..aedc520 100644
--- a/src/commands/vulnchatters.ts
+++ b/src/commands/vulnchatters.ts
@@ -1,5 +1,5 @@
 import { redis } from "bun";
-import { Command, sendMessage } from ".";
+import { Command, sendMessage } from "commands";
 
 export default new Command('vulnchatters', ['vulnchatters', 'vulnc'], 'chatter', async msg => {
   const data = await redis.keys('user:*:vulnerable');
diff --git a/src/commands/yabai.ts b/src/commands/yabai.ts
index 19a1cce..a1d8759 100644
--- a/src/commands/yabai.ts
+++ b/src/commands/yabai.ts
@@ -1,5 +1,5 @@
-import { Command, sendMessage } from ".";
-import { timeout } from "../lib/timeout";
+import { Command, sendMessage } from "commands";
+import { timeout } from "lib/timeout";
 
 // Remake of the !yabai command in ttv/kiara_tv
 export default new Command('yabai', ['yabai', 'goon'], 'chatter', async (msg, user) => {
diff --git a/src/db/connection.ts b/src/db/connection.ts
index 2604ee0..edafe99 100644
--- a/src/db/connection.ts
+++ b/src/db/connection.ts
@@ -1,7 +1,7 @@
 import type { AccessToken } from "@twurple/auth";
 import PocketBase, { RecordService } from "pocketbase";
-import type { inventory } from "../items";
-import logger from "../lib/logger";
+import type { inventory } from "items";
+import logger from "lib/logger";
 
 const pocketbaseurl = process.env.POCKETBASE_URL ?? "localhost:8090";
 if (pocketbaseurl === "") { logger.enverr("POCKETBASE_URL"); process.exit(1); };
diff --git a/src/db/dbAuth.ts b/src/db/dbAuth.ts
index 1242f68..140fa0b 100644
--- a/src/db/dbAuth.ts
+++ b/src/db/dbAuth.ts
@@ -1,5 +1,5 @@
 import type { AccessToken } from "@twurple/auth";
-import pocketbase, { type authRecord } from "./connection";
+import pocketbase, { type authRecord } from "db/connection";
 const pb = pocketbase.collection('auth');
 
 export async function createAuthRecord(token: AccessToken, userId: string) {
diff --git a/src/db/dbTimeouts.ts b/src/db/dbTimeouts.ts
index f99a8cd..c1a1708 100644
--- a/src/db/dbTimeouts.ts
+++ b/src/db/dbTimeouts.ts
@@ -1,6 +1,6 @@
-import pocketbase from "./connection";
-import { User } from "../user";
-import logger from "../lib/logger";
+import pocketbase from "db/connection";
+import User from "user";
+import logger from "lib/logger";
 const pb = pocketbase.collection('timeouts');
 
 export async function createTimeoutRecord(user: User, target: User, item: string): Promise<void> {
diff --git a/src/db/dbUsedItems.ts b/src/db/dbUsedItems.ts
index c125093..3678b24 100644
--- a/src/db/dbUsedItems.ts
+++ b/src/db/dbUsedItems.ts
@@ -1,6 +1,6 @@
-import pocketbase from "./connection";
-import { User } from "../user";
-import logger from "../lib/logger";
+import pocketbase from "db/connection";
+import User from "user";
+import logger from "lib/logger";
 const pb = pocketbase.collection('usedItems');
 
 export async function createUsedItemRecord(user: User, item: string): Promise<void> {
diff --git a/src/db/dbUser.ts b/src/db/dbUser.ts
index 0da23c8..5db01c8 100644
--- a/src/db/dbUser.ts
+++ b/src/db/dbUser.ts
@@ -1,7 +1,7 @@
-import pocketbase, { type userRecord } from "./connection";
-import { emptyInventory, itemarray } from "../items";
-import type { User } from "../user";
-import logger from "../lib/logger";
+import pocketbase, { type userRecord } from "db/connection";
+import { emptyInventory, itemarray } from "items";
+import type User from "user";
+import logger from "lib/logger";
 
 const pb = pocketbase.collection('users');
 
diff --git a/src/events/banned.ts b/src/events/banned.ts
index 5e62a1e..d336742 100644
--- a/src/events/banned.ts
+++ b/src/events/banned.ts
@@ -1,5 +1,5 @@
-import { eventSub, streamerId } from "..";
-import { deleteBannedUserMessagesFromChatWidget } from "../web/chatWidget/message";
+import { eventSub, streamerId } from "main";
+import { deleteBannedUserMessagesFromChatWidget } from "web/chatWidget/message";
 
 eventSub.onChannelBan(streamerId, async msg => {
   deleteBannedUserMessagesFromChatWidget(msg);
diff --git a/src/events/deleteMessage.ts b/src/events/deleteMessage.ts
index 0396787..6544b92 100644
--- a/src/events/deleteMessage.ts
+++ b/src/events/deleteMessage.ts
@@ -1,5 +1,5 @@
-import { eventSub, streamerId } from "..";
-import { deleteMessageFromChatWidget } from "../web/chatWidget/message";
+import { eventSub, streamerId } from "main";
+import { deleteMessageFromChatWidget } from "web/chatWidget/message";
 
 eventSub.onChannelChatMessageDelete(streamerId, streamerId, async msg => {
   deleteMessageFromChatWidget(msg);
diff --git a/src/events/index.ts b/src/events/index.ts
index dd58196..77234d1 100644
--- a/src/events/index.ts
+++ b/src/events/index.ts
@@ -1,6 +1,6 @@
 import kleur from "kleur";
-import { eventSub, streamerApi, streamerId } from "..";
-import logger from "../lib/logger";
+import { eventSub, streamerApi, streamerId } from "main";
+import logger from "lib/logger";
 
 eventSub.onRevoke(event => {
   logger.ok(`Successfully revoked EventSub subscription: ${kleur.underline(event.id)}`);
@@ -33,7 +33,7 @@ for (const file of files) {
 
 eventSub.start();
 
-import { getAuthRecord } from "../db/dbAuth";
+import { getAuthRecord } from "db/dbAuth";
 import { StaticAuthProvider } from "@twurple/auth";
 import { ApiClient, HelixEventSubSubscription } from "@twurple/api";
 
diff --git a/src/events/message.ts b/src/events/message.ts
index 819b53a..607ccdb 100644
--- a/src/events/message.ts
+++ b/src/events/message.ts
@@ -1,13 +1,13 @@
 import { EventSubChannelChatMessageEvent } from "@twurple/eventsub-base"
-import { streamerId, eventSub, commandPrefix, streamerUsers } from "..";
-import { User } from "../user";
-import commands, { sendMessage } from "../commands";
+import { streamerId, eventSub, commandPrefix, streamerUsers } from "main";
+import User from "user";
+import commands, { sendMessage } from "commands";
 import { redis } from "bun";
-import { isAdmin } from "../lib/admins";
-import cheers from "../cheers";
-import logger from "../lib/logger";
-import { addMessageToChatWidget } from "../web/chatWidget/message";
-import { isInvuln, setTemporaryInvuln } from "../lib/invuln";
+import { isAdmin } from "lib/admins";
+import cheers from "cheers";
+import logger from "lib/logger";
+import { addMessageToChatWidget } from "web/chatWidget/message";
+import { isInvuln, setTemporaryInvuln } from "lib/invuln";
 
 logger.info(`Loaded the following commands: ${commands.keys().toArray().join(', ')}`);
 
diff --git a/src/index.ts b/src/index.ts
index 2dfbda7..51326ae 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,9 +1,9 @@
 import { createAuthProvider } from "./auth";
 import { ApiClient } from "@twurple/api";
 import { EventSubWsListener } from "@twurple/eventsub-ws";
-import { addAdmin } from "./lib/admins";
-import logger from "./lib/logger";
-import { addInvuln } from "./lib/invuln";
+import { addAdmin } from "lib/admins";
+import logger from "lib/logger";
+import { addInvuln } from "lib/invuln";
 
 const CHATTERINTENTS = ["user:read:chat", "user:write:chat", "user:bot"];
 const STREAMERINTENTS = ["user:read:chat", "moderation:read", "channel:manage:moderators", "moderator:manage:banned_users", "bits:read", "channel:moderate"];
diff --git a/src/items/blaster.ts b/src/items/blaster.ts
index 2571b38..791d689 100644
--- a/src/items/blaster.ts
+++ b/src/items/blaster.ts
@@ -1,11 +1,11 @@
-import { changeItemCount, Item } from ".";
-import { sendMessage } from "../commands";
-import { createTimeoutRecord } from "../db/dbTimeouts";
-import { createUsedItemRecord } from "../db/dbUsedItems";
-import { getUserRecord } from "../db/dbUser";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { timeout } from "../lib/timeout";
-import { User } from "../user";
+import { changeItemCount, Item } from "items";
+import { sendMessage } from "commands";
+import { createTimeoutRecord } from "db/dbTimeouts";
+import { createUsedItemRecord } from "db/dbUsedItems";
+import { getUserRecord } from "db/dbUser";
+import parseCommandArgs from "lib/parseCommandArgs";
+import { timeout } from "lib/timeout";
+import User from "user";
 
 const ITEMNAME = 'blaster';
 
diff --git a/src/items/grenade.ts b/src/items/grenade.ts
index ef9ba2e..3ab03c7 100644
--- a/src/items/grenade.ts
+++ b/src/items/grenade.ts
@@ -1,11 +1,11 @@
 import { redis } from "bun";
-import { sendMessage } from "../commands";
-import { timeout } from "../lib/timeout";
-import { changeItemCount, Item } from ".";
-import { User } from "../user";
-import { getUserRecord } from "../db/dbUser";
-import { createTimeoutRecord } from "../db/dbTimeouts";
-import { createUsedItemRecord } from "../db/dbUsedItems";
+import { sendMessage } from "commands";
+import { timeout } from "lib/timeout";
+import { changeItemCount, Item } from "items";
+import User from "user";
+import { getUserRecord } from "db/dbUser";
+import { createTimeoutRecord } from "db/dbTimeouts";
+import { createUsedItemRecord } from "db/dbUsedItems";
 
 const ITEMNAME = 'grenade';
 
diff --git a/src/items/index.ts b/src/items/index.ts
index edc5861..322fac2 100644
--- a/src/items/index.ts
+++ b/src/items/index.ts
@@ -1,6 +1,6 @@
 import { EventSubChannelChatMessageEvent } from "@twurple/eventsub-base";
-import { User } from "../user";
-import { type userType } from "../commands";
+import User from "user";
+import { type userType } from "commands";
 
 export class Item {
   public readonly name: string;
@@ -31,8 +31,8 @@ export class Item {
 };
 
 import { readdir } from 'node:fs/promises';
-import type { userRecord } from "../db/connection";
-import { updateUserRecord } from "../db/dbUser";
+import type { userRecord } from "db/connection";
+import { updateUserRecord } from "db/dbUser";
 const items = new Map<string, Item>;
 const emptyInventory: inventory = {};
 const itemarray: string[] = [];
diff --git a/src/items/silverbullet.ts b/src/items/silverbullet.ts
index f8744f1..9b3c61a 100644
--- a/src/items/silverbullet.ts
+++ b/src/items/silverbullet.ts
@@ -1,11 +1,11 @@
-import { changeItemCount, Item } from ".";
-import { sendMessage } from "../commands";
-import { createTimeoutRecord } from "../db/dbTimeouts";
-import { createUsedItemRecord } from "../db/dbUsedItems";
-import { getUserRecord } from "../db/dbUser";
-import parseCommandArgs from "../lib/parseCommandArgs";
-import { timeout } from "../lib/timeout";
-import { User } from "../user";
+import { changeItemCount, Item } from "items";
+import { sendMessage } from "commands";
+import { createTimeoutRecord } from "db/dbTimeouts";
+import { createUsedItemRecord } from "db/dbUsedItems";
+import { getUserRecord } from "db/dbUser";
+import parseCommandArgs from "lib/parseCommandArgs";
+import { timeout } from "lib/timeout";
+import User from "user";
 
 const ITEMNAME = 'silverbullet';
 
diff --git a/src/items/tnt.ts b/src/items/tnt.ts
index 17d90d5..4290fc5 100644
--- a/src/items/tnt.ts
+++ b/src/items/tnt.ts
@@ -1,11 +1,11 @@
 import { redis } from "bun";
-import { sendMessage } from "../commands";
-import { timeout } from "../lib/timeout";
-import { changeItemCount, Item } from ".";
-import { User } from "../user";
-import { getUserRecord } from "../db/dbUser";
-import { createTimeoutRecord } from "../db/dbTimeouts";
-import { createUsedItemRecord } from "../db/dbUsedItems";
+import { sendMessage } from "commands";
+import { timeout } from "lib/timeout";
+import { changeItemCount, Item } from "items";
+import User from "user";
+import { getUserRecord } from "db/dbUser";
+import { createTimeoutRecord } from "db/dbTimeouts";
+import { createUsedItemRecord } from "db/dbUsedItems";
 
 const ITEMNAME = 'tnt';
 
diff --git a/src/lib/changeBalance.ts b/src/lib/changeBalance.ts
index e6ba2d0..df94e54 100644
--- a/src/lib/changeBalance.ts
+++ b/src/lib/changeBalance.ts
@@ -1,6 +1,6 @@
-import { updateUserRecord } from "../db/dbUser";
-import { type userRecord } from "../db/connection";
-import { User } from "../user";
+import { updateUserRecord } from "db/dbUser";
+import { type userRecord } from "db/connection";
+import User from "user";
 
 export async function changeBalance(user: User, userRecord: userRecord, amount: number): Promise<false | userRecord> {
   userRecord.balance = userRecord.balance += amount;
diff --git a/src/lib/parseCommandArgs.ts b/src/lib/parseCommandArgs.ts
index 6ed9af3..4e18320 100644
--- a/src/lib/parseCommandArgs.ts
+++ b/src/lib/parseCommandArgs.ts
@@ -1,4 +1,4 @@
-import { commandPrefix } from "..";
+import { commandPrefix } from "main";
 
 /** Helper function to extract arguments from commands */
 export default function parseCommandArgs(input: string) {
diff --git a/src/lib/timeout.ts b/src/lib/timeout.ts
index d217990..6fac34d 100644
--- a/src/lib/timeout.ts
+++ b/src/lib/timeout.ts
@@ -1,7 +1,7 @@
-import { streamerApi, streamerId } from "..";
-import logger from "./logger";
-import { User } from "../user";
-import { isInvuln } from "./invuln";
+import { streamerApi, streamerId } from "main";
+import logger from "lib/logger";
+import User from "user";
+import { isInvuln } from "lib/invuln";
 
 type SuccessfulTimeout = { status: true; };
 type UnSuccessfulTimeout = { status: false; reason: 'banned' | 'unknown' | 'illegal'; };
diff --git a/src/user.ts b/src/user.ts
index 4b34f24..82a2e24 100644
--- a/src/user.ts
+++ b/src/user.ts
@@ -1,7 +1,7 @@
 import { redis } from "bun";
-import { chatterApi } from ".";
+import { chatterApi } from "main";
 import { HelixUser } from "@twurple/api"
-import logger from "./lib/logger";
+import logger from "lib/logger";
 
 const EXPIRETIME = 60 * 60 // 60 minutes
 
@@ -15,7 +15,7 @@ const EXPIRETIME = 60 * 60 // 60 minutes
 // userlookup expiration gets set when user chats or is targeted by another user
 // vulnchatters only gets set when user chats
 
-export class User {
+export default class User {
   public username!: string;
   public id!: string;
   public displayName!: string;
diff --git a/src/web/chatWidget/message.ts b/src/web/chatWidget/message.ts
index 33e0ee7..d6bd1ef 100644
--- a/src/web/chatWidget/message.ts
+++ b/src/web/chatWidget/message.ts
@@ -1,5 +1,5 @@
 import { EventSubChannelChatMessageEvent, EventSubChannelChatMessageDeleteEvent, EventSubChannelBanEvent } from "@twurple/eventsub-base";
-import { sendTwitchChatEvent } from "./widgetServerFunctions";
+import { sendTwitchChatEvent } from "web/chatWidget/widgetServerFunctions";
 
 export async function addMessageToChatWidget(msg: EventSubChannelChatMessageEvent) {
   await sendTwitchChatEvent({
diff --git a/src/web/chatWidget/widgetServerFunctions.ts b/src/web/chatWidget/widgetServerFunctions.ts
index a8b5766..8990286 100644
--- a/src/web/chatWidget/widgetServerFunctions.ts
+++ b/src/web/chatWidget/widgetServerFunctions.ts
@@ -1,4 +1,4 @@
-import { streamerId, chatterApi } from "../..";
+import { streamerId, chatterApi } from "main";
 import { redis } from "bun";
 
 type badgeObject = {
@@ -80,8 +80,8 @@ function parseRawBadges(returnobj: badgeObject, data: HelixChatBadgeSet[]) {
   };
 };
 
-import server from "..";
-import type { twitchEventData } from "./websockettypes";
+import server from "web";
+import type { twitchEventData } from "web/chatWidget/websockettypes";
 
 export async function sendTwitchChatEvent(event: twitchEventData) {
   server.publish('twitchchat', JSON.stringify(event));
diff --git a/src/web/chatWidget/www/src/createMessage.ts b/src/web/chatWidget/www/src/createMessage.ts
index ffe2f08..cc31485 100644
--- a/src/web/chatWidget/www/src/createMessage.ts
+++ b/src/web/chatWidget/www/src/createMessage.ts
@@ -43,7 +43,7 @@ async function prefetchImages(urls: string[], maxRetries = 3, retryDelay = 500)
   await Promise.all(urls.map(url => loadImage(url)));
 };
 
-import { type createMessageEvent } from '../../websockettypes';
+import { type createMessageEvent } from 'web/chatWidget/websockettypes';
 
 export function parseMessage(data: createMessageEvent): HTMLDivElement {
   const parentDiv = document.createElement('div');
diff --git a/src/web/chatWidget/www/src/main.ts b/src/web/chatWidget/www/src/main.ts
index 57dfdac..1a44fc7 100644
--- a/src/web/chatWidget/www/src/main.ts
+++ b/src/web/chatWidget/www/src/main.ts
@@ -1,7 +1,7 @@
 import './style.css';
 import '@fontsource/jersey-15';
 
-import { type twitchEventData } from "../../websockettypes";
+import { type twitchEventData } from "web/chatWidget/websockettypes";
 import { parseMessage } from './createMessage';
 
 const socket = new WebSocket(`ws://${location.host}`);
diff --git a/src/web/index.ts b/src/web/index.ts
index 7291e0c..296e33f 100644
--- a/src/web/index.ts
+++ b/src/web/index.ts
@@ -1,7 +1,7 @@
-import logger from "../lib/logger";
-import { getBadges, getExternalEmotes } from "./chatWidget/widgetServerFunctions";
-import chatWidget from "./chatWidget/www/index.html";
-import { sendTwitchChatEvent } from "./chatWidget/widgetServerFunctions";
+import logger from "lib/logger";
+import { getBadges, getExternalEmotes } from "web/chatWidget/widgetServerFunctions";
+import chatWidget from "web/chatWidget/www/index.html";
+import { sendTwitchChatEvent } from "web/chatWidget/widgetServerFunctions";
 
 const port = Number(process.env.WEB_PORT);
 if (isNaN(port)) { logger.enverr("WEB_PORT"); process.exit(1); };
diff --git a/tsconfig.chatwidget.json b/tsconfig.chatwidget.json
index 4b7805e..8af98de 100644
--- a/tsconfig.chatwidget.json
+++ b/tsconfig.chatwidget.json
@@ -1,6 +1,8 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
     "lib": ["DOM", "ES2020"],
     "types": []
   },
diff --git a/tsconfig.json b/tsconfig.json
index 6261323..9dc875d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,18 @@
 {
   "files": [],
+  "compilerOptions": {
+    "baseUrl": "./src",
+    "paths": {
+      "lib/*": ["./lib/*"],
+      "main": ["./index.ts"],
+      "user": ["./user.ts"],
+      "commands": ["./commands/index.ts"],
+      "items": ["./items/index.ts"],
+      "cheers": ["./cheers/index.ts"],
+      "events": ["./events/index.ts"],
+      "web/*": ["./web/*"]
+    }
+  },
   "references": [
     { "path": "./tsconfig.bot.json" },
     { "path": "./tsconfig.chatwidget.json" }