diff --git a/example/main.ts b/example/main.ts
index 5746d03..afcaa2a 100644
--- a/example/main.ts
+++ b/example/main.ts
@@ -1,5 +1,4 @@
-import { MysaApiClient } from '@/api/MysaApiClient';
-import { MysaSession } from '@/api/MysaSession';
+import { MysaApiClient, MysaSession } from '@/api';
 import 'dotenv/config';
 import { readFile, rm, writeFile } from 'fs/promises';
 import { pino } from 'pino';
diff --git a/src/index.ts b/src/index.ts
index b1c13e7..4d4b4e2 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1 +1,2 @@
 export * from './api';
+export * from './types';
diff --git a/src/types/index.ts b/src/types/index.ts
new file mode 100644
index 0000000..4b7ffbc
--- /dev/null
+++ b/src/types/index.ts
@@ -0,0 +1,2 @@
+export * from './mqtt';
+export * from './rest';
diff --git a/src/types/mqtt/in/index.ts b/src/types/mqtt/in/index.ts
new file mode 100644
index 0000000..9d42f85
--- /dev/null
+++ b/src/types/mqtt/in/index.ts
@@ -0,0 +1,4 @@
+export * from './ChangeDeviceState';
+export * from './CheckDeviceSettings';
+export * from './InMessageType';
+export * from './StartPublishingDeviceStatus';
diff --git a/src/types/mqtt/index.ts b/src/types/mqtt/index.ts
new file mode 100644
index 0000000..fef57eb
--- /dev/null
+++ b/src/types/mqtt/index.ts
@@ -0,0 +1,10 @@
+export * from './in';
+export * from './InPayload';
+export * from './MsgBasePayload';
+export * from './MsgInPayload';
+export * from './MsgOutPayload';
+export * from './MsgTypeBasePayload';
+export * from './MsgTypeInPayload';
+export * from './MsgTypeOutPayload';
+export * from './out';
+export * from './OutPayload';
diff --git a/src/types/mqtt/out/index.ts b/src/types/mqtt/out/index.ts
new file mode 100644
index 0000000..47ddc51
--- /dev/null
+++ b/src/types/mqtt/out/index.ts
@@ -0,0 +1,7 @@
+export * from './DeviceLog';
+export * from './DevicePostBoot';
+export * from './DeviceSetpointChange';
+export * from './DeviceStateChange';
+export * from './DeviceV1Status';
+export * from './DeviceV2Status';
+export * from './OutMessageType';
diff --git a/src/types/rest/index.ts b/src/types/rest/index.ts
new file mode 100644
index 0000000..35b5f86
--- /dev/null
+++ b/src/types/rest/index.ts
@@ -0,0 +1 @@
+export * from './Devices';