Move ui components out of unnecessary subdirectories

src/components/account-search.tsx

@@ -6,7 +6,7 @@ import { defineMessages, useIntl } from 'react-intl';
 
 import AutosuggestAccountInput from 'soapbox/components/autosuggest-account-input.tsx';
 
-import SvgIcon from './ui/icon/svg-icon.tsx';
+import SvgIcon from './ui/svg-icon.tsx';
 
 const messages = defineMessages({
   placeholder: { id: 'account_search.placeholder', defaultMessage: 'Search for an account' },

src/components/autosuggest-account-input.tsx

@@ -7,7 +7,7 @@ import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest
 import { useAppDispatch } from 'soapbox/hooks/index.ts';
 
 import type { Menu } from 'soapbox/components/dropdown-menu/index.ts';
-import type { InputThemes } from 'soapbox/components/ui/input/input.tsx';
+import type { InputThemes } from 'soapbox/components/ui/input.tsx';
 
 const noOp = () => { };
 

src/components/autosuggest-input.tsx

@@ -9,7 +9,7 @@ import AutosuggestAccount from 'soapbox/features/compose/components/autosuggest-
 import { textAtCursorMatchesToken } from 'soapbox/utils/suggestions.ts';
 
 import type { Menu, MenuItem } from 'soapbox/components/dropdown-menu/index.ts';
-import type { InputThemes } from 'soapbox/components/ui/input/input.tsx';
+import type { InputThemes } from 'soapbox/components/ui/input.tsx';
 import type { Emoji } from 'soapbox/features/emoji/index.ts';
 
 export type AutoSuggestion = string | Emoji;

src/components/big-card.tsx

@@ -1,6 +1,6 @@
 import xIcon from '@tabler/icons/outline/x.svg';
 
-import IconButton from 'soapbox/components/ui/icon-button/icon-button.tsx';
+import IconButton from 'soapbox/components/ui/icon-button.tsx';
 import { Card, CardBody, Stack, Text } from 'soapbox/components/ui/index.ts';
 
 const closeIcon = xIcon;

src/components/birthday-input.tsx

@@ -3,7 +3,7 @@ import { defineMessages, useIntl } from 'react-intl';
 
 import { useInstance, useFeatures } from 'soapbox/hooks/index.ts';
 
-import { Datetime } from './ui/datetime/datetime.tsx';
+import { Datetime } from './ui/datetime.tsx';
 
 const messages = defineMessages({
   birthdayPlaceholder: { id: 'edit_profile.fields.birthday_placeholder', defaultMessage: 'Your birthday' },

src/components/emoji-graphic.tsx

@@ -1,4 +1,4 @@
-import Emoji from 'soapbox/components/ui/emoji/emoji.tsx';
+import Emoji from 'soapbox/components/ui/emoji.tsx';
 
 interface IEmojiGraphic {
   emoji: string;

src/components/markup.tsx

@@ -1,6 +1,6 @@
 import { forwardRef } from 'react';
 
-import Text, { IText } from './ui/text/text.tsx';
+import Text, { IText } from './ui/text.tsx';
 import './markup.css';
 
 interface IMarkup extends IText {

src/components/media-gallery.tsx

@@ -13,7 +13,7 @@ import { truncateFilename } from 'soapbox/utils/media.ts';
 import { isIOS } from '../is-mobile.ts';
 import { isPanoramic, isPortrait, isNonConformingRatio, minimumAspectRatio, maximumAspectRatio } from '../utils/media-aspect-ratio.ts';
 
-import SvgIcon from './ui/icon/svg-icon.tsx';
+import SvgIcon from './ui/svg-icon.tsx';
 
 import type { List as ImmutableList } from 'immutable';
 

src/components/relative-timestamp.tsx

@@ -1,7 +1,7 @@
 import { Component } from 'react';
 import { injectIntl, defineMessages, IntlShape, FormatDateOptions } from 'react-intl';
 
-import Text, { IText } from './ui/text/text.tsx';
+import Text, { IText } from './ui/text.tsx';
 
 const messages = defineMessages({
   just_now: { id: 'relative_time.just_now', defaultMessage: 'now' },

src/components/status-content.tsx

@@ -14,7 +14,7 @@ import Markup from './markup.tsx';
 import Mention from './mention.tsx';
 import Poll from './polls/poll.tsx';
 
-import type { Sizes } from 'soapbox/components/ui/text/text.tsx';
+import type { Sizes } from 'soapbox/components/ui/text.tsx';
 import type { Status } from 'soapbox/types/entities.ts';
 
 const MAX_HEIGHT = 642; // 20px * 32 (+ 2px padding at the top)

src/components/ui/accordion.tsx

@@ -6,9 +6,9 @@ import { defineMessages, useIntl } from 'react-intl';
 
 import DropdownMenu from 'soapbox/components/dropdown-menu/index.ts';
 
-import HStack from '../hstack/hstack.tsx';
-import Icon from '../icon/icon.tsx';
-import Text from '../text/text.tsx';
+import HStack from './hstack.tsx';
+import Icon from './icon.tsx';
+import Text from './text.tsx';
 
 import type { Menu } from 'soapbox/components/dropdown-menu/index.ts';
 

src/components/ui/avatar.tsx

@@ -4,7 +4,7 @@ import { useMemo, useState } from 'react';
 
 import StillImage, { IStillImage } from 'soapbox/components/still-image.tsx';
 
-import Icon from '../icon/icon.tsx';
+import Icon from '../icon.tsx';
 
 const AVATAR_SIZE = 42;
 

src/components/ui/button.tsx

@@ -2,11 +2,10 @@ import clsx from 'clsx';
 import { forwardRef, useCallback } from 'react';
 import { Link } from 'react-router-dom';
 
-import Icon from '../icon/icon.tsx';
-
+import Icon from './icon.tsx';
 import { useButtonStyles } from './useButtonStyles.ts';
 
-import type { ButtonSizes, ButtonThemes } from './useButtonStyles.tsx';
+import type { ButtonSizes, ButtonThemes } from './useButtonStyles.ts';
 
 interface IButton {
   /** Whether this button expands the width of its container. */

src/components/ui/card.tsx

@@ -4,10 +4,10 @@ import { forwardRef } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 
-import SvgIcon from 'soapbox/components/ui/icon/svg-icon.tsx';
+import SvgIcon from 'soapbox/components/ui/svg-icon.tsx';
 
-import HStack from '../hstack/hstack.tsx';
-import Text from '../text/text.tsx';
+import HStack from './hstack.tsx';
+import Text from './text.tsx';
 
 const sizes = {
   md: 'p-4 sm:rounded-xl',

src/components/ui/carousel.tsx

@@ -4,8 +4,8 @@ import { useEffect, useState } from 'react';
 
 import { useDimensions } from 'soapbox/hooks/index.ts';
 
-import HStack from '../hstack/hstack.tsx';
-import Icon from '../icon/icon.tsx';
+import HStack from './hstack.tsx';
+import Icon from './icon.tsx';
 
 interface ICarousel {
   children: any;

src/components/ui/column.tsx

@@ -6,7 +6,7 @@ import { useHistory } from 'react-router-dom';
 import Helmet from 'soapbox/components/helmet.tsx';
 import { useSoapboxConfig } from 'soapbox/hooks/index.ts';
 
-import { Card, CardBody, CardHeader, CardTitle, type CardSizes } from '../card/card.tsx';
+import { Card, CardBody, CardHeader, CardTitle, type CardSizes } from './card.tsx';
 
 type IColumnHeader = Pick<IColumn, 'label' | 'backHref' | 'className' | 'action'>;
 

src/components/ui/datepicker.tsx

@@ -1,9 +1,9 @@
 import { useEffect, useMemo, useState } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
 
-import Select from '../select/select.tsx';
-import Stack from '../stack/stack.tsx';
-import Text from '../text/text.tsx';
+import Select from './select.tsx';
+import Stack from './stack.tsx';
+import Text from './text.tsx';
 
 const getDaysInMonth = (month: number, year: number) => new Date(year, month + 1, 0).getDate();
 const currentYear = new Date().getFullYear();

src/components/ui/datetime.tsx

@@ -1,4 +1,4 @@
-import Input from '../input/input.tsx';
+import Input from './input.tsx';
 
 interface DatetimeProps {
   value: Date;

src/components/ui/divider.tsx

@@ -1,6 +1,6 @@
-import Text from '../text/text.tsx';
+import Text from './text.tsx';
 
-import type { Sizes as TextSizes } from '../text/text.tsx';
+import type { Sizes as TextSizes } from './text.tsx';
 
 interface IDivider {
   text?: string;

src/components/ui/emoji-selector.tsx

@@ -3,9 +3,9 @@ import dotsIcon from '@tabler/icons/outline/dots.svg';
 import clsx from 'clsx';
 import { useEffect, useState } from 'react';
 
-import EmojiComponent from 'soapbox/components/ui/emoji/emoji.tsx';
-import HStack from 'soapbox/components/ui/hstack/hstack.tsx';
-import IconButton from 'soapbox/components/ui/icon-button/icon-button.tsx';
+import EmojiComponent from 'soapbox/components/ui/emoji.tsx';
+import HStack from 'soapbox/components/ui/hstack.tsx';
+import IconButton from 'soapbox/components/ui/icon-button.tsx';
 import EmojiPickerDropdown from 'soapbox/features/emoji/components/emoji-picker-dropdown.tsx';
 import { useClickOutside, useFeatures, useSoapboxConfig } from 'soapbox/hooks/index.ts';
 

src/components/ui/form-actions.tsx

@@ -1,4 +1,4 @@
-import HStack from '../hstack/hstack.tsx';
+import HStack from './hstack.tsx';
 
 interface IFormActions {
   children: React.ReactNode;

src/components/ui/form-group.tsx

@@ -1,8 +1,8 @@
 import { Children, cloneElement, isValidElement, useMemo } from 'react';
 
-import Checkbox from '../checkbox/checkbox.tsx';
-import HStack from '../hstack/hstack.tsx';
-import Stack from '../stack/stack.tsx';
+import Checkbox from './checkbox.tsx';
+import HStack from './hstack.tsx';
+import Stack from './stack.tsx';
 
 interface IFormGroup {
   /** Input label message. */

src/components/ui/icon-button.tsx

@@ -1,8 +1,8 @@
 import clsx from 'clsx';
 import { forwardRef } from 'react';
 
-import SvgIcon from '../icon/svg-icon.tsx';
-import Text from '../text/text.tsx';
+import SvgIcon from './svg-icon.tsx';
+import Text from './text.tsx';
 
 interface IIconButton extends React.ButtonHTMLAttributes<HTMLButtonElement> {
   /** Class name for the <svg> icon. */

src/components/ui/icon.tsx

@@ -1,5 +1,4 @@
-import Counter from '../counter/counter.tsx';
-
+import Counter from './counter.tsx';
 import SvgIcon from './svg-icon.tsx';
 
 interface IIcon extends Pick<React.SVGAttributes<SVGAElement>, 'strokeWidth'> {

src/components/ui/index.ts

@@ -1,11 +1,11 @@
-export { default as Accordion } from './accordion/accordion.tsx';
-export { default as Avatar } from './avatar/avatar.tsx';
-export { default as Banner } from './banner/banner.tsx';
-export { default as Button } from './button/button.tsx';
-export { default as Carousel } from './carousel/carousel.tsx';
-export { Card, CardBody, CardHeader, CardTitle } from './card/card.tsx';
-export { default as Checkbox } from './checkbox/checkbox.tsx';
-export { Column, ColumnHeader } from './column/column.tsx';
+export { default as Accordion } from './accordion.tsx';
+export { default as Avatar } from './avatar.tsx';
+export { default as Banner } from './banner.tsx';
+export { default as Button } from './button.tsx';
+export { default as Carousel } from './carousel.tsx';
+export { Card, CardBody, CardHeader, CardTitle } from './card.tsx';
+export { default as Checkbox } from './checkbox.tsx';
+export { Column, ColumnHeader } from './column.tsx';
 export {
   Combobox,
   ComboboxInput,
@@ -13,21 +13,21 @@ export {
   ComboboxList,
   ComboboxOption,
   ComboboxOptionText,
-} from './combobox/combobox.tsx';
-export { default as Counter } from './counter/counter.tsx';
-export { default as Datepicker } from './datepicker/datepicker.tsx';
-export { default as Divider } from './divider/divider.tsx';
-export { default as Emoji } from './emoji/emoji.tsx';
-export { default as EmojiSelector } from './emoji-selector/emoji-selector.tsx';
-export { default as FileInput } from './file-input/file-input.tsx';
-export { default as Form } from './form/form.tsx';
-export { default as FormActions } from './form-actions/form-actions.tsx';
-export { default as FormGroup } from './form-group/form-group.tsx';
-export { default as HStack } from './hstack/hstack.tsx';
-export { default as Icon } from './icon/icon.tsx';
-export { default as IconButton } from './icon-button/icon-button.tsx';
-export { default as Input } from './input/input.tsx';
-export { default as Layout } from './layout/layout.tsx';
+} from './combobox.tsx';
+export { default as Counter } from './counter.tsx';
+export { default as Datepicker } from './datepicker.tsx';
+export { default as Divider } from './divider.tsx';
+export { default as Emoji } from './emoji.tsx';
+export { default as EmojiSelector } from './emoji-selector.tsx';
+export { default as FileInput } from './file-input.tsx';
+export { default as Form } from './form.tsx';
+export { default as FormActions } from './form-actions.tsx';
+export { default as FormGroup } from './form-group.tsx';
+export { default as HStack } from './hstack.tsx';
+export { default as Icon } from './icon.tsx';
+export { default as IconButton } from './icon-button.tsx';
+export { default as Input } from './input.tsx';
+export { default as Layout } from './layout.tsx';
 export {
   Menu,
   MenuButton,
@@ -36,22 +36,22 @@ export {
   MenuItems,
   MenuLink,
   MenuList,
-} from './menu/menu.tsx';
-export { default as Modal } from './modal/modal.tsx';
-export { default as Popover } from './popover/popover.tsx';
-export { default as Portal } from './portal/portal.tsx';
-export { default as ProgressBar } from './progress-bar/progress-bar.tsx';
-export { default as RadioButton } from './radio-button/radio-button.tsx';
-export { default as Select } from './select/select.tsx';
-export { default as Slider } from './slider/slider.tsx';
-export { default as Spinner } from './spinner/spinner.tsx';
-export { default as Stack } from './stack/stack.tsx';
-export { default as Streamfield } from './streamfield/streamfield.tsx';
-export { default as Tabs } from './tabs/tabs.tsx';
-export { default as TagInput } from './tag-input/tag-input.tsx';
-export { default as Text } from './text/text.tsx';
-export { default as Textarea } from './textarea/textarea.tsx';
-export { default as Toast } from './toast/toast.tsx';
-export { default as Toggle } from './toggle/toggle.tsx';
-export { default as Tooltip } from './tooltip/tooltip.tsx';
-export { default as Widget } from './widget/widget.tsx';
+} from './menu.tsx';
+export { default as Modal } from './modal.tsx';
+export { default as Popover } from './popover.tsx';
+export { default as Portal } from './portal.tsx';
+export { default as ProgressBar } from './progress-bar.tsx';
+export { default as RadioButton } from './radio-button.tsx';
+export { default as Select } from './select.tsx';
+export { default as Slider } from './slider.tsx';
+export { default as Spinner } from './spinner.tsx';
+export { default as Stack } from './stack.tsx';
+export { default as Streamfield } from './streamfield.tsx';
+export { default as Tabs } from './tabs.tsx';
+export { default as TagInput } from './tag-input.tsx';
+export { default as Text } from './text.tsx';
+export { default as Textarea } from './textarea.tsx';
+export { default as Toast } from './toast.tsx';
+export { default as Toggle } from './toggle.tsx';
+export { default as Tooltip } from './tooltip.tsx';
+export { default as Widget } from './widget.tsx';

src/components/ui/input.tsx

@@ -7,9 +7,9 @@ import { defineMessages, useIntl } from 'react-intl';
 import { useLocale } from 'soapbox/hooks/index.ts';
 import { getTextDirection } from 'soapbox/utils/rtl.ts';
 
-import Icon from '../icon/icon.tsx';
-import SvgIcon from '../icon/svg-icon.tsx';
-import Tooltip from '../tooltip/tooltip.tsx';
+import Icon from './icon.tsx';
+import SvgIcon from './svg-icon.tsx';
+import Tooltip from './tooltip.tsx';
 
 const messages = defineMessages({
   showPassword: { id: 'input.password.show_password', defaultMessage: 'Show password' },

src/components/ui/language-dropdown.tsx

@@ -2,7 +2,7 @@ import worldIcon from '@tabler/icons/outline/world.svg';
 
 import { openDropdownMenu } from 'soapbox/actions/dropdown-menu.ts';
 import DropdownMenu, { MenuItem } from 'soapbox/components/dropdown-menu/index.ts';
-import SvgIcon from 'soapbox/components/ui/icon/svg-icon.tsx';
+import SvgIcon from 'soapbox/components/ui/svg-icon.tsx';
 import { languages } from 'soapbox/features/preferences/index.tsx';
 import { useAppDispatch } from 'soapbox/hooks/index.ts';
 

src/components/ui/modal.tsx

@@ -4,10 +4,10 @@ import clsx from 'clsx';
 import { forwardRef, useEffect, useRef } from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
-import Button from '../button/button.tsx';
-import { ButtonThemes } from '../button/useButtonStyles.ts';
-import HStack from '../hstack/hstack.tsx';
-import IconButton from '../icon-button/icon-button.tsx';
+import Button from './button.tsx';
+import HStack from './hstack.tsx';
+import IconButton from './icon-button.tsx';
+import { ButtonThemes } from './useButtonStyles.ts';
 
 const messages = defineMessages({
   back: { id: 'card.back.label', defaultMessage: 'Back' },

src/components/ui/popover.tsx

@@ -13,7 +13,7 @@ import {
 import clsx from 'clsx';
 import { cloneElement, useRef, useState } from 'react';
 
-import Portal from '../portal/portal.tsx';
+import Portal from './portal.tsx';
 
 interface IPopover {
   children: React.ReactElement<any, string | React.JSXElementConstructor<any>>;

src/components/ui/radio-button.tsx

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 
-import HStack from '../hstack/hstack.tsx';
+import HStack from './hstack.tsx';
 
 interface IRadioButton {
   value: string;

src/components/ui/spinner.tsx

@@ -1,7 +1,7 @@
 import { FormattedMessage } from 'react-intl';
 
-import Stack from '../stack/stack.tsx';
-import Text from '../text/text.tsx';
+import Stack from './stack.tsx';
+import Text from './text.tsx';
 
 import './spinner.css';
 

src/components/ui/streamfield.tsx

@@ -1,11 +1,11 @@
 import xIcon from '@tabler/icons/outline/x.svg';
 import { useIntl, defineMessages } from 'react-intl';
 
-import Button from '../button/button.tsx';
-import HStack from '../hstack/hstack.tsx';
-import IconButton from '../icon-button/icon-button.tsx';
-import Stack from '../stack/stack.tsx';
-import Text from '../text/text.tsx';
+import Button from './button.tsx';
+import HStack from './hstack.tsx';
+import IconButton from './icon-button.tsx';
+import Stack from './stack.tsx';
+import Text from './text.tsx';
 
 const messages = defineMessages({
   add: { id: 'streamfield.add', defaultMessage: 'Add' },

src/components/ui/tabs.tsx

@@ -9,8 +9,7 @@ import clsx from 'clsx';
 import { createContext, useContext, useLayoutEffect, useRef, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 
-import Counter from '../counter/counter.tsx';
-
+import Counter from './counter.tsx';
 import './tabs.css';
 
 const HORIZONTAL_PADDING = 8;

src/components/ui/tag-input.tsx

@@ -1,7 +1,6 @@
 import { useState } from 'react';
 
-import HStack from '../hstack/hstack.tsx';
-
+import HStack from './hstack.tsx';
 import Tag from './tag.tsx';
 
 interface ITagInput {

src/components/ui/tag.tsx

@@ -1,7 +1,7 @@
 import xIcon from '@tabler/icons/outline/x.svg';
 
-import IconButton from '../icon-button/icon-button.tsx';
-import Text from '../text/text.tsx';
+import IconButton from './icon-button.tsx';
+import Text from './text.tsx';
 
 interface ITag {
   /** Name of the tag. */

src/components/ui/textarea.tsx

@@ -5,8 +5,8 @@ import { FormattedMessage } from 'react-intl';
 import { useLocale } from 'soapbox/hooks/index.ts';
 import { getTextDirection } from 'soapbox/utils/rtl.ts';
 
-import Stack from '../stack/stack.tsx';
-import Text from '../text/text.tsx';
+import Stack from './stack.tsx';
+import Text from './text.tsx';
 
 interface ITextarea extends Pick<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'id' | 'maxLength' | 'onChange' | 'onClick' | 'onKeyDown' | 'onPaste' | 'required' | 'disabled' | 'rows' | 'readOnly'> {
   /** Put the cursor into the input on mount. */

src/components/ui/toast.tsx

@@ -9,10 +9,10 @@ import { Link } from 'react-router-dom';
 
 import { ToastText, ToastType } from 'soapbox/toast.tsx';
 
-import HStack from '../hstack/hstack.tsx';
-import Icon from '../icon/icon.tsx';
-import Stack from '../stack/stack.tsx';
-import Text from '../text/text.tsx';
+import HStack from './hstack.tsx';
+import Icon from './icon.tsx';
+import Stack from './stack.tsx';
+import Text from './text.tsx';
 
 const renderText = (text: ToastText) => {
   if (typeof text === 'string') {

src/components/ui/widget.tsx

@@ -1,9 +1,9 @@
 import arrowRightIcon from '@tabler/icons/outline/arrow-right.svg';
 
-import HStack from 'soapbox/components/ui/hstack/hstack.tsx';
-import IconButton from 'soapbox/components/ui/icon-button/icon-button.tsx';
-import Stack from 'soapbox/components/ui/stack/stack.tsx';
-import Text from 'soapbox/components/ui/text/text.tsx';
+import HStack from 'soapbox/components/ui/hstack.tsx';
+import IconButton from 'soapbox/components/ui/icon-button.tsx';
+import Stack from 'soapbox/components/ui/stack.tsx';
+import Text from 'soapbox/components/ui/text.tsx';
 
 interface IWidgetTitle {
   /** Title text for the widget. */

src/features/account-gallery/components/media-item.tsx

@@ -5,7 +5,7 @@ import { useState } from 'react';
 
 import Blurhash from 'soapbox/components/blurhash.tsx';
 import StillImage from 'soapbox/components/still-image.tsx';
-import SvgIcon from 'soapbox/components/ui/icon/svg-icon.tsx';
+import SvgIcon from 'soapbox/components/ui/svg-icon.tsx';
 import { useSettings } from 'soapbox/hooks/index.ts';
 import { isIOS } from 'soapbox/is-mobile.ts';
 

src/features/audio/index.tsx

@@ -9,7 +9,7 @@ import throttle from 'lodash/throttle';
 import { useEffect, useLayoutEffect, useRef, useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 
-import SvgIcon from 'soapbox/components/ui/icon/svg-icon.tsx';
+import SvgIcon from 'soapbox/components/ui/svg-icon.tsx';
 import { formatTime, getPointerPosition } from 'soapbox/features/video/index.tsx';
 
 import Visualizer from './visualizer.ts';

src/features/chats/components/chat-message-reaction-wrapper/chat-message-reaction-wrapper.tsx

@@ -1,6 +1,6 @@
 import { useState, useEffect, cloneElement } from 'react';
 
-import EmojiSelector from 'soapbox/components/ui/emoji-selector/emoji-selector.tsx';
+import EmojiSelector from 'soapbox/components/ui/emoji-selector.tsx';
 import { Portal } from 'soapbox/components/ui/index.ts';
 
 interface IChatMessageReactionWrapper {

src/features/compose/components/schedule-form.tsx

@@ -3,7 +3,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { setSchedule, removeSchedule } from 'soapbox/actions/compose.ts';
 import IconButton from 'soapbox/components/icon-button.tsx';
-import { Datetime } from 'soapbox/components/ui/datetime/datetime.tsx';
+import { Datetime } from 'soapbox/components/ui/datetime.tsx';
 import { HStack, Stack, Text } from 'soapbox/components/ui/index.ts';
 import { useAppDispatch, useCompose } from 'soapbox/hooks/index.ts';
 

src/features/compose/components/search-zap-split.tsx

@@ -13,8 +13,8 @@ import {
   submitSearch,
 } from 'soapbox/actions/search.ts';
 import AutosuggestAccountInput from 'soapbox/components/autosuggest-account-input.tsx';
-import SvgIcon from 'soapbox/components/ui/icon/svg-icon.tsx';
 import { Input } from 'soapbox/components/ui/index.ts';
+import SvgIcon from 'soapbox/components/ui/svg-icon.tsx';
 import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts';
 import { Account } from 'soapbox/schemas/index.ts';
 import { selectAccount } from 'soapbox/selectors/index.ts';

src/features/compose/components/search.tsx

@@ -15,8 +15,8 @@ import {
   submitSearch,
 } from 'soapbox/actions/search.ts';
 import AutosuggestAccountInput from 'soapbox/components/autosuggest-account-input.tsx';
-import SvgIcon from 'soapbox/components/ui/icon/svg-icon.tsx';
 import { Input } from 'soapbox/components/ui/index.ts';
+import SvgIcon from 'soapbox/components/ui/svg-icon.tsx';
 import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts';
 import { selectAccount } from 'soapbox/selectors/index.ts';
 import { AppDispatch, RootState } from 'soapbox/store.ts';

src/features/developers/developers-menu.tsx

@@ -10,8 +10,8 @@ import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import { Link, useHistory } from 'react-router-dom';
 
 import { changeSettingImmediate } from 'soapbox/actions/settings.ts';
-import SvgIcon from 'soapbox/components/ui/icon/svg-icon.tsx';
 import { Column, Text } from 'soapbox/components/ui/index.ts';
+import SvgIcon from 'soapbox/components/ui/svg-icon.tsx';
 import { useAppDispatch } from 'soapbox/hooks/index.ts';
 import toast from 'soapbox/toast.tsx';
 import sourceCode from 'soapbox/utils/code.ts';

src/features/edit-profile/index.tsx

@@ -25,7 +25,7 @@ import { isDefaultAvatar, isDefaultHeader } from 'soapbox/utils/accounts.ts';
 import AvatarPicker from './components/avatar-picker.tsx';
 import HeaderPicker from './components/header-picker.tsx';
 
-import type { StreamfieldComponent } from 'soapbox/components/ui/streamfield/streamfield.tsx';
+import type { StreamfieldComponent } from 'soapbox/components/ui/streamfield.tsx';
 import type { Account } from 'soapbox/schemas/index.ts';
 
 const nonDefaultAvatar = (url: string | undefined) => url && isDefaultAvatar(url) ? undefined : url;

src/features/event/components/event-action-button.tsx

@@ -7,7 +7,7 @@ import { openModal } from 'soapbox/actions/modals.ts';
 import { Button } from 'soapbox/components/ui/index.ts';
 import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts';
 
-import type { ButtonThemes } from 'soapbox/components/ui/button/useButtonStyles.tsx';
+import type { ButtonThemes } from 'soapbox/components/ui/useButtonStyles.ts';
 import type { Status as StatusEntity } from 'soapbox/types/entities.ts';
 
 const messages = defineMessages({

src/features/event/components/event-header.tsx

@@ -37,8 +37,8 @@ import { initReport, ReportableEntities } from 'soapbox/actions/reports.ts';
 import { deleteStatus } from 'soapbox/actions/statuses.ts';
 import Icon from 'soapbox/components/icon.tsx';
 import StillImage from 'soapbox/components/still-image.tsx';
-import SvgIcon from 'soapbox/components/ui/icon/svg-icon.tsx';
 import { Button, HStack, IconButton, Menu, MenuButton, MenuDivider, MenuItem, MenuLink, MenuList, Stack, Text } from 'soapbox/components/ui/index.ts';
+import SvgIcon from 'soapbox/components/ui/svg-icon.tsx';
 import VerificationBadge from 'soapbox/components/verification-badge.tsx';
 import { useAppDispatch, useFeatures, useOwnAccount, useSettings } from 'soapbox/hooks/index.ts';
 import copy from 'soapbox/utils/copy.ts';

src/features/filters/edit-filter.tsx

@@ -12,7 +12,7 @@ import toast from 'soapbox/toast.tsx';
 
 import { SelectDropdown } from '../forms/index.tsx';
 
-import type { StreamfieldComponent } from 'soapbox/components/ui/streamfield/streamfield.tsx';
+import type { StreamfieldComponent } from 'soapbox/components/ui/streamfield.tsx';
 
 interface IFilterField {
   id?: string;

src/features/group/components/group-tags-field.tsx

@@ -3,7 +3,7 @@ import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
 import { Input, Streamfield } from 'soapbox/components/ui/index.ts';
 
-import type { StreamfieldComponent } from 'soapbox/components/ui/streamfield/streamfield.tsx';
+import type { StreamfieldComponent } from 'soapbox/components/ui/streamfield.tsx';
 
 const messages = defineMessages({
   hashtagPlaceholder: { id: 'manage_group.fields.hashtag_placeholder', defaultMessage: 'Add a topic' },

src/features/groups/components/tab-bar.tsx

@@ -3,7 +3,7 @@ import { useHistory } from 'react-router-dom';
 
 import { Tabs } from 'soapbox/components/ui/index.ts';
 
-import type { Item } from 'soapbox/components/ui/tabs/tabs.tsx';
+import type { Item } from 'soapbox/components/ui/tabs.tsx';
 
 export enum TabItems {
   MY_GROUPS = 'MY_GROUPS',

src/features/nostr-relays/components/relay-editor.tsx

@@ -1,7 +1,7 @@
 import { FormattedMessage } from 'react-intl';
 
 import { HStack, Input, Select } from 'soapbox/components/ui/index.ts';
-import Streamfield, { StreamfieldComponent } from 'soapbox/components/ui/streamfield/streamfield.tsx';
+import Streamfield, { StreamfieldComponent } from 'soapbox/components/ui/streamfield.tsx';
 import { useInstance } from 'soapbox/hooks/index.ts';
 
 interface IRelayEditor {

src/features/notifications/components/filter-bar.tsx

@@ -12,7 +12,7 @@ import Icon from 'soapbox/components/icon.tsx';
 import { Tabs } from 'soapbox/components/ui/index.ts';
 import { useAppDispatch, useFeatures, useSettings } from 'soapbox/hooks/index.ts';
 
-import type { Item } from 'soapbox/components/ui/tabs/tabs.tsx';
+import type { Item } from 'soapbox/components/ui/tabs.tsx';
 
 const messages = defineMessages({
   all: { id: 'notifications.filter.all', defaultMessage: 'All' },

src/features/public-timeline/index.tsx

@@ -8,7 +8,7 @@ import { clearTimeline, expandPublicTimeline } from 'soapbox/actions/timelines.t
 import { usePublicStream } from 'soapbox/api/hooks/index.ts';
 import PullToRefresh from 'soapbox/components/pull-to-refresh.tsx';
 import { Accordion, Column } from 'soapbox/components/ui/index.ts';
-import { LanguageDropdown } from 'soapbox/components/ui/language-dropdown/language-dropdown.tsx';
+import { LanguageDropdown } from 'soapbox/components/ui/language-dropdown.tsx';
 import { useAppSelector, useAppDispatch, useInstance, useSettings, useTheme, useFeatures } from 'soapbox/hooks/index.ts';
 import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts';
 

src/features/soapbox-config/components/crypto-address-input.tsx

@@ -2,7 +2,7 @@ import { useIntl, defineMessages } from 'react-intl';
 
 import { HStack, Input } from 'soapbox/components/ui/index.ts';
 
-import type { StreamfieldComponent } from 'soapbox/components/ui/streamfield/streamfield.tsx';
+import type { StreamfieldComponent } from 'soapbox/components/ui/streamfield.tsx';
 import type { CryptoAddress } from 'soapbox/types/soapbox.ts';
 
 const messages = defineMessages({

src/features/soapbox-config/components/footer-link-input.tsx

@@ -2,7 +2,7 @@ import { useIntl, defineMessages } from 'react-intl';
 
 import { HStack, Input } from 'soapbox/components/ui/index.ts';
 
-import type { StreamfieldComponent } from 'soapbox/components/ui/streamfield/streamfield.tsx';
+import type { StreamfieldComponent } from 'soapbox/components/ui/streamfield.tsx';
 import type { FooterItem } from 'soapbox/types/soapbox.ts';
 
 const messages = defineMessages({

src/features/soapbox-config/components/promo-panel-input.tsx

@@ -4,7 +4,7 @@ import { HStack, Input } from 'soapbox/components/ui/index.ts';
 
 import IconPicker from './icon-picker.tsx';
 
-import type { StreamfieldComponent } from 'soapbox/components/ui/streamfield/streamfield.tsx';
+import type { StreamfieldComponent } from 'soapbox/components/ui/streamfield.tsx';
 import type { PromoPanelItem } from 'soapbox/types/soapbox.ts';
 
 const messages = defineMessages({

src/features/ui/components/modals/compose-event-modal/compose-event-modal.tsx

@@ -24,7 +24,7 @@ import { closeModal, openModal } from 'soapbox/actions/modals.ts';
 import { ADDRESS_ICONS } from 'soapbox/components/autosuggest-location.tsx';
 import LocationSearch from 'soapbox/components/location-search.tsx';
 import { checkEventComposeContent } from 'soapbox/components/modal-root.tsx';
-import { Datetime } from 'soapbox/components/ui/datetime/datetime.tsx';
+import { Datetime } from 'soapbox/components/ui/datetime.tsx';
 import { Button, Form, FormGroup, HStack, Icon, IconButton, Input, Modal, Spinner, Stack, Tabs, Text, Toggle } from 'soapbox/components/ui/index.ts';
 import AccountContainer from 'soapbox/containers/account-container.tsx';
 import { ComposeEditor } from 'soapbox/features/ui/util/async-components.ts';

src/features/ui/components/modals/confirmation-modal.tsx

@@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl';
 import List, { ListItem } from 'soapbox/components/list.tsx';
 import { Modal, Stack, Text, Toggle } from 'soapbox/components/ui/index.ts';
 
-import type { ButtonThemes } from 'soapbox/components/ui/button/useButtonStyles.tsx';
+import type { ButtonThemes } from 'soapbox/components/ui/useButtonStyles.ts';
 
 interface IConfirmationModal {
   heading: React.ReactNode;

src/features/ui/components/modals/edit-announcement-modal.tsx

@@ -3,7 +3,7 @@ import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
 import { closeModal } from 'soapbox/actions/modals.ts';
 import { useAnnouncements } from 'soapbox/api/hooks/admin/useAnnouncements.ts';
-import { Datetime } from 'soapbox/components/ui/datetime/datetime.tsx';
+import { Datetime } from 'soapbox/components/ui/datetime.tsx';
 import { Form, FormGroup, HStack, Modal, Stack, Text, Textarea, Toggle } from 'soapbox/components/ui/index.ts';
 import { useAppDispatch } from 'soapbox/hooks/index.ts';
 import toast from 'soapbox/toast.tsx';

src/features/ui/components/modals/nostr-login-modal/components/nostr-extension-indicator.tsx

@@ -3,8 +3,8 @@ import { FormattedMessage } from 'react-intl';
 
 import { closeModal } from 'soapbox/actions/modals.ts';
 import { nostrExtensionLogIn } from 'soapbox/actions/nostr.ts';
-import Stack from 'soapbox/components/ui/stack/stack.tsx';
-import Text from 'soapbox/components/ui/text/text.tsx';
+import Stack from 'soapbox/components/ui/stack.tsx';
+import Text from 'soapbox/components/ui/text.tsx';
 import { useNostr } from 'soapbox/contexts/nostr-context.tsx';
 import { useAppDispatch } from 'soapbox/hooks/index.ts';
 

src/features/ui/components/modals/onboarding-flow-modal/steps/avatar-step.tsx

@@ -5,7 +5,7 @@ import { useRef, useState } from 'react';
 import { FormattedMessage, defineMessages } from 'react-intl';
 
 import { patchMe } from 'soapbox/actions/me.ts';
-import IconButton from 'soapbox/components/ui/icon-button/icon-button.tsx';
+import IconButton from 'soapbox/components/ui/icon-button.tsx';
 import { Button, Stack, Text, Avatar, Icon, Spinner } from 'soapbox/components/ui/index.ts';
 import { useAppDispatch, useOwnAccount } from 'soapbox/hooks/index.ts';
 import toast from 'soapbox/toast.tsx';

src/features/ui/components/modals/onboarding-flow-modal/steps/bio-step.tsx

@@ -3,7 +3,7 @@ import { useState } from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { patchMe } from 'soapbox/actions/me.ts';
-import IconButton from 'soapbox/components/ui/icon-button/icon-button.tsx';
+import IconButton from 'soapbox/components/ui/icon-button.tsx';
 import { Button, Text, FormGroup, Stack, Textarea } from 'soapbox/components/ui/index.ts';
 import { useAppDispatch, useOwnAccount } from 'soapbox/hooks/index.ts';
 import toast from 'soapbox/toast.tsx';

src/features/ui/components/modals/onboarding-flow-modal/steps/completed-step.tsx

@@ -2,7 +2,7 @@ import confettiIcon from '@tabler/icons/outline/confetti.svg';
 import xIcon from '@tabler/icons/outline/x.svg';
 import { FormattedMessage } from 'react-intl';
 
-import IconButton from 'soapbox/components/ui/icon-button/icon-button.tsx';
+import IconButton from 'soapbox/components/ui/icon-button.tsx';
 import { Button, Icon, Stack, Text } from 'soapbox/components/ui/index.ts';
 
 const closeIcon = xIcon;