diff --git a/app/slices/agent/components/agentChat/Provider.vue b/app/slices/agent/components/agent/chat/Provider.vue
similarity index 100%
rename from app/slices/agent/components/agentChat/Provider.vue
rename to app/slices/agent/components/agent/chat/Provider.vue
diff --git a/app/slices/agent/components/agentList/Card.vue b/app/slices/agent/components/agent/list/Card.vue
similarity index 100%
rename from app/slices/agent/components/agentList/Card.vue
rename to app/slices/agent/components/agent/list/Card.vue
diff --git a/app/slices/agent/components/agentList/Provider.vue b/app/slices/agent/components/agent/list/Provider.vue
similarity index 100%
rename from app/slices/agent/components/agentList/Provider.vue
rename to app/slices/agent/components/agent/list/Provider.vue
diff --git a/app/slices/bridle/components/bridleChat/Empty.vue b/app/slices/bridle/components/bridle/chat/Empty.vue
similarity index 100%
rename from app/slices/bridle/components/bridleChat/Empty.vue
rename to app/slices/bridle/components/bridle/chat/Empty.vue
diff --git a/app/slices/bridle/components/bridleChat/Input.vue b/app/slices/bridle/components/bridle/chat/Input.vue
similarity index 100%
rename from app/slices/bridle/components/bridleChat/Input.vue
rename to app/slices/bridle/components/bridle/chat/Input.vue
diff --git a/app/slices/bridle/components/bridleChat/Message.vue b/app/slices/bridle/components/bridle/chat/Message.vue
similarity index 100%
rename from app/slices/bridle/components/bridleChat/Message.vue
rename to app/slices/bridle/components/bridle/chat/Message.vue
diff --git a/app/slices/bridle/components/bridleChat/Provider.vue b/app/slices/bridle/components/bridle/chat/Provider.vue
similarity index 100%
rename from app/slices/bridle/components/bridleChat/Provider.vue
rename to app/slices/bridle/components/bridle/chat/Provider.vue
diff --git a/app/slices/common/components/landingHero/AgentCard.vue b/app/slices/common/components/landing/hero/AgentCard.vue
similarity index 100%
rename from app/slices/common/components/landingHero/AgentCard.vue
rename to app/slices/common/components/landing/hero/AgentCard.vue
diff --git a/app/slices/common/components/landingHero/Provider.vue b/app/slices/common/components/landing/hero/Provider.vue
similarity index 100%
rename from app/slices/common/components/landingHero/Provider.vue
rename to app/slices/common/components/landing/hero/Provider.vue
diff --git a/app/slices/template/components/templateList/Provider.vue b/app/slices/template/components/template/list/Provider.vue
similarity index 100%
rename from app/slices/template/components/templateList/Provider.vue
rename to app/slices/template/components/template/list/Provider.vue
diff --git a/app/slices/template/pages/templates.vue b/app/slices/template/pages/templates/index.vue
similarity index 100%
rename from app/slices/template/pages/templates.vue
rename to app/slices/template/pages/templates/index.vue