diff --git a/client/src/index.ts b/client/src/index.ts
index f42acc0..e5667c9 100644
--- a/client/src/index.ts
+++ b/client/src/index.ts
@@ -1,8 +1,8 @@
 import rpc from 'rage-rpc'
-import {
-    RageFW_ClientCallback,
+
+import type {
+    RageFW_ClientEventCallback,
     RageFW_ClientEvent,
-    RageFW_ClientEventReturn,
     RageFW_ClientServerEvent,
     RageFW_ClientServerEventArguments,
     RageFW_ClientServerEventReturn,
@@ -11,7 +11,7 @@ import {
 class Client {
     public register<EventName extends RageFW_ClientEvent>(
         eventName: EventName,
-        callback: RageFW_ClientCallback<EventName>,
+        callback: RageFW_ClientEventCallback<EventName>,
     ): void {
         rpc.register(eventName, data => {
             return callback(data)
diff --git a/client/src/types.ts b/client/src/types.ts
deleted file mode 100644
index 76bd3a4..0000000
--- a/client/src/types.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/// <reference types="@ragempcommunity/types-client" />
-
-import type {
-    RageFW_ICustomClientEvent,
-    RageFW_ICustomServerEvent,
-} from 'rage-fw-shared-types'
-
-// CLIENT
-
-export type RageFW_ClientEvent = keyof RageFW_ICustomClientEvent
-
-export type RageFW_ClientCallback<K extends RageFW_ClientEvent> = (
-    args: Parameters<RageFW_ICustomClientEvent[K]>,
-) => RageFW_ClientEventReturn<K>
-
-export type RageFW_ClientEventReturn<K extends RageFW_ClientEvent> =
-    K extends keyof RageFW_ICustomClientEvent
-        ? ReturnType<RageFW_ICustomClientEvent[K]>
-        : never
-
-// SERVER
-
-export type RageFW_ClientServerEvent = keyof RageFW_ICustomServerEvent
-
-export type RageFW_ClientServerEventArguments<
-    K extends RageFW_ClientServerEvent,
-> = K extends keyof RageFW_ICustomServerEvent
-    ? Parameters<RageFW_ICustomServerEvent[K]>
-    : never
-
-export type RageFW_ClientServerEventReturn<K extends RageFW_ClientServerEvent> =
-    K extends keyof RageFW_ICustomServerEvent
-        ? ReturnType<RageFW_ICustomServerEvent[K]>
-        : never
diff --git a/client/src/types/client.ts b/client/src/types/client.ts
new file mode 100644
index 0000000..e334159
--- /dev/null
+++ b/client/src/types/client.ts
@@ -0,0 +1,14 @@
+/// <reference types="@ragempcommunity/types-client" />
+
+import type { RageFW_ICustomClientEvent } from 'rage-fw-shared-types'
+
+export type RageFW_ClientEvent = keyof RageFW_ICustomClientEvent
+
+export type RageFW_ClientEventCallback<K extends RageFW_ClientEvent> = (
+    args: Parameters<RageFW_ICustomClientEvent[K]>,
+) => RageFW_ClientEventReturn<K>
+
+export type RageFW_ClientEventReturn<K extends RageFW_ClientEvent> =
+    K extends keyof RageFW_ICustomClientEvent
+        ? ReturnType<RageFW_ICustomClientEvent[K]>
+        : never
diff --git a/client/src/types/index.ts b/client/src/types/index.ts
new file mode 100644
index 0000000..c60bed8
--- /dev/null
+++ b/client/src/types/index.ts
@@ -0,0 +1,2 @@
+export * from './client'
+export * from './server'
\ No newline at end of file
diff --git a/client/src/types/server.ts b/client/src/types/server.ts
new file mode 100644
index 0000000..f44a489
--- /dev/null
+++ b/client/src/types/server.ts
@@ -0,0 +1,16 @@
+/// <reference types="@ragempcommunity/types-client" />
+
+import type { RageFW_ICustomServerEvent } from 'rage-fw-shared-types'
+
+export type RageFW_ClientServerEvent = keyof RageFW_ICustomServerEvent
+
+export type RageFW_ClientServerEventArguments<
+    K extends RageFW_ClientServerEvent,
+> = K extends keyof RageFW_ICustomServerEvent
+    ? Parameters<RageFW_ICustomServerEvent[K]>
+    : never
+
+export type RageFW_ClientServerEventReturn<K extends RageFW_ClientServerEvent> =
+    K extends keyof RageFW_ICustomServerEvent
+        ? ReturnType<RageFW_ICustomServerEvent[K]>
+        : never
diff --git a/server/src/index.ts b/server/src/index.ts
index c2a5754..655449e 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -1,15 +1,16 @@
 import rpc from 'rage-rpc'
-import {
+
+import type {
     RageFW_ClientEvent,
     RageFW_ClientEventArguments,
     RageFW_ClientEventReturn,
+    RageFW_ICustomServerEvent,
     RageFW_ServerEvent,
     RageFW_ServerEventCallback,
     RageFW_ServerEventCallbackCustom,
     RageFW_ServerEventCallbackNative,
-} from './types.js'
+} from './types'
 import { nativeEvents } from './native.events'
-import type { RageFW_ICustomServerEvent } from 'rage-fw-shared-types'
 
 class Server {
     private isNativeEvent(eventName: string): eventName is keyof IServerEvents {
diff --git a/server/src/types/client.ts b/server/src/types/client.ts
new file mode 100644
index 0000000..341997e
--- /dev/null
+++ b/server/src/types/client.ts
@@ -0,0 +1,15 @@
+/// <reference types="@ragempcommunity/types-server" />
+
+import type { RageFW_ICustomClientEvent } from 'rage-fw-shared-types'
+
+export type RageFW_ClientEvent = keyof RageFW_ICustomClientEvent
+
+export type RageFW_ClientEventArguments<K extends RageFW_ClientEvent> =
+    K extends RageFW_ClientEvent
+        ? Parameters<RageFW_ICustomClientEvent[K]>
+        : never
+
+export type RageFW_ClientEventReturn<K extends RageFW_ClientEvent> =
+    K extends RageFW_ClientEvent
+        ? ReturnType<RageFW_ICustomClientEvent[K]>
+        : never
diff --git a/server/src/types/index.ts b/server/src/types/index.ts
new file mode 100644
index 0000000..7636a1f
--- /dev/null
+++ b/server/src/types/index.ts
@@ -0,0 +1,2 @@
+export * from './client'
+export * from './server'
diff --git a/server/src/types.ts b/server/src/types/server.ts
similarity index 59%
rename from server/src/types.ts
rename to server/src/types/server.ts
index c4e9a22..9b12f02 100644
--- a/server/src/types.ts
+++ b/server/src/types/server.ts
@@ -1,11 +1,7 @@
 /// <reference types="@ragempcommunity/types-server" />
 
-import type {
-    RageFW_ICustomServerEvent,
-    RageFW_ICustomClientEvent,
-} from 'rage-fw-shared-types'
-
-// SERVER
+import type { RageFW_ICustomServerEvent } from 'rage-fw-shared-types'
+export type { RageFW_ICustomServerEvent } from 'rage-fw-shared-types'
 
 export type RageFW_ServerEvent =
     | keyof RageFW_ICustomServerEvent
@@ -28,17 +24,3 @@ export type RageFW_ServerEventCallback<K extends RageFW_ServerEvent> =
         : K extends keyof IServerEvents
           ? RageFW_ServerEventCallbackNative<K>
           : never
-
-// CLIENT
-
-export type RageFW_ClientEvent = keyof RageFW_ICustomClientEvent
-
-export type RageFW_ClientEventArguments<K extends RageFW_ClientEvent> =
-    K extends RageFW_ClientEvent
-        ? Parameters<RageFW_ICustomClientEvent[K]>
-        : never
-
-export type RageFW_ClientEventReturn<K extends RageFW_ClientEvent> =
-    K extends RageFW_ClientEvent
-        ? ReturnType<RageFW_ICustomClientEvent[K]>
-        : never