diff --git a/AGENTS.md b/AGENTS.md
index 2ec85cb..55ca588 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -22,7 +22,7 @@ Before meaningful code changes, read:
 - Keep backend code under `backend/src/Socialize.Api`.
 - The solution file is `backend/Socialize.slnx`.
 - Backend feature code currently follows FastEndpoints module folders under `Modules/<Feature>`.
-- Frontend feature work should prefer `frontend/src/features/<feature>` for new isolated slices while preserving existing route/store code until a task migrates it.
+- Frontend feature-owned code belongs under `frontend/src/features/<feature>`.
 - Frontend runtime config must flow through `frontend/src/config.js`.
 - If backend contracts change, run `./scripts/update-openapi.sh` when the backend is running.
 - Dev servers use HTTP and bind to `0.0.0.0` for LAN access.
@@ -119,4 +119,4 @@ Contract changes:
 
 - Existing checked-in env and appsettings files may include legacy sensitive-looking values; do not propagate those values into new docs or templates.
 - The frontend is still JavaScript, not the TypeScript starter app generated by the bootstrap script. New OpenAPI scaffolding exists, but migrating app code to generated typed API calls should happen by task.
-- Some existing frontend code still lives under `views/`, `stores/`, and `plugins/`. Move it into feature folders only when a task explicitly owns that migration.
+- Feature-owned frontend route views and stores now live under `frontend/src/features/*`; keep future feature work there.
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 0d76698..3d6b9ac 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -55,11 +55,10 @@ frontend/src/
 ├─ pages/
 ├─ plugins/
 ├─ router/
