diff --git a/src/modules/AieraChat/ContentRow/index.tsx b/src/modules/AieraChat/components/ContentRow/index.tsx
similarity index 100%
rename from src/modules/AieraChat/ContentRow/index.tsx
rename to src/modules/AieraChat/components/ContentRow/index.tsx
diff --git a/src/modules/AieraChat/Header/Search/index.tsx b/src/modules/AieraChat/components/Header/Search/index.tsx
similarity index 98%
rename from src/modules/AieraChat/Header/Search/index.tsx
rename to src/modules/AieraChat/components/Header/Search/index.tsx
index a6309d3b1..43e8e42ea 100644
--- a/src/modules/AieraChat/Header/Search/index.tsx
+++ b/src/modules/AieraChat/components/Header/Search/index.tsx
@@ -4,9 +4,9 @@ import { MicroSearch } from '@aiera/client-sdk/components/Svg/MicroSearch';
 import { VirtuosoMessageListMethods } from '@virtuoso.dev/message-list';
 import classNames from 'classnames';
 import React, { ChangeEvent, KeyboardEvent, RefObject, useCallback, useEffect, useState } from 'react';
-import { useChatStore } from '../../store';
+import { useChatStore } from '../../../store';
 import { IconButton } from '../../IconButton';
-import { ChatMessage, ChatMessageType } from '../../services/messages';
+import { ChatMessage, ChatMessageType } from '../../../services/messages';
 import { CitableContent, ContentBlock } from '../../Messages/MessageFactory/Block';
 import { ListItemContent } from '../../Messages/MessageFactory/Block/List';
 
diff --git a/src/modules/AieraChat/Header/index.tsx b/src/modules/AieraChat/components/Header/index.tsx
similarity index 92%
rename from src/modules/AieraChat/Header/index.tsx
rename to src/modules/AieraChat/components/Header/index.tsx
index 104e6599d..923339d96 100644
--- a/src/modules/AieraChat/Header/index.tsx
+++ b/src/modules/AieraChat/components/Header/index.tsx
@@ -3,7 +3,7 @@ import React, { RefObject } from 'react';
 import { Search } from './Search';
 import { VirtuosoMessageListMethods } from '@virtuoso.dev/message-list';
 import { IconButton } from '../IconButton';
