diff --git a/Example/example.ts b/Example/example.ts
index 90a3117..daaa23b 100644
--- a/Example/example.ts
+++ b/Example/example.ts
@@ -8,7 +8,7 @@ import {
     Mimetype,
     WALocationMessage,
     MessageLogLevel,
-} from '../WAClient/WAClient'
+} from '../src/WAClient/WAClient'
 import * as fs from 'fs'
 
 async function example() {
diff --git a/Binary/WAMessage.d.ts b/WAMessage/WAMessage.d.ts
similarity index 100%
rename from Binary/WAMessage.d.ts
rename to WAMessage/WAMessage.d.ts
diff --git a/Binary/WAMessage.js b/WAMessage/WAMessage.js
similarity index 100%
rename from Binary/WAMessage.js
rename to WAMessage/WAMessage.js
diff --git a/Binary/Constants.ts b/src/Binary/Constants.ts
similarity index 98%
rename from Binary/Constants.ts
rename to src/Binary/Constants.ts
index 9c5b9a8..f4de64f 100644
--- a/Binary/Constants.ts
+++ b/src/Binary/Constants.ts
@@ -1,4 +1,4 @@
-import { proto as Coding } from './WAMessage'
+import { proto as Coding } from '../../WAMessage/WAMessage'
 
 export namespace WA {
     export const Tags = {
diff --git a/Binary/Decoder.ts b/src/Binary/Decoder.ts
similarity index 100%
rename from Binary/Decoder.ts
rename to src/Binary/Decoder.ts
diff --git a/Binary/Encoder.ts b/src/Binary/Encoder.ts
similarity index 98%
rename from Binary/Encoder.ts
rename to src/Binary/Encoder.ts
index fdaf25f..756265c 100644
--- a/Binary/Encoder.ts
+++ b/src/Binary/Encoder.ts
@@ -1,5 +1,5 @@
 import { WA } from './Constants'
-import { proto } from './WAMessage'
+import { proto } from '../../WAMessage/WAMessage'
 
 export default class Encoder {
     data: Array<number> = []
diff --git a/Binary/Tests.ts b/src/Binary/Tests.ts
similarity index 100%
rename from Binary/Tests.ts
rename to src/Binary/Tests.ts
diff --git a/Binary/def.proto b/src/Binary/def.proto
similarity index 100%
rename from Binary/def.proto
rename to src/Binary/def.proto
diff --git a/WAClient/Base.ts b/src/WAClient/Base.ts
similarity index 100%
rename from WAClient/Base.ts
rename to src/WAClient/Base.ts
diff --git a/WAClient/Constants.ts b/src/WAClient/Constants.ts
similarity index 98%
rename from WAClient/Constants.ts
rename to src/WAClient/Constants.ts
index 463b803..bf65d4b 100644
--- a/WAClient/Constants.ts
+++ b/src/WAClient/Constants.ts
@@ -1,5 +1,5 @@
 import { WAMessage } from '../WAConnection/Constants'
-import { proto } from '../Binary/WAMessage'
+import { proto } from '../../WAMessage/WAMessage'
 /**
  * set of statuses visible to other people; see updatePresence() in WhatsAppWeb.Send
  */
diff --git a/WAClient/Messages.ts b/src/WAClient/Messages.ts
similarity index 100%
rename from WAClient/Messages.ts
rename to src/WAClient/Messages.ts
diff --git a/WAClient/Tests.ts b/src/WAClient/Tests.ts
similarity index 100%
rename from WAClient/Tests.ts
rename to src/WAClient/Tests.ts
diff --git a/WAClient/Utils.ts b/src/WAClient/Utils.ts
similarity index 99%
rename from WAClient/Utils.ts
rename to src/WAClient/Utils.ts
index c18c3a3..d4de821 100644
--- a/WAClient/Utils.ts
+++ b/src/WAClient/Utils.ts
@@ -4,7 +4,7 @@ import * as fs from 'fs'
 import fetch from 'node-fetch'
 import { WAMessage, WAMessageContent } from '../WAConnection/Constants'
 import { hmacSign, aesDecryptWithIV, hkdf } from '../WAConnection/Utils'
-import { proto } from '../Binary/WAMessage'
+import { proto } from '../../WAMessage/WAMessage'
 import { randomBytes } from 'crypto'
 import { exec } from 'child_process'
 
diff --git a/WAClient/WAClient.ts b/src/WAClient/WAClient.ts
similarity index 100%
rename from WAClient/WAClient.ts
rename to src/WAClient/WAClient.ts
diff --git a/WAConnection/Base.ts b/src/WAConnection/Base.ts
similarity index 100%
rename from WAConnection/Base.ts
rename to src/WAConnection/Base.ts
diff --git a/WAConnection/Connect.ts b/src/WAConnection/Connect.ts
similarity index 100%
rename from WAConnection/Connect.ts
rename to src/WAConnection/Connect.ts
diff --git a/WAConnection/Constants.ts b/src/WAConnection/Constants.ts
similarity index 97%
rename from WAConnection/Constants.ts
rename to src/WAConnection/Constants.ts
index f3cd5e0..1f17062 100644
--- a/WAConnection/Constants.ts
+++ b/src/WAConnection/Constants.ts
@@ -1,5 +1,5 @@
 import { WA } from '../Binary/Constants'
-import { proto } from '../Binary/WAMessage'
+import { proto } from '../../WAMessage/WAMessage'
 
 export enum MessageLogLevel {
     none=0,
diff --git a/WAConnection/Tests.ts b/src/WAConnection/Tests.ts
similarity index 100%
rename from WAConnection/Tests.ts
rename to src/WAConnection/Tests.ts
diff --git a/WAConnection/Utils.ts b/src/WAConnection/Utils.ts
similarity index 100%
rename from WAConnection/Utils.ts
rename to src/WAConnection/Utils.ts
diff --git a/WAConnection/Validation.ts b/src/WAConnection/Validation.ts
similarity index 100%
rename from WAConnection/Validation.ts
rename to src/WAConnection/Validation.ts
diff --git a/WAConnection/WAConnection.ts b/src/WAConnection/WAConnection.ts
similarity index 100%
rename from WAConnection/WAConnection.ts
rename to src/WAConnection/WAConnection.ts
diff --git a/tsconfig.json b/tsconfig.json
index ef7647d..1c05a6c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,6 +11,6 @@
     "forceConsistentCasingInFileNames": true,
     "declaration": true
   },
-  "include": ["*/*.ts"],
-  "exclude": ["node_modules", "*/Tests.ts"]
+  "include": ["src/*/*.ts"],
+  "exclude": ["node_modules", "src/*/Tests.ts"]
 }