diff --git a/frontend/projects/shared-meet-components/src/lib/components/generics/list/list/list.component.html b/frontend/projects/shared-meet-components/src/lib/components/generics/list/list.component.html
similarity index 100%
rename from frontend/projects/shared-meet-components/src/lib/components/generics/list/list/list.component.html
rename to frontend/projects/shared-meet-components/src/lib/components/generics/list/list.component.html
diff --git a/frontend/projects/shared-meet-components/src/lib/components/generics/list/list/list.component.scss b/frontend/projects/shared-meet-components/src/lib/components/generics/list/list.component.scss
similarity index 100%
rename from frontend/projects/shared-meet-components/src/lib/components/generics/list/list/list.component.scss
rename to frontend/projects/shared-meet-components/src/lib/components/generics/list/list.component.scss
diff --git a/frontend/projects/shared-meet-components/src/lib/components/generics/list/list/list.component.spec.ts b/frontend/projects/shared-meet-components/src/lib/components/generics/list/list.component.spec.ts
similarity index 100%
rename from frontend/projects/shared-meet-components/src/lib/components/generics/list/list/list.component.spec.ts
rename to frontend/projects/shared-meet-components/src/lib/components/generics/list/list.component.spec.ts
diff --git a/frontend/projects/shared-meet-components/src/lib/components/generics/list/list/list.component.ts b/frontend/projects/shared-meet-components/src/lib/components/generics/list/list.component.ts
similarity index 100%
rename from frontend/projects/shared-meet-components/src/lib/components/generics/list/list/list.component.ts
rename to frontend/projects/shared-meet-components/src/lib/components/generics/list/list.component.ts
diff --git a/frontend/projects/shared-meet-components/src/lib/components/index.ts b/frontend/projects/shared-meet-components/src/lib/components/index.ts
index 9cd082d..fad1122 100644
--- a/frontend/projects/shared-meet-components/src/lib/components/index.ts
+++ b/frontend/projects/shared-meet-components/src/lib/components/index.ts
@@ -1,8 +1,9 @@
-export * from './console-nav/console-nav.component';
 export * from './cards/base-card/base-card.component';
 export * from './cards/toggle-card/toggle-card.component';
 export * from './cards/selection-card/selection-card.component';
 export * from './cards/pro-feature/pro-feature.component';
+export * from './console-nav/console-nav.component';
+export * from './dialog/dialog.component';
 export * from './dynamic-grid/dynamic-grid.component';
-export * from './errors/unauthorized/unauthorized.component';
-export * from './errors/room-creator-disabled/room-creator-disabled.component';
+export * from './generics/list/list.component';
+export * from './spinner/spinner.component';
diff --git a/frontend/projects/shared-meet-components/src/lib/guards/index.ts b/frontend/projects/shared-meet-components/src/lib/guards/index.ts
index 6df5b3f..f1367df 100644
--- a/frontend/projects/shared-meet-components/src/lib/guards/index.ts
+++ b/frontend/projects/shared-meet-components/src/lib/guards/index.ts
@@ -1,9 +1,9 @@
+export * from './application-mode.guard';
 export * from './auth.guard';
 export * from './extract-query-params.guard';
-export * from './validate-room-access.guard';
-export * from './validate-recording-access.guard';
-export * from './application-mode.guard';
-export * from './participant-name.guard';
 export * from './moderator-secret.guard';
+export * from './participant-name.guard';
 export * from './room-creator.guard';
 export * from './run-serially.guard';
+export * from './validate-room-access.guard';
+export * from './validate-recording-access.guard';
diff --git a/frontend/projects/shared-meet-components/src/lib/models/index.ts b/frontend/projects/shared-meet-components/src/lib/models/index.ts
index 2030760..01f9422 100644
--- a/frontend/projects/shared-meet-components/src/lib/models/index.ts
+++ b/frontend/projects/shared-meet-components/src/lib/models/index.ts
@@ -1,3 +1,3 @@
 export * from './sidenav.model';
 export * from './notification.model';
