diff --git a/assets/js/src/core/app/api/pimcore/index.ts b/assets/js/src/core/app/api/pimcore/index.ts
index 65306518d..e2776cd0c 100644
--- a/assets/js/src/core/app/api/pimcore/index.ts
+++ b/assets/js/src/core/app/api/pimcore/index.ts
@@ -12,8 +12,20 @@
 */
 
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
+import {RootState} from "@Pimcore/app/store";
 
 export const api = createApi({
-  baseQuery: fetchBaseQuery({ baseUrl: '/' }),
+  baseQuery: fetchBaseQuery({
+    baseUrl: '/',
+    prepareHeaders: (headers, { getState }) => {
+      // By default, if we have a token in the store, let's use that for authenticated requests
+      const token = (getState() as RootState).auth?.token
+      if (token !== null) {
+        headers.set('authorization', `Bearer ${token}`)
+      }
+
+      return headers
+    }
+  }),
   endpoints: () => ({})
 })
diff --git a/assets/js/src/app/auth/auth-slice.tsx b/assets/js/src/core/app/auth/auth-slice.tsx
similarity index 100%
rename from assets/js/src/app/auth/auth-slice.tsx
rename to assets/js/src/core/app/auth/auth-slice.tsx
diff --git a/assets/js/src/components/login-form/hooks/use-is-authenticated.ts b/assets/js/src/core/components/login-form/hooks/use-is-authenticated.ts
similarity index 100%
rename from assets/js/src/components/login-form/hooks/use-is-authenticated.ts
rename to assets/js/src/core/components/login-form/hooks/use-is-authenticated.ts
diff --git a/assets/js/src/components/login-form/hooks/use-middleware.ts b/assets/js/src/core/components/login-form/hooks/use-middleware.ts
similarity index 100%
rename from assets/js/src/components/login-form/hooks/use-middleware.ts
rename to assets/js/src/core/components/login-form/hooks/use-middleware.ts
diff --git a/assets/js/src/components/login-form/hooks/use-refresh-token.ts b/assets/js/src/core/components/login-form/hooks/use-refresh-token.ts
similarity index 100%
rename from assets/js/src/components/login-form/hooks/use-refresh-token.ts
rename to assets/js/src/core/components/login-form/hooks/use-refresh-token.ts
diff --git a/assets/js/src/components/login-form/hooks/use-user.ts b/assets/js/src/core/components/login-form/hooks/use-user.ts
similarity index 100%
rename from assets/js/src/components/login-form/hooks/use-user.ts
rename to assets/js/src/core/components/login-form/hooks/use-user.ts
diff --git a/assets/js/src/components/login-form/login-form-style.tsx b/assets/js/src/core/components/login-form/login-form-style.tsx
similarity index 100%
rename from assets/js/src/components/login-form/login-form-style.tsx
rename to assets/js/src/core/components/login-form/login-form-style.tsx
diff --git a/assets/js/src/components/login-form/login-form.tsx b/assets/js/src/core/components/login-form/login-form.tsx
similarity index 100%
rename from assets/js/src/components/login-form/login-form.tsx
rename to assets/js/src/core/components/login-form/login-form.tsx
diff --git a/assets/js/src/components/login-form/services/auth.ts b/assets/js/src/core/components/login-form/services/auth.ts
similarity index 100%
rename from assets/js/src/components/login-form/services/auth.ts
rename to assets/js/src/core/components/login-form/services/auth.ts
diff --git a/assets/js/src/components/login-form/store/index.ts b/assets/js/src/core/components/login-form/store/index.ts
similarity index 100%
rename from assets/js/src/components/login-form/store/index.ts
rename to assets/js/src/core/components/login-form/store/index.ts
diff --git a/assets/js/src/router/layouts/default.tsx b/assets/js/src/core/router/layouts/default.tsx
similarity index 100%
rename from assets/js/src/router/layouts/default.tsx
rename to assets/js/src/core/router/layouts/default.tsx
diff --git a/assets/js/src/router/layouts/login/login.styles.tsx b/assets/js/src/core/router/layouts/login/login.styles.tsx
similarity index 100%
rename from assets/js/src/router/layouts/login/login.styles.tsx
rename to assets/js/src/core/router/layouts/login/login.styles.tsx
diff --git a/assets/js/src/router/layouts/login/login.tsx b/assets/js/src/core/router/layouts/login/login.tsx
similarity index 100%
rename from assets/js/src/router/layouts/login/login.tsx
rename to assets/js/src/core/router/layouts/login/login.tsx
diff --git a/assets/js/src/router/router.tsx b/assets/js/src/core/router/router.tsx
similarity index 100%
rename from assets/js/src/router/router.tsx
rename to assets/js/src/core/router/router.tsx
diff --git a/public/build/entrypoints.json b/public/build/entrypoints.json
index 1b916f357..f2586d2d3 100644
--- a/public/build/entrypoints.json
+++ b/public/build/entrypoints.json
@@ -1,12 +1,7 @@
 {
   "entrypoints": {
     "main": {
-      "css": [
-        "http://localhost:3030/build/vendors-node_modules_ant-design_icons_es_icons_EyeTwoTone_js-node_modules_ant-design_icons_es-5f1bae.css",
-        "http://localhost:3030/build/main.css"
-      ],
       "js": [
-        "http://localhost:3030/build/vendors-node_modules_ant-design_icons_es_icons_EyeTwoTone_js-node_modules_ant-design_icons_es-5f1bae.js",
         "http://localhost:3030/build/main.js"
       ]
     }