diff --git a/README.md b/README.md
index ef8f66a11..37ae95883 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,7 @@ Model registry provides a central repository for model developers to store and m
    - [playground](https://petstore.swagger.io/?url=https://raw.githubusercontent.com/kubeflow/model-registry/main/api/openapi/model-registry.yaml)
  - [license scanning](https://github.com/kubeflow/model-registry/issues/323)
  - [monitoring image quality](https://github.com/kubeflow/model-registry/issues/327)
+8. [UI](.clients/ui/README.md)
 
 ## Pre-requisites:
 - go >= 1.21
diff --git a/clients/ui/Makefile b/clients/ui/Makefile
new file mode 100644
index 000000000..addcf8986
--- /dev/null
+++ b/clients/ui/Makefile
@@ -0,0 +1,32 @@
+CONTAINER_TOOL ?= docker
+
+.PHONY: all
+all: build
+
+.PHONY: help
+help: ## Display this help.
+	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
+
+.PHONY: dev-install-dependencies
+dev-install-dependencies:
+	cd frontend && npm install
+
+.PHONY: dev-bff
+dev-bff:
+	cd bff && make run PORT=4000 MOCK_K8S_CLIENT=true MOCK_MR_CLIENT=true
+
+.PHONY: dev-frontend
+dev-frontend:
+	cd frontend && npm run start:dev
+
+.PHONY: dev-start
+dev-start: 
+	make -j 2 dev-bff dev-frontend
+
+.PHONY: docker-compose
+docker-compose:
+	$(CONTAINER_TOOL) compose -f docker-compose.yaml up
+
+.PHONY: kind-deployment
+kind-deployment:
+	./scripts/deploy_kind_cluster.sh
diff --git a/clients/ui/README.md b/clients/ui/README.md
new file mode 100644
index 000000000..fe7b80a69
--- /dev/null
+++ b/clients/ui/README.md
@@ -0,0 +1,48 @@
+[frontend requirements]: ./frontend/docs/dev-setup.md#requirements
+[BFF requirements]: ./bff/README.md#pre-requisites
+[frontend dev setup]: ./frontend/docs/dev-setup.md#development
+[BFF dev setup]: ./bff/README.md#development
+
+# Model Registry UI
+
+## Overview
+
+The Model Registry UI is a standalone web app for Kubeflow Model Registry. In this repository, you will find the frontend and backend for the Model Registry UI.
+
+## Prerequisites
+
+* [Frontend requirements]
+* [BFF requirements]
+
+## Set Up
+
+### Development
+
+To run the a mocked dev environment you can either:
+
+* Use the makefile command to install dependencies `make dev-install-dependencies` and then start the dev environment `make dev-start`.
+
+* Or follow the [frontend dev setup] and [BFF dev setup].
+
+### Docker deployment
+
+To build the Model Registry UI container, run the following command:
+
+```shell
+make docker-compose
+```
+
+### Kubernetes Deployment
+
+For a in-depth guide on how to deploy the Model Registry UI, please refer to the [local kubernetes deployment](./bff/docs/dev-guide.md) documentation.
+
+To quickly enable the Model Registry UI in your Kind cluster, you can use the following command:
+
+```shell
+make kind-deployment
+```
+
+## OpenAPI Specification
+
+You can find the OpenAPI specification for the Model Registry UI in the [openapi](./api/openapi) directory.
+A live version of the OpenAPI specification can be found [here](https://editor.swagger.io/?url=https://raw.githubusercontent.com/kubeflow/model-registry/main/clients/ui/api/openapi/mod-arch.yaml).
diff --git a/clients/ui/api/openapi/mod-arch.yaml b/clients/ui/api/openapi/mod-arch.yaml
index 3479de762..d17494682 100644
--- a/clients/ui/api/openapi/mod-arch.yaml
+++ b/clients/ui/api/openapi/mod-arch.yaml
@@ -86,7 +86,13 @@ paths:
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/ModelVersionUpdate"
+              type: object
+              properties:
+                metadata:
+                  type: object
+                  description: Metadata about the response
+                data:
+                  $ref: "#/components/schemas/ModelVersionUpdate"
         required: true
       tags:
         - ModelRegistryService
@@ -141,7 +147,13 @@ paths:
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/RegisteredModelCreate"
+              type: object
+              properties:
+                metadata:
+                  type: object
+                  description: Metadata about the response
+                data:
+                  $ref: "#/components/schemas/RegisteredModelCreate"
         required: true
       tags:
         - ModelRegistryService
@@ -186,7 +198,13 @@ paths:
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/RegisteredModelUpdate"
+              type: object
+              properties:
+                metadata:
+                  type: object
+                  description: Metadata about the response
+                data:
+                  $ref: "#/components/schemas/RegisteredModelUpdate"
         required: true
       tags:
         - ModelRegistryService
@@ -244,7 +262,13 @@ paths:
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/Artifact"
+              type: object
+              properties:
+                metadata:
+                  type: object
+                  description: Metadata about the response
+                data:
+                  $ref: "#/components/schemas/Artifact"
         required: true
       tags:
         - ModelRegistryService
@@ -305,7 +329,13 @@ paths:
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/ModelVersion"
+              type: object
+              properties:
+                metadata:
+                  type: object
+                  description: Metadata about the response
+                data:
+                  $ref: "#/components/schemas/ModelVersion"
         required: true
       tags:
         - ModelRegistryService
@@ -972,99 +1002,195 @@ components:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/Config"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/Config"
       description: A response containing a list of ModelArtifact entities.
     ModelRegistryRespone:
       content:
         application/json:
           schema:
-            type: array
-            items:
-              $ref: "#/components/schemas/ModelRegistry"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                type: array
+                items:
+                  $ref: "#/components/schemas/ModelRegistry"
       description: A response containing a list of ModelArtifact entities.
     ModelArtifactListResponse:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/ModelArtifactList"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/ModelArtifactList"
       description: A response containing a list of ModelArtifact entities.
     ModelArtifactResponse:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/ModelArtifact"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/ModelArtifact"
       description: A response containing a `ModelArtifact` entity.
     ModelVersionListResponse:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/ModelVersionList"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/ModelVersionList"
       description: A response containing a list of `ModelVersion` entities.
     ModelVersionResponse:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/ModelVersion"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/ModelVersion"
       description: A response containing a `ModelVersion` entity.
     RegisteredModelListResponse:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/RegisteredModelList"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/RegisteredModelList"
       description: A response containing a list of `RegisteredModel` entities.
     RegisteredModelResponse:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/RegisteredModel"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/RegisteredModel"
       description: A response containing a `RegisteredModel` entity.
     ArtifactResponse:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/Artifact"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/Artifact"
       description: A response containing an `Artifact` entity.
     ArtifactListResponse:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/ArtifactList"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/ArtifactList"
       description: A response containing a list of `Artifact` entities.
     ServingEnvironmentListResponse:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/ServingEnvironmentList"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/ServingEnvironmentList"
       description: A response containing a list of `ServingEnvironment` entities.
     ServingEnvironmentResponse:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/ServingEnvironment"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/ServingEnvironment"
       description: A response containing a `ServingEnvironment` entity.
     InferenceServiceListResponse:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/InferenceServiceList"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/InferenceServiceList"
       description: A response containing a list of `InferenceService` entities.
     InferenceServiceResponse:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/InferenceService"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/InferenceService"
       description: A response containing a `InferenceService` entity.
     ServeModelListResponse:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/ServeModelList"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/ServeModelList"
       description: A response containing a list of `ServeModel` entities.
     ServeModelResponse:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/ServeModel"
+            type: object
+            properties:
+              metadata:
+                type: object
+                description: Metadata about the response
+              data:
+                $ref: "#/components/schemas/ServeModel"
       description: A response containing a `ServeModel` entity.
   parameters:
     modelRegistryName:
diff --git a/clients/ui/docker-compose.yaml b/clients/ui/docker-compose.yaml
index 6c5f4bd74..7fbc2c8ca 100644
--- a/clients/ui/docker-compose.yaml
+++ b/clients/ui/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
     ports:
       - 8080:8080
     environment:
-      API_URL: http://model-registry-bff:4001
+      API_URL: http://model-registry-bff:4000
     networks:
       - model_registry
     depends_on:
@@ -15,6 +15,7 @@ services:
     container_name: model-registry-bff
     command:
       - "--mock-k8s-client=true"
+      - "--mock-mr-client=true"
     networks:
       - model_registry
 
diff --git a/clients/ui/frontend/Dockerfile b/clients/ui/frontend/Dockerfile
index 0e787fdee..c25a2b1c6 100644
--- a/clients/ui/frontend/Dockerfile
+++ b/clients/ui/frontend/Dockerfile
@@ -10,7 +10,7 @@ RUN npm run build
 
 FROM nginxinc/nginx-unprivileged
 
-ENV API_URL="http://localhost:4001"
+ENV API_URL="http://localhost:4000"
 ENV NGINX_ENVSUBST_FILTER="API_URL"
 
 COPY --from=build-stage /usr/src/app/dist/ "/usr/share/nginx/html"
diff --git a/clients/ui/frontend/README.md b/clients/ui/frontend/README.md
index c8f062d7d..63ca41ba7 100644
--- a/clients/ui/frontend/README.md
+++ b/clients/ui/frontend/README.md
@@ -7,7 +7,7 @@
 
 The Kubeflow Model Registry UI is a standalone web app for Kubeflow Model Registry.
 
-## Contributing:
+## Contributing
 
 Individual bug fixes are welcome, it is recommended that you create a bug [issue] at the same time to describe the fix you're applying. If you are unsure how best to solve it, start with the issue and note your desire to contribute.
 
diff --git a/clients/ui/frontend/docs/dev-setup.md b/clients/ui/frontend/docs/dev-setup.md
index 327a40577..2fe6e9653 100644
--- a/clients/ui/frontend/docs/dev-setup.md
+++ b/clients/ui/frontend/docs/dev-setup.md
@@ -8,10 +8,6 @@ This project requires the following tools to be installed on your system:
   - Node recommended version -> `20.17.0`
   - NPM recommended version -> `10.8.2`
 
-### Additional tooling
-
-[TBD]
-
 ## Development
 
 1. Clone the repository
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/pages/appChrome.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/appChrome.ts
index 8d30c9a48..5d6afc32d 100644
--- a/clients/ui/frontend/src/__tests__/cypress/cypress/pages/appChrome.ts
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/appChrome.ts
@@ -9,7 +9,7 @@ class AppChrome {
     cy.testA11y();
   }
 
-  // TODO: implement when authorization is enabled
+  // TODO: [Auth-enablement] Uncomment once auth is enabled
   // shouldBeUnauthorized() {
   //   cy.findByTestId('unauthorized-error');
   //   return this;
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/support/commands/application.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/support/commands/application.ts
index 7b5de43ea..c6100d0cd 100644
--- a/clients/ui/frontend/src/__tests__/cypress/cypress/support/commands/application.ts
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/support/commands/application.ts
@@ -7,7 +7,7 @@ import type { Matcher, MatcherOptions as DTLMatcherOptions } from '@testing-libr
 declare global {
   namespace Cypress {
     interface Chainable {
-      // TODO: Uncomment when authorization is enabled
+      // TODO: [Auth-enablement] Uncomment once auth is enabled
       // /**
       //  * Visits the URL and performs a login if necessary.
       //  * Uses credentials supplied by environment variables if not provided.
@@ -121,7 +121,7 @@ declare global {
   }
 }
 
-// TODO: Uncomment when authorization is enabled
+// TODO: [Auth-enablement] Uncomment once auth is enabled
 // Cypress.Commands.add('visitWithLogin', (url, user = TEST_USER) => {
 //   if (Cypress.env('MOCK')) {
 //     cy.visit(url);
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts
index dc9940b24..e6cb531c3 100644
--- a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts
@@ -205,35 +205,22 @@ describe('Model Registry core', () => {
   });
 });
 
-// TODO: Enable when model registration is there
-// describe('Register Model button', () => {
-//   it('Navigates to register page from empty state', () => {
-//     initIntercepts({ disableModelRegistryFeature: false, registeredModels: [] });
-//     modelRegistry.visit();
-//     modelRegistry.findRegisterModelButton().click();
-//     cy.findByTestId('app-page-title').should('exist');
-//     cy.findByTestId('app-page-title').contains('Register model');
-//     cy.findByText('Model registry - modelregistry-sample').should('exist');
-//   });
-
-//   it('Navigates to register page from table toolbar', () => {
-//     initIntercepts({ disableModelRegistryFeature: false });
-//     modelRegistry.visit();
-//     modelRegistry.findRegisterModelButton().click();
-//     cy.findByTestId('app-page-title').should('exist');
-//     cy.findByTestId('app-page-title').contains('Register model');
-//     cy.findByText('Model registry - modelregistry-sample').should('exist');
-//   });
-
-//   it('should be accessible for non-admin users', () => {
-//     asProjectEditUser();
-//     initIntercepts({
-//       disableModelRegistryFeature: false,
-//       allowed: false,
-//     });
-
-//     modelRegistry.visit();
-//     modelRegistry.navigate();
-//     modelRegistry.shouldModelRegistrySelectorExist();
-//   });
-// });
+describe('Register Model button', () => {
+  it('Navigates to register page from empty state', () => {
+    initIntercepts({ registeredModels: [] });
+    modelRegistry.visit();
+    modelRegistry.findRegisterModelButton().click();
+    cy.findByTestId('app-page-title').should('exist');
+    cy.findByTestId('app-page-title').contains('Register model');
+    cy.findByText('Model registry - modelregistry-sample').should('exist');
+  });
+
+  it('Navigates to register page from table toolbar', () => {
+    initIntercepts({ registeredModels: [] });
+    modelRegistry.visit();
+    modelRegistry.findRegisterModelButton().click();
+    cy.findByTestId('app-page-title').should('exist');
+    cy.findByTestId('app-page-title').contains('Register model');
+    cy.findByText('Model registry - modelregistry-sample').should('exist');
+  });
+});
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersions.cy.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersions.cy.ts
index 3aa7f9c50..c3fd860e2 100644
--- a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersions.cy.ts
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersions.cy.ts
@@ -130,7 +130,7 @@ describe('Model Versions', () => {
   });
 
   it('Model versions table', () => {
-    // TODO: Uncomment when we fix finding listbox items
+    // TODO: [Testing] Uncomment when we fix finding listbox items
 
     initIntercepts({
       modelRegistries: [
diff --git a/clients/ui/frontend/src/app/App.tsx b/clients/ui/frontend/src/app/App.tsx
index 430a9ff07..494ee459e 100644
--- a/clients/ui/frontend/src/app/App.tsx
+++ b/clients/ui/frontend/src/app/App.tsx
@@ -19,11 +19,11 @@ import {
   StackItem,
 } from '@patternfly/react-core';
 import { BarsIcon } from '@patternfly/react-icons';
-import ToastNotifications from '~/components/ToastNotifications';
+import ToastNotifications from '~/shared/components/ToastNotifications';
+import { useSettings } from '~/shared/hooks/useSettings';
 import NavSidebar from './NavSidebar';
 import AppRoutes from './AppRoutes';
 import { AppContext } from './AppContext';
-import { useSettings } from './useSettings';
 import { ModelRegistrySelectorContextProvider } from './context/ModelRegistrySelectorContext';
 
 const App: React.FC = () => {
@@ -62,7 +62,7 @@ const App: React.FC = () => {
               <Button
                 variant="secondary"
                 onClick={() => {
-                  // TODO: logout
+                  // TODO: [Auth-enablement] Logout when auth is enabled
                 }}
               >
                 Logout
@@ -94,7 +94,9 @@ const App: React.FC = () => {
         </MastheadBrand>
       </MastheadMain>
 
-      <MastheadContent>{/* TODO: Change this into a component for Header Tools */}</MastheadContent>
+      <MastheadContent>
+        {/* TODO: [Auth-enablement] Add logout and user status once we enable itNavigates to register page from table toolbar */}
+      </MastheadContent>
     </Masthead>
   );
 
diff --git a/clients/ui/frontend/src/app/AppContext.ts b/clients/ui/frontend/src/app/AppContext.ts
index e4ab9e4bb..1f4bd70aa 100644
--- a/clients/ui/frontend/src/app/AppContext.ts
+++ b/clients/ui/frontend/src/app/AppContext.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { UserSettings, ConfigSettings } from '~/types';
+import { UserSettings, ConfigSettings } from '~/shared/types';
 
 type AppContextProps = {
   config: ConfigSettings;
diff --git a/clients/ui/frontend/src/app/AppRoutes.tsx b/clients/ui/frontend/src/app/AppRoutes.tsx
index 2852cc23f..7dbf30b9e 100644
--- a/clients/ui/frontend/src/app/AppRoutes.tsx
+++ b/clients/ui/frontend/src/app/AppRoutes.tsx
@@ -25,7 +25,7 @@ export const useAdminSettings = (): NavDataItem[] => {
   // get auth access for example set admin as true
   const isAdmin = true; //this should be a call to getting auth / role access
 
-  // TODO: Remove the linter skip when we implement authentication
+  // TODO: [Auth-enablement] Remove the linter skip when we implement authentication
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   if (!isAdmin) {
     return [];
@@ -56,7 +56,7 @@ const AppRoutes: React.FC = () => {
       <Route path="/modelRegistry/*" element={<ModelRegistryRoutes />} />
       <Route path="*" element={<NotFound />} />
       {
-        // TODO: Remove the linter skip when we implement authentication
+        // TODO: [Auth-enablement] Remove the linter skip when we implement authentication
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         isAdmin && (
           <Route path="/modelRegistrySettings/*" element={<ModelRegistrySettingsRoutes />} />
diff --git a/clients/ui/frontend/src/app/context/useModelRegistryAPIState.tsx b/clients/ui/frontend/src/app/context/useModelRegistryAPIState.tsx
index 9b1465ba0..d51592d9e 100644
--- a/clients/ui/frontend/src/app/context/useModelRegistryAPIState.tsx
+++ b/clients/ui/frontend/src/app/context/useModelRegistryAPIState.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { APIState } from '~/app/api/types';
+import { APIState } from '~/shared/api/types';
 import { ModelRegistryAPIs } from '~/app/types';
 import {
   createModelArtifact,
@@ -18,8 +18,8 @@ import {
   patchModelArtifact,
   patchModelVersion,
   patchRegisteredModel,
-} from '~/app/api/service';
-import useAPIState from '~/app/api/useAPIState';
+} from '~/shared/api/service';
+import useAPIState from '~/shared/api/useAPIState';
 
 export type ModelRegistryAPIState = APIState<ModelRegistryAPIs>;
 
diff --git a/clients/ui/frontend/src/app/hooks/useModelArtifactsByVersionId.ts b/clients/ui/frontend/src/app/hooks/useModelArtifactsByVersionId.ts
index 5fb90a17a..ffe8ee241 100644
--- a/clients/ui/frontend/src/app/hooks/useModelArtifactsByVersionId.ts
+++ b/clients/ui/frontend/src/app/hooks/useModelArtifactsByVersionId.ts
@@ -1,5 +1,8 @@
 import * as React from 'react';
-import useFetchState, { FetchState, FetchStateCallbackPromise } from '~/utilities/useFetchState';
+import useFetchState, {
+  FetchState,
+  FetchStateCallbackPromise,
+} from '~/shared/utilities/useFetchState';
 import { ModelArtifactList } from '~/app/types';
 import { useModelRegistryAPI } from '~/app/hooks/useModelRegistryAPI';
 
diff --git a/clients/ui/frontend/src/app/hooks/useModelRegistries.ts b/clients/ui/frontend/src/app/hooks/useModelRegistries.ts
index 705256a8f..20fdec719 100644
--- a/clients/ui/frontend/src/app/hooks/useModelRegistries.ts
+++ b/clients/ui/frontend/src/app/hooks/useModelRegistries.ts
@@ -1,7 +1,10 @@
 import * as React from 'react';
-import useFetchState, { FetchState, FetchStateCallbackPromise } from '~/utilities/useFetchState';
+import useFetchState, {
+  FetchState,
+  FetchStateCallbackPromise,
+} from '~/shared/utilities/useFetchState';
 import { ModelRegistry } from '~/app/types';
-import { getListModelRegistries } from '~/app/api/k8s';
+import { getListModelRegistries } from '~/shared/api/k8s';
 
 const useModelRegistries = (): FetchState<ModelRegistry[]> => {
   const listModelRegistries = React.useMemo(() => getListModelRegistries(''), []);
diff --git a/clients/ui/frontend/src/app/hooks/useModelVersionById.ts b/clients/ui/frontend/src/app/hooks/useModelVersionById.ts
index 19b7ecd97..6a7928499 100644
--- a/clients/ui/frontend/src/app/hooks/useModelVersionById.ts
+++ b/clients/ui/frontend/src/app/hooks/useModelVersionById.ts
@@ -1,5 +1,8 @@
 import * as React from 'react';
-import useFetchState, { FetchState, FetchStateCallbackPromise } from '~/utilities/useFetchState';
+import useFetchState, {
+  FetchState,
+  FetchStateCallbackPromise,
+} from '~/shared/utilities/useFetchState';
 import { ModelVersion } from '~/app/types';
 import { useModelRegistryAPI } from '~/app/hooks/useModelRegistryAPI';
 
diff --git a/clients/ui/frontend/src/app/hooks/useModelVersionsByRegisteredModel.ts b/clients/ui/frontend/src/app/hooks/useModelVersionsByRegisteredModel.ts
index c8f82f9e3..c1c1cf6b4 100644
--- a/clients/ui/frontend/src/app/hooks/useModelVersionsByRegisteredModel.ts
+++ b/clients/ui/frontend/src/app/hooks/useModelVersionsByRegisteredModel.ts
@@ -1,5 +1,8 @@
 import * as React from 'react';
-import useFetchState, { FetchState, FetchStateCallbackPromise } from '~/utilities/useFetchState';
+import useFetchState, {
+  FetchState,
+  FetchStateCallbackPromise,
+} from '~/shared/utilities/useFetchState';
 import { ModelVersionList } from '~/app/types';
 import { useModelRegistryAPI } from '~/app/hooks/useModelRegistryAPI';
 
diff --git a/clients/ui/frontend/src/app/hooks/useRegisteredModelById.ts b/clients/ui/frontend/src/app/hooks/useRegisteredModelById.ts
index c2d45bc8b..b95be220f 100644
--- a/clients/ui/frontend/src/app/hooks/useRegisteredModelById.ts
+++ b/clients/ui/frontend/src/app/hooks/useRegisteredModelById.ts
@@ -1,5 +1,8 @@
 import * as React from 'react';
-import useFetchState, { FetchState, FetchStateCallbackPromise } from '~/utilities/useFetchState';
+import useFetchState, {
+  FetchState,
+  FetchStateCallbackPromise,
+} from '~/shared/utilities/useFetchState';
 import { RegisteredModel } from '~/app/types';
 import { useModelRegistryAPI } from '~/app/hooks/useModelRegistryAPI';
 
diff --git a/clients/ui/frontend/src/app/hooks/useRegisteredModels.ts b/clients/ui/frontend/src/app/hooks/useRegisteredModels.ts
index 6553c7aea..3f5d48357 100644
--- a/clients/ui/frontend/src/app/hooks/useRegisteredModels.ts
+++ b/clients/ui/frontend/src/app/hooks/useRegisteredModels.ts
@@ -1,5 +1,8 @@
 import * as React from 'react';
-import useFetchState, { FetchState, FetchStateCallbackPromise } from '~/utilities/useFetchState';
+import useFetchState, {
+  FetchState,
+  FetchStateCallbackPromise,
+} from '~/shared/utilities/useFetchState';
 import { RegisteredModelList } from '~/app/types';
 import { useModelRegistryAPI } from '~/app/hooks/useModelRegistryAPI';
 
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryCoreLoader.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryCoreLoader.tsx
index 0c4ec86f0..0e6cac17a 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryCoreLoader.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryCoreLoader.tsx
@@ -2,11 +2,11 @@ import * as React from 'react';
 import { Navigate, Outlet, useParams } from 'react-router-dom';
 import { Bullseye, Alert, Popover, List, ListItem, Button } from '@patternfly/react-core';
 import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
-import ApplicationsPage from '~/app/components/ApplicationsPage';
+import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
-import { ProjectObjectType, typedEmptyImage } from '~/app/components/design/utils';
+import { ProjectObjectType, typedEmptyImage } from '~/shared/components/design/utils';
 import { ModelRegistryContextProvider } from '~/app/context/ModelRegistryContext';
-import TitleWithIcon from '~/app/components/design/TitleWithIcon';
+import TitleWithIcon from '~/shared/components/design/TitleWithIcon';
 import EmptyModelRegistryState from './screens/components/EmptyModelRegistryState';
 import InvalidModelRegistry from './screens/InvalidModelRegistry';
 import ModelRegistrySelectorNavigator from './screens/ModelRegistrySelectorNavigator';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryRoutes.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryRoutes.tsx
index 48f02ada4..f6fd0f486 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryRoutes.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryRoutes.tsx
@@ -14,7 +14,7 @@ import ArchiveModelVersionDetails from './screens/ModelVersionsArchive/ArchiveMo
 import RegisteredModelsArchiveDetails from './screens/RegisteredModelsArchive/RegisteredModelArchiveDetails';
 import RegisterModel from './screens/RegisterModel/RegisterModel';
 import RegisterVersion from './screens/RegisterModel/RegisterVersion';
-import '~/style/MUI-theme.scss';
+import '~/shared/style/MUI-theme.scss';
 
 const ModelRegistryRoutes: React.FC = () => (
   <Routes>
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/InvalidModelRegistry.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/InvalidModelRegistry.tsx
index c1559a725..eb473f0ce 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/InvalidModelRegistry.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/InvalidModelRegistry.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import EmptyStateErrorMessage from '~/app/components/EmptyStateErrorMessage';
+import EmptyStateErrorMessage from '~/shared/components/EmptyStateErrorMessage';
 import { modelRegistryUrl } from './routeUtils';
 import ModelRegistrySelectorNavigator from './ModelRegistrySelectorNavigator';
 
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesDescriptionListGroup.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesDescriptionListGroup.tsx
index 8416f3939..60a11b82c 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesDescriptionListGroup.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesDescriptionListGroup.tsx
@@ -4,7 +4,7 @@ import { Table, Tbody, Th, Thead, Tr } from '@patternfly/react-table';
 import { PlusCircleIcon } from '@patternfly/react-icons';
 import text from '@patternfly/react-styles/css/utilities/Text/text';
 import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
-import DashboardDescriptionListGroup from '~/components/DashboardDescriptionListGroup';
+import DashboardDescriptionListGroup from '~/shared/components/DashboardDescriptionListGroup';
 import { getProperties, mergeUpdatedProperty } from '~/app/pages/modelRegistry/screens/utils';
 import { ModelRegistryCustomProperties } from '~/app/types';
 import ModelPropertiesTableRow from '~/app/pages/modelRegistry/screens/ModelPropertiesTableRow';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesTableRow.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesTableRow.tsx
index ef78584ba..3498f7bc5 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesTableRow.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesTableRow.tsx
@@ -11,8 +11,8 @@ import {
   TextInput,
 } from '@patternfly/react-core';
 import { CheckIcon, TimesIcon } from '@patternfly/react-icons';
-import { KeyValuePair } from '~/types';
-import { EitherNotBoth } from '~/typeHelpers';
+import { KeyValuePair } from '~/shared/types';
+import { EitherNotBoth } from '~/shared/typeHelpers';
 import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 
 type ModelPropertiesTableRowProps = {
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistry.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistry.tsx
index 75cf9f119..4c55f9f8d 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistry.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistry.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import ApplicationsPage from '~/app/components/ApplicationsPage';
-import TitleWithIcon from '~/app/components/design/TitleWithIcon';
-import { ProjectObjectType } from '~/app/components/design/utils';
+import ApplicationsPage from '~/shared/components/ApplicationsPage';
+import TitleWithIcon from '~/shared/components/design/TitleWithIcon';
+import { ProjectObjectType } from '~/shared/components/design/utils';
 import useRegisteredModels from '~/app/hooks/useRegisteredModels';
 import { filterLiveModels } from '~/app/pages/modelRegistry/screens/utils';
 import ModelRegistrySelectorNavigator from './ModelRegistrySelectorNavigator';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistrySelector.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistrySelector.tsx
index 757eeed47..303135b4d 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistrySelector.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistrySelector.tsx
@@ -20,7 +20,7 @@ import {
 } from '@patternfly/react-core';
 import truncateStyles from '@patternfly/react-styles/css/components/Truncate/truncate';
 import { InfoCircleIcon, BlueprintIcon } from '@patternfly/react-icons';
-import { useBrowserStorage } from '~/components/browserStorage';
+import { useBrowserStorage } from '~/shared/components/browserStorage';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
 import { ModelRegistry } from '~/app/types';
 
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetails.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetails.tsx
index fe60a7b6a..8bbcd176b 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetails.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetails.tsx
@@ -2,7 +2,7 @@ import React, { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router';
 import { Breadcrumb, BreadcrumbItem, Flex, FlexItem, Truncate } from '@patternfly/react-core';
 import { Link } from 'react-router-dom';
-import ApplicationsPage from '~/app/components/ApplicationsPage';
+import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
 import useRegisteredModelById from '~/app/hooks/useRegisteredModelById';
 import useModelVersionById from '~/app/hooks/useModelVersionById';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsView.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsView.tsx
index c541ea4fd..a88b77643 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsView.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsView.tsx
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { DescriptionList, Flex, FlexItem, ContentVariants, Title } from '@patternfly/react-core';
-import DashboardDescriptionListGroup from '~/components/DashboardDescriptionListGroup';
-import EditableTextDescriptionListGroup from '~/components/EditableTextDescriptionListGroup';
-import EditableLabelsDescriptionListGroup from '~/components/EditableLabelsDescriptionListGroup';
+import DashboardDescriptionListGroup from '~/shared/components/DashboardDescriptionListGroup';
+import EditableTextDescriptionListGroup from '~/shared/components/EditableTextDescriptionListGroup';
+import EditableLabelsDescriptionListGroup from '~/shared/components/EditableLabelsDescriptionListGroup';
 import { ModelVersion } from '~/app/types';
 import useModelArtifactsByVersionId from '~/app/hooks/useModelArtifactsByVersionId';
 import { ModelRegistryContext } from '~/app/context/ModelRegistryContext';
-import InlineTruncatedClipboardCopy from '~/components/InlineTruncatedClipboardCopy';
-import DashboardHelpTooltip from '~/components/DashboardHelpTooltip';
+import InlineTruncatedClipboardCopy from '~/shared/components/InlineTruncatedClipboardCopy';
+import DashboardHelpTooltip from '~/shared/components/DashboardHelpTooltip';
 import {
   getLabels,
   mergeUpdatedLabels,
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelDetailsView.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelDetailsView.tsx
index f0360589c..0f97fc080 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelDetailsView.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelDetailsView.tsx
@@ -2,11 +2,11 @@ import * as React from 'react';
 import { ClipboardCopy, DescriptionList, Flex, FlexItem, Content } from '@patternfly/react-core';
 import { RegisteredModel } from '~/app/types';
 import { ModelRegistryContext } from '~/app/context/ModelRegistryContext';
-import EditableTextDescriptionListGroup from '~/components/EditableTextDescriptionListGroup';
-import EditableLabelsDescriptionListGroup from '~/components/EditableLabelsDescriptionListGroup';
+import EditableTextDescriptionListGroup from '~/shared/components/EditableTextDescriptionListGroup';
+import EditableLabelsDescriptionListGroup from '~/shared/components/EditableLabelsDescriptionListGroup';
 import { getLabels, mergeUpdatedLabels } from '~/app/pages/modelRegistry/screens/utils';
 import ModelPropertiesDescriptionListGroup from '~/app/pages/modelRegistry/screens/ModelPropertiesDescriptionListGroup';
-import DashboardDescriptionListGroup from '~/components/DashboardDescriptionListGroup';
+import DashboardDescriptionListGroup from '~/shared/components/DashboardDescriptionListGroup';
 import ModelTimestamp from '~/app/pages/modelRegistry/screens/components/ModelTimestamp';
 
 type ModelDetailsViewProps = {
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionListView.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionListView.tsx
index efb41f568..90d3b0bea 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionListView.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionListView.tsx
@@ -18,20 +18,20 @@ import { EllipsisVIcon, FilterIcon } from '@patternfly/react-icons';
 import { useNavigate } from 'react-router';
 import { ModelVersion, RegisteredModel } from '~/app/types';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
-import { SearchType } from '~/app/components/DashboardSearchField';
+import { SearchType } from '~/shared/components/DashboardSearchField';
 import {
   filterModelVersions,
   sortModelVersionsByCreateTime,
 } from '~/app/pages/modelRegistry/screens/utils';
 import EmptyModelRegistryState from '~/app/pages/modelRegistry/screens/components/EmptyModelRegistryState';
-import { ProjectObjectType, typedEmptyImage } from '~/app/components/design/utils';
+import { ProjectObjectType, typedEmptyImage } from '~/shared/components/design/utils';
 import {
   modelVersionArchiveUrl,
   registerVersionForModelUrl,
 } from '~/app/pages/modelRegistry/screens/routeUtils';
 import { asEnumMember } from '~/app/utils';
 import ModelVersionsTable from '~/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTable';
-import SimpleSelect from '~/app/components/SimpleSelect';
+import SimpleSelect from '~/shared/components/SimpleSelect';
 import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 
 type ModelVersionListViewProps = {
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersions.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersions.tsx
index 1e1d48728..d6533550c 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersions.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersions.tsx
@@ -3,7 +3,7 @@ import { useNavigate, useParams } from 'react-router';
 import { Breadcrumb, BreadcrumbItem, Truncate } from '@patternfly/react-core';
 import { Link } from 'react-router-dom';
 import { ModelVersionsTab } from '~/app/pages/modelRegistry/screens/ModelVersions/const';
-import ApplicationsPage from '~/app/components/ApplicationsPage';
+import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import useModelVersionsByRegisteredModel from '~/app/hooks/useModelVersionsByRegisteredModel';
 import useRegisteredModelById from '~/app/hooks/useRegisteredModelById';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTable.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTable.tsx
index 0911e0bdc..ea595e370 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTable.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTable.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { Table } from '~/app/components/table';
+import { Table } from '~/shared/components/table';
 import { ModelVersion } from '~/app/types';
 import { mvColumns } from '~/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableColumns';
-import DashboardEmptyTableView from '~/app/components/DashboardEmptyTableView';
+import DashboardEmptyTableView from '~/shared/components/DashboardEmptyTableView';
 import ModelVersionsTableRow from '~/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow';
 
 type ModelVersionsTableProps = {
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableColumns.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableColumns.ts
index f98ea9129..479317c0c 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableColumns.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableColumns.ts
@@ -1,4 +1,4 @@
-import { SortableData } from '~/app/components/table';
+import { SortableData } from '~/shared/components/table';
 import { ModelVersion } from '~/app/types';
 
 export const mvColumns: SortableData<ModelVersion>[] = [
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ArchiveModelVersionDetails.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ArchiveModelVersionDetails.tsx
index 8a595c47d..586ac414e 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ArchiveModelVersionDetails.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ArchiveModelVersionDetails.tsx
@@ -2,7 +2,7 @@ import React, { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router';
 import { Button, Flex, FlexItem, Label, Content, Tooltip, Truncate } from '@patternfly/react-core';
 
-import ApplicationsPage from '~/app/components/ApplicationsPage';
+import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
 import useRegisteredModelById from '~/app/hooks/useRegisteredModelById';
 import useModelVersionById from '~/app/hooks/useModelVersionById';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionArchiveDetails.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionArchiveDetails.tsx
index fdb1f80f0..b6d2028ef 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionArchiveDetails.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionArchiveDetails.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router';
 import { Button, Flex, FlexItem, Label, Content, Truncate } from '@patternfly/react-core';
-import ApplicationsPage from '~/app/components/ApplicationsPage';
+import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
 import { ModelRegistryContext } from '~/app/context/ModelRegistryContext';
 import useRegisteredModelById from '~/app/hooks/useRegisteredModelById';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchive.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchive.tsx
index 2245187ac..e456773e9 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchive.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchive.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { useParams } from 'react-router';
 import { Breadcrumb, BreadcrumbItem } from '@patternfly/react-core';
 import { Link } from 'react-router-dom';
-import ApplicationsPage from '~/app/components/ApplicationsPage';
+import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
 import useRegisteredModelById from '~/app/hooks/useRegisteredModelById';
 import useModelVersionsByRegisteredModel from '~/app/hooks/useModelVersionsByRegisteredModel';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveListView.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveListView.tsx
index fe53943c7..bca18327a 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveListView.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveListView.tsx
@@ -9,8 +9,8 @@ import {
 } from '@patternfly/react-core';
 import { FilterIcon } from '@patternfly/react-icons';
 import { ModelVersion } from '~/app/types';
-import { SearchType } from '~/app/components/DashboardSearchField';
-import SimpleSelect from '~/app/components/SimpleSelect';
+import { SearchType } from '~/shared/components/DashboardSearchField';
+import SimpleSelect from '~/shared/components/SimpleSelect';
 import { asEnumMember } from '~/app/utils';
 import { filterModelVersions } from '~/app/pages/modelRegistry/screens/utils';
 import EmptyModelRegistryState from '~/app/pages/modelRegistry/screens/components/EmptyModelRegistryState';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveTable.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveTable.tsx
index 57f814b4f..932f50480 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveTable.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveTable.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { Table } from '~/app/components/table';
+import { Table } from '~/shared/components/table';
 import { ModelVersion } from '~/app/types';
-import DashboardEmptyTableView from '~/app/components/DashboardEmptyTableView';
+import DashboardEmptyTableView from '~/shared/components/DashboardEmptyTableView';
 import ModelVersionsTableRow from '~/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow';
 import { mvColumns } from '~/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableColumns';
 
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx
index b9bf97642..0ccedb470 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx
@@ -14,10 +14,10 @@ import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
 import { useParams, useNavigate } from 'react-router';
 import { Link } from 'react-router-dom';
 import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
-import FormSection from '~/app/components/pf-overrides/FormSection';
-import ApplicationsPage from '~/app/components/ApplicationsPage';
+import FormSection from '~/shared/components/pf-overrides/FormSection';
+import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { modelRegistryUrl, registeredModelUrl } from '~/app/pages/modelRegistry/screens/routeUtils';
-import { ValueOf } from '~/typeHelpers';
+import { ValueOf } from '~/shared/typeHelpers';
 import { useRegisterModelData, RegistrationCommonFormData } from './useRegisterModelData';
 import { isRegisterModelSubmitDisabled, registerModel } from './utils';
 import { useRegistrationCommonState } from './useRegistrationCommonState';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterVersion.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterVersion.tsx
index 2b73b2747..6a3524588 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterVersion.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterVersion.tsx
@@ -12,10 +12,10 @@ import {
 import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
 import { useParams, useNavigate } from 'react-router';
 import { Link } from 'react-router-dom';
-import ApplicationsPage from '~/app/components/ApplicationsPage';
+import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { modelRegistryUrl, registeredModelUrl } from '~/app/pages/modelRegistry/screens/routeUtils';
 import useRegisteredModels from '~/app/hooks/useRegisteredModels';
-import { ValueOf } from '~/typeHelpers';
+import { ValueOf } from '~/shared/typeHelpers';
 import { filterLiveModels } from '~/app/pages/modelRegistry/screens/utils';
 import { RegistrationCommonFormData, useRegisterVersionData } from './useRegisterModelData';
 import { isRegisterVersionSubmitDisabled, registerVersion } from './utils';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
index acbb861f3..1016f560e 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
@@ -13,11 +13,11 @@ import {
   TextInputGroupMain,
 } from '@patternfly/react-core';
 import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
-import { UpdateObjectAtPropAndValue } from '~/types';
+import { UpdateObjectAtPropAndValue } from '~/shared/types';
 // import { DataConnection, UpdateObjectAtPropAndValue } from '~/pages/projects/types';
 // import { convertAWSSecretData } from '~/pages/projects/screens/detail/data-connections/utils';
 import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
-import FormSection from '~/app/components/pf-overrides/FormSection';
+import FormSection from '~/shared/components/pf-overrides/FormSection';
 import { ModelVersion } from '~/app/types';
 import { ModelLocationType, RegistrationCommonFormData } from './useRegisterModelData';
 // import { ConnectionModal } from './ConnectionModal';
@@ -35,7 +35,8 @@ const RegistrationCommonFormSections: React.FC<RegistrationCommonFormSectionsPro
   isFirstVersion,
   latestVersion,
 }) => {
-  // const [isAutofillModalOpen, setAutofillModalOpen] = React.useState(false); TODO: Check wether we should use data connections
+  // TODO: [Data connections] Check wether we should use data connections
+  // const [isAutofillModalOpen, setAutofillModalOpen] = React.useState(false);
 
   // const connectionDataMap: Record<string, keyof RegistrationCommonFormData> = {
   //   AWS_S3_ENDPOINT: 'modelLocationEndpoint',
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/usePrefillRegisterVersionFields.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/usePrefillRegisterVersionFields.ts
index 0f35fd72d..be9e3601b 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/usePrefillRegisterVersionFields.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/usePrefillRegisterVersionFields.ts
@@ -5,7 +5,7 @@ import {
   getLastCreatedItem,
   uriToObjectStorageFields,
 } from '~/app/pages/modelRegistry/screens/utils';
-import { UpdateObjectAtPropAndValue } from '~/types';
+import { UpdateObjectAtPropAndValue } from '~/shared/types';
 import useModelArtifactsByVersionId from '~/app/hooks/useModelArtifactsByVersionId';
 import useModelVersionsByRegisteredModel from '~/app/hooks/useModelVersionsByRegisteredModel';
 import { RegisterVersionFormData, ModelLocationType } from './useRegisterModelData';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/useRegisterModelData.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/useRegisterModelData.ts
index b51a773a0..92a77356d 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/useRegisterModelData.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/useRegisterModelData.ts
@@ -1,4 +1,6 @@
-import useGenericObjectState, { GenericObjectState } from '~/utilities/useGenericObjectState';
+import useGenericObjectState, {
+  GenericObjectState,
+} from '~/shared/utilities/useGenericObjectState';
 
 export enum ModelLocationType {
   ObjectStorage = 'Object storage',
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/useRegistrationCommonState.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/useRegistrationCommonState.ts
index a25639cbe..993616b2b 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/useRegistrationCommonState.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/useRegistrationCommonState.ts
@@ -17,7 +17,7 @@ export const useRegistrationCommonState = (): RegistrationCommonState => {
   const [submitError, setSubmitError] = React.useState<Error | undefined>(undefined);
 
   const { apiState } = React.useContext(ModelRegistryContext);
-  const author = 'kubeflow-user'; // TODO: enable this once we have users ---> useAppSelector((state) => state.user || '');
+  const author = 'kubeflow-user'; // TODO: [Auth-enablement] Enable this once we have users ---> useAppSelector((state) => state.user || '');
 
   const handleSubmit = (doSubmit: () => Promise<unknown>) => {
     setIsSubmitting(true);
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelListView.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelListView.tsx
index 847d66ffd..9e4dc2d4c 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelListView.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelListView.tsx
@@ -4,10 +4,10 @@ import { FilterIcon } from '@patternfly/react-icons';
 import { useNavigate } from 'react-router-dom';
 import { RegisteredModel } from '~/app/types';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
-import { SearchType } from '~/app/components/DashboardSearchField';
-import { ProjectObjectType, typedEmptyImage } from '~/app/components/design/utils';
+import { SearchType } from '~/shared/components/DashboardSearchField';
+import { ProjectObjectType, typedEmptyImage } from '~/shared/components/design/utils';
 import { asEnumMember, filterRegisteredModels } from '~/app/utils';
-import SimpleSelect from '~/app/components/SimpleSelect';
+import SimpleSelect from '~/shared/components/SimpleSelect';
 import {
   registeredModelArchiveUrl,
   registerModelUrl,
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTable.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTable.tsx
index 12d377684..6ef939886 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTable.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTable.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { Table } from '~/app/components/table';
+import { Table } from '~/shared/components/table';
 import { RegisteredModel } from '~/app/types';
-import DashboardEmptyTableView from '~/app/components/DashboardEmptyTableView';
+import DashboardEmptyTableView from '~/shared/components/DashboardEmptyTableView';
 import { rmColumns } from './RegisteredModelsTableColumns';
 import RegisteredModelTableRow from './RegisteredModelTableRow';
 
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableColumns.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableColumns.ts
index bd7e4309e..7ca6bce8e 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableColumns.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableColumns.ts
@@ -1,4 +1,4 @@
-import { SortableData } from '~/app/components/table';
+import { SortableData } from '~/shared/components/table';
 import { RegisteredModel } from '~/app/types';
 
 export const rmColumns: SortableData<RegisteredModel>[] = [
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableToolbar.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableToolbar.tsx
index 877d1fee0..08ad711b4 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableToolbar.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableToolbar.tsx
@@ -52,20 +52,17 @@ const RegisteredModelsTableToolbar: React.FC<RegisteredModelsTableToolbarProps>
                 ref={toggleRef}
                 onClick={() => setIsRegisterNewVersionOpen(!isRegisterNewVersionOpen)}
                 isExpanded={isRegisterNewVersionOpen}
-                splitButtonOptions={{
-                  variant: 'action',
-                  items: [
-                    <MenuToggleAction
-                      id="register-model-button"
-                      key="register-model-button"
-                      data-testid="register-model-button"
-                      aria-label="Register model"
-                      onClick={() => navigate(registerModelUrl(preferredModelRegistry?.name))}
-                    >
-                      Register model
-                    </MenuToggleAction>,
-                  ],
-                }}
+                splitButtonItems={[
+                  <MenuToggleAction
+                    id="register-model-button"
+                    key="register-model-button"
+                    data-testid="register-model-button"
+                    aria-label="Register model"
+                    onClick={() => navigate(registerModelUrl(preferredModelRegistry?.name))}
+                  >
+                    Register model
+                  </MenuToggleAction>,
+                ]}
                 aria-label="Register model toggle"
                 data-testid="register-model-split-button"
               />
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelArchiveDetails.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelArchiveDetails.tsx
index 711469e57..521e0a980 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelArchiveDetails.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelArchiveDetails.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router';
 import { Button, Flex, FlexItem, Label, Content, Truncate } from '@patternfly/react-core';
-import ApplicationsPage from '~/app/components/ApplicationsPage';
+import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
 import { ModelRegistryContext } from '~/app/context/ModelRegistryContext';
 import useRegisteredModelById from '~/app/hooks/useRegisteredModelById';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchive.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchive.tsx
index 00aa63aba..17630f394 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchive.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchive.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Breadcrumb, BreadcrumbItem } from '@patternfly/react-core';
 import { Link } from 'react-router-dom';
-import ApplicationsPage from '~/app/components/ApplicationsPage';
+import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
 import { filterArchiveModels } from '~/app/pages/modelRegistry/screens/utils';
 import useRegisteredModels from '~/app/hooks/useRegisteredModels';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveListView.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveListView.tsx
index b84b73a31..50da0b1fd 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveListView.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveListView.tsx
@@ -9,10 +9,10 @@ import {
 } from '@patternfly/react-core';
 import { FilterIcon } from '@patternfly/react-icons';
 import { RegisteredModel } from '~/app/types';
-import { SearchType } from '~/app/components/DashboardSearchField';
+import { SearchType } from '~/shared/components/DashboardSearchField';
 import { filterRegisteredModels } from '~/app/pages/modelRegistry/screens/utils';
 import EmptyModelRegistryState from '~/app/pages/modelRegistry/screens/components/EmptyModelRegistryState';
-import SimpleSelect from '~/app/components/SimpleSelect';
+import SimpleSelect from '~/shared/components/SimpleSelect';
 import { asEnumMember } from '~/app/utils';
 import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 import RegisteredModelsArchiveTable from './RegisteredModelsArchiveTable';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveTable.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveTable.tsx
index 4c6c66ed0..74f4ed4aa 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveTable.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveTable.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { Table } from '~/app/components/table';
+import { Table } from '~/shared/components/table';
 import { RegisteredModel } from '~/app/types';
 import { rmColumns } from '~/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableColumns';
-import DashboardEmptyTableView from '~/app/components/DashboardEmptyTableView';
+import DashboardEmptyTableView from '~/shared/components/DashboardEmptyTableView';
 import RegisteredModelTableRow from '~/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTableRow';
 
 type RegisteredModelsArchiveTableProps = {
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/__tests__/utils.spec.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/__tests__/utils.spec.ts
index d4a102c08..77c5726eb 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/__tests__/utils.spec.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/__tests__/utils.spec.ts
@@ -18,7 +18,7 @@ import {
   mergeUpdatedProperty,
   sortModelVersionsByCreateTime,
 } from '~/app/pages/modelRegistry/screens/utils';
-import { SearchType } from '~/app/components/DashboardSearchField';
+import { SearchType } from '~/shared/components/DashboardSearchField';
 
 describe('getLabels', () => {
   it('should return an empty array when customProperties is empty', () => {
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveModelVersionModal.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveModelVersionModal.tsx
index 4e1f8f59a..f4e018cb6 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveModelVersionModal.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveModelVersionModal.tsx
@@ -8,7 +8,7 @@ import {
   ModalHeader,
   TextInput,
 } from '@patternfly/react-core';
-import DashboardModalFooter from '~/app/components/DashboardModalFooter';
+import DashboardModalFooter from '~/shared/components/DashboardModalFooter';
 import { useNotification } from '~/app/hooks/useNotification';
 
 interface ArchiveModelVersionModalProps {
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveRegisteredModelModal.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveRegisteredModelModal.tsx
index 3729255da..e5de53054 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveRegisteredModelModal.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveRegisteredModelModal.tsx
@@ -8,7 +8,7 @@ import {
   ModalHeader,
   TextInput,
 } from '@patternfly/react-core';
-import DashboardModalFooter from '~/app/components/DashboardModalFooter';
+import DashboardModalFooter from '~/shared/components/DashboardModalFooter';
 import { useNotification } from '~/app/hooks/useNotification';
 
 interface ArchiveRegisteredModelModalProps {
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelLabels.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelLabels.tsx
index e888b6965..10983cc11 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelLabels.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelLabels.tsx
@@ -2,7 +2,7 @@ import { Button, Label, LabelGroup, Popover, SearchInput, Content } from '@patte
 import { Modal, ModalVariant } from '@patternfly/react-core/deprecated';
 import React from 'react';
 import { ModelVersion, RegisteredModel } from '~/app/types';
-import useDebounceCallback from '~/utilities/useDebounceCallback';
+import useDebounceCallback from '~/shared/utilities/useDebounceCallback';
 import { getLabels } from '~/app/pages/modelRegistry/screens/utils';
 
 // Threshold count to decide whether to choose modal or popover
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelTimestamp.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelTimestamp.tsx
index 7fbebbea6..faedff181 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelTimestamp.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelTimestamp.tsx
@@ -1,6 +1,6 @@
 import { Timestamp, TimestampTooltipVariant } from '@patternfly/react-core';
 import React from 'react';
-import { relativeTime } from '~/utilities/time';
+import { relativeTime } from '~/shared/utilities/time';
 
 type ModelTimestampProps = {
   timeSinceEpoch?: string;
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreModelVersionModal.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreModelVersionModal.tsx
index b83105098..e7dc7a341 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreModelVersionModal.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreModelVersionModal.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Form, Modal, ModalHeader, ModalBody, Alert } from '@patternfly/react-core';
-import DashboardModalFooter from '~/app/components/DashboardModalFooter';
+import DashboardModalFooter from '~/shared/components/DashboardModalFooter';
 import { useNotification } from '~/app/hooks/useNotification';
 
 interface RestoreModelVersionModalProps {
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx
index ee5a23f0a..e1348b4ee 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Alert, Form, ModalHeader, Modal, ModalBody } from '@patternfly/react-core';
-import DashboardModalFooter from '~/app/components/DashboardModalFooter';
+import DashboardModalFooter from '~/shared/components/DashboardModalFooter';
 import { useNotification } from '~/app/hooks/useNotification';
 
 interface RestoreRegisteredModelModalProps {
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/utils.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/utils.ts
index d06779891..964cd1ea0 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/utils.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/utils.ts
@@ -1,4 +1,4 @@
-import { SearchType } from '~/app/components/DashboardSearchField';
+import { SearchType } from '~/shared/components/DashboardSearchField';
 import {
   ModelRegistryCustomProperties,
   ModelRegistryMetadataType,
@@ -7,7 +7,7 @@ import {
   ModelVersion,
   RegisteredModel,
 } from '~/app/types';
-import { KeyValuePair } from '~/types';
+import { KeyValuePair } from '~/shared/types';
 
 export type ObjectStorageFields = {
   endpoint: string;
diff --git a/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTable.tsx b/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTable.tsx
index 04aeb6089..e05cacd6a 100644
--- a/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTable.tsx
+++ b/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTable.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { ModelRegistry } from '~/app/types';
-import { Table } from '~/app/components/table';
+import { Table } from '~/shared/components/table';
 import { modelRegistryColumns } from './columns';
 import ModelRegistriesTableRow from './ModelRegistriesTableRow';
 
@@ -9,7 +9,7 @@ type ModelRegistriesTableProps = {
 };
 
 const ModelRegistriesTable: React.FC<ModelRegistriesTableProps> = ({ modelRegistries }) => (
-  // TODO: Add toolbar once we manage permissions
+  // TODO: [Model Registry RBAC] Add toolbar once we manage permissions
   <Table
     data-testid="model-registries-table"
     data={modelRegistries}
diff --git a/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTableRow.tsx b/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTableRow.tsx
index 2d5996128..6289a6c61 100644
--- a/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTableRow.tsx
+++ b/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTableRow.tsx
@@ -17,6 +17,6 @@ const ModelRegistriesTableRow: React.FC<ModelRegistriesTableRowProps> = ({ model
   </>
 );
 
-// TODO: Get rest of columns once we manage permissions
+// TODO: [Model Registry RBAC] Get rest of columns once we manage permissions
 
 export default ModelRegistriesTableRow;
diff --git a/clients/ui/frontend/src/app/pages/settings/ModelRegistrySettings.tsx b/clients/ui/frontend/src/app/pages/settings/ModelRegistrySettings.tsx
index 9b3067c50..120ea680b 100644
--- a/clients/ui/frontend/src/app/pages/settings/ModelRegistrySettings.tsx
+++ b/clients/ui/frontend/src/app/pages/settings/ModelRegistrySettings.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import { EmptyState, EmptyStateBody, EmptyStateVariant } from '@patternfly/react-core';
 import { PlusCircleIcon } from '@patternfly/react-icons';
-import ApplicationsPage from '~/app/components/ApplicationsPage';
+import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import useModelRegistries from '~/app/hooks/useModelRegistries';
-import TitleWithIcon from '~/app/components/design/TitleWithIcon';
-import { ProjectObjectType } from '~/app/components/design/utils';
+import TitleWithIcon from '~/shared/components/design/TitleWithIcon';
+import { ProjectObjectType } from '~/shared/components/design/utils';
 import ModelRegistriesTable from './ModelRegistriesTable';
 
 const ModelRegistrySettings: React.FC = () => {
diff --git a/clients/ui/frontend/src/app/pages/settings/columns.ts b/clients/ui/frontend/src/app/pages/settings/columns.ts
index eb50403d8..36ae2ea29 100644
--- a/clients/ui/frontend/src/app/pages/settings/columns.ts
+++ b/clients/ui/frontend/src/app/pages/settings/columns.ts
@@ -1,4 +1,4 @@
-import { SortableData } from '~/app/components/table';
+import { SortableData } from '~/shared/components/table';
 import { ModelRegistry } from '~/app/types';
 
 export const modelRegistryColumns: SortableData<ModelRegistry>[] = [
@@ -8,7 +8,7 @@ export const modelRegistryColumns: SortableData<ModelRegistry>[] = [
     sortable: (a, b) => a.name.localeCompare(b.name),
     width: 30,
   },
-  // TODO: Add once we manage permissions
+  // TODO: [Model Registry RBAC] Add once we manage permissions
   // {
   //   field: 'status',
   //   label: 'Status',
diff --git a/clients/ui/frontend/src/app/types.ts b/clients/ui/frontend/src/app/types.ts
index 9dd9cb4c8..a2c1dafb0 100644
--- a/clients/ui/frontend/src/app/types.ts
+++ b/clients/ui/frontend/src/app/types.ts
@@ -1,5 +1,5 @@
 import { AlertVariant } from '@patternfly/react-core';
-import { APIOptions } from '~/app/api/types';
+import { APIOptions } from '~/shared/api/types';
 
 export enum ModelState {
   LIVE = 'LIVE',
diff --git a/clients/ui/frontend/src/app/useUser.tsx b/clients/ui/frontend/src/app/useUser.tsx
deleted file mode 100644
index e69de29bb..000000000
diff --git a/clients/ui/frontend/src/app/utils.ts b/clients/ui/frontend/src/app/utils.ts
index 3753a9ec2..cc2e412e3 100644
--- a/clients/ui/frontend/src/app/utils.ts
+++ b/clients/ui/frontend/src/app/utils.ts
@@ -1,4 +1,4 @@
-import { SearchType } from '~/app/components/DashboardSearchField';
+import { SearchType } from '~/shared/components/DashboardSearchField';
 import { RegisteredModel } from '~/app/types';
 
 export const asEnumMember = <T extends object>(
diff --git a/clients/ui/frontend/src/index.tsx b/clients/ui/frontend/src/index.tsx
index 060875bd0..386ffa31d 100644
--- a/clients/ui/frontend/src/index.tsx
+++ b/clients/ui/frontend/src/index.tsx
@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom/client';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { ThemeProvider, createTheme } from '@mui/material/styles';
 import App from './app/App';
-import { BrowserStorageContextProvider } from './components/browserStorage/BrowserStorageContext';
+import { BrowserStorageContextProvider } from './shared/components/browserStorage/BrowserStorageContext';
 import { NotificationContextProvider } from './app/context/NotificationContext';
 
 const theme = createTheme({ cssVariables: true });
diff --git a/clients/ui/frontend/src/app/api/__tests__/errorUtils.spec.ts b/clients/ui/frontend/src/shared/api/__tests__/errorUtils.spec.ts
similarity index 86%
rename from clients/ui/frontend/src/app/api/__tests__/errorUtils.spec.ts
rename to clients/ui/frontend/src/shared/api/__tests__/errorUtils.spec.ts
index 921a3d7b9..54eb9df31 100644
--- a/clients/ui/frontend/src/app/api/__tests__/errorUtils.spec.ts
+++ b/clients/ui/frontend/src/shared/api/__tests__/errorUtils.spec.ts
@@ -1,6 +1,6 @@
-import { NotReadyError } from '~/utilities/useFetchState';
-import { APIError } from '~/app/api/types';
-import { handleRestFailures } from '~/app/api/errorUtils';
+import { NotReadyError } from '~/shared/utilities/useFetchState';
+import { APIError } from '~/shared/api/types';
+import { handleRestFailures } from '~/shared/api/errorUtils';
 import { mockRegisteredModel } from '~/__mocks__/mockRegisteredModel';
 import { mockBFFResponse } from '~/__mocks__/utils';
 
diff --git a/clients/ui/frontend/src/app/api/__tests__/service.spec.ts b/clients/ui/frontend/src/shared/api/__tests__/service.spec.ts
similarity index 98%
rename from clients/ui/frontend/src/app/api/__tests__/service.spec.ts
rename to clients/ui/frontend/src/shared/api/__tests__/service.spec.ts
index 85be9763d..07e1fbc88 100644
--- a/clients/ui/frontend/src/app/api/__tests__/service.spec.ts
+++ b/clients/ui/frontend/src/shared/api/__tests__/service.spec.ts
@@ -1,5 +1,5 @@
-import { isModelRegistryResponse, restCREATE, restGET, restPATCH } from '~/app/api/apiUtils';
-import { handleRestFailures } from '~/app/api/errorUtils';
+import { isModelRegistryResponse, restCREATE, restGET, restPATCH } from '~/shared/api/apiUtils';
+import { handleRestFailures } from '~/shared/api/errorUtils';
 import { ModelState, ModelArtifactState } from '~/app/types';
 import {
   createModelArtifact,
@@ -18,13 +18,13 @@ import {
   getModelArtifactsByModelVersion,
   createModelVersionForRegisteredModel,
   createModelArtifactForModelVersion,
-} from '~/app/api/service';
+} from '~/shared/api/service';
 import { BFF_API_VERSION } from '~/app/const';
 
 const mockRestPromise = Promise.resolve({ data: {} });
 const mockRestResponse = {};
 
-jest.mock('~/app/api/apiUtils', () => ({
+jest.mock('~/shared/api/apiUtils', () => ({
   restCREATE: jest.fn(() => mockRestPromise),
   restGET: jest.fn(() => mockRestPromise),
   restPATCH: jest.fn(() => mockRestPromise),
@@ -32,7 +32,7 @@ jest.mock('~/app/api/apiUtils', () => ({
   isModelRegistryResponse: jest.fn(() => true),
 }));
 
-jest.mock('~/app/api/errorUtils', () => ({
+jest.mock('~/shared/api/errorUtils', () => ({
   handleRestFailures: jest.fn(() => mockRestPromise),
 }));
 
diff --git a/clients/ui/frontend/src/app/api/apiUtils.ts b/clients/ui/frontend/src/shared/api/apiUtils.ts
similarity index 87%
rename from clients/ui/frontend/src/app/api/apiUtils.ts
rename to clients/ui/frontend/src/shared/api/apiUtils.ts
index d14733c73..fc0aa71cb 100644
--- a/clients/ui/frontend/src/app/api/apiUtils.ts
+++ b/clients/ui/frontend/src/shared/api/apiUtils.ts
@@ -1,6 +1,7 @@
-import { APIOptions } from '~/app/api/types';
-import { EitherOrNone } from '~/typeHelpers';
+import { APIOptions } from '~/shared/api/types';
+import { EitherOrNone } from '~/shared/typeHelpers';
 import { ModelRegistryBody } from '~/app/types';
+import { USER_ACCESS_TOKEN } from '~/shared/utilities/const';
 
 export const mergeRequestInit = (
   opts: APIOptions = {},
@@ -60,6 +61,19 @@ const callRestJSON = <T>(
     requestData = JSON.stringify(data);
   }
 
+  // Get from the browser storage the value from the key USER_ACCESS_TOKEN
+  // and set it as the value for the header key 'x-forwarded-access-token'
+  // This is a security measure to ensure that the user is authenticated
+  // before making any API calls. Local Storage is not secure, but it is
+  // enough for this PoC.
+  const token = localStorage.getItem(USER_ACCESS_TOKEN);
+  if (token) {
+    otherOptions.headers = {
+      ...otherOptions.headers,
+      [USER_ACCESS_TOKEN]: token,
+    };
+  }
+
   return fetch(`${host}${path}${searchParams ? `?${searchParams}` : ''}`, {
     ...otherOptions,
     ...(contentType && { headers: { 'Content-Type': contentType } }),
@@ -167,7 +181,6 @@ export const isModelRegistryResponse = <T>(response: unknown): response is Model
   if (typeof response === 'object' && response !== null) {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const modelRegistryBody = response as { data?: T };
-    // TODO: Check if data is conforming any type so we have a proper check
     return modelRegistryBody.data !== undefined;
   }
   return false;
diff --git a/clients/ui/frontend/src/app/api/errorUtils.ts b/clients/ui/frontend/src/shared/api/errorUtils.ts
similarity index 81%
rename from clients/ui/frontend/src/app/api/errorUtils.ts
rename to clients/ui/frontend/src/shared/api/errorUtils.ts
index 35fbdc2d9..47046554c 100644
--- a/clients/ui/frontend/src/app/api/errorUtils.ts
+++ b/clients/ui/frontend/src/shared/api/errorUtils.ts
@@ -1,5 +1,5 @@
-import { APIError } from '~/app/api/types';
-import { isCommonStateError } from '~/utilities/useFetchState';
+import { APIError } from '~/shared/api/types';
+import { isCommonStateError } from '~/shared/utilities/useFetchState';
 
 const isError = (e: unknown): e is APIError => typeof e === 'object' && e !== null && 'error' in e;
 
@@ -17,7 +17,6 @@ export const handleRestFailures = <T>(promise: Promise<T>): Promise<T> =>
       }
       if (isCommonStateError(e)) {
         // Common state errors are handled by useFetchState at storage level, let them deal with it
-        // TODO: check whether we need this or not
         throw e;
       }
       // eslint-disable-next-line no-console
diff --git a/clients/ui/frontend/src/app/api/k8s.ts b/clients/ui/frontend/src/shared/api/k8s.ts
similarity index 73%
rename from clients/ui/frontend/src/app/api/k8s.ts
rename to clients/ui/frontend/src/shared/api/k8s.ts
index 0b97eb891..61b83d767 100644
--- a/clients/ui/frontend/src/app/api/k8s.ts
+++ b/clients/ui/frontend/src/shared/api/k8s.ts
@@ -1,6 +1,6 @@
-import { APIOptions } from '~/app/api/types';
-import { handleRestFailures } from '~/app/api/errorUtils';
-import { isModelRegistryResponse, restGET } from '~/app/api/apiUtils';
+import { APIOptions } from '~/shared/api/types';
+import { handleRestFailures } from '~/shared/api/errorUtils';
+import { isModelRegistryResponse, restGET } from '~/shared/api/apiUtils';
 import { ModelRegistry } from '~/app/types';
 import { BFF_API_VERSION } from '~/app/const';
 
diff --git a/clients/ui/frontend/src/app/api/service.ts b/clients/ui/frontend/src/shared/api/service.ts
similarity index 98%
rename from clients/ui/frontend/src/app/api/service.ts
rename to clients/ui/frontend/src/shared/api/service.ts
index 3579877dc..b62c77216 100644
--- a/clients/ui/frontend/src/app/api/service.ts
+++ b/clients/ui/frontend/src/shared/api/service.ts
@@ -15,9 +15,9 @@ import {
   restCREATE,
   restGET,
   restPATCH,
-} from '~/app/api/apiUtils';
-import { APIOptions } from '~/app/api/types';
-import { handleRestFailures } from '~/app/api/errorUtils';
+} from '~/shared/api/apiUtils';
+import { APIOptions } from '~/shared/api/types';
+import { handleRestFailures } from '~/shared/api/errorUtils';
 
 export const createRegisteredModel =
   (hostPath: string) =>
diff --git a/clients/ui/frontend/src/app/api/types.ts b/clients/ui/frontend/src/shared/api/types.ts
similarity index 100%
rename from clients/ui/frontend/src/app/api/types.ts
rename to clients/ui/frontend/src/shared/api/types.ts
diff --git a/clients/ui/frontend/src/app/api/useAPIState.ts b/clients/ui/frontend/src/shared/api/useAPIState.ts
similarity index 94%
rename from clients/ui/frontend/src/app/api/useAPIState.ts
rename to clients/ui/frontend/src/shared/api/useAPIState.ts
index 4783e8cbe..e6c7ec879 100644
--- a/clients/ui/frontend/src/app/api/useAPIState.ts
+++ b/clients/ui/frontend/src/shared/api/useAPIState.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { APIState } from '~/app/api/types';
+import { APIState } from '~/shared/api/types';
 
 const useAPIState = <T>(
   hostPath: string | null,
diff --git a/clients/ui/frontend/src/app/components/ApplicationsPage.tsx b/clients/ui/frontend/src/shared/components/ApplicationsPage.tsx
similarity index 100%
rename from clients/ui/frontend/src/app/components/ApplicationsPage.tsx
rename to clients/ui/frontend/src/shared/components/ApplicationsPage.tsx
diff --git a/clients/ui/frontend/src/components/DashboardDescriptionListGroup.scss b/clients/ui/frontend/src/shared/components/DashboardDescriptionListGroup.scss
similarity index 100%
rename from clients/ui/frontend/src/components/DashboardDescriptionListGroup.scss
rename to clients/ui/frontend/src/shared/components/DashboardDescriptionListGroup.scss
diff --git a/clients/ui/frontend/src/components/DashboardDescriptionListGroup.tsx b/clients/ui/frontend/src/shared/components/DashboardDescriptionListGroup.tsx
similarity index 98%
rename from clients/ui/frontend/src/components/DashboardDescriptionListGroup.tsx
rename to clients/ui/frontend/src/shared/components/DashboardDescriptionListGroup.tsx
index 4d1409434..7a65b61cb 100644
--- a/clients/ui/frontend/src/components/DashboardDescriptionListGroup.tsx
+++ b/clients/ui/frontend/src/shared/components/DashboardDescriptionListGroup.tsx
@@ -14,7 +14,7 @@ import {
 import text from '@patternfly/react-styles/css/utilities/Text/text';
 import { CheckIcon, PencilAltIcon, TimesIcon } from '@patternfly/react-icons';
 
-import '~/components/DashboardDescriptionListGroup.scss';
+import '~/shared/components/DashboardDescriptionListGroup.scss';
 
 type EditableProps = {
   isEditing: boolean;
diff --git a/clients/ui/frontend/src/app/components/DashboardEmptyTableView.tsx b/clients/ui/frontend/src/shared/components/DashboardEmptyTableView.tsx
similarity index 100%
rename from clients/ui/frontend/src/app/components/DashboardEmptyTableView.tsx
rename to clients/ui/frontend/src/shared/components/DashboardEmptyTableView.tsx
diff --git a/clients/ui/frontend/src/components/DashboardHelpTooltip.tsx b/clients/ui/frontend/src/shared/components/DashboardHelpTooltip.tsx
similarity index 100%
rename from clients/ui/frontend/src/components/DashboardHelpTooltip.tsx
rename to clients/ui/frontend/src/shared/components/DashboardHelpTooltip.tsx
diff --git a/clients/ui/frontend/src/app/components/DashboardModalFooter.tsx b/clients/ui/frontend/src/shared/components/DashboardModalFooter.tsx
similarity index 100%
rename from clients/ui/frontend/src/app/components/DashboardModalFooter.tsx
rename to clients/ui/frontend/src/shared/components/DashboardModalFooter.tsx
diff --git a/clients/ui/frontend/src/app/components/DashboardSearchField.tsx b/clients/ui/frontend/src/shared/components/DashboardSearchField.tsx
similarity index 97%
rename from clients/ui/frontend/src/app/components/DashboardSearchField.tsx
rename to clients/ui/frontend/src/shared/components/DashboardSearchField.tsx
index d084c2d5f..c43a2ba82 100644
--- a/clients/ui/frontend/src/app/components/DashboardSearchField.tsx
+++ b/clients/ui/frontend/src/shared/components/DashboardSearchField.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { InputGroup, InputGroupItem, TextInput } from '@patternfly/react-core';
-import SimpleSelect from '~/app/components/SimpleSelect';
+import SimpleSelect from '~/shared/components/SimpleSelect';
 import { asEnumMember } from '~/app/utils';
 import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 
diff --git a/clients/ui/frontend/src/components/EditableLabelsDescriptionListGroup.tsx b/clients/ui/frontend/src/shared/components/EditableLabelsDescriptionListGroup.tsx
similarity index 99%
rename from clients/ui/frontend/src/components/EditableLabelsDescriptionListGroup.tsx
rename to clients/ui/frontend/src/shared/components/EditableLabelsDescriptionListGroup.tsx
index 095bfdd72..392987637 100644
--- a/clients/ui/frontend/src/components/EditableLabelsDescriptionListGroup.tsx
+++ b/clients/ui/frontend/src/shared/components/EditableLabelsDescriptionListGroup.tsx
@@ -14,7 +14,7 @@ import { Modal } from '@patternfly/react-core/deprecated';
 import { ExclamationCircleIcon } from '@patternfly/react-icons';
 import DashboardDescriptionListGroup, {
   DashboardDescriptionListGroupProps,
-} from '~/components/DashboardDescriptionListGroup';
+} from '~/shared/components/DashboardDescriptionListGroup';
 
 type EditableTextDescriptionListGroupProps = Partial<
   Pick<DashboardDescriptionListGroupProps, 'title' | 'contentWhenEmpty'>
diff --git a/clients/ui/frontend/src/components/EditableTextDescriptionListGroup.tsx b/clients/ui/frontend/src/shared/components/EditableTextDescriptionListGroup.tsx
similarity index 97%
rename from clients/ui/frontend/src/components/EditableTextDescriptionListGroup.tsx
rename to clients/ui/frontend/src/shared/components/EditableTextDescriptionListGroup.tsx
index 17ed82a7d..832510205 100644
--- a/clients/ui/frontend/src/components/EditableTextDescriptionListGroup.tsx
+++ b/clients/ui/frontend/src/shared/components/EditableTextDescriptionListGroup.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { ExpandableSection, TextArea } from '@patternfly/react-core';
 import DashboardDescriptionListGroup, {
   DashboardDescriptionListGroupProps,
-} from '~/components/DashboardDescriptionListGroup';
+} from '~/shared/components/DashboardDescriptionListGroup';
 import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 
 type EditableTextDescriptionListGroupProps = Pick<
diff --git a/clients/ui/frontend/src/app/components/EmptyStateErrorMessage.tsx b/clients/ui/frontend/src/shared/components/EmptyStateErrorMessage.tsx
similarity index 100%
rename from clients/ui/frontend/src/app/components/EmptyStateErrorMessage.tsx
rename to clients/ui/frontend/src/shared/components/EmptyStateErrorMessage.tsx
diff --git a/clients/ui/frontend/src/components/InlineTruncatedClipboardCopy.scss b/clients/ui/frontend/src/shared/components/InlineTruncatedClipboardCopy.scss
similarity index 100%
rename from clients/ui/frontend/src/components/InlineTruncatedClipboardCopy.scss
rename to clients/ui/frontend/src/shared/components/InlineTruncatedClipboardCopy.scss
diff --git a/clients/ui/frontend/src/components/InlineTruncatedClipboardCopy.tsx b/clients/ui/frontend/src/shared/components/InlineTruncatedClipboardCopy.tsx
similarity index 100%
rename from clients/ui/frontend/src/components/InlineTruncatedClipboardCopy.tsx
rename to clients/ui/frontend/src/shared/components/InlineTruncatedClipboardCopy.tsx
diff --git a/clients/ui/frontend/src/app/components/MarkdownView.scss b/clients/ui/frontend/src/shared/components/MarkdownView.scss
similarity index 100%
rename from clients/ui/frontend/src/app/components/MarkdownView.scss
rename to clients/ui/frontend/src/shared/components/MarkdownView.scss
diff --git a/clients/ui/frontend/src/app/components/MarkdownView.tsx b/clients/ui/frontend/src/shared/components/MarkdownView.tsx
similarity index 92%
rename from clients/ui/frontend/src/app/components/MarkdownView.tsx
rename to clients/ui/frontend/src/shared/components/MarkdownView.tsx
index 4ece1204a..89a2eb77e 100644
--- a/clients/ui/frontend/src/app/components/MarkdownView.tsx
+++ b/clients/ui/frontend/src/shared/components/MarkdownView.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
-import { markdownConverter } from '~/utilities/markdown';
+import { markdownConverter } from '~/shared/utilities/markdown';
 
 import './MarkdownView.scss';
 
diff --git a/clients/ui/frontend/src/app/components/SimpleSelect.scss b/clients/ui/frontend/src/shared/components/SimpleSelect.scss
similarity index 100%
rename from clients/ui/frontend/src/app/components/SimpleSelect.scss
rename to clients/ui/frontend/src/shared/components/SimpleSelect.scss
diff --git a/clients/ui/frontend/src/app/components/SimpleSelect.tsx b/clients/ui/frontend/src/shared/components/SimpleSelect.tsx
similarity index 100%
rename from clients/ui/frontend/src/app/components/SimpleSelect.tsx
rename to clients/ui/frontend/src/shared/components/SimpleSelect.tsx
diff --git a/clients/ui/frontend/src/components/ToastNotification.tsx b/clients/ui/frontend/src/shared/components/ToastNotification.tsx
similarity index 100%
rename from clients/ui/frontend/src/components/ToastNotification.tsx
rename to clients/ui/frontend/src/shared/components/ToastNotification.tsx
diff --git a/clients/ui/frontend/src/components/ToastNotifications.tsx b/clients/ui/frontend/src/shared/components/ToastNotifications.tsx
similarity index 100%
rename from clients/ui/frontend/src/components/ToastNotifications.tsx
rename to clients/ui/frontend/src/shared/components/ToastNotifications.tsx
diff --git a/clients/ui/frontend/src/components/browserStorage/BrowserStorageContext.tsx b/clients/ui/frontend/src/shared/components/browserStorage/BrowserStorageContext.tsx
similarity index 96%
rename from clients/ui/frontend/src/components/browserStorage/BrowserStorageContext.tsx
rename to clients/ui/frontend/src/shared/components/browserStorage/BrowserStorageContext.tsx
index 07b8bc84e..9b6107c9b 100644
--- a/clients/ui/frontend/src/components/browserStorage/BrowserStorageContext.tsx
+++ b/clients/ui/frontend/src/shared/components/browserStorage/BrowserStorageContext.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { useDeepCompareMemoize } from '~/utilities/useDeepCompareMemoize';
-import { useEventListener } from '~/utilities/useEventListener';
+import { useDeepCompareMemoize } from '~/shared/utilities/useDeepCompareMemoize';
+import { useEventListener } from '~/shared/utilities/useEventListener';
 
 type ValueMap = { [storageKey: string]: unknown };
 export type BrowserStorageContextType = {
diff --git a/clients/ui/frontend/src/components/browserStorage/index.ts b/clients/ui/frontend/src/shared/components/browserStorage/index.ts
similarity index 100%
rename from clients/ui/frontend/src/components/browserStorage/index.ts
rename to clients/ui/frontend/src/shared/components/browserStorage/index.ts
diff --git a/clients/ui/frontend/src/app/components/design/CollapsibleSection.tsx b/clients/ui/frontend/src/shared/components/design/CollapsibleSection.tsx
similarity index 100%
rename from clients/ui/frontend/src/app/components/design/CollapsibleSection.tsx
rename to clients/ui/frontend/src/shared/components/design/CollapsibleSection.tsx
diff --git a/clients/ui/frontend/src/app/components/design/DividedGallery.scss b/clients/ui/frontend/src/shared/components/design/DividedGallery.scss
similarity index 100%
rename from clients/ui/frontend/src/app/components/design/DividedGallery.scss
rename to clients/ui/frontend/src/shared/components/design/DividedGallery.scss
diff --git a/clients/ui/frontend/src/app/components/design/DividedGallery.tsx b/clients/ui/frontend/src/shared/components/design/DividedGallery.tsx
similarity index 100%
rename from clients/ui/frontend/src/app/components/design/DividedGallery.tsx
rename to clients/ui/frontend/src/shared/components/design/DividedGallery.tsx
diff --git a/clients/ui/frontend/src/app/components/design/DividedGalleryItem.tsx b/clients/ui/frontend/src/shared/components/design/DividedGalleryItem.tsx
similarity index 100%
rename from clients/ui/frontend/src/app/components/design/DividedGalleryItem.tsx
rename to clients/ui/frontend/src/shared/components/design/DividedGalleryItem.tsx
diff --git a/clients/ui/frontend/src/app/components/design/HeaderIcon.tsx b/clients/ui/frontend/src/shared/components/design/HeaderIcon.tsx
similarity index 95%
rename from clients/ui/frontend/src/app/components/design/HeaderIcon.tsx
rename to clients/ui/frontend/src/shared/components/design/HeaderIcon.tsx
index e0e8ebf00..ce72a7502 100644
--- a/clients/ui/frontend/src/app/components/design/HeaderIcon.tsx
+++ b/clients/ui/frontend/src/shared/components/design/HeaderIcon.tsx
@@ -5,7 +5,7 @@ import {
   typedObjectImage,
   ProjectObjectType,
   SectionType,
-} from '~/app/components/design/utils';
+} from '~/shared/components/design/utils';
 
 interface HeaderIconProps {
   size?: number;
diff --git a/clients/ui/frontend/src/app/components/design/InfoGalleryItem.tsx b/clients/ui/frontend/src/shared/components/design/InfoGalleryItem.tsx
similarity index 92%
rename from clients/ui/frontend/src/app/components/design/InfoGalleryItem.tsx
rename to clients/ui/frontend/src/shared/components/design/InfoGalleryItem.tsx
index eaf8d9f96..e71fc2cb5 100644
--- a/clients/ui/frontend/src/app/components/design/InfoGalleryItem.tsx
+++ b/clients/ui/frontend/src/shared/components/design/InfoGalleryItem.tsx
@@ -8,8 +8,8 @@ import {
   Stack,
   StackItem,
 } from '@patternfly/react-core';
-import { SectionType, sectionTypeBackgroundColor } from '~/app/components/design/utils';
-import DividedGalleryItem from '~/app/components/design/DividedGalleryItem';
+import { SectionType, sectionTypeBackgroundColor } from '~/shared/components/design/utils';
+import DividedGalleryItem from '~/shared/components/design/DividedGalleryItem';
 
 const HEADER_ICON_SIZE = 40;
 const HEADER_ICON_PADDING = 2;
diff --git a/clients/ui/frontend/src/app/components/design/ScrolledGallery.tsx b/clients/ui/frontend/src/shared/components/design/ScrolledGallery.tsx
similarity index 100%
rename from clients/ui/frontend/src/app/components/design/ScrolledGallery.tsx
rename to clients/ui/frontend/src/shared/components/design/ScrolledGallery.tsx
diff --git a/clients/ui/frontend/src/app/components/design/TitleWithIcon.tsx b/clients/ui/frontend/src/shared/components/design/TitleWithIcon.tsx
similarity index 95%
rename from clients/ui/frontend/src/app/components/design/TitleWithIcon.tsx
rename to clients/ui/frontend/src/shared/components/design/TitleWithIcon.tsx
index 02893ae03..c40bd8089 100644
--- a/clients/ui/frontend/src/app/components/design/TitleWithIcon.tsx
+++ b/clients/ui/frontend/src/shared/components/design/TitleWithIcon.tsx
@@ -4,7 +4,7 @@ import {
   ProjectObjectType,
   typedBackgroundColor,
   typedObjectImage,
-} from '~/app/components/design/utils';
+} from '~/shared/components/design/utils';
 
 interface TitleWithIconProps {
   title: React.ReactNode;
diff --git a/clients/ui/frontend/src/app/components/design/TypeBorderCard.scss b/clients/ui/frontend/src/shared/components/design/TypeBorderCard.scss
similarity index 100%
rename from clients/ui/frontend/src/app/components/design/TypeBorderCard.scss
rename to clients/ui/frontend/src/shared/components/design/TypeBorderCard.scss
diff --git a/clients/ui/frontend/src/app/components/design/TypeBorderedCard.tsx b/clients/ui/frontend/src/shared/components/design/TypeBorderedCard.tsx
similarity index 90%
rename from clients/ui/frontend/src/app/components/design/TypeBorderedCard.tsx
rename to clients/ui/frontend/src/shared/components/design/TypeBorderedCard.tsx
index a0e68e2ed..11fb115ca 100644
--- a/clients/ui/frontend/src/app/components/design/TypeBorderedCard.tsx
+++ b/clients/ui/frontend/src/shared/components/design/TypeBorderedCard.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import { Card, CardProps } from '@patternfly/react-core';
-import { ProjectObjectType, SectionType } from '~/app/components/design/utils';
+import { ProjectObjectType, SectionType } from '~/shared/components/design/utils';
 
 import './TypeBorderCard.scss';
 
diff --git a/clients/ui/frontend/src/app/components/design/utils.ts b/clients/ui/frontend/src/shared/components/design/utils.ts
similarity index 100%
rename from clients/ui/frontend/src/app/components/design/utils.ts
rename to clients/ui/frontend/src/shared/components/design/utils.ts
diff --git a/clients/ui/frontend/src/app/components/design/vars.scss b/clients/ui/frontend/src/shared/components/design/vars.scss
similarity index 100%
rename from clients/ui/frontend/src/app/components/design/vars.scss
rename to clients/ui/frontend/src/shared/components/design/vars.scss
diff --git a/clients/ui/frontend/src/app/components/pf-overrides/FormSection.scss b/clients/ui/frontend/src/shared/components/pf-overrides/FormSection.scss
similarity index 100%
rename from clients/ui/frontend/src/app/components/pf-overrides/FormSection.scss
rename to clients/ui/frontend/src/shared/components/pf-overrides/FormSection.scss
diff --git a/clients/ui/frontend/src/app/components/pf-overrides/FormSection.tsx b/clients/ui/frontend/src/shared/components/pf-overrides/FormSection.tsx
similarity index 100%
rename from clients/ui/frontend/src/app/components/pf-overrides/FormSection.tsx
rename to clients/ui/frontend/src/shared/components/pf-overrides/FormSection.tsx
diff --git a/clients/ui/frontend/src/app/components/table/CheckboxTd.tsx b/clients/ui/frontend/src/shared/components/table/CheckboxTd.tsx
similarity index 100%
rename from clients/ui/frontend/src/app/components/table/CheckboxTd.tsx
rename to clients/ui/frontend/src/shared/components/table/CheckboxTd.tsx
diff --git a/clients/ui/frontend/src/app/components/table/Table.tsx b/clients/ui/frontend/src/shared/components/table/Table.tsx
similarity index 97%
rename from clients/ui/frontend/src/app/components/table/Table.tsx
rename to clients/ui/frontend/src/shared/components/table/Table.tsx
index f702ff39b..c3f233356 100644
--- a/clients/ui/frontend/src/app/components/table/Table.tsx
+++ b/clients/ui/frontend/src/shared/components/table/Table.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { TbodyProps } from '@patternfly/react-table';
-import { EitherNotBoth } from '~/typeHelpers';
+import { EitherNotBoth } from '~/shared/typeHelpers';
 import TableBase, { MIN_PAGE_SIZE } from './TableBase';
 import useTableColumnSort from './useTableColumnSort';
 
diff --git a/clients/ui/frontend/src/app/components/table/TableBase.tsx b/clients/ui/frontend/src/shared/components/table/TableBase.tsx
similarity index 99%
rename from clients/ui/frontend/src/app/components/table/TableBase.tsx
rename to clients/ui/frontend/src/shared/components/table/TableBase.tsx
index 30f845fca..bf2f730a7 100644
--- a/clients/ui/frontend/src/app/components/table/TableBase.tsx
+++ b/clients/ui/frontend/src/shared/components/table/TableBase.tsx
@@ -21,7 +21,7 @@ import {
   TbodyProps,
   InnerScrollContainer,
 } from '@patternfly/react-table';
-import { EitherNotBoth } from '~/typeHelpers';
+import { EitherNotBoth } from '~/shared/typeHelpers';
 import { GetColumnSort, SortableData } from './types';
 import { CHECKBOX_FIELD_ID, EXPAND_FIELD_ID, KEBAB_FIELD_ID } from './const';
 
diff --git a/clients/ui/frontend/src/app/components/table/TableRowTitleDescription.tsx b/clients/ui/frontend/src/shared/components/table/TableRowTitleDescription.tsx
similarity index 95%
rename from clients/ui/frontend/src/app/components/table/TableRowTitleDescription.tsx
rename to clients/ui/frontend/src/shared/components/table/TableRowTitleDescription.tsx
index be2d02e9b..2d4cf0aee 100644
--- a/clients/ui/frontend/src/app/components/table/TableRowTitleDescription.tsx
+++ b/clients/ui/frontend/src/shared/components/table/TableRowTitleDescription.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Content } from '@patternfly/react-core';
-import MarkdownView from '~/app/components/MarkdownView';
+import MarkdownView from '~/shared/components/MarkdownView';
 
 type TableRowTitleDescriptionProps = {
   title: React.ReactNode;
diff --git a/clients/ui/frontend/src/app/components/table/__tests__/useCheckboxTable.spec.ts b/clients/ui/frontend/src/shared/components/table/__tests__/useCheckboxTable.spec.ts
similarity index 97%
rename from clients/ui/frontend/src/app/components/table/__tests__/useCheckboxTable.spec.ts
rename to clients/ui/frontend/src/shared/components/table/__tests__/useCheckboxTable.spec.ts
index 8744706eb..e503d6f2c 100644
--- a/clients/ui/frontend/src/app/components/table/__tests__/useCheckboxTable.spec.ts
+++ b/clients/ui/frontend/src/shared/components/table/__tests__/useCheckboxTable.spec.ts
@@ -1,6 +1,6 @@
 import { act } from 'react';
 import { testHook } from '~/__tests__/unit/testUtils/hooks';
-import { useCheckboxTable } from '~/app/components/table';
+import { useCheckboxTable } from '~/shared/components/table';
 
 describe('useCheckboxTable', () => {
   it('should select/unselect all', () => {
diff --git a/clients/ui/frontend/src/app/components/table/const.ts b/clients/ui/frontend/src/shared/components/table/const.ts
similarity index 100%
rename from clients/ui/frontend/src/app/components/table/const.ts
rename to clients/ui/frontend/src/shared/components/table/const.ts
diff --git a/clients/ui/frontend/src/app/components/table/index.ts b/clients/ui/frontend/src/shared/components/table/index.ts
similarity index 100%
rename from clients/ui/frontend/src/app/components/table/index.ts
rename to clients/ui/frontend/src/shared/components/table/index.ts
diff --git a/clients/ui/frontend/src/app/components/table/types.ts b/clients/ui/frontend/src/shared/components/table/types.ts
similarity index 100%
rename from clients/ui/frontend/src/app/components/table/types.ts
rename to clients/ui/frontend/src/shared/components/table/types.ts
diff --git a/clients/ui/frontend/src/app/components/table/useCheckboxTable.ts b/clients/ui/frontend/src/shared/components/table/useCheckboxTable.ts
similarity index 91%
rename from clients/ui/frontend/src/app/components/table/useCheckboxTable.ts
rename to clients/ui/frontend/src/shared/components/table/useCheckboxTable.ts
index f6680debf..d0538aa4b 100644
--- a/clients/ui/frontend/src/app/components/table/useCheckboxTable.ts
+++ b/clients/ui/frontend/src/shared/components/table/useCheckboxTable.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useCheckboxTableBase } from '~/app/components/table';
+import { useCheckboxTableBase } from '~/shared/components/table';
 import type Table from './Table';
 
 type UseCheckboxTable = {
diff --git a/clients/ui/frontend/src/app/components/table/useCheckboxTableBase.ts b/clients/ui/frontend/src/shared/components/table/useCheckboxTableBase.ts
similarity index 100%
rename from clients/ui/frontend/src/app/components/table/useCheckboxTableBase.ts
rename to clients/ui/frontend/src/shared/components/table/useCheckboxTableBase.ts
diff --git a/clients/ui/frontend/src/app/components/table/useTableColumnSort.ts b/clients/ui/frontend/src/shared/components/table/useTableColumnSort.ts
similarity index 100%
rename from clients/ui/frontend/src/app/components/table/useTableColumnSort.ts
rename to clients/ui/frontend/src/shared/components/table/useTableColumnSort.ts
diff --git a/clients/ui/frontend/src/app/useSettings.tsx b/clients/ui/frontend/src/shared/hooks/useSettings.tsx
similarity index 84%
rename from clients/ui/frontend/src/app/useSettings.tsx
rename to clients/ui/frontend/src/shared/hooks/useSettings.tsx
index 3f169616c..4aad461b0 100644
--- a/clients/ui/frontend/src/app/useSettings.tsx
+++ b/clients/ui/frontend/src/shared/hooks/useSettings.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { POLL_INTERVAL } from '~/utilities/const';
-import { useDeepCompareMemoize } from '~/utilities/useDeepCompareMemoize';
-import { ConfigSettings, UserSettings } from '~/types';
-import useTimeBasedRefresh from './useTimeBasedRefresh';
+import { POLL_INTERVAL } from '~/shared/utilities/const';
+import { useDeepCompareMemoize } from '~/shared/utilities/useDeepCompareMemoize';
+import { ConfigSettings, UserSettings } from '~/shared/types';
+import useTimeBasedRefresh from '~/shared/hooks/useTimeBasedRefresh';
 
 export const useSettings = (): {
   configSettings: ConfigSettings | null;
@@ -62,7 +62,7 @@ export const useSettings = (): {
 };
 
 // Mock a settings config call
-// TODO: replace with thea actual call once we have the endpoint
+// TODO: [Data Flow] replace with thea actual call once we have the endpoint
 export const fetchConfig = async (): Promise<ConfigSettings> => ({
   common: {
     featureFlags: {
@@ -72,7 +72,7 @@ export const fetchConfig = async (): Promise<ConfigSettings> => ({
 });
 
 // Mock a settings user call
-// TODO: replace with thea actual call once we have the endpoint
+// TODO: [Auth-enablement] replace with thea actual call once we have the endpoint
 export const fetchUser = async (): Promise<UserSettings> => ({
   username: 'admin',
   isAdmin: true,
diff --git a/clients/ui/frontend/src/app/useTimeBasedRefresh.ts b/clients/ui/frontend/src/shared/hooks/useTimeBasedRefresh.ts
similarity index 92%
rename from clients/ui/frontend/src/app/useTimeBasedRefresh.ts
rename to clients/ui/frontend/src/shared/hooks/useTimeBasedRefresh.ts
index 3ddd82a09..3ec4b2961 100644
--- a/clients/ui/frontend/src/app/useTimeBasedRefresh.ts
+++ b/clients/ui/frontend/src/shared/hooks/useTimeBasedRefresh.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useBrowserStorage } from '~/components/browserStorage';
+import { useBrowserStorage } from '~/shared/components/browserStorage';
 
 export type SetTime = (refreshDateMarker: Date) => void;
 
@@ -33,7 +33,7 @@ const useTimeBasedRefresh = (): SetTime => {
     if (lastDate < refreshDateMarker) {
       setNewDateString(refreshDateMarker.toString());
       console.log('Logging out and refreshing');
-      // TODO: Replace with actual logout function
+      // TODO: [Auth-enablement] Replace with actual logout function
       //logout().then(() => window.location.reload());
     } else {
       console.error(
diff --git a/clients/ui/frontend/src/style/MUI-theme.scss b/clients/ui/frontend/src/shared/style/MUI-theme.scss
similarity index 100%
rename from clients/ui/frontend/src/style/MUI-theme.scss
rename to clients/ui/frontend/src/shared/style/MUI-theme.scss
diff --git a/clients/ui/frontend/src/typeHelpers.ts b/clients/ui/frontend/src/shared/typeHelpers.ts
similarity index 100%
rename from clients/ui/frontend/src/typeHelpers.ts
rename to clients/ui/frontend/src/shared/typeHelpers.ts
diff --git a/clients/ui/frontend/src/types.ts b/clients/ui/frontend/src/shared/types.ts
similarity index 64%
rename from clients/ui/frontend/src/types.ts
rename to clients/ui/frontend/src/shared/types.ts
index dc3221320..2b540f17e 100644
--- a/clients/ui/frontend/src/types.ts
+++ b/clients/ui/frontend/src/shared/types.ts
@@ -1,23 +1,23 @@
-import { ValueOf } from '~/typeHelpers';
+import { ValueOf } from '~/shared/typeHelpers';
 
-//  TODO: Get the status config params
+//  TODO: [Data Flow] Get the status config params
 export type UserSettings = {
   username: string;
   isAdmin: boolean;
   isAllowed: boolean;
 };
 
-// TODO: Add more config parameters
+// TODO: [Data Flow] Add more config parameters
 export type ConfigSettings = {
   common: CommonConfig;
 };
 
-// TODO: Add more config parameters
+// TODO: [Data Flow] Add more config parameters
 export type CommonConfig = {
   featureFlags: FeatureFlag;
 };
 
-// TODO: Add more config parameters
+// TODO: [Data Flow] Add more config parameters
 export type FeatureFlag = {
   modelRegistry: boolean;
 };
diff --git a/clients/ui/frontend/src/shared/utilities/const.ts b/clients/ui/frontend/src/shared/utilities/const.ts
new file mode 100644
index 000000000..dfd3abedc
--- /dev/null
+++ b/clients/ui/frontend/src/shared/utilities/const.ts
@@ -0,0 +1,6 @@
+// TODO: [Env Handling] Fetch the .env variable here.
+const POLL_INTERVAL = 30000;
+
+export const USER_ACCESS_TOKEN = 'x-forwarded-access-token';
+
+export { POLL_INTERVAL };
diff --git a/clients/ui/frontend/src/utilities/markdown.ts b/clients/ui/frontend/src/shared/utilities/markdown.ts
similarity index 100%
rename from clients/ui/frontend/src/utilities/markdown.ts
rename to clients/ui/frontend/src/shared/utilities/markdown.ts
diff --git a/clients/ui/frontend/src/utilities/time.ts b/clients/ui/frontend/src/shared/utilities/time.ts
similarity index 94%
rename from clients/ui/frontend/src/utilities/time.ts
rename to clients/ui/frontend/src/shared/utilities/time.ts
index 16fd8a8e8..5165fb0c1 100644
--- a/clients/ui/frontend/src/utilities/time.ts
+++ b/clients/ui/frontend/src/shared/utilities/time.ts
@@ -1,4 +1,4 @@
-// TODO: Trimed down version of the original file. Needs to be updated with the original file.
+// TODO: [Reusable Codebase] Trimed down version of the original file. Needs to be updated with the original file.
 
 const printAgo = (time: number, unit: string) => `${time} ${unit}${time > 1 ? 's' : ''} ago`;
 const printIn = (time: number, unit: string) => `in ${time} ${unit}${time > 1 ? 's' : ''}`;
diff --git a/clients/ui/frontend/src/utilities/useDebounceCallback.ts b/clients/ui/frontend/src/shared/utilities/useDebounceCallback.ts
similarity index 100%
rename from clients/ui/frontend/src/utilities/useDebounceCallback.ts
rename to clients/ui/frontend/src/shared/utilities/useDebounceCallback.ts
diff --git a/clients/ui/frontend/src/utilities/useDeepCompareMemoize.ts b/clients/ui/frontend/src/shared/utilities/useDeepCompareMemoize.ts
similarity index 100%
rename from clients/ui/frontend/src/utilities/useDeepCompareMemoize.ts
rename to clients/ui/frontend/src/shared/utilities/useDeepCompareMemoize.ts
diff --git a/clients/ui/frontend/src/utilities/useEventListener.ts b/clients/ui/frontend/src/shared/utilities/useEventListener.ts
similarity index 100%
rename from clients/ui/frontend/src/utilities/useEventListener.ts
rename to clients/ui/frontend/src/shared/utilities/useEventListener.ts
diff --git a/clients/ui/frontend/src/utilities/useFetchState.ts b/clients/ui/frontend/src/shared/utilities/useFetchState.ts
similarity index 99%
rename from clients/ui/frontend/src/utilities/useFetchState.ts
rename to clients/ui/frontend/src/shared/utilities/useFetchState.ts
index aa688d349..6f302b6ce 100644
--- a/clients/ui/frontend/src/utilities/useFetchState.ts
+++ b/clients/ui/frontend/src/shared/utilities/useFetchState.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { APIOptions } from '~/app/api/types';
+import { APIOptions } from '~/shared/api/types';
 
 /**
  * Allows "I'm not ready" rejections if you lack a lazy provided prop
diff --git a/clients/ui/frontend/src/utilities/useGenericObjectState.ts b/clients/ui/frontend/src/shared/utilities/useGenericObjectState.ts
similarity index 92%
rename from clients/ui/frontend/src/utilities/useGenericObjectState.ts
rename to clients/ui/frontend/src/shared/utilities/useGenericObjectState.ts
index a243bd820..a72d670ba 100644
--- a/clients/ui/frontend/src/utilities/useGenericObjectState.ts
+++ b/clients/ui/frontend/src/shared/utilities/useGenericObjectState.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { UpdateObjectAtPropAndValue } from '~/types';
+import { UpdateObjectAtPropAndValue } from '~/shared/types';
 
 export type GenericObjectState<T> = [
   data: T,
diff --git a/clients/ui/frontend/src/utilities/const.ts b/clients/ui/frontend/src/utilities/const.ts
deleted file mode 100644
index 7e589524b..000000000
--- a/clients/ui/frontend/src/utilities/const.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// TODO: Fetch the .env variable here.
-const POLL_INTERVAL = 30000;
-
-export { POLL_INTERVAL };
diff --git a/clients/ui/manifests/base/kustomization.yaml b/clients/ui/manifests/base/kustomization.yaml
index 4c9472a1d..939b4d754 100644
--- a/clients/ui/manifests/base/kustomization.yaml
+++ b/clients/ui/manifests/base/kustomization.yaml
@@ -7,6 +7,7 @@ resources:
   - model-registry-bff-deployment.yaml
   - model-registry-ui-service.yaml
   - model-registry-ui-deployment.yaml
+  - model-registry-service-account.yaml
 
 images:
   - name: model-registry-ui-image
diff --git a/clients/ui/manifests/base/model-registry-bff-deployment.yaml b/clients/ui/manifests/base/model-registry-bff-deployment.yaml
index 311aaebd5..27a2b5998 100644
--- a/clients/ui/manifests/base/model-registry-bff-deployment.yaml
+++ b/clients/ui/manifests/base/model-registry-bff-deployment.yaml
@@ -14,6 +14,7 @@ spec:
       labels:
         app: model-registry-bff
     spec:
+      serviceAccountName: model-registry-bff
       containers:
       - name: model-registry-bff
         image: model-registry-bff-image
diff --git a/clients/ui/manifests/base/model-registry-bff-role.yaml b/clients/ui/manifests/base/model-registry-bff-role.yaml
index 6b5ea1954..82a210855 100644
--- a/clients/ui/manifests/base/model-registry-bff-role.yaml
+++ b/clients/ui/manifests/base/model-registry-bff-role.yaml
@@ -15,7 +15,7 @@ metadata:
   name: bff-read-services
 subjects:
 - kind: ServiceAccount
-  name: default
+  name: model-registry-bff
   namespace: kubeflow
 roleRef:
   kind: ClusterRole
diff --git a/clients/ui/manifests/base/model-registry-service-account.yaml b/clients/ui/manifests/base/model-registry-service-account.yaml
new file mode 100644
index 000000000..86cbfc9b6
--- /dev/null
+++ b/clients/ui/manifests/base/model-registry-service-account.yaml
@@ -0,0 +1,4 @@
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: model-registry-bff
\ No newline at end of file
diff --git a/clients/ui/manifests/base/model-registry-ui-deployment.yaml b/clients/ui/manifests/base/model-registry-ui-deployment.yaml
index 3e0e9a055..23c55eb07 100644
--- a/clients/ui/manifests/base/model-registry-ui-deployment.yaml
+++ b/clients/ui/manifests/base/model-registry-ui-deployment.yaml
@@ -26,3 +26,6 @@ spec:
             memory: 2Gi
         ports:
           - containerPort: 8080
+        env:
+          - name: API_URL
+            value: "http://model-registry-bff-service:4000"
diff --git a/clients/ui/manifests/user-rbac/admin-rbac.yaml b/clients/ui/manifests/user-rbac/admin-rbac.yaml
new file mode 100644
index 000000000..592a58bf9
--- /dev/null
+++ b/clients/ui/manifests/user-rbac/admin-rbac.yaml
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: admin-user
+  namespace: kube-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: admin-user
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+  - kind: ServiceAccount
+    name: admin-user
+    namespace: kube-system
\ No newline at end of file
diff --git a/clients/ui/manifests/user-rbac/kustomization.yaml b/clients/ui/manifests/user-rbac/kustomization.yaml
new file mode 100644
index 000000000..cb01d8d05
--- /dev/null
+++ b/clients/ui/manifests/user-rbac/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - admin-rbac.yaml
\ No newline at end of file
diff --git a/clients/ui/scripts/deploy_kind_cluster.sh b/clients/ui/scripts/deploy_kind_cluster.sh
new file mode 100755
index 000000000..648199314
--- /dev/null
+++ b/clients/ui/scripts/deploy_kind_cluster.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# Check for required tools
+command -v docker >/dev/null 2>&1 || { echo >&2 "Docker is required but it's not installed. Aborting."; exit 1; }
+command -v kubectl >/dev/null 2>&1 || { echo >&2 "kubectl is required but it's not installed. Aborting."; exit 1; }
+command -v kind >/dev/null 2>&1 || { echo >&2 "kind is required but it's not installed. Aborting."; exit 1; }
+
+if kubectl get deployment model-registry-deployment -n kubeflow >/dev/null 2>&1; then
+  echo "Model Registry deployment already exists. Skipping to step 4."
+else
+    # Step 1: Create a kind cluster
+    echo "Creating kind cluster..."
+    kind create cluster
+
+    # Verify cluster creation
+    echo "Verifying cluster..."
+    kubectl cluster-info
+
+    # Step 2: Create kubeflow namespace
+    echo "Creating kubeflow namespace..."
+    kubectl create namespace kubeflow
+
+    # Step 3: Deploy Model Registry to cluster
+    echo "Deploying Model Registry to cluster..."
+    kubectl apply -k "https://github.com/alexcreasy/model-registry/manifests/kustomize/overlays/db?ref=kind"
+
+    # Wait for deployment to be available
+    echo "Waiting for Model Registry deployment to be available..."
+    kubectl wait --for=condition=available -n kubeflow deployment/model-registry-deployment --timeout=1m
+
+    # Verify deployment
+    echo "Verifying deployment..."
+    kubectl get pods -n kubeflow
+fi
+
+# Step 4: Deploy model registry UI
+echo "Deploying Model Registry UI..."
+kubectl apply -n kubeflow -k ./manifests/base
+
+# Wait for deployment to be available
+echo "Waiting Model Registry UI to be available..."
+kubectl wait --for=condition=available -n kubeflow deployment/model-registry-ui --timeout=1m
+
+# Step 5: Apply admin user service account in the cluster
+echo "Applying admin user service account and rolebinding..."
+kubectl apply -k ./manifests/user-rbac
+
+# Step 6: Generate token for admin user and display it
+echo "Generating token for admin user, copy the following token in the local storage with key 'x-forwarded-access-token'..."
+echo -e "\033[32m$(kubectl -n kube-system create token admin-user)\033[0m"
+
+# Step 5: Port-forward the service
+echo "Portfowarding Model Registry UI..."
+echo -e "\033[32mDashboard available in http://localhost:8080\033[0m"
+kubectl port-forward svc/model-registry-ui-service -n kubeflow 8080:8080