-export { ApplicationMode } from './context.model';
+export * from './context.model';
diff --git a/frontend/projects/shared-meet-components/src/lib/pages/index.ts b/frontend/projects/shared-meet-components/src/lib/pages/index.ts
index 7e2bf59..0ff6db7 100644
--- a/frontend/projects/shared-meet-components/src/lib/pages/index.ts
+++ b/frontend/projects/shared-meet-components/src/lib/pages/index.ts
@@ -1,16 +1,18 @@
 export * from './console/console.component';
-export * from './console/rooms/rooms.component';
-export * from './console/rooms/room-form/room-form.component';
-export * from './console/recordings/recordings.component';
+export * from './console/about/about.component';
 export * from './console/access-permissions/access-permissions.component';
 export * from './console/appearance/appearance.component';
-export * from './console/security-preferences/security-preferences.component';
-export * from './console/about/about.component';
-export * from './console/overview/overview.component';
 export * from './console/login/login.component';
-export * from './room-creator/room-creator.component';
-export * from './login/login.component';
-export * from './video-room/video-room.component';
-export * from './participant-name-form/participant-name-form.component';
+export * from './console/overview/overview.component';
+export * from './console/recordings/recordings.component';
+export * from './console/rooms/rooms.component';
+export * from './console/rooms/room-form/room-form.component';
+export * from './console/security-preferences/security-preferences.component';
 export * from './disconnected/disconnected.component';
+export * from './error/error.component';
+export * from './login/login.component';
+export * from './participant-name-form/participant-name-form.component';
+export * from './room-creator/room-creator.component';
+export * from './room-creator-disabled/room-creator-disabled.component';
 export * from './room-recordings/room-recordings.component';
+export * from './video-room/video-room.component';
diff --git a/frontend/projects/shared-meet-components/src/lib/components/errors/room-creator-disabled/room-creator-disabled.component.html b/frontend/projects/shared-meet-components/src/lib/pages/room-creator-disabled/room-creator-disabled.component.html
similarity index 100%
rename from frontend/projects/shared-meet-components/src/lib/components/errors/room-creator-disabled/room-creator-disabled.component.html
rename to frontend/projects/shared-meet-components/src/lib/pages/room-creator-disabled/room-creator-disabled.component.html
diff --git a/frontend/projects/shared-meet-components/src/lib/components/errors/room-creator-disabled/room-creator-disabled.component.scss b/frontend/projects/shared-meet-components/src/lib/pages/room-creator-disabled/room-creator-disabled.component.scss
similarity index 100%
rename from frontend/projects/shared-meet-components/src/lib/components/errors/room-creator-disabled/room-creator-disabled.component.scss
rename to frontend/projects/shared-meet-components/src/lib/pages/room-creator-disabled/room-creator-disabled.component.scss
diff --git a/frontend/projects/shared-meet-components/src/lib/components/errors/room-creator-disabled/room-creator-disabled.component.spec.ts b/frontend/projects/shared-meet-components/src/lib/pages/room-creator-disabled/room-creator-disabled.component.spec.ts
similarity index 100%
rename from frontend/projects/shared-meet-components/src/lib/components/errors/room-creator-disabled/room-creator-disabled.component.spec.ts
rename to frontend/projects/shared-meet-components/src/lib/pages/room-creator-disabled/room-creator-disabled.component.spec.ts
diff --git a/frontend/projects/shared-meet-components/src/lib/components/errors/room-creator-disabled/room-creator-disabled.component.ts b/frontend/projects/shared-meet-components/src/lib/pages/room-creator-disabled/room-creator-disabled.component.ts
similarity index 100%
rename from frontend/projects/shared-meet-components/src/lib/components/errors/room-creator-disabled/room-creator-disabled.component.ts
rename to frontend/projects/shared-meet-components/src/lib/pages/room-creator-disabled/room-creator-disabled.component.ts