diff --git a/package.json b/package.json
index eca66740..2bc79c6d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@whereby.com/browser-sdk",
-    "version": "2.1.0-beta3",
+    "version": "2.1.0-beta4",
     "description": "Modules for integration Whereby video in web apps",
     "author": "Whereby AS",
     "license": "MIT",
diff --git a/src/lib/__mocks__/appMocks.ts b/src/lib/__mocks__/appMocks.ts
index 4c840e58..ac68f3e8 100644
--- a/src/lib/__mocks__/appMocks.ts
+++ b/src/lib/__mocks__/appMocks.ts
@@ -1,7 +1,7 @@
 import { Credentials } from "../api";
 import Organization from "../api/models/Organization";
 import { SignalClient } from "@whereby/jslib-media/src/utils/ServerSocket";
-import { RemoteParticipant } from "../RoomParticipant";
+import { RemoteParticipant } from "../core";
 import { v4 as uuid } from "uuid";
 import MockMediaStream from "./MediaStream";
 
diff --git a/src/lib/RoomParticipant.ts b/src/lib/core/RoomParticipant.ts
similarity index 100%
rename from src/lib/RoomParticipant.ts
rename to src/lib/core/RoomParticipant.ts
diff --git a/src/lib/core/index.ts b/src/lib/core/index.ts
index 87e98f2b..88ee026e 100644
--- a/src/lib/core/index.ts
+++ b/src/lib/core/index.ts
@@ -8,3 +8,4 @@ export * from "./redux/slices/remoteParticipants";
 export * from "./redux/slices/rtcConnection";
 export * from "./redux/slices/signalConnection";
 export * from "../version";
+export * from "./RoomParticipant";
diff --git a/src/lib/core/redux/slices/__tests__/rtcConnection.unit.ts b/src/lib/core/redux/slices/__tests__/rtcConnection.unit.ts
index e435888f..7b02369e 100644
--- a/src/lib/core/redux/slices/__tests__/rtcConnection.unit.ts
+++ b/src/lib/core/redux/slices/__tests__/rtcConnection.unit.ts
@@ -5,7 +5,7 @@ import {
     selectStreamsToAccept,
 } from "../rtcConnection";
 import { oneOf, randomRemoteParticipant } from "../../../../../lib/__mocks__/appMocks";
-import { StreamState } from "../../../../../lib/RoomParticipant";
+import { StreamState } from "../../../../../lib/core/RoomParticipant";
 
 describe("rtcConnectionSlice", () => {
     describe("reactors", () => {
diff --git a/src/lib/core/redux/slices/remoteParticipants.ts b/src/lib/core/redux/slices/remoteParticipants.ts
index 20e1feed..523a8163 100644
--- a/src/lib/core/redux/slices/remoteParticipants.ts
+++ b/src/lib/core/redux/slices/remoteParticipants.ts
@@ -1,7 +1,7 @@
 import { PayloadAction, createSelector, createSlice } from "@reduxjs/toolkit";
 import { RootState } from "../store";
 import { SignalClient } from "@whereby/jslib-media/src/utils/ServerSocket";
-import { RemoteParticipant, Screenshare, StreamState } from "../../../../lib/RoomParticipant";
+import { RemoteParticipant, Screenshare, StreamState } from "../../../../lib/core/RoomParticipant";
 import { rtcEvents } from "./rtcConnection/actions";
 import { StreamStatusUpdate } from "./rtcConnection/types";
 import { signalEvents } from "./signalConnection/actions";
diff --git a/src/lib/core/redux/slices/rtcConnection/index.ts b/src/lib/core/redux/slices/rtcConnection/index.ts
index 44b0c55a..3d69eff4 100644
--- a/src/lib/core/redux/slices/rtcConnection/index.ts
+++ b/src/lib/core/redux/slices/rtcConnection/index.ts
@@ -10,7 +10,7 @@ import RtcManagerDispatcher, {
 } from "@whereby/jslib-media/src/webrtc/RtcManagerDispatcher";
 import { createReactor, startAppListening } from "../../listenerMiddleware";
 import { selectRemoteParticipants, streamStatusUpdated } from "../remoteParticipants";
-import { StreamState } from "../../../../../lib/RoomParticipant";
+import { StreamState } from "../../../../../lib/core/RoomParticipant";
 import { selectAppIsNodeSdk, selectAppWantsToJoin } from "../app";
 import {
     selectIsCameraEnabled,
diff --git a/src/lib/core/redux/slices/rtcConnection/types.ts b/src/lib/core/redux/slices/rtcConnection/types.ts
index aafeb8e7..3c7a2f7b 100644
--- a/src/lib/core/redux/slices/rtcConnection/types.ts
+++ b/src/lib/core/redux/slices/rtcConnection/types.ts
@@ -1,4 +1,4 @@
-import { StreamState } from "../../../../../lib/RoomParticipant";
+import { StreamState } from "../../../../../lib/core/RoomParticipant";
 
 export interface StreamStatusUpdate {
     clientId: string;
diff --git a/src/lib/core/redux/slices/waitingParticipants.ts b/src/lib/core/redux/slices/waitingParticipants.ts
index be9d27dc..fcb75bd2 100644
--- a/src/lib/core/redux/slices/waitingParticipants.ts
+++ b/src/lib/core/redux/slices/waitingParticipants.ts
@@ -1,6 +1,6 @@
 import { createSlice } from "@reduxjs/toolkit";
 import { RootState } from "../store";
-import { WaitingParticipant } from "../../../../lib/RoomParticipant";
+import { WaitingParticipant } from "../../../../lib/core/RoomParticipant";
 import { createAppThunk } from "../thunk";
 import { signalEvents } from "./signalConnection/actions";
 import { selectSignalConnectionSocket } from "./signalConnection";
diff --git a/src/lib/react/useRoomConnection/types.ts b/src/lib/react/useRoomConnection/types.ts
index 70d5d2bf..447fe6b0 100644
--- a/src/lib/react/useRoomConnection/types.ts
+++ b/src/lib/react/useRoomConnection/types.ts
@@ -1,4 +1,4 @@
-import { LocalParticipant, RemoteParticipant, Screenshare } from "../../RoomParticipant";
+import { LocalParticipant, RemoteParticipant, Screenshare } from "../../core";
 
 import { ChatMessage as SignalChatMessage } from "@whereby/jslib-media/src/utils/ServerSocket";
 import { LocalMediaOptions } from "../../core/redux/slices/localMedia";