-import { ChatMessage } from '../services/messages';
+import { ChatMessage } from '../../services/messages';
 
 export function Header({
     onOpenMenu,
diff --git a/src/modules/AieraChat/Hint/index.tsx b/src/modules/AieraChat/components/Hint/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Hint/index.tsx
rename to src/modules/AieraChat/components/Hint/index.tsx
diff --git a/src/modules/AieraChat/Hint/styles.css b/src/modules/AieraChat/components/Hint/styles.css
similarity index 100%
rename from src/modules/AieraChat/Hint/styles.css
rename to src/modules/AieraChat/components/Hint/styles.css
diff --git a/src/modules/AieraChat/IconButton/index.tsx b/src/modules/AieraChat/components/IconButton/index.tsx
similarity index 100%
rename from src/modules/AieraChat/IconButton/index.tsx
rename to src/modules/AieraChat/components/IconButton/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Block/Chart/Area/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Block/Chart/Area/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Messages/MessageFactory/Block/Chart/Area/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Block/Chart/Area/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Block/Chart/Bar/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Block/Chart/Bar/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Messages/MessageFactory/Block/Chart/Bar/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Block/Chart/Bar/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Block/Chart/Line/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Block/Chart/Line/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Messages/MessageFactory/Block/Chart/Line/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Block/Chart/Line/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Block/Chart/Pie/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Block/Chart/Pie/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Messages/MessageFactory/Block/Chart/Pie/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Block/Chart/Pie/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Block/Chart/Scatter/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Block/Chart/Scatter/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Messages/MessageFactory/Block/Chart/Scatter/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Block/Chart/Scatter/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Block/Chart/Tree/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Block/Chart/Tree/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Messages/MessageFactory/Block/Chart/Tree/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Block/Chart/Tree/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Block/Chart/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Block/Chart/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Messages/MessageFactory/Block/Chart/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Block/Chart/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Block/Image/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Block/Image/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Messages/MessageFactory/Block/Image/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Block/Image/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Block/List/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Block/List/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Messages/MessageFactory/Block/List/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Block/List/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Block/Quote/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Block/Quote/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Messages/MessageFactory/Block/Quote/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Block/Quote/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Block/Table/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Block/Table/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Messages/MessageFactory/Block/Table/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Block/Table/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Block/Text/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Block/Text/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Messages/MessageFactory/Block/Text/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Block/Text/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Block/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Block/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Messages/MessageFactory/Block/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Block/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Citation/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Citation/index.tsx
similarity index 92%
rename from src/modules/AieraChat/Messages/MessageFactory/Citation/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Citation/index.tsx
index 130fbcf8c..d6ba24467 100644
--- a/src/modules/AieraChat/Messages/MessageFactory/Citation/index.tsx
+++ b/src/modules/AieraChat/components/Messages/MessageFactory/Citation/index.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import React from 'react';
-import { useChatStore } from '../../../store';
+import { useChatStore } from '../../../../store';
 
 export const Citation = () => {
     const { onSelectSource } = useChatStore();
diff --git a/src/modules/AieraChat/Messages/MessageFactory/Loading/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/Loading/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Messages/MessageFactory/Loading/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/Loading/index.tsx
diff --git a/src/modules/AieraChat/Messages/MessageFactory/MessagePrompt/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/MessagePrompt/index.tsx
similarity index 94%
rename from src/modules/AieraChat/Messages/MessageFactory/MessagePrompt/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/MessagePrompt/index.tsx
index d9743a740..c28ea118c 100644
--- a/src/modules/AieraChat/Messages/MessageFactory/MessagePrompt/index.tsx
+++ b/src/modules/AieraChat/components/Messages/MessageFactory/MessagePrompt/index.tsx
@@ -1,8 +1,8 @@
 import { MicroQuestionMark } from '@aiera/client-sdk/components/Svg/MicroQuestionMark';
 import classNames from 'classnames';
 import React from 'react';
-import { ChatMessagePrompt } from '../../../services/messages';
-import { useChatStore } from '../../../store';
+import { ChatMessagePrompt } from '../../../../services/messages';
+import { useChatStore } from '../../../../store';
 
 export const MessagePrompt = ({
     data,
diff --git a/src/modules/AieraChat/Messages/MessageFactory/MessageResponse/Footer/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/MessageResponse/Footer/index.tsx
similarity index 99%
rename from src/modules/AieraChat/Messages/MessageFactory/MessageResponse/Footer/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/MessageResponse/Footer/index.tsx
index 1d418d9f2..f122271e8 100644
--- a/src/modules/AieraChat/Messages/MessageFactory/MessageResponse/Footer/index.tsx
+++ b/src/modules/AieraChat/components/Messages/MessageFactory/MessageResponse/Footer/index.tsx
@@ -4,8 +4,8 @@ import { MicroFolder } from '@aiera/client-sdk/components/Svg/MicroFolder';
 import { MicroRefresh } from '@aiera/client-sdk/components/Svg/MicroRefresh';
 import { MicroThumbDown } from '@aiera/client-sdk/components/Svg/MicroThumbDown';
 import { MicroThumbUp } from '@aiera/client-sdk/components/Svg/MicroThumbUp';
-import { AddSourceDialog } from '@aiera/client-sdk/modules/AieraChat/AddSourceDialog';
-import { IconButton } from '@aiera/client-sdk/modules/AieraChat/IconButton';
+import { AddSourceDialog } from '@aiera/client-sdk/modules/AieraChat/modals/AddSourceDialog';
+import { IconButton } from '@aiera/client-sdk/modules/AieraChat/components/IconButton';
 import { ChatMessage } from '@aiera/client-sdk/modules/AieraChat/services/messages';
 import { Source } from '@aiera/client-sdk/modules/AieraChat/store';
 import classNames from 'classnames';
diff --git a/src/modules/AieraChat/Messages/MessageFactory/MessageResponse/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/MessageResponse/index.tsx
similarity index 97%
rename from src/modules/AieraChat/Messages/MessageFactory/MessageResponse/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/MessageResponse/index.tsx
index 5d47308a0..d54090201 100644
--- a/src/modules/AieraChat/Messages/MessageFactory/MessageResponse/index.tsx
+++ b/src/modules/AieraChat/components/Messages/MessageFactory/MessageResponse/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ChatMessageResponse, ChatMessageStatus } from '../../../services/messages';
+import { ChatMessageResponse, ChatMessageStatus } from '../../../../services/messages';
 import { Block } from '../Block';
 import { Loading } from '../Loading';
 import { Footer } from './Footer';
diff --git a/src/modules/AieraChat/Messages/MessageFactory/SearchableText/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/SearchableText/index.tsx
similarity index 93%
rename from src/modules/AieraChat/Messages/MessageFactory/SearchableText/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/SearchableText/index.tsx
index c4b8b162f..405dae31c 100644
--- a/src/modules/AieraChat/Messages/MessageFactory/SearchableText/index.tsx
+++ b/src/modules/AieraChat/components/Messages/MessageFactory/SearchableText/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { useChatStore } from '../../../store';
+import { useChatStore } from '../../../../store';
 
 export function SearchableText({ text }: { text: string }) {
     const { searchTerm } = useChatStore();
diff --git a/src/modules/AieraChat/Messages/MessageFactory/SourcesResponse/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/SourcesResponse/index.tsx
similarity index 96%
rename from src/modules/AieraChat/Messages/MessageFactory/SourcesResponse/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/SourcesResponse/index.tsx
index 6fef8b957..2d26d9c17 100644
--- a/src/modules/AieraChat/Messages/MessageFactory/SourcesResponse/index.tsx
+++ b/src/modules/AieraChat/components/Messages/MessageFactory/SourcesResponse/index.tsx
@@ -2,9 +2,9 @@ import { Button } from '@aiera/client-sdk/components/Button';
 import { MicroTrash } from '@aiera/client-sdk/components/Svg/MicroTrash';
 import classNames from 'classnames';
 import React, { useCallback, useState } from 'react';
-import { AddSourceDialog } from '../../../AddSourceDialog';
-import { ChatMessageSources, ChatMessageStatus } from '../../../services/messages';
-import { Source, useChatStore } from '../../../store';
+import { AddSourceDialog } from '../../../../modals/AddSourceDialog';
+import { ChatMessageSources, ChatMessageStatus } from '../../../../services/messages';
+import { Source, useChatStore } from '../../../../store';
 import { Loading } from '../Loading';
 
 export const SourcesResponse = ({ data, onConfirm }: { onConfirm: (k: string) => void; data: ChatMessageSources }) => {
diff --git a/src/modules/AieraChat/Messages/MessageFactory/index.tsx b/src/modules/AieraChat/components/Messages/MessageFactory/index.tsx
similarity index 92%
rename from src/modules/AieraChat/Messages/MessageFactory/index.tsx
rename to src/modules/AieraChat/components/Messages/MessageFactory/index.tsx
index afb1ae538..c5d881293 100644
--- a/src/modules/AieraChat/Messages/MessageFactory/index.tsx
+++ b/src/modules/AieraChat/components/Messages/MessageFactory/index.tsx
@@ -2,7 +2,7 @@ import { VirtuosoMessageListProps } from '@virtuoso.dev/message-list';
 import React from 'react';
 import { match } from 'ts-pattern';
 import { MessageListContext } from '..';
-import { ChatMessage, ChatMessageType } from '../../services/messages';
+import { ChatMessage, ChatMessageType } from '../../../services/messages';
 import { MessagePrompt } from './MessagePrompt';
 import { MessageResponse } from './MessageResponse';
 import { SourcesResponse } from './SourcesResponse';
diff --git a/src/modules/AieraChat/Prompt/index.tsx b/src/modules/AieraChat/components/Messages/Prompt/index.tsx
similarity index 96%
rename from src/modules/AieraChat/Prompt/index.tsx
rename to src/modules/AieraChat/components/Messages/Prompt/index.tsx
index b3452dbc7..b76292644 100644
--- a/src/modules/AieraChat/Prompt/index.tsx
+++ b/src/modules/AieraChat/components/Messages/Prompt/index.tsx
@@ -2,9 +2,10 @@ import { MicroArrowUp } from '@aiera/client-sdk/components/Svg/MicroArrowUp';
 import { MicroFolder } from '@aiera/client-sdk/components/Svg/MicroFolder';
 import classNames from 'classnames';
 import React, { KeyboardEvent, useCallback, useEffect, useRef, useState } from 'react';
-import { MicroFolderOpen } from '../../../components/Svg/MicroFolderOpen';
-import { useChatStore } from '../store';
-import { Hint } from '../Hint';
+import { MicroFolderOpen } from '../../../../../components/Svg/MicroFolderOpen';
+import { useChatStore } from '../../../store';
+import { Hint } from '../../Hint';
+import './styles.css';
 
 interface PromptProps {
     onOpenSources: () => void;
diff --git a/src/modules/AieraChat/styles.css b/src/modules/AieraChat/components/Messages/Prompt/styles.css
similarity index 100%
rename from src/modules/AieraChat/styles.css
rename to src/modules/AieraChat/components/Messages/Prompt/styles.css
diff --git a/src/modules/AieraChat/Messages/SuggestedPrompts/index.tsx b/src/modules/AieraChat/components/Messages/SuggestedPrompts/index.tsx
similarity index 96%
rename from src/modules/AieraChat/Messages/SuggestedPrompts/index.tsx
rename to src/modules/AieraChat/components/Messages/SuggestedPrompts/index.tsx
index 62d3b0d57..e045408ad 100644
--- a/src/modules/AieraChat/Messages/SuggestedPrompts/index.tsx
+++ b/src/modules/AieraChat/components/Messages/SuggestedPrompts/index.tsx
@@ -1,10 +1,10 @@
 import React, { useCallback, useState } from 'react';
 import { VirtuosoMessageListProps } from '@virtuoso.dev/message-list';
-import { useSuggestedPrompts } from '../../services/suggestedPrompts';
+import { useSuggestedPrompts } from '../../../services/suggestedPrompts';
 import { LoadingSpinner } from '@aiera/client-sdk/components/LoadingSpinner';
 import { Chevron } from '@aiera/client-sdk/components/Svg/Chevron';
 import { MessageListContext } from '..';
-import { ChatMessage } from '../../services/messages';
+import { ChatMessage } from '../../../services/messages';
 
 export const SuggestedPrompts: VirtuosoMessageListProps<ChatMessage, MessageListContext>['EmptyPlaceholder'] = ({
     context,
diff --git a/src/modules/AieraChat/Messages/index.tsx b/src/modules/AieraChat/components/Messages/index.tsx
similarity index 99%
rename from src/modules/AieraChat/Messages/index.tsx
rename to src/modules/AieraChat/components/Messages/index.tsx
index 1d2ef97e8..fd0d6d7b3 100644
--- a/src/modules/AieraChat/Messages/index.tsx
+++ b/src/modules/AieraChat/components/Messages/index.tsx
@@ -9,7 +9,7 @@ import {
 } from '@virtuoso.dev/message-list';
 import classNames from 'classnames';
 import React, { Fragment, RefObject, useCallback, useEffect, useMemo } from 'react';
-import { Prompt } from '../Prompt';
+import { Prompt } from './Prompt';
 import {
     ChatMessage,
     ChatMessagePrompt,
@@ -18,8 +18,8 @@ import {
     ChatMessageStatus,
     ChatMessageType,
     useChatMessages,
-} from '../services/messages';
-import { useChatStore } from '../store';
+} from '../../services/messages';
+import { useChatStore } from '../../store';
 import { MessageFactory } from './MessageFactory';
 import './styles.css';
 import { SuggestedPrompts } from './SuggestedPrompts';
diff --git a/src/modules/AieraChat/Messages/styles.css b/src/modules/AieraChat/components/Messages/styles.css
similarity index 100%
rename from src/modules/AieraChat/Messages/styles.css
rename to src/modules/AieraChat/components/Messages/styles.css
diff --git a/src/modules/AieraChat/PanelSearchInput/index.tsx b/src/modules/AieraChat/components/SearchInput/index.tsx
similarity index 97%
rename from src/modules/AieraChat/PanelSearchInput/index.tsx
rename to src/modules/AieraChat/components/SearchInput/index.tsx
index 4fa13d0e5..fd482e354 100644
--- a/src/modules/AieraChat/PanelSearchInput/index.tsx
+++ b/src/modules/AieraChat/components/SearchInput/index.tsx
@@ -2,7 +2,7 @@ import { MicroCloseCircle } from '@aiera/client-sdk/components/Svg/MicroCloseCir
 import classNames from 'classnames';
 import React from 'react';
 
-export function PanelSearchInput({
+export function SearchInput({
     autoFocus,
     value,
     onChange,
diff --git a/src/modules/AieraChat/index.tsx b/src/modules/AieraChat/index.tsx
index 3a71fd7e9..64b3e5ceb 100644
--- a/src/modules/AieraChat/index.tsx
+++ b/src/modules/AieraChat/index.tsx
@@ -3,13 +3,12 @@ import { VirtuosoMessageListMethods } from '@virtuoso.dev/message-list';
 import classNames from 'classnames';
 import React, { ReactElement, useCallback, useRef, useState } from 'react';
 import { Transcript } from '../Transcript';
-import { ConfirmDialog } from './ConfirmDialog';
-import { Header } from './Header';
-import { Menu } from './Menu';
-import { Messages } from './Messages';
-import { Sources } from './Sources';
+import { ConfirmDialog } from './modals/ConfirmDialog';
+import { Header } from './components/Header';
+import { Menu } from './panels/Menu';
+import { Messages } from './components/Messages';
+import { Sources } from './panels/Sources';
 import { useChatStore } from './store';
-import './styles.css';
 import { ChatMessage } from './services/messages';
 
 export function AieraChat(): ReactElement {
diff --git a/src/modules/AieraChat/AddSourceDialog/index.tsx b/src/modules/AieraChat/modals/AddSourceDialog/index.tsx
similarity index 97%
rename from src/modules/AieraChat/AddSourceDialog/index.tsx
rename to src/modules/AieraChat/modals/AddSourceDialog/index.tsx
index 677947f17..e0add76f2 100644
--- a/src/modules/AieraChat/AddSourceDialog/index.tsx
+++ b/src/modules/AieraChat/modals/AddSourceDialog/index.tsx
@@ -6,11 +6,11 @@ import { MicroFolderOpen } from '@aiera/client-sdk/components/Svg/MicroFolderOpe
 import debounce from 'lodash.debounce';
 import React, { ReactElement, useCallback, useEffect, useState } from 'react';
 import { match } from 'ts-pattern';
-import { ContentRow } from '../ContentRow';
+import { ContentRow } from '../../components/ContentRow';
 import { Modal } from '../Modal';
-import { PanelSearchInput } from '../PanelSearchInput';
-import { useEvents } from '../services/events';
-import { Source, useChatStore } from '../store';
+import { SearchInput } from '../../components/SearchInput';
+import { useEvents } from '../../services/events';
+import { Source, useChatStore } from '../../store';
 
 /**
  * Checks if a given source exists in an array of sources
@@ -65,7 +65,7 @@ export function AddSourceDialog({
     return (
         <Modal onClose={onClose} title="Manage Sources" className="h-60 -mb-5" Icon={MicroFolderOpen}>
             <div className="flex flex-col flex-1">
-                <PanelSearchInput
+                <SearchInput
                     autoFocus
                     onChange={(newValue) => {
                         if (newValue) {
diff --git a/src/modules/AieraChat/ConfirmDialog/index.tsx b/src/modules/AieraChat/modals/ConfirmDialog/index.tsx
similarity index 100%
rename from src/modules/AieraChat/ConfirmDialog/index.tsx
rename to src/modules/AieraChat/modals/ConfirmDialog/index.tsx
diff --git a/src/modules/AieraChat/Modal/index.tsx b/src/modules/AieraChat/modals/Modal/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Modal/index.tsx
rename to src/modules/AieraChat/modals/Modal/index.tsx
diff --git a/src/modules/AieraChat/Menu/index.tsx b/src/modules/AieraChat/panels/Menu/index.tsx
similarity index 93%
rename from src/modules/AieraChat/Menu/index.tsx
rename to src/modules/AieraChat/panels/Menu/index.tsx
index f86076ac4..fa4d63429 100644
--- a/src/modules/AieraChat/Menu/index.tsx
+++ b/src/modules/AieraChat/panels/Menu/index.tsx
@@ -5,10 +5,10 @@ import { MicroTrash } from '@aiera/client-sdk/components/Svg/MicroTrash';
 import classNames from 'classnames';
 import React, { useState } from 'react';
 import { Panel } from '../Panel';
-import { PanelSearchInput } from '../PanelSearchInput';
-import { useChatSessions } from '../services/chats';
-import { useChatStore } from '../store';
-import { ContentRow } from '../ContentRow';
+import { SearchInput } from '../../components/SearchInput';
+import { useChatSessions } from '../../services/chats';
+import { useChatStore } from '../../store';
+import { ContentRow } from '../../components/ContentRow';
 
 export function Menu({ onClose, onOpenConfirm }: { onOpenConfirm: () => void; onClose: () => void }) {
     const { chatId, onSelectChat, onNewChat } = useChatStore();
@@ -22,7 +22,7 @@ export function Menu({ onClose, onOpenConfirm }: { onOpenConfirm: () => void; on
         <Panel Icon={MicroBars} className="mt-4 flex flex-col flex-1" onClose={onClose} title="All Chats" side="left">
             {({ onStartExit }) => (
                 <div className="flex flex-col flex-1 pb-6">
-                    <PanelSearchInput
+                    <SearchInput
                         onChange={setSearchTerm}
                         value={searchTerm}
                         name="search_chats"
diff --git a/src/modules/AieraChat/Panel/index.tsx b/src/modules/AieraChat/panels/Panel/index.tsx
similarity index 100%
rename from src/modules/AieraChat/Panel/index.tsx
rename to src/modules/AieraChat/panels/Panel/index.tsx
diff --git a/src/modules/AieraChat/Panel/styles.css b/src/modules/AieraChat/panels/Panel/styles.css
similarity index 100%
rename from src/modules/AieraChat/Panel/styles.css
rename to src/modules/AieraChat/panels/Panel/styles.css
diff --git a/src/modules/AieraChat/Sources/index.tsx b/src/modules/AieraChat/panels/Sources/index.tsx
similarity index 97%
rename from src/modules/AieraChat/Sources/index.tsx
rename to src/modules/AieraChat/panels/Sources/index.tsx
index 2010453b0..caa54b082 100644
--- a/src/modules/AieraChat/Sources/index.tsx
+++ b/src/modules/AieraChat/panels/Sources/index.tsx
@@ -8,10 +8,10 @@ import debounce from 'lodash.debounce';
 import React, { useCallback, useEffect, useState } from 'react';
 import { match } from 'ts-pattern';
 import { Panel } from '../Panel';
-import { PanelSearchInput } from '../PanelSearchInput';
-import { useEvents } from '../services/events';
-import { Source, useChatStore } from '../store';
-import { ContentRow } from '../ContentRow';
+import { SearchInput } from '../../components/SearchInput';
+import { useEvents } from '../../services/events';
+import { Source, useChatStore } from '../../store';
+import { ContentRow } from '../../components/ContentRow';
 
 /**
  * Checks if a given source exists in an array of sources
@@ -60,7 +60,7 @@ export function Sources({ onClose }: { onClose: () => void }) {
             side="right"
         >
             <div className="flex flex-col flex-1">
-                <PanelSearchInput
+                <SearchInput
                     autoFocus
                     onChange={(newValue) => {
                         if (newValue) {
diff --git a/src/modules/AieraChat/services/messages.ts b/src/modules/AieraChat/services/messages.ts
index b8be8eac8..1e7dedc19 100644
--- a/src/modules/AieraChat/services/messages.ts
+++ b/src/modules/AieraChat/services/messages.ts
@@ -1,5 +1,5 @@
 import { useState, useEffect, useCallback } from 'react';
-import { ContentBlock } from '../Messages/MessageFactory/Block';
+import { ContentBlock } from '../components/Messages/MessageFactory/Block';
 
 export enum ChatMessageType {
     prompt = 'prompt',