diff --git a/src/index.ts b/src/index.ts
index a5bf111c0..a6f542a84 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -32,8 +32,3 @@ try {
 export * from "./matrix";
 export default matrixcs;
 
-export * from './@types/event';
-export * from './@types/PushRules';
-export * from './@types/requests';
-export * from './@types/search';
-export * from './models/room-summary';
diff --git a/src/matrix.ts b/src/matrix.ts
index bb6492412..e279997e9 100644
--- a/src/matrix.ts
+++ b/src/matrix.ts
@@ -46,6 +46,11 @@ export * from "./store/session/webstorage";
 export * from "./crypto/store/memory-crypto-store";
 export * from "./crypto/store/indexeddb-crypto-store";
 export * from "./content-repo";
+export * from './@types/event';
+export * from './@types/PushRules';
+export * from './@types/requests';
+export * from './@types/search';
+export * from './models/room-summary';
 export * as ContentHelpers from "./content-helpers";
 export {
     createNewMatrixCall,