diff --git a/packages/theme-pink-cupcake/src/components/NavBar/NavBarLogin.vue b/packages/theme-pink-cupcake/src/components/NavBar/NavBarLogin.vue
index efaebff0e..f8b5e33f5 100644
--- a/packages/theme-pink-cupcake/src/components/NavBar/NavBarLogin.vue
+++ b/packages/theme-pink-cupcake/src/components/NavBar/NavBarLogin.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import NavBarDropdown from './NavBarDropdown.vue'
-import FormLogin from '../Content/FormLogin.vue'
+import FormLogin from '../Pages/Account/FormLogin.vue'
 </script>
 
 <template>
diff --git a/packages/theme-pink-cupcake/src/components/Content/FormForgotPassword.vue b/packages/theme-pink-cupcake/src/components/Pages/Account/FormForgotPassword.vue
similarity index 100%
rename from packages/theme-pink-cupcake/src/components/Content/FormForgotPassword.vue
rename to packages/theme-pink-cupcake/src/components/Pages/Account/FormForgotPassword.vue
diff --git a/packages/theme-pink-cupcake/src/components/Content/FormLogin.vue b/packages/theme-pink-cupcake/src/components/Pages/Account/FormLogin.vue
similarity index 100%
rename from packages/theme-pink-cupcake/src/components/Content/FormLogin.vue
rename to packages/theme-pink-cupcake/src/components/Pages/Account/FormLogin.vue
diff --git a/packages/theme-pink-cupcake/src/components/Content/FormRegister.vue b/packages/theme-pink-cupcake/src/components/Pages/Account/FormRegister.vue
similarity index 100%
rename from packages/theme-pink-cupcake/src/components/Content/FormRegister.vue
rename to packages/theme-pink-cupcake/src/components/Pages/Account/FormRegister.vue
diff --git a/packages/theme-pink-cupcake/src/components/Content/FormResendVerification.vue b/packages/theme-pink-cupcake/src/components/Pages/Account/FormResendVerification.vue
similarity index 100%
rename from packages/theme-pink-cupcake/src/components/Content/FormResendVerification.vue
rename to packages/theme-pink-cupcake/src/components/Pages/Account/FormResendVerification.vue
diff --git a/packages/theme-pink-cupcake/src/components/Pages/Account/index.ts b/packages/theme-pink-cupcake/src/components/Pages/Account/index.ts
new file mode 100644
index 000000000..334f8b862
--- /dev/null
+++ b/packages/theme-pink-cupcake/src/components/Pages/Account/index.ts
@@ -0,0 +1,6 @@
+import FormForgotPassword from './FormForgotPassword.vue'
+import FormLogin from './FormLogin.vue'
+import FormRegister from './FormRegister.vue'
+import FormResendVerification from './FormResendVerification.vue'
+
+export { FormForgotPassword, FormLogin, FormRegister, FormResendVerification }
diff --git a/packages/theme-pink-cupcake/src/components/index.ts b/packages/theme-pink-cupcake/src/components/index.ts
index b0c9b50b1..0e09cb34d 100644
--- a/packages/theme-pink-cupcake/src/components/index.ts
+++ b/packages/theme-pink-cupcake/src/components/index.ts
@@ -11,9 +11,9 @@ import CardBoxBig from './Content/CardBoxBig.vue'
 import MainContent from './Content/MainContent.vue'
 import HeaderPage from './Content/HeaderPage.vue'
 import FooterContent from './Content/FooterContent.vue'
-import FormLogin from './Content/FormLogin.vue'
-import FormRegister from './Content/FormRegister.vue'
-import FormForgotPassword from './Content/FormForgotPassword.vue'
+import FormLogin from './Pages/Account/FormLogin.vue'
+import FormRegister from './Pages/Account/FormRegister.vue'
+import FormForgotPassword from './Pages/Account/FormForgotPassword.vue'
 import NavBar from './NavBar/NavBar.vue'
 import NavBarDropdown from './NavBar/NavBarDropdown.vue'
 import NavBarDropdownSeparator from './NavBar/NavBarDropdownSeparator.vue'
