diff --git a/src/nimbotsdk.nim b/src/nimbotsdk.nim
index 4b5f303..c789a1a 100644
--- a/src/nimbotsdk.nim
+++ b/src/nimbotsdk.nim
@@ -1,28 +1,21 @@
-# Things here have been tested to work
-
 import nimbotsdk/matrixTypes
-export ICryptoStorageProvider, Storage, Client, Content, Unsigned, Event, Filter, Appservice
+export ICryptoStorageProvider, Storage, Client, Content, Unsigned, Event,
+    Filter, Appservice
 
 import nimbotsdk/MatrixAuth
 export newMatrixAuth, passwordLogin
 
 import nimbotsdk/MatrixClient
-export newMatrixClient
-export onRoomMessage
+export newMatrixClient, onRoomMessage, addPreprocessor, getServerVersions,
+    start, sendReadReceipt, setTyping, replyText, replyHtmlText, replyNotice,
+    replyHtmlNotice, sendNotice, sendHtmlNotice, sendText, sendHtmlText,
+    sendMessage, sendEvent, sendRawEvent, sendStateEvent, redactEvent
 
-export addPreprocessor, getServerVersions, start, sendReadReceipt, setTyping,
-    replyText, replyHtmlText, replyNotice, replyHtmlNotice, sendNotice,
-    sendHtmlNotice, sendText, sendHtmlText, sendMessage, sendEvent,
-    sendRawEvent, sendStateEvent, redactEvent
-
-import nimbotsdk/AutojoinRoomsMixin
+import nimbotsdk/mixins/AutojoinRoomsMixin
 export AutojoinRoomsMixinSetupOnClient, AutojoinRoomsMixinSetupOnAppservice
 
-import nimbotsdk/SimpleFsStorageProvider
-export newSimpleFsStorageProvider
-
-import nimbotsdk/RichRepliesPreprocessor
+import nimbotsdk/preprocessors/RichRepliesPreprocessor
 export newRichRepliesPreprocessor
 
-import nimbotsdk/RustSdkCryptoStorageProvider
-export RustSdkCryptoStorageProvider
\ No newline at end of file
+import nimbotsdk/storage/[SimpleFsStorageProvider, RustSdkCryptoStorageProvider]
+export newSimpleFsStorageProvider, RustSdkCryptoStorageProvider
\ No newline at end of file