diff --git a/src/commands/loader.ts b/src/commands/loader.ts
index a9622cc..476f7ac 100644
--- a/src/commands/loader.ts
+++ b/src/commands/loader.ts
@@ -6,15 +6,15 @@ import { readdir } from 'fs/promises';
 export default async (client: Client) => {
 	const rest = new REST({ version: '9' }).setToken(client.token ?? '');
 
-	const command_categories = (await readdir('./src/commands'))
-		.filter(element => !element.endsWith('.ts'));
+	const command_categories = (await readdir(__dirname))
+		.filter(element => !element.endsWith('.js') && !element.endsWith('.ts'));
 
 	const commands = (
 		await Promise.all(
 			// For each categorie
 			command_categories.map(async command_category => {
 				// Retrieve all the commands
-				const command_files = await readdir(`./src/commands/${command_category}`);
+				const command_files = await readdir(`${__dirname}/${command_category}`);
 
 				// Add the command
 				return Promise.all(
diff --git a/src/events/loader.ts b/src/events/loader.ts
index 0654070..9a25194 100644
--- a/src/events/loader.ts
+++ b/src/events/loader.ts
@@ -2,12 +2,12 @@ import { Client } from 'discord.js';
 import { readdir } from 'fs/promises';
 
 export default async (client: Client) => {
-	const events_categories = (await readdir('./src/events'))
-		.filter(element => !element.endsWith('.ts'));
+	const events_categories = (await readdir(__dirname))
+		.filter(element => !element.endsWith('.js') && !element.endsWith('.ts'));
 
 	events_categories.forEach(async event_category => {
 		// Retrieve events
-		const events = await readdir(`./src/events/${event_category}`);
+		const events = await readdir(`${__dirname}/${event_category}`);
 
 		// Load them into the client
 		Promise.all(
@@ -16,9 +16,10 @@ export default async (client: Client) => {
 					`../events/${event_category}/${event_file}`
 				);
 
-				// Remove .ts
+				// Remove extension
 				const event_type_ext = event_file.split('.');
-				if (event_type_ext.pop() !== 'ts') {
+				const ext = event_type_ext.pop();
+				if (!(ext === 'js' || ext === 'ts')) {
 					throw `Unknown file in ${event_category}: ${event_file}`;
 				}
 				const event_type = event_type_ext.join('.');