7 files changed, 29 insertions, 20 deletions
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Create.razor b/MatrixRoomUtils.Web/Pages/Rooms/Create.razor
index 3a98801..ebf6444 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/Create.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/Create.razor
@@ -1,10 +1,12 @@
 @page "/Rooms/Create"
-@using MatrixRoomUtils.Core.Responses
 @using System.Text.Json
 @using System.Reflection
-@using MatrixRoomUtils.Core.Helpers
-@using MatrixRoomUtils.Core.StateEventTypes
-@using MatrixRoomUtils.Core.StateEventTypes.Spec
+@using LibMatrix
+@using LibMatrix.Extensions
+@using LibMatrix.Helpers
+@using LibMatrix.Responses
+@using LibMatrix.StateEventTypes.Spec
+@using LibMatrix.StateEventTypes
 @using MatrixRoomUtils.Web.Classes.RoomCreationTemplates
 @* @* ReSharper disable once RedundantUsingDirective - Must not remove this, Rider marks this as "unused" when it's not */ *@
 @using MatrixRoomUtils.Web.Shared.SimpleComponents
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Index.razor b/MatrixRoomUtils.Web/Pages/Rooms/Index.razor
index 6d12dc2..89ededf 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/Index.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/Index.razor
@@ -1,9 +1,9 @@
 @page "/Rooms"
-@using MatrixRoomUtils.Core.StateEventTypes
-@using MatrixRoomUtils.Core.StateEventTypes.Spec
-@using MatrixRoomUtils.Core.Filters
-@using MatrixRoomUtils.Core.Helpers
-@using MatrixRoomUtils.Core.Responses
+@using LibMatrix.StateEventTypes
+@using LibMatrix.StateEventTypes.Spec
+@using LibMatrix.Filters
+@using LibMatrix.Helpers
+@using LibMatrix.Responses
 <h3>Room list</h3>
 <p>@Status</p>
 @if (RenderContents) {
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor b/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor
index cd4788b..3297bcb 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor
@@ -1,9 +1,11 @@
 @page "/Rooms/{RoomId}/Policies"
-@using MatrixRoomUtils.Core.StateEventTypes
+@using LibMatrix.StateEventTypes
 @using System.Text.Json
-@using MatrixRoomUtils.Core.Helpers
-@using MatrixRoomUtils.Core.Responses
-@using MatrixRoomUtils.Core.StateEventTypes.Spec
+@using LibMatrix
+@using LibMatrix.Extensions
+@using LibMatrix.Helpers
+@using LibMatrix.Responses
+@using LibMatrix.StateEventTypes.Spec
 <h3>Policy list editor - Editing @RoomId</h3>
 <hr/>
 
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Space.razor b/MatrixRoomUtils.Web/Pages/Rooms/Space.razor
index 91f97d0..15c7c70 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/Space.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/Space.razor
@@ -1,6 +1,8 @@
 @page "/Rooms/{RoomId}/Space"
 @using System.Text.Json
-@using MatrixRoomUtils.Core.Responses
+@using LibMatrix.Extensions
+@using LibMatrix.Responses
+@using LibMatrix.RoomTypes
 <h3>Room manager - Viewing Space</h3>
 
 <button onclick="@JoinAllRooms">Join all rooms</button>
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor b/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor
index 8b2ff0c..e01fca8 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor
@@ -1,7 +1,8 @@
 @page "/Rooms/{RoomId}/State/Edit"
 @using System.Net.Http.Headers
 @using System.Text.Json
-@using MatrixRoomUtils.Core.Responses
+@using LibMatrix.Extensions
+@using LibMatrix.Responses
 @inject ILocalStorageService LocalStorage
 @inject NavigationManager NavigationManager
 <h3>Room state editor - Editing @RoomId</h3>
@@ -142,4 +143,4 @@
     }
 
     private string shownEventJson { get; set; }
-}
\ No newline at end of file
+}
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor b/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor
index 09b38f0..cf23c36 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor
@@ -1,7 +1,8 @@
 @page "/Rooms/{RoomId}/State/View"
 @using System.Net.Http.Headers
 @using System.Text.Json
-@using MatrixRoomUtils.Core.Responses
+@using LibMatrix.Extensions
+@using LibMatrix.Responses
 @inject ILocalStorageService LocalStorage
 @inject NavigationManager NavigationManager
 <h3>Room state viewer - Viewing @RoomId</h3>
@@ -125,4 +126,4 @@
     }
 
     private bool _showMembershipEvents;
-}
\ No newline at end of file
+}
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor b/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor
index 2234dd9..7fe89cc 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor
@@ -1,7 +1,8 @@
 @page "/Rooms/{RoomId}/Timeline"
 @using MatrixRoomUtils.Web.Shared.TimelineComponents
-@using MatrixRoomUtils.Core.Responses
-@using MatrixRoomUtils.Core.StateEventTypes.Spec
+@using LibMatrix
+@using LibMatrix.Responses
+@using LibMatrix.StateEventTypes.Spec
 <h3>RoomManagerTimeline</h3>
 <hr/>
 <p>Loaded @Events.Count events...</p>