diff --git a/packages/theme-pink-cupcake/src/index.ts b/packages/theme-pink-cupcake/src/index.ts
index 279829aae..be90dc203 100644
--- a/packages/theme-pink-cupcake/src/index.ts
+++ b/packages/theme-pink-cupcake/src/index.ts
@@ -2,8 +2,8 @@ import type { App } from 'vue'
 
 // Import sub-plugins
 import PinkCupcakeComponents from './plugins/components'
-import PinkCupcakeViews from './plugins/views'
 import AdminSprinkle from './plugins/admin'
+import AccountSprinkle from './plugins/account'
 import FontAwesome from './plugins/font-awesome'
 
 // Init UIkit
@@ -15,8 +15,8 @@ UIkit.use(Icons)
 export default {
     install: (app: App) => {
         app.use(PinkCupcakeComponents)
-        app.use(PinkCupcakeViews)
         app.use(AdminSprinkle) // TODO : Add option to disable this or load on demand
+        app.use(AccountSprinkle) // TODO : Add option to disable this or load on demand
         app.use(FontAwesome)
     }
 }
diff --git a/packages/theme-pink-cupcake/src/plugins/account.ts b/packages/theme-pink-cupcake/src/plugins/account.ts
new file mode 100644
index 000000000..e7d4523b6
--- /dev/null
+++ b/packages/theme-pink-cupcake/src/plugins/account.ts
@@ -0,0 +1,43 @@
+/**
+ * Register every admin components & views globally
+ * See : https://vuejs.org/guide/components/registration
+ */
+import type { App } from 'vue'
+import {
+    PageLogin,
+    PageRegister,
+    PageForgotPassword,
+    PageResendVerification
+} from '../views/Account'
+import {
+    FormLogin,
+    FormRegister,
+    FormForgotPassword,
+    FormResendVerification
+} from '../components/Pages/Account'
+
+export default {
+    install: (app: App) => {
+        app.component('UFFormLogin', FormLogin)
+            .component('UFFormRegister', FormRegister)
+            .component('UFFormForgotPassword', FormForgotPassword)
+            .component('UFFormResendVerification', FormResendVerification)
+            .component('UFPageLogin', PageLogin)
+            .component('UFPageRegister', PageRegister)
+            .component('UFPageForgotPassword', PageForgotPassword)
+            .component('UFPageResendVerification', PageResendVerification)
+    }
+}
+
+declare module 'vue' {
+    export interface GlobalComponents {
+        UFFormLogin: typeof FormLogin
+        UFFormRegister: typeof FormRegister
+        UFFormForgotPassword: typeof FormForgotPassword
+        UFFormResendVerification: typeof FormResendVerification
+        UFPageLogin: typeof PageLogin
+        UFPageRegister: typeof PageRegister
+        UFPageForgotPassword: typeof PageForgotPassword
+        UFPageResendVerification: typeof PageResendVerification
+    }
+}
diff --git a/packages/theme-pink-cupcake/src/plugins/components.ts b/packages/theme-pink-cupcake/src/plugins/components.ts
index d43a1a03b..628a9fc01 100644
--- a/packages/theme-pink-cupcake/src/plugins/components.ts
+++ b/packages/theme-pink-cupcake/src/plugins/components.ts
@@ -17,9 +17,6 @@ import {
     MainContent,
     HeaderPage,
     FooterContent,
-    FormLogin,
-    FormRegister,
-    FormForgotPassword,
     NavBar,
     NavBarDropdown,
     NavBarDropdownSeparator,
@@ -52,9 +49,6 @@ export default {
             .component('UFMainContent', MainContent)
             .component('UFHeaderPage', HeaderPage)
             .component('UFFooterContent', FooterContent)
-            .component('UFFormLogin', FormLogin)
-            .component('UFFormRegister', FormRegister)
-            .component('UFFormForgotPassword', FormForgotPassword)
             .component('UFNavBar', NavBar)
             .component('UFNavBarDropdown', NavBarDropdown)
             .component('UFNavBarDropdownSeparator', NavBarDropdownSeparator)
@@ -88,9 +82,6 @@ declare module 'vue' {
         UFMainContent: typeof MainContent
         UFHeaderPage: typeof HeaderPage
         UFFooterContent: typeof FooterContent
-        UFFormLogin: typeof FormLogin
-        UFFormRegister: typeof FormRegister
-        UFFormForgotPassword: typeof FormForgotPassword
         UFNavBar: typeof NavBar
         UFNavBarDropdown: typeof NavBarDropdown
         UFNavBarDropdownSeparator: typeof NavBarDropdownSeparator
diff --git a/packages/theme-pink-cupcake/src/plugins/views.ts b/packages/theme-pink-cupcake/src/plugins/views.ts
deleted file mode 100644
index ae6ba2b38..000000000
--- a/packages/theme-pink-cupcake/src/plugins/views.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Register every views globally
- * See : https://vuejs.org/guide/components/registration
- */
-import type { App } from 'vue'
-import { PageLogin, PageRegister, PageForgotPassword, PageResendVerification } from '../views'
-
-export default {
-    install: (app: App) => {
-        app.component('UFPageLogin', PageLogin)
-            .component('UFPageRegister', PageRegister)
-            .component('UFPageForgotPassword', PageForgotPassword)
-            .component('UFPageResendVerification', PageResendVerification)
-    }
-}
-
-declare module 'vue' {
-    export interface GlobalComponents {
-        UFPageLogin: typeof PageLogin
-        UFPageRegister: typeof PageRegister
-        UFPageForgotPassword: typeof PageForgotPassword
-        UFPageResendVerification: typeof PageResendVerification
-    }
-}
diff --git a/packages/theme-pink-cupcake/src/tests/components/Content/FormForgotPassword.test.ts b/packages/theme-pink-cupcake/src/tests/components/Content/FormForgotPassword.test.ts
index 2ffa5414f..6afe143f6 100644
--- a/packages/theme-pink-cupcake/src/tests/components/Content/FormForgotPassword.test.ts
+++ b/packages/theme-pink-cupcake/src/tests/components/Content/FormForgotPassword.test.ts
@@ -1,6 +1,6 @@
 import { mount, config } from '@vue/test-utils'
 import { describe, test, expect, vi, afterEach } from 'vitest'
-import FormForgotPassword from '../../../components/Content/FormForgotPassword.vue'
+import FormForgotPassword from '../../../components/Pages/Account/FormForgotPassword.vue'
 import UFAlert from '../../../components/UFAlert.vue'
 import { Severity, type AlertInterface } from '@userfrosting/sprinkle-core/interfaces'
 import { forgotPassword } from '@userfrosting/sprinkle-account/composables'
diff --git a/packages/theme-pink-cupcake/src/tests/components/Content/FormLogin.test.ts b/packages/theme-pink-cupcake/src/tests/components/Content/FormLogin.test.ts
index bffa785e9..884da3b78 100644
--- a/packages/theme-pink-cupcake/src/tests/components/Content/FormLogin.test.ts
+++ b/packages/theme-pink-cupcake/src/tests/components/Content/FormLogin.test.ts
@@ -1,6 +1,6 @@
 import { mount, config } from '@vue/test-utils'
 import { describe, test, afterEach, expect, vi } from 'vitest'
-import FormLogin from '../../../components/Content/FormLogin.vue'
+import FormLogin from '../../../components/Pages/Account/FormLogin.vue'
 import { useAuthStore } from '@userfrosting/sprinkle-account/stores'
 import UFAlert from '../../../components/UFAlert.vue'
 import UIkit from 'uikit'
diff --git a/packages/theme-pink-cupcake/src/tests/components/Content/FormRegister.test.ts b/packages/theme-pink-cupcake/src/tests/components/Content/FormRegister.test.ts
index 91b4ec001..96ccabd56 100644
--- a/packages/theme-pink-cupcake/src/tests/components/Content/FormRegister.test.ts
+++ b/packages/theme-pink-cupcake/src/tests/components/Content/FormRegister.test.ts
@@ -1,6 +1,6 @@
 import { mount, config } from '@vue/test-utils'
 import { describe, test, expect, vi, afterEach } from 'vitest'
-import FormRegister from '../../../components/Content/FormRegister.vue'
+import FormRegister from '../../../components/Pages/Account/FormRegister.vue'
 import UFAlert from '../../../components/UFAlert.vue'
 import UIkit from 'uikit'
 import type { UserInterface, RegisterForm } from '@userfrosting/sprinkle-account/interfaces'
diff --git a/packages/theme-pink-cupcake/src/tests/components/Content/FormResendVerification.test.ts b/packages/theme-pink-cupcake/src/tests/components/Content/FormResendVerification.test.ts
index 55111fb95..4fd6cc237 100644
--- a/packages/theme-pink-cupcake/src/tests/components/Content/FormResendVerification.test.ts
+++ b/packages/theme-pink-cupcake/src/tests/components/Content/FormResendVerification.test.ts
@@ -1,6 +1,6 @@
 import { mount, config } from '@vue/test-utils'
 import { describe, test, expect, vi, afterEach } from 'vitest'
-import FormResendVerification from '../../../components/Content/FormResendVerification.vue'
+import FormResendVerification from '../../../components/Pages/Account/FormResendVerification.vue'
 import UFAlert from '../../../components/UFAlert.vue'
 import { Severity, type AlertInterface } from '@userfrosting/sprinkle-core/interfaces'
 import { resendVerification } from '@userfrosting/sprinkle-account/composables'
diff --git a/packages/theme-pink-cupcake/src/views/PageForgotPassword.vue b/packages/theme-pink-cupcake/src/views/Account/PageForgotPassword.vue
similarity index 80%
rename from packages/theme-pink-cupcake/src/views/PageForgotPassword.vue
rename to packages/theme-pink-cupcake/src/views/Account/PageForgotPassword.vue
index ddd8f95f8..2f9698402 100644
--- a/packages/theme-pink-cupcake/src/views/PageForgotPassword.vue
+++ b/packages/theme-pink-cupcake/src/views/Account/PageForgotPassword.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import FormForgotPassword from '../components/Content/FormForgotPassword.vue'
+import FormForgotPassword from '../../components/Pages/Account/FormForgotPassword.vue'
 </script>
 
 <template>
diff --git a/packages/theme-pink-cupcake/src/views/PageLogin.vue b/packages/theme-pink-cupcake/src/views/Account/PageLogin.vue
similarity index 93%
rename from packages/theme-pink-cupcake/src/views/PageLogin.vue
rename to packages/theme-pink-cupcake/src/views/Account/PageLogin.vue
index e467d28f3..d200a7b81 100644
--- a/packages/theme-pink-cupcake/src/views/PageLogin.vue
+++ b/packages/theme-pink-cupcake/src/views/Account/PageLogin.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import FormLogin from '../components/Content/FormLogin.vue'
+import FormLogin from '../../components/Pages/Account/FormLogin.vue'
 </script>
 
 <template>
diff --git a/packages/theme-pink-cupcake/src/views/PageRegister.vue b/packages/theme-pink-cupcake/src/views/Account/PageRegister.vue
similarity index 87%
rename from packages/theme-pink-cupcake/src/views/PageRegister.vue
rename to packages/theme-pink-cupcake/src/views/Account/PageRegister.vue
index dc2ef99c2..4ae28b570 100644
--- a/packages/theme-pink-cupcake/src/views/PageRegister.vue
+++ b/packages/theme-pink-cupcake/src/views/Account/PageRegister.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import FormRegister from '../components/Content/FormRegister.vue'
+import FormRegister from '../../components/Pages/Account/FormRegister.vue'
 </script>
 
 <template>
diff --git a/packages/theme-pink-cupcake/src/views/PageResendVerification.vue b/packages/theme-pink-cupcake/src/views/Account/PageResendVerification.vue
similarity index 78%
rename from packages/theme-pink-cupcake/src/views/PageResendVerification.vue
rename to packages/theme-pink-cupcake/src/views/Account/PageResendVerification.vue
index 5334af266..2ee91a3d6 100644
--- a/packages/theme-pink-cupcake/src/views/PageResendVerification.vue
+++ b/packages/theme-pink-cupcake/src/views/Account/PageResendVerification.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import FormResendVerification from '../components/Content/FormResendVerification.vue'
+import FormResendVerification from '../../components/Pages/Account/FormResendVerification.vue'
 </script>
 
 <template>
diff --git a/packages/theme-pink-cupcake/src/views/index.ts b/packages/theme-pink-cupcake/src/views/Account/index.ts
similarity index 100%
rename from packages/theme-pink-cupcake/src/views/index.ts
rename to packages/theme-pink-cupcake/src/views/Account/index.ts