-├─ stores/
-└─ views/
+└─ stores/
 ```
 
-The generated scaffold expects `app/`, `features/`, `pages/`, `router/`, `stores/`, and `api/`. Socialize currently has substantial existing code under `views/`, `stores/`, and `plugins/`. New isolated feature work should prefer `features/<feature>/`; existing screens should be migrated only by explicit task.
+Feature-owned frontend code lives under `frontend/src/features/<feature>/`. Feature folders may contain route views, stores, composables, constants, utilities, and local components. Cross-cutting shell code remains in `layouts/`, shared UI remains in `components/`, global plugins remain in `plugins/`, and app-wide stores may remain in `stores/`.
 
 ## API Contract
 
diff --git a/docs/CONVENTIONS.md b/docs/CONVENTIONS.md
index e5e9298..ff97b7b 100644
--- a/docs/CONVENTIONS.md
+++ b/docs/CONVENTIONS.md
@@ -15,8 +15,8 @@
 - Use the shared Axios API client in `frontend/src/plugins/api.js` for current JavaScript flows.
 - Preserve auth refresh behavior in `authStore` and the API plugin.
 - Route-level authenticated app screens live under `/app/*`.
-- New isolated feature slices should prefer `frontend/src/features/<feature>/`.
-- Do not move existing views/stores into feature folders unless a task owns that migration.
+- Feature-owned views, stores, composables, constants, utilities, and local components belong under `frontend/src/features/<feature>/`.
+- Keep only cross-cutting app shell, plugins, shared components, and app-wide stores outside feature folders.
 
 ## Docs
 
diff --git a/docs/FEATURES/platform-scaffold.md b/docs/FEATURES/platform-scaffold.md
index d05cbf7..123387a 100644
--- a/docs/FEATURES/platform-scaffold.md
+++ b/docs/FEATURES/platform-scaffold.md
@@ -30,7 +30,7 @@ backend/tests/Socialize.Tests
 
 ## Frontend
 
-The frontend remains the existing Vue 3 app. The scaffold directories `frontend/src/api`, `frontend/src/features`, `frontend/src/pages`, `frontend/src/layouts`, and `frontend/src/app` are available for incremental migration.
+The frontend remains the existing Vue 3 app. Feature-owned route views and stores live under `frontend/src/features/<feature>`, while shared app shell code stays under `frontend/src/layouts`, `frontend/src/components`, `frontend/src/plugins`, and `frontend/src/router`.
 
 ## API Contract
 
diff --git a/docs/PROMPTS/frontend-task.md b/docs/PROMPTS/frontend-task.md
index 282addc..12bde68 100644
--- a/docs/PROMPTS/frontend-task.md
+++ b/docs/PROMPTS/frontend-task.md
@@ -14,8 +14,7 @@ You are implementing a frontend task in this repository.
 ## Instructions
 
 - Implement only the requested frontend task.
-- Existing route-level app screens live under `frontend/src/views/app`.
-- New isolated feature slices should prefer `frontend/src/features/<feature>`.
+- Feature-owned route views, stores, composables, constants, utilities, and local components belong under `frontend/src/features/<feature>`.
 - Use `frontend/src/config.js` for runtime configuration.
 - Preserve token refresh behavior in `authStore` and `frontend/src/plugins/api.js`.
 - Use generated API types from `frontend/src/api/schema.d.ts` when the endpoint has been generated.
diff --git a/docs/PROMPT_TEMPLATE.md b/docs/PROMPT_TEMPLATE.md
index fad1b02..da43ae3 100644
--- a/docs/PROMPT_TEMPLATE.md
+++ b/docs/PROMPT_TEMPLATE.md
@@ -24,7 +24,7 @@ Implement:
 - Do not refactor unrelated code.
 - Follow existing backend/frontend structure.
 - Backend code currently belongs under `backend/src/Socialize.Api/Modules/<Feature>`.
-- New isolated frontend feature code should prefer `frontend/src/features/<feature>`.
+- Frontend feature-owned code belongs under `frontend/src/features/<feature>`.
 - If backend contracts change, update OpenAPI using `./scripts/update-openapi.sh`.
 - Do not manually duplicate generated API types when generated types exist.
 
diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json
index 4750a7a..d491413 100644
--- a/frontend/.eslintrc.json
+++ b/frontend/.eslintrc.json
@@ -18,5 +18,7 @@
     "vue",
     "tailwindcss"
   ],
-  "rules": {}
+  "rules": {
+    "tailwindcss/no-custom-classname": "off"
+  }
 }
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 9c93647..69566e0 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -35,10 +35,10 @@
 <script async setup>
     import { computed, ref, watch } from 'vue';
     import { useRoute } from 'vue-router';
-    import { useAuthStore } from '@/stores/authStore.js';
+    import { useAuthStore } from '@/features/auth/stores/authStore.js';
     import { mdiChevronLeft, mdiChevronRight } from '@mdi/js';
-    import AppBar from '@/views/main/AppBar.vue';
-    import AppSidebar from '@/views/main/AppSidebar.vue';
+    import AppBar from '@/layouts/main/AppBar.vue';
+    import AppSidebar from '@/layouts/main/AppSidebar.vue';
 
     const route = useRoute();
     const authStore = useAuthStore();
diff --git a/frontend/src/app/.gitkeep b/frontend/src/app/.gitkeep
deleted file mode 100644
index 8b13789..0000000
--- a/frontend/src/app/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/frontend/src/constants/Reactions.js b/frontend/src/constants/Reactions.js
deleted file mode 100644
index 14ae0b1..0000000
--- a/frontend/src/constants/Reactions.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export const REACTIONS = {
-    LIKE: 'Like',
-    DISLIKE: 'Dislike',
-    LOVE: 'Love',
-    HAHA: 'Haha',
-    WOW: 'Wow',
-    SAD: 'Sad',
-    ANGRY: 'Angry'
-};
\ No newline at end of file
diff --git a/frontend/src/features/.gitkeep b/frontend/src/features/.gitkeep
deleted file mode 100644
index 8b13789..0000000
--- a/frontend/src/features/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/frontend/src/composables/useFacebookLogin.js b/frontend/src/features/auth/composables/useFacebookLogin.js
similarity index 96%
rename from frontend/src/composables/useFacebookLogin.js
rename to frontend/src/features/auth/composables/useFacebookLogin.js
index a97a619..a91bad9 100644
--- a/frontend/src/composables/useFacebookLogin.js
+++ b/frontend/src/features/auth/composables/useFacebookLogin.js
@@ -1,6 +1,6 @@
 import {onMounted, ref} from "vue";
 import {useHead} from "@vueuse/head";
-import {useAuthStore} from "@/stores/authStore.js";
+import {useAuthStore} from "@/features/auth/stores/authStore.js";
 import config from "@/config.js";
 
 export function useFacebookLogin() {
diff --git a/frontend/src/stores/authStore.js b/frontend/src/features/auth/stores/authStore.js
similarity index 100%
rename from frontend/src/stores/authStore.js
rename to frontend/src/features/auth/stores/authStore.js
diff --git a/frontend/src/views/auth/ForgotPasswordView.vue b/frontend/src/features/auth/views/ForgotPasswordView.vue
similarity index 100%
rename from frontend/src/views/auth/ForgotPasswordView.vue
rename to frontend/src/features/auth/views/ForgotPasswordView.vue
diff --git a/frontend/src/views/auth/LoginView.vue b/frontend/src/features/auth/views/LoginView.vue
similarity index 98%
rename from frontend/src/views/auth/LoginView.vue
rename to frontend/src/features/auth/views/LoginView.vue
index ba2cdd8..438cdc3 100644
--- a/frontend/src/views/auth/LoginView.vue
+++ b/frontend/src/features/auth/views/LoginView.vue
@@ -104,7 +104,7 @@
 <script setup>
     import { ref } from 'vue';
     import { GoogleLogin } from 'vue3-google-login';
-    import { useAuthStore } from '@/stores/authStore.js';
+    import { useAuthStore } from '@/features/auth/stores/authStore.js';
     import { useI18n } from 'vue-i18n';
     import { useRouter } from 'vue-router';
     import { mdiEye, mdiEyeOff, mdiGoogle } from '@mdi/js';
diff --git a/frontend/src/views/auth/RegisterView.vue b/frontend/src/features/auth/views/RegisterView.vue
similarity index 100%
rename from frontend/src/views/auth/RegisterView.vue
rename to frontend/src/features/auth/views/RegisterView.vue
diff --git a/frontend/src/views/auth/ResetPasswordView.vue b/frontend/src/features/auth/views/ResetPasswordView.vue
similarity index 100%
rename from frontend/src/views/auth/ResetPasswordView.vue
rename to frontend/src/features/auth/views/ResetPasswordView.vue
diff --git a/frontend/src/views/auth/VerifyEmailView.vue b/frontend/src/features/auth/views/VerifyEmailView.vue
similarity index 100%
rename from frontend/src/views/auth/VerifyEmailView.vue
rename to frontend/src/features/auth/views/VerifyEmailView.vue
diff --git a/frontend/src/stores/channelsStore.js b/frontend/src/features/channels/stores/channelsStore.js
similarity index 95%
rename from frontend/src/stores/channelsStore.js
rename to frontend/src/features/channels/stores/channelsStore.js
index 622572c..15a72a1 100644
--- a/frontend/src/stores/channelsStore.js
+++ b/frontend/src/features/channels/stores/channelsStore.js
@@ -1,8 +1,8 @@
 import { computed } from 'vue';
 import { defineStore } from 'pinia';
 import { useSessionStorage } from '@vueuse/core';
-import { useWorkspaceStore } from '@/stores/workspaceStore.js';
-import { useContentItemsStore } from '@/stores/contentItemsStore.js';
+import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
+import { useContentItemsStore } from '@/features/content/stores/contentItemsStore.js';
 
 export const useChannelsStore = defineStore('channels', () => {
     const workspaceStore = useWorkspaceStore();
diff --git a/frontend/src/views/app/ChannelsView.vue b/frontend/src/features/channels/views/ChannelsView.vue
similarity index 97%
rename from frontend/src/views/app/ChannelsView.vue
rename to frontend/src/features/channels/views/ChannelsView.vue
index c02eced..e9f9742 100644
--- a/frontend/src/views/app/ChannelsView.vue
+++ b/frontend/src/features/channels/views/ChannelsView.vue
@@ -2,9 +2,9 @@
     import { computed, reactive, ref, watch } from 'vue';
     import { useRoute } from 'vue-router';
     import { useI18n } from 'vue-i18n';
-    import { useWorkspaceStore } from '@/stores/workspaceStore.js';
-    import { useContentItemsStore } from '@/stores/contentItemsStore.js';
-    import { useChannelsStore } from '@/stores/channelsStore.js';
+    import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
+    import { useContentItemsStore } from '@/features/content/stores/contentItemsStore.js';
+    import { useChannelsStore } from '@/features/channels/stores/channelsStore.js';
     import {
         mdiClose,
         mdiFacebook,
diff --git a/frontend/src/stores/clientsStore.js b/frontend/src/features/clients/stores/clientsStore.js
similarity index 97%
rename from frontend/src/stores/clientsStore.js
rename to frontend/src/features/clients/stores/clientsStore.js
index e3277f5..7dd09f8 100644
--- a/frontend/src/stores/clientsStore.js
+++ b/frontend/src/features/clients/stores/clientsStore.js
@@ -1,7 +1,7 @@
 import { computed, ref, watch } from 'vue';
 import { defineStore } from 'pinia';
-import { useAuthStore } from '@/stores/authStore.js';
-import { useWorkspaceStore } from '@/stores/workspaceStore.js';
+import { useAuthStore } from '@/features/auth/stores/authStore.js';
+import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
 import { useClient } from '@/plugins/api.js';
 
 export const useClientsStore = defineStore('clients', () => {
diff --git a/frontend/src/views/app/ClientDetailView.vue b/frontend/src/features/clients/views/ClientDetailView.vue
similarity index 98%
rename from frontend/src/views/app/ClientDetailView.vue
rename to frontend/src/features/clients/views/ClientDetailView.vue
index df73f33..ceb74e0 100644
--- a/frontend/src/views/app/ClientDetailView.vue
+++ b/frontend/src/features/clients/views/ClientDetailView.vue
@@ -3,10 +3,10 @@
     import { useRoute } from 'vue-router';
     import AppAvatar from '@/components/AppAvatar.vue';
     import ImageCropperDialog from '@/components/ImageCropperDialog.vue';
-    import { useAuthStore } from '@/stores/authStore.js';
-    import { useClientsStore } from '@/stores/clientsStore.js';
-    import { useProjectsStore } from '@/stores/projectsStore.js';
-    import { useContentItemsStore } from '@/stores/contentItemsStore.js';
+    import { useAuthStore } from '@/features/auth/stores/authStore.js';
+    import { useClientsStore } from '@/features/clients/stores/clientsStore.js';
+    import { useProjectsStore } from '@/features/projects/stores/projectsStore.js';
+    import { useContentItemsStore } from '@/features/content/stores/contentItemsStore.js';
 
     const authStore = useAuthStore();
     const route = useRoute();
diff --git a/frontend/src/views/app/ClientsView.vue b/frontend/src/features/clients/views/ClientsView.vue
similarity index 97%
rename from frontend/src/views/app/ClientsView.vue
rename to frontend/src/features/clients/views/ClientsView.vue
index f9798d3..538f0a6 100644
--- a/frontend/src/views/app/ClientsView.vue
+++ b/frontend/src/features/clients/views/ClientsView.vue
@@ -2,9 +2,9 @@
     import { reactive, ref } from 'vue';
     import { useI18n } from 'vue-i18n';
     import AppAvatar from '@/components/AppAvatar.vue';
-    import { useAuthStore } from '@/stores/authStore.js';
-    import { useWorkspaceStore } from '@/stores/workspaceStore.js';
-    import { useClientsStore } from '@/stores/clientsStore.js';
+    import { useAuthStore } from '@/features/auth/stores/authStore.js';
+    import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
+    import { useClientsStore } from '@/features/clients/stores/clientsStore.js';
 
     const authStore = useAuthStore();
     const workspaceStore = useWorkspaceStore();
diff --git a/frontend/src/stores/contentItemDetailStore.js b/frontend/src/features/content/stores/contentItemDetailStore.js
similarity index 98%
rename from frontend/src/stores/contentItemDetailStore.js
rename to frontend/src/features/content/stores/contentItemDetailStore.js
index 6ce7122..b311d05 100644
--- a/frontend/src/stores/contentItemDetailStore.js
+++ b/frontend/src/features/content/stores/contentItemDetailStore.js
@@ -1,6 +1,6 @@
 import { reactive, ref } from 'vue';
 import { defineStore } from 'pinia';
-import { useWorkspaceStore } from '@/stores/workspaceStore.js';
+import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
 import { useClient } from '@/plugins/api.js';
 
 export const useContentItemDetailStore = defineStore('content-item-detail', () => {
diff --git a/frontend/src/stores/contentItemsStore.js b/frontend/src/features/content/stores/contentItemsStore.js
similarity index 95%
rename from frontend/src/stores/contentItemsStore.js
rename to frontend/src/features/content/stores/contentItemsStore.js
index 0222821..52827ea 100644
--- a/frontend/src/stores/contentItemsStore.js
+++ b/frontend/src/features/content/stores/contentItemsStore.js
@@ -1,7 +1,7 @@
 import { computed, ref, watch } from 'vue';
 import { defineStore } from 'pinia';
-import { useAuthStore } from '@/stores/authStore.js';
-import { useWorkspaceStore } from '@/stores/workspaceStore.js';
+import { useAuthStore } from '@/features/auth/stores/authStore.js';
+import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
 import { useClient } from '@/plugins/api.js';
 
 export const useContentItemsStore = defineStore('content-items', () => {
diff --git a/frontend/src/views/app/ContentItemDetailView.vue b/frontend/src/features/content/views/ContentItemDetailView.vue
similarity index 98%
rename from frontend/src/views/app/ContentItemDetailView.vue
rename to frontend/src/features/content/views/ContentItemDetailView.vue
index 17d716d..0c7dcb0 100644
--- a/frontend/src/views/app/ContentItemDetailView.vue
+++ b/frontend/src/features/content/views/ContentItemDetailView.vue
@@ -3,12 +3,12 @@
     import { useRoute, useRouter } from 'vue-router';
     import { useSessionStorage } from '@vueuse/core';
     import AppAvatar from '@/components/AppAvatar.vue';
-    import { useChannelsStore } from '@/stores/channelsStore.js';
-    import { useClientsStore } from '@/stores/clientsStore.js';
-    import { useContentItemDetailStore } from '@/stores/contentItemDetailStore.js';
-    import { useContentItemsStore } from '@/stores/contentItemsStore.js';
-    import { useProjectsStore } from '@/stores/projectsStore.js';
-    import { useWorkspaceStore } from '@/stores/workspaceStore.js';
+    import { useChannelsStore } from '@/features/channels/stores/channelsStore.js';
+    import { useClientsStore } from '@/features/clients/stores/clientsStore.js';
+    import { useContentItemDetailStore } from '@/features/content/stores/contentItemDetailStore.js';
+    import { useContentItemsStore } from '@/features/content/stores/contentItemsStore.js';
+    import { useProjectsStore } from '@/features/projects/stores/projectsStore.js';
+    import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
 
     const route = useRoute();
     const router = useRouter();
diff --git a/frontend/src/views/app/ContentItemsView.vue b/frontend/src/features/content/views/ContentItemsView.vue
similarity index 95%
rename from frontend/src/views/app/ContentItemsView.vue
rename to frontend/src/features/content/views/ContentItemsView.vue
index 9d25a60..c2fdb8d 100644
--- a/frontend/src/views/app/ContentItemsView.vue
+++ b/frontend/src/features/content/views/ContentItemsView.vue
@@ -1,7 +1,7 @@
 <script setup>
     import { useI18n } from 'vue-i18n';
-    import { useAuthStore } from '@/stores/authStore.js';
-    import { useContentItemsStore } from '@/stores/contentItemsStore.js';
+    import { useAuthStore } from '@/features/auth/stores/authStore.js';
+    import { useContentItemsStore } from '@/features/content/stores/contentItemsStore.js';
 
     const { t } = useI18n();
     const authStore = useAuthStore();
diff --git a/frontend/src/views/app/MediaLibraryView.vue b/frontend/src/features/content/views/MediaLibraryView.vue
similarity index 100%
rename from frontend/src/views/app/MediaLibraryView.vue
rename to frontend/src/features/content/views/MediaLibraryView.vue
diff --git a/frontend/src/views/svg/Facebook.vue b/frontend/src/features/landing/svg/Facebook.vue
similarity index 100%
rename from frontend/src/views/svg/Facebook.vue
rename to frontend/src/features/landing/svg/Facebook.vue
diff --git a/frontend/src/views/svg/Hutopy.vue b/frontend/src/features/landing/svg/Hutopy.vue
similarity index 100%
rename from frontend/src/views/svg/Hutopy.vue
rename to frontend/src/features/landing/svg/Hutopy.vue
diff --git a/frontend/src/views/svg/Instagram.vue b/frontend/src/features/landing/svg/Instagram.vue
similarity index 100%
rename from frontend/src/views/svg/Instagram.vue
rename to frontend/src/features/landing/svg/Instagram.vue
diff --git a/frontend/src/views/svg/Linkedin.vue b/frontend/src/features/landing/svg/Linkedin.vue
similarity index 100%
rename from frontend/src/views/svg/Linkedin.vue
rename to frontend/src/features/landing/svg/Linkedin.vue
diff --git a/frontend/src/views/svg/Reddit.vue b/frontend/src/features/landing/svg/Reddit.vue
similarity index 100%
rename from frontend/src/views/svg/Reddit.vue
rename to frontend/src/features/landing/svg/Reddit.vue
diff --git a/frontend/src/views/svg/Tiktok.vue b/frontend/src/features/landing/svg/Tiktok.vue
similarity index 100%
rename from frontend/src/views/svg/Tiktok.vue
rename to frontend/src/features/landing/svg/Tiktok.vue
diff --git a/frontend/src/views/svg/Web.vue b/frontend/src/features/landing/svg/Web.vue
similarity index 100%
rename from frontend/src/views/svg/Web.vue
rename to frontend/src/features/landing/svg/Web.vue
diff --git a/frontend/src/views/svg/X.vue b/frontend/src/features/landing/svg/X.vue
similarity index 100%
rename from frontend/src/views/svg/X.vue
rename to frontend/src/features/landing/svg/X.vue
diff --git a/frontend/src/views/svg/Youtube.vue b/frontend/src/features/landing/svg/Youtube.vue
similarity index 100%
rename from frontend/src/views/svg/Youtube.vue
rename to frontend/src/features/landing/svg/Youtube.vue
diff --git a/frontend/src/views/main/Landing.vue b/frontend/src/features/landing/views/Landing.vue
similarity index 100%
rename from frontend/src/views/main/Landing.vue
rename to frontend/src/features/landing/views/Landing.vue
diff --git a/frontend/src/stores/notificationsStore.js b/frontend/src/features/notifications/stores/notificationsStore.js
similarity index 94%
rename from frontend/src/stores/notificationsStore.js
rename to frontend/src/features/notifications/stores/notificationsStore.js
index fae926a..85d6c44 100644
--- a/frontend/src/stores/notificationsStore.js
+++ b/frontend/src/features/notifications/stores/notificationsStore.js
@@ -1,7 +1,7 @@
 import { computed, ref, watch } from 'vue';
 import { defineStore } from 'pinia';
-import { useAuthStore } from '@/stores/authStore.js';
-import { useWorkspaceStore } from '@/stores/workspaceStore.js';
+import { useAuthStore } from '@/features/auth/stores/authStore.js';
+import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
 import { useClient } from '@/plugins/api.js';
 
 export const useNotificationsStore = defineStore('notifications', () => {
diff --git a/frontend/src/stores/projectsStore.js b/frontend/src/features/projects/stores/projectsStore.js
similarity index 94%
rename from frontend/src/stores/projectsStore.js
rename to frontend/src/features/projects/stores/projectsStore.js
index 4b4add5..cc557a8 100644
--- a/frontend/src/stores/projectsStore.js
+++ b/frontend/src/features/projects/stores/projectsStore.js
@@ -1,7 +1,7 @@
 import { ref, watch } from 'vue';
 import { defineStore } from 'pinia';
-import { useAuthStore } from '@/stores/authStore.js';
-import { useWorkspaceStore } from '@/stores/workspaceStore.js';
+import { useAuthStore } from '@/features/auth/stores/authStore.js';
+import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
 import { useClient } from '@/plugins/api.js';
 
 export const useProjectsStore = defineStore('projects', () => {
diff --git a/frontend/src/views/app/ProjectDetailView.vue b/frontend/src/features/projects/views/ProjectDetailView.vue
similarity index 95%
rename from frontend/src/views/app/ProjectDetailView.vue
rename to frontend/src/features/projects/views/ProjectDetailView.vue
index 14ce21a..9956050 100644
--- a/frontend/src/views/app/ProjectDetailView.vue
+++ b/frontend/src/features/projects/views/ProjectDetailView.vue
@@ -1,10 +1,10 @@
 <script setup>
     import { computed } from 'vue';
     import { useRoute } from 'vue-router';
-    import { useAuthStore } from '@/stores/authStore.js';
-    import { useWorkspaceStore } from '@/stores/workspaceStore.js';
-    import { useProjectsStore } from '@/stores/projectsStore.js';
-    import { useContentItemsStore } from '@/stores/contentItemsStore.js';
+    import { useAuthStore } from '@/features/auth/stores/authStore.js';
+    import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
+    import { useProjectsStore } from '@/features/projects/stores/projectsStore.js';
+    import { useContentItemsStore } from '@/features/content/stores/contentItemsStore.js';
 
     const authStore = useAuthStore();
     const route = useRoute();
diff --git a/frontend/src/views/app/ProjectsView.vue b/frontend/src/features/projects/views/ProjectsView.vue
similarity index 96%
rename from frontend/src/views/app/ProjectsView.vue
rename to frontend/src/features/projects/views/ProjectsView.vue
index 5b650e9..aecad42 100644
--- a/frontend/src/views/app/ProjectsView.vue
+++ b/frontend/src/features/projects/views/ProjectsView.vue
@@ -2,10 +2,10 @@
     import { computed, reactive, ref, watch } from 'vue';
     import { useRoute } from 'vue-router';
     import { useI18n } from 'vue-i18n';
-    import { useAuthStore } from '@/stores/authStore.js';
-    import { useClientsStore } from '@/stores/clientsStore.js';
-    import { useWorkspaceStore } from '@/stores/workspaceStore.js';
-    import { useProjectsStore } from '@/stores/projectsStore.js';
+    import { useAuthStore } from '@/features/auth/stores/authStore.js';
+    import { useClientsStore } from '@/features/clients/stores/clientsStore.js';
+    import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
+    import { useProjectsStore } from '@/features/projects/stores/projectsStore.js';
 
     const route = useRoute();
     const authStore = useAuthStore();
diff --git a/frontend/src/stores/reviewQueueStore.js b/frontend/src/features/reviews/stores/reviewQueueStore.js
similarity index 91%
rename from frontend/src/stores/reviewQueueStore.js
rename to frontend/src/features/reviews/stores/reviewQueueStore.js
index 4d0639b..191f661 100644
--- a/frontend/src/stores/reviewQueueStore.js
+++ b/frontend/src/features/reviews/stores/reviewQueueStore.js
@@ -1,7 +1,7 @@
 import { computed } from 'vue';
 import { defineStore } from 'pinia';
-import { useContentItemsStore } from '@/stores/contentItemsStore.js';
-import { useProjectsStore } from '@/stores/projectsStore.js';
+import { useContentItemsStore } from '@/features/content/stores/contentItemsStore.js';
+import { useProjectsStore } from '@/features/projects/stores/projectsStore.js';
 
 const stageByStatus = {
     Draft: 'Draft',
diff --git a/frontend/src/views/app/ReviewQueueView.vue b/frontend/src/features/reviews/views/ReviewQueueView.vue
similarity index 96%
rename from frontend/src/views/app/ReviewQueueView.vue
rename to frontend/src/features/reviews/views/ReviewQueueView.vue
index 3e44056..8dc6878 100644
--- a/frontend/src/views/app/ReviewQueueView.vue
+++ b/frontend/src/features/reviews/views/ReviewQueueView.vue
@@ -1,6 +1,6 @@
 <script setup>
     import { useI18n } from 'vue-i18n';
-    import { useReviewQueueStore } from '@/stores/reviewQueueStore.js';
+    import { useReviewQueueStore } from '@/features/reviews/stores/reviewQueueStore.js';
 
     const { t } = useI18n();
     const reviewQueueStore = useReviewQueueStore();
diff --git a/frontend/src/views/app/IntegrationsSettingsView.vue b/frontend/src/features/settings/views/IntegrationsSettingsView.vue
similarity index 100%
rename from frontend/src/views/app/IntegrationsSettingsView.vue
rename to frontend/src/features/settings/views/IntegrationsSettingsView.vue
diff --git a/frontend/src/views/app/SettingsLayoutView.vue b/frontend/src/features/settings/views/SettingsLayoutView.vue
similarity index 97%
rename from frontend/src/views/app/SettingsLayoutView.vue
rename to frontend/src/features/settings/views/SettingsLayoutView.vue
index a98cb3c..7384ffd 100644
--- a/frontend/src/views/app/SettingsLayoutView.vue
+++ b/frontend/src/features/settings/views/SettingsLayoutView.vue
@@ -1,6 +1,6 @@
 <script setup>
     import { useI18n } from 'vue-i18n';
-    import { useAuthStore } from '@/stores/authStore.js';
+    import { useAuthStore } from '@/features/auth/stores/authStore.js';
 
     const authStore = useAuthStore();
     const { t } = useI18n();
diff --git a/frontend/src/stores/userProfileStore.js b/frontend/src/features/user-profile/stores/userProfileStore.js
similarity index 98%
rename from frontend/src/stores/userProfileStore.js
rename to frontend/src/features/user-profile/stores/userProfileStore.js
index db511c2..e1b0a13 100644
--- a/frontend/src/stores/userProfileStore.js
+++ b/frontend/src/features/user-profile/stores/userProfileStore.js
@@ -1,6 +1,6 @@
 import {computed, watch} from 'vue'
 import {defineStore} from 'pinia'
-import {useAuthStore} from "@/stores/authStore.js";
+import {useAuthStore} from "@/features/auth/stores/authStore.js";
 import {useClient} from "@/plugins/api.js";
 import {useSessionStorage} from "@vueuse/core";
 
diff --git a/frontend/src/views/app/UserSettingsView.vue b/frontend/src/features/user-profile/views/UserSettingsView.vue
similarity index 98%
rename from frontend/src/views/app/UserSettingsView.vue
rename to frontend/src/features/user-profile/views/UserSettingsView.vue
index 5b6feb9..4cf341c 100644
--- a/frontend/src/views/app/UserSettingsView.vue
+++ b/frontend/src/features/user-profile/views/UserSettingsView.vue
@@ -3,7 +3,7 @@
     import { useI18n } from 'vue-i18n';
     import AppAvatar from '@/components/AppAvatar.vue';
     import ImageCropperDialog from '@/components/ImageCropperDialog.vue';
-    import { useUserProfileStore } from '@/stores/userProfileStore.js';
+    import { useUserProfileStore } from '@/features/user-profile/stores/userProfileStore.js';
 
     const userProfileStore = useUserProfileStore();
     const { t } = useI18n();
diff --git a/frontend/src/stores/workspaceStore.js b/frontend/src/features/workspaces/stores/workspaceStore.js
similarity index 98%
rename from frontend/src/stores/workspaceStore.js
rename to frontend/src/features/workspaces/stores/workspaceStore.js
index e3006d4..ccf4c4c 100644
--- a/frontend/src/stores/workspaceStore.js
+++ b/frontend/src/features/workspaces/stores/workspaceStore.js
@@ -1,6 +1,6 @@
 import { computed, ref, watch } from 'vue';
 import { defineStore } from 'pinia';
-import { useAuthStore } from '@/stores/authStore.js';
+import { useAuthStore } from '@/features/auth/stores/authStore.js';
 import { useClient } from '@/plugins/api.js';
 
 export const useWorkspaceStore = defineStore('workspace', () => {
diff --git a/frontend/src/views/app/DashboardView.vue b/frontend/src/features/workspaces/views/DashboardView.vue
similarity index 98%
rename from frontend/src/views/app/DashboardView.vue
rename to frontend/src/features/workspaces/views/DashboardView.vue
index 996c4db..dc8c7a4 100644
--- a/frontend/src/views/app/DashboardView.vue
+++ b/frontend/src/features/workspaces/views/DashboardView.vue
@@ -2,9 +2,9 @@
     import { computed, ref } from 'vue';
     import { useI18n } from 'vue-i18n';
     import { mdiChevronLeft, mdiChevronRight } from '@mdi/js';
-    import { useWorkspaceStore } from '@/stores/workspaceStore.js';
-    import { useProjectsStore } from '@/stores/projectsStore.js';
-    import { useContentItemsStore } from '@/stores/contentItemsStore.js';
+    import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
+    import { useProjectsStore } from '@/features/projects/stores/projectsStore.js';
+    import { useContentItemsStore } from '@/features/content/stores/contentItemsStore.js';
 
     const { t, locale } = useI18n();
     const workspaceStore = useWorkspaceStore();
diff --git a/frontend/src/views/app/OverviewView.vue b/frontend/src/features/workspaces/views/OverviewView.vue
similarity index 98%
rename from frontend/src/views/app/OverviewView.vue
rename to frontend/src/features/workspaces/views/OverviewView.vue
index 2f07f5d..444abc6 100644
--- a/frontend/src/views/app/OverviewView.vue
+++ b/frontend/src/features/workspaces/views/OverviewView.vue
@@ -1,8 +1,8 @@
 <script setup>
     import { computed, onMounted, ref, watch } from 'vue';
     import { useI18n } from 'vue-i18n';
-    import { useAuthStore } from '@/stores/authStore.js';
-    import { useWorkspaceStore } from '@/stores/workspaceStore.js';
+    import { useAuthStore } from '@/features/auth/stores/authStore.js';
+    import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
     import { useClient } from '@/plugins/api.js';
 
     const { locale, t } = useI18n();
diff --git a/frontend/src/views/app/WorkspaceCreateView.vue b/frontend/src/features/workspaces/views/WorkspaceCreateView.vue
similarity index 98%
rename from frontend/src/views/app/WorkspaceCreateView.vue
rename to frontend/src/features/workspaces/views/WorkspaceCreateView.vue
index ca11639..96a9282 100644
--- a/frontend/src/views/app/WorkspaceCreateView.vue
+++ b/frontend/src/features/workspaces/views/WorkspaceCreateView.vue
@@ -2,7 +2,7 @@
     import { computed, reactive, ref } from 'vue';
     import { useRouter } from 'vue-router';
     import { useI18n } from 'vue-i18n';
-    import { useWorkspaceStore } from '@/stores/workspaceStore.js';
+    import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
 
     const router = useRouter();
     const { t } = useI18n();
diff --git a/frontend/src/views/app/WorkspaceSettingsView.vue b/frontend/src/features/workspaces/views/WorkspaceSettingsView.vue
similarity index 99%
rename from frontend/src/views/app/WorkspaceSettingsView.vue
rename to frontend/src/features/workspaces/views/WorkspaceSettingsView.vue
index c214aba..f066200 100644
--- a/frontend/src/views/app/WorkspaceSettingsView.vue
+++ b/frontend/src/features/workspaces/views/WorkspaceSettingsView.vue
@@ -1,7 +1,7 @@
 <script setup>
     import { computed, reactive, ref, watch } from 'vue';
     import { useI18n } from 'vue-i18n';
-    import { useWorkspaceStore } from '@/stores/workspaceStore.js';
+    import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
     import {
         mdiAccountGroupOutline,
         mdiCheckCircleOutline,
diff --git a/frontend/src/layouts/.gitkeep b/frontend/src/layouts/.gitkeep
deleted file mode 100644
index 8b13789..0000000
--- a/frontend/src/layouts/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/frontend/src/views/main/AppBar.vue b/frontend/src/layouts/main/AppBar.vue
similarity index 98%
rename from frontend/src/views/main/AppBar.vue
rename to frontend/src/layouts/main/AppBar.vue
index f067ccd..4913f24 100644
--- a/frontend/src/views/main/AppBar.vue
+++ b/frontend/src/layouts/main/AppBar.vue
@@ -2,8 +2,8 @@
     import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
     import { useRoute, useRouter } from 'vue-router';
     import { useI18n } from 'vue-i18n';
-    import { useAuthStore } from '@/stores/authStore.js';
-    import { useWorkspaceStore } from '@/stores/workspaceStore.js';
+    import { useAuthStore } from '@/features/auth/stores/authStore.js';
+    import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
     import {
         mdiChevronDown,
         mdiCogOutline,
diff --git a/frontend/src/views/main/AppSidebar.vue b/frontend/src/layouts/main/AppSidebar.vue
similarity index 98%
rename from frontend/src/views/main/AppSidebar.vue
rename to frontend/src/layouts/main/AppSidebar.vue
index 27aa561..0908d81 100644
--- a/frontend/src/views/main/AppSidebar.vue
+++ b/frontend/src/layouts/main/AppSidebar.vue
@@ -3,13 +3,13 @@
     import { useRoute, useRouter } from 'vue-router';
     import { useI18n } from 'vue-i18n';
     import AppAvatar from '@/components/AppAvatar.vue';
-    import { useAuthStore } from '@/stores/authStore.js';
-    import { useChannelsStore } from '@/stores/channelsStore.js';
+    import { useAuthStore } from '@/features/auth/stores/authStore.js';
+    import { useChannelsStore } from '@/features/channels/stores/channelsStore.js';
     import { useLanguageStore } from '@/stores/languageStore.js';
-    import { useNotificationsStore } from '@/stores/notificationsStore.js';
-    import { useContentItemsStore } from '@/stores/contentItemsStore.js';
-    import { useProjectsStore } from '@/stores/projectsStore.js';
-    import { useUserProfileStore } from '@/stores/userProfileStore.js';
+    import { useNotificationsStore } from '@/features/notifications/stores/notificationsStore.js';
+    import { useContentItemsStore } from '@/features/content/stores/contentItemsStore.js';
+    import { useProjectsStore } from '@/features/projects/stores/projectsStore.js';
+    import { useUserProfileStore } from '@/features/user-profile/stores/userProfileStore.js';
     import {
         mdiBellOutline,
         mdiCalendarMonthOutline,
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 2e498a0..bac5d9b 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -19,18 +19,18 @@ import {
     VTextField,
 } from 'vuetify/components';
 import vueGoogleOauth from 'vue3-google-login';
-import { useAuthStore } from '@/stores/authStore.js';
-import { useUserProfileStore } from '@/stores/userProfileStore.js';
+import { useAuthStore } from '@/features/auth/stores/authStore.js';
+import { useUserProfileStore } from '@/features/user-profile/stores/userProfileStore.js';
 import Toast, { POSITION } from 'vue-toastification';
 import 'vue-toastification/dist/index.css';
 import './assets/main.css';
-import { useWorkspaceStore } from '@/stores/workspaceStore.js';
-import { useReviewQueueStore } from '@/stores/reviewQueueStore.js';
-import { useContentItemsStore } from '@/stores/contentItemsStore.js';
-import { useClientsStore } from '@/stores/clientsStore.js';
-import { useProjectsStore } from '@/stores/projectsStore.js';
-import { useNotificationsStore } from '@/stores/notificationsStore.js';
-import { useChannelsStore } from '@/stores/channelsStore.js';
+import { useWorkspaceStore } from '@/features/workspaces/stores/workspaceStore.js';
+import { useReviewQueueStore } from '@/features/reviews/stores/reviewQueueStore.js';
+import { useContentItemsStore } from '@/features/content/stores/contentItemsStore.js';
+import { useClientsStore } from '@/features/clients/stores/clientsStore.js';
+import { useProjectsStore } from '@/features/projects/stores/projectsStore.js';
+import { useNotificationsStore } from '@/features/notifications/stores/notificationsStore.js';
+import { useChannelsStore } from '@/features/channels/stores/channelsStore.js';
 import { i18n } from '@/plugins/i18n.js';
 import config from '@/config.js';
 
diff --git a/frontend/src/plugins/api.js b/frontend/src/plugins/api.js
index bd35458..84783e2 100644
--- a/frontend/src/plugins/api.js
+++ b/frontend/src/plugins/api.js
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { useAuthStore } from '@/stores/authStore.js';
+import { useAuthStore } from '@/features/auth/stores/authStore.js';
 import config from '@/config.js';
 
 export function useClient() {
diff --git a/frontend/src/router/router.js b/frontend/src/router/router.js
index 0d6de7a..e57229c 100644
--- a/frontend/src/router/router.js
+++ b/frontend/src/router/router.js
@@ -1,26 +1,26 @@
-import { useAuthStore } from '@/stores/authStore.js';
+import { useAuthStore } from '@/features/auth/stores/authStore.js';
 import { createRouter, createWebHistory } from 'vue-router';
 
-const LoginView = () => import('@/views/auth/LoginView.vue');
-const Landing = () => import('@/views/main/Landing.vue');
-const RegisterView = () => import('@/views/auth/RegisterView.vue');
-const ForgotPasswordView = () => import('@/views/auth/ForgotPasswordView.vue');
-const ResetPasswordView = () => import('@/views/auth/ResetPasswordView.vue');
-const VerifyEmailView = () => import('@/views/auth/VerifyEmailView.vue');
-const OverviewView = () => import('@/views/app/OverviewView.vue');
-const DashboardView = () => import('@/views/app/DashboardView.vue');
-const ChannelsView = () => import('@/views/app/ChannelsView.vue');
-const CampaignsView = () => import('@/views/app/ProjectsView.vue');
-const CampaignDetailView = () => import('@/views/app/ProjectDetailView.vue');
-const MediaLibraryView = () => import('@/views/app/MediaLibraryView.vue');
-const WorkspaceCreateView = () => import('@/views/app/WorkspaceCreateView.vue');
-const SettingsLayoutView = () => import('@/views/app/SettingsLayoutView.vue');
-const UserSettingsView = () => import('@/views/app/UserSettingsView.vue');
-const IntegrationsSettingsView = () => import('@/views/app/IntegrationsSettingsView.vue');
-const WorkspaceSettingsView = () => import('@/views/app/WorkspaceSettingsView.vue');
-const ReviewQueueView = () => import('@/views/app/ReviewQueueView.vue');
-const ContentItemsView = () => import('@/views/app/ContentItemsView.vue');
-const ContentItemDetailView = () => import('@/views/app/ContentItemDetailView.vue');
+const LoginView = () => import('@/features/auth/views/LoginView.vue');
+const Landing = () => import('@/features/landing/views/Landing.vue');
+const RegisterView = () => import('@/features/auth/views/RegisterView.vue');
+const ForgotPasswordView = () => import('@/features/auth/views/ForgotPasswordView.vue');
+const ResetPasswordView = () => import('@/features/auth/views/ResetPasswordView.vue');
+const VerifyEmailView = () => import('@/features/auth/views/VerifyEmailView.vue');
+const OverviewView = () => import('@/features/workspaces/views/OverviewView.vue');
+const DashboardView = () => import('@/features/workspaces/views/DashboardView.vue');
+const ChannelsView = () => import('@/features/channels/views/ChannelsView.vue');
+const CampaignsView = () => import('@/features/projects/views/ProjectsView.vue');
+const CampaignDetailView = () => import('@/features/projects/views/ProjectDetailView.vue');
+const MediaLibraryView = () => import('@/features/content/views/MediaLibraryView.vue');
+const WorkspaceCreateView = () => import('@/features/workspaces/views/WorkspaceCreateView.vue');
+const SettingsLayoutView = () => import('@/features/settings/views/SettingsLayoutView.vue');
+const UserSettingsView = () => import('@/features/user-profile/views/UserSettingsView.vue');
+const IntegrationsSettingsView = () => import('@/features/settings/views/IntegrationsSettingsView.vue');
+const WorkspaceSettingsView = () => import('@/features/workspaces/views/WorkspaceSettingsView.vue');
+const ReviewQueueView = () => import('@/features/reviews/views/ReviewQueueView.vue');
+const ContentItemsView = () => import('@/features/content/views/ContentItemsView.vue');
+const ContentItemDetailView = () => import('@/features/content/views/ContentItemDetailView.vue');
 
 const routes = [
     {
diff --git a/frontend/src/utils/youtube.js b/frontend/src/utils/youtube.js
deleted file mode 100644
index 51de3a1..0000000
--- a/frontend/src/utils/youtube.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Regular expression for matching YouTube video IDs in various URL formats
- */
-const VIDEO_ID_REGEX = /(?:youtube\.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|.*[?&]v=)|youtu\.be\/)([^"&?\/\s]{11})/i;
-
-/**
- * Regular expression for matching standalone YouTube video IDs
- */
-const SHORT_URL_REGEX = /^[a-zA-Z0-9_-]{11}$/;
-
-/**
- * Extracts the video ID from a YouTube URL or returns the input if it's already a video ID.
- * @param {string} input - The YouTube URL or video ID
- * @returns {string|null} The extracted video ID or null if invalid
- */
-export function extractVideoId(input) {
-    if (!input) return null;
-
-    // If it's already a valid video ID, return it
-    if (isValidVideoId(input)) {
-        return input;
-    }
-
-    // Try to extract video ID from URL
-    const match = input.match(VIDEO_ID_REGEX);
-    return match ? match[1] : null;
-}
-
-/**
- * Validates if the input is a valid YouTube video ID.
- * @param {string} input - The video ID to validate
- * @returns {boolean} True if the input is a valid video ID
- */
-export function isValidVideoId(input) {
-    if (!input) return false;
-    return SHORT_URL_REGEX.test(input);
-}
-
-/**
- * Validates if the input is a valid YouTube URL or video ID.
- * @param {string} input - The URL or video ID to validate
- * @returns {boolean} True if the input is a valid YouTube URL or video ID
- */
-export function isValidYouTubeUrlOrId(input) {
-    if (!input) return false;
-
-    // Check if it's a valid video ID
-    if (isValidVideoId(input)) {
-        return true;
-    }
-
-    // Check if it's a valid YouTube URL
-    return VIDEO_ID_REGEX.test(input);
-}
-
-/**
- * Builds a YouTube embed URL from a video ID.
- * @param {string} videoId - The YouTube video ID
- * @returns {string} The YouTube embed URL
- */
-export function buildEmbedUrl(videoId) {
-    if (!videoId) return '';
-    return `https://www.youtube.com/embed/${videoId}`;
-} 
\ No newline at end of file